gentoo resync : 01.08.2021

4218 files changed, 55468 insertions, 37007 deletions

diff --git a/Manifest b/Manifest
index dc3145a09eb7..68b5b4cb5935 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29301 BLAKE2B 491d62ad23f0de498240951ed7c1f2610418293d394b355f859b10e1e53a751e5f8726b1b10339fc8d1646facfa48970bef3bec01ed83e6824c6760562ddc89d SHA512 bf227274a8908326a378aaecfc00f2d6e52701bc51fc99c7b9e5da5bf1968f6ee9e4b7a2acb2866092122e36297892ca8ad936c84dd10ce4f474f35f5f644e60
-TIMESTAMP 2021-07-28T08:39:12Z
+MANIFEST Manifest.files.gz 29281 BLAKE2B d4fe22ac46d8ecf0f9200437544fa8c170899a8d923db41f0353013a414bdf6c4f7f5bb20331f92d376447f3865bd290d4ab8e99711d850408c0ab1dc46e5d73 SHA512 3d7474ba7213abeee898e22a4e083ce34d28090ed3c902d447e8060ec07c8b7bea5e993f33b55611f30580a52680140e9d5c26f779b7b1b1adb65ebc7a022e8b
+TIMESTAMP 2021-08-01T20:39:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEBF7BfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEHBmRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCSiA/8DDQ9iEHDSEcyLvDFQCirY/Yfpuj/xdzvXQXhtVgnku5KgWRH0yfkPXfm
-6oTj+ODf1lalmXbBWluxWYDkugsKhKDKTbGI+Xciep4iQLE/ztXM770sq2j+lpga
-D4bk6qfNjmd1XWYyCNP0hRgaI+lTQw587duXvy+hARl5mBQXX+XlaoNXjK2hRYG9
-4QBKOXt6pp6XCFdz2uKJQCd38IkqQMWsbaFKfhvRT1gFNeLcalhsw4klpsOKnIk/
-AvoFG5rib6voH6/n8HS2BNoPc5uOKqdqj2v3oQXcE5KxYksSRIVHdntDJMc+4Kqb
-zfWpfhX8Bj6Oll0P/eMsTQ1wvpcnzZMyy14qIMXzh+wrvB2DFzomL9tR+PF351XU
-h53LC36ha8yqIXQXYl5ToDXydUzg+NSZO97gT/2zB7kkYc3UZZ1lxfLF79r+Sob7
-5qNwRQ1rrW3tizbDjjqGP7uUGBcXcmpTbBflPi4YdGx/gRmi3VWxBDfV+kObw7Zj
-gxaJhB9CcZZC+QK+FSeLloqq2N5NHtDerY8CsbbqjedSDSXYpsqO57EoCxR6tPt9
-On5j1N5iMi7/GCbD9QX2ujJtPDImpMOU6LdnvCWYq3L4oY5cO3/WLtnYThE6e851
-DQkWR47mCHBiSQkkfn5X4wJ9zzmQG7XF66TvHtljXma2hhEYY0k=
-=x5Dt
+klCLzQ/9EC8AAMCKkMdApl36SpSfzCzrWvyRBY4KYovbL+JL3drBGLdpVNYpODVt
+s7RT6tuBD7qoiTjYJf5qScOLTd70ZCbwmWCBZrGGBUu0vNHmESS5DVnZwCj+toIh
+SmULvuI2sZlYbH+BXNcbXDZZLCZwLskznglLNn+Y7t7siAjOFlwfu4huQGiB75ww
+wmLjuVdXkIiHdwxyxtYTiP0Pq4ivrK70nx8vtOfUWij+ZPqoyOyeDVuXWN/4sW7u
+K5br/oiTjSC3j22kWgRFHAForec6H5FoLyrlZkalWsQGa6F/IGJMEv0PtUrjjIKQ
+DJVZ8rQNrzX055ZYWcJXEZwV4oKDca4uGIvBb53N+HDaSDDLbXzYhMAFpRD0g1s7
+U1C4d4Y9nQZYKF5vgiREdXMeHEgzEfRLZTMoiTUagOfSn4sDkiP1fRSGphVWwzLm
+1fx6AtP78evxQPhRWnmmMUa277Y5e/BKncPsQf1oUiBNWjmxhmhcNv7kOcgsNQ9j
+jdKZBMwWPKda8/Ry04NejWISdkS0hQh1vFu9iBx+KTipYjlT7ISGgs2O3sl6sinG
+vP9KvjevPm1C6SSETRcRoLDv0Xz0e4EpZkDvO1H++dCZJ159K48K4n2vIwPXnAFP
+vMwfjuZoSS4nP1qtwvdRt3mM47h6Lf4+72BtmlS3KRpE55qCyC4=
+=cT4r
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d5348995cfe5..d67d2a6e7a4f 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index bc6063ba107f..4d445109711b 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/badvpn/Manifest b/acct-user/badvpn/Manifest
new file mode 100644
index 000000000000..9476b4c2fc24
--- /dev/null
+++ b/acct-user/badvpn/Manifest
@@ -0,0 +1,2 @@
+EBUILD badvpn-0.ebuild 238 BLAKE2B 41988119d48b3bbaafb2a6d49b4401b63a520332f41158454da370c6efada2f762369b8af545a98a64fb8cfa72f39b3c2d8ef92016c9e02b5b083a691e13b350 SHA512 9e2f9d53faf8657b7c505cd25540dfedcf7265c29062f3baef400dcad8512e6cc34a713a09c17c4c93148f1c7528d5d5d8f0a1e91a2a9fbc74c11e49521bb457
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-user/badvpn/badvpn-0.ebuild b/acct-user/badvpn/badvpn-0.ebuild
new file mode 100644
index 000000000000..5322dfafce8d
--- /dev/null
+++ b/acct-user/badvpn/badvpn-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-vpn/badvpn"
+
+ACCT_USER_ID=116
+ACCT_USER_GROUPS=( badvpn )
+
+acct-user_add_deps
diff --git a/acct-user/badvpn/metadata.xml b/acct-user/badvpn/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/badvpn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/cockroach/Manifest b/acct-user/cockroach/Manifest
new file mode 100644
index 000000000000..7b95ea2d241f
--- /dev/null
+++ b/acct-user/cockroach/Manifest
@@ -0,0 +1,2 @@
+EBUILD cockroach-0.ebuild 301 BLAKE2B 00ab9807fb374aaf6399a6c4fa5a6ec676e1d92377be5ab10801fe80043ad37db8f9e61a1ff78f67811bf67392b09a60513c575d7a05de3bdde39fd0d8293b8d SHA512 db25c3844dfc33549c411da2cb1c5a222e51a9eb613d6e96ad3ee9d3fb66c93498fef01f96301b72fe6a2c52892208d5e002be84f78424c8942cda926da3e351
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-user/cockroach/cockroach-0.ebuild b/acct-user/cockroach/cockroach-0.ebuild
new file mode 100644
index 000000000000..404244332221
--- /dev/null
+++ b/acct-user/cockroach/cockroach-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-db/cockroach"
+
+ACCT_USER_ID=110
+ACCT_USER_GROUPS=( cockroach )
+ACCT_USER_HOME=/var/lib/cockroach
+ACCT_USER_SHELL=/bin/sh
+
+acct-user_add_deps
diff --git a/acct-user/cockroach/metadata.xml b/acct-user/cockroach/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/cockroach/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/drone/Manifest b/acct-user/drone/Manifest
new file mode 100644
index 000000000000..40d80a247958
--- /dev/null
+++ b/acct-user/drone/Manifest
@@ -0,0 +1,2 @@
+EBUILD drone-0.ebuild 247 BLAKE2B e2dc6849156749759e53954150c0ac6fe0dd10584b662a152108cc05132e2c754308f9b61136b46dce8cc69993a8a40a08aa1d09a076f546d969597abcbf0d2f SHA512 342f8e543ac9afb3ce33b315e20f86fbc96f3b1bfdd586b863c62f6e9c5150aa182bdfe072d951b04e0b884f224f5d00c64f4f9d8ecc0f40626c813953b45967
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-user/drone/drone-0.ebuild b/acct-user/drone/drone-0.ebuild
new file mode 100644
index 000000000000..0d5a3103cec9
--- /dev/null
+++ b/acct-user/drone/drone-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for dev-util/drone"
+
+ACCT_USER_ID=112
+ACCT_USER_GROUPS=( drone )
+ACCT_USER_HOME=/var/lib/drone
diff --git a/acct-user/drone/metadata.xml b/acct-user/drone/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/drone/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/rundeck/Manifest b/acct-user/rundeck/Manifest
new file mode 100644
index 000000000000..30cd30e5e44e
--- /dev/null
+++ b/acct-user/rundeck/Manifest
@@ -0,0 +1,2 @@
+EBUILD rundeck-0.ebuild 302 BLAKE2B 8d39433484db94f8d13b24c9f0b51ef08dd5a90da752acf917f6487662970be113b85791c0f946386331a8b2521747b7ed46802752a8efbd35cc4ada7097cb76 SHA512 138333b90a265930d835dc8265933c58ddda4a14fdfc5dbb8ea6a6162667c47b05134e185d31c3b8a21f6b106df52a98fcbb3e47e76b8f05b5d3025ec4262af3
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-user/rundeck/metadata.xml b/acct-user/rundeck/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/rundeck/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/rundeck/rundeck-0.ebuild b/acct-user/rundeck/rundeck-0.ebuild
new file mode 100644
index 000000000000..9c34344b34ff
--- /dev/null
+++ b/acct-user/rundeck/rundeck-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit acct-user
+
+DESCRIPTION="A user for app-misc/rundeck-bin"
+
+ACCT_USER_ID=109
+ACCT_USER_HOME=/var/lib/rundeck
+ACCT_USER_SHELL=/bin/bash
+ACCT_USER_GROUPS=( rundeck )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 15c6caa80d06..4d477e917195 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 69f244943be8..10406c6c54ba 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -3,5 +3,5 @@ AUX brltty-6.0-udev.patch 1033 BLAKE2B d5220b3351af4191ab78f122265296ed802209d03
 AUX brltty.rc 241 BLAKE2B 873b1344cc6dee3aa6272d9c8857b58a751200e77d7fa0d96f9ff992f2825267503db5fc11ea07d7064a0fa4fe78af637c41ced04212d063efb92183bb936c9f SHA512 d3b91fddbfa61e212537c58444585262d2781fa97ff7f8f4e9ab3c3ad937c680b230d805f7541e2701050e2b001d7d11f7e5937476568a3459d73bb36026f847
 AUX brltty.tmpfiles.conf 31 BLAKE2B e51c4c6e98da2d68ebd2aca39d3015ca28b40dbee5528155f9efb87ef8ec5264b382c78acf748514bd1f3902dbedcd471f4e18b0361c6a924108a950c75aceb9 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7
 DIST brltty-6.1.tar.xz 3394852 BLAKE2B 03e6358721dcd5c3bdee3301a1ed827a690128ec339669543279c7e9a115bef6c5d8630e4af2d0b214b9c7c3eaa9001ab4c54ae7fb899cb3bc675985f51d6933 SHA512 030ef60ef7a9a60dc2fba2a64ea0a0868395eee6f2f86876b4e4111e804a05b44f798a154a69a8f5e0f6358130993c360a550f7decac0535450f9cf939231eaf
-EBUILD brltty-6.1.ebuild 5561 BLAKE2B 1281c04a500d036330d7a8629f60f77ce613df4fdb7113b9b40f4d458a14e5ed7f0eb68a8ab8ffda1f4a69c3c36f8b7eae77c13b435c90153d516d69e7a5f5cf SHA512 c90ea5b5687667097b04ac6496997698a58515e5826f62434eb17752a369f53322623c514f1527910697650bae724ec444152c3b6259ed3eac93dde017d87a71
+EBUILD brltty-6.1.ebuild 5601 BLAKE2B e26efd68d25484109eac679fe9ee28a86da220089f5a642ac412096476727d967f594465c31e2001e5119b5b35e0ac2a092c428844c4e79bec3a923a385a5019 SHA512 a1e938b5e8648286c03ad10164cbae3b3f07ff9faebc6c09f38f4ebc0c4ce6ac8890d6e9ee222af854a603003773de73583b1fdde96b1d54256ced864cdb71b2
 MISC metadata.xml 1661 BLAKE2B a4687ddd715019cf8273353b4a70a4981e4925f5e931859280b2f836b8f56f82708b82a1cc184a3e056febb15649987650e1312a00ac8a35efa833ae2e4d1f7d SHA512 c7904bf90031faaa478456e3f3e6c59f969e9abba2cee33ac7ad7041edaaab8ea89ca3301f4bd7a7f385507623f316fa4908ac2c6e66a94ac108bce2aad87936
diff --git a/app-accessibility/brltty/brltty-6.1.ebuild b/app-accessibility/brltty/brltty-6.1.ebuild
index cff7d7f3322c..648e42c44bc4 100644
--- a/app-accessibility/brltty/brltty-6.1.ebuild
+++ b/app-accessibility/brltty/brltty-6.1.ebuild
@@ -207,8 +207,10 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.tmpfiles.conf
+
 	elog
-	elog "please be sure ${ROOT}/etc/brltty.conf is correct for your system."
+	elog "please be sure ${EROOT}/etc/brltty.conf is correct for your system."
 	elog
 	elog "To make brltty start on boot, type this command as root:"
 	elog
diff --git a/app-accessibility/freetts/Manifest b/app-accessibility/freetts/Manifest
index 14e35d41a508..9b5c853ba77a 100644
--- a/app-accessibility/freetts/Manifest
+++ b/app-accessibility/freetts/Manifest
@@ -1,4 +1,4 @@
 AUX jsapi-gentoo.diff 10456 BLAKE2B c0de49a34fe6e5240f4a1c895b99593a169a3a14fe7c3b98cc62723d34b31935735e9632f599b90748a760a448860ae81d2a1e48de6f1074633d33e19c5158d3 SHA512 62acd90cb064db176ee7a0950857c173f2ace4de6a6319fce3273bcbb222f8fd309bc6939eaba00a00cd7217871dca60cfa33d5ee1396b86333b9dedbf8f3034
 DIST freetts-1.2.2-src.zip 14111416 BLAKE2B fd3ac79ffe3ca031d40a6523a4ae900200c1b1eea0369fd1eec3233f852af8edffd81ca6c0bba628132221346d283d2138794e1f9697074fc1044944ad852e5b SHA512 a2cce0b1fd2267cc8dbd3e2ad3ec1f99526de3988443c0937405cc7b2eab9ef517001ef0b4b387e8721d3c33610cd642c6b7cf83217996a83481830de9713de7
-EBUILD freetts-1.2.2-r1.ebuild 1914 BLAKE2B 1e0be38b586cbbe84ddb212b1046e1386097bcf57af706d41f382ce0a62b1fb7dde3e2df0d173545314da22c52e6a2affd9b085b0d12a92673e847143aa2c983 SHA512 74ab139b264f65d67f2eecd9725c2332d8a7774f4907c5ca638555de6760642d43f873b8d12b2510b0c16f0de964a17dd6a1f99bc1fe4634b55bd4b86b192c29
+EBUILD freetts-1.2.2-r2.ebuild 1893 BLAKE2B dee303a7fa26b1d02a4b73a31e6debb17d44fe4fcd262f4f9a74ec4e164871e04308cf09d28af812d3c12e9b80f5ad1130aca4a13150ea5d68cf3326d75de234 SHA512 e11223bf9c9ecd6078dfead0a22bcb74a324e81f71faabfdc899dafb278630d8ce918feca1ecef3488e0044483efa7f5d1341fbba5c79612101d6949a9bb45f0
 MISC metadata.xml 576 BLAKE2B dda15cfed056b8e34ebd707ac45b632b2ba322b85109a77fd8cdb3c9f2e485ec6495cee5773ec7a092e553dc51f2e1534b9778b1e35ec1f6719ce8ac56fb3406 SHA512 f4541826693d1e4b6c943c269d2702f27d60c70727f19ac6511696c723d9e56e5d4673ebb8a219a974bd1b1cfdeba9164b8084017c09fba28429b795308b25a8
diff --git a/app-accessibility/freetts/freetts-1.2.2-r1.ebuild b/app-accessibility/freetts/freetts-1.2.2-r1.ebuild
deleted file mode 100644
index bca36b634869..000000000000
--- a/app-accessibility/freetts/freetts-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A speech synthesis system written entirely in Java"
-HOMEPAGE="https://freetts.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="jsapi mbrola"
-
-DEPEND=">=virtual/jdk-1.8:*
-	${RDEPEND}
-	jsapi? ( app-arch/sharutils )"
-RDEPEND=">=virtual/jre-1.8:*
-	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) "
-BDEPEND="app-arch/unzip"
-
-# Tests aren't present.
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/jsapi-gentoo.diff )
-
-DOCS=( ANNOUNCE.txt README.txt RELEASE_NOTES )
-
-src_prepare() {
-	default
-	# Prepare source directory.
-	mkdir src || die "Failed to create source directory."
-	mv com de src/ || die "Failed to move files to source directory."
-
-	# Prepare library directory.
-	cd lib || die "Lib directory not present."
-	chmod 0755 jsapi.sh || die "jsapi.sh not present or can't change permissions."
-
-	use mbrola && echo "mbrola.base=/usr/share/mbrola/" >> "${S}"/speech.properties
-}
-
-src_compile() {
-	if use jsapi; then
-		pushd lib
-		./jsapi.sh || die "jsapi.sh failed"
-		popd
-	fi
-
-	eant jars
-}
-
-# Tests aren't present.
-# http://freetts.sourceforge.net/docs/index.php#how_test
-#src_test() {
-#	ANT_TASKS="ant-junit" eant junit
-#}
-
-src_install() {
-	default
-	java-pkg_dojar lib/*.jar mbrola/*.jar
-
-	use mbrola && local jflags="--java_args -Dmbrola.base=/usr/share/mbrola"
-
-	java-pkg_dolauncher ${PN} --main com.sun.speech.freetts.FreeTTS ${jflags}
-
-	insinto /usr/share/${PN}
-	doins speech.properties
-	doins -r tools
-
-	if use doc ; then
-		docinto /usr/share/doc/${PF}/html
-		dodoc -r docs/*
-		java-pkg_dojavadoc javadoc
-	fi
-
-	if use examples ; then
-		java-pkg_doexamples demo
-	fi
-
-	if use source ; then
-		java-pkg_dosrc src/*
-	fi
-}
diff --git a/app-accessibility/freetts/freetts-1.2.2-r2.ebuild b/app-accessibility/freetts/freetts-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..4322b03c1b15
--- /dev/null
+++ b/app-accessibility/freetts/freetts-1.2.2-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc examples source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A speech synthesis system written entirely in Java"
+HOMEPAGE="https://freetts.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+
+LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="jsapi mbrola"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${RDEPEND}
+	jsapi? ( app-arch/sharutils )"
+RDEPEND=">=virtual/jre-1.8:*
+	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) "
+BDEPEND="app-arch/unzip"
+
+# Tests aren't present.
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/jsapi-gentoo.diff )
+
+DOCS=( ANNOUNCE.txt README.txt RELEASE_NOTES )
+
+src_prepare() {
+	default
+	# Prepare source directory.
+	mkdir src || die "Failed to create source directory."
+	mv com de src/ || die "Failed to move files to source directory."
+
+	# Prepare library directory.
+	cd lib || die "Lib directory not present."
+	chmod 0755 jsapi.sh || die "jsapi.sh not present or can't change permissions."
+
+	use mbrola && echo "mbrola.base=/usr/share/mbrola/" >> "${S}"/speech.properties
+}
+
+src_compile() {
+	if use jsapi; then
+		pushd lib
+		./jsapi.sh || die "jsapi.sh failed"
+		popd
+	fi
+
+	eant jars
+}
+
+# Tests aren't present.
+# http://freetts.sourceforge.net/docs/index.php#how_test
+#src_test() {
+#	ANT_TASKS="ant-junit" eant junit
+#}
+
+src_install() {
+	default
+	java-pkg_dojar lib/*.jar mbrola/*.jar
+
+	use mbrola && local jflags="--java_args -Dmbrola.base=/usr/share/mbrola"
+
+	java-pkg_dolauncher ${PN} --main com.sun.speech.freetts.FreeTTS ${jflags}
+
+	insinto /usr/share/${PN}
+	doins speech.properties
+	doins -r tools
+
+	if use doc ; then
+		docinto html
+		dodoc -r docs/*
+		java-pkg_dojavadoc javadoc
+	fi
+
+	if use examples ; then
+		java-pkg_doexamples demo
+	fi
+
+	if use source ; then
+		java-pkg_dosrc src/*
+	fi
+}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 69990bbbd44f..2ed8515029e5 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 468f691df146..6ea1355d162c 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -4,5 +4,5 @@ DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac8
 DIST httpd-2.4.48.tar.bz2 7194385 BLAKE2B 5006535dc15b703b4388d90d57559bd882f16210c2f38f4d773312ed8322803629deee18709ca4446000c20c94ff8b0037acbe4dddab9cdbe45417079f708039 SHA512 6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724
 EBUILD apache-tools-2.4.46-r1.ebuild 2507 BLAKE2B fda19f030d70903240275e0885f52cd200e1d6c7a157da0a061fe77c78afff72fcbf295496f0cc002e3056c22e2519bfe0bc6868f0ddc5805e461ae609613f87 SHA512 603ccb716b54f27c804049ed71eb19c2ecc072115d9a9ee65b5ded7368e60fea4c845eec67e1ee653bad07a24e4a9af1833ce58dbf2dca83b8acdc7b1f54b7e5
 EBUILD apache-tools-2.4.47-r1.ebuild 2516 BLAKE2B a6694ce1f0971df73b64bb2a1058b479535ff1e1c364f9ed54b490a0f8ecc16f04ab598e24a0d659901e48d1d67ae3b910c6572d9ac3b223f091f5534a0122dc SHA512 09dcae7c3d6a5929dab3ebdc3730d30f748e52608b176f744ad6016cd81ca7dac25c514350069c20a259cf00a0ccdad0292592e19a38180f38a10c9e84028610
-EBUILD apache-tools-2.4.48-r1.ebuild 2509 BLAKE2B 60422b202ceae122dfc4a57e2f59a4ad713426e849a481eabb8b7da0e2b286be2da0c41e1f9fa346998b6de133464dbda5c9b553c83d0240e7a54e88742f8a33 SHA512 9836d90b893dbdb72f4de1b2a3a3c22137512f5b3cdcddebf0ba6cb8a1028122e999e2a89f060c569f7514b23021589cb3ba63110cad19c08b8e8f441a0280d7
+EBUILD apache-tools-2.4.48-r1.ebuild 2516 BLAKE2B 9ba9c90064db3b642870ffe5d0d7815932f2513a889c216584fbf2d43bdc8add8ac27cb69761fc54af6f863de290a2b2d208a7a0b3ae30a088dfce04b165d95c SHA512 70eacf18eb5179b219a371350a4b4605c9290dca59c6c95c107d7bc62de6e6165068539641f1d01601ef77220cccddd9b64a1658e1147b03de278f4517e4c93f
 MISC metadata.xml 468 BLAKE2B 850e5a23a188280992a745276f7466b0287d4e1ca9dee8c61046612273bf7484c24e60d95ccc6637c65c88d851719bed812e2c1f3e951fdca1c7058c68aaa0db SHA512 d9b6eabeaba642f760ceca4b4b39b5db7bae5369c6766ce230c5cf0949e3152affa6ec5116ffa4ead983d987387c767600b8f36ebe1b8cf1323ed5c2cb14fab2
diff --git a/app-admin/apache-tools/apache-tools-2.4.48-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.48-r1.ebuild
index c808fc3ae5cb..42da9c838d8f 100644
--- a/app-admin/apache-tools/apache-tools-2.4.48-r1.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.48-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"
 
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 0289d99d3228..ea57a78b2f8b 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,6 +3,8 @@ DIST awscli-1.19.104.tar.gz 2024567 BLAKE2B 82662ffe6a05dd329210ff84962e1ad37ece
 DIST awscli-1.19.112.tar.gz 2028010 BLAKE2B c5f973a2a0cf002038cdc46d0760f5e5fad942b1383f21819459d51fd3e3a17617e23d45d284345fac1760a812ffc81842068e8517bb500559a330ea8183968e SHA512 4ad9e960826baa057a2e72ddc2afce1012b766b5f691236435347c3e4ce210ee0b14003c16615262ec707d0c65b7f7f71a15fcf80a0fdfefb21ab6a28cfb1d55
 DIST awscli-1.20.0.tar.gz 2028152 BLAKE2B d746335fc3414e773fbf3cb60b68ea1242162c7fb6f9e8222bec1bff992ec08e7239b9279de70551d05a99b2bd2743e8e2b8f65e01655574a542660fbb4a6ad7 SHA512 0aa478e9c28afa922958881f2f7795c6925e342964fb171176c81bce1fc4a0529dc9eb2fefaa05b670376781671e1531bbfe5114d0f0a748c964c5ace2c79ee4
 DIST awscli-1.20.1.tar.gz 2028927 BLAKE2B bd535f1eba64987c8389c8003b90a1361e95db00a62f13138b35d0f4b6a5130b2e52e38663f4560bf58fe6b86e668ee142a0228001d8cde583d096ce81612264 SHA512 b704ff3f482dd2ccfdf78d01ccff214c9cb9f7b12b1af0a7c615b9567a931a8bc47a444dd8f136a958346750a60fb03a084993a7deb0c234448a9889918c97e6
+DIST awscli-1.20.10.tar.gz 2047053 BLAKE2B 1ad45d2703e82c2be1a2847c2312d7199ef55aa7df33568be890c6ce72e03e05cddafeb1cce5c76a5f363bd397f744f1c229fbd5ea518fc53d24f2711e628207 SHA512 9c56ccc0191b319aa7035bce72da9cf1f9e97c9600a202e706244a5eaff419f305c7d68dbcbc96bb622b219efcd56ad6691b149fbf3daf036ebf627987b306f5
+DIST awscli-1.20.11.tar.gz 2047295 BLAKE2B d27c2fa2c1f665fe8f691e6d7ddd19a52b0f28e3d648f96f78e5b7f8c58f06252c99e49e739f45e8e70b126d5d3fbcf7f08fb54f837c47c2d3708152496435ec SHA512 d4ae3becbc9fdd863396504c43e4c683827706a7016e73fbd5e412cb8654ec5a3c0e10ee2c4d90455dd5427cfd73fe183d723f43030e4e35916389313dad06d8
 DIST awscli-1.20.2.tar.gz 2029411 BLAKE2B dad47f749af3c1e7bbeb291eb92889c7dc9bdc9e81ddb1fd3769897f94ba549123589a2ef8a34b88d8370cc6bb5ad45cc7b9fa06ec474620303a78ec3d64100e SHA512 6384a02a7bd3a8ea38cf46725daa25e7656e12c1f3f6465043efc223a82c605dbc916a26debc214ff6d364e81013e729acac424ccccc535785e8a3b68cfce2f6
 DIST awscli-1.20.3.tar.gz 2029411 BLAKE2B 6d8573709072ea3955696de0c65a32610446737a216f6c5dd4ecae4cffcb48ecac531cfc598517c037066d066cf0de01510c0740949450ad3a5925af79bd8c16 SHA512 2324800964de8b1af4ae39dcee15e8fc2bd5e11a239c245590a86fac6574d80b290fb9d967df82d6fdd412cd8b783fd209780e5e58846a16302fa13c6f3b93fb
 DIST awscli-1.20.4.tar.gz 2043470 BLAKE2B 58722fe4277a7950665913e8b9ae99de8017cfe8c4974a3524f917533499e830d2eea2ac0994022796b979869468b5f3a767727b4384f78e325e423ed003b1b3 SHA512 3066438ac58eb2afb83ae6fef516e09965ceea1e97897e4f5b5760046f28a2f822b16b90c0a9ee6a58c6cdabbfb2f0ce044caf41396093188290e2a7c1e8c4f3
@@ -10,10 +12,13 @@ DIST awscli-1.20.5.tar.gz 2043880 BLAKE2B f4b833baf883479ed63e09de998b41e0e0e880
 DIST awscli-1.20.6.tar.gz 2044686 BLAKE2B 6513afc020855a103c5a4ee2b2aa6fc7355f2ebc445d3a89403045a8111a6beef7b934640de020a43fdd670fd4efb2f02dc907826b6a8f3335f6119267dfba10 SHA512 f53a56ae1aed266a4c6bd9236b15a070feaca804ea5276dbe0ad01e006866a17f2ab965ff086640cf62e002da0033c9091c56de1eb4b89a25cbeed329fd63e08
 DIST awscli-1.20.7.tar.gz 2045304 BLAKE2B d8f086d8d2eb36645e77fa3d9ae7c196ed3a3fddcc2a0218696f92bd69e10b453be1340b965a8d8e6697bbd3c45013d72de3ed0d31b5823515a5a0092a812858 SHA512 a41bd3ebc34a65add66ef95d5194ba07907a08f7368b0fcd6551af2070c46c4a509af47d30aeadabddce19d1a61200a58faf40a7e2f759e64915cfb2826666ab
 DIST awscli-1.20.8.tar.gz 2046203 BLAKE2B 12fb4b26f030667f43778fc713fc83becb2bb78b9f5b7b9de1faae1b74207e27487bc4731e234767b11ce152cfbfb5b41fcf66e4d4793b0a754a7634219d455a SHA512 11861a471a3d43305dbc2d18b50848849736c6e55a0ed6ae0d7bafe73389a6011100b6b0ccbec243ea2f2846e8e689412d04a68bcf8324027a03f31062807dec
+DIST awscli-1.20.9.tar.gz 2046575 BLAKE2B 68a99843ead460aa0de60368f1cd8d91c32840fb8a9d251aad0cd787a2e6fe968716436cf32c94b779f6718356b5303f417b850d6a8a31ab1519c385b5c93799 SHA512 655e6eef77a0759e77d2b2c1db922048cdd270d693d9bae08dea6576f3eb5fc4e20a050364ab3dfbaf3a54d9a8fc08c97a6329f30fcf51f38a4de456e76e2b5d
 EBUILD awscli-1.19.104.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
 EBUILD awscli-1.19.112.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.0.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.1.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.10.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.11.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.2.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.3.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.4.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
@@ -21,4 +26,5 @@ EBUILD awscli-1.20.5.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b9408
 EBUILD awscli-1.20.6.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.7.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.8.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.9.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 MISC metadata.xml 446 BLAKE2B ec9df05d20b2bb8838cd4dfd9671124c638130e9ef249041ecadae1f9ec8894f143bbfa12bde776b02e3bca073f36a836c2a7d3575f5d4a1dbe64dec8fab1367 SHA512 bf0f41deac11dcc66ce93e230d7892215501d10b4fbb0fa5b83d7003185037b6d90dfe7ec2e06ed4bed3ff3f0966280cd4316ad0293a7b4921aaabeb2c85a635
diff --git a/app-admin/awscli/awscli-1.20.10.ebuild b/app-admin/awscli/awscli-1.20.10.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.20.11.ebuild b/app-admin/awscli/awscli-1.20.11.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.11.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.20.9.ebuild b/app-admin/awscli/awscli-1.20.9.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.9.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 2a92e7249362..228361a55be0 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -38,6 +38,7 @@ DIST filebeat-7.10.2.tar.gz 87244727 BLAKE2B 77e5967d4ee6b5390ebe19c3c9de9e5cbf6
 DIST filebeat-7.12.0.tar.gz 94231781 BLAKE2B 3e90888bbf204c8e96066f894ba211feb893d89915dbad9ab023dd7a12551c3f1f839b1d266170637646b1cdfbed3652abae09e5b97babb68efa429fc7b3a682 SHA512 46049bf6e98bc7f29bd312f39afa185fcaec9d11bd7349ab58b2a21095dda25c0dafabaaefe618a47e084191ed8c1a24bc7e7ead32628c15934f8aeffe2e3c81
 DIST filebeat-7.12.1.tar.gz 94237879 BLAKE2B 7f7c1ed0ded8bc52b1830d3448d910bae5b2e775a9b1264271a8e3420fa95d0e4c1e7ee3545d198583af2b90b390f3f8bca0c871ca2ecdd077fcbe284648ba42 SHA512 3e2c49ddab59461f82abc5e3ea0f12941f2ed73a6f23c2f062ec88c85d577ce2b5efb234a110e62e9949490bec4f355f3118508572b93883adc7122d76d33cb1
 DIST filebeat-7.13.2.tar.gz 96332174 BLAKE2B d196700f7ccd54a01f3711e8c10356bf16dc499c10fc4534d0a103f2f89824bef8ef844d50a747f9418fe3d610871effc9f831657bb252010f939449c8e63490 SHA512 6ebbfa9b87c2f8cd7a7f949bf56104b6065bed4aa5b543be1997d46cc1143d02a1c7b035a1e885aaf1e5dd41379d83d42ca11e63326d24fd5456ead4f126a3a9
+DIST filebeat-7.13.4.tar.gz 96335617 BLAKE2B b417ffaf0bb47df78cd2d31be09d4fb2b5a0b41ad90bc59bd53928cecd0f6e0245426c55be9e977b71225adfb957c1ef8768be434d41e44b699efcce0d904006 SHA512 85e63941466b83690f743cec58be29bdbe133da73975b2c6390589d2245484fae53eb25732260c0db77d35ae6f37fc2f7f003d45cfd2ceb281a51d36897c7b68
 DIST filebeat-7.9.3.tar.gz 82872010 BLAKE2B e437905a13e556e1bec9b59a8837eb4649f063e4ddb9815a3e18efdc291758e39b5abc0465295f8526f042aecdfc2b8e49ebb6980aeb8b3b13be9d4431863401 SHA512 35c2c8038f0f540e467feef341f3248eadda5e5b1a80c247bcd54c073153a7839f797be327b65c4eee255f4d656e36c57d112b7ff0e637342ccc13f4f59366d7
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod 372 BLAKE2B 80a7e0aac984acb79239b3309290cd8ef1eeca8d9f53b3c91628cbe6dd112706d2313c47e33ac52ea9e8a6417289dacae8e2e72a03e679836d3ed89cb86c0aee SHA512 6db1a52bbab1332ab7e761532cb110394afa1dd69cc5f7443c3fb733c7d95fa712cf6bf8a78fc3f51d89b2d368a248e532bab06bc93e2e663b8f836c91aef0de
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip 29788 BLAKE2B c1e493471bca24ac64c8119e624ea077a74678a492b036deb907ede12b5e93c3ef699820cb2ec9468a98d00e83d84c6bb45cf274b4812a0f319a0248610a4d2c SHA512 a412fbe597ab0c47223d733303ed2277656fe35866f52e4ed1f25cc03b691f15f5592cb07b3c5fb39d4cb98c6d73dbc8e1e7869cea17241a33dfc29db0a1d121
@@ -1296,5 +1297,6 @@ EBUILD filebeat-7.10.2.ebuild 56909 BLAKE2B 595e7681a5f2ad3e93220e36a93e67b567d5
 EBUILD filebeat-7.12.0.ebuild 56889 BLAKE2B 0a544cd15867f9df0f4951df20d88a16aa695dfe84f1b6b22687712a2d9a6268ff6b1db67b631b0d75d0a628ce509b6f5b2495bc848f63095bdc99265fefff5c SHA512 7dead5a00d0ec225f58b278d44db1d874d36e90611ce2105ed7da79f89dfe0662dd985f6a60b4dad718f79ddb79ce4dc6b70b2fd81c753bb90591a22b882f748
 EBUILD filebeat-7.12.1.ebuild 56889 BLAKE2B 385ef4017cafe2dbd8b16172f2dd8cabdb6940d0706678f2caed89532030f01210663fd84fb0e8960b5502c5f6d783617e9b323367d9a2edb98972e5a2ada599 SHA512 3e159c707c8e4e69e7889fad39159bdfd57e026092cd81be6289d21d7d586e99620038f1023d9903292a0ecd7d439abe4b6d68df14c3c8506b99462fe1e548f0
 EBUILD filebeat-7.13.2.ebuild 61937 BLAKE2B 949b8cd97a05e6c8035ffa05dccd0acb7c2d61d6f28bbcf401a2fd02b138d9f4fbb5d7f9785e9a31be16aca59c40cd7df8c1ba0e2821e8dd8c67e419a9e422da SHA512 f4a892c6d0216cc42b1531c326e246aee83f34c65d96e560549c4b74006d88c74920a5332bbaa2af7c84c518070752ff53f5152281a7c7a4af029f760b62dff0
+EBUILD filebeat-7.13.4.ebuild 61937 BLAKE2B 949b8cd97a05e6c8035ffa05dccd0acb7c2d61d6f28bbcf401a2fd02b138d9f4fbb5d7f9785e9a31be16aca59c40cd7df8c1ba0e2821e8dd8c67e419a9e422da SHA512 f4a892c6d0216cc42b1531c326e246aee83f34c65d96e560549c4b74006d88c74920a5332bbaa2af7c84c518070752ff53f5152281a7c7a4af029f760b62dff0
 EBUILD filebeat-7.9.3.ebuild 55140 BLAKE2B b5cf3c10c29f84b63bc35f85eb78871b7fdb18db5048f6aa4f8421f09b50479eb4da290716110de4f2e8b6abae5b1cb1702a032505a95f93bcb0332170ace241 SHA512 694ac3ace92424e7bd1153270d88a9bd204c605d9608e430c101beffa973a1ef2c476f0c2ed0666024ab8040cd99dda15b2a7c092f4a75f888b24232225cec3b
 MISC metadata.xml 491 BLAKE2B 5653f51e27a38d7a2726ebcbd0d7b6f622e836efdcf5651e87707d9d63e75535e4550c47a53530409bdcbdca37b9885cc7bb8e731e053a9f9ab60d89e16c2cab SHA512 a6b752a75acbdfd9c1a98d7b2abd2eb6026962d6697b536c6452c750ce4014378c7fda650f5049dd1a6d34796f1997678b0c4509d89a0bde55157b22c80fcd82
diff --git a/app-admin/filebeat/filebeat-7.13.4.ebuild b/app-admin/filebeat/filebeat-7.13.4.ebuild
new file mode 100644
index 000000000000..e3d05342b132
--- /dev/null
+++ b/app-admin/filebeat/filebeat-7.13.4.ebuild
@@ -0,0 +1,1173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f"
+	"4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f/go.mod"
+	"4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b"
+	"4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b/go.mod"
+	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898"
+	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+	"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.51.0"
+	"cloud.google.com/go v0.51.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/datastore v1.0.0"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee"
+	"code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee/go.mod"
+	"code.cloudfoundry.org/go-loggregator v7.4.0+incompatible"
+	"code.cloudfoundry.org/go-loggregator v7.4.0+incompatible/go.mod"
+	"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f"
+	"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod"
+	"code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a"
+	"code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0"
+	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod"
+	"github.com/Azure/azure-event-hubs-go/v3 v3.1.2"
+	"github.com/Azure/azure-event-hubs-go/v3 v3.1.2/go.mod"
+	"github.com/Azure/azure-pipeline-go v0.1.8/go.mod"
+	"github.com/Azure/azure-pipeline-go v0.1.9/go.mod"
+	"github.com/Azure/azure-pipeline-go v0.2.1"
+	"github.com/Azure/azure-pipeline-go v0.2.1/go.mod"
+	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod"
+	"github.com/Azure/azure-storage-blob-go v0.6.0/go.mod"
+	"github.com/Azure/azure-storage-blob-go v0.8.0"
+	"github.com/Azure/azure-storage-blob-go v0.8.0/go.mod"
+	"github.com/Azure/go-amqp v0.12.6"
+	"github.com/Azure/go-amqp v0.12.6/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.6"
+	"github.com/Azure/go-autorest/autorest v0.9.6/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.2.0"
+	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/DataDog/zstd v1.4.1"
+	"github.com/DataDog/zstd v1.4.1/go.mod"
+	"github.com/Masterminds/semver v1.4.2"
+	"github.com/Masterminds/semver v1.4.2/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.7"
+	"github.com/Microsoft/hcsshim v0.8.7/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6"
+	"github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6/go.mod"
+	"github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d"
+	"github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d/go.mod"
+	"github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41"
+	"github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41/go.mod"
+	"github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc"
+	"github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc/go.mod"
+	"github.com/akavel/rsrc v0.8.0"
+	"github.com/akavel/rsrc v0.8.0/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20"
+	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod"
+	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43"
+	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43/go.mod"
+	"github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6"
+	"github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod"
+	"github.com/antlr/antlr4 v0.0.0-20200820155224-be881fa6b91d"
+	"github.com/antlr/antlr4 v0.0.0-20200820155224-be881fa6b91d/go.mod"
+	"github.com/apache/thrift v0.13.1-0.20200603211036-eac4d0c79a5f"
+	"github.com/apache/thrift v0.13.1-0.20200603211036-eac4d0c79a5f/go.mod"
+	"github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77"
+	"github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5"
+	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod"
+	"github.com/aws/aws-lambda-go v1.6.0"
+	"github.com/aws/aws-lambda-go v1.6.0/go.mod"
+	"github.com/aws/aws-sdk-go-v2 v0.9.0"
+	"github.com/aws/aws-sdk-go-v2 v0.9.0/go.mod"
+	"github.com/awslabs/goformation/v3 v3.1.0"
+	"github.com/awslabs/goformation/v3 v3.1.0/go.mod"
+	"github.com/awslabs/goformation/v4 v4.1.0"
+	"github.com/awslabs/goformation/v4 v4.1.0/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bi-zone/go-winio v0.4.15"
+	"github.com/bi-zone/go-winio v0.4.15/go.mod"
+	"github.com/blakerouse/service v1.1.1-0.20200924160513-057808572ffa"
+	"github.com/blakerouse/service v1.1.1-0.20200924160513-057808572ffa/go.mod"
+	"github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2"
+	"github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod"
+	"github.com/blang/semver v3.1.0+incompatible"
+	"github.com/blang/semver v3.1.0+incompatible/go.mod"
+	"github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible"
+	"github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible/go.mod"
+	"github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e"
+	"github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e/go.mod"
+	"github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e"
+	"github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f"
+	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f/go.mod"
+	"github.com/cloudfoundry/noaa v2.1.0+incompatible"
+	"github.com/cloudfoundry/noaa v2.1.0+incompatible/go.mod"
+	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4"
+	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f"
+	"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/containerd/cgroups v0.0.0-20190919134610-bf292b21730f"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1"
+	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+	"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
+	"github.com/containerd/containerd v1.3.3"
+	"github.com/containerd/containerd v1.3.3/go.mod"
+	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41"
+	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod"
+	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+	"github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c"
+	"github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3"
+	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de"
+	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd"
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.0.0"
+	"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea"
+	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/creack/pty v1.1.9"
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/cucumber/godog v0.8.1"
+	"github.com/cucumber/godog v0.8.1/go.mod"
+	"github.com/cyphar/filepath-securejoin v0.2.2"
+	"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892"
+	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/go.mod"
+	"github.com/devigned/tab v0.1.1/go.mod"
+	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2"
+	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2/go.mod"
+	"github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b"
+	"github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b/go.mod"
+	"github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de"
+	"github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible/go.mod"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
+	"github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1"
+	"github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf"
+	"github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf/go.mod"
+	"github.com/docker/distribution v2.7.1+incompatible"
+	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+	"github.com/docker/engine v0.0.0-20191113042239-ea84732a7725"
+	"github.com/docker/engine v0.0.0-20191113042239-ea84732a7725/go.mod"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-connections v0.4.0/go.mod"
+	"github.com/docker/go-metrics v0.0.1"
+	"github.com/docker/go-metrics v0.0.1/go.mod"
+	"github.com/docker/go-units v0.3.3/go.mod"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815"
+	"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
+	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6"
+	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dustin/go-humanize v1.0.0"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/eapache/go-resiliency v1.2.0"
+	"github.com/eapache/go-resiliency v1.2.0/go.mod"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+	"github.com/eapache/queue v1.1.0"
+	"github.com/eapache/queue v1.1.0/go.mod"
+	"github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2"
+	"github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod"
+	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3"
+	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod"
+	"github.com/elastic/ecs v1.8.0"
+	"github.com/elastic/ecs v1.8.0/go.mod"
+	"github.com/elastic/elastic-agent-client/v7 v7.0.0-20210308165121-7dd05ee2b5a5"
+	"github.com/elastic/elastic-agent-client/v7 v7.0.0-20210308165121-7dd05ee2b5a5/go.mod"
+	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270"
+	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270/go.mod"
+	"github.com/elastic/go-concert v0.1.0"
+	"github.com/elastic/go-concert v0.1.0/go.mod"
+	"github.com/elastic/go-libaudit/v2 v2.2.0"
+	"github.com/elastic/go-libaudit/v2 v2.2.0/go.mod"
+	"github.com/elastic/go-licenser v0.3.1"
+	"github.com/elastic/go-licenser v0.3.1/go.mod"
+	"github.com/elastic/go-lookslike v0.3.0"
+	"github.com/elastic/go-lookslike v0.3.0/go.mod"
+	"github.com/elastic/go-lumber v0.1.0"
+	"github.com/elastic/go-lumber v0.1.0/go.mod"
+	"github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595"
+	"github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595/go.mod"
+	"github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f"
+	"github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f/go.mod"
+	"github.com/elastic/go-seccomp-bpf v1.1.0"
+	"github.com/elastic/go-seccomp-bpf v1.1.0/go.mod"
+	"github.com/elastic/go-structform v0.0.8"
+	"github.com/elastic/go-structform v0.0.8/go.mod"
+	"github.com/elastic/go-sysinfo v1.1.1/go.mod"
+	"github.com/elastic/go-sysinfo v1.6.0"
+	"github.com/elastic/go-sysinfo v1.6.0/go.mod"
+	"github.com/elastic/go-txfile v0.0.7"
+	"github.com/elastic/go-txfile v0.0.7/go.mod"
+	"github.com/elastic/go-ucfg v0.7.0/go.mod"
+	"github.com/elastic/go-ucfg v0.8.3"
+	"github.com/elastic/go-ucfg v0.8.3/go.mod"
+	"github.com/elastic/go-windows v1.0.0/go.mod"
+	"github.com/elastic/go-windows v1.0.1"
+	"github.com/elastic/go-windows v1.0.1/go.mod"
+	"github.com/elastic/gosigar v0.14.1"
+	"github.com/elastic/gosigar v0.14.1/go.mod"
+	"github.com/elastic/sarama v1.19.1-0.20210120173147-5c8cb347d877"
+	"github.com/elastic/sarama v1.19.1-0.20210120173147-5c8cb347d877/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v4.9.0+incompatible"
+	"github.com/evanphx/json-patch v4.9.0+incompatible/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/fortytw2/leaktest v1.3.0"
+	"github.com/fortytw2/leaktest v1.3.0/go.mod"
+	"github.com/frankban/quicktest v1.10.2"
+	"github.com/frankban/quicktest v1.10.2/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-logr/logr v0.2.0"
+	"github.com/go-logr/logr v0.2.0/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/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647"
+	"github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible"
+	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.1"
+	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+	"github.com/go-stack/stack v1.8.0"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.7"
+	"github.com/go-test/deep v1.0.7/go.mod"
+	"github.com/gobuffalo/here v0.6.0"
+	"github.com/gobuffalo/here v0.6.0/go.mod"
+	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be"
+	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.3"
+	"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+	"github.com/godror/godror v0.10.4"
+	"github.com/godror/godror v0.10.4/go.mod"
+	"github.com/gofrs/flock v0.7.1/go.mod"
+	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b"
+	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b/go.mod"
+	"github.com/gofrs/uuid v3.3.0+incompatible"
+	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/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"
+	"github.com/golang/mock v1.3.1/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.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/golang/snappy v0.0.1"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/gomodule/redigo v1.8.3"
+	"github.com/gomodule/redigo v1.8.3/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9"
+	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.2"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.1.0"
+	"github.com/google/gofuzz v1.1.0/go.mod"
+	"github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0"
+	"github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/renameio v0.1.0"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/googleapis/gnostic v0.4.1"
+	"github.com/googleapis/gnostic v0.4.1/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75"
+	"github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod"
+	"github.com/gorilla/mux v1.7.2"
+	"github.com/gorilla/mux v1.7.2/go.mod"
+	"github.com/gorilla/websocket v1.4.1"
+	"github.com/gorilla/websocket v1.4.1/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.13.0"
+	"github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod"
+	"github.com/h2non/filetype v1.1.1-0.20201130172452-f60988ab73d5"
+	"github.com/h2non/filetype v1.1.1-0.20201130172452-f60988ab73d5/go.mod"
+	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.9.2"
+	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.0"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.6.6"
+	"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.2"
+	"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.2"
+	"github.com/hashicorp/go-uuid v1.0.2/go.mod"
+	"github.com/hashicorp/go-version v1.0.0"
+	"github.com/hashicorp/go-version v1.0.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/nomad/api v0.0.0-20200303134319-e31695b5bbe6"
+	"github.com/hashicorp/nomad/api v0.0.0-20200303134319-e31695b5bbe6/go.mod"
+	"github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95"
+	"github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.6"
+	"github.com/imdario/mergo v0.3.6/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jarcoal/httpmock v1.0.4"
+	"github.com/jarcoal/httpmock v1.0.4/go.mod"
+	"github.com/jcmturner/gofork v1.0.0"
+	"github.com/jcmturner/gofork v1.0.0/go.mod"
+	"github.com/jessevdk/go-flags v1.4.0"
+	"github.com/jessevdk/go-flags v1.4.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5"
+	"github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod"
+	"github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901"
+	"github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod"
+	"github.com/joho/godotenv v1.3.0"
+	"github.com/joho/godotenv v1.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/jonboulle/clockwork v0.2.2"
+	"github.com/jonboulle/clockwork v0.2.2/go.mod"
+	"github.com/josephspurrier/goversioninfo v0.0.0-20190209210621-63e6d1acd3dd"
+	"github.com/josephspurrier/goversioninfo v0.0.0-20190209210621-63e6d1acd3dd/go.mod"
+	"github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod"
+	"github.com/jpillora/backoff v1.0.0"
+	"github.com/jpillora/backoff v1.0.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.10"
+	"github.com/json-iterator/go v1.1.10/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/karrick/godirwalk v1.15.6"
+	"github.com/karrick/godirwalk v1.15.6/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.11.0"
+	"github.com/klauspost/compress v1.11.0/go.mod"
+	"github.com/kolide/osquery-go v0.0.0-20200604192029-b019be7063ac"
+	"github.com/kolide/osquery-go v0.0.0-20200604192029-b019be7063ac/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pretty v0.2.1"
+	"github.com/kr/pretty v0.2.1/go.mod"
+	"github.com/kr/pty v1.1.1"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01"
+	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01/go.mod"
+	"github.com/magefile/mage v1.9.0/go.mod"
+	"github.com/magefile/mage v1.11.0"
+	"github.com/magefile/mage v1.11.0/go.mod"
+	"github.com/magiconair/properties v1.8.0"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/mailru/easyjson v0.7.1"
+	"github.com/mailru/easyjson v0.7.1/go.mod"
+	"github.com/markbates/pkger v0.17.0"
+	"github.com/markbates/pkger v0.17.0/go.mod"
+	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
+	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-colorable v0.1.6"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
+	"github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe"
+	"github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe/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-sqlite3 v1.9.0"
+	"github.com/mattn/go-sqlite3 v1.9.0/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
+	"github.com/miekg/dns v1.1.15"
+	"github.com/miekg/dns v1.1.15/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v1.0.1"
+	"github.com/mitchellh/gox v1.0.1/go.mod"
+	"github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51"
+	"github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51/go.mod"
+	"github.com/mitchellh/iochan v1.0.0"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.3.3"
+	"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/morikuni/aec v1.0.0"
+	"github.com/morikuni/aec v1.0.0/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/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/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/oklog/ulid v1.3.1"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.5.0/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.11.0"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.2.0/go.mod"
+	"github.com/onsi/gomega v1.4.3/go.mod"
+	"github.com/onsi/gomega v1.7.0"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483"
+	"github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6"
+	"github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod"
+	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+	"github.com/opencontainers/runc v1.0.0-rc9"
+	"github.com/opencontainers/runc v1.0.0-rc9/go.mod"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+	"github.com/opencontainers/runtime-spec v1.0.1"
+	"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39"
+	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+	"github.com/otiai10/copy v1.2.0"
+	"github.com/otiai10/copy v1.2.0/go.mod"
+	"github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod"
+	"github.com/otiai10/curr v1.0.0"
+	"github.com/otiai10/curr v1.0.0/go.mod"
+	"github.com/otiai10/mint v1.3.0/go.mod"
+	"github.com/otiai10/mint v1.3.1"
+	"github.com/otiai10/mint v1.3.1/go.mod"
+	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
+	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
+	"github.com/pelletier/go-toml v1.2.0"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pierrec/lz4 v2.5.2+incompatible"
+	"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+	"github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0"
+	"github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20170505043639-c605e284fe17/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/poy/eachers v0.0.0-20181020210610-23942921fe77"
+	"github.com/poy/eachers v0.0.0-20181020210610-23942921fe77/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.1.0/go.mod"
+	"github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc"
+	"github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.6.0/go.mod"
+	"github.com/prometheus/common v0.7.0"
+	"github.com/prometheus/common v0.7.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.3/go.mod"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/prometheus/procfs v0.0.11"
+	"github.com/prometheus/procfs v0.0.11/go.mod"
+	"github.com/prometheus/prometheus v2.5.0+incompatible"
+	"github.com/prometheus/prometheus v2.5.0+incompatible/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0"
+	"github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e"
+	"github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e/go.mod"
+	"github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54"
+	"github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54/go.mod"
+	"github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b"
+	"github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod"
+	"github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod"
+	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522"
+	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522/go.mod"
+	"github.com/santhosh-tekuri/jsonschema v1.2.4"
+	"github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod"
+	"github.com/satori/go.uuid v1.2.0"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/sergi/go-diff v1.1.0"
+	"github.com/sergi/go-diff v1.1.0/go.mod"
+	"github.com/shirou/gopsutil v3.20.12+incompatible"
+	"github.com/shirou/gopsutil v3.20.12+incompatible/go.mod"
+	"github.com/shopspring/decimal v1.2.0"
+	"github.com/shopspring/decimal v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0"
+	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.2"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+	"github.com/spf13/cobra v0.0.5"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.3.2"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v1.1.5-0.20170601210322-f6abca593680/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b"
+	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b/go.mod"
+	"github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786"
+	"github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786/go.mod"
+	"github.com/ugorji/go v1.1.8"
+	"github.com/ugorji/go v1.1.8/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/ugorji/go/codec v1.1.8"
+	"github.com/ugorji/go/codec v1.1.8/go.mod"
+	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5"
+	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797"
+	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797/go.mod"
+	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e"
+	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e/go.mod"
+	"github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230"
+	"github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230/go.mod"
+	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4"
+	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4/go.mod"
+	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec"
+	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec/go.mod"
+	"github.com/vbatts/tar-split v0.11.1"
+	"github.com/vbatts/tar-split v0.11.1/go.mod"
+	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41"
+	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41/go.mod"
+	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
+	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
+	"github.com/xdg/stringprep v1.0.0"
+	"github.com/xdg/stringprep v1.0.0/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7"
+	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7/go.mod"
+	"go.elastic.co/apm v1.7.2/go.mod"
+	"go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b"
+	"go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b/go.mod"
+	"go.elastic.co/apm/module/apmelasticsearch v1.7.2"
+	"go.elastic.co/apm/module/apmelasticsearch v1.7.2/go.mod"
+	"go.elastic.co/apm/module/apmhttp v1.7.2"
+	"go.elastic.co/apm/module/apmhttp v1.7.2/go.mod"
+	"go.elastic.co/ecszap v0.3.0"
+	"go.elastic.co/ecszap v0.3.0/go.mod"
+	"go.elastic.co/fastjson v1.0.0/go.mod"
+	"go.elastic.co/fastjson v1.1.0"
+	"go.elastic.co/fastjson v1.1.0/go.mod"
+	"go.elastic.co/go-licence-detector v0.4.0"
+	"go.elastic.co/go-licence-detector v0.4.0/go.mod"
+	"go.etcd.io/bbolt v1.3.4"
+	"go.etcd.io/bbolt v1.3.4/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.opencensus.io v0.22.2/go.mod"
+	"go.uber.org/atomic v1.5.0"
+	"go.uber.org/atomic v1.5.0/go.mod"
+	"go.uber.org/goleak v1.0.0"
+	"go.uber.org/goleak v1.0.0/go.mod"
+	"go.uber.org/multierr v1.3.0"
+	"go.uber.org/multierr v1.3.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.14.0"
+	"go.uber.org/zap v1.14.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/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-20191206172530-e9b2fee46413/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a"
+	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/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-20191227195350-da58074b4299"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b"
+	"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"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028"
+	"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.3.0"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod"
+	"golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod"
+	"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/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"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/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"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod"
+	"golang.org/x/sys v0.0.0-20180815093151-14742f9018cd/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/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-20190405154228-4b34438f7a67/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
+	"golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/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-20190626221950-04f50cda93cb/go.mod"
+	"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod"
+	"golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20210308170721-88b6017d0656"
+	"golang.org/x/sys v0.0.0-20210308170721-88b6017d0656/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.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.5"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0"
+	"golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0/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.15.0"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.2.0/go.mod"
+	"google.golang.org/appengine v1.4.0/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"
+	"google.golang.org/appengine v1.6.5/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-20190927181202-20e1ac93f88c/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb"
+	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/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.24.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.29.1"
+	"google.golang.org/grpc v1.29.1/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/airbrake/gobrake.v2 v2.0.9"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b"
+	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/jcmturner/aescts.v1 v1.0.1"
+	"gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
+	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
+	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
+	"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
+	"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
+	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0"
+	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod"
+	"gopkg.in/jcmturner/rpc.v1 v1.1.0"
+	"gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
+	"gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528"
+	"gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+	"gotest.tools v2.2.0+incompatible"
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"gotest.tools/gotestsum v0.6.0"
+	"gotest.tools/gotestsum v0.6.0/go.mod"
+	"gotest.tools/v3 v3.0.3"
+	"gotest.tools/v3 v3.0.3/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"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"howett.net/plist v0.0.0-20181124034731-591f970eefbb"
+	"howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod"
+	"k8s.io/api v0.19.4"
+	"k8s.io/api v0.19.4/go.mod"
+	"k8s.io/apimachinery v0.19.4"
+	"k8s.io/apimachinery v0.19.4/go.mod"
+	"k8s.io/client-go v0.19.4"
+	"k8s.io/client-go v0.19.4/go.mod"
+	"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac"
+	"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
+	"k8s.io/klog/v2 v2.0.0/go.mod"
+	"k8s.io/klog/v2 v2.2.0"
+	"k8s.io/klog/v2 v2.2.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6"
+	"k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod"
+	"k8s.io/kubernetes v1.13.0"
+	"k8s.io/kubernetes v1.13.0/go.mod"
+	"k8s.io/utils v0.0.0-20200729134348-d5654de09c73"
+	"k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod"
+	"rsc.io/binaryregexp v0.2.0"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.0.1"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.2.0"
+	"sigs.k8s.io/yaml v1.2.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+S="${WORKDIR}/beats-${PV}"
+
+src_prepare() {
+	default
+
+	# avoid Elastic license
+	rm -r x-pack || die
+
+	# use ${PV} instead of git commit id
+	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
+}
+
+src_compile() {
+	emake -C "${S}/filebeat"
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 3103826d2777..0f83dbdda616 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,8 +1,6 @@
 AUX logrotate-3.15.0-ignore-hidden.patch 566 BLAKE2B 1739e0d175311eb2a3692826830bb101dc65b3966eb6dcd96fcbdb6bb1376eac5c0d0c78a26ff2ee6cfad57396d05dd3cae9ff4621a94b80d9a8b5877a52195d SHA512 ed572f12617812b44f7b79e9f3c7fb7aada1fed8f80244ee9e5e7c7f536e493c69790c7c62e0dc1951f979bc5a2cff581f439a8e1fb1a47722e6c0f1dcb4e65d
 AUX logrotate.conf 740 BLAKE2B ade43681e1929aa8b7e167a2be0c8569f3842680687381c202ac04b5cf97cd85481f6ca7fbf6f0dffa64caa3b1d9cb0f1e2154af8882a3ce7008337f2a5ede6f SHA512 6411acd842fac1a8af72142cddfa76b567f6ba859bed91dab56f1d26b48f3dcaa3ffee6c8094860fe9c43f9b6bc398199c8f4047856b91d6d12333d0fc7aef96
 AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe8d0bd1703e5075671dd1e13a030ec06fa269214bff9552670d3e0932e3dbde2e3673d59b7a50a2458b SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36
-DIST logrotate-3.18.0.tar.gz 224873 BLAKE2B f73ffa2d58a5125393e6c96e158e39e0b4cadef01e6eebd172220227a7e1363e6731bc2ac511fa028078054b55d42b131cdc30232ac5762ce4c6cbff79c19681 SHA512 d1bca267fbec4acbb83ffba4d3ac4c864f4269d8513e5614e7dbe6f3b1f176685218bffdb5d62f559ee73f84cf9a8a257c9f63e30af058d12d0034240f247586
 DIST logrotate-3.18.1.tar.gz 225226 BLAKE2B 6f40dfe89f9c6202263f16204a9cff07b921abc9a298b58649bb4968c9f498626741be334c47d4092da564ed75642b687ff6ef8781f69f5e25364f8635646d9d SHA512 c40f920686aee014c652f087c64f2a85e9e866a8717d1bd3f32a9dd7959a02962e6174de28ae685428b442e12079d0c8d91485611ca34a873ffae872a54ec9fe
-EBUILD logrotate-3.18.0.ebuild 2485 BLAKE2B def8bc9ca3114392f84c537ad44d06b44503fddce3600464e3e5645251f9f25753458eaa86ed59ad9470be7c3df25df089cd2749933cf8bebf8da6533803cc72 SHA512 7f74ae31c32d858036c998ab0f7eefe0c56dc34d19fb35fd0133a0e618e073b940c4e007b710f76a626890f084492de1de4cfbd988e61ce935a63162a8475766
-EBUILD logrotate-3.18.1.ebuild 2429 BLAKE2B 1df02a4f96019ab09931bde59958fade5fef87f9e53918e21046ff254ce0b9df0f7a01558b4320e3dd411a8d5752b92b6082864fd056a2daf61adf2db2d4907e SHA512 703002a8a23b4c0d2551992edfe8ef22d9fbe71fdd61cb5dbe3cb292ff866087a71781ff5393cf5be7579bdac0ea8a8382297af311eb6616767b08af1f8ebf84
+EBUILD logrotate-3.18.1-r1.ebuild 2252 BLAKE2B 116708c1f1247a84699afbfe7241b0d62fa12b140e72ef74eed0e5837d48aa847045f6245cf9541becf1ab0833f965c830a0a027f96d699067039448c6e77b89 SHA512 0617442fc69bdd598d31f99d216799dc265de36d72f7ca07a1a1471c7eab17ecb82eab49a160773f7ef9bc3a7d3aac07b14c679f9fd2fed44851beac7c35e65f
 MISC metadata.xml 1206 BLAKE2B c52b227a223e5d7db50f2009b3766d6af0f2c0ca51bdf3f6098d56d16c6586c08826b795f50a6f3f2e50f29ed4f9def8c53268a533eac985e3ab22042c418f7a SHA512 9d184f5b4c025416b7a2f6019f982a12e65e39da3532d7d024759e1e73d2b55d0e949e38c4cd0926e552059b600c114daa5beb135433d71e8f85d0f732d0b791
diff --git a/app-admin/logrotate/logrotate-3.18.0.ebuild b/app-admin/logrotate/logrotate-3.18.0.ebuild
deleted file mode 100644
index 9e712b69c695..000000000000
--- a/app-admin/logrotate/logrotate-3.18.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="acl +cron selinux"
-
-COMMON_DEPEND="
-	>=dev-libs/popt-1.5
-	selinux? ( sys-libs/libselinux )
-	acl? ( virtual/acl )"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-apps/sed-4"
-
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-logrotate )
-	cron? ( virtual/cron )"
-
-STATEFILE="/var/lib/misc/logrotate.status"
-OLDSTATEFILE="/var/lib/logrotate.status"
-
-move_old_state_file() {
-	elog "logrotate state file is now located at ${STATEFILE}"
-	elog "See bug #357275"
-	if [[ -e "${OLDSTATEFILE}" ]] ; then
-		elog "Moving your current state file to new location: ${STATEFILE}"
-		mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
-	fi
-}
-
-install_cron_file() {
-	exeinto /etc/cron.daily
-	newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch"
-)
-
-src_prepare() {
-	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
-	default
-}
-
-src_configure() {
-	econf \
-	$(use_with acl) \
-	$(use_with selinux) \
-	--with-state-file-path="${STATEFILE}"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	insinto /usr
-	dobin logrotate
-	doman logrotate.8
-	dodoc ChangeLog.md
-
-	insinto /etc
-	doins "${FILESDIR}"/logrotate.conf
-
-	use cron && install_cron_file
-
-	systemd_dounit examples/logrotate.{service,timer}
-	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
-
-	keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
-	elog
-	elog "The ${PN} binary is now installed under /usr/bin. Please"
-	elog "update your links"
-	elog
-	move_old_state_file
-	elog "If you are running systemd you might need to run:"
-	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
-	elog "in order to create the new location of the logrotate state file"
-	elog
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you wish to have logrotate e-mail you updates, please"
-		elog "emerge virtual/mailx and configure logrotate in"
-		elog "/etc/logrotate.conf appropriately"
-		elog
-		elog "Additionally, /etc/logrotate.conf may need to be modified"
-		elog "for your particular needs. See man logrotate for details."
-	fi
-}
diff --git a/app-admin/logrotate/logrotate-3.18.1-r1.ebuild b/app-admin/logrotate/logrotate-3.18.1-r1.ebuild
new file mode 100644
index 000000000000..e5eeab2ecc63
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.18.1-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="acl +cron selinux"
+
+DEPEND="
+	>=dev-libs/popt-1.5
+	selinux? ( sys-libs/libselinux )
+	acl? ( virtual/acl )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+STATEFILE="${EPREFIX}/var/lib/misc/logrotate.status"
+OLDSTATEFILE="${EPREFIX}/var/lib/logrotate.status"
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch"
+)
+
+src_prepare() {
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' examples/logrotate.{cron,service} || die
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_with acl) \
+		$(use_with selinux) \
+		--with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+
+	move_old_state_file
+
+	tmpfiles_process ${PN}.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs. See man logrotate for details."
+	fi
+}
diff --git a/app-admin/logrotate/logrotate-3.18.1.ebuild b/app-admin/logrotate/logrotate-3.18.1.ebuild
deleted file mode 100644
index 254aa29f7356..000000000000
--- a/app-admin/logrotate/logrotate-3.18.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="acl +cron selinux"
-
-DEPEND="
-	>=dev-libs/popt-1.5
-	selinux? ( sys-libs/libselinux )
-	acl? ( virtual/acl )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-logrotate )
-	cron? ( virtual/cron )"
-
-STATEFILE="${EPREFIX}/var/lib/misc/logrotate.status"
-OLDSTATEFILE="${EPREFIX}/var/lib/logrotate.status"
-
-move_old_state_file() {
-	elog "logrotate state file is now located at ${STATEFILE}"
-	elog "See bug #357275"
-	if [[ -e "${OLDSTATEFILE}" ]] ; then
-		elog "Moving your current state file to new location: ${STATEFILE}"
-		mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
-	fi
-}
-
-install_cron_file() {
-	exeinto /etc/cron.daily
-	newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch"
-)
-
-src_prepare() {
-	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' examples/logrotate.{cron,service} || die
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_with acl) \
-		$(use_with selinux) \
-		--with-state-file-path="${STATEFILE}"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin logrotate
-	doman logrotate.8
-	dodoc ChangeLog.md
-
-	insinto /etc
-	doins "${FILESDIR}"/logrotate.conf
-
-	use cron && install_cron_file
-
-	systemd_dounit examples/logrotate.{service,timer}
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
-
-	keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
-	elog
-	elog "The ${PN} binary is now installed under /usr/bin. Please"
-	elog "update your links"
-	elog
-
-	move_old_state_file
-
-	elog "If you are running systemd you might need to run:"
-	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
-	elog "in order to create the new location of the logrotate state file"
-	elog
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you wish to have logrotate e-mail you updates, please"
-		elog "emerge virtual/mailx and configure logrotate in"
-		elog "/etc/logrotate.conf appropriately"
-		elog
-		elog "Additionally, /etc/logrotate.conf may need to be modified"
-		elog "for your particular needs. See man logrotate for details."
-	fi
-}
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 378bd57bc009..1771b0e4390d 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -5,17 +5,23 @@ AUX logstash.initd-r2 1997 BLAKE2B 4a2e36bcd171950ddea636f9269708416536b4f54c620
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
 DIST logstash-6.8.15.tar.gz 176912362 BLAKE2B 68178b2cbf0ad3ecafc83fddf4c50ef767862fbb90ba7a0dd0527de4f8d3bddc485a99a7e774c6d0efd5b3eb4bf701be042cfc58dcb546c7436db39ff4594841 SHA512 bb42b1284f6ca8d4b10cac96b57cae0f28a33047164f9f9a352ed906a960e11fea3d9c58b23cdd607e0d76eee7aa07fbb6ce8870323e3cc6cba472578d99fb01
 DIST logstash-6.8.16.tar.gz 176912473 BLAKE2B ec7d5fb92a2ef55499b395a855bc5cfd3c953180d5bd443bd70ff792f12c51a6635d1cc60cf115cab6b934c6201f889f8fbb3b3e35a4841b177d42d0d6864c3f SHA512 c272fb8b0e03c37a057f7789989645077279492abca58a690fbc50e8e5e428a8f3c765e7d68d37ddaf927650b563d1ab0f637eb8a5213f4f0475bbfed1264caf
+DIST logstash-6.8.17.tar.gz 179116623 BLAKE2B fa25a3149fded215586d97b3bd2a2b2b168292d45e32f1b69987c9e6e9e6f35100643df09d03f51da042b27acfd57bfcfdb1f4f18fddf7b9d21e01ef84668cc7 SHA512 00cf51cbce906d2594b0a17548d362fe678f458a2e7f9c167d4387953a848a588dbba070d370002a5e4d7ca2df2e3910805a27e3c0263ab29d99042229af0c3a
 DIST logstash-7.12.0-linux-x86_64.tar.gz 368429061 BLAKE2B 7bf60eeeec072e99aec807c8cb64cfd5cd46270d297c717fee539531286f487ef254738a439947e40bfc039778d20fa746566aa4d0c031a8f1a22deaaab9ce74 SHA512 ba32cb97e81cc3f4369c752b860aea7a85d212921954e5829f0b63526584d01c79731dd094905d91ed35f9887ae70bfffd5324b25dc3f23e60745462493e8195
 DIST logstash-7.12.1-linux-x86_64.tar.gz 368465800 BLAKE2B eea395286408de50cf61b2a69f6a673f81c4021370eab9b04fb1a9ad993a5b625145d6710e5045f9572a6a923455fe8613c2262bd488f6e76d467850b1bfa5c5 SHA512 9ef32dbeb4269d904a775a1cf5833b09cc5b8b71c03f953641fd5de5c27ba51ec878d9e74cdd98255d37fcd39d592deea72832bdce26cbb2827db4ae3b294834
 DIST logstash-7.13.2-linux-x86_64.tar.gz 360899712 BLAKE2B 327c5a2820cc42ec0d63bd5d8e1983f37e217e7fe28eebe326a7437b938a3602b387e0138c0055b3b23f8d657013e79a8d7b9b0ad698075667a0c944c07e7dd8 SHA512 706a107fefc587262c27d754ddddce482affc6b12e240895d56ec61e97887f1edf7b0a0888e089827c622917d772f3b9231b6aadf352f5e78c7eee98cfdbfb2b
+DIST logstash-7.13.4-linux-x86_64.tar.gz 361126551 BLAKE2B e972b2c6b992573f0320de0487141c17fa6cd1889d7d266f79958fbc261a4e8564b9f9fc88b654de7e476c6c2747f47e169d0fd3601888035193a2cb844fd710 SHA512 2dba64af5f6b0724a75a8f4f3dc9fb067e27785fd5d0b9ef0571c77df6ebaa89418a165b7489ad47676847c4a9f928cbfc8d3ddc885db21053d0bda9dd524f49
 DIST logstash-oss-6.8.15.tar.gz 176782145 BLAKE2B 20cdd28d9c6e43edb3cc6d60b961155880aaf2e22d100b6641246a56194ba87aef3c41e039be2ab6bca75e646b83a3f42c935472776aa87a4baa774cca74458d SHA512 c74f189af58ca936b3d3e19970f29a78b8f041f5771163c5ed28466e84cf456f4814a9f4c5a9def2706c39daaebaca948c14e683a6aa82b2e1c1e7ee57592dc2
 DIST logstash-oss-6.8.16.tar.gz 176782454 BLAKE2B afdea56bbaa2623548948722f5dcd85172e0d3580c302fde91e1f6d0af66e82538465da9aeb428bbb9e66c7a8bdd29ce69279098d5c3ee9a7c2ac1efdbedb628 SHA512 d994472606cbb474471441a238c6bfacf9c1cdf1adf20129a8bc256daab9ea49adaa8c425c9a41520846465393a2c112ec6c83478579620ebbf446e528accf20
+DIST logstash-oss-6.8.17.tar.gz 178986613 BLAKE2B 5e318903fb134f6096fb983d3651d5d81c2bc9d62421aa7468ee7cb82a5e7895a517911a759d82f1f2c939c3ce67df4e26c1296c0871cb1cfb8078627e68e5f3 SHA512 0f43f9f0dc4a253c6d5a6f07234a22bc67b8866dd6f25837372c1d3c9cca2ddb1b94b632c4528324eeb23019d5d1ae7374661dec8011e55210555e01bec77c2c
 DIST logstash-oss-7.12.0-linux-x86_64.tar.gz 368251521 BLAKE2B 0959b29335dba2728d2e7a76ee482fb713f9d504a52bea1dcde99f042cfd52d9e18067cb3fffe6ca28b2eddddfd4ded1a19de616f4ddd3b6889e373a908706a0 SHA512 5d7bd5ec3ea5907771bb7590277e54be3407cebe6bc89dd7f5d73b02e9e8907855d19500787b21c8ffcff9cdbbb68a4bbb286131d03ce5585ec89e5c2a76dc60
 DIST logstash-oss-7.12.1-linux-x86_64.tar.gz 368287628 BLAKE2B 72e758e6962cc5a24c2a5f6ea4c268be1bc0b5a0ae1d73cb056d0d321b20495df346233e58661f11a37fc5e6c0750f28501af24511a7a29c2e698ce933c7380f SHA512 cefdfdaf2f1d0190d35bc5da2244a5bc09659e9f225cfd05acbdacd0f5f89cc13b928704491d18ac0d54c3500f8c15dc7ca64341bf0d7ed56a49c10eb82a55d4
 DIST logstash-oss-7.13.2-linux-x86_64.tar.gz 360703237 BLAKE2B 130b68f77fb5b52db71d478801afe498ab157f2b38c56e67455b28bc7358faaae9663c79b515031544136e6dc126d8d96b6fab8f7802bf84d5125850540feaae SHA512 0d4cc38740b9a9b44a528a148ea8f2032a27af275bf4508700ec62ae3d74987c4fbbda72b4b6fb4a4059e9be3a7949813ad401187d43335e99b9a280350fba93
+DIST logstash-oss-7.13.4-linux-x86_64.tar.gz 360925283 BLAKE2B 68482538d4b2589044215495ab7d41b4820650908d979438b197c5ee4ff82dfc53580fba7c834c62964e9b12ff23e6d9ecfc6e333a2cb6f077d6d4c953527173 SHA512 d57c30c763ba3323380c7276a49895ce3adbe90700061bdf1ce8c6abe98c4ac0c5789ac2a725f15d8d4f89c80dec691479027887b8976dcd618aa91f7af13d8e
 EBUILD logstash-bin-6.8.15.ebuild 2099 BLAKE2B 04b2c3baf24b2a64ced6d06ecb21518355c75e1bc25e386ec6532d0aadcfe893cff6b2e77cffebcec7bc0f47bce52c158a2c78c0acb37bb6cf1356448d60ca82 SHA512 883dd9967dce6987f956872b0d0df75951b55bc0898eba6cbd85c53a6cb8e6b1e25b0d90f3f95b9bdee3ba0e7577448eec5de6638e6dde9f9432383f6bb1458a
 EBUILD logstash-bin-6.8.16.ebuild 2099 BLAKE2B 04b2c3baf24b2a64ced6d06ecb21518355c75e1bc25e386ec6532d0aadcfe893cff6b2e77cffebcec7bc0f47bce52c158a2c78c0acb37bb6cf1356448d60ca82 SHA512 883dd9967dce6987f956872b0d0df75951b55bc0898eba6cbd85c53a6cb8e6b1e25b0d90f3f95b9bdee3ba0e7577448eec5de6638e6dde9f9432383f6bb1458a
+EBUILD logstash-bin-6.8.17.ebuild 2099 BLAKE2B 04b2c3baf24b2a64ced6d06ecb21518355c75e1bc25e386ec6532d0aadcfe893cff6b2e77cffebcec7bc0f47bce52c158a2c78c0acb37bb6cf1356448d60ca82 SHA512 883dd9967dce6987f956872b0d0df75951b55bc0898eba6cbd85c53a6cb8e6b1e25b0d90f3f95b9bdee3ba0e7577448eec5de6638e6dde9f9432383f6bb1458a
 EBUILD logstash-bin-7.12.0.ebuild 2504 BLAKE2B f2075c4b5fb9dd9a0f33da6fb226445aa8ad95dbf8f4dc009ca2819971a4d2894b12abcdb2a8dd5121170a8f522cb0cf13d9d8605a0989ce6c17b262b034a2a3 SHA512 817c14b140ec357c9cfe4634acf4603ff6e0d48c6e8be32c6b769bd033ad6196782031aa87a030c823e4ea233822263d3556b958e7fd15a907ed20a41d41bff1
 EBUILD logstash-bin-7.12.1.ebuild 2504 BLAKE2B f2075c4b5fb9dd9a0f33da6fb226445aa8ad95dbf8f4dc009ca2819971a4d2894b12abcdb2a8dd5121170a8f522cb0cf13d9d8605a0989ce6c17b262b034a2a3 SHA512 817c14b140ec357c9cfe4634acf4603ff6e0d48c6e8be32c6b769bd033ad6196782031aa87a030c823e4ea233822263d3556b958e7fd15a907ed20a41d41bff1
 EBUILD logstash-bin-7.13.2.ebuild 2504 BLAKE2B f2075c4b5fb9dd9a0f33da6fb226445aa8ad95dbf8f4dc009ca2819971a4d2894b12abcdb2a8dd5121170a8f522cb0cf13d9d8605a0989ce6c17b262b034a2a3 SHA512 817c14b140ec357c9cfe4634acf4603ff6e0d48c6e8be32c6b769bd033ad6196782031aa87a030c823e4ea233822263d3556b958e7fd15a907ed20a41d41bff1
+EBUILD logstash-bin-7.13.4.ebuild 2504 BLAKE2B f2075c4b5fb9dd9a0f33da6fb226445aa8ad95dbf8f4dc009ca2819971a4d2894b12abcdb2a8dd5121170a8f522cb0cf13d9d8605a0989ce6c17b262b034a2a3 SHA512 817c14b140ec357c9cfe4634acf4603ff6e0d48c6e8be32c6b769bd033ad6196782031aa87a030c823e4ea233822263d3556b958e7fd15a907ed20a41d41bff1
 MISC metadata.xml 692 BLAKE2B 4dce636bac8df4bdc8761c340b230db0371df1b127e17de8f9d55225fec2ccea4f59876e88b651427c11047eb24c6993391a2f25a3ac1ec39032d50226e9c99b SHA512 6a22c84fcb90fcb8334a1bd26e240e97d7c06d17251a9f973d780c28b836eba45cde5fc35a46e2cd82bf30f04116c825ec831344fd286f9e84cc430d032f3757
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.17.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.17.ebuild
new file mode 100644
index 000000000000..beabb835c090
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.8.17.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="acct-group/logstash
+	acct-user/logstash
+	virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/{pipelines.yml,startup.options} || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	doins "${FILESDIR}/pipelines.yml"
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT}/usr/share/${MY_PN}"
+	elog
+	elog "The default pipeline configuration expects the configuration(s) to be found in:"
+	elog "${EROOT}/etc/logstash/conf.d/*.conf"
+}
diff --git a/app-admin/logstash-bin/logstash-bin-7.13.4.ebuild b/app-admin/logstash-bin/logstash-bin-7.13.4.ebuild
new file mode 100644
index 000000000000..aea75866ef6f
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-7.13.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="acct-group/logstash
+	acct-user/logstash
+	virtual/jre"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	local d
+	for d in aarch64-Linux arm-Linux Darwin i386-Linux i386-SunOS \
+		i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \
+		ppc-AIX sparcv9-Linux sparcv9-SunOS x86_64-DragonFlyBSD \
+		x86_64-FreeBSD x86_64-OpenBSD x86_64-SunOS x86_64-Windows; do
+			rm -r vendor/jruby/lib/jni/$d || die
+	done
+
+	# remove bundled java
+	rm -r jdk || die
+}
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/{pipelines.yml,startup.options} || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	doins "${FILESDIR}/pipelines.yml"
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT}/usr/share/${MY_PN}"
+	elog
+	elog "The default pipeline configuration expects the configuration(s) to be found in:"
+	elog "${EROOT}/etc/logstash/conf.d/*.conf"
+}
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 3273d2a90678..e0a4cf8c9f5a 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,10 +1,11 @@
 AUX monit.initd-5.0-r1 801 BLAKE2B adec89a1694095c128763bb3a2f31867d89b2a4ef1ab2e6347d84c6652a0ef02c5c0c6957e777045dc0c41b3036d806efd71f1186c5a8f7db81e90cb2d9775b7 SHA512 f152b8f7889d1dcad313591f5d6c66261055a8ee61a66cc35b25f51b76ecb3b4dc316eef189b7554ac0f24387c73acf685ca65f12e3a0bf2070ae5003424d162
+AUX monit.logrotate 146 BLAKE2B 89bbe7c69f50dbca3f3c443d56da6eae6aab7a4976f90c209850b71410e5faa12c40d488d694a94635167ae245fd021cae6a855523dc6bcbb538bc6c29c07526 SHA512 bac426713adf8cc6dead70916cf3404229652cd85d0d4f4b436f9a4074a7a9cc3af03da6d91677645e349bcf6a614d0adf277676d04a54b7f67ba3ec6714903a
 AUX monit.pamd 120 BLAKE2B 76744f79babaa99fa2961f73158ca755f885e9ea8e20b76dcb29f8fd10be6b5804b09b3c90f59ada7ce81eab90713ba43d2b2f28a6abc278fdfc75b356af4e67 SHA512 75c5fbad1c04fc5c9c0de224df245d64f4e59e23f79f4037edcc94623795852900318747e8a71946cab406009834643e84e1cd40b27854951d5462e740712b5c
 AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e4360520252369951b3f7f87a3dd96440a58c9d2c4973ce9980a00ab7085c92af1e6542ae10d679ba352d170b19 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88
-DIST monit-5.27.1.tar.gz 1459360 BLAKE2B ef8030112c401ab08653692c702f2ec6d34c11605c2f6fbb5310f8e08d7fb238cf1b2d0271358b7160e05ad8dae3931d458329c422ae826681c11fe46fac01b4 SHA512 1e71a529a920a37576242a99fe8067d9b88f64136b111c152527aca4aa5d3cac3c32c1f58a793a56361b8e286f025bfb1f063f4c38d25ebafc7927fbf9170673
 DIST monit-5.27.2.tar.gz 1463790 BLAKE2B f00733261fd941f47ec04e63ed9e3617991cd8a069a14e59941e85d3a342537892019864d4716f821428adb57979aa270fcba9d57f573d49e897dfcd77cc133a SHA512 a45cbbf0905b165767e21d66103b460ea48948824d043881aba3de752e34a67bfb3b97f75153e3672d87a34a702d66ceee28160110654aa52fb82c668aa135b9
 DIST monit-5.28.0.tar.gz 1480041 BLAKE2B 3ac9930efc89de8b4f65dd197c4f4289b3410afac38950c83b459436720d2c786e89d8bad22e4a7688af9c6111021500b9f3c6f0a8e8cee3a6b0e2f5058ec148 SHA512 3805a8cd5ad2ef9c94832a7fe3a09cf508eb857c92cda129d914db8656613e26eac5fefdaa4530b3403b4f6eb0c4cccdc620c12461dbebcda738ba9535ffa885
-EBUILD monit-5.27.1-r1.ebuild 1162 BLAKE2B 71b1d1a5e10520af69bebfcab81f17c7a72e43753d7fe1f0c421c4d2e738d20248638f6860baa9bcddff82294d0855cb004d974430dcff6a5de6cf2d6546f753 SHA512 70657c77855021896681345dc5fc4d654d356e559bd83f7ac92561e5e154aa5ec12234699a7e85551e92cf19a6eff54bba956a41f0180f5af909c1515b0465a7
+DIST monit-5.28.1.tar.gz 1470342 BLAKE2B 134f63f4560cf26a563cb8e1f063b291dd6d87159878a1918aef62d8ffe6138a64b4e34c1713b46cb80bfd04eddb0abab725aa7cbe59331dac9e41d0f286f883 SHA512 2683084aea88567309b4693247c27312e1cb4225175cb8643a1f980ed8fc8ecd549818e157e1bb6c0feafc306bc9217bbd2c0c501cb75ea2425b646955076e5a
 EBUILD monit-5.27.2-r1.ebuild 1162 BLAKE2B 71b1d1a5e10520af69bebfcab81f17c7a72e43753d7fe1f0c421c4d2e738d20248638f6860baa9bcddff82294d0855cb004d974430dcff6a5de6cf2d6546f753 SHA512 70657c77855021896681345dc5fc4d654d356e559bd83f7ac92561e5e154aa5ec12234699a7e85551e92cf19a6eff54bba956a41f0180f5af909c1515b0465a7
 EBUILD monit-5.28.0-r1.ebuild 1165 BLAKE2B c6ef0342430b3db2a28b3a6fba3e839f62669bf96d364905c8e7dd1b992bfbf13a26c2d74d16a9a6377c4700c995dcfef8b8ce9c32e1ece39a3ad4b8cacaa133 SHA512 b9ddf767729170ba218fe35bc3dc49efdf3218d5cb19b4312d2f6e8d1fe65c1c5a88a6b61c1bce766c5b5a4079f62f3add5bcce325659b6a228d3bea4530b79c
+EBUILD monit-5.28.1-r1.ebuild 1231 BLAKE2B 1de7222521a60adfaf6abc1a2fc8b3e75bfaa669d167734a4c0058aead6f419f38b63dc01a9aee6ddd8b9934a0e87cb7bc0d50ef454ab80792bf117ee5eb3e7a SHA512 cf682f1d976b4ec006ad9429c4e06948a7857802f35f767d2b12728186320053332a2e59b74cdb2f2b91ee54eaea5c19e770329e95e89e6e3c5c21a080c4a854
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-admin/monit/files/monit.logrotate b/app-admin/monit/files/monit.logrotate
new file mode 100644
index 000000000000..25246a559777
--- /dev/null
+++ b/app-admin/monit/files/monit.logrotate
@@ -0,0 +1,7 @@
+/var/log/monit.log {
+        rotate 15
+        daily
+        postrotate
+                /usr/bin/monit reload >/dev/null 2>&1
+        endscript
+}
diff --git a/app-admin/monit/monit-5.27.1-r1.ebuild b/app-admin/monit/monit-5.27.1-r1.ebuild
deleted file mode 100644
index 7ed9b024d941..000000000000
--- a/app-admin/monit/monit-5.27.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 pam systemd
-
-DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
-IUSE="ipv6 pam ssl"
-
-RDEPEND="sys-libs/zlib:=
-	virtual/libcrypt:=
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_prepare() {
-	default
-	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with ipv6)
-		$(use_with pam)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc; insopts -m600; doins monitrc
-	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
-
-	dobashcomp system/bash/monit
-}
-
-pkg_postinst() {
-	elog "Sample configurations are available at:"
-	elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/monit/monit-5.28.1-r1.ebuild b/app-admin/monit/monit-5.28.1-r1.ebuild
new file mode 100644
index 000000000000..d9f496af739c
--- /dev/null
+++ b/app-admin/monit/monit-5.28.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 pam systemd
+
+DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="ipv6 pam ssl"
+
+RDEPEND="sys-libs/zlib:=
+	virtual/libcrypt:=
+	pam? ( sys-libs/pam )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_prepare() {
+	default
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with ipv6)
+		$(use_with pam)
+		$(use_with ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/monit.logrotate monit
+
+	insinto /etc; insopts -m600; doins monitrc
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+
+	dobashcomp system/bash/monit
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index 605f8025a8ad..d8c9b21ec75a 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,7 +1,7 @@
 AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb79454c18b471ab62134074765c313be5633e5fc8d1d9105a51d4dc648e3e08f200487ea62e3b9cd4e4a1 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659
 DIST password-store-1.7.3.tar.xz 63416 BLAKE2B 5931608e0208dfe6965b79f586c153a4930d1c3d3b74433d026ee0bc5889fcc29334c637ca4fb68308d0169bad7c8235b6632e9f80eda1e24f0f5721353f88e3 SHA512 89755a7b02f05d75055a9fc14fd3f456c0a49ec31bdffd097a027f91228c64a98b18c1e80017aeda811773ae3287ff1b9737532da8ded06799d8fe3979ca06f7
 DIST password-store-1.7.4.tar.xz 65272 BLAKE2B db1a34b5900802731deaf09d3ade1d3f00022fd21eb0b21140dca3d399c89183dc901e5bce15d7bb6041e62017e2b8b6df61c6ec3eadb1df6c0278dbc6c2bc11 SHA512 1fe108895b224451b54e545d399b6a97040e094049448509f92ae33164a5cf9044a91f52edfc705fcf333f6526df1a478deeebc4df109764d58100f9e3e22681
-EBUILD pass-1.7.3.ebuild 2200 BLAKE2B 29b614496070c995983bf8ebb44bd02ac8f8ed53161c814adb69cad95fe74667e869f106d51aefe26cd449a08f464cfec88315c24d3e7996ba8f1d44fc8604b5 SHA512 18dc94bdc0d786377791b99a36e3f1eb10f518874290623638cf4ab65cda3bdad7ac6875b37c15cae7dda5fa84f08204b5a64bd3c2de2a4e3b9e885fcfe3d0f5
-EBUILD pass-1.7.4.ebuild 2245 BLAKE2B 051ff8b708cc792007f6f4f3003107eacc3246dda126922c9cc4f35c07e33f5b339b96897804f80dd06ff54f0cb2f1ba0bcc95f6edb27cebf43f989d3882fd5b SHA512 e82f175b7ec9e51d376299be7788c7b818aa331e0d74cf134d0b6a1fe6bfbc12489c0c2b436cb1ce18ee1d28882a44ab2946189a3e7118045dbb68fac00d2d7b
-EBUILD pass-9999.ebuild 2355 BLAKE2B 8dd1aee24e20485c9efef65d1e869d93556f1bd0eed7e2af81b3d5ff9ba8cdc7968a6c3ca8f12faf921cf91b558a4e94c4eb2ec84755fea8ae459de271a5784a SHA512 3a14b4d54b6d64968d262151b81e0efc3b5e7aeaa8ad8d01df1f10f37b40c069db68a3dfae0c84f369975cca10b19df1b3893fa37d39b6aa02dfde87fa167102
-MISC metadata.xml 747 BLAKE2B 0fa61ff5f87f66214e11c38fe1dd0dc746b8151bc201c72d972ddbd0f8e32dc89701798746df8e2c912eb0d4ccf43fc91d857dfc5395d184f4da24d5128f7b13 SHA512 5fb903b4d06cd49dea554f2a94bbd79e544840e4cce4e876b12eeaceb45aa6321a3fe50f1d531fdeb9cbd34dab66b2bf3ac0be52b07edaf62acf69a892c96200
+EBUILD pass-1.7.3-r1.ebuild 2037 BLAKE2B fe8df4ab2c95856a3144f04dc56c006ed49f86d83ddc8d4c61de24b2788334b0cd29b0709c60c05a8abe0f05c27c8fcf5c967f580b2fed4fe8828c49154f39a0 SHA512 bc8d994effc16552c13b69671bd7de507e7b03501874ac9600e77606400be07bdfeefb61f2d21f3c2d10a2c1b3bd8fe6f06d4394c4932a477ad35dd9daea6a13
+EBUILD pass-1.7.4-r1.ebuild 2085 BLAKE2B c9264776f83f717c49c0d86cd6dd4f769122c2d513e38aba71975537e3e6161c2172467454acb7a2de3f82e5b384c8aa38229f4b2bf2faf4bc3700f62dc962d9 SHA512 375bcb9398c5f8ece901ce87362e8f7c877d203d2d99116a32cb7bf4b5a901e63ffa213d7eca93d9015368f7b2fabdf9e4648229b029fde4362d8e54882cf7c1
+EBUILD pass-9999.ebuild 2195 BLAKE2B 0e2e326f7aadf1719f667714d3866843e705a32fde248995af42b8bd524b91d58e6fd06feccffaf9571471a79e1974169b2ddc6fcefcc8f7aa0d87c50811141f SHA512 62e78aadfb9435e66fe39b54dfa30f3e454c90d48c94c14824373d8b05767638699bb86a7961d07dad21df586e238a6dc0b7a1b437560a1fdcde3d51a36df8db
+MISC metadata.xml 681 BLAKE2B 78b3d400e730db6ad94181c8c4eec2a6ff5eb658f63eeab96b5ad8a721726e66458f00b0723943f92c3cd39e85c4552610493cd62a8aa8c3f989e42278a89f97 SHA512 e5915b54b420e608b29a9aca44ec8682c64ec997e240085691686d686363bf0c4f0f800e3c56a02c06f2ebf5a97302b0a45cea04ff60cc9506dbaf816c8c0468
diff --git a/app-admin/pass/metadata.xml b/app-admin/pass/metadata.xml
index 3e292a92eba7..51ce1b2aa67d 100644
--- a/app-admin/pass/metadata.xml
+++ b/app-admin/pass/metadata.xml
@@ -12,11 +12,8 @@
 		<flag name="git">
 			Use <pkg>dev-vcs/git</pkg> for password revisions.
 		</flag>
-		<flag name="fish-completion">
-			Enable fish completion support.
-		</flag>
 		<flag name="dmenu">
-			Add support for x11-misc/dmenu with the 'passmenu' program.
+			Add support for <pkg>x11-misc/dmenu</pkg> with the 'passmenu' program.
 		</flag>
 		<flag name="importers">
 			Allow importing passwords from other password managers using various contributed scripts.
diff --git a/app-admin/pass/pass-1.7.3-r1.ebuild b/app-admin/pass/pass-1.7.3-r1.ebuild
new file mode 100644
index 000000000000..03a687c03b6b
--- /dev/null
+++ b/app-admin/pass/pass-1.7.3-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 elisp-common
+
+DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
+HOMEPAGE="https://www.passwordstore.org/"
+SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
+S="${WORKDIR}/password-store-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
+IUSE="+git X emacs dmenu importers elibc_Darwin"
+
+RDEPEND="
+	app-crypt/gnupg
+	media-gfx/qrencode
+	>=app-text/tree-1.7.0
+	git? ( dev-vcs/git )
+	X? ( x11-misc/xclip )
+	elibc_Darwin? ( app-misc/getopt )
+	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
+	emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
+"
+
+src_prepare() {
+	default
+
+	use elibc_Darwin || return
+
+	# use coreutils
+	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
+	# host getopt isn't cool, and we aren't brew (rip out brew reference)
+	sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
+	# make sure we can find "mount"
+	sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
+}
+
+src_compile() {
+	use emacs && elisp-compile contrib/emacs/*.el
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		BASHCOMPDIR="$(get_bashcompdir)" \
+		WITH_BASHCOMP=yes \
+		WITH_ZSHCOMP=yes \
+		WITH_FISHCOMP=yes
+
+	use dmenu && dobin contrib/dmenu/passmenu
+
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.{el,elc}
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	fi
+
+	if use importers; then
+		exeinto /usr/share/${PN}/importers
+		doexe contrib/importers/*
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use importers; then
+		einfo "To import passwords from other password managers, you may use the"
+		einfo "various importer scripts found in:"
+		einfo "    ${EROOT}/usr/share/${PN}/importers/"
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-admin/pass/pass-1.7.3.ebuild b/app-admin/pass/pass-1.7.3.ebuild
deleted file mode 100644
index ae678d292fa6..000000000000
--- a/app-admin/pass/pass-1.7.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 elisp-common
-
-DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
-HOMEPAGE="https://www.passwordstore.org/"
-SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
-
-RDEPEND="
-	app-crypt/gnupg
-	media-gfx/qrencode
-	>=app-text/tree-1.7.0
-	git? ( dev-vcs/git )
-	X? ( x11-misc/xclip )
-	elibc_Darwin? ( app-misc/getopt )
-	zsh-completion? ( app-shells/gentoo-zsh-completions )
-	fish-completion? ( app-shells/fish )
-	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
-	emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
-"
-
-S="${WORKDIR}/password-store-${PV}"
-
-src_prepare() {
-	default
-
-	use elibc_Darwin || return
-	# use coreutils'
-	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
-	# host getopt isn't cool, and we aren't brew (rip out brew reference)
-	sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
-	# make sure we can find "mount"
-	sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
-}
-
-src_compile() {
-	use emacs && elisp-compile contrib/emacs/*.el
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		BASHCOMPDIR="$(get_bashcompdir)" \
-		WITH_BASHCOMP=yes \
-		WITH_ZSHCOMP=$(usex zsh-completion) \
-		WITH_FISHCOMP=$(usex fish-completion)
-	use dmenu && dobin contrib/dmenu/passmenu
-	if use emacs; then
-		elisp-install ${PN} contrib/emacs/*.{el,elc}
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
-	fi
-	if use importers; then
-		exeinto /usr/share/${PN}/importers
-		doexe contrib/importers/*
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use importers; then
-		einfo "To import passwords from other password managers, you may use the"
-		einfo "various importer scripts found in:"
-		einfo "    ${EROOT%/}/usr/share/${PN}/importers/"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-admin/pass/pass-1.7.4-r1.ebuild b/app-admin/pass/pass-1.7.4-r1.ebuild
new file mode 100644
index 000000000000..795de43f39b1
--- /dev/null
+++ b/app-admin/pass/pass-1.7.4-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 elisp-common
+
+DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
+HOMEPAGE="https://www.passwordstore.org/"
+SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
+S="${WORKDIR}/password-store-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="+git wayland X emacs dmenu importers elibc_Darwin"
+
+RDEPEND="
+	app-crypt/gnupg
+	media-gfx/qrencode
+	>=app-text/tree-1.7.0
+	git? ( dev-vcs/git )
+	wayland? ( gui-apps/wl-clipboard )
+	X? ( x11-misc/xclip )
+	elibc_Darwin? ( app-misc/getopt )
+	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
+	emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
+"
+
+src_prepare() {
+	default
+
+	use elibc_Darwin || return
+
+	# use coreutils'
+	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
+	# host getopt isn't cool, and we aren't brew (rip out brew reference)
+	sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
+	# make sure we can find "mount"
+	sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
+}
+
+src_compile() {
+	use emacs && elisp-compile contrib/emacs/*.el
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		BASHCOMPDIR="$(get_bashcompdir)" \
+		WITH_BASHCOMP=yes \
+		WITH_ZSHCOMP=yes \
+		WITH_FISHCOMP=yes
+
+	use dmenu && dobin contrib/dmenu/passmenu
+
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.{el,elc}
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	fi
+
+	if use importers; then
+		exeinto /usr/share/${PN}/importers
+		doexe contrib/importers/*
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use importers; then
+		einfo "To import passwords from other password managers, you may use the"
+		einfo "various importer scripts found in:"
+		einfo "    ${EROOT}/usr/share/${PN}/importers/"
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-admin/pass/pass-1.7.4.ebuild b/app-admin/pass/pass-1.7.4.ebuild
deleted file mode 100644
index d1349cc29760..000000000000
--- a/app-admin/pass/pass-1.7.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 elisp-common
-
-DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
-HOMEPAGE="https://www.passwordstore.org/"
-SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-IUSE="+git wayland X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
-
-RDEPEND="
-	app-crypt/gnupg
-	media-gfx/qrencode
-	>=app-text/tree-1.7.0
-	git? ( dev-vcs/git )
-	wayland? ( gui-apps/wl-clipboard )
-	X? ( x11-misc/xclip )
-	elibc_Darwin? ( app-misc/getopt )
-	zsh-completion? ( app-shells/gentoo-zsh-completions )
-	fish-completion? ( app-shells/fish )
-	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
-	emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
-"
-
-S="${WORKDIR}/password-store-${PV}"
-
-src_prepare() {
-	default
-
-	use elibc_Darwin || return
-	# use coreutils'
-	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
-	# host getopt isn't cool, and we aren't brew (rip out brew reference)
-	sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
-	# make sure we can find "mount"
-	sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
-}
-
-src_compile() {
-	use emacs && elisp-compile contrib/emacs/*.el
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		BASHCOMPDIR="$(get_bashcompdir)" \
-		WITH_BASHCOMP=yes \
-		WITH_ZSHCOMP=$(usex zsh-completion) \
-		WITH_FISHCOMP=$(usex fish-completion)
-	use dmenu && dobin contrib/dmenu/passmenu
-	if use emacs; then
-		elisp-install ${PN} contrib/emacs/*.{el,elc}
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
-	fi
-	if use importers; then
-		exeinto /usr/share/${PN}/importers
-		doexe contrib/importers/*
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use importers; then
-		einfo "To import passwords from other password managers, you may use the"
-		einfo "various importer scripts found in:"
-		einfo "    ${EROOT}/usr/share/${PN}/importers/"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild
index a6ee842f8175..b0b05e8dda99 100644
--- a/app-admin/pass/pass-9999.ebuild
+++ b/app-admin/pass/pass-9999.ebuild
@@ -10,16 +10,16 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 	S="${WORKDIR}/password-store-${PV}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
 HOMEPAGE="https://www.passwordstore.org/"
 
-SLOT="0"
 LICENSE="GPL-2"
-IUSE="+git wayland X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
+SLOT="0"
+IUSE="+git wayland X emacs dmenu importers elibc_Darwin"
 
 RDEPEND="
 	app-crypt/gnupg
@@ -29,8 +29,6 @@ RDEPEND="
 	wayland? ( gui-apps/wl-clipboard )
 	X? ( x11-misc/xclip )
 	elibc_Darwin? ( app-misc/getopt )
-	zsh-completion? ( app-shells/gentoo-zsh-completions )
-	fish-completion? ( app-shells/fish )
 	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
 	emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 "
@@ -57,13 +55,16 @@ src_install() {
 		PREFIX="${EPREFIX}/usr" \
 		BASHCOMPDIR="$(get_bashcompdir)" \
 		WITH_BASHCOMP=yes \
-		WITH_ZSHCOMP=$(usex zsh-completion) \
-		WITH_FISHCOMP=$(usex fish-completion)
+		WITH_ZSHCOMP=yes \
+		WITH_FISHCOMP=yes
+
 	use dmenu && dobin contrib/dmenu/passmenu
+
 	if use emacs; then
 		elisp-install ${PN} contrib/emacs/*.{el,elc}
 		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
 	fi
+
 	if use importers; then
 		exeinto /usr/share/${PN}/importers
 		doexe contrib/importers/*
diff --git a/app-admin/prelude-manager/Manifest b/app-admin/prelude-manager/Manifest
index 253804530a88..41e5f4f1d8e6 100644
--- a/app-admin/prelude-manager/Manifest
+++ b/app-admin/prelude-manager/Manifest
@@ -4,6 +4,6 @@ AUX prelude-manager.run 133 BLAKE2B b91c630c269ff09327da88cbcaaca6108121a5ae16d4
 AUX prelude-manager.service 398 BLAKE2B b409fd283baa3d85c0b25149e2912483e29f090338cc659c3444e2f51ca228b50cf2d5172ecf85b16a40c50f515def2ed178c6a2d85caeaa8b7b75b5ac5ddf45 SHA512 b3700ef920e739f521c87477a8752f787345971cd7077a4a0722b3d4069ca2ba55df3db87da4b544f559cd2e4faf2ef3b068e1c5dead6003f580dc04b4590495
 DIST prelude-manager-5.1.0.tar.gz 1510054 BLAKE2B 88ef666a76c58af1a8164c033b7e9c1ea869a18a66cb489d8c7fdbf1fa331006e7844aea4386ea3185902afd108af5eb1b46ee17686032de460d8c5b336fd658 SHA512 1f0e993f9bf684ec65a741db3cdaf537dc47bc2f77652a37c194db422dd5da2aa33b78d3ee454c78b28b44c022eacc7246ee99187b0b8779c12f3a67320d89a3
 DIST prelude-manager-5.2.0.tar.gz 1564874 BLAKE2B cd00aca6a533cdb47e311c4a8eed17d514f39de3b1c5a4b334b8e8c8c2d318b36d1fc843bf36be0383da2ae5f4e41a936fc70ad92d5b55ab56e9a34c36fc1dae SHA512 49f8fd10c7f3c5c816e6bc49ce8d47abfe56b4b0a1d8a564774f67ef5f0e3058c62ef9c88ca709b1fe2961ed832269fe811ddf57d4118879fa561970561507d6
-EBUILD prelude-manager-5.1.0-r1.ebuild 1321 BLAKE2B 8225dc9452630b1947e5d78b299800cef3826c9adc66c4ca5c7e2883a75fcc0a8adebd872fa196ace7c8809a1aa94c404c6894c9e30fb66b3aeaea85672bfd03 SHA512 63524e5a595147e16b54ef6b48e6ca10688defb810975ac03375c15f796a4f16f30cb80854e07168a2a3232d10adbb7d2417b36699b9b57b356ca8acf062d21b
+EBUILD prelude-manager-5.1.0-r1.ebuild 1370 BLAKE2B 70142eb7e5edfeb0bcc75599191c469f54c3f614285d4ea52273e8c745e36006a4f5412f61c5bfeb66725d46471114c83aa81227fb68b6c4e79a5badc2e73a89 SHA512 cf83a68e6a9d90b12e221f368090394c7f3585dbf98e0fe0a5b1f9ab083570dc62dd3746bc56be92ee7bd77d5cfe160a2dc07288ef8461e91ed75691a170ab26
 EBUILD prelude-manager-5.2.0-r1.ebuild 1503 BLAKE2B 6d231aefe434d92a1e2c9d79954590f37269da19fd8a63608c2f68a599a1dd855a52d0254985288614d2e82f7ed9155f695d0a1edf76bb36cba17281ce60dfc2 SHA512 02cd12c7e415a6c787f1bed47f5fe7f433863c2b0c30dbb342bcf0e99bc4fc7aa2aa92546e23514e97daf4385cba73609e4ed3ac6e5b347fc0c5d483b1f46902
 MISC metadata.xml 934 BLAKE2B e0ec3df374c613395e3e54ab35307b71404ace2fb08fc5350278d67dc8d5d0bf8adb731158301bf0620308034c80057f85721ed02a71de0c2656e9a7021d3ab6 SHA512 19f7244fc4ded37701ca32aa6373b50efd26f058f82fafbd8b5916a619149b8a73cb7cd7c4497664fcd18d7508786e4782473d5020856152f2e1129211fc0d09
diff --git a/app-admin/prelude-manager/prelude-manager-5.1.0-r1.ebuild b/app-admin/prelude-manager/prelude-manager-5.1.0-r1.ebuild
index 1fcb2078c9d1..70bb74a04d62 100644
--- a/app-admin/prelude-manager/prelude-manager-5.1.0-r1.ebuild
+++ b/app-admin/prelude-manager/prelude-manager-5.1.0-r1.ebuild
@@ -64,3 +64,7 @@ src_install() {
 
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 05c6ac6d41ce..af04c8d91c2f 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -2,7 +2,7 @@ AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf
 DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
 DIST puppet-agent_7.8.0-1focal_amd64.deb 20931500 BLAKE2B 3c521631fb96440e51ad82c3665f07a5ee9cba1d978fccbe9388684ad0c211138f022017ff49b92818cfc8f50ebed0a996c9321918413e4a1c7ca0f5a2f68f8a SHA512 f0cd9951b54bc9aacce987ea10e9257db9432620f50657ca220ea8b7b4aad1c5ddebd6f5e89c5bdee837b0f928bbebe375afdb72652eb33ee22e3778498aafa1
 DIST puppet-agent_7.9.0-1focal_amd64.deb 20934808 BLAKE2B 4b5c529e1a5cb5877a753b09a477fc08e7ca7a93c3b1dae5062864d2887adea584075f4ca6b963e01cb5121ce06008182cfc39124b9e22559899beb03855240f SHA512 b6c94b65febd6b76f1ab7af5f4f5238fb314b2abb226dd5828f09ca46fdf4cd22641f765ea338b3aeb7ccf6e0fe37d5682586fbef7dc27b51a654ded6f774495
-EBUILD puppet-agent-6.19.1-r1.ebuild 2056 BLAKE2B fe832ee23a2cb2b94bdcc943524144dfb9f64c3442c874722a67f43b8edfa16b63bc74ef3fdf96844abd68a709b34dcb13d04deec3bb896bf22daa5475a4016a SHA512 e7f35d13d653e4a2f3d6890434ddd9b409809fbe36232b2a309089757909547497b401c33369a229d75dab6e55a0068afc41f079966bedbb9f5d3a242caeebed
-EBUILD puppet-agent-7.8.0.ebuild 1909 BLAKE2B 433ad14094e7f585ed7c427740189d35314bb28aee0a282f26f7d26bdb661e0197b4925b254730f60213bb5f989638181074df5dbb4b7dd285b53aae1e99b90e SHA512 6059d73491ded91c2caada66e5722206170994caa7f025f60ddd32900dc837ace0b2257786f4224b83b5b3db3b5f1d5244bd0495bb77c80b240800c99fd89cb2
-EBUILD puppet-agent-7.9.0-r2.ebuild 1905 BLAKE2B 5284752eb2f5f4b82b3c068c3a92db1eadabe0ef689e66151d3351636084cfc7917f0cc0b875d773efeeaa948ed7a90189c57ea232c60a3d88ef3b9db719d190 SHA512 ab84733265ff5b9b4aff9a0996379914cb363932c1bed80fcedfb980b9eee2035341a87b7b56f4219ddb7d85669793b477fc671cb31a7639f4b4fda032a5090c
+EBUILD puppet-agent-6.19.1-r1.ebuild 2112 BLAKE2B cb5c39b4053e2e7f9476d36571ef2d7ffb232dc61c01517d1cd1fd0dee6d093b9b07e95962d8bd3c7c8db47bd9fe70fadf49446dc0f0702271b01d7c40e59d80 SHA512 552fa439fcdac6b76218401a2a60c042261e27fafa2cda93e5b2bb52b7708488292f167e5102e1dcff42913abe779f5202d69fc241e38ecb140a11d8f2ba9901
+EBUILD puppet-agent-7.8.0.ebuild 1965 BLAKE2B 9524398bc6ddab603236762a151940c3a0c0ea55cdc686516904c0a1282248f6f9d1546ac1b792b22a4d3ad2d0998056c3c2485c6801fe5bf0e2be93b62c5967 SHA512 1f77777cee4cb41c8f53ba79784631f4549c1233aeb4896d870787fc4b3c7f5d98702d3bf5186b18f8b58b1c9c4f13dfc2f00826b3d57e2e11876f3c6aed8b02
+EBUILD puppet-agent-7.9.0-r2.ebuild 1961 BLAKE2B ec28bcc16844f62f7fa11488b356e8fa4800e2b251e6475e75551c9308ce6e18fdede9c0161b516bef87503ea528694da7c3b9de1dedb2ccf8b45ef6ba276df3 SHA512 d141479cf12efe11e187fdbc72e05d8b2308163610bca209df1edd41d0f5fac3f0dbaf608202e7ba145d6695dcf26ed0b20cf33e1b756850ac795d1f2673a5db
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild b/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild
index 77257d4a760b..e99c2fe2b84a 100644
--- a/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild
@@ -74,3 +74,7 @@ src_install() {
 	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
 	dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
 }
+
+pkg_postinst() {
+	tmpfiles_process puppet-agent.conf
+}
diff --git a/app-admin/puppet-agent/puppet-agent-7.8.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.8.0.ebuild
index b9cc527c3117..fc2beb5766ff 100644
--- a/app-admin/puppet-agent/puppet-agent-7.8.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.8.0.ebuild
@@ -72,3 +72,7 @@ src_install() {
 	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
 	dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
 }
+
+pkg_postinst() {
+	tmpfiles_process puppet-agent.conf
+}
diff --git a/app-admin/puppet-agent/puppet-agent-7.9.0-r2.ebuild b/app-admin/puppet-agent/puppet-agent-7.9.0-r2.ebuild
index b8a399857d7f..3b7141fcc4b4 100644
--- a/app-admin/puppet-agent/puppet-agent-7.9.0-r2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.9.0-r2.ebuild
@@ -72,3 +72,7 @@ src_install() {
 	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
 	dosym ../../../../lib/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
 }
+
+pkg_postinst() {
+	tmpfiles_process puppet-agent.conf
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 363b6946dff7..bd1612749002 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,7 +6,7 @@ AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
 DIST puppet-7.8.0.tar.gz 2893281 BLAKE2B cef1d56048a72ffa18c9fe2917e4f616dd4d778eddc91c88becf06a418471af1e2cf1688aa05ad3e71f24d5bb1923eaf35b8a1419ed05a72b299af970d1427e6 SHA512 189fabe199afefc77951ee3f2bf20c749f6efe290cc3a76f5ba58892c80cc76082b1ce77c23bca87f57f62816410bc5536e4206806fe31517915c72046ace08d
 DIST puppet-7.9.0.tar.gz 2899891 BLAKE2B 06f675fc9eaac4ddfa7957847abe33928f0779f3c18dbf339067525ec69b6b87d274294a1133ec8332fbbed6111b568c63478493f3de467c63e2948bcf446b71 SHA512 6329d89530d2cb008e28116de655024e9bf944b3f41d086e0e47c41c74af3da51c283a912ac966cf7bac52f86e54304df6cf31477a5663cae09fb4d18f958cf2
-EBUILD puppet-5.5.22.ebuild 3751 BLAKE2B bde3bbacdd70435fe0e804133106ebc887f72da5742c871bfdaed08a084866f178b68433453d392f7e98f8f5a2297ee10e7b6e035392fecd22a84780a2b431b2 SHA512 5bc024d0696e51de520ca6ba162cf312ddc9cca04ba5ee18f849ca48547f31e4a493664ffd0100022ef4fb69ad1c24b1efccf7a25d85652281da71c446b87f26
-EBUILD puppet-7.8.0.ebuild 3538 BLAKE2B a5419de57c88bcab6796a2df14afca910f1b466a0ca20fc40b3b937053059d126a4ef845ca9ad2903f2c4afe6b86f19fbfd61779e54a0e3b2a51622ac9dfe07b SHA512 70be4cbede4a005ab5d01daf6ad49e3349c818c56abbe62d9021ec748b8d1b431821baed282c813d53b488d803ef715253300a12bd0cc79216c927d2bb4ba7b8
-EBUILD puppet-7.9.0.ebuild 3540 BLAKE2B 1239d0f1d9a6cdb8dab7965c51c8c7879e20cf2089dd67a1c8903bf8da1aa03c53af3485f82621f1656ef71866c7df92777b66447858319e79c865174c42c458 SHA512 f13b7f037fa7b5f25d37752a6c5f4cdebec9e1ca4f272a1ab4023d3cf79f47c98c4b5df49e996565205e8e9e80296ecbebf5b9ca4ae98b1371b657662ed179da
+EBUILD puppet-5.5.22-r1.ebuild 3751 BLAKE2B f651b0c7d9196a83b00533a2cf6cb3b28e8b5de366cd792ed7194e84b93d971042c3e17a50abefe56e18f67bb0cd3d694604f19dc02c3ed7d72e11f1e0b71d22 SHA512 5d50d74214db6abac3fa66a5249b8b5dbfbc6340c6815e99611e2c62ff6347f2e9c96c53ad79221865e78eeed3e2796941cc50b5a979bdc8a589f57e6681ce06
+EBUILD puppet-7.8.0-r1.ebuild 3538 BLAKE2B ffa6662cfe92ab50890fdcdffdf397c709c93f1a37e0cc12c6029fa718f78367b2ff4548757d5c1a798f46ad7243a3483d8066bdf29e1a9d78866dca16a64b34 SHA512 80f2fe881dbfee31b3e7fb81d0f9e2d029c696fb3c54d63489da74845c296bba7eb821124170c58dc992887817d2725f1a2bbcdb4e1efbadd1bea69c87ee107e
+EBUILD puppet-7.9.0-r1.ebuild 3540 BLAKE2B 74d2e019ac3823979cb19d845d1acc1556003bd7c9fa4eb6083a34d3352d93f9e94315d50708c585acd72aa9756a416245b14d3f4e71e29e8c948fa0e6708cae SHA512 9e98044702d8b596c3acb31adbab0738977fdf1accedcd7e74a962f74d606d6d5453c322a5389434f494fa46403f362c089e88389b6eec2fd59e1a8d1ba6af6c
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-5.5.22-r1.ebuild b/app-admin/puppet/puppet-5.5.22-r1.ebuild
new file mode 100644
index 000000000000..3fc2f8062ec5
--- /dev/null
+++ b/app-admin/puppet/puppet-5.5.22-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="https://puppet.com/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/hiera-3.2.1:0
+	=dev-ruby/facter-3*
+	>=dev-ruby/fast_gettext-1.1.2:0
+	>=dev-ruby/locale-2.1:0
+	>=dev-ruby/multi_json-1.10:0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0
+	acct-user/puppet
+	acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# fix systemd path
+	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet.conf
+
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
+}
diff --git a/app-admin/puppet/puppet-5.5.22.ebuild b/app-admin/puppet/puppet-5.5.22.ebuild
deleted file mode 100644
index d0814cc9e781..000000000000
--- a/app-admin/puppet/puppet-5.5.22.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/hiera-3.2.1:0
-	=dev-ruby/facter-3*
-	>=dev-ruby/fast_gettext-1.1.2:0
-	>=dev-ruby/locale-2.1:0
-	>=dev-ruby/multi_json-1.10:0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# fix systemd path
-	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-7.8.0-r1.ebuild b/app-admin/puppet/puppet-7.8.0-r1.ebuild
new file mode 100644
index 000000000000..f2b79f3d4dc9
--- /dev/null
+++ b/app-admin/puppet/puppet-7.8.0-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	dev-ruby/concurrent-ruby
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0
+	acct-user/puppet
+	acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# fix systemd path
+	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"
+		dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet.conf
+
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+	elog "not already done so."
+	elog
+}
diff --git a/app-admin/puppet/puppet-7.8.0.ebuild b/app-admin/puppet/puppet-7.8.0.ebuild
deleted file mode 100644
index d3f1ad182f3d..000000000000
--- a/app-admin/puppet/puppet-7.8.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	dev-ruby/concurrent-ruby
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# fix systemd path
-	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"
-		dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppet/puppet-7.9.0-r1.ebuild b/app-admin/puppet/puppet-7.9.0-r1.ebuild
new file mode 100644
index 000000000000..c1c0ce4f6d0c
--- /dev/null
+++ b/app-admin/puppet/puppet-7.9.0-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	dev-ruby/concurrent-ruby
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0
+	acct-user/puppet
+	acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# fix systemd path
+	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"
+		dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet.conf
+
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+	elog "not already done so."
+	elog
+}
diff --git a/app-admin/puppet/puppet-7.9.0.ebuild b/app-admin/puppet/puppet-7.9.0.ebuild
deleted file mode 100644
index 125aa53e82ce..000000000000
--- a/app-admin/puppet/puppet-7.9.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	dev-ruby/concurrent-ruby
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# fix systemd path
-	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"
-		dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 3923d93c158f..ffea482733f5 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -2,6 +2,6 @@ AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
 DIST puppetdb-7.4.1.tar.gz 47409868 BLAKE2B 0ac4234547b27e9ad12c9c008d76be8fff7f724d93acc2ca26700d18ac2e30bf9689c46550a8976b90e662d7af97994d7e299b94e2d68e5b5f7d1166a54d4ff8 SHA512 64c42477554039991b35dfd2d29f4fa507226cc3256b07ff3524cd287c1dbf09bdf60116dd12288d1340ca74ced2872ac886f4eadde8bd83965976579e99738d
 DIST puppetdb-7.5.0.tar.gz 47469411 BLAKE2B 98bf574e8b4edba47f58b899bdc3b6037a3ae79a2a8d8b3f69a108c416648fdc35f804d71fc412bcc257f7609be9b4d706af7e28d2fd05d3768a02e9efd95841 SHA512 94bf5bc9a95cacb1a3a7f0fb5b04a05eab5ded7d18c2fb396e616b44e429a4a6299e6802fc0fd72aa832a6d8181a7ecf6ef6aff4696d4c9bc16a1954aee6f77c
-EBUILD puppetdb-7.4.1.ebuild 2647 BLAKE2B 210c1c51e34c16766e8f1cca2c94c7e5d6a0e60415cc0fa1691f1b85dd7d088bd540cc24e7318ccc224763c5920d4823b760d5c4cbd78df2c050612b6fd923ea SHA512 3e773a22cfc7fb7b8bf0b038a9641077af5d819ce654bae935d0a7b67840f39c2e703477d91d4f09091337f2bcab41679a6aaa75f76458897e99b94856c611b1
-EBUILD puppetdb-7.5.0.ebuild 2649 BLAKE2B 93e811d338631f32fce739bbc2692bfb5b6b9aa93c6fa4705faeca5921d682612c813559a2549c3e78efb37a80b83e390ba27b809c86e82c2b80f160bab4cec3 SHA512 9f82fdfe9efa7320db27fe81b1212e7ee960506e9da28ca9b2e65089d214b7c7e1ab1127cc7fc1d9671e2296792f6cc24a81b22659eae0b140cc020cfb04267b
+EBUILD puppetdb-7.4.1.ebuild 2680 BLAKE2B cb171464987e15cb5c4ec154ce8e1fa99437236a824968a3961abe3ca67eb34ccd0db9c781923c3e2a5d4bd5f7e85a1eba5de8138af9fe8ef892bec463a937d3 SHA512 255fadfe0392069b4b79e25769b9823fda49bbb7885a265d3305a35983d3bc8568f4c79c961943308a82bfc573028209829f68c7df979179a980893626a2fe42
+EBUILD puppetdb-7.5.0.ebuild 2682 BLAKE2B bab62e7ca9d5f0ba712eb97c678ec2a0b82b0f33c048c503ed4414e92381619f9e46fb1450e47c7a45473adf885ed41e3f48e4861698bbfc533f390e6538dd23 SHA512 c0884f8d30d42e542650d12cce68c4613e4c76459dd9a3b5f063d29b2ff44c17b666e517558090a17818085460e0b4aafbbcc200b1ecd4dad81d3e0767fc5dc7
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-7.4.1.ebuild b/app-admin/puppetdb/puppetdb-7.4.1.ebuild
index 06b2986213b8..d1028bca1724 100644
--- a/app-admin/puppetdb/puppetdb-7.4.1.ebuild
+++ b/app-admin/puppetdb/puppetdb-7.4.1.ebuild
@@ -81,6 +81,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process puppetdb.conf
+
 	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
 	elog
 	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
diff --git a/app-admin/puppetdb/puppetdb-7.5.0.ebuild b/app-admin/puppetdb/puppetdb-7.5.0.ebuild
index 78bd75a0264e..d3f27c98cbb9 100644
--- a/app-admin/puppetdb/puppetdb-7.5.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-7.5.0.ebuild
@@ -81,6 +81,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process puppetdb.conf
+
 	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
 	elog
 	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 9718768ba40c..f604f10d4dbc 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -2,6 +2,6 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-7.2.0.tar.gz 62897576 BLAKE2B 63a8a7ea001757e15224ec819d9a23e23d3e568832421009118c1c4c3880564f614afcfa593e7c0c580cd2890ab653f5692cfc7fb23992ca7674cd5a56fa3f50 SHA512 ec90220abf4901ad98e1e07f65cdc25f09b62fda22f915260519d6fc599d36ea3a5ec2bfd5787cc9459d3c25753ff5eded2c09a67a614da1d6dda0881262b3b9
 DIST puppetserver-7.2.1.tar.gz 62917686 BLAKE2B 2a77423a932d7c75a164818d011feee1b789759046551be0d0275436295c47af6398222a223409a28b83c8186caf0d9f6e2d9ab4fc606214119bf0b56dc4d4d0 SHA512 ac960b756e6cbf32e70d1d209c6202973ffec17b553a68eaf9c0580ff4925656ae1a7616e45bee11f2a06544157d61e58b94bf700d39affd5d0116840c3fc10f
-EBUILD puppetserver-7.2.0.ebuild 5325 BLAKE2B 63fbd9c252c64476df2b8592c34ccd2e67bcd39b41686ddf29f49cf860ccedbc3193b8e9adb95edb8cd3cd75da448e0dd9f202da5bbf0cb9bd1bbbe61f996a29 SHA512 191d5c6fa5dd735838814de6b7c62bf44c143c64d470aaef171f27eafa6e1576643b2614620cf7f07919a16388fbb58ad9b89124ada6bcbe287b4cd88d374bf9
-EBUILD puppetserver-7.2.1.ebuild 5326 BLAKE2B 1ac5bd0287581c9bdaf1de5cf664224f33041661f1c60f78cb62a16a3dc90861c6618b0b77bab7a8c62a29bd3f70ae8b33cba2a93aad586a24dd4926264aae63 SHA512 ac7582cb40523158a82ed01e696cdb34ffd86b34a846afe6424419541bf87d520d094279300c6ec681f637f7096069a13565aa43d0beb448547343ac7b3984db
+EBUILD puppetserver-7.2.0-r1.ebuild 5330 BLAKE2B dfa1d0d6d15ca5e965ac2bd7dd8cbc89044db60ec4eb1bc71d17bbb8243b29ad6c5a75a623846f576e06edbd997a5b525ce2cbe1c044c7a4493083bc13e5e376 SHA512 f42646b2e12797783a3c1b67c06adf1eafacb734108c7b42d6a68595f51ae751b00cf74657107983a65ca7192aee7929d96f971dfc408176cceb421d19839376
+EBUILD puppetserver-7.2.1-r1.ebuild 5331 BLAKE2B 999b5de0b2165e1e198abec668f9dd8d5efeee7f8282a9bed8df074e8a1d8e0b73cc6fae5eaae0c6916b9931f92480ad90516b625e435c214c525d83348e4014 SHA512 1ff8e175a7b11f5398f49bfc4e3fa426ef7c5eb1fe229d50d12427955e322a51cd19b7c888d568ebd63ee11a199eb03e0af71eee42b69bcaff3e93741ba1ff09
 MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-7.2.0-r1.ebuild b/app-admin/puppetserver/puppetserver-7.2.0-r1.ebuild
new file mode 100644
index 000000000000..c2df215b358d
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-7.2.0-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd tmpfiles
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="amd64"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+	acct-group/puppet"
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	keepdir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process puppetserver.conf
+
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
diff --git a/app-admin/puppetserver/puppetserver-7.2.0.ebuild b/app-admin/puppetserver/puppetserver-7.2.0.ebuild
deleted file mode 100644
index 4d5a6144923f..000000000000
--- a/app-admin/puppetserver/puppetserver-7.2.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
-	acct-group/puppet"
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	keepdir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-	insopts -m 0644
-	insinto /usr/lib/tmpfiles.d
-	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-7.2.1-r1.ebuild b/app-admin/puppetserver/puppetserver-7.2.1-r1.ebuild
new file mode 100644
index 000000000000..15e9859ee758
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-7.2.1-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd tmpfiles
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+	acct-group/puppet"
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	keepdir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process puppetserver.conf
+
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
diff --git a/app-admin/puppetserver/puppetserver-7.2.1.ebuild b/app-admin/puppetserver/puppetserver-7.2.1.ebuild
deleted file mode 100644
index 0cf80aca0efb..000000000000
--- a/app-admin/puppetserver/puppetserver-7.2.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="~amd64"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
-	acct-group/puppet"
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	keepdir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-	insopts -m 0644
-	insinto /usr/lib/tmpfiles.d
-	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index fe16bdc16d2f..7487f33ba60b 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -1,4 +1,4 @@
 AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
-EBUILD pwgen-2.08.ebuild 592 BLAKE2B a0c50ce96642d24677027e4175abb34588e461b67e972ffee31aa2c3a05fcad49debe01a16c66bfc1005e590f78254276cec63bfd6c1f06a43265be0a0656179 SHA512 a8543cf56dc8d9744f9e3b63a5ea33d728df4de81edb0af5c3a9c634e621e241fcc2e19d758d5e31005da75e1cce55bd69e70980f74050d0a2d186fb414092e3
+EBUILD pwgen-2.08.ebuild 591 BLAKE2B c4acd75771f8a8db67aa1d97ecc55ea61252d7e1973a5015675c871f7d2796a4fdf892e8bd5eb10540bfa7e3b590ceb9ee68b2abe5de28a7159251076715ed52 SHA512 061569ac2720c90bae5ea677ccefba18c5073a4993307012382bc4763a1235a4abeed58574696c92c4717af52efc1e9e9055c22084814246ab02eb8aafa8bd9d
 MISC metadata.xml 800 BLAKE2B 5a0d864ef0486780ff7b3c11b2bb9517b44cffd9bca0e2f0a271c7ac5706908e68aca646f88a6ff2c4e946decc5857488c56a1fd116ad5d23e75af519d870db5 SHA512 9b373a948f74ba60d4ac120115cc9f4f2f9c4823ea679227693d725bdfb83378f8f2c279140ef34f6dc32a5c2ad093688a4db21f3ec07f73c7753fe741a17e93
diff --git a/app-admin/pwgen/pwgen-2.08.ebuild b/app-admin/pwgen/pwgen-2.08.ebuild
index e1c446a50cc1..4c84b08861c9 100644
--- a/app-admin/pwgen/pwgen-2.08.ebuild
+++ b/app-admin/pwgen/pwgen-2.08.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="livecd"
 
 src_configure() {
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index 3eb7ef82ae93..8e86ba5c2542 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -1,4 +1,6 @@
 DIST Rex-1.13.3.tar.gz 349550 BLAKE2B c2ccc2144e56761d33ed2b5d790febd49863639d2e3bba8028b7937b43eb51e7e59e9e99cb1d67f247b2dff8ef91aa04776afd6277ad8a2370f35d71e0b528dd SHA512 beab22aef8ba620b6e74847698eab99977844d2e9632812a9ae0e1ee303cbe4e5a6489000bd5209d76e42e3bb4bb799a90408ed6fb14e034f68132a4d37766dc
+DIST Rex-1.13.4.tar.gz 351011 BLAKE2B ec046b88f4443b03c05efbabb40900085293c61dab0ee9818a8c4d05be3cc0a1c1f53738b72cc245aaa2dfbcb00541f0e1e31b0c20f2464e9fc6586ed10707ef SHA512 27b76f4b527b42ea0b06dc1de05254dbd6e2fa3bc9a8a708af7557789ef22aec374a5d0585bf3ec4ee878a5387d51b881cf95855dbd05149b7b23929de12027d
 EBUILD rex-1.13.3.ebuild 6441 BLAKE2B 66c2402b9ab177af0df3beeb9725ec93f70ef58c5fb7e6ba9318206bde4917e65f808d5ab0d7b974626c4c70260b609b5cc6159203a237386ac38d2657e7033a SHA512 fb0c69768c9332888f89d620776288cd2e1a1333a4d2487be8082aa3c05b50b5f7194664ad7b66e40af8ca9b3fdc29fd41a60cbe8a90cc345069962db33d17b5
+EBUILD rex-1.13.4.ebuild 6441 BLAKE2B 66c2402b9ab177af0df3beeb9725ec93f70ef58c5fb7e6ba9318206bde4917e65f808d5ab0d7b974626c4c70260b609b5cc6159203a237386ac38d2657e7033a SHA512 fb0c69768c9332888f89d620776288cd2e1a1333a4d2487be8082aa3c05b50b5f7194664ad7b66e40af8ca9b3fdc29fd41a60cbe8a90cc345069962db33d17b5
 EBUILD rex-9999.ebuild 6441 BLAKE2B 66c2402b9ab177af0df3beeb9725ec93f70ef58c5fb7e6ba9318206bde4917e65f808d5ab0d7b974626c4c70260b609b5cc6159203a237386ac38d2657e7033a SHA512 fb0c69768c9332888f89d620776288cd2e1a1333a4d2487be8082aa3c05b50b5f7194664ad7b66e40af8ca9b3fdc29fd41a60cbe8a90cc345069962db33d17b5
 MISC metadata.xml 23996 BLAKE2B e168b5ecd856cb94f71ac6b49a695b376be4823c6fc009d04a0230a09d930cf96a57b7a72ff0ec14e3c4e09bafa1aeabc06927a746051b756a4b855fc4aba0c1 SHA512 432480499c91ba14994cde0ecd3d07618ae53ba9046893d0c2efe38c1e9946ab7d26746af86b854903f3b8dbc34403a3bf4b84070af77edf021d6e1ff5df6fbc
diff --git a/app-admin/rex/rex-1.13.4.ebuild b/app-admin/rex/rex-1.13.4.ebuild
new file mode 100644
index 000000000000..cad3166f1de0
--- /dev/null
+++ b/app-admin/rex/rex-1.13.4.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	GITHUB_USER=RexOps
+	GITHUB_REPO=Rex
+	EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git"
+	EGIT_BRANCH="master"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
+	VCS_ECLASS="git-r3"
+else
+	# This is intentional to stop perl-module.eclass doing magic things when it
+	# shouldn't. Like making ${S} contain "Rex" when the git clone has "rex"
+	# Also prevents perl-module.eclass provisioning SRC_URI
+	DIST_AUTHOR=FERKI
+	DIST_NAME=Rex
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit bash-completion-r1 perl-module ${VCS_ECLASS}
+
+DESCRIPTION="(R)?ex, the friendly automation framework"
+HOMEPAGE="https://metacpan.org/release/Rex https://www.rexify.org"
+
+SLOT="0"
+IUSE="minimal test"
+RESTRICT="!test? ( test )"
+
+DZIL_DEPENDS="
+	dev-perl/Dist-Zilla
+	dev-perl/Dist-Zilla-Plugin-CheckExtraTests
+	dev-perl/Dist-Zilla-Plugin-ContributorsFile
+	dev-perl/Dist-Zilla-Plugin-Git
+	dev-perl/Dist-Zilla-Plugin-Git-Contributors
+	dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome
+	dev-perl/Dist-Zilla-Plugin-Meta-Contributors
+	dev-perl/Dist-Zilla-Plugin-MetaProvides-Package
+	dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic
+	dev-perl/Dist-Zilla-Plugin-OSPrereqs
+	dev-perl/Dist-Zilla-Plugin-OurPkgVersion
+	dev-perl/Dist-Zilla-Plugin-Run
+	dev-perl/Software-License
+"
+RDEPEND="
+	!minimal? (
+		dev-perl/DBI
+		dev-perl/Expect
+		dev-perl/IPC-Shareable
+		dev-perl/XML-LibXML
+	)
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	dev-perl/Data-Validate-IP
+	dev-perl/Devel-Caller
+	dev-perl/Digest-HMAC
+	virtual/perl-Digest-MD5
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	dev-perl/HTTP-Message
+	dev-perl/Hash-Merge
+	virtual/perl-IO
+	dev-perl/IO-String
+	dev-perl/IO-Tty
+	dev-perl/JSON-MaybeXS
+	virtual/perl-MIME-Base64
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SFTP-Foreign
+	>=virtual/perl-Scalar-List-Utils-1.450.0
+	dev-perl/Parallel-ForkManager
+	dev-perl/Sort-Naturally
+	dev-perl/String-Escape
+	virtual/perl-Storable
+	dev-perl/TermReadKey
+	virtual/perl-Test-Simple
+	dev-perl/Text-Glob
+	virtual/perl-Text-Tabs+Wrap
+	virtual/perl-Time-HiRes
+	dev-perl/URI
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl
+	dev-perl/YAML
+	virtual/perl-version
+"
+# NB: would add test? !minimal? Test-mysqld, but I can't get that to work
+BDEPEND="
+	${RDEPEND}
+	>=virtual/perl-CPAN-Meta-Requirements-2.120.620
+	>=virtual/perl-ExtUtils-MakeMaker-7.110.100
+	>=dev-perl/File-ShareDir-Install-0.60.0
+	virtual/perl-Module-Metadata
+	test? (
+		!minimal? (
+			dev-perl/File-LibMagic
+		)
+		virtual/perl-File-Temp
+		dev-perl/Test-Deep
+		dev-perl/Test-Output
+		dev-perl/Test-UseAllModules
+		virtual/perl-autodie
+	)
+"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" ${DZIL_DEPENDS}"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		"${VCS_ECLASS}"_src_unpack
+		mkdir -p "${S}" || die "Can't make ${S}"
+	else
+		default
+	fi
+}
+
+dzil_src_prep() {
+	einfo "Patching dist.ini"
+
+	# This block of sed invocations removes all plugins that aren't
+	# useful for users to have on Gentoo, because all of them are
+	# conditional and subjective style checks, which don't indicate
+	# a real issue for users, and paying the price of their dependencies is undesired.
+
+	# The {N;d} trick adds the [n]ext line after the match to the pattern-space
+	# so that the final [d]elete deletes the next line too. Can be expanded for each
+	# line, ie: {N;N;N;d} deletes 3 lines after the match as well as the match.
+	sed -e '/^\[Test::Kwalitee\]/d' \
+		-e '/^\[PodSyntaxTests\]/d' \
+		-e '/^Perl::Critic::Freenode =/d' \
+		-e '/^Perl::Critic::TooMuchCode =/d' \
+		-e '/^Test::Kwalitee =/d' \
+		-e '/^Test::PerlTidy =/d' \
+		-e '/^Test::Pod =/d' \
+		-e '/^\[Test::CPAN::Changes\]/{N;d}' \
+		-e '/^\[OptionalFeature/,/^$/d' \
+		-e '/^\[Test::MinimumVersion\]/{N;d}' \
+		-i dist.ini || die "Can't patch dist.ini"
+
+	# Removals/additions have to be tracked by git or dzil build fails
+	# Spurious warning during src_prepare
+	git rm -f xt/author/critic-progressive.t || die "Can't rm author/critic-progressive.t"
+	# Spurious warning during src_prepare
+	git rm -f xt/author/perltidy.t || die "Can't rm author/perltidy.t"
+}
+dzil_env_setup() {
+	# NextRelease noise :(
+	mkdir -p ~/.dzil/ || die "mkdir -p ~/.dzil/ failed"
+	local user="$(whoami)"
+	local host="$(hostname)"
+	printf '[%%User]\nname = %s\nemail = %s' "${user}" "${user}@${host}" >> ~/.dzil/config.ini
+
+}
+dzil_to_distdir() {
+	local dzil_root dest has_missing modname dzil_version
+	dzil_root="$1"
+	dest="$2"
+
+	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
+
+	S="${dzil_root}" dzil_src_prep
+	dzil_env_setup
+
+	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
+	einfo "Generating CPAN dist with ${dzil_version}"
+
+	has_missing=""
+
+	einfo "Checking dzil authordeps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+		has_missing=1
+			eerror "'dzil authordeps' indicates missing build dependencies"
+			eerror "These will prevent building, please report a bug"
+			eerror "Missing:"
+		fi
+		eerror "  ${modname}"
+	done < <( dzil authordeps --missing --versions )
+
+	[[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
+
+	einfo "Checking dzil build deps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+			has_missing=1
+			ewarn "'dzil listdeps' indicates missing build dependencies"
+			ewarn "These may prevent building, please report a bug if they do"
+			ewarn "Missing:"
+		fi
+		ewarn "  ${modname}"
+	done < <( dzil listdeps --missing --versions --author )
+
+	einfo "Generating release"
+	dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]]; then
+		# Uses git sources in WORKDIR/rex-git
+		# to generate a CPAN-style tree in ${S}
+		# before letting perl-module.eclass do the rest
+		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
+	fi
+	cd "${S}" || die "Can't enter build dir"
+
+	# If you DIY installed Test::mysqld, but didn't patch
+	# it to handle the fact on Gentoo, mysql_install_db is NOT in PATH
+	# tests fail. So this test is patched out if mysql_install_db is not in PATH
+	if perl_has_module "Test::mysqld" && ! type -P mysql_install_db >/dev/null; then
+		perl_rm_files "t/db.t"
+	fi
+	perl-module_src_prepare
+}
+
+src_install() {
+	newbashcomp "share/${PN}-tab-completion.bash" "${PN}"
+
+	insinto /usr/share/zsh/site-functions
+	newins "share/${PN}-tab-completion.zsh" "_${PN}"
+
+	perl-module_src_install
+}
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 3babbbf68349..abe79cffd866 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -3,6 +3,6 @@ AUX setools-4.4.0-remove-gui.patch 1015 BLAKE2B f81872b140107337466e1d57bfd3c193
 DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8
 DIST setools-4.4.0.tar.bz2 275218 BLAKE2B f716a78dd628e0309d3802f2155ef3a045dd8ebee7dec42be9f8b5fc0069b0df4e3d827b0a0cc03f7f02f5a3dff1d7ab7e4eee0d83d6cf4c87af82fe756a9321 SHA512 2ec92d7a6e30261549b6a8d2f17175d4a7d8313ef0cd81f4a19a91c53fe0107bac9a89c19dd67a4c534ee51ec520590795b4312f9e03e69fdf1763b0c35291f8
 EBUILD setools-4.3.0.ebuild 1261 BLAKE2B 2bab4af1c52f47255c6b54fb533084022005c875c7c7dd73738d60c4a8510d3e37467a11a19e5d3380ec2e677e8e2d65b4ba9c12ed51a8502cb2709be48ff308 SHA512 8ef6976367724748118cd44c4c1c8ee1de6d2f993e78193a45163ec7647c6949bf1226eea600d5a9e4f0fb12ac17ec4e6a33feaf5e10f5bd14662823d22f1d09
-EBUILD setools-4.4.0.ebuild 1341 BLAKE2B a78f22acfde7eb0a0da22b672a31f758b2ad2ff485f19403abf00bf43fdcc2f8ba2b47a9df2fafe459ff4fb019e9ac4395d9a5b66e7eb3024be83f4481c659ba SHA512 708cd5d964f498761dfbc617ffed13e9c276cc130d253183ca490aace0f9bab43802d1d7efd92f6ac4e78f2e34e89730f09d1faabb6177b55407666a7edd71c6
+EBUILD setools-4.4.0.ebuild 1340 BLAKE2B 141a159a43a8e665794f8a5eae69553407672740a4f79c02e156d93694a1890af29faed372fec687bd28d7befad94f2fffa2eee48c52ad31cc893729b18c67ee SHA512 0a22277a938f769cfe2b9b0b9b3fceaaf146727e3e511a4a2eef9f518021ee0c6b3962bb95f23f022c9f94e1d4958d39c68c58d6a229ceafb6fc65b2bcd6b26d
 EBUILD setools-9999.ebuild 1342 BLAKE2B 8fa289b9c6e405f27cb8eb402a955f89483aa30ef4b3fea57f99bc313067204836a57c017c00736cc0bd9002f2bb6c1275bbe868aa8109c9d68116304cf7b49b SHA512 61a36c4eb0c09ec23aa84728f917e30730d25e0cab7063163e05b3354cf5d61933d571849fe4e256aa0c532cb15c416d958432b46aa660dba8f5a62461c614a1
 MISC metadata.xml 334 BLAKE2B 7fa85c132495c221d8618934cfe5481df604ac8c4bf36878f36d8c35b31e923515634124b0e3b9abda16b748a7684463851574a23428dfdc54bd8a7bd3625ad5 SHA512 52b24eea951558dca0db5c046f0a803c94ebd9d9b42b4a317ecd2d60f0dff885872fc3813d94f4c5c5b9ec2696f609f59cb34f406348f3a75c7ce270218d4513
diff --git a/app-admin/setools/setools-4.4.0.ebuild b/app-admin/setools/setools-4.4.0.ebuild
index bab448134a71..fccf62f23698 100644
--- a/app-admin/setools/setools-4.4.0.ebuild
+++ b/app-admin/setools/setools-4.4.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
 else
 	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index a21dfb76246d..58ee52d684cc 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1,4 +1,4 @@
 DIST stow-2.3.1.tar.gz 654191 BLAKE2B 9fd54fd3ff76aa7b72ed973cd6d70b8dc747fa3bb1ecc6bedd221b308d7d141a21a2f077c67efb432f2c7c4fb6bd126639038b196946206bf4a7f95040477ab2 SHA512 e9a7de1a6f10eaf7cdbe6737e0a8be1498e2eac46b6c57e65b83759b061efd1c0db45f7cba123e35428307e3aebe5baef9ea8bd4b5eb6ec5e1b159117a760441
 DIST stow-2.3.1.tar.gz.sig 833 BLAKE2B 9c4e3d5f59f793b629e27fccda6dd6c8934b3055b4104a6452dda866908c89c11845f9da68b1cfa78662421f1642c27c2d5957042d861be26951ca78203b1c2a SHA512 87cf2cb3a5be9b80edb2a4f6ec97e193d67b1301edb87664fec6d3b51a1bedd2635fcddd92825a1efeb383cad3c06662f436d3c9b301e73862775f44b324fff5
-EBUILD stow-2.3.1.ebuild 892 BLAKE2B 658a056418feb81c8d22074b93d057f167b0d78a2b12a3eb7e3f1a91444f248c4373ddad30b30f8507fd15930f19938124860e7610d2743566d691445fe897c2 SHA512 f818150ce5b4cfdfb1186a278332e26f50b33a4b40b9a4c0081aed1f050d8dc7d6a8c8670b5bb0b72cea74536ca014f76197471c5c1573dd612fc877c029207d
+EBUILD stow-2.3.1.ebuild 900 BLAKE2B 98ca56731d54357efe9078fbb1bb0fb8fddc563ca0344b347a73930fc447d375474def121c206df4023d758fe83a803519cd16b820944733f98cb6486ab23c6d SHA512 4d107d5904befcd83a7e729e6b5a75a5f143bbf4714f0e7fdcce100934ea74c555331cb489c73da813d913977f1a1ea89fe284a10419d8d45430aee39470574b
 MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/app-admin/stow/stow-2.3.1.ebuild b/app-admin/stow/stow-2.3.1.ebuild
index 85cbb9866c54..e0c065ac9e2c 100644
--- a/app-admin/stow/stow-2.3.1.ebuild
+++ b/app-admin/stow/stow-2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/adamspiers.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/adamspiers.asc
 inherit perl-functions verify-sig
 
 DESCRIPTION="GNU Stow is a symlink farm manager"
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 7e230db2e5ca..93e18f4d9d57 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -144,6 +144,8 @@ DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1
 DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip 7657 BLAKE2B 068727abe4a8d862a04d3d269d431af59cf048d596dfa951112c40e249b623278eaa74aab6a0afeab45bb62d77ce7fa3c5f341d3236c4ebe1c7c92fe48984b31 SHA512 c147af6f868c87dc6b1b311f5c78496dc8cc65e2cc3c3984651751f58a1762941d555f74936554a0beab1bb8530f7c6e8c249d83548a348fe83918644b89303c
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 15013 BLAKE2B daecbcbb12a60a1423c4f419db44a0d63108fe622cf843593abb16fd75dcea703b3cf56f1c13433959eccbfb2a9bd5640f837f4be3296220366438dd7ed04f86 SHA512 44ccb3d6134742a80ac15830613c169d1b0d43e6ce40c2f2fdea07203bec134e1ba80dc57c6d14a007014ea141dca311b3ebe61b12d2181311665a9ffe83ca39
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip 14678 BLAKE2B 3f95d78aa356a314f8da501f8085a880201766e184abb6c222c45e09c0c3b5e1e1eb7b89cc8ed46b77b09be8860fdf3e28525d9a451964ad64a96c6ee848a41d SHA512 be60a4c8059a9cb07ceb12e079b1224b6f871ecb1d7953906ab303cfe86d00cb979e203299f00fe828b2f6d2a3f5d55814c50809e9b872ab6d96db73f3771498
 DIST github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.mod 35 BLAKE2B cffc4d93883796250299293231d8ab412161515e4dc1038531dccc53b3a53e4ce63dad27376d730433423c8a26165f44ec9fe8835b644c6f548751321bec8ad7 SHA512 b09dee249fe3328abc4372180964ef265d8db2b6c2676b5d71dd1f04f65e4192315b00a7f5f9f573c193d53c31c0493dcd8d441ea8d3a1d340ed531bb7468ae3
 DIST github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.zip 10363 BLAKE2B 00106cd55d9f8b6bd6799713be177e95cdc6e549d06a5bc954048d822d246e41ec77c2f87b46a571329356af24ad3af25f8c12ac612e43c0a7f8e7172cad3cb5 SHA512 9ff25645bf0a60fd37839b98171adba445869762b73c1582f939fb924bf8007d02777a95b152e0d706d3a53b3c55e672e369ea0cd0c938d22fbf0dc1c6aac610
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
@@ -164,16 +166,21 @@ DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod 170 BLAKE2B c8f3e464fd2cb8f38cf999a300b44307a1e3d40101460176aaac8467ec7d371f08c69ebbcae7ad8086a48a02a0dd7fc4b1cda1bbd7b5199c4b76f1ff0492d7b3 SHA512 4cb0a4f9d5f74f3115a10661469cafa88044a8ed2de959b26054441714080fe8d639485b69df02e0f91fa9040db259fbef8281971c28a67953a5abe5b7220ccf
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod 170 BLAKE2B c8f3e464fd2cb8f38cf999a300b44307a1e3d40101460176aaac8467ec7d371f08c69ebbcae7ad8086a48a02a0dd7fc4b1cda1bbd7b5199c4b76f1ff0492d7b3 SHA512 4cb0a4f9d5f74f3115a10661469cafa88044a8ed2de959b26054441714080fe8d639485b69df02e0f91fa9040db259fbef8281971c28a67953a5abe5b7220ccf
+DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
+DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip 12336 BLAKE2B 9af04c73a7345883b0255c644a2ff626825cd80c98b8254e270c338e796ff594f2c14ca3fe3e6f8fedb54d6ad471a88e4c8d1fcd13bf3830bbe0231c68ab6f32 SHA512 b3b5b92200ee866c9d587be1e3a0dfdcd237ec787fc6cf35321306363bb64a5080291ff6f14be4c387a2f76437559fc85c11da9ccddd0894a0016e637a83950f
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.0.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.0.zip 96300 BLAKE2B d9e4ff7f3b689cd42913da0edddad4860724e757d5ca1e5fec6308103f2dc4251d8f64f8550910935edb57f9a8c73e10b720745775639469118fd5d55eaa946b SHA512 c296db7c49e7a51ac966d48d661c4d1734f319879d539530215dd9ce7415df15c6fb9942a7113e0e1873801b2b557410ba8e1efd622315f512cbc23c18b85ec5
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.zip 2350671 BLAKE2B a92ca77a13f725d8200c54b38feaa8bb930e3f1bacafe8ba58da87d8a10a2997b3128d169ebe815b44b3e49aff3c5da59aaa844d585974a78ae67c46e2ad868d SHA512 20785f6bc9c10177063825a51a4afec84bd069f1876f5caf633379f1c638467cc94f5a4841d245a95e403d075643b7d975cb487b9b3a8c4800c23c320b917770
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip 10848 BLAKE2B 6bafaaca5b1bf59ac01421e1726f48de06015b36217f9f08ac776428a9edf089bc64382b251be8a02ac537366542ab160c028af668316a0a821486e29b012116 SHA512 7ec927cc2547c8307631198f09d32507176af71bbf03e7192025798dfd34eed3a8350cc0c5b388069eb6f426352d0688e3ee4baab9cf78b18176eb7e46bfc09f
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.zip 109300 BLAKE2B d76af4585d0240852a075ec55fc5a2d139cfde0530fb306893f2d981b0c9d5675eb162fe14bbf51b67f266049795f9e002f4929ee51a5686a59826e0ab4de3c4 SHA512 8e27958a53533d7412defe10e7be2c479c8d147001f4cb0e615a130ac362d604d334e35b43bed92a10f33fe72fbf7609aea46b910f53c2b7f7f15fa1dd088fb3
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip 57782 BLAKE2B cdd50ecc0cbd0c7e58f3e6ff91cd26f7a212f4f62cb10358e1729b6b8be346390f1659ec7443a0c48f280c4a499f399b3ab3c03ba897ba8a7a61c336ff6f7c29 SHA512 e0ac39873cc584e40df505c3c01d20771d3a5e06f1c2c78a046971a220f029795b4cce7da71b497bfb618c0159897640c6606a4bd0d446826b142430f7f66204
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 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
@@ -186,6 +193,8 @@ DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip 9787 BLAKE2B bf52b08f028
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.mod 36 BLAKE2B fc3f6a7a743de397801f3814ff9d164976370c0b4084806b72d93b027c85f95a2a4beeb7b87082b0c2795f3108e95b1906b16e04317eb0722dbcd558cce03733 SHA512 61f4f9c015313ad381be1c47d53278f5215c2aea5ca778bd117061652e6a879cb77b3f786797fd6fca3247f2ff22d4657d0dac2f8a8105758bd4223fe3f5d7ec
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.zip 9862 BLAKE2B 1afeef2dded5ca4ee36d0f29821cc9eae0a40b605b5a82caab987b7269fefdf4379960ad0565b21ac33c2fb64c8fc1c5fbab078fe75e7e0d2b2725c66c9030de SHA512 2e1990eecfb1d73d4c3cf8205e700009076ff7745593d8cfb1f9a010dc2a96d58426b009c7b86042dbba69c40a8ffc82997dc4935ccf7f48f45fa2f26c36cae1
 DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod 36 BLAKE2B d46b14a3eed14f8d5886e333deada157d9484ad3bab124d3d57d9fd6a39242c2272417df8bb31e08361f2be8b11dda9e96600aa800879f393c8753330eac4e68 SHA512 7ffd6ce59d5c5fffc6ee8e8f48e1e7114628ee2631abbb1a3591b794c23b2ce6dab10f67b8b76bf82c73e1cd8614313b2bb1152b829a8875425f1a603ee394d4
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip 26646 BLAKE2B 408dfc541d7bd0692010d6071f96db972dbf84b0e9dfe552db221cdcc4011f023dcfc12e7c9657696c9ad204c6587404f793b4785beb78d53462764a2da96c5b SHA512 fb53c8511a1538397edace6101699904f19e63b82143b56754ef2a62d457fd34f6bfa907d379964c427ad8b7d38fa9ad186bc66d4a103c7f118b8734324593ce
 DIST github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.mod 35 BLAKE2B 18effbab22ec81323de6616d2177fac8d3d81a02de8fe8cdc427a969e6ca54d5c6c84898598fb0970ac12c4577ad10db1b04715fcaaaa1515ca291b7fc4f289f SHA512 f49d53dcb97d48267dbb282392bfb57a39ca600e4e61bd0483e27573dbe80e60334e3b023a6db6d86d86681a88ea25061d6724d656b1fe8ff5d02bb3edbcff85
 DIST github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.zip 3006 BLAKE2B 78b6c92a698fe1bc7d870b5219da44e4249b9ec12a31eaf9b438c0a1f421f273cb1b11a40dba55022c90af217c4afed112e5991655b14b2a04991764c117c65f SHA512 5f7eaa50e67ef3ccb02ca7d21eb2660395d08f2c86cb2c45bac07a3fb38d7bb783688c4ed7202ee86312b4efd488defdee2893b80a78bfd1046306c4b787614b
 DIST github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.mod 429 BLAKE2B 1b89e15ade551911f2cfeb241f1707157c1a0427871f0c4ba0eaf39f04686a6fa2a72f32bc6fbcff7e113a1cd7bb731a1bf321dd4007489e66faf612428e2a97 SHA512 b5b4f0f88fc76c4ebc7d203729b095a969d2417a59a605dc78dd7eca128aeaff5a5f4793ddd9281adec7e65c14f2e1121778012e60bdb10b8ec9f84d9b13e6b6
@@ -228,6 +237,7 @@ DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod 29 BLAKE2B 5311a22
 DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.zip 37788 BLAKE2B c23c30419fd55a14451ffcd5b95ac35ff704ad6d1d0d4b3d344c9e3e0afe3adcc619ee2d99630dd9343229a890d8331183806eaf0e012b8597d7a5d285ec3b57 SHA512 2d8bb8c9051997cf18289857515a09c6a5b2475bdb6a54206bfd1cb213d1e3516d50f3fc8879d69174dc5f91b0b81d23e834095684b39d4d850c0aef5321e3fd
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv0.0.0-20171007142547-342cbe0a0415.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip 2737734 BLAKE2B 6d5345f7334008fd717d25d3a3d8f18b77408de943a1deb60ec3fc488ead17a2d41fb2f91ee174195b87f01446fcb61106fa2798acbfd2c477863e7a1740a71f SHA512 b86f02e94eccf0d66190b6ce8025774e2c9d181d4308a4725c2dcd3e7234e71965250826c6ef604665922a2986c3c7e54309b22004fddafe8ebbabe33baafbe1
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
@@ -325,13 +335,19 @@ DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
 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 github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip 79096 BLAKE2B dfe472a48935e77689778e60ac3379abac11b1fd632c35033f4ba19afc601175a26e38bcdcaecdc56250d1b90aaa2f7f499010040eccc49e477dc904202de4b7 SHA512 4506c31c8d95fadde5570686eff451f177ff4bcc80469a5bdba92b65afcfb2597d05f14ca724e8dd40b43b867ab9eef1f62d98d7afed6bf93cd33b689d646c3c
 DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20170728041850-787624de3eb7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.zip 165533 BLAKE2B 04307e864994ddb9d843c45b57eb5bcac0c5d13aa18e63da83767803e4c1dda72d0c17070d566f6040bbd561fbe46c97bd2027477bbc23acc8b27fe68d48e4ef SHA512 dc279707dde421e9650071c85d85e5311053b1ade53dbaff95e71f3619b54d91200a8836f342d5bae6a324aa27474329bc93323e13ef8a64f79114159bfb79f2
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip 138925 BLAKE2B 34895513786f190d7379e74e7256b9fc18fb82bcc985866dc94ab2110fe04c120fda46b2f2629b87d9d0380e21420a625f8206782c67ca5c0e71c6cc8309b9ea SHA512 39bb926ff817750578322805bcf412db6c09ca5b7dcd237fed9f64df51222de62b62eee275e6d37c7dafde7dd8fada499c344c62c3ef0a3bd8d27053057f4079
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip 35110 BLAKE2B 4ebd3cf0dc4580a53cbefe7a955cf05cb6d1d60a69951ea4e18eaaf108ce2cd5bfd0b2dc4bed62a12b48922f6f9dcdf1e598b77a946bfa0267314caea827286d SHA512 5c8e6beedefdf390a9eda76fd8d5042323e1c9a6306605ec7ca8b1612bc038a6cb0c02ca1093e0b6373a05ea64b7eb0c0bc62720a74b37d4ceb61564f4d46753
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.zip 421304 BLAKE2B 4c4754375d5603517ed3c272832b5f15958c17806266bed6582d9996d952e7870cd17b547faa6ca9a1e34c98885641c39554816d24f4ed0edf106c518b16fa52 SHA512 c1e49a03098892179f8fa98aa5873085aa3268e782501e83cef88fa909a05336c61dba5fd7094d49f03fd163169028af661699f63ccd6836a67762d7453da77b
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip 429863 BLAKE2B 51d2d6558bb657231d7e7e9561e42018196902dd388a320726a5f5c93b1111c8ed0b8c6eccc62b2e6c49d4b09f084ad99a8b17ce3944963e990c75271ee6f8aa SHA512 3cf71984f9b4974a2967b5d0496bf9ee28f248f10133ed54017c02b7d2bb9e04dcc00cd3873f5a8b9fa4ae7d6cec619a4ee4e97e6dbfecd886df10de47017fda
 DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.6.0.mod 226 BLAKE2B f7f023e293b358c278ecca07bb202f1bd82d11cd79e3549b1a9cbcf2028271ce2f40fff8c8b59cf4a5b2c0af4f92f08a07e71e1251fe9b4ffcf7b29538f97b9a SHA512 28a25ca24c618a16d228634c3330de7aa8a90b3199c56e4bd6bd27e67ca29e4a62ccdf4282fbfee6a4d7a6dbe84d43ad778d5cd883505472920cf939a0719dc7
 DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.6.0.zip 40186 BLAKE2B c9cdd3ecaf2f5ce3301c3275b30425d4448f15a5da4a1ccd3d5c04795e25fbc580791c790b32acdb9bc3aad17dcefee88e59fe8e7cb49705648a8473f9aa780a SHA512 3ea5c6e9705cc3c1241d8caaf15b140d1674a1ccd29781cce0e6502703ebeb09603b9f5552b115729a1a924e7d32c6d662ca460aac32344216b2092454ffa755
 DIST github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.mod 35 BLAKE2B abe58b21d1d4bfd808722eedf7c5539a14f98cf479cca98e38905373a84b0d230168d22f6cade1576e145585289a01a69597d1158a893db6b8393a203d4b295a SHA512 30a341d9047bc35fa2911b119514c68e9a29ac0b57ab84e820b5a52f968fa7968d662777dbdabf06f96f0a4398339ab4d25c714ab7addb833e5c4d6e938a9fb9
@@ -402,6 +418,8 @@ DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.zip
 DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.0.0.mod 819 BLAKE2B d92365f486528e4ee8abf0a03ec17a4177ee070de453b1bf02af7eb13a944fe85ba81976a5d61cb3e1fdb422e188ebbe62e5db6435eee56bb81ef8f5d5fafbb1 SHA512 f87d8a710287fc690267862806a9a2c320ad0ad6a3b1e80ce5c0c9f23a2cba416599fe855bd4e852384c885fa8dd92345311e652f19eb2c67984eafe3fba322a
 DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.10.0.mod 863 BLAKE2B f2f19ec678e886c0aa71289f49e306a1bf83ed38dcaba44646315e29344d060678b3d9f498f640330c2c5dd9a634114ea6228f754743a2b3a1fce6a35a8a696d SHA512 dc3bdcf85d1106276cd63c16b735cbb6ff1694a3412e93b31c8686155a6b42e22ba3d48c7a30ffb44a1238ae9e7740fd0b39a7d2ad714b7e143c8432912e04df
 DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.10.0.zip 531430 BLAKE2B 345a4f442c4749daad86cf873525e54c96ad9d4f5a595d90539d682d54d525a784f16e134e3cefc123870c0a96c8574b8da1e69d1196866b5bd106bb90d381d5 SHA512 71d4e3424450c4a8f504fb49c8482a1500a059666b2d2ba94321e9c0b38e8b7212a61696f4055425aa0ed393e537dc5c96e9bae249da9510304e805405bcc70f
+DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.10.1.mod 863 BLAKE2B f2f19ec678e886c0aa71289f49e306a1bf83ed38dcaba44646315e29344d060678b3d9f498f640330c2c5dd9a634114ea6228f754743a2b3a1fce6a35a8a696d SHA512 dc3bdcf85d1106276cd63c16b735cbb6ff1694a3412e93b31c8686155a6b42e22ba3d48c7a30ffb44a1238ae9e7740fd0b39a7d2ad714b7e143c8432912e04df
+DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.10.1.zip 535167 BLAKE2B 2af380559736e5f64c740a35c985ab262711cc885530f498bbc65a84d715974a105db71bde443aee9edbacbe43f36f86ba7b6916c58d6777c73fc0737af4f6ff SHA512 df813c520da46e81edb40af248169dd1ae1269104bf7f9c88826fff2a573a6e576a2e73f9c2e9d3e85ed6dd0667913d5e718104ebb56abef126ca37caff00312
 DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.9.1.mod 863 BLAKE2B f2f19ec678e886c0aa71289f49e306a1bf83ed38dcaba44646315e29344d060678b3d9f498f640330c2c5dd9a634114ea6228f754743a2b3a1fce6a35a8a696d SHA512 dc3bdcf85d1106276cd63c16b735cbb6ff1694a3412e93b31c8686155a6b42e22ba3d48c7a30ffb44a1238ae9e7740fd0b39a7d2ad714b7e143c8432912e04df
 DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.9.1.zip 529975 BLAKE2B edda1ac182919b13e7500b00f5d67b82ace64a279a83939e12093186ef37092a929f10329970ad75a7bbb4aab533150298553c940c33ee9da45c091b754ad791 SHA512 d94bb99dd31bbe8192b86571cf14dc02fd9db5a35ab5479fe0c8c6a7fd3d8b541c6d3391af78b1d6ae25337236ee9c50e53481dd268f1b2bfe75ab5740134c6b
 DIST github.com%2Fhashicorp%2Fjsonapi%2F@v%2Fv0.0.0-20210518035559-1e50d74c8db3.mod 36 BLAKE2B 50966eec34e15885b67cb768f7007d78c34f2a17f56b1deb98512182e79ce3472ebf912e35b076e11f4c414b1666fccdad4fcb94ec27e2487c8bbcf64338529e SHA512 18c7a8d6cc7869ef6a25f68005f96235cda1ca72e9c765b7dd23d3a543da8e2e68e8824d631b122a04ebb2292a54846c547af8967279408b9c909d80ec09cde3
@@ -429,6 +447,7 @@ DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip 38997 BLAKE2B 792e9f0dee385
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.zip 30042 BLAKE2B b14fbf7999bbddca7c82a13eb46485682474824f9fa310c69c4376ae5111496426a9b4b72df6a009efc2f3530c56eafd73bad9df8ca2436211a2200cb812d810 SHA512 fe7617211e425fbf6245c55d42d436c5600e89b84a17f59e56563cde8e2957fee5be9b570f546836627c021b7896d3a7e238ad8adef66f4c3f08f9d231bbd93e
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.0.mod 270 BLAKE2B 5549706699b1adfc2d01e7fe9e2bb7f7ce3f58fa81c921f3eb57dc7b2f418d3e8a690b1c4e68ce49a5e722a9c800a7a68c55ca453d60fb171d2442a2abfa6531 SHA512 9ffc97ac538d2bbd9ffd19857bbbd42846987022919e1da5f7b779bb95a1bb9e13b84c4397e2df796a4e43982e79465063b910b4cd9220b6119a2550a0f1cc5a
 DIST github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.0.zip 643347 BLAKE2B e1a5a00ddb690f18811b7c304704fced71d8775aac45757b2e6d1fe0c5f0b142ef91e7e047896deacc9a28e41fc38051eb8f51fddc380efc604e886ad380b306 SHA512 2dc9e5fffb23adcd89ab91efe3846ca9563a0e9b650a72f37331e323c59bed070ef6c4e4169ffcad257b1e529b6a47fb0d2687efa48502b665567c49a00ba6ce
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
@@ -443,6 +462,7 @@ DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.m
 DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.zip 161148 BLAKE2B bfa0b01c4e9fb0b576b1ac3b96d4045591ff9b64c7d6c0626dd1a315eaa270889f5634cefce54bcad390faa6d3e1bdd940ca09304d4fbd38580f17e166ad6e47 SHA512 e56b1ebdebeaa8c48d2ab2a934ea5be6f5622a8d2d64e0d8621d054b64f81fc5239ef95b1a0589505a67303844757be6c98116abfcbb200ca71b297dd5dc4b40
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip 131514 BLAKE2B 477f1ba8434036d96652435c432190539006ee38ccf606671cf319e356c6047c3913c6dffad6e4af13e023dbcb6ce93455797e37d3e5b9524b75ddbcbe0e906e SHA512 e64c91926d1e3688151b4f511f506fe4c2acd0a2ab839a43d12c77145e23215e7ce3ea281651f46bb945a07e04a1d2b6bccdfc3d862b3b7cce074e5817ac014e
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
@@ -453,6 +473,7 @@ DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.zip 9872 BLAKE2B 50868
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
 DIST github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.mod 34 BLAKE2B 478d9f3a5b214f002fcd08abafc3b9738ee5a997c612d017bf40def473be58c81d69489ecf546cae460f2ee38c9489ccb1c3bcbf1c27ca572169425b059c3019 SHA512 535a205c3f8b1d8c1c0cfd13ad5881f0174977c0de81ab5927d5c23c99f067eebc8f5c371530234f9626252f52832c3e8d229ab3c0dd6472bd570ac4464c7e36
 DIST github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.zip 8274 BLAKE2B 9f7261226e45d83c0c0645eb1df0e99fcfd3e5de3e0f4bdfdb702aa81f6e4f9b9d0e5a36023c2c723893e10697acce9b32e8a806e9e231d9d150340299f9224e SHA512 0ca91b5d7133f7e71ba33e41f5d87b39eee842986f7c356c1751d03377ca266743b1b00ac912631b8c96f82de03109e3141273730accf160f1a2b91791bdf016
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.2.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
@@ -499,6 +520,7 @@ DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc016
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.zip 6915 BLAKE2B c635157b3fcfa5f9d990bc2c452c6e038ac5549ec3100b2df80b51271004f75700c9f6144ce2ab61002d7fd6eed4dc02d7928336149c7e59b7be03835873b2e0 SHA512 a11d1e71a13782e0890369c4fd52a1e29b2e8a3ee42ba97ea2b479b0c43c260c37dcc648e1625f1437769dcd0bd07f04ae502f48749745fda22f0fa16328a9eb
 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.2.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
 DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.4.mod 38 BLAKE2B ddc3076fa3a93a287dcc66d087fcfa08483a03baeccc6fcfdca7c390908cd0b83017754103a78f6977c929d24868a9ce78859bf9e270fd84b5fb38ef8f939f9c SHA512 79ad90998c2a3e01501014598c152d4d08a92d354678b5e395c4a16ded8519f12e4ea883485ef49f07e240c52e075c7f9a07a410eaa9a1aca3657cfbfe4b6368
 DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.4.zip 6594 BLAKE2B b15e08c63310a36a0c142ad2d04773e9bf0ab3603b39e5252dec6de6b186d1f101f0778c54c931b8a3ff1873afc70d462e0a71b8349eff663ba1a7afb66e4fe6 SHA512 a538577dba9d9b918d9354174ef97507fa8908a48f17a3c0fe97e4215535a6dde8c15f6ec5e807f2445ce6bb80b276d83f21254e58af9a0cafa4ab9013c8d1f0
@@ -554,6 +576,7 @@ DIST github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.mo
 DIST github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.zip 5536 BLAKE2B 4aef4f0b7976b684d558a78b210af19968c039430e8444c91be6bdc55dd9728c66678e840f6e89932ea8ce368ff3a1087051e6a9e0f624c5426031b97b5ac6e8 SHA512 8f33d00e767a0209538bc96087cff921f42b710c88e335eeae1fb06a1435bd3f8ba604c629b2d8970510e6dbec7853087be1a957c4ada8fa384dac90f93c823e
 DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod 28 BLAKE2B d1f2187d0457fbf3087b388af0e41fa8c7a6c1d54c9f22fb631a144f42adf679bd372b5fc45f8d6f33d7e3cfbd57c1b7da2c4e969ae32185281390db58e9acbd SHA512 41e5c366b775318a4162bea00a6fa4e3d5a23c2ddb5c2707e4a4fb77c42855ce407429a7cf9c8e506bc79493ad5c56423c70dab081187ea6c94fbdaa0d5040d7
 DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip 8493 BLAKE2B 0f00762e52e47e39e2c76907ef393dae846d9a49422e066c82ebba3e769ceab17df6fe1cb473ba490cb3b2c5c5aeb1616cfdb42b617c4685ee2066f7fe9612f8 SHA512 08341ab41505c3a098ec989ff43d8e460ec2b449b9a4cce6cb6240e33f8580f75071c2a7e7c8269f6cfa3fc2a5e33a3315af0fd2ae80bcc0901cc6ae9118804c
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
@@ -581,15 +604,22 @@ DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.1.zip 24699 BLAKE2B 5e3b644d12a
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod 443 BLAKE2B 2bc1a0ca986dd17787cbf528312efc6e721d3d9a46126b90537b7cae6681192e74afc83f3b64f8835314a0608a3f146e3fb74afc3339bb7b009d16ba04208cbe SHA512 e45c711b58e0453c63b899faabfb662fe743085dbc82782ef730ef6797fd8d372208d4fa887168ac920d6b1d15f7f65fc9a3fbff25a4474915d858411a7adee8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.zip 203807 BLAKE2B 38f6971c3cde204ef50304cce44c09a0e8b6f4bfd793a50255edc97fa28358259943fe8892427eefcc74d96aebb2378e655b90247d54e39802f3161a1d9b15ef SHA512 0d5c11527f2c8d41dcc962a3750bc8b6e25acc8e53089c9394744bc85690aa132f961cba7ecd5c7a41b1a8b338b8d6badcf13810ad640900e3fdbd0d4f0e5c31
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip 200972 BLAKE2B 6b6aa2cc4006f6671b0f54def912df6ff1aba7b69bd08c1950f7415032e2de383af556cd793f991989f1542cab5d7bc8a73894504c2f3b757a23007ba76b21b6 SHA512 c01081549c9e62a75d99ff37fb4bf3e620dd9e6a22a049c1b0b1b53604086ba68a5c366a7373423354b25cf7298c642956db7eca4b04be4b9431fe24ec8da125
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip 69219 BLAKE2B 6ecc62f2f3ae4622ba6e19c51f7ff7ca3bafcadcb38cb7a9d79dfcc2ddd7183d79dca8e0d6b534f5a2dc508c21e0fb349310b4feaac35c1f7b1166c3febd1228 SHA512 934c3e50ebdc1ea65ccfd4de1e2e0f0ebdece54be1cccaffa5e325c667ab22bae84a7fc7ead1066e75094697a86452fdc36fab57b955f42337708de32e7eec32
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.zip 139422 BLAKE2B 8a7bae0792b45bbc14f152be071b52651c125f64630709bd7539a4a6bebb9a2305a4dc5c39b882190a46699124ca491e5045ec631d0a544c5ec03f1fb00d303e SHA512 83799d97c51ca8f9a557366506ad82a9e1edeee8388ac77f0cf86ccb17f84d99a3e3efabcbb21c31e2eef50a59aa860482900c0dd103b27bdaf141328f830fec
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip 151692 BLAKE2B 89c5a1012d53a62b773c2c3e9a20426564f01e70abd39ea67cc76abc00f38e6f1443ccb31c0ad89920cff80ad94c5f7e72c5d67eb3aa44e047c0bea758be242b SHA512 121a4e3ffbf959722b4333b5e449dd54b6a84548bb580e429b21fc6fdb6a494456ea55208a039f7be6dc7b7fedcf0c6183edd0dd727cd7ebe0ec517a8e999c85
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.zip 103441 BLAKE2B 0db2c582c9c3b88adfde32eb9fac2bf855daf5392e0ce4b712a12bac78ae1825e2c74d64f69e85430dc2da800f47a8437c3b12531ad0941d2e3ff08e757718a0 SHA512 6e1bbf3b89c135896ca3d0f520bff89a54be03299a2408f81f727fbfe8f933abb11a2e4e2fcebba0dc3fa464fbef2fe8a02f397c9f590c6bcae4053851f0c6af
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip 132055 BLAKE2B ed3f24a397ca21aee9972a2fb1bcd12acdcd5b7aa5b21a36cd8e8c1b1e04bf3a1264cd7b21147e1f69e76792fb0d36f4cd44f51178376a9daeb092e69eb8a2f3 SHA512 e3f4d97e22ad8d27a3c8bcdb6516f4e1574348b864deb6f1569f3d94098987f35bc87c7a34f95e84834fcd8c750b3a177f847b586b72b91af0e0f9a735bc3f20
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
@@ -600,6 +630,8 @@ DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip 52931 BLAKE2B e511ef9edf7d968d848e021658001daefe7c8cc7169b1c6984ca5388fc4d6a5f54def9060483e57392711617892d21322d9de099234901bd1c251e57e6489f6b SHA512 e3d8a20d1cc351b8944579988feff39cb0aa3e1f2aacf2e2307180c25c153a0473f2a5a3ebda9d96868cb1f477ccccffdce06b117be7fa5409b2d1926b4c270a
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip 52967 BLAKE2B ffc9e503771f88257408708b3e0bf6f1d0c9a36dfb10d6f4f6377fa7e97599b1993f6198a8dc013d29ef17929a83562eac4f5eba1e8f51148b189a94128a4314 SHA512 d30efcc17654904bafaa3cbac0c2aae4b44f83dd347c8ae4ea77f5b637ef4371e08e6d8483ccb8a73273ff9fc91dcad43e8c536ebf5de9b69bac66cdfbf6efe8
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod 41 BLAKE2B aeccb766735cab34f6559537127886e3227273ec40f78cb289b852430e5cb967e2b3b8a798dd20ab0d1c8481c62d25976a76831092bc114cc6c04214ce7ab081 SHA512 8ce1457d8f4e3cd2d997306844a157198039ae5feb9132f22d5768c1de32800469f682d33a8c3c455f7728332136f376858c23bf00da180a53f9d32d4e4ef291
@@ -608,6 +640,7 @@ DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b392
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip 26744 BLAKE2B dbc7578fcac5c616d1cb5dd7cae959ee8df0496532db36d78d617ff265f213e4e5a336d33b795e793100c1b8e604919ca6fabb1736bcea0c02bdd0f8f0cc931a SHA512 dc990fd4f640acaa66baed26f2e82e0a6c46e293b016bd1573e72600e1256146f1b8abf746ebd96771bad4f3d95dded70c9f884908580ffffc4162efa0450735
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip 68547 BLAKE2B 608b2dc4f6e135b208d273d5e6de884f02eb15ca5d790104c4b2c449595c3c8984238cd4889215472cc2383968ea4d78f75771a2c66b7041980b8f76884b54f8 SHA512 6be9a4d700abf43f9eb8279b601339ff2290f6278fbbaeb308a9d51d621881e613308595dffb8d843d070bc3e21caca3ebaf20ffcbc60cdb2f8590cdcd30c595
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
@@ -631,6 +664,8 @@ DIST github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.0.0-20190808065407-f07404
 DIST github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.0.0-20190808065407-f07404cefc8c.zip 101665 BLAKE2B 0741fe0249d4b9eceacfb4083cf6eca6fbdc862caa11808f9554f4f5a203d02160703e816f1ff8161e38c9111ca371388571b4a674a60266cfec643c1a46d267 SHA512 4cf5248af38da717c032d78d06a9457ec2a2faa7a1ba15f83f7baeff517eb8f7a2b2f72fb5010f5c608201a5951268f0a9746307699969162470ca95384a0b0e
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.zip 13531 BLAKE2B 7da23f76d1f6cfdb578c6826a9746381c6227706fdd4658f30bd088883def6662c17d3c06363ea4b9007fad4e7c14b7add0e96380bbe4f5b7feb03125bc830b1 SHA512 6142450cb34a7688845cfeecfff68957118b039d9117ab75584132e34f8ce12ad8ffd24578d1d602c7a98fb2b6b494693ed4e509df2d6130e1d47c5bebcbb420
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20200427203606-3cfed13b9966.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20200427203606-3cfed13b9966.zip 14185 BLAKE2B cadb2f5385b4d6463242d7d86f7bfca610be66a6f98efaa612850f85716ac463eaf708dd72f99d279f86d069b5c809858933fc70644c2efdc81499a2c428d5c7 SHA512 3902b701054a7e360ed023e31d82e02cc18ce4f27ee9e319729c6c841420f50f62614df714e77ac60a84ad42d3196a78b9a290d0e2442d9dc20d2aa169616c7e
 DIST github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.12.0.mod 389 BLAKE2B 555f8d3d381c55c4f2879545bd0b39f68539fbe3191f13e05141e250b97ce0b691578e5a4ce3ee7e5d240da2ba629f743b688a4027e5b1a3c51418a7bfde6387 SHA512 eaf483275fe2605f1d12f5d2cae8e80b0257ec6a9e8d52257f67dabd7215b9b42b2e5260363276c2db17a63cf3bcc18aea5b0aa36109d98b40a04b24ffc3b410
 DIST github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.12.0.zip 729715 BLAKE2B a0970226f00ff2eb82dcdba7d9f2143fe0129c553eb41660a6aa110af92a7a14c6c1d0b2209dec19172bee663f34ecbfc49483314abb4e9953f1e0ca17df0180 SHA512 d575a099c6f14ed363e1e64ff4c44d18f151c59d3cad88a07efaa700f4f27db4138ad44b39989f92123a78a3d49cdf1c4b411ac055632095ef2aee522a64b61b
 DIST github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.15.1.mod 475 BLAKE2B b67cab22d6601cb13feb66c1f33149c70dae0fe65d3f2569c0565af3f53d42c6edacb6c7b201fcf9d005e16e6d525d4bf053f78fdacd42c532219f5def41915f SHA512 3ff183920425daa73dd14c627e533c9dd6a279013626a982991ec0c0ec464d1bd917e705a7a110f45940d9204db5f9b8fb3997fcf799d70d3f4b1551478368cb
@@ -639,6 +674,7 @@ DIST github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.mod 28 B
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.zip 355151 BLAKE2B 845d552a6f36dd795cb634fbfca8b7fb3b70f783bba125827ef11729296621cabcdd1ad5e605f9d6c6148e1dd401efb4c80c7f2de4fe8143e05f7c5dc6e607fc SHA512 1c7d0944948442d15a2befc4d5817883a72b95d9bb0320be569863a64139bb45df5f0a06805f9893de657c6ac78cf6f3e4793d78cd2c674eb1eba86305faee66
 DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.8.mod 40 BLAKE2B cda2535ba0a3160edbe7d8908e254248e06311ace58d75f6e0b2c75fe1e68f534f68ddaf77a0eef2844b87c2b0234323d8b36a04ce39910cd5e3c0701073f350 SHA512 fc06f111ad8fe91b6233781e300d3abe760140633f45c51fc7b93c744b870f66727d12132e692b5d59526fddd1f728d7a18976e392052d9fe362d3a39149cbb1
 DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.8.zip 511586 BLAKE2B d4050d69ee4cc166f7ff244a5fc91afefbf2174f08af5db760205ab57cb547ba3ddf3e1e5cb0466db4d5559834ebc798d635f9c9083b19468be2dcaeaabc84b5 SHA512 f728a00642c34c8e665f5443b86940b9c00b590df5192c3acd5f6b20cb3b1d94125e3e194f017a99b8e56437b5530e3db2f97454d6c19c0bb2acf8097a4300ae
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
 DIST github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv3.3.3+incompatible.mod 38 BLAKE2B ad63f2622bcdf456d30122d1d6d93400d706923ecdffe13656683c5b6937708f7700c4632e3cf23992f46f35b74ed133849e42a70c85d2197a8c6a37a7e483ac SHA512 12e2b25a46cd8c1c59f7120b0728115e0586d453a57ad6c387798adc6fcb9c3536841527503fd4acc0be79b951fd389a7a50f1708cda0697e8fca46ff17f86b2
 DIST github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv3.3.3+incompatible.zip 38424 BLAKE2B 94fd5e9da2c5aee5cb65bef9e1a28731608565365bb91d630ea4fe7a8776956c1868dccf6933aedf2d003c031621961aeab59d67ee9c0ff00a0a26eb4654db08 SHA512 665321c09469854f87f352d6d83b2492a994dea0ed90c14a88853b2a053fb96899b5a1ae1a79d8f8e14c307f460854d23a63aae1e7f647271ce2c2fb090f835a
 DIST github.com%2Fvmihailenco%2Fmsgpack%2Fv4%2F@v%2Fv4.3.12.mod 382 BLAKE2B 6f41d1e7f377e399c8744e0cc6ebd6bfa3bbf716061e40dbafe8710440beb4d577907263e88ef25a96fe35c261791860c469d46546ba22f795403ed4ad2eb618 SHA512 59caca36c98f86ec974b2fb0d4787a2d112e5803c40495f97e482021aaee53807819a72dcc4cea8b5b849bd5c108cd635028d42958014304c2bf307095cff16e
@@ -649,6 +685,8 @@ DIST github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod 168 BLAKE2B 61409485b5a15b
 DIST github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.zip 10353 BLAKE2B 386f5fcd209b8a2f2428e8460dae57d3f5a41649f8a42ba7c5c0f2037fa3b858e949ad3b526d99d71a4f5b094d5b409788dd398a8daacf8e28166be7f290c936 SHA512 8feb5dc97b7c8acbcb7989f7ee6d87b1b3b1074163482438c609418b0dd02135238f80edd968ef7a730aced473d18ea08f5c23ab8b0f7a5e63e76d39d7d8cc96
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20160813154853-07dd2e8dfe18.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20160813154853-07dd2e8dfe18.zip 5189 BLAKE2B c33cf849489426ecd3357af65e5e7bffcfe099d68c45533d034c24e7ddf777c8b35906307adf3776dd68066a3d279f524cc34d64357d50b75dbc224ae0bf6b2a SHA512 ced3e4a27e6f88594e9b752950551157b7e0c44f3daecc45582b8c481c3241cc4777fc1e3e75255a888151772a8121c9112830d2cc78d4951500e6b8b96a6118
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip 5264 BLAKE2B f6d986c7f5fbb1960fa1b62a5722d426c3ab79d865cb179bb9bca5a213bb2008a3cf4edb59dba1a336928cb0bd05d31f7083f394cec09270e66b55cd4a045b37 SHA512 2a8e1f10d10e4479568374b9e51b1b8dbbf1077d8af413d7dcd254ba1dc1cd38ee19e75a4661a4e237d3662e51cbcf96a08bc69a2e5beaf34a2559fcfb9d653c
 DIST github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20161029104018-1d6e34225557.mod 33 BLAKE2B 1fb8495d86422bc87ae3a29d7040d3deb46560e8986404fe66da26fa2f7eea5f38b1ab84a67b8e79c544841627025e882fee2aea3fadd75f69f1761238eac23b SHA512 3f30afa5211772645ee93a8b11eeec246fda17559bb23b1bbc93b614815998fcae1f45827f12922fd8d51bf84425e2154f690728a63b510d278d60a48549fb77
 DIST github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20161029104018-1d6e34225557.zip 8240 BLAKE2B f296b3627e88ad94f61395fd4a7a3622c88747a4314ac1210168554dd63161f214eb6908ee7ee303c7885871265c36b4593891600568e22258e86a5ddb65125e SHA512 14e663d7e0ea19d40586075cfe99b3838c021636d67837f2a128f45ba4ae1a235690c27cdbff12cc76cb632d92bed765ac4cd9e24ef61f138d759988d42c45f7
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
@@ -664,10 +702,16 @@ DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.3.mod 207 BLAKE2B c6fa7bea22c9783
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.3.zip 269513 BLAKE2B 2cce2f2d45a6d2a8c286134d835bcb9b54c4db1cd2783e79b57704773733286cd5e746fa0358b255427b09e4d35e448293120bb4c0ca2540cdc038cf49fb39ad SHA512 bce627c80fbb87a2ef290fb0f523fd754b9bb97eb5a903b9f8e287da9797c7b05d6e1c9d08467257a5d72e2a671c8cf47265ee92dd3cb464a1550db8eb80298a
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.4.mod 207 BLAKE2B c6fa7bea22c978311fb4a7bc92da56725efee8c4055a63df58f09cca207fd82551b2108754a0ebb9e300bd4d05aab29ddc51f63c63df296690a3f213e9acf5df SHA512 fa73ed9738f477f22319d9ce7be0f655caeac3164097632425c8480facd0e50a385823093d490d795be61367c92afb8181b7c192ff94d07398874df8677eec7e
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.4.zip 270223 BLAKE2B 3170068408fa5019989d40c1b107f8ae83c471e59797d2355f370f64b46cafb9ff88593538e61ef43daf8bcbf7a38ba38cd15fe520898852e261b620f43b894f SHA512 5ed82db9b28cccb81c4146b5651e6ce2378d6f4717f298240d5e42fdb0274958f448c473d54ff319522807b3adf9dad1db53109e1cba1f8d050d766ee565b93e
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.9.0.mod 207 BLAKE2B c6fa7bea22c978311fb4a7bc92da56725efee8c4055a63df58f09cca207fd82551b2108754a0ebb9e300bd4d05aab29ddc51f63c63df296690a3f213e9acf5df SHA512 fa73ed9738f477f22319d9ce7be0f655caeac3164097632425c8480facd0e50a385823093d490d795be61367c92afb8181b7c192ff94d07398874df8677eec7e
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.9.0.zip 271139 BLAKE2B ef90f8609bb0443989de9b36f4d520a53666b06eade0f08dd04d4d5f13dd898846172d07085a177b7ffe1add1f7f44e71ec51852cd8a056cca4470e5ab0eab4f SHA512 ce93478d87524ae930da15e29487ad354597979036b75c482f49d3fed7ebbc5d536437e14a76790c4b432ec89ee6752d5d3b22a711e004e4a9d8d6a2fb844fbe
 DIST github.com%2Fzclconf%2Fgo-cty-debug%2F@v%2Fv0.0.0-20191215020915-b22d67c1ba0b.mod 128 BLAKE2B 8aaf551c3afef3baeb7382d33ae0c2467b31bb567b5131d5b0302175b94d2d70a1390eb3f51c4cb7ee4357eb84142bb85c4306e210a9150b828971e3f93d5ac8 SHA512 1695d6effa440673a8c8a6f64b8931c8d6ff3401c4a8020bcb8f899dd6498951cd8fef233fe353e3d32cd59f5db7e3085839f67a5d142e0d3fc0e7772d64c799
 DIST github.com%2Fzclconf%2Fgo-cty-debug%2F@v%2Fv0.0.0-20191215020915-b22d67c1ba0b.zip 11821 BLAKE2B 49f42fbdf99c028d1d8be23c5649652509ea302aa05708552e891557c11d9716b864804cc1234ec785c383c03e435b077b80b105172c766f7df4dea56a507ebd SHA512 8cc0a553b7bb7a8d3d08f23ac1531e4f6458c96d84aa2816722304410c6e977f5150603f58f0d4865664fa10d0159f434a160cc674896b1329fc765ef5bf24da
 DIST github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.2.mod 80 BLAKE2B 792b829d635e212603aa59faf482b301b95e5465e5544f28fd3810393bd270001fee6679a08567963e366d01e0f1fc9e8da9db5727669b6fe262f9d0f2db1431 SHA512 52f4cda625bf8ceda19e65dee204e30b1ceaa68b0a0815e925b22d41a02fce6b44e9e73b6d1e957c7826257dfecfe3d17b5c46da5668384957eb6b723e8024fc
 DIST github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.2.zip 68523 BLAKE2B a90db518f6eccf2664b55221e860ac52037ebebba5e69129497ff86cbe7f7f4890ebb78930feff7f987a5f14af1ee00a4c0febc23787afa2617f92ac4a11c26d SHA512 536f2184e0f721374b4e739096a57cba35d06ac5594ea1d3712d373a18d5f98a0fd479c3d1dd723612a8a23b1d83337c8823dbd039e9f825a8df747feeda7181
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip 112407 BLAKE2B af65ce0475f0b55ace7f03a7af6fdfaf8daae8b79e0ec1c9fd1aaa911cfe517c6760e6a5fb7881f87d7fed4da3274d14c78aa1424c85c003dc0fa98b092134ee SHA512 ff7060fd74bf2070006a55a739f6a8b64abc5ff09db2d2bc53fe978852e5b82f96bfc79c1f73b68e704bff423722f7adefba0b906de6d96d7e03c3e5740b7ac1
+DIST go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20210428180535-15715dcf1ace.mod 2199 BLAKE2B b20cac239312fc4abe97def27f86079f0fa274f0cdfeff885c41accb360324ce18a20c61da752af0d2c4d6682cd2eaf836ca7b50f60788048e90691d29b18efc SHA512 1a09c3fc71b8942c781cde21b70698d571fe716a605ae449b512622c47ea68b4604698c8250580a52a91869a6adbb21dea500f9d02651631f0e00e0636eab179
+DIST go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20210428180535-15715dcf1ace.zip 7131583 BLAKE2B b8e324b090246399f72fae222d6d5466f5c4fe71b62f6f9bad4cc2fd2e1f9719e20a55b7857d54c9be6bfff6f02dbe40f7d4fef2bb7ac5d22d80f5674ad49153 SHA512 49be2e167379677ae52360c6fdec1919b9995076486f86c08b644f4b57f43464af43d5bd95f6e35901dd70c3d3b2ebd03816baaacf0d36cf7a3a220b40c7b2fa
 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
@@ -681,6 +725,8 @@ DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip 15027 BLAKE2B 06a2451071b8cb0de9b4e664d007584998c91acf4bcca04be7f6c4e97c2579a9cc174e4db220347a00b252392cd6f3aa3e08e27ef3a231d422512a419a199c2a SHA512 be6b2545811ac8a869fd0365c1126be58531a6c0b51690feb17d7e88a2b79dfec6a466ac317df15e4d038c02df0f72993ae3e50a218c9f7f6659787c7f8e9333
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip 14488 BLAKE2B 3bb8df1a459b2cf1dd63ab200f06a9f41f968f828b815b70bff899972a4c913656dbd3856dc6f4626836175d32b63c439e32a5aeb6a034f4733e2d09ef53f7f9 SHA512 d5fff733045694509ef1100fb8701526002b0841a11b5e1acbdea7e186c80738f651bd973c5eba2db5d2b8fff1b3057ea5d7d0e46645268b2f3619656238fdf4
+DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip 224175 BLAKE2B 839e4b40c818d9ed889cb4f00b3b4c1e1a21add9e4732da956da63d77e5b8c2211443c9c2528f3c7a6886455d94d0818932e19876cf5576318426451d10eebb5 SHA512 deff970d323e0023cb39fd3aa38c419ccafef4c10af4edc8e9b70671e5892d60229e47f176495bdc4602b1cc4f344e8724e06eb740dd7858fde006bf121d5c1e
 DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
 DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.zip 221108 BLAKE2B 9f03d8b356ccff8e8dda9a4885d7fa79eeccb614415b1bc50ec206458f650456a9e1ade1401908b53c37a3b293cd3b7503b84104555250bc801e5c74b8fb9122 SHA512 259b357d0f31ae6ad5dd1b841d69d934b1d9d441617944d4b46269f43fb4de1cbf15750dac9dc87cf4260902ad2f4e4560e6e023375212e554d150fd65af5f9d
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
@@ -821,6 +867,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod 24 BLAKE
 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-20190422165155-953cdadca894.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-20190502175342-a43fa875dd82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -876,10 +923,12 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip 8609319 BLAKE2B a4459cdb830dd5de499cab9b0a37afa88f0cee1b3733a9d765a6693eea89fa5f7b2aafd9f5b27405c9bd38f27f715ef311845e52d3dedbcbf2ba020a04334898 SHA512 f40c677e92a896b7158f0b3ddb786e670a954fff7d981be3e0d3bc6d789d4f069174273050a0cedb8e2438d780e6950e027d84a2e2d64b7936e61edc613acd36
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20161028155119-f51c12702a4d.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 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%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip 11971 BLAKE2B 7b29c746b75b42c23fca353b8299a4feaf69556ce1395872470e891835a8dec88a4e4c3b64ba6dcb4b5512aafb9bb44cc38c68915a0f6702f1027cda89d03d81 SHA512 58cb42ebeb88c06e049caf8c609e95243e7bdba51057de7d7301885aa904111dbe85962b5faef216ae45aa73f371b5de6516800a6f5765219cfde3fb06372afe
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -1045,6 +1094,7 @@ DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.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%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
 DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
 DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
@@ -1099,7 +1149,9 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa2
 DIST terraform-0.14.10.tar.gz 2800197 BLAKE2B 46cf7abb960bb475d3042983d1e47d4f745e0444797034b82ee6416054baf5fe37eba8339325a014b3aae62028eb4f4c8203c6b9d0f1b45b02104763117fbf52 SHA512 639c6d4b517ac929204b4f74c5d649a141102117296a4ea81d250ea56bd47297ca3f00e8582dc7536bb324770f1d2c8d089bc10b4ff260fa69895e7c6205d80d
 DIST terraform-0.15.5.tar.gz 2885932 BLAKE2B 997ae485ff395d2174ef2265559cff4321545e63b1b7f7eba55da6b1cacfa4c5922eaf75dea220688a126bb7f1b093f884cb67e60bea1de943a9d715b9a7daf2 SHA512 d8636e2adfca58be42f88469759aede0f2d71b824fea187d67ef198d21742bc0198ad721f636f166523e0b7a92f10fdea9b445ff142464a148888110bd10a8de
 DIST terraform-1.0.1.tar.gz 2881426 BLAKE2B 8602e053c5ca23fe9dacd3517cdad8aefe88abbe0780dc9a430307e05697395c8c34e845bedcccb5547d721791954585295a2af909892c34346be0f3a3cc20f9 SHA512 9909aa0802d2c4a77d138f4415e7d588a6bd450d0bba3adda695877f51bd41a7b9584c42291d41fbdc20fc1788c1f2bde54417c40e8c824ac4854b8670450c67
+DIST terraform-1.0.3.tar.gz 2886412 BLAKE2B 748e7e9438f6f3a80f87dd03cb7319cf5c84383261951f964fbcb5349bef8a508c38581cb9b18ae0e6279829ffc9f36c377a5cd05d45ed11f257beee437b8de0 SHA512 037d1a42a79b1e441245f28c5548245ddf5f5000510563508fb1e2503563dc4b27d1451ad25afd3cdb18bc004e83cc692101fd90f51c3e4e836905fd7e0cadcb
 EBUILD terraform-0.14.10.ebuild 52142 BLAKE2B fa9347a9146993192c3e915de6f6dfd8759fe1108991d3b7f48699b13f4ccca8095789e84ce504f1a2fdd6a135090d67371a0dfe21d86f954bea7bcae51b02b7 SHA512 b9fd59984ec7195810eaa215a6fa8a8398752d36bafa6958b5cf8eff549b20950fe2d71d3c7e555168d9a80ca2aadfc9912c70636bb7440897870406140e94c0
 EBUILD terraform-0.15.5.ebuild 58399 BLAKE2B a73f374b870f4e7026e46f411d7b071cf005df9755795dca847050b4d0c740c31839eccdb9bca11083d6a83519b53b8dee676d86d4768c71a05c6780fbc0128e SHA512 4c353bf162f5606d744d7cadaa85cf204e96154f382fb92c1ee69dee3d79a0cffb33c5bf1cbbd794de3d3168b7105fbee3ea924d4b63adad50ae70978117adbd
 EBUILD terraform-1.0.1.ebuild 58400 BLAKE2B 0faccb9bb1c97ecc6a581066a86e15df7f0222f8749d894325e7511d1603c05c802494814102ad60011263d71d92f9eb2fa418485a8e17d7db715e8a8d561c1f SHA512 6d4a3c2ff9e0699485f9f2f48a521b5e23ef24bd97b91b13d2d63df30339b48131d8fc2184e55c10046acd40b71379c708e9b30e9caa1528dabb3b60f1861eb7
+EBUILD terraform-1.0.3.ebuild 59228 BLAKE2B 71817e8cc4da07ad08235a4d74e24d9ee00e6ce1dad457cf3a0ee8c81099f36bf2a2705b0338ecace5d8157ae4b7f27d2846239d92d752b10c08711f41f29e63 SHA512 27d74cfc52ccaac8b4c6baa0af5e5d086d362ea3184722254ca4b959cad40127ec0059dab9f744433ee1097cf83d6fae7a2944cde5281a74e971b1863ddcbe69
 MISC metadata.xml 1074 BLAKE2B f14c6ede900b616f5a5514adc9735d25fa834dc879712ab79b68fe15a927cb3e8e77a7b30ee8af3b44551be9ec2368476757c4ec5e5b44fcd266367b485fc8bc SHA512 2e28b3de2b512246ddfb76b547151683c4202620992f9453747b4869db1a16d92996cbf810bf82f09e6895ddc7b23ecc2e0ecaf43d9c3ba9e8a2fb53baa995dc
diff --git a/app-admin/terraform/terraform-1.0.3.ebuild b/app-admin/terraform/terraform-1.0.3.ebuild
new file mode 100644
index 000000000000..87cc9e4302ca
--- /dev/null
+++ b/app-admin/terraform/terraform-1.0.3.ebuild
@@ -0,0 +1,1089 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+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/go.mod"
+	"cloud.google.com/go v0.74.0/go.mod"
+	"cloud.google.com/go v0.78.0/go.mod"
+	"cloud.google.com/go v0.79.0"
+	"cloud.google.com/go v0.79.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"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v47.1.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v51.2.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v52.5.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v52.5.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest v11.1.2+incompatible/go.mod"
+	"github.com/Azure/go-autorest v14.2.0+incompatible"
+	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.3/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.10/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.18"
+	"github.com/Azure/go-autorest/autorest v0.11.18/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.13"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.1"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.1"
+	"github.com/Azure/go-autorest/logger v0.2.1/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.6.0"
+	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d/go.mod"
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/semver v1.5.0"
+	"github.com/Masterminds/semver v1.5.0/go.mod"
+	"github.com/Masterminds/sprig v2.22.0+incompatible"
+	"github.com/Masterminds/sprig v2.22.0+incompatible/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+	"github.com/agext/levenshtein v1.2.1/go.mod"
+	"github.com/agext/levenshtein v1.2.2"
+	"github.com/agext/levenshtein v1.2.2/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
+	"github.com/apparentlymart/go-cidr v1.1.0"
+	"github.com/apparentlymart/go-cidr v1.1.0/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod"
+	"github.com/apparentlymart/go-shquot v0.0.1"
+	"github.com/apparentlymart/go-shquot v0.0.1/go.mod"
+	"github.com/apparentlymart/go-textseg v1.0.0"
+	"github.com/apparentlymart/go-textseg v1.0.0/go.mod"
+	"github.com/apparentlymart/go-textseg/v13 v13.0.0"
+	"github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod"
+	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13"
+	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod"
+	"github.com/apparentlymart/go-versions v1.0.1"
+	"github.com/apparentlymart/go-versions v1.0.1/go.mod"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
+	"github.com/aws/aws-sdk-go v1.31.9/go.mod"
+	"github.com/aws/aws-sdk-go v1.37.0"
+	"github.com/aws/aws-sdk-go v1.37.0/go.mod"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bmatcuk/doublestar v1.1.5"
+	"github.com/bmatcuk/doublestar v1.1.5/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cheggaaa/pb v1.0.27/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"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/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/coreos/go-semver v0.2.0"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/creack/pty v1.1.11/go.mod"
+	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dimchansky/utfbom v1.1.1"
+	"github.com/dimchansky/utfbom v1.1.1/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dylanmei/iso8601 v0.1.0"
+	"github.com/dylanmei/iso8601 v0.1.0/go.mod"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.7/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-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-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.1/go.mod"
+	"github.com/go-test/deep v1.0.3"
+	"github.com/go-test/deep v1.0.3/go.mod"
+	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
+	"github.com/gofrs/uuid v3.3.0+incompatible"
+	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
+	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/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"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.1.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.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-20160524151835-7d79101e329e/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.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.3/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/martian/v3 v3.1.0"
+	"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/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
+	"github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
+	"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/google/uuid v1.2.0"
+	"github.com/google/uuid v1.2.0/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
+	"github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod"
+	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5"
+	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5/go.mod"
+	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d"
+	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/websocket v1.4.2"
+	"github.com/gorilla/websocket v1.4.2/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/hashicorp/aws-sdk-go-base v0.6.0"
+	"github.com/hashicorp/aws-sdk-go-base v0.6.0/go.mod"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/errwrap v1.1.0"
+	"github.com/hashicorp/errwrap v1.1.0/go.mod"
+	"github.com/hashicorp/go-azure-helpers v0.12.0/go.mod"
+	"github.com/hashicorp/go-azure-helpers v0.14.0"
+	"github.com/hashicorp/go-azure-helpers v0.14.0/go.mod"
+	"github.com/hashicorp/go-checkpoint v0.5.0"
+	"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-getter v1.5.2"
+	"github.com/hashicorp/go-getter v1.5.2/go.mod"
+	"github.com/hashicorp/go-hclog v0.14.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.15.0"
+	"github.com/hashicorp/go-hclog v0.15.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.4"
+	"github.com/hashicorp/go-msgpack v0.5.4/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.1"
+	"github.com/hashicorp/go-multierror v1.1.1/go.mod"
+	"github.com/hashicorp/go-plugin v1.4.1"
+	"github.com/hashicorp/go-plugin v1.4.1/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.2"
+	"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-safetemp v1.0.0"
+	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
+	"github.com/hashicorp/go-slug v0.4.1"
+	"github.com/hashicorp/go-slug v0.4.1/go.mod"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod"
+	"github.com/hashicorp/go-tfe v0.15.0"
+	"github.com/hashicorp/go-tfe v0.15.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.0.0/go.mod"
+	"github.com/hashicorp/go-version v1.1.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.1"
+	"github.com/hashicorp/go-version v1.2.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f"
+	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.0.0/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.10.1"
+	"github.com/hashicorp/hcl/v2 v2.10.1/go.mod"
+	"github.com/hashicorp/jsonapi v0.0.0-20210518035559-1e50d74c8db3"
+	"github.com/hashicorp/jsonapi v0.0.0-20210518035559-1e50d74c8db3/go.mod"
+	"github.com/hashicorp/memberlist v0.1.0"
+	"github.com/hashicorp/memberlist v0.1.0/go.mod"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20210209133302-4fd17a0faac2"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20210209133302-4fd17a0faac2/go.mod"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/huandu/xstrings v1.3.2"
+	"github.com/huandu/xstrings v1.3.2/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/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.11"
+	"github.com/imdario/mergo v0.3.11/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jhump/protoreflect v1.6.0"
+	"github.com/jhump/protoreflect v1.6.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.4.0"
+	"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.2.1+incompatible"
+	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.11.2"
+	"github.com/klauspost/compress v1.11.2/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"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"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/lib/pq v1.8.0"
+	"github.com/lib/pq v1.8.0/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
+	"github.com/likexian/gokit v0.20.15"
+	"github.com/likexian/gokit v0.20.15/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786"
+	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod"
+	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88"
+	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/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.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.10/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-shellwords v1.0.4"
+	"github.com/mattn/go-shellwords v1.0.4/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.8"
+	"github.com/miekg/dns v1.0.8/go.mod"
+	"github.com/mitchellh/cli v1.1.2"
+	"github.com/mitchellh/cli v1.1.2/go.mod"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod"
+	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/gox v1.0.1"
+	"github.com/mitchellh/gox v1.0.1/go.mod"
+	"github.com/mitchellh/iochan v1.0.0"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/panicwrap v1.0.0"
+	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.1"
+	"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mozillazg/go-httpheader v0.2.1"
+	"github.com/mozillazg/go-httpheader v0.2.1/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
+	"github.com/oklog/run v1.0.0"
+	"github.com/oklog/run v1.0.0/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.8.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
+	"github.com/onsi/gomega v1.5.0/go.mod"
+	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db"
+	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pkg/browser v0.0.0-20201207095918-0426ae3fba23"
+	"github.com/pkg/browser v0.0.0-20201207095918-0426ae3fba23/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.1"
+	"github.com/posener/complete v1.2.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v1.0.0"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.4.1"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.2"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/satori/go.uuid v1.2.0"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
+	"github.com/soheilhy/cmux v0.1.4"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spf13/afero v1.2.2"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.2/go.mod"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod"
+	"github.com/tombuildsstuff/giovanni v0.15.1"
+	"github.com/tombuildsstuff/giovanni v0.15.1/go.mod"
+	"github.com/ulikunitz/xz v0.5.8"
+	"github.com/ulikunitz/xz v0.5.8/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/vmihailenco/msgpack v3.3.3+incompatible"
+	"github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
+	"github.com/vmihailenco/msgpack/v4 v4.3.12"
+	"github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod"
+	"github.com/vmihailenco/tagparser v0.1.1"
+	"github.com/vmihailenco/tagparser v0.1.1/go.mod"
+	"github.com/xanzy/ssh-agent v0.2.1"
+	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/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"
+	"github.com/zclconf/go-cty v1.0.0/go.mod"
+	"github.com/zclconf/go-cty v1.1.0/go.mod"
+	"github.com/zclconf/go-cty v1.2.0/go.mod"
+	"github.com/zclconf/go-cty v1.8.0/go.mod"
+	"github.com/zclconf/go-cty v1.9.0"
+	"github.com/zclconf/go-cty v1.9.0/go.mod"
+	"github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b"
+	"github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod"
+	"github.com/zclconf/go-cty-yaml v1.0.2"
+	"github.com/zclconf/go-cty-yaml v1.0.2/go.mod"
+	"go.etcd.io/bbolt v1.3.3"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/etcd v0.5.0-alpha.5.0.20210428180535-15715dcf1ace"
+	"go.etcd.io/etcd v0.5.0-alpha.5.0.20210428180535-15715dcf1ace/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.mod"
+	"go.opencensus.io v0.23.0"
+	"go.opencensus.io v0.23.0/go.mod"
+	"go.uber.org/atomic v1.3.2"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/multierr v1.1.0"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
+	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/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-20191202143827-86a70503ff7e/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+	"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/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/lint v0.0.0-20201208152925-83fdc39ff7b5"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/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/mod v0.4.0/go.mod"
+	"golang.org/x/mod v0.4.1/go.mod"
+	"golang.org/x/mod v0.4.2"
+	"golang.org/x/mod v0.4.2/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/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-20190812203447-cdfb69ac37fc/go.mod"
+	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod"
+	"golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/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-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/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-20190402181905-9f3314589c9a/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/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84"
+	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/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/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/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-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/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-20191008105621-543471e840be/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/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/go.mod"
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
+	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57"
+	"golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/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/term v0.0.0-20201210144234-2321bbc49cbf"
+	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/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.1-0.20181227161524-e6919f6577db/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/go.mod"
+	"golang.org/x/text v0.3.5"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-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-20191203134012-c197fd4bf371/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/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
+	"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
+	"golang.org/x/tools v0.1.0"
+	"golang.org/x/tools v0.1.0/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.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/go.mod"
+	"google.golang.org/api v0.40.0/go.mod"
+	"google.golang.org/api v0.41.0/go.mod"
+	"google.golang.org/api v0.44.0-impersonate-preview"
+	"google.golang.org/api v0.44.0-impersonate-preview/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-20170818010345-ee236bd376b0/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/go.mod"
+	"google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
+	"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
+	"google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
+	"google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
+	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6"
+	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
+	"google.golang.org/grpc v1.8.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.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"
+	"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/go.mod"
+	"google.golang.org/grpc v1.34.0/go.mod"
+	"google.golang.org/grpc v1.35.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/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/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/inf.v0 v0.9.0"
+	"gopkg.in/inf.v0 v0.9.0/go.mod"
+	"gopkg.in/ini.v1 v1.42.0"
+	"gopkg.in/ini.v1 v1.42.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"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"
+	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711"
+	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
+	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
+	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655"
+	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod"
+	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
+	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.1/go.mod"
+	"k8s.io/klog v0.4.0"
+	"k8s.io/klog v0.4.0/go.mod"
+	"k8s.io/klog/v2 v2.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
+	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4"
+	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4/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"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/yaml v1.1.0"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	)
+go-module_set_globals
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+
+EGO_PN="github.com/hashicorp/${PN}"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+="${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	GOCACHE="${T}/go-cache" go build -mod=readonly \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/terraform
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
diff --git a/app-admin/xkcdpass/Manifest b/app-admin/xkcdpass/Manifest
index fe9dd3b7f86b..584c25141986 100644
--- a/app-admin/xkcdpass/Manifest
+++ b/app-admin/xkcdpass/Manifest
@@ -1,3 +1,3 @@
 DIST xkcdpass-1.19.2.tar.gz 2073808 BLAKE2B 19ad3f505ab672b1a2554e534896b15c77eb9741e7da01e22efff44d069ff6a482c122ec7fa616bc3789d2ce4bd5f6050c06bcff9661476d15fbc78edc505c36 SHA512 20376fc22fb4d251e2b921d4db48fea2109a4c42832614d41e807b262130111c58e01d1ded2019fad230a458953a2f185d92cfe95f3950aaa0a97750b3b3a2b6
-EBUILD xkcdpass-1.19.2.ebuild 1017 BLAKE2B 7c62cb22065aded7d6d66b26d298d8bd9664216c7a1e5979c8722a681e3b5aa8b389ab917749317618f28933531d901a614b23e7fe353856d718c1977adc0f35 SHA512 e856f101a1b7bc1a0f3dd0ed73dfa254a25a63afa394a3b67ffbe2c53b70eafcbb480bcafea0cc7b608fe46aaefd636ff208046cea996762981349286dc5f2c0
+EBUILD xkcdpass-1.19.2.ebuild 1082 BLAKE2B eeec356a8473d534469fadedaccb99472350bc270dd00738b46b88610a4f602a95d45f154bf7f9d2bd63b5aa7aa1ba13b968c98ab142464a4f4f4ff3f46bbfc9 SHA512 7cd61c38abee095ec1d40f74e37fb114c5cd9c1bd63b6a6f5d90a0a4416fb3ae5dfa7d8b0ea79dccf5baa3fd2cf1d1ba9124088f5d3c8393c0c74a3ac4ec13c1
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-admin/xkcdpass/xkcdpass-1.19.2.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.2.ebuild
index 904553903feb..f550986ee229 100644
--- a/app-admin/xkcdpass/xkcdpass-1.19.2.ebuild
+++ b/app-admin/xkcdpass/xkcdpass-1.19.2.ebuild
@@ -17,7 +17,10 @@ LICENSE="BSD CC-BY-3.0
 	l10n_no? ( CC-BY-4.0 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="l10n_de l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt"
+IUSE="l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt"
+
+distutils_enable_tests pytest
+REQUIRED_USE="test? ( l10n_en )"
 
 src_prepare() {
 	default
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 804adcae3686..ae6df15aa9e2 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index a49f4381c3cb..b90725c85e46 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -16,7 +16,7 @@ AUX freshclamd.service-r1 177 BLAKE2B 8c9304e8c43e03288dcb1c6897b53e7c36b6e6116b
 AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
 DIST clamav-0.103.2.tar.gz 13387954 BLAKE2B de0ececd2fe4486d2e8194dbeb45bfb74086ab3eb45fcab7590e75aa5a2242981066a4e8fa99b571cf7278f4516d986ad1a24254a8fe2c5caf4c870b3179c4b6 SHA512 87d47c4529a57da0b47b3744a279996ca24fa74ce10d7e27a53c19c1e13098af680e0e48ed767122bb2bbd3f927302451da84ccf51a933e7e3556ef43cbe9f45
 DIST clamav-0.103.3.tar.gz 13389239 BLAKE2B 1846cceed39fbd48fcf973d05a57901cf6f9ccdbb4d7eae501e712d84ab4d0a662e4477696aa6a1446116db85a89603428d7092a55e18f7acb805016d3cd5431 SHA512 c2ee24a6f63735c064140aa5baa347d51e8240b2f7eced3480d05435202aedd481fa7057fd40ecbc2e93a62fe8b0cefb574d8accdf9acede643ffbe0d396686f
-EBUILD clamav-0.103.2.ebuild 7297 BLAKE2B 40c860b711dab3cceca4f854e660a1303166deefe0da4a0eb7e6461ad040ec4196484376c2f5d86808ed64c96cf33d1ace904611f99764b6d839e988b6c7a9a9 SHA512 0c638901b57bc9bf7afd3eac018f3a9dc0cb0a93829f8ebdc29f172bd67507073e7fe61240fecc30b0eeab4b36da98f93f8f79c7a7d4da4913c208c48a9ba3eb
-EBUILD clamav-0.103.3-r1.ebuild 7313 BLAKE2B 449bf4e1eba2a78308ea0c1a9f7050e9b57fd0787c253e4e2630485f8d3e9fd3ff02c693ded75b594814e5b63b9f530f781f92571941dbabf6e40336790bb72b SHA512 07a8305d39793f5d9197025391cd25b1ef8f6d5318f99621dc98f9e733c7c994130bf4811a20da2b1ca9c160ac2c4d4fe052d83e76b331d1b0c090bc978ef50e
-EBUILD clamav-0.103.3.ebuild 7303 BLAKE2B 2e3e460a6c20e7ce2d09ca65b0555cedf4afadc3e4f902ae807fe532bc6f61e07d0bb8e26203fbaef13fd865660d30ef83cd9f1c875609d1ddfbf52c1c9b11a1 SHA512 0f11faddec0d91f6511bc82dbd5ad3c0fd4c1b5c86530cbf9a1774389334fee95c31c874b90cac555322bd062b16e045ae64cb481fb6de5d3b9b2684a392f484
+EBUILD clamav-0.103.2.ebuild 7395 BLAKE2B a014956d708aacb1c5904c57cb9c42b4c9255282f6718e6f37afba75dac7dd07da84e2cc17afb85ccab136e7d9c206ddd13257dbe6d3eb2a7c3c865b38cdd61f SHA512 bfdf8fe0ec764c7c165eaad8c090a33f182bf6e781745ac2eeb3ac51186d4128a8acff0ead73e4d5352e432c56ba9d6727f0cbea8c35dc6a6f552495c62deb28
+EBUILD clamav-0.103.3-r1.ebuild 7411 BLAKE2B 6aab6c68ecc942dfdd089abe50715ad76aec6bba4536ff38549e840c7e4e4216aa71540c821cf1eb3739fd382b380f1a0d99a11d224584b1911e68e2026ac729 SHA512 b879d03afb8113b70a9b0d17214c24a975b005d50bd3d406cebccfc7de2ea93ec755b27d0fceaf14b6ad55b859694dc05379c51e8fc0ddea230aa0a03e197dd6
+EBUILD clamav-0.103.3.ebuild 7401 BLAKE2B 98680c16cef3f05a3010a4366b94f2cbcaf58e8b3e93eecab548635e964d5705e9f7342b71da13f1fbb3b3a71d413f263b461fbb194e4208374fbb6e0382143e SHA512 f4cf02804d6df453fb6efcd981af53183ba129ca7d71ef563c91829b89f82fc3567d3782488dfd3c90087175535b69306bc65c657cbd48d51507b1355cb4de39
 MISC metadata.xml 933 BLAKE2B 867499e23131bf714cdddd911ef727dc6e487be8c6f0be1985611bc2ce8bfbee639e114f8ade6a6b9418095d03a45095030168912ab21484da81385c53255b05 SHA512 c0a3132dbfafbdb8852d621de187cfbd5daa30ab682593b88c77278e0c8a58fb57ed1427b9f8aa798926ccc94db4a19eeec77915f06de9b0cd182237aa77a892
diff --git a/app-antivirus/clamav/clamav-0.103.2.ebuild b/app-antivirus/clamav/clamav-0.103.2.ebuild
index 2a26103218b3..62e7fa4618a6 100644
--- a/app-antivirus/clamav/clamav-0.103.2.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.2.ebuild
@@ -215,6 +215,12 @@ src_test() {
 }
 
 pkg_postinst() {
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			tmpfiles_process clamav.conf
+		fi
+	fi
+
 	if use milter ; then
 		elog "For simple instructions how to setup the clamav-milter read the"
 		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
diff --git a/app-antivirus/clamav/clamav-0.103.3-r1.ebuild b/app-antivirus/clamav/clamav-0.103.3-r1.ebuild
index 95b7377cd083..1eb403b44251 100644
--- a/app-antivirus/clamav/clamav-0.103.3-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.3-r1.ebuild
@@ -215,6 +215,12 @@ src_test() {
 }
 
 pkg_postinst() {
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			tmpfiles_process clamav.conf
+		fi
+	fi
+
 	if use milter ; then
 		elog "For simple instructions how to setup the clamav-milter read the"
 		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
diff --git a/app-antivirus/clamav/clamav-0.103.3.ebuild b/app-antivirus/clamav/clamav-0.103.3.ebuild
index 2e786a0b7c00..533e4dc2d083 100644
--- a/app-antivirus/clamav/clamav-0.103.3.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.3.ebuild
@@ -215,6 +215,12 @@ src_test() {
 }
 
 pkg_postinst() {
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			tmpfiles_process clamav.conf
+		fi
+	fi
+
 	if use milter ; then
 		elog "For simple instructions how to setup the clamav-milter read the"
 		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 9c44cfb037d7..22d64f59d0ca 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index c871862a7299..6b73333c311b 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -19,5 +19,5 @@ DIST bareos-18.2.10.tar.gz 10558902 BLAKE2B ffeac4169131dfc28ec0c9cd9816962492a9
 DIST bareos-19.2.9.tar.gz 12886739 BLAKE2B 93b01a71e0824efc8a82c62107de03a0e6df23f600e005c9a98f5f0e541b13c4181dbb11b79fdd2a6f144e1cdbc25a95b1b310576bd3b79721f757c652881626 SHA512 b480a9a8dd459b8af3ab353bc5de2f8d1498d5754416972990add8cc6c8ea40462f6bde01ae92ca23f91c96d8ac2e6daf1dae085de80f021d52c5c87dc9a103e
 EBUILD bareos-17.2.10.ebuild 10243 BLAKE2B fd52bf443eab0b6b6f6610fced73f14f43ded6c13b5010b32a986129e20433b57bbdf33bbe1e365ad0cfd6dc2c9ec98ac15a065c83f66d17968464a9bce9f961 SHA512 a2c9dc80ae3894a22cc0c3c4769b8a4d680a807a2531c2807a25184f229661b2a6f5afcd87827966e239bfac78484275c0c95b4e1444d8aea2f90dc39458c569
 EBUILD bareos-18.2.10.ebuild 11298 BLAKE2B 4df50a376a19f744188b8742f2ee0c4d4e559b02392caea1b1de7c4c1180b06e4ea5ac93e2610538a803ba00c0092bdd04016f790000fd2f9bd92acf364ff0c6 SHA512 0809bb8ece48e8cbdd30a8145fba6474c3291f7aff4197a7e221c6b94f9f9e5d3ba3272f9e0c83da01562071ecc85b9cd6be012bc6e47409b21d6788cc1a0828
-EBUILD bareos-19.2.9.ebuild 10924 BLAKE2B 7ed3781f4bd5e27455dca9485d6fe2cdf28d1fdec7b6f38e6fcd7430481359cf10e5f6be3f27986f556aff55cff20f1bab3a55597c09a1e902793232db7f4e2e SHA512 e6c06012495478d0b8140bf979637d52da60fd3b1e6289e1f5d56741679dac272c40394137bf3b988cef105141b302ee3fa290908b71b3926527721db213113a
+EBUILD bareos-19.2.9-r1.ebuild 10940 BLAKE2B 2c541ca61ee7e44e00f3cbbef8f8dcac5723e13391575c76f320dfbe38c96840bb210ca349ad8ed159da81db91f9bf6a33217da6d3ae8ac1a62061fff8ae4741 SHA512 75efb6c3c295d5b01731bbba25d671b58938f5485e1f6672cc003ba2a282ecd876838e24ca59213fc657d7a1f04de387527088b94aac864d457719a223d96ff4
 MISC metadata.xml 1489 BLAKE2B 3ede9b0a6d7a72e455da20ee3c84e5e37afa8c935d1b7bc9c7048d469315cc73160fe4c9014563812a9bab361cad51bd31cc29d73d9e085b0e3606011b84a36b SHA512 29b3c02f4333ee70177b6e0205304fe6f7b785c2ac9684352f9e6464c6dec266fa0213ae198f146c907df0f2c3af1f7e0da2a8cd67c04299cac6df44443a8872
diff --git a/app-backup/bareos/bareos-19.2.9-r1.ebuild b/app-backup/bareos/bareos-19.2.9-r1.ebuild
new file mode 100644
index 000000000000..1c9bdced2c67
--- /dev/null
+++ b/app-backup/bareos/bareos-19.2.9-r1.ebuild
@@ -0,0 +1,384 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake tmpfiles
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb
+	logwatch mysql ndmp +postgres readline scsi-crypto
+	sqlite static +storage-daemon systemd tcpd vim-syntax xattr"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+	!app-backup/bacula
+	acct-group/${PN}
+	!x86? (
+		ceph? ( sys-cluster/ceph )
+	)
+	glusterfs? ( sys-cluster/glusterfs )
+	lmdb? ( dev-db/lmdb )
+	dev-libs/gmp:0
+	!clientonly? (
+		acct-user/${PN}
+		postgres? ( dev-db/postgresql:*[threads] )
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		director? (
+			virtual/mta
+			jansson? ( dev-libs/jansson )
+		)
+	)
+	logwatch? ( sys-apps/logwatch )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		sys-libs/zlib[static-libs]
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		dev-libs/openssl:0=[static-libs]
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/lzo
+		dev-libs/openssl:0=
+		sys-libs/ncurses:=
+		sys-libs/zlib
+	)
+	"
+RDEPEND="${DEPEND}
+	!clientonly? (
+		storage-daemon? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+BDEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="
+	!clientonly? ( || ( mysql postgres sqlite ) )
+	static? ( clientonly )
+	x86? ( !ceph )
+"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+src_prepare() {
+	use mysql    && export mydbtypes+=( mysql )
+	use postgres && export mydbtypes+=( postgresql )
+	use sqlite   && export mydbtypes+=( sqlite )
+
+	# enables default database driver in catalog
+	pushd core/src/defaultconfigs >&/dev/null || die
+		sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE_WITH_DATABASE_DRIVER_XXX/d' $(grep -rl XXX_REPLACE_WITH_DATABASE_DRIVER_XXX) \
+			|| die "sed on MyCatalog.conf.in failed"
+	popd >&/dev/null || die
+
+	# fix gentoo version detection
+	eapply -p0 "${FILESDIR}/${PN}-cmake-gentoo.patch"
+
+	# fix missing DESTDIR in symlink creation
+	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
+
+	# disable dird and stored plugins, because of
+	# py2 dependency
+	cd "${S}/core/src/plugins"
+	cmake_comment_add_subdirectory dird
+	cmake_comment_add_subdirectory stored
+	cd -
+
+	CMAKE_USE_DIR="$S/core"
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	CMAKE_USE_DIR="$S/core"
+
+	pushd core/platforms >&/dev/null || die
+	cmake_comment_add_subdirectory '${DISTNAME}'
+	popd >&/dev/null || die
+
+	if use clientonly; then
+		mycmakeargs+=(
+			-Dclient-only=ON
+			-Dstatic-cons=$(usex static)
+			-Dstatic-fd=$(usex static)
+		)
+	fi
+
+	for useflag in acl ipv6 ndmp scsi-crypto \
+		systemd mysql lmdb; do
+		mycmakeargs+=( -D$useflag=$(usex $useflag) )
+	done
+
+	mycmakeargs+=(
+		-DHAVE_PYTHON=0
+		-DDEFAULT_DB_TYPE=${mydbtypes[0]}
+		-Darchivedir=/var/lib/bareos/storage
+		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
+		-Dbasename="`hostname -s`"
+		-Dbatch-insert=yes
+		-Dbsrdir=/var/lib/bareos/bsr
+		-Dconfdir=/etc/bareos
+		-Dcoverage=yes
+		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
+		-Ddir-group=bareos
+		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Ddir-user=bareos
+		-Ddocdir=/usr/share/doc/${PF}
+		-Ddynamic-cats-backends=yes
+		-Ddynamic-storage-backends=yes
+		-Dfd-group=bareos
+		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dfd-user=root
+		-Dhost=${CHOST}
+		-Dhostname="`hostname -s`"
+		-Dhtmldir=/usr/share/doc/${PF}/html
+		-Dlibdir=/usr/$(get_libdir)
+		-Dlogdir=/var/log/bareos
+		-Dmandir=/usr/share/man
+		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmysql=$(usex mysql)
+		-Dopenssl=yes
+		-Dpiddir=/run/bareos
+		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
+		-Dpostgresql=$(usex postgres)
+		-Dsbin-perm=0755
+		-Dsbindir=/usr/sbin
+		-Dscriptdir=/usr/libexec/bareos
+		-Dsd-group=bareos
+		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dsd-user=root
+		-Dsqlite3=$(usex sqlite)
+		-Dsubsysdir=/run/lock/subsys
+		-Dsysconfdir=/etc
+		-Dworkingdir=/var/lib/bareos
+		-Dx=$(usex X)
+		)
+
+		cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove upstream init scripts
+	rm -f "${D}"/etc/init.d/bareos-*
+
+	# rename statically linked apps
+	if use clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bareos-fd bareos-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use clientonly; then
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/core/scripts/logrotate bareos
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
+
+			into /etc/log.d/scripts/services
+			dobin bareos
+
+			into /etc/log.d/scripts/shared
+			dobin applybareosdate
+
+			insinto /etc/log.d/conf/logfiles
+			newins logfile.bareos.conf bareos.conf
+
+			insinto /etc/log.d/conf/services
+			newins services.bareos.conf bareos.conf
+
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
+	if use clientonly || ! use director; then
+		if use systemd; then
+			rm -vf "${D}"/lib/systemd/system/bareos-dir.service
+		fi
+		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/share/man/man8/bwild.8*
+		rm -vf "${D}"/usr/share/man/man8/bregex.8*
+		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
+		rm -vf "${D}"/usr/libexec/bareos/create_*_database
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
+		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
+	fi
+	if use clientonly || ! use storage-daemon; then
+		if use systemd; then
+			rm -vf "${D}"/lib/systemd/system/bareos-sd.service
+		fi
+		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bareos/disk-changer
+		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
+		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
+		rm -vf "${D}"/etc/bareos/mtx-changer.conf
+	fi
+	if ! use scsi-crypto; then
+		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
+	fi
+
+	# documentation
+	dodoc README.md
+	dodoc core/README.configsubdirectories
+	use glusterfs dodoc core/README.glusterfs
+	use ndmp && dodoc core/README.NDMP
+	use scsi-crypto && dodoc core/README.scsicrypto
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins core/scripts/bareos.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins core/scripts/filetype.vim bareos_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bareos-fd"
+	if ! use clientonly; then
+		if use director; then
+			myscripts+=" bareos-dir"
+		fi
+		if use storage-daemon; then
+			myscripts+=" bareos-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependency for the director init script
+		case "${script}" in
+			bareos-dir)
+				sed -i -e "s:%databasetypes%:${mydbtypes[*]}:" "${T}/${script}".confd || die
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	# install systemd unit files
+	if use systemd; then
+		if ! use clientonly; then
+			use director && systemd_dounit core/platforms/systemd/bareos-dir.service
+			use storage-daemon && systemd_dounit core/platforms/systemd/bareos-sd.service
+		fi
+		systemd_dounit core/platforms/systemd/bareos-fd.service
+	fi
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bareos
+	keepdir /var/lib/bareos/storage
+
+	diropts -m0755
+	keepdir /var/log/bareos
+
+	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+
+	# make sure bareos group can execute bareos libexec scripts
+	fowners -R root:bareos /usr/libexec/bareos
+}
+
+pkg_postinst() {
+	tmpfiles_process bareos.conf
+
+	if use clientonly; then
+		fowners root:bareos /var/lib/bareos
+	else
+		fowners bareos:bareos /var/lib/bareos
+	fi
+
+	if ! use clientonly && use director; then
+		einfo
+		einfo "If this is a new install, you must create the database:"
+		if use postgres; then
+			einfo
+			einfo "For postgresql:"
+			einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'"
+			einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'"
+			einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'"
+		fi
+		if use mysql; then
+			einfo
+			einfo "For mysql:"
+			einfo
+			einfo "  Make sure root has direct access to your mysql server. You may want to"
+			einfo "  create a /root/.my.cnf file with"
+			einfo "    [client]"
+			einfo "    user=root"
+			einfo "    password=YourPasswordForAccessingMysqlAsRoot"
+			einfo "  before running:"
+			einfo "  /usr/libexec/bareos/create_bareos_database mysql"
+			einfo "  /usr/libexec/bareos/make_bareos_tables mysql"
+			einfo "  /usr/libexec/bareos/grant_bareos_privileges mysql"
+		fi
+		einfo
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bareos does not officially support SQLite database."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+		einfo "It is strongly recommended to use either postgresql or mysql as"
+		einfo "catalog database backend."
+		einfo
+	fi
+}
diff --git a/app-backup/bareos/bareos-19.2.9.ebuild b/app-backup/bareos/bareos-19.2.9.ebuild
deleted file mode 100644
index e2d48fb23962..000000000000
--- a/app-backup/bareos/bareos-19.2.9.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-CMAKE_WARN_UNUSED_CLI=no
-#CMAKE_REMOVE_MODULES=yes
-
-inherit python-any-r1 systemd cmake
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bareos.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb
-	logwatch mysql ndmp +postgres readline scsi-crypto
-	sqlite static +storage-daemon systemd tcpd vim-syntax xattr"
-
-# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
-DEPEND="
-	!app-backup/bacula
-	acct-group/${PN}
-	!x86? (
-		ceph? ( sys-cluster/ceph )
-	)
-	glusterfs? ( sys-cluster/glusterfs )
-	lmdb? ( dev-db/lmdb )
-	dev-libs/gmp:0
-	!clientonly? (
-		acct-user/${PN}
-		postgres? ( dev-db/postgresql:*[threads] )
-		mysql? ( virtual/mysql )
-		sqlite? ( dev-db/sqlite:3 )
-		director? (
-			virtual/mta
-			jansson? ( dev-libs/jansson )
-		)
-	)
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( sys-apps/tcp-wrappers )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		acl? ( virtual/acl[static-libs] )
-		sys-libs/zlib[static-libs]
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		dev-libs/openssl:0=[static-libs]
-	)
-	!static? (
-		acl? ( virtual/acl )
-		dev-libs/lzo
-		dev-libs/openssl:0=
-		sys-libs/ncurses:=
-		sys-libs/zlib
-	)
-	"
-RDEPEND="${DEPEND}
-	!clientonly? (
-		storage-daemon? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	"
-BDEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="
-	!clientonly? ( || ( mysql postgres sqlite ) )
-	static? ( clientonly )
-	x86? ( !ceph )
-"
-
-S=${WORKDIR}/${PN}-Release-${PV}
-
-src_prepare() {
-	use mysql    && export mydbtypes+=( mysql )
-	use postgres && export mydbtypes+=( postgresql )
-	use sqlite   && export mydbtypes+=( sqlite )
-
-	# enables default database driver in catalog
-	pushd core/src/defaultconfigs >&/dev/null || die
-		sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE_WITH_DATABASE_DRIVER_XXX/d' $(grep -rl XXX_REPLACE_WITH_DATABASE_DRIVER_XXX) \
-			|| die "sed on MyCatalog.conf.in failed"
-	popd >&/dev/null || die
-
-	# fix gentoo version detection
-	eapply -p0 "${FILESDIR}/${PN}-cmake-gentoo.patch"
-
-	# fix missing DESTDIR in symlink creation
-	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
-
-	# disable dird and stored plugins, because of
-	# py2 dependency
-	cd "${S}/core/src/plugins"
-	cmake_comment_add_subdirectory dird
-	cmake_comment_add_subdirectory stored
-	cd -
-
-	CMAKE_USE_DIR="$S/core"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=()
-
-	CMAKE_USE_DIR="$S/core"
-
-	pushd core/platforms >&/dev/null || die
-	cmake_comment_add_subdirectory '${DISTNAME}'
-	popd >&/dev/null || die
-
-	if use clientonly; then
-		mycmakeargs+=(
-			-Dclient-only=ON
-			-Dstatic-cons=$(usex static)
-			-Dstatic-fd=$(usex static)
-		)
-	fi
-
-	for useflag in acl ipv6 ndmp scsi-crypto \
-		systemd mysql lmdb; do
-		mycmakeargs+=( -D$useflag=$(usex $useflag) )
-	done
-
-	mycmakeargs+=(
-		-DHAVE_PYTHON=0
-		-DDEFAULT_DB_TYPE=${mydbtypes[0]}
-		-Darchivedir=/var/lib/bareos/storage
-		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
-		-Dbasename="`hostname -s`"
-		-Dbatch-insert=yes
-		-Dbsrdir=/var/lib/bareos/bsr
-		-Dconfdir=/etc/bareos
-		-Dcoverage=yes
-		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
-		-Ddir-group=bareos
-		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Ddir-user=bareos
-		-Ddocdir=/usr/share/doc/${PF}
-		-Ddynamic-cats-backends=yes
-		-Ddynamic-storage-backends=yes
-		-Dfd-group=bareos
-		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dfd-user=root
-		-Dhost=${CHOST}
-		-Dhostname="`hostname -s`"
-		-Dhtmldir=/usr/share/doc/${PF}/html
-		-Dlibdir=/usr/$(get_libdir)
-		-Dlogdir=/var/log/bareos
-		-Dmandir=/usr/share/man
-		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmysql=$(usex mysql)
-		-Dopenssl=yes
-		-Dpiddir=/run/bareos
-		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
-		-Dpostgresql=$(usex postgres)
-		-Dsbin-perm=0755
-		-Dsbindir=/usr/sbin
-		-Dscriptdir=/usr/libexec/bareos
-		-Dsd-group=bareos
-		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dsd-user=root
-		-Dsqlite3=$(usex sqlite)
-		-Dsubsysdir=/run/lock/subsys
-		-Dsysconfdir=/etc
-		-Dworkingdir=/var/lib/bareos
-		-Dx=$(usex X)
-		)
-
-		cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
-	rm -f "${D}"/usr/sbin/bareos
-
-	# remove upstream init scripts
-	rm -f "${D}"/etc/init.d/bareos-*
-
-	# rename statically linked apps
-	if use clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bareos-fd bareos-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use clientonly; then
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/core/scripts/logrotate bareos
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
-
-			into /etc/log.d/scripts/services
-			dobin bareos
-
-			into /etc/log.d/scripts/shared
-			dobin applybareosdate
-
-			insinto /etc/log.d/conf/logfiles
-			newins logfile.bareos.conf bareos.conf
-
-			insinto /etc/log.d/conf/services
-			newins services.bareos.conf bareos.conf
-
-			popd >&/dev/null || die
-		fi
-	fi
-
-	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
-	if use clientonly || ! use director; then
-		if use systemd; then
-			rm -vf "${D}"/lib/systemd/system/bareos-dir.service
-		fi
-		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/share/man/man8/bwild.8*
-		rm -vf "${D}"/usr/share/man/man8/bregex.8*
-		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
-		rm -vf "${D}"/usr/libexec/bareos/create_*_database
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
-		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
-	fi
-	if use clientonly || ! use storage-daemon; then
-		if use systemd; then
-			rm -vf "${D}"/lib/systemd/system/bareos-sd.service
-		fi
-		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
-		rm -vf "${D}"/usr/libexec/bareos/disk-changer
-		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
-		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
-		rm -vf "${D}"/etc/bareos/mtx-changer.conf
-	fi
-	if ! use scsi-crypto; then
-		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
-	fi
-
-	# documentation
-	dodoc README.md
-	dodoc core/README.configsubdirectories
-	use glusterfs dodoc core/README.glusterfs
-	use ndmp && dodoc core/README.NDMP
-	use scsi-crypto && dodoc core/README.scsicrypto
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins core/scripts/bareos.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins core/scripts/filetype.vim bareos_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bareos-fd"
-	if ! use clientonly; then
-		if use director; then
-			myscripts+=" bareos-dir"
-		fi
-		if use storage-daemon; then
-			myscripts+=" bareos-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependency for the director init script
-		case "${script}" in
-			bareos-dir)
-				sed -i -e "s:%databasetypes%:${mydbtypes[*]}:" "${T}/${script}".confd || die
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	# install systemd unit files
-	if use systemd; then
-		if ! use clientonly; then
-			use director && systemd_dounit core/platforms/systemd/bareos-dir.service
-			use storage-daemon && systemd_dounit core/platforms/systemd/bareos-sd.service
-		fi
-		systemd_dounit core/platforms/systemd/bareos-fd.service
-	fi
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bareos
-	keepdir /var/lib/bareos/storage
-
-	diropts -m0755
-	keepdir /var/log/bareos
-
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
-
-	# make sure bareos group can execute bareos libexec scripts
-	fowners -R root:bareos /usr/libexec/bareos
-}
-
-pkg_postinst() {
-	if use clientonly; then
-		fowners root:bareos /var/lib/bareos
-	else
-		fowners bareos:bareos /var/lib/bareos
-	fi
-
-	if ! use clientonly && use director; then
-		einfo
-		einfo "If this is a new install, you must create the database:"
-		if use postgres; then
-			einfo
-			einfo "For postgresql:"
-			einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'"
-			einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'"
-			einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'"
-		fi
-		if use mysql; then
-			einfo
-			einfo "For mysql:"
-			einfo
-			einfo "  Make sure root has direct access to your mysql server. You may want to"
-			einfo "  create a /root/.my.cnf file with"
-			einfo "    [client]"
-			einfo "    user=root"
-			einfo "    password=YourPasswordForAccessingMysqlAsRoot"
-			einfo "  before running:"
-			einfo "  /usr/libexec/bareos/create_bareos_database mysql"
-			einfo "  /usr/libexec/bareos/make_bareos_tables mysql"
-			einfo "  /usr/libexec/bareos/grant_bareos_privileges mysql"
-		fi
-		einfo
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bareos does not officially support SQLite database."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-		einfo "It is strongly recommended to use either postgresql or mysql as"
-		einfo "catalog database backend."
-		einfo
-	fi
-}
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index de1299814bad..7e30c8262fdb 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -2,9 +2,8 @@ AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0
 AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718
 AUX borgmatic-1.5.16-flexmock_write_args.patch 738 BLAKE2B aef28c6cc9f3e4c6294cf34cb6e3a1291fce90e0696f54d8f3975d7823faf64d73f2f625f1ccc7d1473e74f81342e6243d283950c505ed7cfc2279afe8eb5df9 SHA512 a9e1645dad137a9a20e71967d4578b3bbedca5556ce8e7b588215eb240c5581e6e0d5b657941eedb637ff94ac6e09ed06d3d9ef941cc1d4365daef0ae536659d
 AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972ed67bff74365b72e5e7df16199b439e5ad785b731eaa9a3eff5cfa6c9084c1b212b2359e9b8a14b1d0952ec6a560746acfbe594a2267e0ac SHA512 b23d899754762e29221b537c303e65a3b84e4a580d502f96870e8927ab2ef79b557f2c5638cfc4557ea5dfb6bea82b9776c6a67e65fda8a02138d3c57dfc00e6
-AUX borgmatic-1.5.16-tests_no_vim_dep.patch 1364 BLAKE2B c88361ff0c9a1fcb40e7d26e9c341ad69e7311bf6441b46cc835d62d39156b0f98ade91f03c6051782a8ccec9eab566867db9b38c7ceb7dc6db0c3875e31e7a6 SHA512 b23624f2da4531f51306893dd23c0bf97e310295006d0829bd880f7aa1798c6f6392759acd023d789c3de00d71ac27d285ab663be567cffe66d67651a4decce2
 DIST borgmatic-1.5.15.tar.gz 275702 BLAKE2B c01c469a4e0b96f4a364e0e44cd26d60cf34bc1c969cbf9931ee5ec6688cf012a1c22acb20e3a434b765ef5ec68657a2507e292e5ed3b9e0587f8784e85ecfe9 SHA512 5520e2e903162caa42c66c1e172af225f5f9622c1b33e5f0854f2dc8379752865e8cb8c442e545ec4fc98509e5c7c863373b12e57cf0bbd417b4e8c0887a27fc
-DIST borgmatic-1.5.16.tar.gz 276802 BLAKE2B 14eb511202b30b570cdf1097a68f732af09a6412e72dddaad0d01982f3375e1f0acf77546222b0166066d27ed6ac450db4e9cc9347eb7af972aa1df023ef0168 SHA512 c28a5e272309370620cc53275f44b5bbe8b0f43180c3bd3333009217a71e35b6ae02d88d9da95629c5a6b7457aec13059024da9e594ed2fbac65d0a41dd24444
+DIST borgmatic-1.5.17.tar.gz 276954 BLAKE2B 45d0458377d4825b84b5a535a28e15c3204479cd0faa349ac16cf59262bc1ad00ebf83c6309d85d4e9e168a1b1173e887c8d1185d509b5dc16d3d6026d0f0dec SHA512 740c8f5de9cbb4980295e435f40d0bd239341f22849081d5616e151d8545118f64f5369dce4203d200910a23d5074b765b1a8cf8e9b515967143ba42bd489fc3
 EBUILD borgmatic-1.5.15.ebuild 2143 BLAKE2B 2a29e0c8c0274a2e02d4137c0cd3661bf2c86c9f9d5b3f59068d3222022ff70975eda4344699f03e181bd746b3c4ccda7e34c365301f1a1d4cb7a167e7ffcceb SHA512 cdabf0735ac44acdfd96f6ada94db2c9cb7fa0de0650d62948850156a08a7266184ed5da9d3d347e19a30609fd104f07c12fca6c515d5767403aa2bf9c42929f
-EBUILD borgmatic-1.5.16.ebuild 2163 BLAKE2B b38b58c6c9b616536e321358ad77613e59ecebc836df3444017a0c5c801a71f3bfe0646610d655c99f802ed63fe7f6cdce7509dbd1e7f44a025afa01347ac498 SHA512 c79717361295aeae8e1b8afc976f4e3072df410d997bc4c0caa1aa70df4ba7e280b66fff09ce387af8be8b66b4ded0ecf51b7de956b205900d35068f5b6d0e91
+EBUILD borgmatic-1.5.17.ebuild 2085 BLAKE2B cf922f6563d7f616655d40e94c353d1bc6a30cf3374fc5582c23de01fa74713e498cc0258ae8c64bea069f67ac4c673301645eef0d860b2f2380dcf5d93e654d SHA512 5174e82bc75772b3d0bbff2e27dad25ab065704236f75f93fa2af79049506b84d84946009498de81acc5d8562489b02450edb1b7b172ea2451c78009c3618b2e
 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1
diff --git a/app-backup/borgmatic/borgmatic-1.5.16.ebuild b/app-backup/borgmatic/borgmatic-1.5.16.ebuild
deleted file mode 100644
index faca0182b6c8..000000000000
--- a/app-backup/borgmatic/borgmatic-1.5.16.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
-	')"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/flexmock[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
-	"${FILESDIR}"/${PN}-1.5.16-flexmock_write_args.patch
-	"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
-	"${FILESDIR}"/${PN}-1.5.16-tests_no_vim_dep.patch  # already merged upstream
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# Unlike the other two test files in integration/commands, which use the
-	# relevant modules' respective APIs, test_borgmatic.py tries to call the
-	# 'borgmatic' executable - which by the time we execute src_test will
-	# not have been created yet. Adding --install to distutils_enable_tests would
-	# likely take care of this - but between the aforementioned behaviour
-	# inconsistency and the fact the only test run from this file as of version
-	# 1.5.13 is the parsing of contents of 'borgmatic --version', just skip it.
-	rm -f "${S}"/tests/integration/commands/test_borgmatic.py
-}
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    generate-borgmatic-config"
-	fi
-	elog
-	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
diff --git a/app-backup/borgmatic/borgmatic-1.5.17.ebuild b/app-backup/borgmatic/borgmatic-1.5.17.ebuild
new file mode 100644
index 000000000000..a9f759659cf1
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.5.17.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+	$(python_gen_cond_dep '
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
+	')"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/flexmock[${PYTHON_USEDEP}]
+		')
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+	"${FILESDIR}"/${PN}-1.5.16-flexmock_write_args.patch
+	"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Unlike the other two test files in integration/commands, which use the
+	# relevant modules' respective APIs, test_borgmatic.py tries to call the
+	# 'borgmatic' executable - which by the time we execute src_test will
+	# not have been created yet. Adding --install to distutils_enable_tests would
+	# likely take care of this - but between the aforementioned behaviour
+	# inconsistency and the fact the only test run from this file as of version
+	# 1.5.13 is the parsing of contents of 'borgmatic --version', just skip it.
+	rm -f "${S}"/tests/integration/commands/test_borgmatic.py
+}
+
+src_install() {
+	distutils-r1_src_install
+	systemd_dounit sample/systemd/borgmatic.{service,timer}
+	keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To generate a sample configuration file, run:"
+		elog "    generate-borgmatic-config"
+	fi
+	elog
+	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+}
diff --git a/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch b/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch
deleted file mode 100644
index 492743e36e04..000000000000
--- a/app-backup/borgmatic/files/borgmatic-1.5.16-tests_no_vim_dep.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e8b8d86592565acde1ac6e7809947b8a761f2f91 Mon Sep 17 00:00:00 2001
-From: Marek Szuba <marek.szuba@cern.ch>
-Date: Tue, 27 Jul 2021 13:46:51 +0100
-Subject: [PATCH] tests/integration/test_execute: use plain Python rather than
- xxd
-
-Removes this test's dependencies on vim and /dev/urandom.
-
-Signed-off-by: Marek Szuba <marek.szuba@cern.ch>
----
- tests/integration/test_execute.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/integration/test_execute.py b/tests/integration/test_execute.py
-index 6dc6467..3b9bef9 100644
---- a/tests/integration/test_execute.py
-+++ b/tests/integration/test_execute.py
-@@ -1,5 +1,6 @@
- import logging
- import subprocess
-+import sys
- 
- import pytest
- from flexmock import flexmock
-@@ -134,7 +135,8 @@ def test_log_outputs_vents_other_processes_when_one_exits():
-     flexmock(module).should_receive('command_for_process').and_return('grep')
- 
-     process = subprocess.Popen(
--        ['xxd', '-l', '40000', '-p', '/dev/urandom'], stdout=subprocess.PIPE, stderr=subprocess.PIPE
-+        [sys.executable, '-c', "import random, string; print(''.join(random.choice(string.ascii_letters) for _ in range(40000)))"],
-+        stdout=subprocess.PIPE, stderr=subprocess.PIPE
-     )
-     other_process = subprocess.Popen(
-         ['true'], stdin=process.stdout, stdout=subprocess.PIPE, stderr=subprocess.STDOUT
diff --git a/app-backup/untangle-https-backup/Manifest b/app-backup/untangle-https-backup/Manifest
index a2531e990a72..c2d5aa9cdbd4 100644
--- a/app-backup/untangle-https-backup/Manifest
+++ b/app-backup/untangle-https-backup/Manifest
@@ -1,3 +1,4 @@
 DIST untangle-https-backup-0.0.10.tar.gz 16377 BLAKE2B 1c6233383e3e986bb63177b5b9f47d57631f2128da822775e0daf8a8bf6fb175f7cd1518ef18d6db116d6a12b2c697fe40e145fe41d2c98a4e12eaf76760b92a SHA512 0bd13fb0b7133bfce1c582317b4e0904e976e07f943a2dedf5f03729baebb5cd8f9aa38cc30c55f953692ed88f358d08b693bc40e89c24e329af2f5167e9247c
 EBUILD untangle-https-backup-0.0.10-r1.ebuild 587 BLAKE2B 1f7c2f49672fae952eccc95071d5014ffef2c617bd28ccb26e957d24137a13de3df857e7c1139851d7462220cfa036eaeb9b2bae8fc4ef86d5191e48678c39c1 SHA512 f8b37a6bae206561241753bffb67825472e6fec868a0b9c68c021068052d462e781c866aff9cb9c194f3602a8806b4b362dda3612166c00cd8310c02f5137f19
+EBUILD untangle-https-backup-0.0.10-r2.ebuild 609 BLAKE2B c5d3a0f68d685127623d7cca4990d3a52e0047b8e57705f12ebd96afa6305662f9ac9a7fc63a275700485781cf349f10937393ce1403b5dedd2d6a14bd04bf55 SHA512 8ce69a6da903ddf50fe4f9a113b1c36a31d3781234436a49561f60144b07f62da789d86457e4d8ae814f4b0a1010d784fa5179a8f5ceea378dbce0075bf3c96c
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r2.ebuild b/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r2.ebuild
new file mode 100644
index 000000000000..545420087d2b
--- /dev/null
+++ b/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r2.ebuild
@@ -0,0 +1,24 @@
+# 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 python3_10 )
+PYTHON_REQ_USE="ssl(+)"
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="Back up Untangle configurations via the web admin UI"
+HOMEPAGE="http://michael.orlitzky.com/code/untangle-https-backup.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	distutils-r1_src_install
+	doman "doc/man8/${PN}.8"
+	dodoc "doc/${PN}.example.ini"
+}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 57975e8a0952..306ae5f552e6 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index e1202bd7d986..9b14ecee184f 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,6 +1,6 @@
 AUX cdrtools-fix-clone-uclibc.patch 2405 BLAKE2B 6fe443e87aafee2a6e4b9ef5d6d6e9b01f8b77095ce7e6b249338264b75adf6b600afd1c4758fb1d684f01fdbd30b9285bac132064df21cca52e6ed644d69c4e SHA512 17c184d90f10f7ebde0c621b349255eb284f9b940ec6cd63427249a9bd6e16d998f06a8eab930fa03afb4ed1589421b6e57f0b183e3d4aa837c0ad65ad413727
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
-EBUILD cdrtools-3.02_alpha09-r2.ebuild 8298 BLAKE2B 92eaf5035bec31a10ffaed49138f4de28a75f5ccf0a3ff6401d6e3f84e0f098966318091782174814e97ef5c7199d1caef643dffae4edfe820960413b680e852 SHA512 c01148b8575d22082db7149a9d35df2d882af4914e93913fddca96c8ccc90a0dad9a2a34e54d5ede8ad923fa1c095794c6d11714001310a8e2893d02fe0ea12e
-EBUILD cdrtools-3.02_alpha09-r3.ebuild 8384 BLAKE2B 4fc7ae83367d37e6826baefd0d82269ee51b8fba295b3c2e05d45a45908f81f791d56141b0a77360084db8b3330b8e68c00985843cde466c52a8d0376122ee9f SHA512 8657702c20daafbb779c9b9993e67ccb394bad99bdf9d969e0ac4789bf4bfce9065f8c0c000a41ed58a80472ce67b861797c60e992eb22d1151d303e8e9b0c7e
-EBUILD cdrtools-3.02_alpha09.ebuild 8229 BLAKE2B 4fca2a03eeadcbd6601401ef93c26df3ee5896c1a1b11e865f49f14d4252ada0b9006e5191cfac24efdb4dcad1e4e9212f77c8886653929a92704acc79b757bf SHA512 560007695b98ed541e35fdb9d1a97de494cefe7c10e0bb95bcc9d59abd3b295a286d16de92239a32714e006fed8899038f0d191e70cc32ea01097c020b8d8a3b
+EBUILD cdrtools-3.02_alpha09-r2.ebuild 8305 BLAKE2B c223008ac563f54e4dafc0a6e62b968464d4d27b2ad5fae1b69df5f04a7d3f1c198da9e6147782a5b9253456a4c981cdbe390cdb5b69d85896bd35e6c7aa2a3f SHA512 c26cb48ad52e2b74a5f7df4c6fdce5854f005a8f2760c2e44166df6b3b64e678a2968fc7a481f53be648f8bd196aad81720dc619b52520af38cec80d11129ea8
+EBUILD cdrtools-3.02_alpha09-r3.ebuild 8391 BLAKE2B 9a5c17269e099f9a19a0b49166bcf60bfe0e19cfee3a811064851918874b709e5ddb194f4f2d5e638606eca9f4e31c777be375c725f047746df5e74dc3237d94 SHA512 8197f6a9d432e6d14f14fda1844f78893449c1f84049bb3fc180da8ecb4be0436332f3098dac46eb1722e8be1e431c07152a403955377b51140c29f97a08b705
+EBUILD cdrtools-3.02_alpha09.ebuild 8236 BLAKE2B 99d3f9a6c0fc5de0aa400ef78fcbf0cc0c3ae10588746809bfa5c3fdae4324591469283f5a30b363a7b5cfa9d404187b923248f654d878a3ea2e11b5d7d3af8e SHA512 691e96a7f6bf86bf65c4535556836f2c44db63107e7b38fc5282e38a457dfeef1c6a0af452107c870add82f666b5bd52b9241e122c073ea0a0265048040279dd
 MISC metadata.xml 444 BLAKE2B 4d6375fb99e7751846883ef73422767522b2d43c9d48869a9babac90e507b90e076a80b6cb9e920869c07000d64168b1cd1b75c1d7655e9b06c0a4a2bd957fdd SHA512 0945a0d302bd8c16b1512a8b63250bd39b7685121fb26dc9677b6c4fb1c81bee41b104df07fa77f83cb8a8461ccf408a0ce2a3cd979bb943935109f4b664b020
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
index 5ff3221ef76d..ebb1b641b3fc 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
index fddb123d5e83..086556458965 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
index f11ca585ee0f..7a64693f19ea 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ace335c9645a..e95ebcb3cde1 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 814baa0fc0d7..5de06601fe01 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,6 +1,8 @@
 AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa224228f403395c9590758c8fa986b3e8d0d1b12353ec7fed5a40f6af900fcd57eaaa7b339018fe42c2b509c0c5d SHA512 f327eee35ca6009069389f935ca89feea4e693e8f0c73f8f218d2639faee4ce35df85832a71e3fe98ce24aae31861aa8bd290833e59ada75c1e1a2df9ff0a477
 DIST ccid-1.4.33.tar.bz2 659673 BLAKE2B f8dd37ed4fd2bd15e6313417dc01feecd0303502d24eeae101ad13233510b5e26b08439c4de453abc734695618faa1c8031e545d045527aa841ab9056a3d729e SHA512 ccfcecbaca4c8f1ee4a4925bd313ced6d6f15ad422cbcc387627aef203a9ae0ff7775c4a2c5d25978ab33ebfd93c34de50e1f783df787b77ea7c774a45ed126b
 DIST ccid-1.4.34.tar.bz2 667477 BLAKE2B 81f8f97fdb4526fa2f0bfe0890cc447c87671989159022a51fa15ed6e85760f7fc3a9b3f673e2cbf72373a9fc67df5304c0a93a945b97f5ad483de213f5b1a45 SHA512 8a71c100e2f0adfd6de89a86dab6690629b10c91d1fddc0a810df2ebeaea978eaaa7c6a21fa964b5cd1ea277b0efe75a2885b490f9bd9ac4776b8ff1848e4122
+DIST ccid-1.4.35.tar.bz2 676789 BLAKE2B d1123c024a798a22906a5c2c2e35f5485b8d2252ddec28571af835bbf169bc5abeb26fea871ef70d67270cc1eb52f992c56f0abb74f6deed555f15e39dbf4756 SHA512 da990b5537ec35baa1b36b9c4be7f1bdccfc149cfa4ce024ddf59504f2a2044273057c1454f227fdad8f6b04fceaf48b88e70d4d0a5475384749b367529deaeb
 EBUILD ccid-1.4.33.ebuild 1540 BLAKE2B 1070f46a0e0c96ec75f364196668d7da00e0987ad41b5c60fe202539141e77a196dbb29f0de19fc4f441931932d30964840adfd84a599bc7d07baf3481be5ad8 SHA512 066b3204120871b14df9770e0c8822d1620a00ba0e3d97474ba8e7e20131f2592cab98b0b78baee9f71cab7ba02250544291c4f61d036cf1a02ca043a98e3048
 EBUILD ccid-1.4.34.ebuild 1545 BLAKE2B 836348f61b179ac74d2531f71099c6116376f46626eb1b91e41b13803a36cc2639cf284f32fe7cfbafa723fbc21c13a9d440f5e3b37fadff45e06765fe467b69 SHA512 3edb62c28a55cc39f32e4da90088d34bb1e8e33112c6fa53e6610eaf093926e681170ba7adac9d0e637ffe8cd09853ac1093001b0709dd365ebcc51e88b60e76
+EBUILD ccid-1.4.35.ebuild 1545 BLAKE2B 836348f61b179ac74d2531f71099c6116376f46626eb1b91e41b13803a36cc2639cf284f32fe7cfbafa723fbc21c13a9d440f5e3b37fadff45e06765fe467b69 SHA512 3edb62c28a55cc39f32e4da90088d34bb1e8e33112c6fa53e6610eaf093926e681170ba7adac9d0e637ffe8cd09853ac1093001b0709dd365ebcc51e88b60e76
 MISC metadata.xml 489 BLAKE2B a9966467fcea7c4d369b52f6da345d62067124f084d9e5c7084eea01cb84b04e98e55e75d69697fbd5ab22f4876d5503f85f916319c4baeb8b0db54b16de0b8b SHA512 01ba84ea6c896ee2bd5f84668d61b7298d0d62a140d986cc3f6125f594da60d9a088552af3253a6117a2036430dab2a175a7dafbff44cb0faa0d28e83e3ceb63
diff --git a/app-crypt/ccid/ccid-1.4.35.ebuild b/app-crypt/ccid/ccid-1.4.35.ebuild
new file mode 100644
index 000000000000..54ad487a2623
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.4.35.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="twinserial kobil-midentity +usb"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.8.3
+	usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README.md AUTHORS )
+
+src_configure() {
+	econf \
+		LEX=: \
+		$(use_enable twinserial) \
+		$(use_enable usb libusb)
+}
+
+src_compile() {
+	default
+	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
+}
+
+src_install() {
+	default
+
+	if use kobil-midentity; then
+		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
+		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
+	fi
+
+	if use kernel_linux; then
+		# note: for eudev support, rules probably will always need to be
+		# installed to /usr
+
+		# ccid >=1.4.11 version changed the rules drastically in a minor
+		# release to no longer use the pcscd group. Using the old ones in
+		# the mean time.
+		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
+
+		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
+		if ! use kobil-midentity; then
+			sed \
+				-e '/Kobil_mIDentity_switch/s/^/#/' \
+				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
+		fi
+
+	fi
+}
diff --git a/app-crypt/dieharder/Manifest b/app-crypt/dieharder/Manifest
index 0a8de4342f14..bdcf3a4953f3 100644
--- a/app-crypt/dieharder/Manifest
+++ b/app-crypt/dieharder/Manifest
@@ -2,5 +2,5 @@ AUX dieharder-3.31.1-build.patch 4500 BLAKE2B 03317321419ef75c0d20300c3ae178702c
 AUX dieharder-3.31.1-cross-compile.patch 2048 BLAKE2B aee35b8d192a2e78fe1da2a35ad662c30764cc07dbf861d3ded9d551f880b5473d63a29acbd67eed50b3622c9ecd294f99f211fe14a13b4a5cb8dadef95f2b66 SHA512 effb05cc65ef8b5ca565abaebffa947b162b0d51fa3ae97d7cdff4b278737339a6a3524acc114b462df8756c07180478ea0f82be961d6dc7cc4025941d2c261f
 AUX dieharder-3.31.1-urandom-64bit.patch 2034 BLAKE2B 989640b3d5a946f3d81ec5cee9747329ecb7246b5ab0473b906d42e5faa971d1aaad43ac54be7b7cad1483cc5605ad70c0f71338b9cf9a22616d2662318bed57 SHA512 2a8d7f766b1eff4911e6aa7cd788cbbffe6ed05cfd27053042d8631786164383ca56783c43a2b4403e5cbf45c2d3d83fd46e427490d3bc2dd8eca880ea3e93da
 DIST dieharder-3.31.1.tgz 1149780 BLAKE2B 12937b54e713ce87d6cb815b9b1e00989085b7661538316649caea4a514518528039441d0d42f377c363c62db179f362feb9d64612a75f724ac363744f884a47 SHA512 e01ed4266b4fe5d5fadde3c92c30e430d0ca5f7fedd26b26ed2ab98b7602aa9c35bb5c8fd9314ef2f5235b5087645ab13e5e6550156e26643baa5aeb77088dc5
-EBUILD dieharder-3.31.1-r4.ebuild 1153 BLAKE2B b75539866c5ec1c75f756011486aaee08263a0a634eb09d7f1b69ff987b1463b4cccfd28a4684925caf72dac33545f61c5b23bde800def9fa67beedadaad5bef SHA512 e0b2e379e0cfd62587f8f1460f8a9e64269a46729e4b8a65b54f82c83a76911d34aaa12f8a0c3a2b0730fa9dbb1b62d6503b38452d55e6f201de7e69d03663a8
+EBUILD dieharder-3.31.1-r4.ebuild 1160 BLAKE2B f15ce36751d025742af93828961bf5c35bd411c56ac244594cdf4f050b2597eea6a5c70b286d274098e65fe2696d573c43213ef299b37f9be6f974a5cfd6414d SHA512 8c4ea4e25cbc9a82758be7d2d0b1778d0fc541c46c1078c9ae50039696332231f117c806d343988046ad8a4c318cc91f0e648307c7f840791502c01917f689b7
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
index 8bae5f15b9a4..75ad6f0f329b 100644
--- a/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.phy.duke.edu/~rgb/General/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc"
 RESTRICT="test" # Way too long
 
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 5f82768b9be0..c3d5d8053fe7 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -20,7 +20,9 @@ AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a8
 DIST krb5-1.18.2.tar.gz 8713927 BLAKE2B f0eb34e67adcb86f347c59ec6ef74970a57530cc56336a84909f852cd6135079ea89828e77c906a272f54e0faf6a4a0497f2b648446eb9d048d1c51e4ec513af SHA512 7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c
 DIST krb5-1.18.3.tar.gz 8715312 BLAKE2B 4f6ad4a529e7578e83d82b43c2cada33bce1dca5081ec826ee06a713f82520b783f72ec56d2ce289e10d1ddcfaa079491e43f21c035b214d244bb80e6b2a1c9f SHA512 cf0bf6cf8f622fa085954e6da998d952cf64dc7ccc319972ed81ea0542089cabf2d0e8243df84da01ad6f40584768ca2f02d108630c6741fa7b3d7d98c887c01
 DIST krb5-1.19.1.tar.gz 8738142 BLAKE2B 902dd08fe4b81b1cb0ec2bf1b95eeece0f8a87b87bae865272c7bf5dd028c01997ec4c5d24df605328db85e7cbfe9a38dd804b363b651aefa7b4eaec958a280c SHA512 36bf33802119ada4650a8f69f1daca95aaf882dc96bfa7061f0340a5decd588c31fc10108ddadf1042934e0e2c3bbd975deec565b0a7f0fc2baf8b8cc6d97491
+DIST krb5-1.19.2.tar.gz 8741053 BLAKE2B 963722721201e75381c91a2af6e982f569a5b1602beb2d1ded83d35f6f914235a6ed91e5d54f56c97e94921a32ed27c49aded258327966ee13d39485208c38d8 SHA512 b90d6ed0e1e8a87eb5cb2c36d88b823a6a6caabf85e5d419adb8a930f7eea09a5f8491464e7e454cca7ba88be09d19415962fe0036ad2e31fc584f9fc0bbd470
 EBUILD mit-krb5-1.18.2-r4.ebuild 4278 BLAKE2B 0ab115db127541d2c5ff6bf7f1f6b06ab115cc7cca8c9f31fd481b5c6f7c2f6e2c17ac2863115d90cfbd22f039528cbde306305daf29d9c30426f6fb9e509b9b SHA512 c4f03936e89d98ec08a85800b990a4c208d5ec5e8fb3233d22e26f95c5bd49e2aa4e8bd6b3ea77ca0c5aa247fbeb559c333159e9dbcb502fc9aa2bce28e593c0
 EBUILD mit-krb5-1.18.3-r2.ebuild 4202 BLAKE2B 64787c272f51fbc4e8895c545f75abacce388e4bd2c14a47c9099be57d533f09f5d375aac167477b78fa1796ba45b681c8d7d126afc6cab9cfc647bced571864 SHA512 d5e8a4f4156d56c7954a12680ca068d9c439b7134575358ca41a20a5e601adef900ad163ef1b78d9eb2c9ec49b97e896295deafb6c8bc289e1b41a25d82dac77
 EBUILD mit-krb5-1.19.1-r1.ebuild 4204 BLAKE2B 0339c60eb9ef017cc2a5f2b0774d03189ecd426a6a391de50383aed685ee99f06a1ffeeac036690553f7b0cce0e6adccc5bacf2fc82c09b1ff34bb2210881855 SHA512 43cd1b051aa279cb33230b6016929bf94e5564d700e8db900c411cb4cc5d61f8de8d1f54ca7f8a73304394c729b9f4fb0b23f87a357eb74399587bf55fc70551
+EBUILD mit-krb5-1.19.2.ebuild 4196 BLAKE2B 67ae2e7fd5af51186600006cf79a1f9e9d75d661820ec817a1be62d172351a6610e6e0c614af9d3af8f4fb96587fc4de075b9e32cc6fcb531189e409c3919a9f SHA512 84faee6c0222604533a521293caf75439af0c4618f130d57bd3f069b89c0129d2d8ede569612bbc477c473a42efe796f8a5ecde70bf4bc16590a737eeeea5e0b
 MISC metadata.xml 823 BLAKE2B b1e312e7d7d1dde62a6260572d68c5c9df90a00c9ca7d43939df0ce7c6e528ac8dfcf839827938f783c241c19255660e1e7806210aaf407a6e86cbaeef24295a SHA512 844715444284f5c7f1a73ed15c0ebe0b5dd8c96c3aa7e6450f465e2a2086509c04d637f139ede5e427972d4b1bb298255388f50978b41de875b47ee40251451e
diff --git a/app-crypt/mit-krb5/mit-krb5-1.19.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.19.2.ebuild
new file mode 100644
index 000000000000..1ee2e7de82cb
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.19.2.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd toolchain-funcs
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
+
+# Test suite requires network access
+RESTRICT="test"
+
+DEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+	lmdb? ( dev-db/lmdb )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/yacc
+	cpu_flags_x86_aes? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+		dev-util/cmocka
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+	"${FILESDIR}/${PN}_dont_create_rundir.patch"
+	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	default
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	AR="$(tc-getAR)" \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		$(use_with lmdb) \
+		$(use_with keyutils) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 1c6b94e845b6..aa082c30c304 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -1,7 +1,9 @@
 DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST anyhow-1.0.32.crate 28512 BLAKE2B c9c37e9bd70074d53b163a3077b7a5304d04b13ada50c020898ee2169ef4db2e26aeb283421f2e757c3d6e31c58ec1832162c1a01904a44b9fb4cf14ffe05d0c SHA512 4646a3b85459fefd826c11fcdf69e532467d2d6ec0711b8d26312483ba988fa8492fe2f727332c39479e25dd37ad04830ea4ab19034cdcdc639e226e2744dc90
 DIST anyhow-1.0.39.crate 34017 BLAKE2B 3186ce0f31cacf68f57bd383d50414d26dc86157bbc4cd3444d0325bcb47945324fe9663d39f3b7a6821fb60b54fbbbabc5307c89d43be0f150cc4baaec8f186 SHA512 ccd57f63290f583b7970b0d5bd853cc2bb29ad9d5fee13222f2b231b56b0d29fb3b8705fd5014419386e2266554d6eb2fe8ce771f93230955cc88466299e48da
+DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
@@ -23,7 +25,9 @@ DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db89
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e43bbd6c8251b5a2f9fd574522539814098b17da03ac5222177332042303f129e0c2729db6bc80e8f76bf4b097d973d4 SHA512 2e89ceea586873e957a31b510f8e8cb0c6675def32ea6b9a9483166b47f69c1ad448a79d897796883b696bf77cb0fcb1d0ac28ee779146f6500ca9a54aa7b4fb
 DIST directories-3.0.1.crate 15674 BLAKE2B 0650c306a6c1086b5f0b4dc49120c91c8f541bb275eb5a21166272fd8fccc4a20dda099e44cfe4c79e2ab82e0552a6390a5893f1ee7bf1f69e64737a41f6bcdf SHA512 840b325522cf9a6a20ad54885b1e0e16f2fb72de6c18ced24f3766dd8355329b7b9f1e6dfacaaf72623d0415b28e7dbbfff3234ff82e5c0fffa86772c3b4bad8
+DIST directories-3.0.2.crate 15593 BLAKE2B a4ecfc7968a0eaa1ae34c7cb0a33aaa3dc0b1d972fcc013fe6349a03e21bba1740950c62fc0d096945b4b29c275081ea0d7d1d57fd659acb22004f75a090a230 SHA512 9bccbb99a832d092dbce0ce5ae98c2e1eb58febf0fbbf410152bb0d62324141957ed04284c71809a692fc2d2ba0e9b41854d892e68269893850ea3645a9549f8
 DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
+DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
 DIST envy-0.4.2.crate 10985 BLAKE2B 8a6f25fd3cdfcc17cfced55bdebbd9641eee3cb7a0d227f1c08837ed41e31fee8575875dc165139d83cd7e124a8998ce77d7d1d0f7ed230ee2e07cb7179b5798 SHA512 3188120adf5dcd72a3329561e8cb864865927df1d24dd7eae6f21df4156c2d8e6bc73351eeefd6c1ac62857bb6d3e154f682b7815a86b77c8047ae6afb88b74e
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
@@ -33,16 +37,20 @@ DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52cadb8e82fc7c5b7b5dd61c81ded5cfded098721500c87b021d5d79766571a7dd6fcde319c826e2e4244d38 SHA512 2addfd505e0904e18a600caa4e695536d2f95292af25906925066616bd588de9ea9abaae45bc8427bc6857c3b9fb6c4288e4cb48e3f1ba69ee1d7be8f3b3bcb6
 DIST libc-0.2.90.crate 521685 BLAKE2B 31442f5a69f888980051fc8877be252277934088690df84924215dc09a4a4bb5d2dd222b8bfb1bec070fa291f8fb4b7cc96c69f40b21c912a7102231f0eb482c SHA512 c05c409c5afb55aca064db78a79b197081ec38a57989f0eb8c3f3095a400f1f298cccbb8132030e3532058e40aa32d1fdabbe2fcfd3437a0e5bc2c9122f88f0f
+DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
+DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST merge-0.1.0.crate 16946 BLAKE2B 1389893fdb788371e8f2526ef9fcc9e1b7a61a6f55fd092cc595339b9df9bc550546056191c1479ecaa13b88633e12656d2a8e217927495e0096ee5ca5641e47 SHA512 2adfef5cf142b06343e8f5816ffba7d031bc71b4a4e54170e36b88267d0c203ecc0cf084041cb25ae55df874fc80d55bd051c76f608ab85fd55f1b5512efe238
 DIST merge_derive-0.1.0.crate 2598 BLAKE2B 209381385224343cbe5b67b4fb4c21e0c0820a0abac19e8ff3baa0c1a4c8e403470d8de840c49f5c2f584ca2c5420c9709b9d598257e2067c037506fc019167e SHA512 cf3781464e4cbdfeee6e394dce38aeb41ac44a71f832907ea0e96c5e8fa0f78945e167f42c541e1ad8930b6583f82bf5c77c68db2165a48287d420570b1c5572
 DIST nitrocli-0.3.4.crate 89135 BLAKE2B c79ce5b4617f47aad4c830d073b39795f6a106697d3ab85ba6f4dc7ad8633cade3aa840c9a117f7b0b4642594757131a5486b077605bcafba6192b28aad26400 SHA512 6a7a5a26af7ac4ddeb14e7612ba4c580c8d7025468a4ef15f102a0890f8ab6234d7ffabc39be04f348c26d87d43c07d2db9b890bf334821a4a6885428b44f682
 DIST nitrocli-0.3.5.crate 97613 BLAKE2B 0bfd97e8a8a643eaf74a7d678c093e3f5beb6851db2f4a1b4df7b2df543a9ee36e4c5de5cb1126799c24fa0c8412da44519a66a161cd9adcadd476789fb20f8a SHA512 7065333b0138a6283224cd604786545fc84360c582f69d0c7ef40ea4d5f8e1bf440d622e958ff84c6ddd4a342c7f38635e222c0f85772ac894afeb68e79e603a
 DIST nitrocli-0.4.0.crate 111508 BLAKE2B 80018466091f7a621280841df6cee70e46cd7d696470cd96a54f59d3b1edccd27b2b8f973f2c37ada0188fd598ff74b5e3fe1b7a261765c04c5bc1a8a43bf61e SHA512 055308694ec51c216b9d8c371fc52d5c479e2830369f79219dd4c13fe697c2d9b281263f1f4b0488736a8796be98b4837c3941d366da08a40e042446fdbcd23d
+DIST nitrocli-0.4.1.crate 117109 BLAKE2B 962ded95d55d0e3d8851154eebb429ded04b38d46c2decb86483b8373e373cb7b547d7d0bda8bfa374200cb33b8b6653a6b85fcf00930af9d17a2033abfb4ace SHA512 65ee77be99c062ebcaec9a6f0fdc5d0045a4b8e56cf01bfe80a3eeecaea7f60b7973632877d3bd0f82a8a385bdc745a721eb924a14c3fec29e00016fc37fb4a2
 DIST nitrokey-0.7.1.crate 42264 BLAKE2B 32aaf5277f3ffdac9cac5f6a5918caea01bcf4b3f9595d9ea4f1895cde517fc4127acf817fec98f1b2a71141d27632abc2bc4e12bca276beb4e1d3582fbf027a SHA512 eddc244c0feef80b58e8c5d287bef8c6fcb6a08e3e56e599e4c3f754ae47c2ee576721edee22d5784e54086535d995fa30326808b85e40f068c72f4c09466915
 DIST nitrokey-0.8.0.crate 44200 BLAKE2B 3bd8fed9c5530ba868d575bea84fe0f8b4836aab3c038c7a2b696c87dff153b26613804076b7ba40003a4582bfc0aa41c32fd57dafbd99c871ec678f01250518 SHA512 6a6c76a41eb56325eccf82759ba1ae297e6a8119c9a5f1f6e56db122247a3229ba7cb3d2773c36819a57dd591bc42def13b6935cc38ca6bfbae95f2e67ff32c5
+DIST nitrokey-0.9.0.crate 45491 BLAKE2B 3a5e0786bb443e0234b448bf5d4696a89cd360930728ab7193deaadfdc5ad99eba1cfa2624aad0584a3a452297c38c33f2695af5f98baed5af1951ba2cbf2fd3 SHA512 11275e63764963efc05b8d7bffd22ffe98a7bdf74d4a37238d7bb5e53ec7d5571da98cd9dbb2d43ea79cfddb3ba4dee07508dd0450aab7a6c37b88f4ee8e2fff
 DIST nitrokey-sys-3.5.0.crate 69014 BLAKE2B 61b036749f4c990c9f5575d464016ac4c2058ae81067dcfdefb49e70cc9702671ffe3e952848f24aaee475243208cfeb4bfb52dc5210b5b8db8d53124871378c SHA512 c7b5db1cd9d14dc46e2de6c47007da01ba9d242b0378490fd9c03b7e9ff18dbaea1e756b0731a7920cfae9be12f86b62e7219f8b380ac6dbdd0cfbe362fd72c5
 DIST nitrokey-sys-3.6.0.crate 72379 BLAKE2B ed900e8b0dea0c955e72bb9f6503d5ca1c621c798befeaef5f387deeb11312f69700f9f63d7e700d9b871d9dadb4dbece68cf2ee17356487d6c7c627e2bbfc08 SHA512 0fb0e2709a086ed9d49afcb1ee75474eb216db99c80ed2b46556b9e7f78689f536bde1d8c6e99a7a90c4c9d7f766e8d5f068c86a2e947171644ab9aeb346aa55
 DIST nitrokey-test-0.4.0.crate 21694 BLAKE2B e6d859751c9b32303ad0e54fefb93fcd4d725655521474f12bf35928792558111b602264593369372410b2b83078f01e2391d0874c695b33c0e3a7a0c19d88e2 SHA512 5a2430bb1c8f51de40ee1b81c3b4d01aadd2e6ea59281a255176040ae464191a81547d80a09fe51bcbaf8195c90b17eb0fd32b2ff24d7e8b70cd718c6f243bbe
@@ -58,6 +66,7 @@ DIST proc-macro-error-attr-1.0.2.crate 6974 BLAKE2B 4b8fb0c70873eb487dbfbcd37d5a
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.19.crate 36390 BLAKE2B d21272e6bbe7bc5953ca388181a3875e6a3426e48ba3eb8808ec51fd2139093b60260998509b81ab1d67dceb4f9a0a255c234912d41739a7420537615ad3a4f0 SHA512 046f65ee0eefc1bfa39a405f46a7aa5ba83a11af057f150700412bc79a7a76d713f020377f38171086da58ee15e3db784c3e198cd18cc852add405e5e27eaeea
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
+DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
 DIST progressing-3.0.2.crate 13938 BLAKE2B 072ebf18d96750208c94007315d133cf5ac0ed26658de3e860ea0b87cf7cdab7002957a440365437b426f5995af8afc2331d8a8d86c1a91087672be1519f444f SHA512 636aab5349c28f674cb0b90ca8a1eea7f92e9a6dc9d5f344d1fb738306512fbe2489d65ca41a5885bfa5ab6df470d4986264a245f3be72cc1f439132b41dedc8
 DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
@@ -68,20 +77,26 @@ DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfc
 DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
+DIST redox_syscall-0.2.8.crate 23697 BLAKE2B 5a084a48e06ab0dc69f64b05058b78d994040da6c42f04c8b615b1977fa3e813cd5a531ab33402402914362301670709679aaaa321e8904424c38d35c284b7ec SHA512 250556a7683254c9daf22887b39abb010eb9d4fe08b944e52bc6595ef6d8acfed76e5f43931fe20c84bdb3743772fb62a0be154ecfb6e66c2facb4c73546eacf
 DIST redox_termios-0.1.2.crate 3268 BLAKE2B 5f3f4e2b7e7a8172f92e8161eb1dcd208b86320868ec351e2f7b47d8ed170b3f44ad8180e44ea7a554de0e53fc268365e683244ad59e4afabd11a09ae378d2b0 SHA512 d8624b2c78d02c5d3afcbecea9ad8d218bff508703cb50684d6ae05614a9f41bf2aa8c47440fbb7d964f01eb9085364222833fbf9c45984508e9d755dac563c1
 DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
 DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
+DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
 DIST regex-1.3.7.crate 235600 BLAKE2B 15370ec0cc9f37c6a7092eaf78a731740aae3d79ec6d385244f4568395cac8947860828ff585aba9f35ccae684bb19e214120f39e7f4998350ff2890a43f2466 SHA512 59090515860c26551ce08e8b37cf1227712944844148b79dcc7348f430e5c3c70767c20807cb1affb242686e7e8f885224c4c9fb9ae890b57f766fec96e2aa69
 DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
+DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
+DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
 DIST rust-argon2-0.8.3.crate 28313 BLAKE2B 2d3468c7b5dc027fbbf6ceb264d77f4ae9b03526e0634c645ffd32a4c87532f5a84c224c6c39a15c9e267d268b187ec65210a2edf7df8294913e4958fbc83352 SHA512 f336dd3f90e1a49be107b641f9e9d513b6f8098dbdd1ab8aa2bd1fae329ce6840ad11a902b599922bef45d96ffb556d52b57d61218271bdccb7c85f9fe1da033
 DIST serde-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
 DIST serde-1.0.124.crate 74508 BLAKE2B c2201c9f1aa7d3f72bdb5ca56b888d40d7606d019d86f3b2dafa93d67e768a8f79ac281c3e8442a4efae676de3b3556c55ca7234fd962809e035631a7f824191 SHA512 3106e446875b6a45f59f23d5619e62e6b97ba5462f38f768b68bd33a3679ee22f4821f460646133eb626a9e529b704e405388425ee2353a4027b48f7e36623ea
+DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
 DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2
 DIST serde_derive-1.0.124.crate 54147 BLAKE2B 313a601e7fba1d23a4029fb40946cd0c54ee100d5eb76e81d33d289debd96b63c862d2797b0b4de49df8b417d711fbebeba7660b4243dbd147cb75d04a2f78a3 SHA512 6da069bd2ffa101bf0c83748417e14cab93b898313a33bbb2584ef4bb85924a92b24c54f61906a42797d409ad47c313089a31549c2e6be1513220e3145a76c8d
+DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
 DIST structopt-0.3.13.crate 50324 BLAKE2B 0c2060e87219437f036772e7457b6273c756c8ecf686bfd24273b713cbcb8410bff5d394e5c6effd12fa222fd0e7510cf16966ad6aafc9196d9d0c646e3a2445 SHA512 b22cf51caaa46c0ad07ad58709e024d615f2f8688db2414acce4f1abd677adb61f1dbdbf3318e194172c475781150da6bcf3c149f6acc60cc195ec598874db5e
 DIST structopt-0.3.17.crate 50166 BLAKE2B 86be10f82d7f56ec178c87248c1618664ed2f8491649e4d90d6dd3358bd4b9ddd76685635e060fd37562cde2abf87ab0f933b9a212e32bdbd4e72d69e103fe9a SHA512 dc193e216dca278b081057072e7888f5b0e0c773fac8e136efd9d0af8cfe89f60d07459bbf23172dd7f8c4ee461458a7d5be957d6cddcc5bbff18515716b66c0
 DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
@@ -90,6 +105,7 @@ DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc4
 DIST structopt-derive-0.4.6.crate 19398 BLAKE2B b8bc319693dd46e77a3229ecee3a6b41e2e479cd6b86d76ad1e0fa33895ef79a21640c09d3fda5bfc6d2e181f37f66d8ada3eedae49f7be3e2774d4a2680313e SHA512 842507f9ac3172c48700d1ba350d93fe087eef37903fe71b15b39f21ada56dded638077dadbaa109869f9a0e65ab7e4a049504505e1d3e2736f779846ba6330c
 DIST syn-1.0.36.crate 205090 BLAKE2B ec3842cb0b1c72de82b2009a52cfa6e8b37f881f195414b6825345d958cb3052aa6c3212aa1d42da7780f8b8960a38d1487b1967125075ce11ef154d01f99592 SHA512 cefc4161d8f10df4782ab8ccea81c14fbb3b789ed71481e32231d4519b8babf6381a671afc3f89a9a8ad17e7f5b4d7ca6c9dbb4c1843132f606db5636ebf0902
 DIST syn-1.0.64.crate 231549 BLAKE2B c039cdfb1701a2ed88aaa14fdb983f614266c006380c197a85c46fcdd20d7319bf864013ef84810aec73dfc6a586229dce601a4ce829ab66536e890247ca0cff SHA512 b43574c8d48743697bc46c17593347d0e98062b0086582f835281b6c52a8f3eac8cb59c212c77fee7f0a2be8525b5e0d8a807ff532a922f6dbd13ef7efc7fc22
+DIST syn-1.0.72.crate 232500 BLAKE2B 8f71f7fb66426f78eec3439688b0468fbef582c8ca912781f19607acd9e8371f2230b305a96f613c16f7299e66fdb2395dc037e1093d3897864bd2bf50ab3d7e SHA512 f01e2ef74fc3f84a753c1c379c24e3c63f3c575d72ab865f8e7d51f4dee4293ac8197b4e123ebaa942e9199bf0a0d8194e57a5aa6314bee6951d3d458dfc3da9
 DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST termion-1.5.6.crate 22677 BLAKE2B b918dc82bfa370bb9662bace34211bc7afa03a042dbd25f4456a7e3859521d4f32ab755780e58070f29eb7903f3b4f8129eb9447cda953b9190f9df3b7eb3aea SHA512 228b6fa7e2f280d6bfc7cef77e7a1d0d8f597178e66af0bde1b1fb6553857b511ba8a6786165815aac6d8a082fd37191f4ea35a47f1e1182f7f2c6086eb34a8c
@@ -103,6 +119,7 @@ DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
@@ -113,4 +130,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 EBUILD nitrocli-0.3.4.ebuild 1551 BLAKE2B 5d0dbaa6766209bfcb3d2c1332a69c395df40377b679f9b42bbf3f58616ffaf51b532a6ee4df185d6c2ae2744c0b18f214027ba4caf0918ef2a69b0565594ab4 SHA512 d774c7b7fd0f92e52572d1fec2f9413d1e683781999336879a89061a68d5f64fb20717e198f4e286a7db9b5b64990e5c21ab4c4c4be3eb659156c7f24eccd760
 EBUILD nitrocli-0.3.5.ebuild 1968 BLAKE2B 5c58af3560e0ca2bfb52b31fff704117b2d5defabcf55aca20efc19d860c52a9f9675086698bfb88394ec3041453030b2e1fdce3fa3a1c68e8a2316af33428db SHA512 f4924b0e13093548c93c12f14dd2472ce3ac39f67525904cca9522c829db27faf768abbe041b1904931963886df92fc240a85602581acb2a4059c40b5d98b20e
 EBUILD nitrocli-0.4.0.ebuild 2343 BLAKE2B 1bf8ad68f2452f1146bbe4bdbaf5a3fd8d18e018d8fd30174a6d04131f7f6a6c68e7abe76143547499bee29875bd6e7641e8d4aa472895b0574f67f4cf706c52 SHA512 ec234f63224e1886b3ceb65642de56badce4641bb0f5501977c8a053f5c9254056dea629fac07e49a9f98aabec606fd60cb4bfdd8e426fc445cefd2b893d014f
+EBUILD nitrocli-0.4.1.ebuild 2157 BLAKE2B 6b38fe87422ddf3d0f08ec864db552187eefe67700cff47bccc58179e4d5eb537cbc2e3f8ace930fcc59f50f8fa7aff48b3b99583430bdac94497143549242c2 SHA512 3000d7bb89a7666d1ac0e39e9743727b8ce094525b639b322aa5e2b4f9e926c59a1e3bd168fa4b7886755253cda3908e407f77ed3a47f867a3245efb46adcc62
 MISC metadata.xml 713 BLAKE2B 77012af77b67c16b6ff4fa02a3c0a26d493ee288f4ed2bb5884923f5be779baf56e12c0bf391d6eae4e9f79f3899c053f583ffdc0ed7595f24ec84ef93c23fe0 SHA512 4a99d7fba9fa024a139fa7b71eae1d341d281b9a9db52376b6ed4e447cd875d2319dc6115c7e17e6b1386b10fb956584203bfac9064af9cf8844788fa7542410
diff --git a/app-crypt/nitrocli/nitrocli-0.4.1.ebuild b/app-crypt/nitrocli/nitrocli-0.4.1.ebuild
new file mode 100644
index 000000000000..6bfb55121f66
--- /dev/null
+++ b/app-crypt/nitrocli/nitrocli-0.4.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+aho-corasick-0.7.18
+anyhow-1.0.40
+autocfg-1.0.1
+base32-0.4.0
+bitflags-1.2.1
+cc-1.0.67
+cfg-if-1.0.0
+clap-2.33.3
+directories-3.0.2
+dirs-sys-0.3.6
+envy-0.4.2
+getrandom-0.1.16
+getrandom-0.2.2
+heck-0.3.2
+lazy_static-1.4.0
+libc-0.2.94
+log-0.4.14
+memchr-2.4.0
+merge-0.1.0
+merge_derive-0.1.0
+nitrocli-0.4.1
+nitrokey-0.9.0
+nitrokey-sys-3.6.0
+nitrokey-test-0.5.0
+nitrokey-test-state-0.1.0
+num-traits-0.2.14
+numtoa-0.1.0
+ppv-lite86-0.2.10
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro2-1.0.26
+progressing-3.0.2
+quote-1.0.9
+rand-0.8.3
+rand_chacha-0.3.0
+rand_core-0.5.1
+rand_core-0.6.2
+rand_hc-0.3.0
+redox_syscall-0.2.8
+redox_termios-0.1.2
+redox_users-0.4.0
+regex-1.5.4
+regex-syntax-0.6.25
+remove_dir_all-0.5.3
+serde-1.0.125
+serde_derive-1.0.125
+structopt-0.3.21
+structopt-derive-0.4.14
+syn-1.0.72
+tempfile-3.2.0
+termion-1.5.6
+textwrap-0.11.0
+toml-0.5.8
+unicode-segmentation-1.7.1
+unicode-width-0.1.8
+unicode-xid-0.2.2
+version_check-0.9.3
+wasi-0.9.0+wasi-snapshot-preview1
+wasi-0.10.2+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A command line tool for interacting with Nitrokey devices."
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli"
+SRC_URI="$(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 BSD-2 CC0-1.0 GPL-3+ LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	dev-libs/hidapi
+"
+# We require gnupg for /usr/bin/gpg-connect-agent.
+RDEPEND="
+	${DEPEND}
+	app-crypt/gnupg
+"
+
+# Uses a plugged-in Nitrokey and runs tests on it. These tests assumes a
+# pristine configuration and will modify the device's state. Not meant
+# to be run as part of the installation.
+RESTRICT="test"
+QA_FLAGS_IGNORED="usr/bin/nitrocli"
+
+src_install() {
+	cargo_src_install --bin=nitrocli
+
+	target/release/shell-complete bash > ${PN}.bash || die
+	newbashcomp ${PN}.bash ${PN}
+
+	target/release/shell-complete fish > ${PN}.fish || die
+	insinto /usr/share/fish/vendor_conf.d/
+	insopts -m0755
+	doins ${PN}.fish
+
+	einstalldocs
+	doman doc/${PN}.1
+}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index d21a7686e5dc..fe0373eaa769 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,5 +1,7 @@
 DIST yubikey-manager-3.1.2.tar.gz 116728 BLAKE2B 35b592a26bbe1c2a1c81ddbc5fd5de2693b01dbadd04dd317baa14e5f9c5556ff8622bc36e31983947b4eed272be16d8ae1d55c6e30fe5532c20605c784411c5 SHA512 e7ad46536fae0476ae7ea4d7115ba9ddb0fe158fcd1e1d548524860b2033996f5487f9c948df85586d5b7ea690b51ad8d5b43261a56aa8820940226e0b18acaa
 DIST yubikey-manager-4.0.0.tar.gz 137438 BLAKE2B df50113ed46c531032785ceb95ee130a2440f88677b088f70095545528cbceff55db483bc299654beb8d78b3cea94a9c8507751a090a8488cc609680167ec8d7 SHA512 f1684122a9ee8d57fa3644ecf140e39973c822dfcb7cc1d6578a2ef9b09ff9b0078e6e4ab3f0eb6522a08703d095027f9f24bc8ca6fff8b6874f7a9b5e99f1b2
+DIST yubikey-manager-4.0.5.tar.gz 142197 BLAKE2B c48a9c6ae5f2d54b24888b750c6263eb501e68be56beb9fb964e8b9ea5131a608786b2e67d0d092ebcfacb15b09cae3eec19f4271893ac77eba70eee28b6d06d SHA512 f8bddf3121c0c509fcacb56500f1c1885354aff5c00b3347d9ca84cdf1df65276ed744209d9653474909b6cba7595bc5529cd4b37ec34c35d2d2c3cf2ff850de
 EBUILD yubikey-manager-3.1.2.ebuild 1460 BLAKE2B 245167a792b93078529190fbfbd45bef1c80fc4d1fcf8ce0e6e72e9a2fef4c317708e5c1433dc6bf585e6821aa21511268e7e1191860b329961e1a8863c0a994 SHA512 19b3084bcf54261aaf1537ec8d13721aa5eb1701375c749428f1ff23cf6c586cd94faf9a45fdd6565c2fd8843af9858741c3a19ac3fb9abef67aca66ea178157
 EBUILD yubikey-manager-4.0.0.ebuild 1324 BLAKE2B f15e7265610bbff0ad64940db32e8455893c67382f81c1b5f1e918a279fb409cfbe9392314850383f5e353fbc29d7e6fe1514c0826775becb1e34749b3c25ca3 SHA512 b215021993fa42925c730c84a66e04b502cb2afd5a4c7a152f337e778c01dc2e1bb26f5071e4ff8ebf4c8acde5ac60ab4dba3b20136a9194b89d88f965ceab85
+EBUILD yubikey-manager-4.0.5-r1.ebuild 987 BLAKE2B c65778d2c1db8fb75a615810a058cd958bbf03d293c98118da28ae4f146c8383f17ab9cac672ca2a5d9e41ecca98ee3d05bc80073e81ab0a011f39bda9531ad5 SHA512 9427369c477444a2c4f8fe783cf8dfda2efb1cf6ee2685d68a8a81c27afcca5b9da2ba13df447e1239afa9aa311708b41025d24f2d73651b9247bba552569ce3
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild
new file mode 100644
index 000000000000..260ec24a7562
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+
+inherit distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
+# the official source for tarballs, not Github
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # Tests require non-existing package makefun
+
+# app-crypt/ccid required for
+# - 'ykman oath'
+# - 'ykman openpgp'
+# - 'ykman piv'
+RDEPEND="
+	app-crypt/ccid
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/ykman.1
+}
diff --git a/app-crypt/yubioath-desktop/Manifest b/app-crypt/yubioath-desktop/Manifest
new file mode 100644
index 000000000000..e7cb59530382
--- /dev/null
+++ b/app-crypt/yubioath-desktop/Manifest
@@ -0,0 +1,3 @@
+DIST yubioath-desktop-5.0.5.tar.gz 5659179 BLAKE2B 31dd1a7e9b8a5034e916f38c7893572b6b7e75fa0bc45b5b807c89010ac0e4a01a446f03d1591dd6323a015fc8fb17861fa60dc5a5e4eff40b5261fb6e3f7088 SHA512 b5a0df306916896e1fd84d6a794a43365b0e0a2cecd97ec1dacc6312507dd2e4dd55fc12b0de9d72d1d0a1b40625330373b7c74dacb2ec37a24ea3e1fd2d4ff7
+EBUILD yubioath-desktop-5.0.5.ebuild 1285 BLAKE2B 5bbf8c8394d735dbe34aff9aab5726e4dd89a880c66a2ccce6a91510d2043dca0d2b43e0e0733ea1ed6ab5452030ed3e127647143dc0190e620c385b51fccab7 SHA512 99cc4bf3068860f12950ac143c5effdf29b9f18774ad638bc352f6539ebe1d6c9da76edb7b2e996fa88e626bd6009863b2ca313553519ffcc7320cfb2ac698a0
+MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/app-crypt/yubioath-desktop/metadata.xml b/app-crypt/yubioath-desktop/metadata.xml
new file mode 100644
index 000000000000..70f78a5392df
--- /dev/null
+++ b/app-crypt/yubioath-desktop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-5.0.5.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-5.0.5.ebuild
new file mode 100644
index 000000000000..7c9e0959879c
--- /dev/null
+++ b/app-crypt/yubioath-desktop/yubioath-desktop-5.0.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="Library and tool for personalization of Yubico's YubiKey NEO"
+HOMEPAGE="
+	https://developers.yubico.com/yubioath-desktop/
+	https://github.com/Yubico/yubioath-desktop"
+SRC_URI="https://github.com/Yubico/yubioath-desktop/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	x11-libs/libdrm"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '>=app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]')
+	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:python build_qrc.py:${PYTHON} build_qrc.py:" \
+		yubioath-desktop.pro || die
+
+	python_fix_shebang "${S}"
+}
+
+src_configure() {
+	eqmake5 yubioath-desktop.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	domenu resources/com.yubico.yubioath.desktop
+	doicon resources/icons/com.yubico.yubioath.png
+	doicon -s scalable resources/icons/com.yubico.yubioath.svg
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 6b63c206e5c0..22ca774a3547 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index 6c3a38603392..85cae3bf9333 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -2,4 +2,4 @@ AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa32
 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
 DIST ht-2.1.1_pre20161206.tar.gz 1082309 BLAKE2B 4fb00b0aa6115da3b561436f9f9905c48d93d6768bcf207931bb46840727c85fb5c9a1afda8ed805f71e9ce242161a2b95e26add02ff5aedc407df7f11c6ddec SHA512 33d681ee8c978568dd0d187d6846994362625d000c316baab10c237175fa6a47dc0e7b61cfd503c4dfad8a01d27af7fc87cbf20109087e1d9280048c898fa621
 EBUILD hteditor-2.1.1_pre20161206.ebuild 1064 BLAKE2B 4d4b1c02c3d0a0484dc0e12d32303f8977af7ac972b4b5df3147594c0a9cba6434f6745bb00eb7fe40e34de7d0c72f8d836c02902f857306c9af198dea5d53b3 SHA512 c36e1528a6e79f222ada5c97a8c0f49e4e338b597369ca768312efeaf33cb919d96fac1f7bf5477ccb0b4f25c29e0aff8f7f78817f8cc99496e77a7fd6bc2528
-MISC metadata.xml 464 BLAKE2B 7fdb5c881881e21f4a74db09bf905c4d0aebdb5077598916186266ca12dca891c1619ce550a37ac3400ef92138ff2521dffd91c25bf254d8e49e0b628ea7ebca SHA512 b08be8368d7459a56096769aec6cdb6607225968b87ac12d22c788081287d16345060f071c09c0d505a8caffcb5de9378328250758b13c9229eb1fc5c10a8388
+MISC metadata.xml 375 BLAKE2B ccf43aa4dc5a99adbe6e42bb0d66b18980a41d17d2d4573a2d84b513dbfb09071d0655a63ef8e5116d995309cf514e05a3854a0c9fc274cccee85bfd44b1d1f3 SHA512 3c255809cc0132d860134a072a8151651f663e2da8608489a225e1bf8e85dc76788ee5a760909509024fc97bc3c20fd1dee93bba54a297d435f35fab6f07d075
diff --git a/app-editors/hteditor/metadata.xml b/app-editors/hteditor/metadata.xml
index ec0e241f14ae..bf3326bd646d 100644
--- a/app-editors/hteditor/metadata.xml
+++ b/app-editors/hteditor/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slyfox@gentoo.org</email>
-    <name>Sergei Trofimovich</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">hte</remote-id>
     <bugs-to>https://github.com/sebastianbiallas/ht/issues</bugs-to>
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 9501190e0c43..79823268d587 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,3 +1,5 @@
 DIST mousepad-0.5.5.tar.bz2 891263 BLAKE2B a75930385f9087f6294811c91b2a162d2e9ca2e945ec84efdfd932806211ee105d2ac2835122c2de4ea519b6728959478147d11df75ff3b00324c262983046a0 SHA512 5c6d6d048fe8a08c04ddeff7adb7d621d9beac631dd58fe5778cc8236e06ddb4ab50380eaebf4236c655b6d26058242024d5d3bbb1772607ab1f10744f8936f1
+DIST mousepad-0.5.6.tar.bz2 916738 BLAKE2B 59506a5eb362259889e580de52ed3135c339da4148dc1c99d7c7e6aee04d776f7ef67959a54aabfa29b7b174279f205cdaa0932199b407528019def24c4915c4 SHA512 24e974f793fd8660d39fc00156f8f8f07bae44133c6f58d705b1665f0b8d333f2248a6780b48794edb56e7faf7f206069a7866f76cbf91f6ce6b8b2ac7121f34
 EBUILD mousepad-0.5.5.ebuild 863 BLAKE2B 02de904b60dbf85fa7f8160671d1be6fc48590b9f6acbdf8112398485d6f367b9d9e6e8bbf041f75887f3eb49071f530d5d8342fa67c207113b86b80cfa2d58a SHA512 de8269ab6791e78318a257c9e52678db31e996c2bd0cb37b36dda062dbb1ec33f243f70f365cd2690815241bf7021b80e9ab866bdbbd9249d63e484cf13facc8
+EBUILD mousepad-0.5.6.ebuild 865 BLAKE2B 6d8b99afce428bd8ddfe3b9e170aeff47c2198ae5be94f5b8b0fb4a5051365547150a9819d3ed948df2b4330e26d37485bd4bf7d143fb5836a24beca29eda12c SHA512 c33da95d6f6ef47dbdb4b10d4381a95259a19d7e33d8ba6895b6749a7c2efca304614aa05dc394f6e005d4dd89d951eb83dffbeb336caf491791db09916e456b
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/app-editors/mousepad/mousepad-0.5.6.ebuild b/app-editors/mousepad/mousepad-0.5.6.ebuild
new file mode 100644
index 000000000000..1dee543de886
--- /dev/null
+++ b/app-editors/mousepad/mousepad-0.5.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
+HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/glib-2.52
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/gtksourceview-4.0.0:4"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		--enable-gtksourceview4
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-editors/sublime-text/Manifest b/app-editors/sublime-text/Manifest
index f52547c3e8ea..0a8058f21902 100644
--- a/app-editors/sublime-text/Manifest
+++ b/app-editors/sublime-text/Manifest
@@ -7,4 +7,4 @@ DIST sublime_text_build_4113_x64.tar.xz 17105200 BLAKE2B 6a23e9eb7ec5b7b5dfef2ef
 EBUILD sublime-text-3_p3211-r1.ebuild 1645 BLAKE2B 5bdf8d1fdae1df2bc59937e2bd2382385aad77fb60a99e3ea4830239adc027f2c09663c9bec3b795d5f633d3625b2ff5a17b328b46986968e99e45ceeb71e515 SHA512 339364d412f075d97ae576e75dfc50a021fdbf2953a0a6de78f45b97d1db21f335a43a2373631b2a42becd8877b4003fc06b4669f3b092f86df0ff09b3c11f2d
 EBUILD sublime-text-4_p4107.ebuild 2055 BLAKE2B 71fc79523f06b4e66ad3469bd9b62aadc13f2ad66eb2028d80fd69ac358df2a303d71375d0cd406ef3460a299b9f467cbf4917a54a3c58c1a859b656d31408d0 SHA512 b871dbe20734510f84b2b0c421c27552f33786ef1e7f8715ba9bc34ec0eb20a02456f2d668b458cf591ff86f24c91f256c5aff0165a2be94549c749fcdf0d90c
 EBUILD sublime-text-4_p4113.ebuild 1944 BLAKE2B 6ea2f6b0705c7a0f3ae083deb217c7421b75f809f34051e04807f235f2c41cb5f7acbc0e1b7f5859cdacd5fefc3e78b447861456b1a57f796518f9e8ca250634 SHA512 ac4e7c50496ee6e67366f83e6fadb78c8284cb1db640258f9249db0e108fe50eda02081c63e08488548d75ca12882646594f5515c35e30fbe9888e74c6b18426
-MISC metadata.xml 215 BLAKE2B e5b704d936932650ad333b6ee575d0f6fb54f7b01e62f59912a5d88c8a76bfff888e9de639a9a4d6ec5882a3e9a57874eb89935bb3d1a3c3a79a4b1f58b944fb SHA512 d803656f1527d3fc8a2b3474c0ff52d86170950b70057a65ab412ce1adc926545393fe1cfb71731d573f057de2145edd90d642c644ef26222a2b413cd8922d47
+MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/app-editors/sublime-text/metadata.xml b/app-editors/sublime-text/metadata.xml
index 3c5abf825aef..70f78a5392df 100644
--- a/app-editors/sublime-text/metadata.xml
+++ b/app-editors/sublime-text/metadata.xml
@@ -3,5 +3,6 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index b06c2ec871ea..8b1950b72a35 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/vterm/Manifest b/app-emacs/vterm/Manifest
index b2ef62afecf3..84e39c133802 100644
--- a/app-emacs/vterm/Manifest
+++ b/app-emacs/vterm/Manifest
@@ -1,5 +1,8 @@
 AUX 50vterm-gentoo.el 213 BLAKE2B adb1452d0bf816beceec4367a33176034f90c46b1649178cce093160117d14c01d1ccebefa57bebbf276d01e812223876a766567fbbb95589851b51db2456db2 SHA512 2847b924a1e3218d433391396681642a88192396a60f25f5da6824a9546a0f155d068b1bfc2115f0698b87e07ca50845ebbdc0a71de2ff8203fdf14b7e43ef0d
-AUX vterm-dont-compile.patch 907 BLAKE2B fdfa5bfc294558ebbe428375c817387ffd2e8c560c66c597815469460997d2f58e4734ee81d0780421cf0d1b512a74ecaf7ffc0fb5ca4034083eaa0a5f38e309 SHA512 359bebd557cca3fd31479bf3596d2d06e6b451faf57a074c4bbbf17e956d62f87a6695055f72697200f00df7c664aca970de89af69cd5470fe4faa0ad0172a95
+AUX vterm-0.0.1_pre20200713-dont-compile.patch 907 BLAKE2B fdfa5bfc294558ebbe428375c817387ffd2e8c560c66c597815469460997d2f58e4734ee81d0780421cf0d1b512a74ecaf7ffc0fb5ca4034083eaa0a5f38e309 SHA512 359bebd557cca3fd31479bf3596d2d06e6b451faf57a074c4bbbf17e956d62f87a6695055f72697200f00df7c664aca970de89af69cd5470fe4faa0ad0172a95
+AUX vterm-0.0.1_pre20210618-dont-compile.patch 772 BLAKE2B 235f1050ccf434663da28794f8b04b8f7e02e824373a75ba214c3ad213dc598f5390c22d3ad068fa2c8b041232664ff5170b08d21c8e9d60b8ea1eb3dae44a48 SHA512 8787887ec2d7c2ee09710ca8683bf90e3ab81d930288e66d74a926f3619f4bea2e37f1bdec0021192b85dc3dbcf778b4e4f5ad82805b35033b212cb43fcbe5e6
 DIST vterm-0.0.1_pre20200713.tar.gz 48160 BLAKE2B 96c45ddb139d19f3020d7a8eebc1ee31a7dc098f47c16cfffc7bf3327261a4366763744a8158d3c8a066ec94be4966a5ef78804db95c9025eee06fb8c9e4aa76 SHA512 17726ad0957daeab2a87b398bfa24dbe3c4c48dfba932138a71cd8c992bf20bd2925a7118a89247bbd674dbecd7fda8663c564a278168bb207034efb03e50cd0
-EBUILD vterm-0.0.1_pre20200713.ebuild 973 BLAKE2B 515cb48c9fc683846192f923b69cef4d7bf185ac24a35e8e0a99c84ca584cb4b41539e193165c48fcc1a426acb519741fdceb639c7816d18da70f06abe76ccb7 SHA512 acbef586ed01692b65e338a26f27c29309ac01350a649238e288cbaf315db82be0c8e388585b76bab43dc5cb1a4061b5260739e9d62bcde8958f294c0854089c
+DIST vterm-0.0.1_pre20210618.tar.gz 58389 BLAKE2B 71221d470e01d647093e3a3af0c57b416ef23e81ff4d783d032613e19f1d467752fea0d242ea0f72092e3cdabbdb88ba15a840d9e4116cf5aa95d54a020efe0d SHA512 9e23eff1c9c5d2cc8e970bb4d9910b3e0258987d09b765ece188641ff5e2696e30d59a409f45253f243162b8e71c0ea301049ff37c93ffec1e1c25206ca9c5d2
+EBUILD vterm-0.0.1_pre20200713.ebuild 972 BLAKE2B 13876ff1c427de41c5c0e529f7793fabc5850cec6a07551777815ca3d985d442c72cd8b429546397d073ab1987493e8bdffc0308290e99df285883b90af19db9 SHA512 01598b7b2515e3a082bc56676b5f448ce20f978e63c5896475b683715fd8a53a6b63b238c870ae0e3c92218c3049e93b2ec7da3074e04f88cd5739252bfa5773
+EBUILD vterm-0.0.1_pre20210618.ebuild 987 BLAKE2B c91417b70e7290b2b2d4b7de1b878ac0ad496012931a5296ae7196053cbebd1d095dce0cf7bee2a7b215bc3284d0c0922fcc67fa6dd9c51d4212270fafe59e3b SHA512 152f372fd98ab2ead4c4084b3312421483c3e97ac3a88aeb70e5b46c8e99ab5b96a786488997426c708619eced9a257fd8e90abdce88de18c7202f9f8293f536
 MISC metadata.xml 633 BLAKE2B 60cd4ca523fa42307493cccbbf5fc240dd658f2c7368e761c94e384e9d363ae8359d0b6e0520be3767b6df38a4d94d9f1ebc3e8983c40d07ffc990428cb863fc SHA512 1ae5bd4bff830550c81d14e8312faf9aa0270ea7bf3e73ad347c20de0fb0d8fbbfe0d1fc807d41c0629e4c3170d9a512abdd5213f200671e63c80afc814fe85b
diff --git a/app-emacs/vterm/files/vterm-dont-compile.patch b/app-emacs/vterm/files/vterm-0.0.1_pre20200713-dont-compile.patch
index 6b08ae812360..6b08ae812360 100644
--- a/app-emacs/vterm/files/vterm-dont-compile.patch
+++ b/app-emacs/vterm/files/vterm-0.0.1_pre20200713-dont-compile.patch
diff --git a/app-emacs/vterm/files/vterm-0.0.1_pre20210618-dont-compile.patch b/app-emacs/vterm/files/vterm-0.0.1_pre20210618-dont-compile.patch
new file mode 100644
index 000000000000..512b9d941423
--- /dev/null
+++ b/app-emacs/vterm/files/vterm-0.0.1_pre20210618-dont-compile.patch
@@ -0,0 +1,22 @@
+Simply error out if the module is not found. Don't confuse the user
+with messages about compiling the module, which won't work outside of
+the package's source tree.
+
+--- a/vterm.el
++++ b/vterm.el
+@@ -130,14 +130,7 @@
+           (message "Compilation of `emacs-libvterm' module succeeded")
+         (error "Compilation of `emacs-libvterm' module failed!")))))
+ 
+-;; If the vterm-module is not compiled yet, compile it
+-(unless (require 'vterm-module nil t)
+-  (if (or vterm-always-compile-module
+-          (y-or-n-p "Vterm needs `vterm-module' to work.  Compile it now? "))
+-      (progn
+-        (vterm-module-compile)
+-        (require 'vterm-module))
+-    (error "Vterm will not work until `vterm-module' is compiled!")))
++(require 'vterm-module)
+ 
+ ;;; Dependencies
+ 
diff --git a/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild b/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild
index 3f049c76abd3..b3df66ead641 100644
--- a/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild
+++ b/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}
 	>=app-editors/emacs-26:*[dynamic-loading]"
 
 S="${WORKDIR}/${MY_PN}-${COMMIT}"
-PATCHES=( "${FILESDIR}"/${PN}-dont-compile.patch )
+PATCHES=( "${FILESDIR}"/${P}-dont-compile.patch )
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.md"
 
diff --git a/app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild b/app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild
new file mode 100644
index 000000000000..77ce01cdc80f
--- /dev/null
+++ b/app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=26
+COMMIT="d9dfa624679afdd5db6ad25429ef86d3dd91401e"
+
+inherit cmake elisp
+
+MY_PN="emacs-libvterm"
+DESCRIPTION="Fully-featured terminal emulator based on libvterm"
+HOMEPAGE="https://github.com/akermu/emacs-libvterm"
+SRC_URI="https://github.com/akermu/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="dev-libs/libvterm"
+RDEPEND="${DEPEND}
+	>=app-editors/emacs-26:*[dynamic-loading]"
+
+S="${WORKDIR}/${MY_PN}-${COMMIT}"
+PATCHES=("${FILESDIR}"/${PN}-0.0.1_pre20210618-dont-compile.patch)
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=("-DUSE_SYSTEM_LIBVTERM=ON")
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	elisp_src_compile
+}
+
+src_install() {
+	elisp_src_install
+	elisp-modules-install ${PN} vterm-module.so
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index cc155c333848..15f2612fa68f 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/distrobuilder/Manifest b/app-emulation/distrobuilder/Manifest
index 0eb68abd869a..1c5a477b26d5 100644
--- a/app-emulation/distrobuilder/Manifest
+++ b/app-emulation/distrobuilder/Manifest
@@ -1,3 +1,1204 @@
+DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod 22 BLAKE2B c2b56c0b043a2c0225c3b4142f179a2d2e4938dad64b95c8662a6d641e69a455b50ed79c66a3bcc10982792d3b7742ac96a2d74eefa7fec40a7c3146e5c949cd SHA512 7b3ef87f98485bb9ec325680f57d43a9bd76e90bdcfb1e798458f28f7d3addf91dbb6a07b654749468860981413ad2267df2d5f3535c85579e9f79d9328d355c
+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%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%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%2Ffirestore%2F@v%2Fv1.1.0.mod 568 BLAKE2B d3d62f2d5c018c4ea3c829f7485e5a1239e2d810f79306af4d08ac32acda4d33e8e90c66c63540c4c95231f5fa116634758858dbf4af2a953a17b0db2b5c1cc9 SHA512 adb3d294ec1e9476bed820afa92aea5cabf77e7996d83bd1f03dff8447dfb13dd18ab4f091ad6ee209128151dcbfedb4967f99ccf7e10f5286e90b2ad56441d6
+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%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
+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 distrobuilder-1.1.tar.gz 17339508 BLAKE2B 5dc023520783301bfaaee9dbdb7f6707a565b6b7cde18afe53051c47cf4ec243be4f279846753f4fdab75f8aa3333fc4e74d90376390073e36edcb57a1d22815 SHA512 4638cb7ad34032a4ab6d6d85a07b92b7ee3ebc6fe34672d148b0574d487ca2a572fbcc700f829865faa77ec07f78e47555246cb8a2455c713d5051f19cbf8426
+DIST distrobuilder-1.2.tar.gz 139416 BLAKE2B e6d0bf355818020ebe304adb71c35a67698441eaf3baf62abcddb334337388d06fb1bc49910be0c716038a41f18bcf0573a484e7bbd1fc4fb46ccabd15830376 SHA512 4595f1387c005f1dc10e7bf43e86c6e88b22d38acab301107fa6e6c419db13df42995eeaaaf34bee9fefae5465151bfb64bd72517b315ae0df3dbabfe5cd2a6a
+DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod 36 BLAKE2B 52a2c5272e004524397df00dfa03b4c2d2ebd985a0c974236aad6b847d6b2b4b7c9b69ef48e263f4c67983b845b020d2004fe749b46fee3c0525da0416b20f3e SHA512 350a16c68553738ce8c2f4a6ac8beba66a7dcf2386a42aff938ebaa3bdc526bda8e5c51c493331eda4666cbcf8411ee7ca3aeb0768cc4f557f34585960f9eb84
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip 32735 BLAKE2B 5de266d7400ae80c027f209cea91c911e22b0ff4fc6a2e964e8906f1a86cc6905b9c12d2588d5fdc91d0d8e9501a0ddf2f7a376cca9935d21943386c3ef31979 SHA512 72621865ffc0cadd27603e2f4032f1cd9c9d8bdcb920b3ca9fd02dbf88e52876a6f092c5b74eceb136021c514b68dc599f0cbbf18ed1620b827d46462aa55e32
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod 366 BLAKE2B 97345e1c4c80024fd786edc92d87c2429bfb7562be7e96648e887d44bbc8d7b4a28da6510910feb8eafe4a390339e83a394ee64ce0686f18fbb291a4792d5c1e SHA512 bfb202512ad2101bd0d0bf6bd3e712f528a5f3b280ccaabe96c54ae06e5deb474cc0bdef0be5f3faae1dee6ca676531acfb4c4e53a5c34022a718e73f457c9e7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod 376 BLAKE2B f7e3a3f97b6a61ca9d5497ff96984c9f445d2c138f9d90157658cc697d9531cace1a87f6e2a18414ee2f7f54eee81d7652b3006b8be6c0137a2c794d37bf845b SHA512 684a7c8f51caebd1bb90c7eac482ebf9a52228c57a5b31ea1b3d3019864bf669688742bf5f9159995e5a6ddb3786aad9dd10c37925767ce9f38641c9a7448e3b
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod 380 BLAKE2B b6ea0cb491b11963174850acd4d525607eec5b63196c774afd73f974048a9a99d0ad6209fff72bab5238109d80d7498b4f8bb126b3c8a170f34373d69d96f4ba SHA512 63536f9954ee05c36e35abee4e91f9791fa97e10a945bb51c710cb2aeaf3a567d999193f968ce54e8d530be617fb55dd6e3a0c0b88f8edc96d1f92d348b13cac
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod 118 BLAKE2B 6c3b0310b2a333471afa5fb1c2cee19265ab4180b71cbfaeb875ae27e5db270fdbd141eb8d498e0e8dc300e4e0d9ea681e99e1a2a3b52c891cad52155cb88a58 SHA512 d48c483ef76bb5ec8d721ba828cade25defd91bb2c0dfc3b44df36742b86e8e0650a2d010bc7843a0b4317633676c393f4044998cf7f953125bed93bb7fb9375
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod 119 BLAKE2B 079ec8baac7694b3a9080e10de4b2b23ed2039493614e4b9080461b3ffb3e3c2521d8a8764388f56454b3654983f2f2554a2b1596a4c1ce37004423c6f420939 SHA512 6a9196afd0b5bcafef72c001742e1c8e45ffd0d7f53ad64ff33a8388b71d90917cff08687ffdcc80f5f64806269c120ffd3ae7d0d718c6fb8b2810b2fc2b5e28
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod 119 BLAKE2B 079ec8baac7694b3a9080e10de4b2b23ed2039493614e4b9080461b3ffb3e3c2521d8a8764388f56454b3654983f2f2554a2b1596a4c1ce37004423c6f420939 SHA512 6a9196afd0b5bcafef72c001742e1c8e45ffd0d7f53ad64ff33a8388b71d90917cff08687ffdcc80f5f64806269c120ffd3ae7d0d718c6fb8b2810b2fc2b5e28
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod 111 BLAKE2B d97433a5745f1479d4c0aa7ed6b6cdf09827fe8cfb41ec000a0aa6162ba01629c76abf9491904397650b65ff74caceae9255faa97f54d0fde0756cfb1b09b494 SHA512 bc44b8d16bbfa4fb5e5f6ad015165f03ca8c747096d4618aac083a22313451fb283f0061fab90e6148e5a52279e839101561feb358cfa77e26028fcfa5a4fc9d
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod 112 BLAKE2B 37e4e4987feb544f6382e506e0721975c975cfd239138221555dd238350b534400256fa7118705a7ded177877f3ead64275789839cbeff8c175aa3e4f8b9c8e5 SHA512 a513562aef7037e4f62d099d2fb3ee2015bb43d6bb32b734ef2597d32642d7cf7eb13f1e9a71edf424e274912d90de5db5c038b8cdc4276836740bc045cd1a90
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
+DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod 37 BLAKE2B 21cbcf43ce9e4dc3485c260f4b20ae34fa1aa41676ccdc1f4bd28fdbd9402db8c1f77d4c644e5044a0f2cc44e06a6109791f6d6cc4620b32e1d2c36426df65a5 SHA512 752909cad98e7eafe9ff00951c27d955242d3d76c99c3e52427987f1c81720af76ad1da5e4d67e31bc192822b7de299edeb2077b248c0f070b6adfde4e9b8ec2
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod 177 BLAKE2B 1b5b5169436173ec669c16023c6993e233f5fadbb574533e7e2db2140c2db22cd9b8697135a46fe7d8787b8e5ae8c16019f15e5cd7a8c4ad59a46f6e6db9bb5e SHA512 83b5d04d488db971f78cd1853903e7f5cb1d547d5b5270bcaf35aff4240f0b96c300ce311014775028e1424c6fad714991c27f0c676d8b8eb37aaa62330450ec
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod 177 BLAKE2B f2d2eb41aaa0f3f47a75ab260a461e6df690c34e7e817ec61afc7854ae26bec641cddf4f4481b5b3b27394e303d1fb1c4a9864f4de2d6c01f33e3fa0521b05bc SHA512 584c9a707b6115caac28ff373974faa59d12531962997f9640a4172b020f72c5d527355f035449a767d65ce426fc9705c143a7bd8afb5058c9ece241c9ad5d1f
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20200113171025-3fe6c5262873.mod 177 BLAKE2B f2d2eb41aaa0f3f47a75ab260a461e6df690c34e7e817ec61afc7854ae26bec641cddf4f4481b5b3b27394e303d1fb1c4a9864f4de2d6c01f33e3fa0521b05bc SHA512 584c9a707b6115caac28ff373974faa59d12531962997f9640a4172b020f72c5d527355f035449a767d65ce426fc9705c143a7bd8afb5058c9ece241c9ad5d1f
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.mod 177 BLAKE2B 4dc3ea105907151260d8473539a5e8c9c32efea3087590cfc5521816e52da19dcc0f7d57ed067a15e82de427abed5a1271c45d5d3c7b284e6490251b0b29f289 SHA512 df4e0266024f6899aceda327e2634b0552f19bfc15db0dabd394cea6a15d3076b210800a083b79e4fa23a78852aab214325bd23040d5e064faaeb34af4ec4bf5
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.mod 177 BLAKE2B 4dc3ea105907151260d8473539a5e8c9c32efea3087590cfc5521816e52da19dcc0f7d57ed067a15e82de427abed5a1271c45d5d3c7b284e6490251b0b29f289 SHA512 df4e0266024f6899aceda327e2634b0552f19bfc15db0dabd394cea6a15d3076b210800a083b79e4fa23a78852aab214325bd23040d5e064faaeb34af4ec4bf5
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.mod 177 BLAKE2B 1abd608ff82193394b1553334bad24f5062c68fbc1b773733d4e69d121e4c23879207bee0211488307dd055def52bf24464b2be9685f10efdb23d63f8745bcf7 SHA512 5a32f55d6a4c3269cfa12d67a4f083477dfc5743b80911055c9e415bcc7cf477077478286fee918c154309d1420d19f811b8222e022df09ba2b7a3e1c93ffb38
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.zip 120356 BLAKE2B 24c6388559ad0953d8d5789f892f2236958f63c276f3887b4c29fabd4410bba43953b09def72561d8ce8db053f74a7ed0241fda3cd5c72dee14b224ef9a62f80 SHA512 7c22d948e4846710ab85a487741f92d60cad0593dd6d4745dc29662bc887a32eca9d092087a47619d579dd2f5fb3b6d36770d2cfcffd7512ece74f03a186dc5b
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.mod 1658 BLAKE2B c431a7025ea626886df3db5f97d03fcc46048cf2987af517d53d6ed088aba9cd023b3a298477fbbeade46c61a2dc2329901b6bbab6c2dd5166153cf571c8f02a SHA512 366574210523371803b9065deccfe090b868fcbdd6484722393e2cb8fa2f1e6a501dcea261c404ce03568f6359d9c9d3bcfda84aaf288f18e9d2235015e80e92
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.15.mod 790 BLAKE2B 61a0b396ffc0fdfd4a88f33c48add22ca1e943069ed96a04d2333f8468f234eb0d8e20dc1eb3a4bda69b0e605e334f84d7387e9a84b10dffc8238c3a1a1e2c61 SHA512 9ed0ff9065a0de72b5a32489a3a71989036e9535a5a69c4066ea2bb5fe51e4e0b90eb70757be7e6663f108564159b062d2fbf5edefc66cd2388008a1ce4feeb2
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.15.zip 608462 BLAKE2B 798e69e8125636647c90e509f7ea63bc5c8fd6c547469e6576ce9124db0431d8d91c4b2aebe9d6ee66e167cafbd4e1cf56f7b239ab01a9e4c40349f56220896d SHA512 94596fd38255cde7bbc9f2a5760eee5d404405c2d5e705cbcd8209f85c0d511574a1520c5584f53a30df9269f9d7824f4d1c34ca7f67a9ee7ef7e5650a512290
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod 36 BLAKE2B b225c59078b955a08b32e04bef09ef99df1befd791c66b6e8c1e97c820aa16bba520e2d9f31af170cfec4546a53b9f49eb59112e3ad5cb9f4ec1e32c570576cd SHA512 3035f5c6d6b72168b77140776f5a15d9ec7a81bacb1f0433d4595ad240c79d69466c6e2e4b2c025b30af68c88ebebe4fd011b04a8a82789401af4503a9cee29e
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7-0.20190325164909-8abdbb8205e4.mod 36 BLAKE2B b225c59078b955a08b32e04bef09ef99df1befd791c66b6e8c1e97c820aa16bba520e2d9f31af170cfec4546a53b9f49eb59112e3ad5cb9f4ec1e32c570576cd SHA512 3035f5c6d6b72168b77140776f5a15d9ec7a81bacb1f0433d4595ad240c79d69466c6e2e4b2c025b30af68c88ebebe4fd011b04a8a82789401af4503a9cee29e
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod 1988 BLAKE2B e89ecdb4644e50e2cd545eb43452729d909745705f5254a59547420baf3da357e77bf5d73b220da6899fe08a4eb034b0d1815702dceda20ada57e277b83b9954 SHA512 67df97dbec1c4a0c0f84551ea80df88a827c9ff4467614ef61544a611e19de6d063af40cf33673621f2e52e198595b61c8d6e5d732fe87f00eb7c5bd653e0399
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.mod 1715 BLAKE2B 2404c8d3fa21fbaaa7f43c4799c320c9c251dfe3f630f7b6d85696c270baa6c4cb017087a4ddc7f7da0b29b94239fc20399616ef1c5f3ce76f05e937779425da SHA512 9d9ed47cb1b8c51ddf79159682aeb99a043532f912514c2ef6574883f5bcb24f1c77c8cdc6238eba436bf3a6ffd095e53956ea1b28eef9fb5dec3646b5549efe
+DIST github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20201218223536-d3e5debf77da.mod 1606 BLAKE2B c0aabd6a401ab80282ac34b81828ecc7ee87098a6d5e781f78d8eb8df3ec193d5dbf9481d3dcef4fa101e99b6559ef13c137a211feb8c06e0e3bcc660a8da496 SHA512 ab7474c1c38a1382ddb5553089543c71da0f8fbfb0425bbba70694f22346525405e89a3edc5b2ac271fa41aa97104c99812e7e5bf2beba066abf592731edab8f
+DIST github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20210227013316-43a75bb4edd3.mod 764 BLAKE2B 5532c4d9382a512ddd2668e766baef1e7e6294f64bcc071598067ee8528e427c5eef89a8175c1d86c4ed4114c661f5a3b9af37f9c3b562646b322568b9b0781b SHA512 6172ec1bf31743800440da645d133ca67f63f1f1495ffd60e5da7ba0e484ae827a2c718fcd802dde1321cded675b9ff2fa24dd0dbd71f784d96329767121d85e
+DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod 38 BLAKE2B 3f0ac051b31c84f5e98663c1e6245a4e2bde2be5c0be61ec80764d753bef5479251bbad3cedf6fb998d1a4a4e66a80beeafa6f3291ed45f46d643f7be109004a SHA512 aa1f503fe0c19002da21ae30df5393c15f2b2243ff415493420204d11032a562d5d40047705b1644d031523881dbbf284d3c56ce8106a2a969d2610504426762
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.0.mod 39 BLAKE2B 8a682140a1d07e82263b0e833426a913fe653381cda13a51ae57546b3364268706318eac76964341746db81863adf5d617ae6f35c5f99975b7678760e1ef98ea SHA512 d513ea6695c5f40b36e8f861d4004e3c8d222dd6568ab60b836dc80608e7e58cfb08e76718a706ad6064da16e3d0d75bb90cc5a33b4ba3a1e0b1db8e6eda7eb7
+DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
+DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
+DIST github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod 41 BLAKE2B 3f9f665454c79b0807b44cf10f69fb0e5c31364865412f19d8b146fc9a0b12d7e5a6282812c7ac70940470a3ed3f2cd9c2e6bca7eb51e43a4b14ad5e723d76f3 SHA512 f9f36e700dbfd7c997b79e527ec2a4d91e5ccf2f4bc7ad6a9298a9cbebe05263bcf8776bd2f3dd258f292790928a20cf45184e7af00140b2940af322897a59fc
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod 41 BLAKE2B bf54fa1827896179238ee6b907fa2222300f47daa86e06332ebd77710873d776ee3195eb506fe2aa5eda4c5b66e6a4121d362c99801ec59b8daf804944279657 SHA512 0c4cd8838cfda0eb234cb8eebc06b0c60bc6696add9d7ec918dfb05bbfafd0230dea107790ca5213a33baeb36d1bc48e4f837bb4000a5447211fbf380a6b83f4
+DIST github.com%2Fantchfx%2Fxpath%2F@v%2Fv1.1.11.mod 41 BLAKE2B 0c08b3b59833ea97383762c1a9ad38d7d7bae3e699a4ec9d05f5e967eb15091f16c6f7d41a212a9a7147aec7c0653b5bba0c0d82eebedbe7a50e436cd5989db7 SHA512 bd84d353c039aec578d30ed57d80c84a2bff02c57aeb1249518a4b47eb9ca4b5537a6b023f9a8fce1033c5707f7566578b05a9cbfd2485426fc63b612468d36e
+DIST github.com%2Fantchfx%2Fxpath%2F@v%2Fv1.1.11.zip 34119 BLAKE2B 5ea7f66150f3fc8bfe76ff092023e46b60dacda149631b5f5a74a71ee1a7df882b4384aef6d8be42ed3a25275cf185cf6807dec5c000e47d267f2575150de2bc SHA512 ee0e35d0653d99b75742cb3e80bcf28d791b59b56245994ff5236679322e49f996ee526934d45c8e67ccdd8b990a423bce0e54dd67e4b27250d08c5590ce1584
+DIST github.com%2Fapex%2Flog%2F@v%2Fv1.1.1.mod 992 BLAKE2B 5cb8556cb9207498058590fcc1cb054c67f60f508e1dc12d0086a3a11fac89dcf90f49a5d844c3e683c76fa159af4091102c165f9fe03e7f7b0e0aedbbe9fde2 SHA512 deebfd1c4d2e3d99fc3f18a9df19b76af9ab511ec4e5d38363c46853f4d531f0ae2e4cd814be374d0db37a507aa221f497876e08532acde65b6c132a290a98d3
+DIST github.com%2Fapex%2Flog%2F@v%2Fv1.9.0.mod 1254 BLAKE2B 0e204388f839c752dfb80541c112671e59763d5decd8de88d55b7acfd69758404761970324c42c02958c0532ac9013c7ba3ccc059e128af7d3b8a5e50b9ebfa6 SHA512 95fba009c7d9fee7ca6dbf3f47f3e603e06aae60e8168d3febbae1ffd175953cf7d1b5882f64b4dc3c88c0d9b117e5cd623d1a4dcc48634641c51e4ea0382cc3
+DIST github.com%2Fapex%2Flog%2F@v%2Fv1.9.0.zip 49314 BLAKE2B 70c029396a1490ae775826887b591437ee7db57d0876e877001fa059695fd8df5dbeeabae1865f7ff6771551f95e13ad76f84e80e35fafbe6cbfa292f202bdec SHA512 fe7586c8cd4e46db9cc21b9149647304c78aa90f8ce9470fce1ae0bc5eb4609bd0d1fa6c3e461eca353f1e5e8c9759f395fd47d7bdc6ecfa2a3a6315f3f4496f
+DIST github.com%2Fapex%2Flogs%2F@v%2Fv1.0.0.mod 155 BLAKE2B 19fc978debba380f1aa426c853b7deba0706bf668bcfe3dad4ad6dc7693afa961fc02905900dffb8f173d19b0c2baf6bd847c9412d5c0856426a5824b01e974d SHA512 92bf6185d4173c2510de3839bf1cb40a120903b630022263ee710738fafbfbb9782347b92a441e3671a069ad9d7c0e4765bb210013a6e47547fe161032280010
+DIST github.com%2Faphistic%2Fgolf%2F@v%2Fv0.0.0-20180712155816-02c07f170c5a.mod 32 BLAKE2B af57c9cd0291aa2d8b7831d94d7bb47b8e44ece55d63b5fb45f8235b91de5d7fc85178118f2d630c6cf59987d8bd9c2726372728f0efeeb1d7d25febf79c91e6 SHA512 671dfdd80d2545609d154864b85d15b25ffe4334183ef99e46020a22001d0501518902a50f71e8239eaacc2723df04166712b4ff194dea6ba25820f40fda8bbb
+DIST github.com%2Faphistic%2Fsweet%2F@v%2Fv0.2.0.mod 283 BLAKE2B 8debb42930980885b0523eb73bb93a37235e8682d75c4e1363b989a6a668f3096a146631985d047e413001dc2fe363346421d2e9b69069dec858254b7c31feac SHA512 c8e4699654b43fe58c813703548b51f140ff9cdd684ca837be627df34b4145ae86440c8c3e0ed6d699649a8de0f8ef90cd5d50cc04193e1b3ee9386046e77f25
+DIST github.com%2Faphistic%2Fsweet%2F@v%2Fv0.3.0.mod 283 BLAKE2B 8debb42930980885b0523eb73bb93a37235e8682d75c4e1363b989a6a668f3096a146631985d047e413001dc2fe363346421d2e9b69069dec858254b7c31feac SHA512 c8e4699654b43fe58c813703548b51f140ff9cdd684ca837be627df34b4145ae86440c8c3e0ed6d699649a8de0f8ef90cd5d50cc04193e1b3ee9386046e77f25
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
+DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod 145 BLAKE2B f28dde209c4d43940897c3dc758b088b19b38db865cba75b246477b497c1303301de7cfbfbea2a7eb1b124021967e4ead6dcfa8475ad240a7381bc7ec256b565 SHA512 00cbada20d24a2d08b1f06e0da060140820972c9718e707f0cce56ad62f1ab7344a969cefece18bee79f6b92dfc390e496d6a4af7c95eea0b66d27cc0f59f3f8
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.20.6.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.23.21.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faybabtme%2Frgbterm%2F@v%2Fv0.0.0-20170906152045-cc83f3b3ce59.mod 35 BLAKE2B fcce8ec3cd6761ae9208a6138edaa637ccc04dd19aab3dfe5b3164dbb61689d8136264c02125ae754dd61be804852004ea91dc4b5ca217ddf9273a4b141ca0ab SHA512 92455aef226bdc8b6c7f82d6c627e7536c8e4da5196160e21280f32e79fdcf55e1a15699bcc5251f70004fa78c5c8bafc286bdac98eaa0e4a4fb3a1e72b0d752
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
+DIST github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod 38 BLAKE2B f6ad4f22436471512ed4037c3f4c8dec4e0f7cb9191ddda23a2f5a5135785a6c5af99dd9005218bf196e0f48db755d040c894f6c5f2c1c338580597eca5eecd8 SHA512 05b70033a965ce6a70ea5fe7c635768c2c665942e04b17e47fba03b70cd977a8cbc292faacc3e10bd785523a43c61d42811c20513669592f308830863cfab56d
+DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod 568 BLAKE2B a2769032d81e02d8f4945648d36e862a996841d0e138077fd190b47b700fa08cd4e8e8d300925fcae5ebe48ea972afed0dcde81870f3673a3227ba90beb5e341 SHA512 262ec838f5c4b97bc186533c20456e62633038ae74747c7b884788bd06ce01863a59237557877d35f37338ebc018d2c1c8ae963e4a42dd42e0823a5b3ec81bb3
+DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
+DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
+DIST github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod 35 BLAKE2B 253b8f5c57339e04a68fcd945f25b655ae0d9b6a265fc3e02c9ab2a5cd0e41d68f5866e80aad321eda2e3fe0ae8b311ec0c4eb922d67e0c7f425ebff5d6dba69 SHA512 c19ab1ccc5297aae6bc7e3536b97091f3f877b1b76e5d93b89842e48ae3c9d4cf49a471ecf72ce6e2da001bd51ef3eb126a83bf5a35e50acc30a43db4d37c301
+DIST github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod 53 BLAKE2B 099610d4ac9528646136a6214a5816a721da42afd273e8e2e7ce40bb4afde2ee7ee3de02e0c04a92808ebedba623d47715e61e8deac2bef77aa9eddce5bc1036 SHA512 fe08dc8aa742ec64dde4481a917d19c5a64d68ab7a373ad0e8a3064978f8c76c5429d9a18a4a52d0b49b035ca9a4b5f96a24fc86df475a1fd725f7cbc0da814b
+DIST github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod 35 BLAKE2B 87fd74b3a198f0c8a9897797611b73c9017378af758bc559464b3e91a6f57ecc39752ad6ea9d73ec0df128a794a3caa6384cf1092808275fe6a55731b6f0bf8b SHA512 082d6dfd13dc8bbe32bb5fc0c8c7e0e2d8fe412397df32f87639179374e57eed96f7eea00a3cda8c0c9a78b354f9275c0be3fcea4b6c797aa627dec71870a41a
+DIST github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod 37 BLAKE2B 9dbf4e5a299c30b356177f7b76d96328e3f35affc49bbac79607fce63bcc72476a8220f773d3c5ae9a6aa0d5fa567b10e6392c68036aef5218253d409dfbc244 SHA512 ebe7fe07551e5a485d47502d69cf84978be13de26484f7541945be2113698bf11ee375a19718cc01af81074ada64803ce8ab78a5bc08fc389eae78fd9455572e
+DIST github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod 32 BLAKE2B 879ed9071c4044f638be3ff367074c7b456ebdd04a6b298b81240662e105635e778f6668870ea711daa2be5bf45086511170df20a43f811d41cb5b1ea439169e SHA512 6eac336db439692e7c478978d290ef8ac9128a31d4535744b0b55331dce7cef6284058b5acb164a6b749a60449cdabeb131142dc5ee3d0222d443c4f292f9683
+DIST github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod 36 BLAKE2B 8937677f3b8473d8d71c79e9d3e420bae0476de69d366765ba5f9a4c42d14a8cd18a49f4ad2911673c80276bdd47dbf019a62fc0aaadbffa72647cac046c362d SHA512 b23603768dd8994a9b735ae81f119d2ac2e33a1b54e6328044f92ebf03f905210e54692752076413dc45217b0a400870a5da8ebd75856bf6b74272d0a301484e
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
+DIST github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.mod 100 BLAKE2B e85f41fdbe685d35c78d22042afb1addb6e7b05a82f3818199928f68b95c3e188e80fc6f3f630c994f3e2b6a1724df5f8b4d407440e34adcc4b2c2c8cb55c53d SHA512 3b92bfd3d83eeec84259d527fc8fbb1854649b8fad658082e1f35044ac097b96f37ab6acbbd83fbe8915f4189bb2249364172d79b75b8d684a88e2c8744be0f3
+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%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod 135 BLAKE2B 1b785fb4e0af530378f15100e4523543e22b2f5f7f350eb46cb16290c1e2f55b18a9f8894024a472c7e9d45deacb1e7a3828a54368ce1ef83095916e2262c194 SHA512 242e8e3859ac02adf7d059da6d2fd5f774892e8a11b69d8e22bd2de43c534f7d4a472e9b3bde5e5bac106211f41546614cefd078ac23115557e26c3d8457d7d0
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod 100 BLAKE2B a7a92e487b14e5f8e8bddffe2cba32e8876b9dfdafb1786b62b2cb1cb93ed646aa98a5093d7e488c00fccf9beb98c078e22d8dca5362618cdb5f4c3515113087 SHA512 ff846fd599947276853b6388db9d0af7ee90dacb6b7dacfe99d8540cb857ee4a530d9beb894f830c52b687f76e69a02347333f635d37498c8fb5ded3b06bc562
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod 138 BLAKE2B a94aeebc267e5d2869c162c5f672be9d76d68dab9968373a51c2da4ea9367f6049ad3ac9fbfae36192a4fed13d176c92675017d1d9ac67d267a0697987cedefb SHA512 ef0515f57df8f50eff19dda46cc3d167bb700d90c7e1080b3f0e7bc07657ed41169d77ec8a4de208b0115c07df42a7ce1cac9bc245ef5cd2688aedc259ba09d3
+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%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
+DIST github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20200908144142-dab0cbea06f4.mod 967 BLAKE2B e6ca6fbd86a4d7a4477dfc1277c989adf8df3a1797280c707793c2442aa7db91bc77a19d55844a15720eaaf9bc88441d135ef185e6ed083a13f03068cfe8421d SHA512 050128e0bf54a0c09ca9ee2a5ffeebaea26a9d1360f1848e797b2766d931191878bb6080eaa7d501271ad5fefa54be13503da3bbfdcbba7af059d43b64d0fbb9
+DIST github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20201003224125-76a6863f2989.mod 647 BLAKE2B 7f778d01f167f1f7359ae817b361bfa530a0eb0a80f410068504bcc53fb2eb47a2a1f9fc9fbac2b6506139c590126bb062dbb612c93f3ed2413f8207b39d46c6 SHA512 e3c8ccbdb8a0057eabb65421f8ca587f4cf5d9dcc0a33ce1ce7c6f827aec10c9d878c69bec1f01b9977e74f093d238326bc3eaea4cc63b0000bfa965406eb970
+DIST github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20210316121734-20793ff83c97.mod 256 BLAKE2B 84d24102b845ad59069a6e1eff870db229dc19d86f5e7c69db0bbea3160b31a2b9d665dee392f1690808a65fc291922017c9fd53faa6f2f1b7ef45107e1eb728 SHA512 64b634e3f82598c9efbe9b0b3d6d2e567595a500f8b19593c75bd2f9855c412ba2a94377e6b7b08925dbec2abc8b224afb314ac49c740318d8cc3001c9ecdb2d
+DIST github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.mod 82 BLAKE2B 2da26acb4cecf71f1a3a252e31a59e07eef00720ec425bfd7f881de012554cbe341b84bd4ba731ac78b4f59a9f004d4c307ecd2ec6a0017ac1e211bd5724c3a0 SHA512 92f3a066d865b1e40c20ee1d175a54310f87c3c09be832fa7741734b485438f9086edff33ec157fedb2e9b1134686069f6e3ab7808560245b018e1a742d6a429
+DIST github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20210316141732-918d888fb676.mod 82 BLAKE2B bfdc964e9bb83283e3440ed14fcb68c099b84777c02c1ed3a2eec49abcb94e8bfa28b4e22119274e5e7d726983460b038dbbf97d6413c7780e4452f698b7dce8 SHA512 b01b810400eccd6df050ec3198a29a6b1145e1b159243c714909c73b2d54940facb8d58244d1a0565c983b3029e90a69b45922826ef0d298dea7bf1dfcfb82a2
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190717030353-c4b9ac5c7601.mod 37 BLAKE2B 49b7224e2c125faea72311f8abff0a639d4ec73b7dd198fe638bfb014ae94c7e720ccbb3aa5b6939f41aac2cc03dfd2016499bccd544cc31034e09e914b6a3c3 SHA512 d1b294e39f577cb07a2cd4a1bc47535f1ad9ddacfd93fb3779c8a9f0feffaa9fe82e7d8288bc287f6bfeab70e5da8d712356c6f635a0f9cc344183045b69a0f6
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod 411 BLAKE2B aaed1a7526861470d053cfa204fe5af2ba4ebca024322c8007d3660acce6fdca03264a12ca0bedcb6fe1f0cc5c78de920f8e8e19a36b12e1604cc3274bb88733 SHA512 32f6adadbc5dc2c9a57c698ba76fa4fd83637e67f58da55c6a22d4faad9f705fef7a472c2b2b2b94b2bba2b839b85856254fac4681dc9770893afa940bc734a5
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod 618 BLAKE2B 085fe180576e1d1d581d2072cd295ca43d305685ce160e77c27d47e4138ae8ba865c249c4098c8cf51943d65402b57b3942fd48fe7b933f1858bb705d578aa40 SHA512 8dd3e2b3e6b8f2c315289626450c89aae9827dae8a3d314f7372ad473165ee773c38afb4fb7364abde2f0543c66aa268d6f79c455c0c166e7bf1bcae20b8e679
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.mod 547 BLAKE2B bbda260ebbb90eb05c921aa25f616beaeee29a8f869f2b65fccb815a1e9b4007667395f5b6b3917eeb34fc80075c5d4bd29b7ed44724b115213c618f28487a48 SHA512 efce41b29f0a235d814f780e646b05c2be96fef06818ad6d477bad0d8557d7570fe31fb23cbff1ccb686feb7f8c7fcb0baf11be7c805e2addc6834d979ea21f2
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200824123100-0b889c03f102.mod 547 BLAKE2B bbda260ebbb90eb05c921aa25f616beaeee29a8f869f2b65fccb815a1e9b4007667395f5b6b3917eeb34fc80075c5d4bd29b7ed44724b115213c618f28487a48 SHA512 efce41b29f0a235d814f780e646b05c2be96fef06818ad6d477bad0d8557d7570fe31fb23cbff1ccb686feb7f8c7fcb0baf11be7c805e2addc6834d979ea21f2
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.mod 519 BLAKE2B cdc77ac2d07ad3c4a331c29876fe9b712155cd62ff3aa33c564adc35e9faefc91b18c9b4bd5d7134fc25f23389140f89aaf36e1a0e0293da4b93e9d7c6a22e25 SHA512 8c1f3f725b662ecaa878383dc2840bb2dbc88170b3ce8be63ca3740bdb9840268efed41fefdb1717f7c275a932eef0da354c0f6ccc1ed9f115e76e9eadc01d7c
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.zip 133129 BLAKE2B 37d037fc475c476ba0398162d6861a91c1c537994c0f1f6d3397ffae539654c282243628c5ba8810a371f09a6ad46ffe71ce2598bcf8db5cdfb758afe817de89 SHA512 44567a8a974dcc24a6484c680d0c27bfbadd42dcc6915e99930726978eaabd1a6ce89d7ed8d4e9df3be560b389dc0aaa4c71382913c450154f7ac2632b599e83
+DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod 37 BLAKE2B 7037e2b6c6f7927a37d8298f91976232fac6e1723d9ffda59b2c01bf81c24acaf124fceeddd8791b6a6bb1e81b03e1bd5ba88ec9613784462a235bdfdea76498 SHA512 3d4ac776b750aac30718ecb1a3efdb383cf39d0838ca60db5ba266152baa1dcbee739a8f384965b5b8d39b9d9b18561ac317eb8c64c61076986db66bc10bc1dc
+DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20181022165439-0650fd9eeb50.mod 37 BLAKE2B 7037e2b6c6f7927a37d8298f91976232fac6e1723d9ffda59b2c01bf81c24acaf124fceeddd8791b6a6bb1e81b03e1bd5ba88ec9613784462a235bdfdea76498 SHA512 3d4ac776b750aac30718ecb1a3efdb383cf39d0838ca60db5ba266152baa1dcbee739a8f384965b5b8d39b9d9b18561ac317eb8c64c61076986db66bc10bc1dc
+DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod 142 BLAKE2B 078f299e69579bbfd85aa291a997ac81e3f04a8317db16e836da1bb4242c8fa52fe809643b227471f5fc95ae2ccddb5d900a2720a91eef9e3fafff0e28979daf SHA512 a3da31b6bf413b1ed55de8dc4693fe4c9019550c77bf5098b67d305b273945cec0114a00cca4aee4d652b4a09ce318642a5bacd1ea7d7df63616734947bee914
+DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod 142 BLAKE2B b063852caf2c56ad1d7b42b5d6f621bc7c5d3b8cb53441688cccd11620bcca11806f01b999fec6ea5d9f297d7540845bbe1bf465f72ad15b87c1bba0e8a2478d SHA512 b14731c3e5c45c304480275ea23e80a5e287bf3eb2b6d56a9b8f6887eebe40fcc7ce22883ca53864ac9cec09f15657cc35a629aa08fc53268a9461d76e5f9a33
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.2.10.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.0-beta.2.0.20200729163537-40b22ef07410.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.1.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.1.mod 3167 BLAKE2B 7f6c73dcc4bb66b6eed715b0da211fc3e651d577ba5f3987e10c715e316745fe7555d387704cb824b0bdf2b21c4d3b9b6e41c26e9f39db855adad277423eff41 SHA512 22ddfc302ef79b6b3f8a47fe5293f36775825ae07e2ecf41e53edf6ea78538d3c321f28241f55a16e65d19446953d3703aef358d83656e74c5147d3efc2fdda9
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.3.mod 3160 BLAKE2B 5ea1ab9522c96ced2615f0116ecc7b762b138bedb1cd61b2dd955f41c47d7fb026e0ca8d91143569dace35f492ce4c5a4b5d8549a31885f7a11dda625b6b4114 SHA512 5201becf224bd0fb9afb13bd2272bf6410168f879ac0dd17ee81af6f66c16a6fd6b908b8d94d208f3c2c6f889039e2d2c3b208f9feb31b9e28a8fb7615d8c79b
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.4.mod 3090 BLAKE2B f86c6697ac3a3b6b35f70e2e5ffe2fb0c772a3d2e37ef929f4125cce251dea20c9229ad60cf7fe5d586dca4646d86be191152b2224e6c707c44ef26cbdcecc4e SHA512 ff4c945833966fef725e4add013e593b54c050ecef8912e2d8ac401042f055012040f7ef89201a9a76b9f3dd8d9f41fb01bfcc7352c7579c98ab492007180205
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.4.zip 2552867 BLAKE2B 8621474dc73b64e07fd12e3aa86c7c86942c5573d7653035c61d28e938a569f3f9f0c57a6a2b49989416c3f64def1450b8c8a3dfcae5afc10122934cae0ea485 SHA512 573f44cfde006136a4784278f89eb8ea07bdc1385962309aba208e19edf46d58059b4e970b260e7014cd4ec2448b7abc369a141de96e9b3af7ac564a13cd58b8
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190815185530-f2a389ac0a02.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20191127005431-f65d91d395eb.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200228182428-0f16d7a0959c.mod 1000 BLAKE2B 595d0a4ca474b1143bfaff75d8bb1089953f1b68da5b593966f85461b5a20ea0a8ebefe6340ae8747b12e9fda5a13dff135e751262f4efbf7142993938a103a8 SHA512 b6ec25dca49d545033cf2e97f7907e4709103e1bd76b341a27511c25df44788246d9788281d2f2636bfc7b4f39ac7fb25fc1de293917bd68ebaec92babea8557
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.mod 1000 BLAKE2B be8fe2174e146003221bd28edca0ceeec630e4bfb3be709e9a00f274c1a7b17d07f7ab07750aec301f443b9a8fbabe612eab719355843da965af2157f4cb0aa9 SHA512 17f1c4c0fb892b6273fe6c90d880b670e6c1fa4e1e036e137fc5ebb9a056d0fb25a968972addfe736c924d1326eb6b5ea4acfaa12119abce1bfa1ec5fdbe2157
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20201208142359-180525291bb7.mod 706 BLAKE2B 45839e0dea068348a70495e79fc5d2266d72b4c907cf3c316075d86a28d9963feae3f9ce69572306641730d8bfc6897ea88110c77fed07a221dd5fd5e205c81a SHA512 97225270bd464d92164307dca9ca128111905610bed66eb207e8e2372f9eded7162ac5298e3cb6948a3c779c92cc89ca973d148d49042624cb6cd8edf4d125ac
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210208174643-50096c924a4e.mod 706 BLAKE2B 0f74638af018614a90baf0d967e297ad5d128f2cba069e44829ff7ad7ed9723d6fda5789a4ab88dd0a42d47c8d41f52ba60aa420f18dcbb990cf4e744382fcca SHA512 b3a77f2822865a71fe706105baab7f54e109880e21bea2e1e46493371de6dcf8eade2881668a5a4848638ae8b39c9ca95364c842d67d906fdcbff6c197237a0d
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210315143101-93e15499afd5.mod 433 BLAKE2B 40f8d68e067e61c755d95545be26025e30261667ec2f2dcfc1f7c0a9b429852586a7194fba9c6f569242903a7b0328cb2cd4efa6a1f37de2a37013691a4608b5 SHA512 5814136e2c80d1298acddc6150b756369fdd71269c2a219b0d051c7e0bfadb10f42f2c5ae91c3ce4421eaea9fdec91baa9dd98d877477a809cc84457e7e4816a
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210315143101-93e15499afd5.zip 147531 BLAKE2B 2d351793b4edfd642b477b70355aebeaa5711031db3d4f4c1db7a810ab045ae1cf6c0490be5d5761b4ac6d714762eb1996d3146d4b06a43a16d0d8c1d9bf201d SHA512 99e72a211c9a297f855d2abf557ccc9d6f14e0fe44be668c447bf1d605e0b7838e739826651230f14d0e3c644820b9464f50cc9dd683c550b594f0221bd7de9c
+DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20180307165137-3d5202aec260.mod 34 BLAKE2B 24e82d551cc42b7a7c8c830ff4941074686a06dfc753202e49bdf1c7d5f7b960d0ddcf73f618585b6dc925cde9cbf123196fc4b45cba6bff79a16500f49c178e SHA512 9ae770f38dd2c9560c8c3e858890a835ed848d5434a289d889c312d681af748b11471efa47739b08ccc12beb6e9050d2f1104ac6299a50a83344f496af516761
+DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod 34 BLAKE2B 24e82d551cc42b7a7c8c830ff4941074686a06dfc753202e49bdf1c7d5f7b960d0ddcf73f618585b6dc925cde9cbf123196fc4b45cba6bff79a16500f49c178e SHA512 9ae770f38dd2c9560c8c3e858890a835ed848d5434a289d889c312d681af748b11471efa47739b08ccc12beb6e9050d2f1104ac6299a50a83344f496af516761
+DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.mod 175 BLAKE2B 1573b65ca6fa922fe9d47ba40920cc95f7f7f9135c729fe9d8f9c2723492a136033f6b16680bc5c405377ce7bf14db34d989c563af74bce702db0b5ab761bc13 SHA512 b227a5f0ea52840001d34ebdfb11b0209dad5dc49faa55c20f5d7283c67992f1e63e4325c4cda3a3e5b70cbc7231301ea448a7e272a5f864d78585cf938f0d2b
+DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20201026212402-0724c46b320c.mod 175 BLAKE2B 1573b65ca6fa922fe9d47ba40920cc95f7f7f9135c729fe9d8f9c2723492a136033f6b16680bc5c405377ce7bf14db34d989c563af74bce702db0b5ab761bc13 SHA512 b227a5f0ea52840001d34ebdfb11b0209dad5dc49faa55c20f5d7283c67992f1e63e4325c4cda3a3e5b70cbc7231301ea448a7e272a5f864d78585cf938f0d2b
+DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20210316144830-115abcc95a1d.mod 175 BLAKE2B cd70348bc4d75666384d9b368ccb9aad2f39066dc3dd98469712c0de73dc09ec519af0ad349ab2f67fc7f3c4598bdae67621c7df572569f346efe8c2d227713f SHA512 c8fc082c1d94ced28dc757bbe7bf4deb6300df92469c205652abdb146e6acacde9f4df1544cfc9ca877ffd29483eb7cad208c4edc2a7425e301358897873649d
+DIST github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.mod 452 BLAKE2B 9fab2dca3c8e2790959402414346a2f97f4826a53f730076e13e87e2f7f9e8a4e3b7436435bdfe29d991b2068c3ece450f68ad88c5b24bb4704c698d51e3bd4a SHA512 153d152d9e1cbd12a523d53ab1be36f76e8f128260927a900269aa8bb8512d5aea6d391e273799edf0f68d04756d59c01a3a7f8bb6ffb4f0b629b454a6c3ef03
+DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod 37 BLAKE2B b3d06413bdfc072eba71c8b51cb7aaf27ca29ba736959bd0fc9ef2de8fe3dbf3f194cdff7d030aa259c8e78fcc9003dee040be0d1b858a677d9e306c89a3542b SHA512 62de290e5234d6bd82d9a865d1ff592736f075130d1c29e9d9f2544ca3f9514c4a81ce1a726cf8fc8be8404e8ca41a88958dac755174ef2c20ec9b455d0cbc50
+DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20190911050354-e029b79d8cda.mod 37 BLAKE2B b3d06413bdfc072eba71c8b51cb7aaf27ca29ba736959bd0fc9ef2de8fe3dbf3f194cdff7d030aa259c8e78fcc9003dee040be0d1b858a677d9e306c89a3542b SHA512 62de290e5234d6bd82d9a865d1ff592736f075130d1c29e9d9f2544ca3f9514c4a81ce1a726cf8fc8be8404e8ca41a88958dac755174ef2c20ec9b455d0cbc50
+DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod 255 BLAKE2B 32db1b4c953ea3f3938b2440858dde31e603131b72aacc4acf32af9e44edece17c738b2014c04558fb658e367ac02c6dc2d1f57b89b61907bd38ba56242d9aa5 SHA512 69dde1b31556a7ede162e742be7e546d412bf257449878e92a5f8b3cd8246d77e9ba96c3dc82415f356c5b8a0181517a2b8f41178e5537739644b8e4713eb594
+DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20201020171139-16b287bc67d0.mod 262 BLAKE2B 8a6a3bc0f862a7ccecdfd3829946b534ecb1d9b66a1d0090e415bf0f8a0bbc039e232fa1d6b5eabb969a7ba8ce5650221ac8130b16fb654cbdfad55ecac56a97 SHA512 bc4746747b81ac10a3b30c423f65399646f8b636ea31e6f63a34e30818f7db193de65bbe9327e3ecdb4d2beb36cc581e8aae80bf215752967e6b6f47f3fc6693
+DIST github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.mod 2018 BLAKE2B 917e8990413b37fe249442829484abae42400bb19f819bd00f8d79e9a8469af6b39b6aa7b4df3e14ae83aade2aa3bfa984eaf6817e8aea85cf47db78ba57089e SHA512 68d307f855583847bf203a479833fafcd0df59a298f5e41abc274ad65d53894e01a69477a65b2411b2c6b9beb215ae534a63b977f787f139719f4fd2532522c0
+DIST github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.4-0.20210301171431-0ae5c75f59ba.mod 961 BLAKE2B ceca7fa48b92ea4ad3a3debe1eb481bbb897a3790e04563f4b5656c298cc7ef3152000f3c52d14d6094cef92a1b2d0e6c0e858ae01945d15e57755d9caef2732 SHA512 4363e27ef5a8efc0d11a1d12ed5799f79c47d8a8f2612e784a2a98a19527135a339b31f2c2902687fd885baa57bc97d9dfccb568ce40dff6639e1f027ea7be08
+DIST github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1-0.20210312161619-7ed62a527887.mod 711 BLAKE2B d576681942bc9c190bbd3a367ca9ffd41d969b1604cb2bb2425f2fc30b6d8c0e791317fbc8dbeed98cb24592013c1083ba7d4e7aa65955338f43375d369a9245 SHA512 ef343394d0d8026b753880ab3d08423ddb5ca2f80ae164adb13023f6ddd2f965d77b7ae0bbc2b014e99b5813d1bf1377c90cac9193d9d77fa8d0b7c6cd7adb31
+DIST github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20201007170849-eb1350a75164.mod 1439 BLAKE2B c5f90a8ab258e5a7404940bb4d557dc46410a36441af42e5ac06cdcb098b485f84518fa108d39527857a3babfcd2cd4415e4178928af814f0eda1895779a1c96 SHA512 468b17b1d2f697b8fa097fa2355f4d96f1c34cd0779415a453bd1d70005fae345f0551e05e7af729342f2660b749e31db95806d754257bb61a1296ebb417f35f
+DIST github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20210316161719-dbaa18c31c14.mod 494 BLAKE2B 2fab5efee2e79f709d55c23688841e2fe394b270b2b23baa91a36fabc15e2f16ca68f98807527b0b613b8aed74d686813ef9fd5156f240456853d94f48c7a567 SHA512 bafead244f4f4a049704531feba39d76875d495a5c8e9bf0f75b643dfcb5d5eadb6285ac0e9a9641564f376bd929822079ab015e2b7af668fc6af37ae66b6c8c
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod 35 BLAKE2B e2c6e0700e40d563dc690884628fa22b6dd56872a63ada54374c07cd6328aa332b6df2396300090da5c9f7ac730b6b9bd60dbc776557c4614d5ab3ce003579f2 SHA512 93f981daaa62351a480595cfb2feffad6c34770cf89f35399d777096fc524cafa50d0dd3f56231ae41b15e56061ab83f0f6829190730dbfc7f9fcd594af7b054
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828172938-92c8520ef9f8.mod 35 BLAKE2B e2c6e0700e40d563dc690884628fa22b6dd56872a63ada54374c07cd6328aa332b6df2396300090da5c9f7ac730b6b9bd60dbc776557c4614d5ab3ce003579f2 SHA512 93f981daaa62351a480595cfb2feffad6c34770cf89f35399d777096fc524cafa50d0dd3f56231ae41b15e56061ab83f0f6829190730dbfc7f9fcd594af7b054
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20191028202541-4f1b8fe65a5c.mod 368 BLAKE2B 52b871af9fd9f2b71074286d0877d16dbf6e9395f18326cfee8cd1eb7339b4694bfb90ae4c843ae1f71cea664a64d4b090b3b8be7e72f01366424400ec2ff05a SHA512 1655c00f6600d5a2ce87971a893f5e23b4d40f1e49d62fc39916751fc8c5352766321761b1e4c5f321f8e205d5164409c964ec508c9cb7372bd182b850692045
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod 439 BLAKE2B 7c315352ceb1b2572b46be523f2ae18dcda51ab13d268c7f54d597a4eb0a71d97cd3d615fc8c45584a7c8070b232b1c5b7003cef36a7ff31d1034335951dbbe2 SHA512 aceeefb2d381828781a1bb99048bf5135c18e1443339298974a1f457eecf86116dc70442d2c192725fba64157c230782ebe3b918f0026d89adff9195bf3bd78b
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod 439 BLAKE2B 7c315352ceb1b2572b46be523f2ae18dcda51ab13d268c7f54d597a4eb0a71d97cd3d615fc8c45584a7c8070b232b1c5b7003cef36a7ff31d1034335951dbbe2 SHA512 aceeefb2d381828781a1bb99048bf5135c18e1443339298974a1f457eecf86116dc70442d2c192725fba64157c230782ebe3b918f0026d89adff9195bf3bd78b
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod 37 BLAKE2B 109f32f2dc537cfeff1699937e93eed980f34a37faa111ad3831be6dbbb1df965c56ef266deba48aa1390fd94bdedfda9ba3a51f4f6d9519ae24db6b99dfe1d4 SHA512 6485196f4703578401e82673647b49d58fe60d7f90c311294096504d3e11477c75fa50684f00c7b378b2566e6e8683cf18d99f2ac78043b077318a643fb11720
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190911142611-5eb25027c9fd.mod 122 BLAKE2B 775bbfe519746bae037f93939baef72c091af97099c61ce8ac2e4ddc93a52ce06a4d4fccc52ae28f533da9c7aa147d9f302269d57448a003a695cc765d32cbc0 SHA512 a92ddbef593ef363aee93b81d810ff76b2df0a4155714d95dbae9d000edfcb4383953625becc3f24cbea19a77431cebc0767e40c746b6abf613ca5346f024370
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod 122 BLAKE2B 3fadecc6cf793ac4efbc51546c1ab8f882b9f350b9c32fcfbb93da9707cdb9d9cad9115e0a2334b4022e1cc5b715d8ad6a1b59e286ffe65b26d20f49036e8a21 SHA512 d2a8eaa285710c7734b1c046775e9715d20bffb7850f1df888d9b98cd4bd6062dcdcb18d43843ecd95adf7b125a105453f1bdea3fb75f09a350d229663e0cc23
+DIST github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20200918131355-0a33824f23a2.mod 1034 BLAKE2B 8abe2830d4e2045c33f438994a7c8875d02a2ea06c6623ea7147a3376328f1211c2aa76fe36328cb0fe2ea4f9aadccad5ee6c927289626cfb594ee70e5737340 SHA512 a5deb691a8a9d292a303c117978173bd49f60fd9d40d5c81679af2499dba27c4993ea8172218f866942d12c990759bde3e8fc9bb3658f9fda3cc2ad4cee79777
+DIST github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210301145711-11e8f1707f62.mod 771 BLAKE2B b760a1721861c21fa061d048a8a8c40a8b2dc0c0409b79e19aa0257e0b9a53d08f696d16daeff4e0806b23d63b5a39a34b9781f951dd97372ab573743cd5aa39 SHA512 c72a7ab4d97ae527f7548bcdb1f69a20a7d78ef0b9291820a82644097b48e278b2d47b8a15370bd475696e61568a0811c5abb42c3c2da9076a4f473271d15479
+DIST github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210315114300-dde8f0fda960.mod 281 BLAKE2B 0ca9a8e650cc6481cc6ea953067f8f7595b4824c72ef1c38e74187e55c67c8c4e830c68adc8df124ac9244cb834c8ff23a1a9d9ab08f94f3591cee98ad229bc3 SHA512 7e4e0326884c87ecd07fdcc1b6e314da75f822e329b9cc598de36912405ee57fd02a77e7504f3ce30a0bf03c0466b974e2abbbd41bf196904d852c3bd942b391
+DIST github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod 42 BLAKE2B 85f366b44e027fa05e71cf323e294e3c4771719c65dd467d2fdab5564501cce11bdd37696a3026b76ae93fab5f9fe92e0f11c6083c6f756f74a19cf0412f94cb SHA512 8249600ef0c0b1993da84d89e9ac18ce72daf21430e0d491f09e863baa6d59d6968b52066c2ef3c4d448570150a511641513da44219f4cc4f64184b883d87703
+DIST github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod 42 BLAKE2B 85f366b44e027fa05e71cf323e294e3c4771719c65dd467d2fdab5564501cce11bdd37696a3026b76ae93fab5f9fe92e0f11c6083c6f756f74a19cf0412f94cb SHA512 8249600ef0c0b1993da84d89e9ac18ce72daf21430e0d491f09e863baa6d59d6968b52066c2ef3c4d448570150a511641513da44219f4cc4f64184b883d87703
+DIST github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod 1592 BLAKE2B 6f69f5e32b115faa2999efe7e88bc17c4a114ab4b6550bd9fec16f847b4792ab60d6e9dec3ff43b3dcb043515df47a3285a5b15e367684f673aa11b10675db70 SHA512 e7e79301f7bec0d49245b444d05ed530f18587e5bd2ddd8efdc759a00fbd1aecee8b6d91c4532da05db700d04a1110faf2aa8383ae01dc597e2dcb0fb1315f8a
+DIST github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.mod 596 BLAKE2B 467c0bb9d570f483e3f9a6b5120eae6221c1c43ccefdae36826c721c690accda7da4993b4744dba0e646cfaf2f6ad7681aa8ef37220cda491fd6692ab9e1975e SHA512 f9a774bd25a457f029d0ee73d3c79119231e40315e08c7d389d9f9c3d8fafa28bbfd285affed8ace9bab66f4cbc663bde0a4fabbb9bcb918d9dcf80cf4106299
+DIST github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.0.mod 705 BLAKE2B f040ecdd53596b78697bb49f6b04ff25f5caf4db91ba1e15f7f8e7c11bffd7adaf0c80dc267f68f271cc589772855dbfa57b95e400df45946e3f98cfd1df3c61 SHA512 0e9e5a7009554c3001053cb210cea2982d0a1d0657e1430c43572d9687f6d9329c8223570dbe50c5bf64b1cf77fdae2ebd355ff2dd6a5f7fd71589e821682dbe
+DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod 37 BLAKE2B 871a916a33bb06834a5841dfdcfa72654f8590a10b7c6f23470ef550643b1cb582c1a34a85a5e5d50868bbffef1ee8613fafbb08291d3f2c47ac7db0a22221e1 SHA512 1709593125db3818a7db588bc486d23501400b9b0960007f0829ddfc42337b7788106b99589de8f83d8f78d5141e029e75621a854bca86a9bfa6e43bc0952c0d
+DIST github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 8c1815001cb2ba1108f60c9959fc87e81146ab7a716f48de7c679e793ccdec03d7324413333cf9dc6adae620298b5c637e0a126eeb6361c82ad16138749ea759 SHA512 5617723462dc0028176687327ac1144b1046a84c9bcf518e2c553a94c9549594c28345a5b875cfbefec148d625ff3525bfec17a97e4a84831dac4fd65d61f886
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod 91 BLAKE2B fad30507d91fca15291c8f13100206c9d9eae4f73ca4034e37de10d1494b42b03535540ce704582cd7a4be4ffa2685f778ac9cd3aa647d6c48d8e6fe33a345cb SHA512 54e3700ced7222d086eac5a73a5973147473e9d063a7a8dd719bff2dbe3d61d9e4cd7427f30c926a2289ef53948f158bc09e189d9714f0437d446f7c30d0cc6e
+DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod 91 BLAKE2B fad30507d91fca15291c8f13100206c9d9eae4f73ca4034e37de10d1494b42b03535540ce704582cd7a4be4ffa2685f778ac9cd3aa647d6c48d8e6fe33a345cb SHA512 54e3700ced7222d086eac5a73a5973147473e9d063a7a8dd719bff2dbe3d61d9e4cd7427f30c926a2289ef53948f158bc09e189d9714f0437d446f7c30d0cc6e
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip 19702 BLAKE2B ee009befd8861b2556869434d14c1d4ce130d432ba5f43821b0cc2f6fa493bc8a4f93a011f05f5789f7c388b2a74f272623d6dc2689a5c29dde0b3c307598173 SHA512 d7c39c78c074d060973433f5f4c1405260fa9f49ba9ff020630bb17404412337b536275aac71ae30c0e3783b95585c46cc492f722572b941fa1476898a6f7e8c
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
+DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod 45 BLAKE2B fd78b551df24aaa503a1e3a673291776e988c7975ac3bad69beadbec7ac5c85675da6e6da9deb4463535e1b0ef0a3e640df6e7ce771de71f033f0e7a3f67a1c1 SHA512 9d9af0844e5c76f84c3804b788cd643e461b02b8a00fa5a41a6238dd72dbada1bb03aa3e7e420f0c68d9926b9cbd2d159456f26ceb64f1c51162da939742d0fd
+DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip 8869 BLAKE2B 9c466fbe14685f949b792015995e38f276bc66f3f6ce8df45cdce9b1fc362733b3f0b08de7ed393c4fd89f24a48e4bfe90dcc8302af8e636707b07da769b4e8d SHA512 e8c8cbc63aa82d0544634f3aae9a4c94816aa5797bbc1946aff148b19651bea6c3c544add0ddc644d20eec3df99a4056bf11f7f9dd83943c53e7c443cc393eba
+DIST github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod 28 BLAKE2B eaa8a9fbcae0146b856a3049263745784b408c86ebeec08966f1f51567eb6185a58ac126e1c2cedd76fb83904c2011e30be079eed09c1ae85184d3524fae2cd4 SHA512 26d198660f3090f0b407efa5c534e963fe98537117ee3bf8ce6b28d84d4cf74320abcfeacc400e873ab16cc28cc0b158b451526d8ce22d08e98f8c5c473423ae
+DIST github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod 34 BLAKE2B 9c3101272ec15930da5985c33a6f623be604c73281209793ab20276863a7552efaa8c1a9167e0a5ecdb11a4f713909be8dc12103ced353d21d19e28693820fb7 SHA512 d93e8325fc82633cea4ccd5ca7df21c9d72d9a0c79dc39299008d7b163fcb67a7f9bef8cad2d2a5c268e85c41ee8a54bbf4657f0f0ecf20b211eff7f1e5b3b36
+DIST github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod 34 BLAKE2B 0b56809cf0ed4e3bfa7b79df2e82e247e083dd3b7467cccf31efed7b2391c817a41eac5e85035ac5ed806bf19708c62b54f634ecf6b5ca83d5781f40a593dca2 SHA512 ff1020a813cca721b7c41d2d4c3fd1924af07afbe798d352a44b07486dff9d823f8953bb011ad3a5b2ad87baa4bd1baa97be1820bd22bd98d37f166b4f0bd9bd
+DIST github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod 35 BLAKE2B 9f1621229dc76bcc02487adf4642116dfb391ec3abc3fe408364eab83a969dd8219ae0d6b418ba181fc3750799ec55fc49a3e3619cbc1d09e11063ad85b61a5a SHA512 35fad2e2c4120e7a4a22b833a1e7c4c78a97498140a4f8d1233acf1cef5936fe45983217d45f73e5ecadf2c1981a0bf1952ea340e987429d3114b18054786c73
+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%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod 38 BLAKE2B ca172597deee09bc6129ff6d8a27b70cd49f5891f9db37e73f1178996255cd0548405d7fdfcffed3745777a332d3e979195e4da827f45e00305725f119332cc1 SHA512 086ced52944283fce02fb1b53de3748e32fed8a90dbab1d69e9ade5ff40c47e3fa1277cb3ce7bcdce2dc36d903eb52d3d3e723801fa8f6265736badba1ae935a
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
+DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20171011171712-7484e51bf6af.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20190905152932-14b96e55d84c.mod 3136 BLAKE2B 7f2d74332ccfa9e92678b72ecbd9fa615c78924d6e8a7be0690cb11661d2a86ce19e97ca5839e848439bc91709c2b50d8d2f34cc91e50288cb3fee1b3a10a926 SHA512 5facb46a2728b34cbc10c9b1ea5f46da1b528e21214dfb4b12ce01de682d7340ceac6dc31cb6d840c6f596cbd1e2efff4003030864453d70280bba40cd256d9a
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip 662227 BLAKE2B e9c50aec1dd4d34aab11819bd341b1f0f6fdc32bac63124930d45f76f0259aa5e1e4781bb408411e643574112ecbe57c3b9c4c5fe59399c153d48dc5eb5bea41 SHA512 aff78c88f3bdb596f1855ab993d8ec3315de9d4809757e2cba6fe22ad4d5dc220242f90e73d9d0a33f9a13521705b82c8526082e26c752fb027dee4b28299d52
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20191101170500-ac7306503d23.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.3-0.20210216175712-646072ed6524+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.5+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.5+incompatible.zip 4571399 BLAKE2B 01e24524ce18179649f706f1f205ac1a98be0d1803f8db4c08dea1aedbc742f418fcb72ae34dbf7c7f799d6d579a3187f98d97f2990edb9f82a50c0bad443ee0 SHA512 3755024e1c4e5f17b10b1527829147127060d594467fca5da55d47c26ea4f79669caecb1c54842ed609b0a918b51fd0b80f74093c3c020350893c4ce8aa38e19
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod 40 BLAKE2B 13f8b46e2e71edb04180a1734d63e1e84dc75661ca635d150fd2bb8b1213df768520fc1c5cffa7a9cb224cb11788efc5242dd85138915fc21dfc9ff95b1d2737 SHA512 721f6b5cc358f8ee7093f7c80e4153ebc474f2052bdb3a91bf2a4ae9d2dbd2e2e50635a5bb8f9b62bd8ee7a0b7420ca9f18c60abcfd5287a953ea63d21aec53d
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip 43214 BLAKE2B f64253be261a17ca9e2c6540d70b159c89b5f578921a7f6287e39be2a99fdec8b67191ff06315e5539585ffe812235ddd90c4a9754d8d63e512fec1991297709 SHA512 a61373f6a66f0ffecd3ffa78a99e6d9560419ab325f12101ae90f2623fdcb2e10adcf274459191263e1a80dd866fb98388434f9875c52e42dfd646d3d25264d3
+DIST github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20170721190031-9461782956ad.mod 35 BLAKE2B cb3636f6ba689ab17bbd240c10dd1f1f150988421212af1498f68fcce3250f61f1dedf1aec95c5437ca7ce92c26ebd115d1b3a16da55d07cfa423871e6f6f73c SHA512 ff56a30d40408c088c121984ad3ecfbc1214da641baf359fc36b8a3ae50ebfac8b98add4b9e4a47f8e03f586800fdd9c268582e581bf99e95009abdcb4e83af3
+DIST github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod 35 BLAKE2B cb3636f6ba689ab17bbd240c10dd1f1f150988421212af1498f68fcce3250f61f1dedf1aec95c5437ca7ce92c26ebd115d1b3a16da55d07cfa423871e6f6f73c SHA512 ff56a30d40408c088c121984ad3ecfbc1214da641baf359fc36b8a3ae50ebfac8b98add4b9e4a47f8e03f586800fdd9c268582e581bf99e95009abdcb4e83af3
+DIST github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod 36 BLAKE2B f42e08ea331c88b2b916ba61587904489222acd832f03a2c7d887d555555a634bfaeaf752d030c7476bfcb1c2d3ee627035d30ea79391656489046a09b61b1b7 SHA512 8a8ece742e952ae7af8fda10838b5c394ba66b2b3fb26b59d8751beeaaffe799210812857cd37eaa311f50f937aa5d271e9e75e54e81fe4a8cc688c1f2a33977
+DIST github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod 97 BLAKE2B c4d40b36cb5693e25e7cb6b9fc7043d0506257d180af3fda684bdad39f566ed75fd711da2e72692dcdd093641ca9919c5acc52678924452dab7086fbf0b670c5 SHA512 8bdc67ca174552ec0f0749f47600c107f88689d8db50c5ee801d5f7a011c8a0ccef00de19d2d47f0eb0c3932006366dae6a1630a3cb10d6052d0f2c0342f5c85
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip 14089 BLAKE2B a825c998f5a7e6432a9d23f49fdf9d8559b8664ce6508468540530efe9585a98400bd38681a24b5a8b2d10b13c4ad91216f6c71153e8c597e3d2e8c8472622e9 SHA512 294682c312e079f96ac920c3f4e3dde7211e36622a378f54f32483e032f4df6f54a1f7314df7c73e2b7391bc559003ffe2bdb97380e4507aba7620ea4123d872
+DIST github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod 34 BLAKE2B a4bf0454b86b8bee83b8b7c1af18459c17c527c3c30546cab6d4f3e950cfb7336d70d7154c2b799307acd9df81bdd341722555ee7f91a53a8604046039f3f337 SHA512 d5fb8a4b7587a35d372e8f0710899a7df4791ac0f0a7fb96b8fe2330a6d676ecba8903aa9c86d810b0575e61b98543bcf1ebc24e5961f1947e934d6acb121736
+DIST github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20160708172513-aabc10ec26b7.mod 34 BLAKE2B a4bf0454b86b8bee83b8b7c1af18459c17c527c3c30546cab6d4f3e950cfb7336d70d7154c2b799307acd9df81bdd341722555ee7f91a53a8604046039f3f337 SHA512 d5fb8a4b7587a35d372e8f0710899a7df4791ac0f0a7fb96b8fe2330a6d676ecba8903aa9c86d810b0575e61b98543bcf1ebc24e5961f1947e934d6acb121736
+DIST github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20160708172513-aabc10ec26b7.zip 55046 BLAKE2B 3b79219296ef31cbf7404bf3c6290e20cc0d8b55650d7ae8f98cdce894839a0f7c105af18a8018b17366e8fcd0aa182eeb4ded9197c290824f583676026786a1 SHA512 fbe6d7b023d070a93eabd1e5c2675d5116a9bfadf9bae3ccb209e50b4537d68044d48dd88b4e6af03e0332d33554f6e50a847d979aa769d50e9090559abb872f
+DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod 36 BLAKE2B d46b14a3eed14f8d5886e333deada157d9484ad3bab124d3d57d9fd6a39242c2272417df8bb31e08361f2be8b11dda9e96600aa800879f393c8753330eac4e68 SHA512 7ffd6ce59d5c5fffc6ee8e8f48e1e7114628ee2631abbb1a3591b794c23b2ce6dab10f67b8b76bf82c73e1cd8614313b2bb1152b829a8875425f1a603ee394d4
+DIST github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod 35 BLAKE2B 03d1120023db31c39a39e5b7f336b05bed30e652c890e12986c81778e49c771e97e8ff0dcbb053f00627ffdb229223b385a9524fa1d35ee83860ca3e0b0701e8 SHA512 7f90935b89bc2fc83b0f52d0090d8cc3f7262415b1feb9c19420f663da4ab8d87bb5cf42c2a558038c57e3e772b468132509b45fe40a4993d0b64b80aeb64ebf
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
+DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
+DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
+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%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.6.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
+DIST github.com%2Fflosch%2Fpongo2%2F@v%2Fv0.0.0-20200913210552-0d938eb266f3.mod 183 BLAKE2B 36a9351e2453232610f67468ede117069d73e3adb983c31f7e8d55dfb90b64908541615471239c16606ed9d0a33cb6d07eab0c1820ba5e8400a29ec4a6364d82 SHA512 2563257d9758599c98fdcfe95352394ad4cbdf9defc3fdee155115180dda8ebe174d39d140a4a3d5b62af95bf09be2e9490c7f6380513696fb79a88312e1982a
+DIST github.com%2Fflosch%2Fpongo2%2F@v%2Fv0.0.0-20200913210552-0d938eb266f3.zip 127684 BLAKE2B daa1fd633af0d070daaa987340742768912db54a66ac685abdc81a87de9e07ed1089f024726dba365bc0fcfb9a6bbd988ecadff070699c9b12511f314265823b SHA512 f21ade27ffb182ff234ab4fa20428edcdfd5b9574ef71f42b1a75f7084f954cdf288c04298a4ff6e70cc4430f784fa44aeb77fc57920b8a63f7633c257b8ce8d
+DIST github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod 39 BLAKE2B 03c2848adc48e404015826fc857d2a7b923efe39f2b11ec28e238ad2b06b0c5f4539f256443f91a116bc135923de7c4013a44285763b482d2baab5db1bdbefc8 SHA512 6c5546d979277d5488fb31eeb9fc33999dea631baec6902f937e19f4d65a23a2bb8620481c3ec69606eabd019be0096553097040bc778522b05f85ebc56bb787
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod 106 BLAKE2B 4876f70d70d2d8703d7b6abea5457e093043912d6a672bf7794a892d1c17b159ed2b92dee05ba1625a1b7cd6c8d66d6dc715bfc1d7c0f1c47965ae8e30506bb2 SHA512 ea3a26ed1f6df26a7e2aa64ea9d5d4a4c3005163cd8adc05028cf25d56d01d115bcda38b7af992242013c2610f26a184ce43dd1826309c95fa008fa9c8c387d9
+DIST github.com%2Ffsouza%2Fgo-dockerclient%2F@v%2Fv1.6.4.mod 968 BLAKE2B ce8b43e6f225e29df6b138a064d6cbed41a044e07ef3378d44892ab23d0ec4588808775908c15d259d950accca5635da69019d1796cc78f78a3200c76594ecc7 SHA512 7149d50785f0aa7d1a5d43636b0b3ee2a0f132151fea4d7c7cb109be362240dd87e989c5f4a7ddced6b2e2a76057280523b12fb3ae1cc381111a049163f474ef
+DIST github.com%2Ffsouza%2Fgo-dockerclient%2F@v%2Fv1.7.2.mod 983 BLAKE2B 4ed3319f7027efbb923258a47a79ff1b5f765180e9a297ad2e3a8551541f0249270735389786c253b6460b973bec29deedd7176eb52e3c035eebca92f4b623b3 SHA512 264ca10c7fb60d6044e270366f8165bdf49fc3d36d5cdb787a7e927541b6dedd784c6735975bddddeffe1aaff5eee45d866cd1238bd35cd9a7804b516014a800
+DIST github.com%2Ffsouza%2Fgo-dockerclient%2F@v%2Fv1.7.2.zip 226026 BLAKE2B 4f1fd86c098c95654f8a7a7becd378f7059922b775ace0cac000388492005aee382d13f74e81a38a4f816c519dc3778a9ec27a537bea1210167e5cbb5f457391 SHA512 92452b5ac5676d8280b17a337b58cd64bef8c9d73897d2b03791158d603899bf3284255b9d9fad4dc177849ca5a1b6ed1d8a86c52b334e7e7823f74a5c1407a7
+DIST github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod 35 BLAKE2B a429dde238710a24e360e6aaf3631eeb28f1ebc1b75fadf44978ff339735683c81910ed7e7c9349d73d06721bcaa68fd526d5f31fae11dc153627de6878fcd1d SHA512 c79cfbe12d4b0cf8e79d2b652665bd6c81b0983fae996b472273cc0163eedce3beddb73e784fa37fda5442096b00aa5135df6fd06c2675942fdcb79b069f2667
+DIST github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod 34 BLAKE2B aacafc6177e1e87c8f4a17f295900d749608f722755d31a1939d1b601e4719984c0d1299fc4de9fe74c1109852009daf4641cb5c81629788a639eeb9314867c5 SHA512 c4b5fc4230e8e9c7631f577ee15414f7a72bfe27af524fd6bfad8c38a81426411dce35a191d840a9c69eeedfeacacd3f2a108c5eec35a3e30b0a7b262b15340a
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.3.5-0.20190526074819-1df300866540.mod 537 BLAKE2B 7a70f84e859adcf37ecddeb2e80e4c1302dab28b15102ef30b995d4a2986151c6646f450705bb80b815cefbc80d68a26be28834c89780ab05f5e408ccce05362 SHA512 f1d930fa81501da87f58e0f96e7062be5e1406a1e99965ccabbc154a415cd2fe3fb374891e1fd7362f68003282c4bf59671a8521c5bedc064df9a730fdaa8ce4
+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-ini%2Fini%2F@v%2Fv1.25.4.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-lintpack%2Flintpack%2F@v%2Fv0.5.2.mod 475 BLAKE2B a6ee9f4b83cd2eece5006f2bdb2224b483372058c70a2374b0f8ef6e01625874653e93f804d6c95431c0d522d775f40e799704dc31a07e69aab07b690e0f9545 SHA512 bc80cc006c40939066739019c1573f78b9da54efa1f8bbc606865ca6355aa26deddb06f2c80e754ef74b9a7e804d5f45c50bca4870d9b7b995367aba2ff95281
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod 31 BLAKE2B d141d98fd2673b422369b754fbd430a465f08bcdb07fbbf1ed626304ecd0843255fd2e909fc395b04c7adec18a15dea65ede0c64689be98b7491729d13363db7 SHA512 45bbb63ae2dda8c2ea63c9e38405b379708326c3f2e7963e3589ea53d06fd3bdce1613b5a0c1ef66f9c6ddc21374b1669218bd6b3210918df0a4b205116f3e14
+DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod 40 BLAKE2B 58806201fdb03763a50b137694c83456be85e03dac2b8ac7a1dd39c27795225d009e38ca6bb232247dad1e9e6868fbc7d6e976ec8d50c36adc2f7ce7e66f75c7 SHA512 f1933f140710ea465e584361e0751356bea07b0e772ad7da7eb3d8ab2881a55c8c300140778defa1a541e3e7613819c28de76127168900c8d52e931a8b408d97
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod 32 BLAKE2B 165b3724097f123b839b3f65d2e401caf6d8046fe822d3d9b9f15d74e1da21c45b77706f79716fc1b9c5322127bec754b2dd35442fe077dad4f3e301cd168ca2 SHA512 14e60a75a483ff4a1f6313a7a8a1dbfbc6ed4c223c7a9d18c0b355e84261084204a22ef1125a40e30acb1b43abfc97e60c045dd91a16d2b4068a78a54d854d28
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod 126 BLAKE2B 27ace39813b8f55ba228ea7a2f298e26bc30daab931d25167887237a6e2a944014b132f143a20006e69861a6d4517d597ea6d56f74b2fa6941752f3161e44644 SHA512 a33deb764fbcafead3f863c4e20fbd6969e8ed04098fede6872555405fa4a352b31f771adfb5df03fd633ee5471dbe259407d873e230af01a1fd31b78042cee2
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod 210 BLAKE2B b3f610a7bbe7758041e145a17de7becfe6ef0d80bf8a2e6bb9de47883483b3ced7f09e0ef1d170f42f1c5928913cf80043727b3e62fc0025943f6a327a884f64 SHA512 d927113c08de347570e5ecf4ef7019c7574e9fa2d751273e8c68f114b49aa4a9d9c39e32937ddd1ad3d665757d59a4e498fe275578d40a6b0dc644ca7dd8fca2
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod 354 BLAKE2B fac3e9e9fd1514b1e07894e6931cd0368df9dcc09210519c569d81871ef1350810111ae38799b9f0b5692829d380b403d8f7468e81eab8ca22027ac3dd8f9adf SHA512 30bf4610b301503fed728f146ed4458dd3bf295e1e4f7e1ae4806f4ca6e8856be988a10642c84c5dad601d71ee5b7bbbbe0f3e371be1b382c3c3e869493721ab
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod 363 BLAKE2B bec8f102ff2d1cf0d4e61960971cae49e628ff3678b0a6595fd4add3dc6018684c004ff8de4a7f60fdb5ea8fa98dae0507c619f148836dc9287cc687cb9629e1 SHA512 b9528f1a273596c8227843c7b5513920f78c25b859c0d095499ea05f5c0200095f28a344c5bcc913b61c44f71c5af50462a2e7e2ca6ebb9670c5875096118998
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod 589 BLAKE2B 9446db5ead7af8fe9e74376580e35fbec6d00ac8590e3e6ed4469ee237f549da84be7a1c282081a65f6112119d9af29c11a603640ac8dedd45e807a9582a55d3 SHA512 23d81877040f9b00f665fe8970912d413e944fe3c811970158cdd2df6778a4170199209de6039d535a896a87286392a2e342d48743235d99059ebda16086d231
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod 499 BLAKE2B 77c4b2e41d6ef35e23029489c7962e3a6e036c1e55a876916b90efcaf7011ab935ff0bf8dfbfd45ea8a27194b480055a99039dabd2a45922a4d18f80fce4343c SHA512 c007b4edad28839d872ce2bee87b875757a3428a09d04d499bcf710baa8fe0f448a818f7a939a3c4c40b05436233a683af41c9ebf466ca58e0f44e508a014923
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod 499 BLAKE2B 77c4b2e41d6ef35e23029489c7962e3a6e036c1e55a876916b90efcaf7011ab935ff0bf8dfbfd45ea8a27194b480055a99039dabd2a45922a4d18f80fce4343c SHA512 c007b4edad28839d872ce2bee87b875757a3428a09d04d499bcf710baa8fe0f448a818f7a939a3c4c40b05436233a683af41c9ebf466ca58e0f44e508a014923
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgo-toolsmith%2Fastcast%2F@v%2Fv1.0.0.mod 146 BLAKE2B 929c15d08be251ebb09aac169eba126603d1f3bc4c8dfffa22b26baeb368d94d4725e3d91425aad4e96aedeebfe91f43b9dc707c5bb7bb11c28e44447e5d1b3b SHA512 fab7c8aca8025f6ffb09bc7cbfbbcc86e1a84608a1643b4443a386ac979aeddf6821e6b67538a033098c22a22c251077046c38b05e08bd8799deea5549b8d8a0
+DIST github.com%2Fgo-toolsmith%2Fastcopy%2F@v%2Fv1.0.0.mod 134 BLAKE2B 0aac384b872ae017d32169a21e2688b251a70d4f9b1a3479cc369d34ad0d81688caf207501fe6017c02764063d62497951270a3e2a2babbde20ce398dcb590cf SHA512 46da2d05a4724f95dca3057c5631239f1743e5fe3359bbdd81ebeb02fc13a22b59e69476bcca359361bab2603a57868e75dd8403cc24e80a27178ff071fb9028
+DIST github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv0.0.0-20180903214952-dcb477bfacd6.mod 40 BLAKE2B 5c860e9a56012a35ba01aacdbea717d5416d65fb8b079f1522655fc71067950cf05b2b3293c96e512c637e381880405156811910ea4fa0822983bd40eeda93a8 SHA512 b33055f798f28acbd654635211a1db351a0f27568ea75b00e1b152cd9912d9f9203072058e55482b82de46c2cd3af050606a8e835d281781ee99ff10d1d52e6d
+DIST github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv1.0.0.mod 40 BLAKE2B 5c860e9a56012a35ba01aacdbea717d5416d65fb8b079f1522655fc71067950cf05b2b3293c96e512c637e381880405156811910ea4fa0822983bd40eeda93a8 SHA512 b33055f798f28acbd654635211a1db351a0f27568ea75b00e1b152cd9912d9f9203072058e55482b82de46c2cd3af050606a8e835d281781ee99ff10d1d52e6d
+DIST github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv0.0.0-20180903215011-8f8ee99c3086.mod 38 BLAKE2B 91da8f19d193efd0f0b989efb3709c45e4d1589419068d9dcbafbcff657f7e8983b90913475bff44b5751dcbab875e860909a4809e3af7546e15ccd291a1e69b SHA512 76e9f50dd3c96285c56801950f80d04d449d5d78c2b40341c3e51148d89430d25870e27c697a3a9c878a9125864166f0807591f997329548fb3fce0ac18f7575
+DIST github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv1.0.0.mod 145 BLAKE2B 31ab68cf4047752783457514aba06de88ca2303370b97c45cc00bb31cfe7709f3eedf75eadd349471224e6d6c1445b2c7fcd7c58bbdd60023220a9e104a6da75 SHA512 9352d6fc784f63dd8bef085a0022b942db57d50b0d418aad4bd514314b7df65ba329bf442a063a0d6ed94da93c47a3f15c77b625b40f1af117bb784c43a27f80
+DIST github.com%2Fgo-toolsmith%2Fastinfo%2F@v%2Fv0.0.0-20180906194353-9809ff7efb21.mod 39 BLAKE2B 81dcc6f162c9539d5d6e9020b8462fe0d6be656e586fb6a15769f9b01e4a490e0f046e8bddbde464449c8f5f33784330e3972e233667be06989f985e16c00717 SHA512 dcec826b59ea3bd9f37e07b4625b06d7cb61e3757cf7d6c221125bdce9711cfa1a63ac592a31b2174e4e3cd7f4d8a7ad51837f777e014dca6ee53aac5a8ce328
+DIST github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv0.0.0-20180903215135-0af7e3c24f30.mod 36 BLAKE2B 858cc95b4dde2a42ec1c3da0ead7b815188e8d6d61a52194e63f5e1ea857d4e3bff22897b9d704256c273ff0730c13fd8a17f20e63f732f5768b1cd8cb1b62e7 SHA512 151ada61957ea2e7289b17306db06c40628908f9e3ee93505b57d29cc859c006d796e1e5ff5c330bb6b00655f9f6fb6c673e9bee25b9553b28c769d372f33dca
+DIST github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv1.0.0.mod 143 BLAKE2B 8ff253d164a2ab5efee3bf62889075fe44e6ea4082e373f966c6a8f06ae79b8aac5f0edd2149d1112e523a8c1a8a0cce9e84013b2938bbbe1e09ac60fc7aade6 SHA512 7745338e2a875f382668b54ba6f71298ab6d50096998d57aff2fda883fd5a4c54d7b8f24251363fbaa380d850226bbe233c2705b0fa230de95aacde042efc5fd
+DIST github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv0.0.0-20181119091011-e9e65178eee8.mod 39 BLAKE2B cd422bc62dddbd9fb0cfd9db5d387d4725e5798238593670cd92c4082fbb0289ab6abd7fd3bfd3f2b91912d6942f0118f6057e09fb852bcc0db6ea19e792b722 SHA512 4c83539dcd8968a62fec2883c88c490ce39315ef61b2d8cb96d8767fecd91e045709efa48a18165d19a7d726bceaa53ae2bc8122c6f14b9ea0f48cb461ca82bb
+DIST github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv1.0.0.mod 102 BLAKE2B 80c36ef24ee2eb1d9aac1efb8e1bf3d54d229562fa42bdc9201d57f0f9c9f1c28500d8f344bc9803222c10f3b1358d1492cb2ee7e7fa4c4ab60ce84e0205cd88 SHA512 c69ce2862cb8cebc9bc1b24e6f18cdc8ed634ae5a5ab0ed5f00d95ab8315b146bd65f8f7960c90a8e42dd691b2b67da173fa81a5778d8e075f9af2f822ede211
+DIST github.com%2Fgo-toolsmith%2Fstrparse%2F@v%2Fv1.0.0.mod 40 BLAKE2B 5ee28988c889c7536b2209c04b61b04c4227d958b516f29e879c51e28e348b0fd9eeb6511eeabfab51c1a72083f65c9e1f6553213cb99b23b8e966f4fbd1941a SHA512 caf03dc50181a339953b27cc8627613175928b80a128473e4d10701f3fe536a66758e199c7418babe3915cf9aeab51527ef66b98b0c084209314bfdbe53cdb5e
+DIST github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.0.mod 37 BLAKE2B e168acbf68a0195c45b153e25098ece619b2656eb02eb648d2dcf11e6c7bab3fab50cd132354d9063c1961879127819944ebc1dd8d7e1d0987cbb91a86b35caf SHA512 854c0798c7e4ba498b3b6efa00375a93e09d84c3a5de042aaa8b58bc75df62cad93e2e0d4876f43de0d1e2956062cee758c8c7aeb2c0807e994f4153ee990624
+DIST github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.3.mod 148 BLAKE2B 5589180e3673189986e0f68ea6c5ea80ee58717ffd6d4d3dcb6951cb5ac12c06b630812ec3636ada212cf0012f88979a6a3027eaec6d38cd701122ce792671e0 SHA512 d654acaf99517ffc2478d297e49cf81a87f80431d0f714773b2083a80d4c813b7b5fc53dcdf701fadfcd3c6d1319876f0466983a9ca88d8caed15f2ad067382a
+DIST github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.3.zip 9857 BLAKE2B fd91395b0d2410b3e3662afc724a0300927529522540fbd6604ffd66c4ed803b2d132dc8d25c36b710f25a1c9dd3323946dd438d0600696bfe83fd841f43c181 SHA512 daee8dbabc31400546446847c9d15671bad14b934ac3006cd7520ce4e6866ae0595fab110fa08582d7ce127036415e8846ec89a9cd4eda1c3eba30801e8cdf37
+DIST github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv1.0.0.mod 87 BLAKE2B 6dbeae8828624aa2c87a7b30d41fd90fb0adcfe188b020326d87ee11659337427e3700961ffa5ba0b8cf19d263188e59cdd8ff6e583c27e7f43aa58a18cfa74b SHA512 10e51158bffb528f1b24e318403c45d82b359bdd0183885b7d1f3d943f9c28311e2d62b49442634f9b0b68d0a3941dc6dca7644229bd52045c76cffc762fbafb
+DIST github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv1.0.0.zip 16782 BLAKE2B 3f47ff225b716132be0872961e52f3c20d2e256d58e4d1e33bb5240199ec6bd997e371c3c74eeaa9321dad2c4e010f65b7f394462b7bde8b37f9a6fb30d125eb SHA512 ab989ba6ccaa81857517430effbaaa8d36fa6dcd0c9bcc848ea398dca5ae5b98646a4c86d2ef1f287b0c5431e1f3ab054d63e20cfd9a432b71dd5016d13d0af7
+DIST github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.8.1.mod 593 BLAKE2B 6be735d038caec71b9fd6b41abf8c5ca9b64583d3ed2b10304271a137495ac9d09f5cedb4951b29412a25e4728b1e20188514eba41d68ec0073915a12597cd06 SHA512 05327890a8421cfa701d4abc03b653f775031bcef8a5c34f01cf80d2e1051aec9ce4a9663af9fe5abd234a09444b7fd532614c033e4c7fba69def37ae01dc958
+DIST github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.8.1.zip 82459 BLAKE2B 1ad5e1e795e76c76fa18e7fde6668cbdd22c008d3cdb17b54aa970cc0c18bc50a7b867d32d4677735352c6b9c54a9d00a937e951917f15c25e4075818037e53b SHA512 49d9627d3405b8a2776651bee932f07a736b1d2701eff39b150563cf163365d2104306056e92a536175308a8a41a5730395a24903b662b3b8c0a0015d08a9eff
+DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod 30 BLAKE2B c4b58079c7f353b01123ed35c24b8c9dc43139a9c87b12fd90cb99e41b97d6e2ce646710b261dedd2a6c9572ee42e677be0ffb43cbb8cb55b99d1eb92ac68f4b SHA512 e0a6df51284e6b2faa2ae12bbc2c53c649fc503427f0651fefe99cd852a012a76a9c5d967cd1a088e1b3270f9b68abc39f56a6d823c5913fa025b771145f80c6
+DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20151105175453-c7fdd8b5cd55.mod 30 BLAKE2B e9f919d91a822060a84e112358ad361bc7be6f3e6e7cd668aaa89ea053c08d27bd20d281550e1f5a34f3db10ef19d7ec918bf094c755ba58bc01e17f7269fb40 SHA512 b096b5a6e72184dd2be5fb4f7ea9458e0b61cf6ef43f92a5fe5d225318315fdedd92bdc351b0802bb0959f77beb0aba830ef171ed61c6d84103690c22e8d8945
+DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod 30 BLAKE2B e9f919d91a822060a84e112358ad361bc7be6f3e6e7cd668aaa89ea053c08d27bd20d281550e1f5a34f3db10ef19d7ec918bf094c755ba58bc01e17f7269fb40 SHA512 b096b5a6e72184dd2be5fb4f7ea9458e0b61cf6ef43f92a5fe5d225318315fdedd92bdc351b0802bb0959f77beb0aba830ef171ed61c6d84103690c22e8d8945
+DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod 39 BLAKE2B 9884f8a07f2a84a159eb17ef62e9b17398b84bdea38fc37591af050dcebc2f56b83f851046c3333e604a7f954b7628c16b267c0c94807f7a41d5d2b797db0918 SHA512 c32a84bb302c9db3f31f714484131ee3ea96fa98b224b9cbf2c5fdd15100a24094e94b55175cf1fb0b6326128c2db8950677d8f6d281b49645b0c7b51b759093
+DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod 42 BLAKE2B 79541bfacd3378a6c6dbe9591309a80390444f2dc2419fb0137c723c6a2ec1e0588c00704ce3c19dc93297b19db89f79bfa09daa2632f6674e35e76819473cb0 SHA512 b9aad4f1c1d4f2c43b293b0c9ca8a600a37ca407ba8b22b0f826c8355828cb7860a96a85df84f720fe8aa2840974807ea7ea7b790790c6dafed794e761f1f26b
+DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod 84 BLAKE2B c25f6962ddcb02b08459d3ea1063e6c3f20e5565e0a70673b7f7c505ca25e219e1e365cccac9d75054b23446e4957a5b136479a35e0d261e2e16519d17781e78 SHA512 be902a6eafa64bbbf2f347367265450369fcbd47a132c3937a7b72946aab00c85c8cae9f98c49dcededc5854362fd78786df3f54ef07e58cd5c92d2b5904828b
+DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod 84 BLAKE2B a4c32df89469a4b93e0d85b867852d870bca997fd2d31163529c9a9f43e67765099caa6dd708e2edc4500b5496c4d36445d8f5c13ec9b08345d6f155dd68fdf7 SHA512 435ffb431d95016e1b15d4bebf142423ab3ac863a17a8ceb4a1595892e1a786a77b37ae0d3c63cd55904e92a783fd908ff5d79f9eeb5e1ebe98dc7e2c0b9a078
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod 215 BLAKE2B 0077e3bcaad8a354f484c15844594107eb1a56d551e7ec55cd75e4594e50af02fe3850d9d212b0bc425da71c20bfd7dd470aa37be046b4eb88c28cb6bb63bb53 SHA512 8f928dfbe495a84c91744bf72527c5662422e608125f8b58908803289a39abfec1823d4628a52b987ab5150103ca588509ae0074fb08799d075e7ffc4157dc33
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip 2700673 BLAKE2B 84605b73500cebee7cae122f45003110ec3a50074d0649b9e7e1e25915b1c5e789017c628e8305523edb28d8f93733b9032f5b20a186b4cba4a38f90c0add6b6 SHA512 5d27fdbda403bc5ca722280af1fc331e48e45dc97d6e0b9f99f0d48d2d173292ae88904236f43851173528d0523fca86dc15a633dae218bbe05bc0fc22e1d477
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+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.0.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+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%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.5.0.mod 129 BLAKE2B 15d140a0b2b22d6c9886ee9e517f923fda26ee8179755702a8eebf1ae8cf75be48e8d28a1df1bf875a7bfd499075d83a541c9716601856abe0e7c850a3ec68fd SHA512 467a3f6fb4c941cd55d8d4b2d6a2015966c60a8614691539c88c4bf0da2f8022055be8561cddd0e60b118f74f010be5998dd128b7b136f14edd2674e5650db2a
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod 124 BLAKE2B 4f470777c8d8816c52e0fb82b2ef37d4e9879c46fa93e8e4fc87c46b85c36ee6b4b1ffea22db22af2946c0fd3a12affa9df706f13f2367b14bb1a72c737ddb66 SHA512 6b46c8a019e49c6ed2307e7bf633d4fa04627938bcdffec22da42f722aeceb35de8655b04f69eb651fbc662ac5554b54b393340bec3ef4cdd01be2d7f6d07eab
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.zip 206749 BLAKE2B fc2ddf3b24119173839d650da1e09d8acb6cdde376741fe38cdb19d4386847fa76a7631c9a67fb9d5504961f592128722db40408665ea9230c9c6660be38b9e5 SHA512 de3e38127f326e99c06f2db3fd86ca7ada6358a516d70ecd66fabe9c4a70ef8a82673e379b66f305ee7bcf00e0ccf56242cb6ee8c37420a8622d1e6c51f503a1
+DIST github.com%2Fgolangci%2Fcheck%2F@v%2Fv0.0.0-20180506172741-cfe4005ccda2.mod 33 BLAKE2B 23432552289b1edd0987877da8a828994a834b67d0c45f7abdf72ba2cfbec12ac90043623948526f4aa3267d462158cbcac90017c377bc89cb715173fad2bcdf SHA512 ddf0d034279047865a7f71bb3745e018b04a65613eef67c75ab246665aec2c833cf41e9d4b2583d89498b0e3e516a7b491766d9935f2aaad861ff67091e23909
+DIST github.com%2Fgolangci%2Fdupl%2F@v%2Fv0.0.0-20180902072040-3e9179ac440a.mod 32 BLAKE2B 23ef6e127c4b643852b0781780f448c8f16ed5f7a000b13008f5114338725f5ba573615385f2e158e0c276e972d7f9366943c9e7cd79973c76426f332f100bcb SHA512 1fae7cd9fc7f93bd10c51b52d7834733484e54352a4cfb812417e594968de4096b8f6fba075c567de411b1302c0507b0c9c5c1d71874645da73c28d434498754
+DIST github.com%2Fgolangci%2Ferrcheck%2F@v%2Fv0.0.0-20181223084120-ef45e06d44b6.mod 144 BLAKE2B c8d7e8f039150472539681c78080647400cd4060f42bd70001c8d3bab6d848f4e0a494a215b3d2731d121e724340db54760d2647b3cf028a0487ff16c22a2d8a SHA512 3326adc96464208bbcac0c76f1c61eed9f9cb2a3f8d2f904540c0b9b403e68cf06889f74801f2be5543ebdd33c9b343f575baaba15a3618be358a4c6f7084d29
+DIST github.com%2Fgolangci%2Fgo-misc%2F@v%2Fv0.0.0-20180628070357-927a3d87b613.mod 35 BLAKE2B 56b6f7c64d33e2b51efc5ab4c705707a51022a007cedbb31dd762a78c9fa505b061033616899afc96c3e2c5813d4cbb0429e2094cee6f83f063e96082717ad24 SHA512 8d80c51b78b47eae5fa22780d52cb3f15c54eedd1827145c9ff52a2143ccc0716b415284a9cab9ddc09da97de3b5dd0e8ff39fe0b2a748a11e4032a4e870b73b
+DIST github.com%2Fgolangci%2Fgo-tools%2F@v%2Fv0.0.0-20190318055746-e32c54105b7c.mod 36 BLAKE2B ea25f08e34968cb929b9f85c2ae1eeb2d6acfbd0fb851774b86435b7dae3723a9978028789acada42f1fe1fbad4d8d0ee47b6c215b32a839be4c6064b6695f90 SHA512 404ca2c9b95bd4d33b0e8203585628822fdbe27ad4ae9c6d2f2001a61b442a8ad16fc5d329cbbf32aa076d935cc1fa14ad1e0f34895ca9641bbc13ff288564e9
+DIST github.com%2Fgolangci%2Fgoconst%2F@v%2Fv0.0.0-20180610141641-041c5f2b40f3.mod 35 BLAKE2B 7fb690e1792ad3fbbd1aa7b35a97c4dd29c00187f095deda8dda7318c96a79367d2337f7b26151ee578a3f0690c5ebfb6cdc9f304aea66b8f2b83e80b7ab360f SHA512 ba10d5331433fb94b6245a146c7d76862ca96700431609746a6d1c76c3a1b615ab3799b463597eee48e57c91b9ac299e78f33d610fe398cc9316b33c99961c7f
+DIST github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528134321-2becd97e67ee.mod 35 BLAKE2B d79807744b67e1911f0963b12df80a63782888e17d40e8b7beb1c66337261dd421535c86414ed65e807743a804c816863ed767e3109d2ddb4e3ce6afc7b3eb52 SHA512 e973a3c52a646538d671237569673b1bc9433f74c2e2401bdb022b222e623f230aa571e31bf1f239f1558397bb513c233c6121225ee02263cc92ddccb6372b4c
+DIST github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20181222123516-0b8337e80d98.mod 33 BLAKE2B 23d1df1d0683de5686b23eee4468e429f2ff021bc61d01895de1769adc5355eb8a13fb1936e736bda7d96f3ca9496565802a5f8d042ef9fad7947ed8fae946f8 SHA512 1b14a6fb3fd86cd47758fc4682d015125a08977e47d1245d4bcf4e6137c60880347c06c224b5302321000ea4d18e88b3c686527f18d65b3c0842a9ccabdd1df6
+DIST github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.17.2-0.20190909185456-6163a8a79084.mod 3590 BLAKE2B 93ce6d798b61c7376c923839965f89bfddb9fed0fe0d72e155ca6947275d6c957175156c9b8f09bd451b2653b02e6e7e227e8224d1862674ff6e716bdd25a9b1 SHA512 fd78951937847682ed51d6d069166f8e3691a863732cb9461232d3a79838885a1c5bca47a739464bbc3e75f9c6905d7e1d3319d8758c25393e6721a2873dc541
+DIST github.com%2Fgolangci%2Fgosec%2F@v%2Fv0.0.0-20190211064107-66fb7fc33547.mod 1097 BLAKE2B 73b5196257c8d65709d4a95497084a4b7393981123e2b46629055a170ac11e0edb6088d73f2bfb132a0fdca66d8e5ab4eb72c82156266bcd1e94880bd9582a3e SHA512 e2358a1ecc128e330903cdd3a64044ca21f05d81840ee5df68c10d499601513fd1715da1335c05a85a34d1888443437e6fcfc161d5ef6e8569d3d44db268a959
+DIST github.com%2Fgolangci%2Fineffassign%2F@v%2Fv0.0.0-20190609212857-42439a7714cc.mod 39 BLAKE2B c366aa7c09bd08747e032aa05afc63507bfcc7b39682c7b897d489cb854c069cb2c5df45c0ac9795dc31b8e44401aea04e96d43a22c040fbebb2405896a9550a SHA512 6bee5cecfae431321e5172c428a9ddfa7166d84c47cc7debcd040b7db1a5ae5234b3b1b139ac119e2d484ddace4461da7c6d053e509568f2da27b92cb2c3861d
+DIST github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20190420132249-ee948d087217.mod 97 BLAKE2B 2147905b767052fc5449f42ff72f328655663ba63eaaadd8ba7155fbdd228c9080babe746b616245f73c9280970aa5321ed6138dd8b459561f07fecec8a3633b SHA512 cd29b90f781929ceca7be28b208aeaf51d64178caf1aa9e4f84ce38c8a8d48b846578ad8438403f64cd572448c697212df4f2ce7255956e43f366adebf7857f9
+DIST github.com%2Fgolangci%2Fmaligned%2F@v%2Fv0.0.0-20180506175553-b1d89398deca.mod 36 BLAKE2B 9f5e639d6ea8aef657af550d00e4e1f8ef3a042fd8ff5e4dcb031789b24d9e6d72cdfd3ff654041ece93d38d53f7c1a999f5a095bfcea12392120b106daefe9a SHA512 b199928dcf91ce17955d3a426861aed80460521f7947206136dd5bbf2f02d181b549a152c1b78361e761d5939fc0d05f04588683da3750a34d71bf34ff4b3502
+DIST github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.0.0-20180809174111-950f5d19e770.mod 36 BLAKE2B e5acf960c529038e9cbe3e35cb4290365ac8c7b5341516cad50466057764bb556b67a2424b55bd538a73207aa126aa1815d14057d109b696d379770cc6057337 SHA512 23f2f177644d7afcefc96843a821ea772318ec58e57a3e4d6c9acdcb484bacb8f4e79828bcd3347c372d28ec6946c8fc92f8ff652dd465d7e5a21c9b97b52f94
+DIST github.com%2Fgolangci%2Fprealloc%2F@v%2Fv0.0.0-20180630174525-215b22d4de21.mod 36 BLAKE2B d0deb13e3870c92583050942811bb6d76ea9a9166338ef27ebb9c210485f9e2d8248648fde86ab70b3bd4c6e8bca94bc54c3881400ae116a9c65d13263390626 SHA512 1890310dbfb0f686572f07b39dbd2d8559b8535702fdfee0302dbd768a6c362778795163a2bed22942d9a3eda488eb761e08443cd0a1c45e2885b276a235e349
+DIST github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180526074752-d9c87f5ffaf0.mod 35 BLAKE2B 5e1299e377856cd707fa70af1dbb083c3dde1d1ce9d8a25caf3b3d4a371c524127c2b3060d65e0aec6ada61a560563b1c2315a888cf38e4292b192079ac90805 SHA512 3a2d357bc6c7e558cf29e309d718b76f37686bd9457ba101a36c1b601abefe5aaf292fb9c81fffcc4411e6edaa51d130c875cee5b51368f758d26e006d7e9a2a
+DIST github.com%2Fgolangci%2Funconvert%2F@v%2Fv0.0.0-20180507085042-28b1c447d1f4.mod 37 BLAKE2B 419c6e5eebd9f78b3e509972d55fdb5c0de90e393e15793a1f1fac97352758dbd5908bd3aca3169b8787b98d38d3dbfd0da3b432c271d39387607f30de75b5d8 SHA512 3910c0cb068e7633473069601aa57e05d47641120229e06ff0917fd4f34ca95b06d0eacbe6fc967fe6827f620779ae0494c4bb9479919e4f0c9a6c5315ff52f1
+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.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.3.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.5.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip 130974 BLAKE2B 6e4efb8abb584c3839c7b1ab80c8060c125b695bddddd44c57f72c0fbf9de85d40595ecff57f57ddb533e34dbe72a95e0e8043d91d462d68818699f194766e90 SHA512 9cff1690cb177e70b1d67ddd305e4317e3d1ef2825f5f3ed4639210f7f2ee6e89ff03970495757b922f16fade5fafae5cc14c8da2b95694faa3fa48c63f3313d
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%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%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip 21941 BLAKE2B 94e8f4d50c0651e1bb47daf76c642871e1e3c53b725910aa101991a7a9b83b8042f76f20be54323b66b5dda1900a7fa5c3708ba0ef02fa2a72c2012efcfa1644 SHA512 eef3b3444dce760fb6cbca5e22f3fcb33fd418e2b54509e80a2150cc644f41a05a59f0acfb7fee386c994dca06d96f4cd023fa192aab368be08ef20eac4a626b
+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%2Fgnostic%2F@v%2Fv0.4.1.mod 278 BLAKE2B ddb0dfbc6706088c465077c061562538e66dd414033408a92d7a967fb4382f10ee4926bad97508e4106b9ee341bb7417337630ca006726fe79f3be7ae12a2953 SHA512 3a36f6a3ad1c6dd306291520ed836c77a58390fa21fb6777bc3158df18cb254096b0eecc791947e7815098e020f260a4914bbffdacb53407582f9cf2e908b7a2
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod 35 BLAKE2B 549faba95b001f14aa66c628d300b6b0e496c92cbd87ed5814b4dbddd422df6d5d7a38af10ea061e512df4129189d221bca001f2b23ce7bbd13fa0b7152bbf4b SHA512 b4c8a43e739f69430d5004c01d083be6f65a70301adc0cbe824955a3b7b50dd2b6033fe8db18419390cb577f89533e9b0399a169f1b10ea39fb2f0c0e3cc47a9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.4.mod 39 BLAKE2B ce025298653101cca2bccaa3f6797881c47f92443d0835d57c2900c62bb34a82d1399884826c863a7a51fbf731c1a8f836674f4416ec2364a20c690d788eaf14 SHA512 3398e8e140093ee9f7c27ce680fc141df5bbeacffb365a98b64898fb6b28cca8eadcbed1d593b90a101a1aede53a5602eb3455e4ec364ea4b76aa3ca043f68f8
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod 39 BLAKE2B ce025298653101cca2bccaa3f6797881c47f92443d0835d57c2900c62bb34a82d1399884826c863a7a51fbf731c1a8f836674f4416ec2364a20c690d788eaf14 SHA512 3398e8e140093ee9f7c27ce680fc141df5bbeacffb365a98b64898fb6b28cca8eadcbed1d593b90a101a1aede53a5602eb3455e4ec364ea4b76aa3ca043f68f8
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip 57100 BLAKE2B 002b1bb18bc81e6a124d511aaa6270763eef5c9af2117cec54f4dae6be22f0bd0de2594158484ae32933f24f1107f4bd490dec99f119a1c7d2cb2f722a9160c8 SHA512 d4bab61fba7c23094263e73459f6b4bd15bdbe02ef6349619cf89e1064a7d44c20534d6267034a0af4f2aa1a7aff0f02c35f424d25e6dc7c4d5e911e6e9fed32
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+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.2.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip 79096 BLAKE2B dfe472a48935e77689778e60ac3379abac11b1fd632c35033f4ba19afc601175a26e38bcdcaecdc56250d1b90aaa2f7f499010040eccc49e477dc904202de4b7 SHA512 4506c31c8d95fadde5570686eff451f177ff4bcc80469a5bdba92b65afcfb2597d05f14ca724e8dd40b43b867ab9eef1f62d98d7afed6bf93cd33b689d646c3c
+DIST github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.0-20190318220348-4088753ea4d3.mod 120 BLAKE2B 0734abf8ddbb6c4bd190acb4f76c5f9e3f9ece54ffe3cb9a92f6f612bbb7844b46b9ce35fe680bdf9fedd66319f629866b79f311110b33167fef23752fc6b7dd SHA512 9e85c69bafa7a9f6ea007c63ebd31f4ecbf9fce14601a8f8ca2a5832414863b7911d36d629a1f6646cf31a17ad2ee29a1acfefb76da467fd2cb13a20b7436ffc
+DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod 449 BLAKE2B 1fbabe18b977c8e6283312fc1f8d8b35514104080a4880afd4445b92fa20af4db49ef3f7fe1da703d4237e6bd78902e64fcc7e9d4db85e84153c2bdbc6a6366b SHA512 a6d33e281b580e5a3461edadbf4e5ebe6aa74a8a929b9f0e96582592b24c85eea1ab202457f88f648018cf5991d267811132ec77255ab4886b6ccf958487d5eb
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod 42 BLAKE2B adaf8e14cd6696bc97bedcada70988d2508d8bf28e94a8b528067359665aac351ec7b7f38ca1a89ceb0c18c3c7935e30af4df20102563c9372b34b0cf54d41bb SHA512 da70feb8b6a17512c3761ce6f13653ea47bfcb4af69b471a3bfde9b79901d0f24ede05c10d35f3e051df54e1e636a848be5d00194ef5e9b85bf7915d6b27dd0e
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
+DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
+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%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20180404174102-ef8a98b0bbce.mod 32 BLAKE2B 8b645c7230638dd2b30ad68a01a18237d6bbc0ae6d2fc671706a7785c9ff50eedbb3beb06e0ebd28b7053fd20ff648606a54226ba95fda6e9deafaf5cab367be SHA512 748afdd4b790c0fa1464b492b79164ef83ae56cdcde204d19adee8b24a755455921132a71af714d78f726cfd7621dc03f85b383d6f26adf9501457573dce26af
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
+DIST github.com%2Fheroku%2Fdocker-registry-client%2F@v%2Fv0.0.0-20181004091502-47ecf50fd8d4.mod 48 BLAKE2B 44bc73134a329a8fc0d922e44ff883215a5a414e28e12824483b9241d1f99a7e2baffaf52a411279af045474c32bab01296fe411312bc231652d00a59544e722 SHA512 d97af2afe2803b27fa19199ab05b0645be6a89cd61847efdf82ddb5aeb4d0efa2bc0e2563e3480551988648c3e3f8ba929464d6a1264aa0859b17d693a76504c
+DIST github.com%2Fheroku%2Fdocker-registry-client%2F@v%2Fv0.0.0-20190909225348-afc9e1acc3d5.mod 832 BLAKE2B b7a4b7cc959559d165fc16fb5400bb34c7a9bcb3d2085ff89bfb51ae4ad08cb6b36e8f164e95fc2a23602edf894eac0b3b2317ca6a8a28b84faba5c1f43530b6 SHA512 ca3d9c0450a4385be9151832671e0aab9a668b12062691e87af7b28a93f3840cb17058c9e7232bdfad7665ec2bb04e54852c8bc3b64326c454cc4b5878816eb3
+DIST github.com%2Fheroku%2Fdocker-registry-client%2F@v%2Fv0.0.0-20190909225348-afc9e1acc3d5.zip 26926 BLAKE2B d46d9ff5bf62a9679d4dce1ce35285b0f0dbc655aeb7a3242ab77b9237fe3a57e8915e86e5148034abf6261ad41fca6e399d0f82ed87f6eaf9f8745c91c3adcb SHA512 186616ed31ead44c4a6b72d97b3ce3750738a2b381d07ffbe458dc4deacf790fa86a642902adc897f7f670eeed18ca5b8c4a572188f0c07e1a7de93dc39845de
+DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
+DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.10.mod 74 BLAKE2B 47557579d6c1e12c3b7dfdd9e5dd37291411cb87ff396973a0e17c97ffc79da1f6d81dec640d75cbc5e84ad9a8e17d729992c998dd614ef89a973d3cf5083b60 SHA512 2638750386491e91639a8d6e0fdd5dfe58ffca24a228d2810556b0f280839ca1489bcb47ea77adf287beb3b2d70ab2b1a664e0fd1b8b24cb3c88aea1265e47ab
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod 74 BLAKE2B 47557579d6c1e12c3b7dfdd9e5dd37291411cb87ff396973a0e17c97ffc79da1f6d81dec640d75cbc5e84ad9a8e17d729992c998dd614ef89a973d3cf5083b60 SHA512 2638750386491e91639a8d6e0fdd5dfe58ffca24a228d2810556b0f280839ca1489bcb47ea77adf287beb3b2d70ab2b1a664e0fd1b8b24cb3c88aea1265e47ab
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod 32 BLAKE2B 5e64d620c37ae185652dd50d045243c9f334248de0232c499c8fbaec13dc400486ecb67ed67a2772048c93fa4ffddda06f402b198cbc8cd81110b03785c4fe42 SHA512 77a838338c62779fd7eba69d5ef388d6d58bcc7953dbfdf8f470d34cb66a7c84bf38ac05602da74c6ac4dd17293c62f910a55370df4671726fca9fab180865ed
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod 35 BLAKE2B f55b1c507e5054287bb6637b3c799d7d56342906f680ed3f691be557e93a417204fcc5a9c1a6c62a6081b895ffbd2558d7d2cd5e064672e2cd47472a92b15a30 SHA512 75c03e33527b1b86b6355b533ae18cc7d87df77338d8627602b7af2068fb020c94cffc51c971fcba4338aa166cc6722847e3437a6db1ccf209145314d60bcb45
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+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%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.8.mod 45 BLAKE2B e071beae9a17798a9d03db9a8683db282536a4fd999d9d0715eee723ba995955cf1c4f364631b58fadf446d6d9818d02aa69298d55d339eb38533c096c83960d SHA512 703d71ec5ec222e1c475dbe132870d5aab5061f00ff69604f73fda9a66934fcd7e7f14df52c4ced59580cc8240a83d99709c746f5c833c33913e18a172220bad
+DIST github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.mod 45 BLAKE2B e071beae9a17798a9d03db9a8683db282536a4fd999d9d0715eee723ba995955cf1c4f364631b58fadf446d6d9818d02aa69298d55d339eb38533c096c83960d SHA512 703d71ec5ec222e1c475dbe132870d5aab5061f00ff69604f73fda9a66934fcd7e7f14df52c4ced59580cc8240a83d99709c746f5c833c33913e18a172220bad
+DIST github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.zip 40715 BLAKE2B e77f11b763855b748bc9a653af51dbf9143a2774e5b464c068b0981cc861f043ccaeca2357d5773a21a31872cd8efa64440bb52b47474d80faf7ebdc8cab7257 SHA512 77233d5bc0bee531a07ef5757708b5073562c79047184dcd91d6b293ad7cbca00a7624ae10ecb3b130afeb9f3e63014bd5488a9d1984bcb3ac5e3bf6c9bdfcb9
+DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod 41 BLAKE2B e9dae477e838938303749c4e7f1d0ece371d20bfb8f0d6fbb915a9ec249b82e300ef691c2175137488065828f67b02503576420fc95c2aa40f4fda262526dc7a SHA512 ab1be2f5ee91ad8c24a7c1d3c2277506dd76f85e8511f53e923ea7e0ecba140303c9312f0ecd2e09631e2e6591ad31a3b19e900ec102b486ed9b56c38a0d0c84
+DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip 7034 BLAKE2B 7732946a34f604c858bda571c3afee7e0e02720d02127d8b4887f4f0363389b50088727de91b0436f0c943d11de80dfb766208f15665d0b4e5cf68f2a7b00817 SHA512 f9c4eaeeb1380aa5e219a19923cfd51f2612fbf11b7f37c710cdb0dfe20270f8cc7841d50dfd17110b004ec46e4c90329286213e04de481a54094df73efc9fe4
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod 107 BLAKE2B cd132ab287312d1ae53abd542a75e6bdd5cecdcd46c5311be91da88d54e1a114019440b12d71a9357851585672f440dc66eaf359a99b7682ce1bd4ee03869325 SHA512 302828b5c2b6eec77f4a2ed075cd8b721da8d62a8747883d4382d5674a7c82dcea01a7de664d15d5eeba7e35b9667347dceae9b4ec93858ed3acf8adee692967
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv0.0.0-20161130080628-0de1eaf82fa3.mod 33 BLAKE2B f8dbdaafe3a686fd557b1e1dde2a10402c841a8095800b56f4a0cc180befd45bd74de0575a7e90b5202bc50faee916196baef35d80f8ea013ddc78ae416af6d9 SHA512 3bc77706ea4909ed01ac069553bde55024b7bfa1612f5065a477d44fb68bad00d7254da1ef978a1518b2704b507ce4cb360571735905c39c7b97fb3e21c64422
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.12.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.12.zip 17541736 BLAKE2B 16fd15530761c37fbfe4479bea982e5671bee792e8f0f92bdf3b7829c60c0f21d6c965fb963cbc3b330de7ef4d6d1619658b762321d6c7b37b527b3b1f1f7238 SHA512 2242dfe6afe921cb6d2e1a6e254e5bc27f135adda1d9211ae18338d358e724a0833830906858a6fd7cc8eeff36f9f5620c6486a117c0dd8c3d5013b0c0da6f46
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.3.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20180405133222-e7e905edc00e.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.1.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.1.mod 34 BLAKE2B 9a841f2f76972fa5d9b89395c421d1b4addf03a137703bc8f5296a2071a3db169c993468489e59ae3eb51c4668c1eac2a8dd27b742c5af923d379dfd0651e826 SHA512 cd08026364570f1acaca890fe4929ca5bafe90b4088f764a077952ce4b52e8d92a8a09e4bf264abd209a161ed47d9b6f572ebd904af2025da3696dbf79b63d5c
+DIST github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.5.mod 34 BLAKE2B 9a841f2f76972fa5d9b89395c421d1b4addf03a137703bc8f5296a2071a3db169c993468489e59ae3eb51c4668c1eac2a8dd27b742c5af923d379dfd0651e826 SHA512 cd08026364570f1acaca890fe4929ca5bafe90b4088f764a077952ce4b52e8d92a8a09e4bf264abd209a161ed47d9b6f572ebd904af2025da3696dbf79b63d5c
+DIST github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.5.zip 127654 BLAKE2B 2339218b7256f2319a9d3c2518b1256f200a421923bbd99f72044968a890e482a282b8a5d24e75a86585c83cc8935c16c3268c8c4a369de133b0f9bc50275d01 SHA512 3deeeb2edc9b02fa384d3a69439c9ce19d8206700b5b0420f361bd9ddf17d0a8062629c9addacf9663e1f70e22108991723d375ef6d4c2af559d62a76213e162
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod 34 BLAKE2B 1365a1cf7687e1b4d333eadaf4871aa7a00c98f5d235453d7e4e000b51127ab036d4b20866f46343338aa79acaf71dcd8c847aa0b1568e7df9cefdc05b33f009 SHA512 ac5a145ff4464a083cec55891b85876ba0280c7115e5be9b70b3300311515260d9e03a94faedcd8eab5a7a2de838448af1a810c0e9f01cb8521582dafc10d78d
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod 72 BLAKE2B 796a88b0b7d88f469e90e59f66d12a3c515e0230eb2a7ec83f00f5266266d93eea475b752677f2ec81a7c99243a5034ec1a2e9f4e23a83b61bfe6e855246b6d3 SHA512 9c13eb40018d27bb2f5623251df11cee7b8c08eaee681b4678f854d7c023bfd3885bf04ae085183c7501e637d86386a00e3a979088aaf2c37a03f732d7655a5a
+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%2Flogrusorgru%2Faurora%2F@v%2Fv0.0.0-20181002194514-a7b3b318ed4e.mod 37 BLAKE2B 400e3fd523a0995770046676b3a848d776c64948653c3730929e39e0c0a9fb2ffdddd8405359f676375bc506efb05bbb9423af6b6674d16baa16d53f264d64e8 SHA512 37c8088012b54286571d11de7e6b59d68a0c5b79542c35c31c30187ac3586f57466354498960aeb500226d740eaf62601ed6e569ee82039efc546a3bbcc7ec73
+DIST github.com%2Flxc%2Flxd%2F@v%2Fv0.0.0-20210322210645-afff9e5620d6.mod 26 BLAKE2B 58245de27a0d5c8ec78e13e28fc4c0b4e2b1c5c02263e311974ca65cd355e78d46b0898d75fcb46a247e4e8a97b009cb4e3e8abb287907f6f767f587c48ffb32 SHA512 1eed4b35ffd96d50db7fa2fca6a5340683fb7504b9834b0d9a816263d6c57211a6a4b0876d735939ef8900b779be595b803a13c411867afc252be27b63ebe25a
+DIST github.com%2Flxc%2Flxd%2F@v%2Fv0.0.0-20210322210645-afff9e5620d6.zip 3008010 BLAKE2B e4fe5c397a61a9752e3908d8aef60e8467a7e420b4a86d9aaaf4dd54110d4fa633ba444d225a4f555d4da2f60d157baa84e05ee1760171658c569c48420b42ec SHA512 0aace028c721984feb9cbc8be963911a421dd98b47731519a5fb4bf1a8b470e485e4673bb0aec61ce3e6b5c99bdf9969ace9d32c0127affaf626fa78bcf0673f
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.7.6.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod 43 BLAKE2B 52ec55a10810ebe4083ca01c7a10daec67e5e9e370d24ae3a0140ab40801bd9b18fd09cee4f306c891b60c83049497bfc69ebc12420663fb5f6b39426002d759 SHA512 0b54c4dc34e54f09c3d9d4b63a4d6a22736250aa3caf1526220c11473f4bfb5b589fc1fe4cfd9d59d1a7c2f8cb60b3407353d41f9b31389200a96939cb95d925
+DIST github.com%2Fmarkbates%2Ferrx%2F@v%2Fv1.1.0.mod 42 BLAKE2B bd5928539c1f7f77695d862c6017fb09f9968122f0837999a89c7fa2b24e059de860966d8ac43a21b56484d694134da2f383ee65820bc68e87c8a532e381751f SHA512 f021536cd75d44a5fb39f4ef3dcab311828faf2a9e9752c2066c4c5baad7185855848cca0d7b0421bfa08222f277aa9d78ce443ac40010d6d953b07477130739
+DIST github.com%2Fmarkbates%2Ferrx%2F@v%2Fv1.1.0.zip 4251 BLAKE2B b5ed6da68395df4d0edd881292217145237b61154afde2d8bb898b8903e977563ae44e9cf203d2cbf3c75fa371fbc1f922fd39c72ff164e67db89079392f94d7 SHA512 b4abc284ddd2bbca0838b83afe5a13ce9d6ab54185f62e6d02d6f8a880f34558855a1481de5a19667339271d196d6f03765d74c44a18989b577354a5ef68db28
+DIST github.com%2Fmarkbates%2Foncer%2F@v%2Fv1.0.0.mod 139 BLAKE2B 15c1b7aeedf25acbfcab3733e985d26da70fa0bef6daf2dbf30f7eb036faa579a5d6f49dc46a0c42935ec282d8ee45eb2e10f49fee3a6d48ad6f93ef2a0710e3 SHA512 6a15abf50ee0c8817ddd46ee17aa95df464ec4ab2098b2f2334ecc0696fefafddc5a85707b8ec45082f00473f6c3b3a8c9fd89802f98e7e9320d5f74ce33359d
+DIST github.com%2Fmarkbates%2Foncer%2F@v%2Fv1.0.0.zip 6741 BLAKE2B 16b4d29863c71bec375ee838e9bae1ec22c2f8e9e95b8ba55be5b0610d616314e7c3d5813d1d45c6321059d4d93bdabe26300d5c9cfc7388e15b4ed2ea5001d1 SHA512 b56c421a5f2c5bcf155a14d66eb4549ca528305e6752e9df6e8d53cd8b580761582309297901120686bd1986af75c88a174384f8c7cca7c5a39f0a463fe53a88
+DIST github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod 179 BLAKE2B de910385e475042370cba96867c04c984420d69427c8d0b8e3784e9263869e463decd856ca914dcfdd85c2977570da2ed59bf5f17c41b6320a4dc5e878388db5 SHA512 4700d6bf62086de6dc5b257b855d20770779aa3b6de37f237e608b3b130e588ac08c035c00636876e38bdcf2637fc84f2547ec9eb9a9de1168781c6225dedc37
+DIST github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.zip 4708 BLAKE2B 0e18be04d9fce1a7d01275807cbdf1636c0f08b3b105217e568a2be2b0b66ef3f4e17e2a64defb806bd426a8fcf09caefe537801ccb14396ea6aa5911691e257 SHA512 857d09df3219f7931768c41e4b99cc4d69acfe8a59c4e745e8b5439181f323d7f27948d0ade0331316511c52be592febad90789644404cc9b43803a34c12d3d1
+DIST github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod 30 BLAKE2B 672d0e9f9aaf18bd8da762725652827a96008d49cf50ac4c7a9776d884b15dd92a7738f49ce870b53c9136976487ea8b64a31f9b689615e16327b76a22ae605a SHA512 65984a32ddd3eea6fe699c2e636cc2368a11059756fd1f711ecb20930ac5a9bdabae5735e9d4ef829bc4312219bde9f2907dfc7864dc53c2a580fca3f8b7b39c
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod 80 BLAKE2B 60990a438d80f62d28312e2ca1f07f9ce277b9d9d52ca762201f9bdb4e9bc72bf7ae95b40f1a249126f70db8f296059bce4d7a098e82d2615186e1267e51eec9 SHA512 89a2e1340f04d1aa40eacc84c94ae2723fa34d2fc5772c60bad2d7e00512adfd5f503896aee75440173037f4d50ceaeb98f7266e80284f29ce00692d15bdd2f9
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+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.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod 95 BLAKE2B 21f86775ef310fa5f1cbd773890d231e9dc64fbf2dfabaa3b7dab027f5cb1ee9880adaadf6b8a9a2b181db838e5fe26d7349442b591d925ca24ec7788d887ef5 SHA512 64b61a0f9ba20ae004a305963046d91b7b66e3659b67fc15350a0afa625ecf4892854e1829dabd589482d844a248aa73a56dc970784f2a03f6492a0010c5c665
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod 38 BLAKE2B ddc3076fa3a93a287dcc66d087fcfa08483a03baeccc6fcfdca7c390908cd0b83017754103a78f6977c929d24868a9ce78859bf9e270fd84b5fb38ef8f939f9c SHA512 79ad90998c2a3e01501014598c152d4d08a92d354678b5e395c4a16ded8519f12e4ea883485ef49f07e240c52e075c7f9a07a410eaa9a1aca3657cfbfe4b6368
+DIST github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod 34 BLAKE2B f00bbc47239c6bb31831b7a6a0f4ebd9e8d23275c2bbb0a851ba5726c310867d0a885c16984f55874b0b7378dda94533ac49a85a8de1d28fbada63ae7e94361a SHA512 e4e9e3ebfd69fb7f182352a03999e4bf657d58f783faf2c8fd0da1d71818502e12acba43292418ab929390623c638352b9603dbda6d8feda4711a9a765a931fb
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod 178 BLAKE2B ad9b4e7186954eb025beefa7c1d622146e2329ec6d9483da5f6066488a2422c28bc54071bc28bfc50b916a5cb9f07549bdf09bcfc4e1edc78234b84900638a91 SHA512 e830b9801e4d9645c55dbec3750189c4070d7125dd2aa7332c58e9307917a869bd432cc628680d2e9e88ce646eea9c63ba2f8aa85c53b20bfd3758c5217f5fd9
+DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod 29 BLAKE2B ced49475e4e8b7199364d477553bbdf91390d5969a6840e688e9d24d70afcf28ede7ef8fc09c89f23a32bfd65bc0bf9f9b58261b693e5162189e37be03bfba2f SHA512 93e7d64e25fc66cfcf514bf546e618198e32d2c35fadaec01684e9488489b484ee402efd301435eb2f725f086ea851ff0445fcdd26775848db3494795a09183b
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.mod 40 BLAKE2B 48753014b177fb672fb4b96c34fda82fd83e7cc16c40ccf8409628f3b41f24fcc34fb0601ac8cb7869558c7d7ee97f6f1b8e6f587d696222db2f482790a628b2 SHA512 571622dd3240dc43d9119a5cbf644cebbabf134314c46ed43438be1568c871617949d07c60b8af3d22f858f7504ab91effc9bf234de84da1fbf72a936aebdbff
+DIST github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod 35 BLAKE2B f74f76885a3c86b832d1e7e80ef9d282c27cc236a3e48ce3bfeb10bb5a5b2ee0820adcffc89c0e30b7a27493b9ee8f131cb5a151baf9c1b7edc8845d30fd4531 SHA512 c5cf4433f35fd5795d64388816ffe45b49fb7192c2c7bf4fad21e680cb35bbbbf046945c48e3a6e1c3d8cf528942b5c2eca85de9d8f70811d910c4624b53f2bb
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.mod 34 BLAKE2B c2617f21438d9c66d02b5f99c147c4409aca4892affa6949f59d6c2153b5860a177c90e95ebfc7649c710c19bf1b41693c67db80c4644c9bdb4f3d9c2b16fc07 SHA512 e493fbf1926f5de9c7b499dcfa319c4881e088e6c722537a61a75ca2afafc93a8586bac67fbdab47efa714a1ac8aa47cf196e821aba83662df6d4321a9817e69
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod 32 BLAKE2B d511476a16a86c50db84dbacb40afb4b30ac3f72c4fd5a8b20fdd8bc6de1c46592bd16b24f77bd037dcb23ba86cd217fa740b59a784c6fff0fea1720d2045695 SHA512 451fbf9129c151784d97cfe6af29d27a277b6821411cfa5b23e6730ba0f5d5a830054eb6ed660dd2192c16abd54d5999be5b80e39bbac3499c3198311d01ec1f
+DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20180220230111-00c29f56e238.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod 34 BLAKE2B 420449db437a4343e47d666ed912d5c57298ec80d13265f293c3a2294624cdbbce9fa319e47ee530da73bdc06d48d80b4a590a03fa1d741f089ab302cadf071d SHA512 ded99f470ac6900d2627d6cefffc4adcd64946cc036657a805f90145aa83fe05478df9eb994059cd8d9613c75f3009221ab0405bcf7e14b00d5d950e09f3e354
+DIST github.com%2Fmoby%2Fsys%2Fmount%2F@v%2Fv0.2.0.mod 146 BLAKE2B 7869866a011bf254df6a1db4d5262678bf1a5ffc9ae673489a44412b7264ec50df1becbbd501e40e7b184839ff6625fd80e0f49510540fbf3a6c377b50ce0107 SHA512 12405bbc967281179ee2c65000b2ae17d0c70f1a9a43dd4b3b20eec02ca2bd194c4796830fa30d4887cc0f7595edad7311ca7d9fb94fd519fbc15bc3fd838ea1
+DIST github.com%2Fmoby%2Fsys%2Fmount%2F@v%2Fv0.2.0.zip 17658 BLAKE2B a6c3d723ca986fb1a1e6624610a17702af227a0cdc396ab8c24c57cbfba811dba195852c039521bc1d07b5aa32a181c2cacc591deba331b1aa173b853dd63bf1 SHA512 24eb14f09ab751f4a41211c76e5c8148d1302b9f7ae79e704d36c839580a40c8ef0d23f9071ae06f93ad9b1f82e282723e3870d17aec7f9c6f85d8d95f9f2416
+DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.0.mod 107 BLAKE2B ab66968ee9263d9c9d1e1a85444ca0da86a5b0f263cdc51a4d4ae9d6398445b529ea4042e3d93560cade1321d0115c153950611f34a8075194ffaf19a7acc472 SHA512 55dc5a9ed85f4b355e9de88d26d76fe6d87aaf45f95574960d42af9d2c9e97c9685d5397faad9409e3384bb0a205b6546e40c303f127302cf9bea040466665e3
+DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod 107 BLAKE2B ab66968ee9263d9c9d1e1a85444ca0da86a5b0f263cdc51a4d4ae9d6398445b529ea4042e3d93560cade1321d0115c153950611f34a8075194ffaf19a7acc472 SHA512 55dc5a9ed85f4b355e9de88d26d76fe6d87aaf45f95574960d42af9d2c9e97c9685d5397faad9409e3384bb0a205b6546e40c303f127302cf9bea040466665e3
+DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip 36737 BLAKE2B 3edd53bcc466182fde46b860033e34cbd5bebff97fa22fcdab0ac5808e796cf9947f921ee267fe0fa3befacd032d655ed771cea4b80f633a321044d08dfc78f4 SHA512 0926b976e8ea08cefa68658519450675ec50e9dbad8716c8e211812bc36830746a75a1a8dea5a8365fdd8d383cda115b066c7cc93abf613f14203ad398d66813
+DIST github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod 105 BLAKE2B 41a08600f3ac56f9fdd41ac16d9b662264da29ca65fb8008e76609dd33efb25c2e5f3b8c22b8a30255b86aed19291dec0401036707893bd4ce4ae213dc1f6762 SHA512 514dad44e0511ec48a367857dcafa6e899d1dddca56119463e0b411d5fc2a5184f79bfb1a26b871249dc76c52c58c0e42b5f748e2b44b6ecd9f2ce32a74d5a62
+DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod 348 BLAKE2B d8f1b00dfeb0f05350cb72b2c6b85ab12fbbe96233c40ebd1de6a72fdb78696d740b8e7e2e6620b7732c980e08fe778e7aec24c4375a36942b91827078645b14 SHA512 0106ae7b39364cccc6c6982989400c53cafe71f5062647e4170b5b98bb091e3f19d9cf35cad536f8f3ed7984d861e4e25df06387c558406dd42d96379dc7b62b
+DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.mod 298 BLAKE2B a0b5363a0969c283250c05505cb09191943d095ecd42fb8eef6694abc77ca4721aeaa5534a6c1b3a23224fa668ff206958a1900cb3dba36cec73f07c95598ac2 SHA512 3c9e90bf64ca3dc8d4e16c56e6ee0d1f41fc0bb1350ab6242d8f0908b01a90fa61e849a63e79ecb282ef0cb9f7593daf7307f922c92badc365822a1b9512f9fe
+DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.zip 22571 BLAKE2B 129cb205745d7f839899afff88380c24592f975867f5f5d0cb2d05479bbb1fd4168f8fed381575f3ac7a724d816ea69804886c0057eec05cb74a3869c4c406f8 SHA512 55e04111a7b17ea5d0b99dac9c0d30b0449021c94c0c314322f64d0884b6ddadf6703f244636113b601643006c3b1e2faddf1c70092dac1ca7a1614d60c0c38e
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170929034955-c48cc78d4826.mod 33 BLAKE2B e0ea5580f1072ea92da2932166e0e9b1aa9a68fb1f2a6d99d11f74369437431c205c2bc9282f54217f3518b828988ea398a26d7d0b0184d11c6bf7daf8d96775 SHA512 1a35c92a5df7744978b71fd312a0316cd1f6c3c26f4c83cbb61a382cb961590b6aafbb101855b5348596b33796d21f151c9b6db57b45d5056fa78c1946d0a946
+DIST github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170929034955-c48cc78d4826.zip 10939 BLAKE2B b48426b5af58aad978f282387b6b4ca50f5f84484df24f7a4fefe9f3c8836c9ca8b96b47a8e16129e585fd7e7a5db9b054c2f1dfab6fd8dd6e9a60ee96dbc745 SHA512 beebe80ed7477a3391f22dc9213b8c1b86f618947f0841cebc7a3e791ffe0d6d19a207f5f1b4015e6af9ffc1324f60b00ad2cf8300c2d6b2236f35451673ed29
+DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod 31 BLAKE2B 5b5d97cb4685ef921770276b81b0bab6f0acc362b49544e23c228fa4e26c3ff712b58e61815616fafc19233d3cfac47b05e9d55d926b2559137ad4e7d734e113 SHA512 f868673a9af26c1735e257c840e1f9f5de035ebdf3814f8568af504af6f3d94284e050f49e96670a5643804760db2ee8e50d396f6d6c1d17c94258695ef41748
+DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip 56868 BLAKE2B 7795586966a72a5107b680b7e5b051a516cc0aa60cd1519bf0dffaf264ca5fcc768544438aa1bff2a2c5a3a5bdd92507f921357d80e4033590afda4ebaf536ed SHA512 22d3534c0e6d6507671e02f1da00eaeb7245497b4ff626ae7967d6b2dd4c9675ec16ebd20d4eb16ce98aaf831e93d207bd7a3331e8ed7411e9ffc71c574dfe67
+DIST github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20180409132520-8791a200eb40.mod 42 BLAKE2B f2c65eda4f8af83b8125816f597f32de21a2fb675e30625c135b92fa603dddab4a253c6151692859ef24c4a4a4b3d68d5dc0506a07d2f86ce28171ca69db1982 SHA512 46deadaef6abd1e87e8aeda576aad66d6b8b49eb95295d6e036197884a4f9564d260a14bbc667bcd646c6fab3ef8eaf2c4307ffdbaf9403923e5b98c5180aff4
+DIST github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod 45 BLAKE2B fed20163d5104ebe6f0a3f9f6649147fcf20ec4b4c5f8cf88f685a0da5c3cf73fb12d2d1ad1f97519e649bab3bf821ffaf1a6d5d2e8990e462ad71a5f315d49e SHA512 f2da07362ab94b3c8d17afdea5720e330568f59d8cbf8a127e5c9407b9d70d83de64cbfb9176c2de612c185ed858d3ee42dd78830d42df974e93d0f8ee2e8341
+DIST github.com%2Fmudler%2Fdocker-companion%2F@v%2Fv0.4.6-0.20201209184016-2d26fc9143d4.mod 500 BLAKE2B bfa28c2ed45f45354c777a10a5696fa3fa118e7437d511395de59f0b12744ad5cf11c7eccf65196fd8bd0b7dba23491ce4791e1c6c6465fd7d1a9c8a323e977f SHA512 5666152a49a221bb2d3b17b2ec932d8abdb8dc8bbbea75d6b17cfbe1209a31d8e0708e0692dee7b916d3b565d50986cb004ff8b42e873f65f3895ed46a5b97bc
+DIST github.com%2Fmudler%2Fdocker-companion%2F@v%2Fv0.4.6-0.20201209184016-2d26fc9143d4.zip 41711 BLAKE2B 7bbae003e3a482bddc7b84619656f61dbcfe19bc1383888c507e7c611a168896b6e6cf9848d18b5c6d66f5e7f58cc3703142e8f0aef9403e2786829c7db4cc17 SHA512 2ade6f52aa12336c3cf3041af0832d55f659a0047204c03beb9bc6ee87f156877da6aff11e14bd36a4bd0a35321dcee14f98405c5f0e6c5026d90186bff75afa
+DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a
+DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod 34 BLAKE2B 315fe4d5620c1d1c92df3fd382560ac2cf164aa17a741c1a74fc25807819de811705467227923fee7f804c6b6e96606c87b4adb11a6b722f367b543c2792cda0 SHA512 b1c163d7a6a139eeee1457fa07933f01eaf6d2ff24d10385e75f87b443a95fe1b08e9e144d3c18eb6a77d34e8521cc6dbd486fefe908e60452c5a80f654c551a
+DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20160627004424-a22cb81b2ecd.mod 38 BLAKE2B e88cae8efddc7e87d193f1dfa70990188cf6997f38aaf0d22135aaed71abd543291661bf5628d0c3d7dc90e64fa0a7ee58e65db2af21bd160c7733b5971059e2 SHA512 96389bbcfe0ff698d1638ea020d8a6311f7caffce3c9d8ab1fb6da6870dc1685313803af2f79da15ad0d5fbc33e17eb883b2631a2d81fa70dd851fb7133b43da
+DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20171102151520-eafdab6b0663.mod 38 BLAKE2B e88cae8efddc7e87d193f1dfa70990188cf6997f38aaf0d22135aaed71abd543291661bf5628d0c3d7dc90e64fa0a7ee58e65db2af21bd160c7733b5971059e2 SHA512 96389bbcfe0ff698d1638ea020d8a6311f7caffce3c9d8ab1fb6da6870dc1685313803af2f79da15ad0d5fbc33e17eb883b2631a2d81fa70dd851fb7133b43da
+DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod 28 BLAKE2B 57fb6c274af3e1f296bbb2c4b81cf52ecd31af71afac9be2f77ca58c67831ecac4eb2f4f8819c510f3e2982d9a5ffdfbb5f384db878b37b531e59e06e0093a31 SHA512 2f4794d0c8dfff16f1fa252eb5e3396e2cc5479c96b5e4af9ec01931387790e51273d4a308fb2813a699a54a3cbf6b3adb5e92d831d3032120cb5f19698bfd19
+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%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod 556 BLAKE2B 8e36edf565660234a9c939b93e99acfd61c30620cf45619158d5a87c102492333387de1bda35aa226695f913358a4385d1b8b768527d8a63d056ab8f13cdae61 SHA512 3c48b6f2cd9bc71efc218b11ae432776164936d4474df73510a785819c417fc894ca71f5783da77f323754ece56b681f8f1e9dacd5bf309f189997ba0b317dfb
+DIST github.com%2Fopen!s!u!s!e%2Fumoci%2F@v%2Fv0.1.1-0.20191030112807-c0dd46ae078f.mod 1694 BLAKE2B 7204b04d4419cf062bc8a3c3f8db5edc053d36e9ba5e13c4837c130ff1535398171624c148cd6749574f5dd077fb2f07261ea146b1e0516f5e9fbd236dc080c2 SHA512 745150401b1cbcd70256b6e17faa91806b55c24e13271f536aa27e1364222f5873718773b3f64dcb878baf887e79abfaad8cd9c5667c07f6ca7ad251e7fa84d0
+DIST github.com%2Fopen!s!u!s!e%2Fumoci%2F@v%2Fv0.4.5.mod 1694 BLAKE2B 7204b04d4419cf062bc8a3c3f8db5edc053d36e9ba5e13c4837c130ff1535398171624c148cd6749574f5dd077fb2f07261ea146b1e0516f5e9fbd236dc080c2 SHA512 745150401b1cbcd70256b6e17faa91806b55c24e13271f536aa27e1364222f5873718773b3f64dcb878baf887e79abfaad8cd9c5667c07f6ca7ad251e7fa84d0
+DIST github.com%2Fopen!s!u!s!e%2Fumoci%2F@v%2Fv0.4.5.zip 1162227 BLAKE2B d086d0511749b34a3c407d771a1dcd068af8afba9dbfb9d69799ce7e291e73a187f763bdd2da1b3948af0c93820f027956e384eba643d1b72eaf7eb6251d1680 SHA512 f5aebbdb31575aa3373b109682d388da749c9e73cc0cdd4dcc9f23c0382978840b21567884bff595e311cdf78448cb28c4c2c103b42d0c603940b1c21c49ce4b
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20180430190053-c9281466c8b2.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod 52 BLAKE2B 451e6b2dce76ac1525c48f536a0f9fc9ae773978ca7b9356bd75473e075877d0127217cbb5695f1fe406295c02a7a9d5424f2f7d4520505d0119834c11645785 SHA512 708918e1cabb5710f63858f35ef5bb197666b2ab8220ee48b47575b77805e44b083dc7577ad3bcf9414fd801653c21be9582086ca73fbd9c5589380a7450a400
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip 34573 BLAKE2B 156844533eaaa6410ac116ec0bddc68ac155aebafc017c51e6fdbfe0425a02dc878e8515795e9300b6ddeef776aafabb60ad0c420a1acb9b0fbcfa1fc0f84905 SHA512 be04251b483e39b4cf503ee442344d3ac1eabcc7c41acb56c25d65ee35eea414f798f159fc168ecf5594b15b9d5349c96cb9741a6c5202cab4bfeb104353a9a1
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip 170576 BLAKE2B 52c16c643c1e621cb967bfcfa1e1209b564dd81bbf1b0427cd5c02b85160c444fcbe2ad9563bd491f040df2c4c6b9cc35f6ec83f671fc00e3cd5f40c8ca3af25 SHA512 04aa87f93002428f1ab79190ea584b23363126390dbdd6c05064646e7c5c3710da712b730f8da194bd83c7b95f260eb1773fd8c1c9daa9f41891a765e6a21742
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.mod 1053 BLAKE2B eef9c12986cf3a2ee51a7c2bc72f01daeb0a6bf0da5c38716447745cb2f82baba7a8263f434c509ce96a26b84f80df93db62dfdc0a247a3cf80c36edd40cf34f SHA512 2f987fd2c36d91f5df6bfb3f2477ab948fa685e2e82e4b0260b369b1fa57aa48c393f0f7f985c5a917218305311ca691525faf7ceed7a0d2f726df04f10ecada
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.zip 684884 BLAKE2B 820095d03422b37402dee1d8999e7bda875202347a1c6542a0685a6551873d36991e52ffb4e5f0358609cac672f2273d5ec71d313b96edbeb6e28548c169cfc0 SHA512 e710c42be0d5f3b78bc417f1da7aa09e2d9f7ba80ed4506e3d2cf0f6f26156ff9bb099a6ccde3d2fda3d990a18001d19a7e8f0aaa0e5c5fe4d49186e0de25f51
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.zip 93618 BLAKE2B 22f438bbfd173163c13a99a286b2459e0ffc7d5c799bdd73cd1982aad6a1c65403adb990da707fb889855bb835e9ee3358d357ec8b7032e7fd77b34d167233f2 SHA512 6c89042e1fc53f3a0664944b4d5a83c5e49e0cbd7452b09fe10c50c8e1c75b0233175127db0d83a7a48194f6e8fc26d3cade943bd3611d50ce9a41dd8e83a709
+DIST github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod 47 BLAKE2B 0eda9805fe0e1acdcc1e7b2693e72e39ea416cf57a108b1847491e1f15f8a7965c8aaa77baad1ae6148f39d36b1fc5fcf159b54111bee0d20bf2fe8edfdf85e2 SHA512 4e53e67b276ea3fe8a3977bbe72758bb2f844e22cdc3e23994176821cea51b10f5e802ca3db848a8b3d00a146c133a89271ee76158c478683b393682806400de
+DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod 209 BLAKE2B 5d7d5b4722834a34f8a63dfe72bd2f5a0426b284ace021ef7f6b7d16ac68710ccfd4ab21b442ac7cdd51f9a17fa116235f8c4d5e1d88c6b4392d89bbdc474e5a SHA512 13826a0b4d175ec2093d0854c789a2ce2c82d325b91d8bdd7dc0cc123b13ae59de2dd994039e90b9cb8ca424f5b642fed283bf8671b25c5c6117b168e5ce42bb
+DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.mod 179 BLAKE2B 16c3178a1515a77927002d1291ac1549ab95db0c67cc00f0d1c4ea543a636f6513e2ceaed328d8b3dcd864caff67ac4f0fdcf9d20fdf11fbcd4c49f527463db6 SHA512 b84b63dad1dedf0a1d06e8823c25a2eb5a833d2155e6e59b5205097cf9dcfe801b7a006e54730e512d0c094601237c2c2d9a4f518cf4fa392ef87f72d119776e
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
+DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.mod 70 BLAKE2B a94864739ead6676f2defd1020645bb86b8b77600037227aee95fe3e82070c31814fd055dad1fa16ce1a00f64f32be96a97968259ef43f70f20e8a55cb9943eb SHA512 aa2a52cf55149c10f76a8e535dc75ff9bc18b4f2515a31e8720a26a5f501459c736dc73548d2e37f348f27b78974bf0a3b18080df972eec26222fd8afbbcfabd
+DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.zip 17867 BLAKE2B 770770b14b7aec5881d745816239212c40a652a491d5a59ece0cb4f17ad3f84ffee92ae1b683bffbc8751b08ae9c2aeaea45b2eeb57d57d82396b07f31abb8ae SHA512 85a39fab5c82b8b276942c5180b1cc2e17c63657324c976ce99a77a3389bb23b3ced52629c76fa9d4bbe20e6cf866ac94c08e17b3f9a8ac416ff9653b9deb245
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.1.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+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
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
+DIST github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod 39 BLAKE2B f2e759320f64fa232673f4f5326c688510df6d43523a08df1b4b7524f92e294bf196c13049fb36feb846916a66b4baf7969cc0200b7109467b1f468dd6ab61cd SHA512 c0602d22e7cb8f1a20a354cafe61518a84a1499f793cdbb4e1d258d62b4f83a2c2a72e6cda49894eb2885ff524baaa47c542937c68bf338c76de5953aa468436
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod 357 BLAKE2B ade628b5e576aac499156117606ac8b2458a5b481ee77be1df4b551133a3957dbce70e8674431420c181a67dfcf886d754b927ea06d588cc3df4e10a0ab8fbc5 SHA512 7bdbda1cfee6852064c8d4b15f1037a5153bfc66b59b3555416518a225b70c1db1daca32c0a7058e90d2b0f55da3d9cbb2f5b119107b5d96a874034158a69958
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 569 BLAKE2B 0c975c1c48f40792b02fd8756be3b6bc044ca05725ae179445a858baed4861011ba76051aa25fb10be23c6cf14738cb9cab928418be49d8ad85211d398089ec8 SHA512 6fe81bf3c591058f2ff968b3c6656766d9d3fd74c8577b3e7cfac17e463392eed3268248237d252c98751b2f97bc7c48a8db15bfc3fbcd4afbbaca0e2970819b
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod 817 BLAKE2B b4cabfb93633359c6ac6dcd400484e6162bc6b609bf0edfc4a82a2cc0137edef114d0d3e9c55bc47d1abd906d9ac00f9d84f07ee7072452c570ba9f98118f4b2 SHA512 7e1b17c424c8ec889d0efb0f5a171043ac0fffb48725144836d8ac635c036e877e65f34f75055359747142051afd00374cec9e39911175adddca2c50fde4c893
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod 693 BLAKE2B 414677e90b5a1e5e2b5b498e46386fb2fa7c93314b390bc4337c74865b6a72f8a64804e4c30aefc54515e9261cda168358d70bc533e8686cbbe0f625b8957d08 SHA512 829b3d7349806cebfad94252c09095aba4c5cbe0cb77cc124e7fc514ded1d8faf0f158d21be97911b8937ab9d330b284139275837607950ca602b3faebef146c
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod 198 BLAKE2B 954749eeaffd58f7885eff94ed89b9c933b2506dce66db05c8aa640fc7e8ff21032d855776ad091c86d43b77bd9e2d1db3cfa7b176f2984ea66c4a49b4373d9c SHA512 539fdd264ff10a459bf00eefdfcd2d3d079426cbcce7c4ecd27e1191d6392e0451804bddd5a39f7279e3c91e63a40ed882ebe1bcce7e71913d6109b7b6ba403b
+DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
+DIST github.com%2Fquasilyte%2Fgo-consistent%2F@v%2Fv0.0.0-20190521200055-c6f3937de18c.mod 380 BLAKE2B d5e50ceb9388a268523bd969c58c4dcbb657248897a652fb1714f180bc5c6c84fded29702d68215f7984e4e100840c415985becd9856f6e1c4f3cf1d2be969be SHA512 a3bcbb78ac52866b5bb8ba27c58b93469ffde745ebabf78c91b06d33e9bfa4641d91afb189c75c10a66f10b8d080822fb8960719d588a1f4ed54650b3b97fa19
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.1.0.mod 45 BLAKE2B 6fe371f17a31bcd132ac67cb50052f6f3874c9f62e2d67f48d52d241026fd21e58ca9abdc15fd53cb949f79e7d40dd0c289af3849da3d4d9ff75b491e8235c10 SHA512 ea2e9a81d7720b4e11129fbdd4772be224b6e1267157c29b9d33813b6f4ae905e43c3840cf1ade6ff5f73bd22c103430a0bc882355c16715e124b442652cd4da
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod 45 BLAKE2B 6fe371f17a31bcd132ac67cb50052f6f3874c9f62e2d67f48d52d241026fd21e58ca9abdc15fd53cb949f79e7d40dd0c289af3849da3d4d9ff75b491e8235c10 SHA512 ea2e9a81d7720b4e11129fbdd4772be224b6e1267157c29b9d33813b6f4ae905e43c3840cf1ade6ff5f73bd22c103430a0bc882355c16715e124b442652cd4da
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.2.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.2.zip 193676 BLAKE2B c70205f8927b27af1bf326f87bc068f11a6813c416cfeddee590426c6a09839165d0b44caa5b511d69bcb24d1445d1dda92f194d27c4b65afe8738a3548ac615 SHA512 5985246482682ff3a5ce2f8144c7faaebf4b06568d563e99e982473bd84cecd1cbc4033e303f20a21509a87ef28f61df2a5b694c4902d89548153cff40111038
+DIST github.com%2Frootless-containers%2Fproto%2F@v%2Fv0.1.0.mod 44 BLAKE2B 49137dd1d4439b5794f6ec09c9a9386491f8eae34e1409cea9c3d3829bf5c7bdfb2e50d05cd519105cc81a581ef85a4ab517e1d40a512a7d5d0139a924e0c83f SHA512 8bc14f6c489f92cc03a7b77fa898e1cb7129965c8fb91a2c54869487765e3522d9a928f7004a2335028b56ca6942d73b42eafb19fc4b922c3832fdb5db2b1971
+DIST github.com%2Frootless-containers%2Fproto%2F@v%2Fv0.1.0.zip 9081 BLAKE2B fb2d11c4c27ed0f2448acf3e48c4f3d0cdf83db35788096dd4e47cc0b8a756fbd7761036ec1fb16285e9aaa8fa7ed7c4eadf58ae423800e96fb68a2f8d5ef70a SHA512 6ce1906025ae03ea9cc686eb3a11fc988145901f6b1fb0ccf106dfb8395eff3ad9fa5f877429ff4fb8446717965f02cbf2b1225a2a0665fa6d73cd09b49f04b5
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip 122358 BLAKE2B 8f906d748eda31f9e673fd8eb0978eb9ff17484d38cfef9f5cb7dd623005bb971d131dce52a6089f5a41deded4c4dbb956aa9a56da91b5a5b5eba9e3a9100f59 SHA512 11e29cdd7a8baee7995009755582c26eb819efd715e9dfa1442b5743c7bf5752188f0fa8f5ddb3452f05f371a280324406410b683609f6a510277d3e03b30ca0
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv0.0.0-20170128012129-256dc444b735.mod 35 BLAKE2B 68028ffeebb96ddadff1a781e7f0d7267d9ee0255b2b00958d9e36b6870e27630f7cfb1f6a1c90d81fa6303465d50936c66567c4b562a8b2711d459ee4e093b4 SHA512 1cf1bb0f786ca726b882a958d719c3b762ac146c01b5f57fa246dabd3fc1462b47cb71f7fa0c6b146873113a609b5a94aee724d2d624fec9651947b78d39cf73
+DIST github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod 35 BLAKE2B bcdc10d46ac3b8a6a83e1cf12d688dea82392c2ccb341edbfc922324b689ecdbe9a2c3449030cefa1ad723976364b8f774e3d6f51dd944fefaabd84b3eb203e0 SHA512 96b3521ffde2955dd8ea8b22b14dfdc829fad79e89a4c54e9c243cf34829e650d40f3e176157bde0b3ba3ec89c40c67f51c49d4ab1e08bfed762018e12ab7024
+DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
+DIST github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod 44 BLAKE2B 74f7855fc5488715e3e4b73dfbe83b0a35a050447fc3369c06c532592c7678cdeb28e9f1fc7ef4f5c14fc90c458d8654baec12ab0453117219ab7b865259ab63 SHA512 b9123f2c64dfb2b16e7081bdd7cd3e5a54f911387cb13ccd5c50c113b3ad75ccb64c754123a3b41d916b4a8d089512eb65a5db5eb303f30118775eea553f1d8b
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20180427012116-c95755e4bcd7.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
+DIST github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod 29 BLAKE2B 5a64bc6a74e308dc780f55617c18661ee4a570f5c536a1d8470ae197f5bde87ba88412e360585c3e7191289a2c478ec7c96c18cdd7ab9e10fc92cb8b098281b0 SHA512 54b48a0f515bb99c21f86f0cc9dfe9e06dff5bf8de3a453b1d91816e28d04fe64a52d01c2c5a651b51cf21d328fba8f97a3cba92e23d66e229034f8aed23a545
+DIST github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod 30 BLAKE2B a19bc3a2a838d03257065184fc24526f5bc8881ef06e4217e0439c05200efd72d8c1f9f7f3288ae69f8317fe21ddeba7fcd35d4431f29743260d0c96c59f6e40 SHA512 2fe62b980dfafee660aef1ea4113fba52dae15e24470b7ff258f055d7f7cd7f6b55b9afa1d46b1cf9fabc804e00c00c452e9bd72ed160dcad2e459dfe5b245c7
+DIST github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod 35 BLAKE2B b4c85147e92e894346c0376cf7dca7e581ba04be40caa18e941b6bbfef1f10e3dd9c5c2df662d3a1758328b3198a04bc00472578043ef3568ee95caf689f111a SHA512 aae1d53204f15d9feec965460e46a299bf85072a40711174d8db5ee21ff50776fd401ee965b2c45ecdb352535c9e4b6e6275fbf589482a27a84baaad5b7807a5
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.5.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.3.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod 337 BLAKE2B 41471db637c5c0363cd36be6d16a6228671ce9658ef71103ad2122a2cd8cfc13c30b87bf2b34df7ba9d6c1fff1ac821462fbb86b622c274cf26a1e3ecb7fd2e9 SHA512 29a4efc27c658b047fbfc6eb2ae311753b01fe878cc733e2fdfd83f5791b3e30ab50b08addd300dff37e7880f6b57662ac0cb0f4b98df2c5a5a9f7d555bc98a5
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod 301 BLAKE2B 5322be7914862368eba07f521c046dbd7580edafd47ac633116b8c9f4b61526d0d63df11ba6894223590a1ffcf4bf478c394a335c305010ca9fc18107d4e61b7 SHA512 8fe5a437a5f3f8c1ce0aff067ee261a946d946d7640aa5acf7c34b9c8c4ee65128a6421aa38bbb1feeba1339b356952ad58b4bad98f1c89ac455d94e86684a8c
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod 242 BLAKE2B 68986e3744d3ae593a16a24b6ce79876723d93cdf96c978c185b14e4fb8d73d379d4ba05e138b412973b465a76a98a458c6606137b0affdd085dbcf20851471e SHA512 ba06d3386a03812f2ce65f0597b932beb62b70b4da92974c5f5ed81c150fb71ce0285a2d9779ec8a40916870b0e4da5c2c8c5591c3687f3b8e829652a01ec1f6
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.mod 242 BLAKE2B 68986e3744d3ae593a16a24b6ce79876723d93cdf96c978c185b14e4fb8d73d379d4ba05e138b412973b465a76a98a458c6606137b0affdd085dbcf20851471e SHA512 ba06d3386a03812f2ce65f0597b932beb62b70b4da92974c5f5ed81c150fb71ce0285a2d9779ec8a40916870b0e4da5c2c8c5591c3687f3b8e829652a01ec1f6
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.zip 66301 BLAKE2B cc9a5f24d1cecda3c1cb51b34d441527c40d16a4c088b888b2e43bb08b0a4f41301ba78fa2503b54546b568a49544ddc516451ac1aff4fc7f92300677e802f5e SHA512 50aa92ee488371c7242664cacc6772fcf3b54068d834089d7b62675f9e17a84d234295f266419919ca197f3ddb6d358bab6d5e4583883d4504d6ff90054f5827
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod 52 BLAKE2B 3986b09ee44d8abc94fc0348107b410db374fccd11d77b9b0b7790b376a0f79b53bb3c70537d8d68b336ec007774fdb248237b6867b1a5c1802216073592fb0c SHA512 ae6455f8889d8aeea4b555e5c34c9583ffc5990e1772e75e5f6376d9e4d7d9e5f540ed0b04bcf142523347dfc21ae20a57d6de089718877d7db4387d9dc62319
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.1.mod 52 BLAKE2B 3986b09ee44d8abc94fc0348107b410db374fccd11d77b9b0b7790b376a0f79b53bb3c70537d8d68b336ec007774fdb248237b6867b1a5c1802216073592fb0c SHA512 ae6455f8889d8aeea4b555e5c34c9583ffc5990e1772e75e5f6376d9e4d7d9e5f540ed0b04bcf142523347dfc21ae20a57d6de089718877d7db4387d9dc62319
+DIST github.com%2Fsmartystreets%2Fgo-aws-auth%2F@v%2Fv0.0.0-20180515143844-0c1422d1fdb9.mod 44 BLAKE2B 731913ee70462d90d65df204e4a8bd34a8334c6c1875792697fe1f7fc4663322d504625db21035d1b2b0541ad0d17c1e14dfaf9c7b46fa46e0ce7a56622c98c1 SHA512 b5d18ea4a5059700ab836e7b93325bc0556c66838f6f9a7049164124c8c1a2b5c44f2832b8137c4733256c6e75a14f5afeda6267ddee6c1cdd5c64bd43a374c0
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgunit%2F@v%2Fv1.0.0.mod 99 BLAKE2B 177be246e7569d2ba2c79728168cee15d47b21c1b0f774c0ef01bbf1fec84fcf90ddec716323133fd93297915816062303d5beca75eab0d222216678ba57756f SHA512 3e021b41fde9b047f53673f0e5dcf126e6a0acb51cb03a06a95f8edf79ecb8d3134127f5c9960c0b25c8d35385d95f3317dba498b1da887171a1d3d65503cc4a
+DIST github.com%2Fsmartystreets%2Fgunit%2F@v%2Fv1.0.4.mod 99 BLAKE2B 0917ccdce549d1e4ce22fdd38d9d1fa3c7f771f31a69d761e6377da4d2be4c3a6545566abe1a36e25fd19a7d01539e41d8bccd964760bb3d1b169d738924d1ae SHA512 b1b6addbe9fad484a6241dcec337efdc9c3bfc6979cf98934027bea40e0f8e3b5a0c179ed6fbc73392fef0550631e841928b4f3b9ff72b8d4490adbf1b89add9
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.1.mod 283 BLAKE2B 8d2ac0a93e8060c85b68a1c3b7f1a22572319c9a8c7f7d88857f8b04793cc55141d63e53728bd85ce4c2a2f3ac27bc7dd9c115b86f5f3ae9d27aed9ad4ebae1e SHA512 cf2637b8c82a9c67cbe323e6f6601e93c6d0840e053a4644b6e6170a4efb56d670007b15eda837e89abfd17b6c15f179c96cd92cc9cea4002f27125cad1049c9
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.0.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.2.0.mod 29 BLAKE2B 329362a4a6143a3ae3fa01298ec9a677e0e6f4054edcad3d300db7fe5a095fd9347d5a239b9ead9beab72bdaa18e6411ac342b56e841f67eba226b802261870c SHA512 961f65a3d308161a97fa3c3d85749f53b7e7b0cb44704f330616c46898ff12e837c9dbca88a02826f40fb70d2b3fcded34a69bcf0f133157291ec3e17439f7a4
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.6.mod 265 BLAKE2B ecbd8f71c2576f741916c7e6fa4c279c327766a9bf957e019164a1ff8af16ca1fc6810004935e57a3b085f81252549ff0f4ee2b89a5e53dc0110218acba937a6 SHA512 25511d7efe6d605b33c4e142ee073694b95d93b10cf3e9d74a161dfb71171de0accd626587299f41a061f4a3ea34482ec36fe7b9b2b3588d8af6b3545a35a45f
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod 265 BLAKE2B ecbd8f71c2576f741916c7e6fa4c279c327766a9bf957e019164a1ff8af16ca1fc6810004935e57a3b085f81252549ff0f4ee2b89a5e53dc0110218acba937a6 SHA512 25511d7efe6d605b33c4e142ee073694b95d93b10cf3e9d74a161dfb71171de0accd626587299f41a061f4a3ea34482ec36fe7b9b2b3588d8af6b3545a35a45f
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod 265 BLAKE2B 22909466af108048bc272b0e67db40f6fcac375de02b29aaee7bc31153d73b2c1130faab8e27a82dba9b5930c789de1840468fe9eafaa8881cbee126b0c9df1d SHA512 17049e0eb9bab7ebe298bcc1fd3ffe0eebd40a7642c48f4e5c2447dc37a3099359d04dd929643497f25ed55a71d7ab6ad6bf0e75553afd4fc98616295745a25b
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip 190543 BLAKE2B 692f5c496466f8d914c1172446f3cb79b1ff9c9e08d7afe44d8af3fe1248b6c1b31fecca3fdd8343afc2b014535dc8e1d3f49a3c71f360d46933ee28002c4c40 SHA512 12bf06f87e15ee039ca148873a13f5944ac6aa6800999ccd5df5175a79fca03edf4672236e2c25ebfe1a28a0aca24d0f6965c8b040c09fb648650976baf8c305
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv0.0.0-20180109140146-7c0cea34c8ec.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod 188 BLAKE2B 26b2922f8d9ebbb77872bc280b6a40ce569be69e78a0734cf7f75def7709fd86183506274ff8b9e5853cb0dc29043ce315acdda631102497a8178cd749fb0c03 SHA512 a5da49fe5d41b33c03cd1af18affc92ca2572f0c735da70c55f06d668ff33ae4a231fcb6cfa2e85ab4b04ef4c7808d895739d0121ae874c43b01edad791f2735
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip 9825 BLAKE2B 19f73014efe76cce5fe92a4956b494f58093416931f8b71a6f3a25c7220c34f3e8b981ccbc80a6711d11b5b706feaffa84b5ad288927ea2e35c73ffd2973b915 SHA512 e92d5ce203ba7e7f9cdfc4e9c383a6b25a7afaa2a14c057cd51397a51f6fb21eac97e6fb3df1cf810f82d7a5d055ddd354ab0178edc9ddf433e2cb09f1125939
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+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%2Fspf13%2Fviper%2F@v%2Fv1.0.2.mod 30 BLAKE2B 18e0337f9146af34821783f04024be09e18f3804558482ea56acf28048ec811ae679e0bc0f6044774e69a98c575b0a41e210277b966bfb04270d7ebf504cb1c0 SHA512 0b3a57fbf1292964f8d35a7b85e9c828bd2c1344d68e4d04ce84acc9c99e2239895058fa656d45e0e5e622afad62056b583fb00a5dd3181302798ea99b0b6799
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod 2018 BLAKE2B 516407d1afeaeb665c558a4babcaa35aff28dd9b41298d04b904378159f1978a924323195e4c160cb9cb992c264558c7ae4f07ec157dd8c65fb98853a3cdc53f SHA512 fda6d22c26332038895ea2f2c62458baebededb0df883728dc9a127c10102b9bfd3e8128dfee194d909d645ea652f3ccd5ef737a8cb7ceadab71864b21de117b
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod 1694 BLAKE2B 195244bf4042b519551efc149dfbd9fe10ff87e5b2ffe6f9a2d3777516315db8b43968533ff089b257c10f94f99babd076ff0a7203a434a79ea5aa7e39eb9818 SHA512 9f614a57ccae909af00a67e464b04eb91a92eebf1c28de3809351363b441d22a4a6628a1902fde8b67956d0bdedd91423d20158eaa6b9cd994fb7e284a35e061
+DIST github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.mod 44 BLAKE2B a9918d823f3b60134a219be4cde670883d2e64732b665c78a642f1c5bf49a523876041533ee7523f5e77c4520746ff4c14ddd0fcc8a5baad56d7e58f73393ad2 SHA512 6ae4ea9b6e5c2e0951834010d12dfa7301c9142a16636b7276d978d05394ea336520f238fe7db9e402307256506fcde1701198a9130d7483dae5daf5a17ad901
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+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.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.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 github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod 34 BLAKE2B 85a4e50642e7088ee26b82c69c65e1bb0396d4e8819088fbdf1d93a8348d7aab950630e3bba1747517d01e0cfb9a9dd1b95341df0722480bbecf18399ba84674 SHA512 50b858817db72f0615a74431c9966f969d12a85fccc3f0dde25a72fbda32f77f3ac76cba50b12fdfd87ed7a7b3a337a291b1f9c86e1fbde81d2d0c2890c1c21d
+DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
+DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
+DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
+DIST github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod 36 BLAKE2B 4f0b6ce8011cb990e38d39f3598609c5b6fc72e3dfa12c8ab30fff486d65949c08bfb3934e8eecb4fd48f6fb77396e14bcc89282134b9b03a823291f789f3681 SHA512 f4cbae32bb681614253570a635d29bd25652cba1facd3bf0a6b7b288a992c890ffd901b8f1374349e0bf5181ba5fef54890a0777b2d0bcc4294af1438cec6335
+DIST github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190721030226-87058b9bfcec.mod 190 BLAKE2B b079349b0a65db4530e0ae682e1ad705f146a8ac2d1c735b9f660d2fa336088c04050defbd04f93d3b51a20dd396d338874065370242fb80ee5beb981fe613f6 SHA512 5056ac014217b14e7111984a99c6d49120404c31baf0ed510316b3b6edb95084b26d273da643e025e1d13fcffca82411a3542acf37dbadd4afaf9466a7a1c607
+DIST github.com%2Ftj%2Fassert%2F@v%2Fv0.0.0-20171129193455-018094318fb0.mod 28 BLAKE2B 742873e953a4c321d1a3fce242332cc938827e7cfd7da3872021fc5f94581945e9c01cdcd79f3d0d33c0cc18af4fd3dfefe334598902dcdc181ffd268e849e00 SHA512 4dcc75f1430a9a1c1c3f891c700daad7b2146edc8a8b83959bb7dbc8350b3d222ea42d1c09bce79cbf23a8d8ff72cba927f6a29f9f84ea981d25f52729c3060b
+DIST github.com%2Ftj%2Fassert%2F@v%2Fv0.0.3.mod 198 BLAKE2B 878e2a22b484403bc1312b046e109e8c32956bd5d6c82e22d087899f4592162fac96576799fadb3ce8d5286a3f5840c0863fd30cd95e6a7e83631429a9f23586 SHA512 918a4ad5fa0b5d262a1b1cd05d537e0f546a1270421c7c3cc9cdd7a63e04ef3e8a275e04597d1a5c4c94047243ce2415371d1fa887cb9a45f3fa7b7700548ef6
+DIST github.com%2Ftj%2Fassert%2F@v%2Fv0.0.3.zip 14827 BLAKE2B 7ddef1d42e6a3e8cff453dede872585973d3f806018c3be3c1423c2b96c2e4fac5013ec57f4e7a56688ec4861d0248d30a5dcec416a2eb9439042dad8ea1df50 SHA512 42a129cde3942bd6253bc455dfdd8f14c7c5f11db3da21cc01bb28e7921ba4ed37019e8ded35b135a959e614328255d2086267676468bc9e960be9a3f479f11f
+DIST github.com%2Ftj%2Fgo-buffer%2F@v%2Fv1.1.0.mod 77 BLAKE2B 7a1452234deed874722189547ac2bd24ea230cc984118dc926b3d60aeeda971a56f136ee34b8dc902a14c9fae0687872b6ce9d4fd30e22e07ca5eafc982e275d SHA512 cdb3790c805591219aaa0fff18e675920f971df1c5504d8ce8961eaa18fc975fff00b75e3e5724dbb30e4dc57b4c56098228c4f7e9b515054a9c1318c9560d22
+DIST github.com%2Ftj%2Fgo-elastic%2F@v%2Fv0.0.0-20171221160941-36157cbbebc2.mod 32 BLAKE2B e6580635d6ff7d43b4882b1bbe937992259dfc43859a6413a6d7b97746549f3d8f1c30aa724d3bbe1a4499d6a8cc974a7053c87f14b7a91e2bd7f2a555a99454 SHA512 a1cc95f87b35b7c9a9c23cf2d2ad1781762d7238be4e34d4e18d66aa01393b4a85bba8ad55e6ec49bf43074fcf7b1f5a23bb41f6c0588d5f3f6c36ce7a629d61
+DIST github.com%2Ftj%2Fgo-kinesis%2F@v%2Fv0.0.0-20171128231115-08b17f58cb1b.mod 32 BLAKE2B 1bbc694f84cfd169e1607396d69b9aa5f94af0f157e6b24654b475eda460fb34fd271e44bb967747cff17b013879dc1e7fb42460b228d9b4f0b22eda0845a912 SHA512 c1a784f3badb6550f7f18ce3ed850e69a8d2b1786a50375b99f1ba7cbd3b2b823cd84427fdea4f94cb0c89cd958f3ce441bf046cc640b21d5693a062ce5e43b2
+DIST github.com%2Ftj%2Fgo-spin%2F@v%2Fv1.1.0.mod 29 BLAKE2B c59da323023887229c554d4ca24307b4e0e318efcd3bbb5008513bff44749335b6ead5d6c74cc0216452039a6534426287c37fe0a8807aca2c2f2bf9b328624e SHA512 d05db9df2782c526d0d7579a34966c6f6d510fba27465728bb6a2401482754fa37baabdf1c179d570d5c92453a5f189e74e985e5fcf6cda344846536d6743f04
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
+DIST github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.1.mod 35 BLAKE2B 8e3c38268bbf27256cb628341ea9b1772f7e0396f91f8d98137af08899752a2c7edfa235780fdd860a514176ac1e559b49fa1de26f6909b71ff4488666b73a9b SHA512 45b7c64fe3b0b38a2ca194c2b91ddbfa4cd1299685b99be460b86eaf952ac8e59b229e82d99850db3cbd4929e495413c92f2bf2c987adcc7252c501ee11b4ddb
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.zip 109691 BLAKE2B 80448b0c68b6b929d8776ab78a6ef0ee956c82ffcdf2a1269c4658c896c2e7e9b0d11ab27219ca73bf1db3de3900ce3c89ba586d62fd4e0142313681b0f971f4 SHA512 1cfadcfa834663de819e8995a000b6d58dad804c614011ba99cd3d0936adae43a8f9a41522a0e55748459b456ed12abad7c89627329fcc7977005ea2ac711a14
+DIST github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod 41 BLAKE2B b7c7dfaa36f45deedb2b403a7a0f09577321cdcd86d714724f9d8dd8044c05aae91dbee433deec1dc094d8af6ceb8d01924bf4a9812b7521ce52ffe5678e4a22 SHA512 887a7529d78ca53e5e8822ac041705ae20c34c337b1bb94d3f6b671e4afd2dbdcce3a52aac4a42defe3da92fde14eef180bc01293040f6150c362f23408e3fa3
+DIST github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.2.0.mod 321 BLAKE2B f1b47bfc9434a89a99aa50b4a714d6cc2e140697e56e34475bd0dfd82cb9782f7837b922468d4769a15641a2a2dd90ce3eed92f1e15a718947537cd1c35bc50b SHA512 0e8018de1c1a59dad1f183e59a5ee1210925d16e4deffc37356b193991b24e23148def88dd6dcf010b2ca74d8172009cf96f500da80f5024ed872940ff191387
+DIST github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.1.1.mod 228 BLAKE2B a5dd2dc83306e4addcae5097145a5a3eb09f77e3df29d0b09c1638a0406c2baa64e2fbbc204c0450eb5a53ab310285e1c73f4fe9f539c61f2b4aa7f1a1b135e5 SHA512 15ec40e7dbf50b73b56c35b11203a8f406b35f51d8f201df80e27a4cca5c0ea35217196dcfd75f68b94128e20898fb69dd8dcb0bc2d2ff3c210d1c126fe04246
+DIST github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod 36 BLAKE2B 4867e6ad22da67000c8f082852df43453cba9814cdbd8370c83bae347da0c426c2e2d705a85572e08a47c872bbb880f7b8befed360edcc8a866609c9486b4e0b SHA512 971639e43bdaee2891c655fa90626dd50be715f1d8493980d6fb081deee7940ad71bdb35887a3425b600869be75dd32e344b2c5d68e54e2ef3d6397c8fbe6490
+DIST github.com%2Fvbatts%2Fgo-mtree%2F@v%2Fv0.4.4.mod 34 BLAKE2B a54816638dee243ea0f8568703ea22983ceb336a86dee5092d0a6b5b72bd112b2c9f2c0284850a071a2231c58bec22d7e067fb23ab8b7d8657fdfafe52790aa1 SHA512 96949588f1f0aed15cb17167b4eef16aeccc3568a065768de71acc27aadcf22fa328cf70e5e8630efb02faa2dd750cc1b5274e0099e490b30fa136e1dacfc463
+DIST github.com%2Fvbatts%2Fgo-mtree%2F@v%2Fv0.5.0.mod 278 BLAKE2B 36b291c51883b04d0bf26f35e7b8e509fda8414268b0a7b5ec7ac13d2dcc0c776d1be8b95e0727546ce3962117c59054af28fd24708ca0347ae9673a568261bc SHA512 a4e232630afed494093c25196c926e7ab1ce124fa27f1d587ed7ca3916c93ba0d2754cd7cc1f6853b7b6430db6c279672878dd534cd412af4ab501f32ae3504e
+DIST github.com%2Fvbatts%2Fgo-mtree%2F@v%2Fv0.5.0.zip 136230 BLAKE2B 0b85cae77ce4b7dd9e74b85d839a8859a67f7221c1b0aabe310ceae657ec018c6ca0dcc957b63d6471b6837df4d96050906566b3e790872eea17635f3d9028b0 SHA512 4758c5a89affc91e4e9a46b67c71fd9133f38424d4973f49547aec71422ac7769ffa57192381ab07611297f90f4bde01b2bb080b9301f3b00a8923701cabb73a
+DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod 38 BLAKE2B 3ade12a1ed924c4e12dd9422b763bf2cadf710ef072d593dc40923d48477b792d87aaa3035e020bcab860da3ceeddcadc44afd74d9e11c3902a5d6241c8826b9 SHA512 637521629966c8f1b3d711a2b2b7b1753bed946f26570cd8e5e55ee3da5b106d418e0b80f48cac7a2651b71103c0d09116707d7b9d8cfb2d78d7bac2e908560a
+DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod 178 BLAKE2B f1d6f07cb4b333ebdd4283a1182c2b8ffc5bdf45a4148912ad383ad73b4dd06bcef24370ee4e33093803042b118bf5a09470e8b2413172ad128f19a7a93c5dea SHA512 a675b67583280d75806977ccdc80641afb67f976ba72d4e106bc90684fa940de2b2854ac2a8cebfa79261e362f46df408198f4c4e48908aab27f9ccb3abd82e8
+DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod 36 BLAKE2B 89b77c2e7582554fd3a63f99bc03f2886e9f554e579ee4e0a99160385d8704b5f983e5680da06accae6bab806d303b726b22f2b4a6c2b03e82bd6bf9a9ddde7e SHA512 8f581beb7e676d082a76b9bf47b7d04c486d5e96e4f69f17fd99efc101e408cd7cd1c8d51a46ab1cbb55f7bb35b08ba8dd875f18e430f30ba9c88c43e44056fb
+DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod 45 BLAKE2B bca314ac4894ffa7e671b1d4ef848ae73386b60786cde851e62ff43e3534310c32b0b5e1134a3c81439ded6766c176ebf1d3759c9690ddcf31c4a36edc625bba SHA512 b4dd7f2c1eaa083bdc0e90f3f636ac1fe32b290b6dfbf09153b8b076aa7cb39c9fae038822059413a4883bab87982bfe873477cc38b23076a7c70b3ce9bf1f45
+DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.mod 31 BLAKE2B eb05706f9dc60f41414a9d2b5c3acee3f615e0d1249c2e9b9776bc255fcfeb05593fb3bf06351d763d4ae4b465aee3f64d9630f4ae5fdd2d4e9ad847e5d4675d SHA512 f220b8b8bbc82fa03107ec51399e2e8c90a442b8b4ad57db441772c1ef66b16a77b71f0601f8aa22b60de4c1da4dffd1d746cd567158fbcd12b1677d88d4b17b
+DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.mod 40 BLAKE2B aba22d49d3bfa4d2797265117e12dee324dd0bf3e5f59fde41ac871dcbfb5ca009e033e0ebdae3bc3be438c397b56f7065a7a311a5bd5150689d80ec7d3ddd4a SHA512 29f41dcbd13cc6fcc59c46066aa34473ade1ccb1e935b55cbc43955f208857aeda44b6b5b94eea9fe264dc11cc3db84d7fe3cadeedc7e1fa3f300c39358537e8
+DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod 40 BLAKE2B bd8fe364e43fdad423aa574d01229ce91e9b3211cbe3a0234070805150d960d3c0fc0c6ec229e7ce5b4079906f2595a2b5f50a8da7bbe9bd906a72a6a7a7434b SHA512 cdd8a665fc41a4b04c59e869b021d5a9b793b9a441c320a234bf2a13be67af9aa60378c58991161f73d83c184039a52fc3f11cd121490996737f0508e277e1cc
+DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod 42 BLAKE2B c2d6fb272d8ae4e541c98023713bcf0b7f47f334d09ad7f9f375ed13eb14d27ee2995745782ecea40d31a561e28702fddeae4b5e32750726c7188118d741cf82 SHA512 14c839017eebd5dcf49dd3495a1ef6421d522389a2943c010d7869d214f757fe7d19d6ac3482fb3d8cbaaeb3977c5c311523aba90e9f7909fb1ba593ba57ae8a
+DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod 40 BLAKE2B d9bfc152a45edf20400c8f59ff6f7d20ac98441b3bed903d1215a98ad5b59aa9037c3dc413b750a34d4784a14d98b6441b47f8117624acba6bf69202345c43c1 SHA512 2b18d1b7379b2fb032b531119bc11adf0d7ee3b7cb490db5fbb2d7c80f04bfcceedf474012172da27d75f4337902929fa49635a17ac436ccd3df638e182c7932
+DIST github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod 37 BLAKE2B 65bb120d06237325c63f8f722a251585f54d2e7f5c70dc35554fa50147d94298bae6117cee34fc6fa202e96ffb0878534d5eea11775a83ed514d33d4fdfb8775 SHA512 cb07bd4926b20e43b08c9f6c29a74eec6b9119421d56d48d69da58152ce8ead0520197c72109579869f3591fc8f8d05b7bca3d274d383cb65b7a023fd9428ed5
+DIST github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod 50 BLAKE2B 1df5b82dac953ff568a0709714e04e4fb31f384e8160fa933b9aaa579f311eabd38c42781612c6d39b7eefb1f995251f74b5ca5364bbd9d240f6896df3257ca4 SHA512 a921e5321a35252f98bbfc819df7177a500b64665f710f2b833f4187062e5c2f050daeeb5230c6cea9dce724823eae24d272924742df53fd3437d9bee9ad89c6
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod 94 BLAKE2B 5014c2a8459f1f01661c7cac0a7d2ad7de372b3e2916d56d721fd454e459fc75d5b4f6249a73dc54b46b91df00b1ef5c3d47d099fa28429a6967427ec7bfb36a SHA512 d3cfb7a75e321d2a6fc145b727dea76002189ae2caa8dd3162e5e6903a1acbe5bd55be81d7f112c71b47e61351534ff991be30993632be9c9d7443111600fe39
+DIST go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod 2476 BLAKE2B 80a0e199679221be23c03ff488f7d505a13018e2c025dc53108c319b525ded9c0c79c288f9ca12437cb3a20d64373f06a1cd27603411ca71bd895b3dce78366f SHA512 8d5b0c6b187ce7685a05c5be2ca8ec63234ec96b8b7c8e37aa3c55e51de624aa19117da13fc75fa180c5e4b2a1b9e5d7adc7c106202d1f995237adc995fb160b
+DIST go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.mod 37 BLAKE2B 9905f25ce802f6b0c6cd290cd4c4eab44332910bd906dbd211c5fbabac7af525fdcf35cc6106e204c194ed9d8e609dcbf0ed0eb5cf606913985076bf2dfa3985 SHA512 f65d060c9eac0fd1d9dfaaa10e03423934b68357cf0ce693486b3e5353b04eee3a4dba0e9fa85c655a0973fbee9b0b85b02c3415b2cce70c52a60209e756b13d
+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.23.0.mod 300 BLAKE2B 768900ce7738c5e1de5c550f1dadf600bae434c89eec337e532e50542487226c79bd113e2b8223c63c241be631ebf5b177441b1b583317425f850a0efc6a02bb SHA512 67849dda4a765e79351214a3641bf601dcdb404f83fd48cde5c6b4fd7249868567424b9f70e0bdf041f6e50f6fcb82239600be8f62253835e4c7c8a17c8d8871
+DIST go.opencensus.io%2F@v%2Fv0.23.0.zip 309862 BLAKE2B cc1876f2670ad970a82ad2b58cac621086428e29145ec62f9917902100236471547339be24e2656fd5c3d6ed4b2a10861edb5879e85c0bb9308b0b334df0f4d3 SHA512 90ec312a3ef194251f06ca8c6535b97b0303b72c55cdb602f6f33b1c691188fd5289e4c7323d01d5c66b15411b28a4fea4bc817c41fad6a7d206448fbfa498c9
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod 131 BLAKE2B 0abc8845d865fa3a1e96e938a9df81733f6d658b39592df46f26eb3292431b0db554eb5db00671f12471cc3c0e454bdf227215c0f9adb182493b5c146a12e3ee SHA512 ac727a2635d02ba4d12c9af7a9ca2d27c0f1bbdb2f2ef797a2852cf569d33cced35be8ce3e95e2ff3b13a0085b723622656ddb8731c055719fbf62cf10caa4df
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip 53254 BLAKE2B 55083a93da944305baacb592cc1145f191412b4fa0a98ff3f4180484d7a3bf4dc65561d71670b8a462126f10ea82a3ca2846f73bacde8c9d8c485e895b329598 SHA512 127df97ad28854e4db92b6ef8f147c50eecf49e6a3f70dd0524325f24aa6bfe977127513443cd8926589587654212acfa4cb8f153e2290b8b27aaa09dd846368
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod 324 BLAKE2B 46301f4e5db74421da813b0c2d3d178417435ede42a1857da3d3af84b5ba353f10cad25fd48b777325dc33edd05f0a17b019a9f37c4e13f28e7ca5ee833c0d5a SHA512 aa82aeb1b0559b9c9b2585b8d584d9be60b6d6aa48e9613cec7ca440e267b93b2eaf67e3e88fc2faca68062792f3f6c9b03d080b6f13dc7f967e1b403521a909
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod 113 BLAKE2B 9c82de4ac4a30a4f5ef4881d70b75dc7433664ee90632c6d4dcd1594f3c08082aada1cea4740d38b79ea7753abe47cbba9a173051577c2be869a45ac1e90902a SHA512 850531fa2e156bb78b5a66f4afe89148f048e90ad6753308f4d36aa886f5bd179d2dd5ca67c99cb98976ced5aa6b14e4e463bb27f0d002b8a0e1814fc5316873
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.zip 17500 BLAKE2B 5d8607a8fde2c57caeb30459232e9d33bcb9c8cb3d1f046f5714510467ddecb6f82180959ec7d28c15053615390ea2ab114ee472988b6ccfc80de7247e74b0c9 SHA512 ab8d76e47875c4435d00d346ab4f9a04f570711f9e03d7eec23abe6a8d29dc49c4538150397da95e89276dc9ae617b8ce90b90422694b38d03b7773127bfd8e5
+DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f
+DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST go.uber.org%2Fzap%2F@v%2Fv1.16.0.mod 282 BLAKE2B cd8f8b009c9a5c34381fa6946d29e228ba21595e3e5ac25eab1f2546a30b616ec885ddc5659a363856b9112a7c114088702b9c0f5f844e4bd180676dd6f696d1 SHA512 96c2bd0ba8c620be099d5bf69e5fa91309538ff29fe26836a6f74a9db5b9d7d00d3bb372222860744bd6644c89dc1ed7fef56daecedad92ed0cba5cdaa1e4c95
+DIST go.uber.org%2Fzap%2F@v%2Fv1.16.0.zip 231211 BLAKE2B 3a325fbc884563de82d57f4c4060dd01c236317a4e075c3bad03664a19a9e56587dff4fd8a5fbc60b581ee719239b1d45eb1cc424c35acefc84999ab85cd33eb SHA512 da2e30804aead70f6a865de5f5774bba955aa3728a67a322e22413641c75abffffd830f1e5968d6ba241c9012708758a1f1a3629d435954f20602fa9b435c909
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+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-20190313024323-a1f597ede03a.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+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-20190611184440-5c40567a22f8.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.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-20191122220453-ac88ee75c92c.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+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-20200728195943-123391ffb6de.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod 209 BLAKE2B ae212ac1167b75a96c3b74f33594fa85e980530886edcf3bb58fb5e077793d24e69d1015e8581caafcc78b2d41cc75e4e17e82b2d3f76f10058ff5a715f00641 SHA512 c2a45c244884d6ccc5c4f73b6b3852d28c9ed1d3acd4805ff36292681e5011284af42ab75ebf6274cda4cc3bcd426496515db7eaca2a529500c0e896190f26a8
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.zip 1864784 BLAKE2B 6e21ae64d3917f37cc233bb3d63c25149182930d022ff1e70bfc50ead953f49d6fd434405b9c1a4ad5b31ea39471b0a9ae6a0093b53d8b7e6cc1e88a34a45544 SHA512 f7077f2cb6f051911f8d97449b22ca79679c5f8e0a29c3c438a4f4bad25fdc58dbfdb9baa32b008663059bf9054cb9ec029215262559fc655f05a413b7214bd3
+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%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip 46110 BLAKE2B fa560c7a47a9724e278b64c4c96c4f28fbc5d1163a8e919f4e656527871420139d0c521172d9e7bf22401a21e6a0d4a802df9e7c6326f45d159138c5ec46b780 SHA512 393b1eb08da86deb3931b57743706b705567979f1e5f5b72520afa4690ad325ce6ae885520594683e510aa26889000fb5c042654612d902de092f29cd6a65786
+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%2Fmod%2F@v%2Fv0.3.0.zip 128895 BLAKE2B c2543ab5e3e1eacc16790bcae51ef70962f035b9b95de3797a1fa1142726ec00c66e4e79b717e363fbc5dae3e91b79f05826d623f9251c0648437efaf007d018 SHA512 06f329247189a6a61e54902e9adf7f309b71818150f2ee43ca7ead80b8f03070edb31c4646b7a379b31e1a8aa81e15fcdb2d0e92f9375fcb4d5a8e2194b954e9
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170915142106-8351a756f30f.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+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-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180911220305-26e67e76b6c3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.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-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+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-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+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-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190912160710-24e19bdeb0f2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.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-20200707034311-ab3426394381.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-20201110031124-69a78807bb2b.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod 179 BLAKE2B cbbf790357e705f6b365164e871ec1a61f38f08d3657730186e53b1e3a3d802cc0af8032be7f59252707c6d19dcdeb6f8b9ec3d4e7af74c1511bae31da54046b SHA512 22eca632a9bff1e24cdbbd1060a6c8a1aaf3bf7e06aa96b40f1848877cab00b8687309b9466f703664c4988264fb5a62ee99bc216038bf1096bc21fa27ef988b
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.zip 1586828 BLAKE2B 8904e53df79d9fd01a4974bb07d19a51e77578c5bd82e71fec4fb8957cf49e590b22fab629a6b89588d33633c19861c0092428e9f032a2041d8076bf749e96b5 SHA512 b8f1cf61c9a2d8cf21caae01f8f7a4324f00e36002a95e84deab25d67ea02349dbc02140b8fa266eaa36057d4434c99c439f87b407e661ab95ca26051f2a7815
+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%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-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%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip 28693 BLAKE2B 3d6a34fa6da642f5ca71c930bd69a41439013f20ee60dde5d4dfab4bf688f1edb150a0477cb006670424c6c59e90d4bac9e5eb34f9fb4c518d903dfd26fb6cb7 SHA512 48b983589bd682ff9275c47733ec73637ebb5e58e1bca0c7744101229237d5cb34170efab63db0061aec857052cce9ef03c3497702b90a86287e6be88e1b33aa
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20171026204733-164713f0dfce.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.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-20190422165155-953cdadca894.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-20190514135907-3a4b5fb9f71f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190522044717-8097e1b27ff5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.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-20190606203320-7fc4e5ec1444.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.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-20190801041406-cbf593c0f2f3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190812073006-9eafafc0a87e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190913121621-c3b328c6e5a7.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.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-20191005200804-aed5e4c7ecf9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.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-20191115151921-52ab43148777.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.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-20191210023423-ac6580df4449.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-20200106162015-b016eb3dc98e.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-20200120151820-655fe14d7479.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-20200124204421-9fbb57f87de9.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-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200817155316-9781c653f443.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916030750-2334cc1a136f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200922070232-aee5d888a860.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-20201112073958-5cba982894dd.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-20201202213521-69691e467435.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210216224549-f992740a1bac.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.zip 1667781 BLAKE2B cdc9bfd5c8eff8d08f2178e9797ffd515ebd393e1c2e0e2aa5d21bc4179de4eeedece5790e020a259353a4d03deb327bb0fb0a5716061df49c1d4bd2a6dde32d SHA512 1b9c921c31bd93c1cdd72a4baa20b9ae7e6a079bb790c9edc3eace4cbddae9ba8f4baa8584c88b16d8753ac18b9ff333cf7b86830eb7d584df0234253d2536e4
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201113234701-d7a72108b828.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%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.zip 23415 BLAKE2B 7b67ba682ce566564d78910a6854418708f329ee424c922ad8c8082df64a4ac3f643647fe235e64340f91364005d361c398c19c546faba0db070ab4da7b52a05 SHA512 390acf2a26428b88b213f16d28860c00f2255ee49a1d516e044c5ce51cbcb01545d10dd5868dba88c7aee5381ec07c68fb62a9e391eacf1a26ea4c318356175d
+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.0.0-20170915090833-1cbadb444a80.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.5.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip 8609319 BLAKE2B a4459cdb830dd5de499cab9b0a37afa88f0cee1b3733a9d765a6693eea89fa5f7b2aafd9f5b27405c9bd38f27f715ef311845e52d3dedbcbf2ba020a04334898 SHA512 f40c677e92a896b7158f0b3ddb786e670a954fff7d981be3e0d3bc6d789d4f069174273050a0cedb8e2438d780e6950e027d84a2e2d64b7936e61edc613acd36
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+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%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20170915040203-e531a2a1c15f.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181117154741-2ddaf7f79a09.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190110163146-51295c7ec13a.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-20190121143147-24cd39ecf745.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-20190311215038-5c2858a9cfe5.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-20190322203728-c1a832b0ad89.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.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-20190521203540-521d6ed310dd.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-20190614205625-5aca471b1d59.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-20190624222133-a101b041ded4.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-20190913181337-0240832f5c3d.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-20191029041327-9cc4af7d6b2c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.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-20200304193943-95d2e580d8eb.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200308013534-11ec41452d41.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip 3360420 BLAKE2B 8292263b751ee7d31e19e81f0d579d777d055ad5ef2528c41015d021d200674c5f189252053a59ead0306907d4c23b07b38145c06c00094364b4a833a873a6e8 SHA512 f8c20e84c403c84de01d202c1b8e68e10483d6db36a06e3271412aa5843649cbd3bc70c5980b254101783e29314d679c5b11b8a0d2ee156cd149b7ad46da20be
+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.0.0-20160322025152-9bf6e6e569ff.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
+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.20.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+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%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod 31 BLAKE2B 679418ac9c2ad45dc432c1fb2f8ae13482bcce67e3d83f3204380a5fe8b69ecb6f19114b8e10656880a434e012712ad94bfe3767874d88ac64960d86dd5548ed SHA512 1ce907ff4c74870bf960dc786a8a2d824ed8794c433af026bdb4fe29c40c0812187bd409e3dfb99bb91414e0ac5f766d3cfe0badfa6e1ac4a3e54de3f14c40dc
+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-20190522204451-c2c4e71fbf69.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
+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-20200117163144-32f20d992d24.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-20200305110556-506484158171.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+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-20201110150050-8816d57aaa9a.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
+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.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+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.23.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod 771 BLAKE2B ec4ea0b34d044e7a4dab50109d3b4e9b0081c538bd568155c4aa7a6370dd0ec31a18f3d1d294ad87af95cd58f2ac885026d07d43d21df1eee2c926dd4d8b2712 SHA512 b6c886622095b3999f108230f6cd3dddb72157180b0ad1a539919289b2e0c8496ebfaab369d65e83d6fd6eeb97b618b49a834c7ad3b98afc996f290d49c936fa
+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.30.0.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%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.26.0-rc.1.mod 83 BLAKE2B 0e4901ba1d4e31ef22f0f978ee7b7d926ac2cd3a1cb5d8d8a81a33e02f9dc81aad6508280d65659862c3a9bc0667c334cb6cd8c0c532d5fdb3735a415c2a5eca SHA512 a7b2aad691925341e3d1f6d1d1453b68386902a4e2e1c0deb406bc157d04328c5519a01ce938a33a6e358cbd9dc0c2f862c9822bde5314d2eb9d416d7bf789d2
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod 123 BLAKE2B 73f875413489557d8f0bbcd665c06356b900f87e2cd9ef0ee5aba218a3a910842912d36dc9e653afa538c99cc723d28327a8bec6eac1f6bd93277d70fa891339 SHA512 d618524aca1cb3e525060bb66b0c8f06c9ad6be5389be228d265dbcdb368442f4f0a7e98f8c9082916b2579d77e627a550904f0b1c058b7d5e45eb7ceb77c2e0
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip 1557709 BLAKE2B bc672854cc46d48461bf28395c5be02fe99ff9da1d23e212078e549bf3e2beeaf953cc185e059c73a374f3e2662cb81fd6c3ff53472934964b8461f370b51a78 SHA512 de309c033d05be35503d6073e14ead585db4e6b75d478a674a37f93c7757e914c67bad446cf7ce04ccd49659d1ab2f9a024ee639a7536480ef92bb6b8b52dfdb
+DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351a233f5e8236743a91df1f630355380a4ae8df10c32abc03470955eac6c15c95655caec990eb17ef2661985570e49293cb146517828090d95635 SHA512 8482c3135335a3a69611529f0d50bd19257b0fe8a8de2d4f2d6441ccde5f1e7a57d487cedc375575c5fe16094e5fc1c7f7f1a6bf04acc8a9d4f92701db279002
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Fantchfx%2Fhtmlquery.v1%2F@v%2Fv1.2.2.mod 37 BLAKE2B df76358940d4e5b828173cb768f93e839189c08fca49ea56a8a971b738f72a36723cb6a55ba8df69c7b63028b14220da15ff1681c4c5e69ca39b8d2ff749a87e SHA512 bfeff9953a1d647c6335582f8731a1b5176fc7256625aacc8b65b63f3141ccf082c2d83f046e55dde8961c1d3defc9d80c2831519506d47f65f4ef9dfbcb0114
+DIST gopkg.in%2Fantchfx%2Fhtmlquery.v1%2F@v%2Fv1.2.2.zip 8238 BLAKE2B 9382e6b66ad4987e45e90bc7bda36b2cf2a0c4906867b9a58065ba935fd3c95fec020d6c47112ba3f8e254cd268d1527208ad41096d6d6578beaee513f58ce1d SHA512 b6149645ac6833ccf918f5a54ace5d79e3cc4653588be634dc63368b584b772a6507e30028a88b13a3a2dfa5a0c59e282b1bfd7f7d79e32b516fbbe72cb911d5
+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-20141024133853-64131543e789.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%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-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%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
+DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
+DIST gopkg.in%2Fflosch%2Fpongo2.v3%2F@v%2Fv3.0.0-20141028000813-5e81b817a0c4.mod 33 BLAKE2B 72032f7335b90f64ebee9c2b8b2caba874330d1598c9491270c9046c3202bec46c206210d4fa646ce69c6161a13405e163e206573c688ed3c778a5c4bbf592ca SHA512 77604cfd227389d07e8b242fa412c37ed0b29180ec976edbaac1d1e033fa6c5050e02b49188452566148ccbef5a974a79daa8b2609c3609bfdbb96c82119c2ce
+DIST gopkg.in%2Fflosch%2Fpongo2.v3%2F@v%2Fv3.0.0-20141028000813-5e81b817a0c4.zip 111455 BLAKE2B f8d398c132df56f89b7b7375f0ae629af140e4fd5e7b7288fb86fc8b31488562577cc1030c1b421705960419c6799b14622cae85ecd905e6652d2788e1f42c47 SHA512 910e7b0da8aa2252c9008123e1035d5bad15c52b361730ffb507ef0f327fb7b1ae5b632108140afbdc3a770263b6af70469a9f4426b88da840668c98c1a06afa
+DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
+DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod 50 BLAKE2B c715a977e733670d4047cc0f62fd485ce2af214d87e799cdea97015f64ee66488e1f68f4aec8e8ab139cd70574a0dd5f54b7bcedad09b8890ad098bcb01d7f5f SHA512 2d48fa45b7183412ac358a60c0af0b3c2f77d5c461f6bf4ba5d7a162195d49076870e739ac6c59e95d41dae2002370f52faf183fd6ca7999d60374866fa3ebdc
+DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod 40 BLAKE2B 33144c2d794f0c82dd97c993506bb6267aa9c65eb99c535e92b206dfdbba0d257a64b12d553f85ec2c770c87c196db9fda863c7f757778e4b36d4cb0fc98f844 SHA512 93ccbb29e7c38516a22d7ac174d4c2e9b87203061ae7bcdffa92499f30470e90d7e88f515f789e1a15c34cfaa6e7c50249e3d26ea1ef8b2afcd92dde62cba044
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
+DIST gopkg.in%2Frobfig%2Fcron.v2%2F@v%2Fv2.0.0-20150107220207-be2e0b0deed5.mod 31 BLAKE2B 03a8a02a5f6454a01dc0f9dc001f15efcf122a876a674a456b6bf524438f9ba59650e4e11b756e58233a3afed8770aebd530ab469340b73e4e4fca3fd5bd2a4e SHA512 bf232a5605f187d806d526afea0a5f4ab64062e1363de1c30d4fa1e97fa247bdd0bc2987419efacf091ff75a48a3eb6b13bd239487d0296e206bdd8d633b992d
+DIST gopkg.in%2Frobfig%2Fcron.v2%2F@v%2Fv2.0.0-20150107220207-be2e0b0deed5.zip 17241 BLAKE2B 5de086ac8f551eda1bb5cbba10c89ead6174dbe62ba4f7e8421096ead7fd901be109f4c96f88824b8276cffc6ebdf4d4c4a8af7f7f3f4a429813ff05216f72f4 SHA512 7addd990027c8d2a5440ccc5141ceddf3a4a9970156e68e837f0eede1a6ff2b90309e5b20d1080219586c7807caa976f95b103fa991eea78b49474646b967297
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+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.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip 81183 BLAKE2B 0e3222d715fe7e9e8e9a10abad817f75bdd095f9af250d6bdf1ee2881930c739111de8b526175c9204995c48e0ade9852541a7f22b0ce1261f473986a2739182 SHA512 d6f4ac547609c943adfc6b518ff03ac09da566ba2b29466abe8f6db3d5a41ae7e5c187068dce4e77271905b1aa88497ca49a43bb9bbf9c94011b7ccf1b4b2f42
+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-20200605160147-a5ece683394c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip 105245 BLAKE2B f0bcfd9d097905364d9c2b032b92a8aad64b63e0942eb864759b156eb97ac58769fbc035acf4ba57bd55db1b6596499ddc6d36e6d2e5cc584c2a465256ca3a73 SHA512 f9c0400f1f5590d7185ae3fdac7adf1787a5f5198e52ebd02841b7df5113c5e34de6a66fa01b2f5735be4b21190dffb46e9d8b084ad5c00ebd99599a39ff73db
+DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
+DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47b24b347ee4758fac8c11e3f627788c03d6568af129acb5b911b08857ab77a619bf571986ee90dd1c6c6aa12fd8e6e26d395a64bb7513a8b SHA512 66a13fedc358399644b869ac4b39a295c6c15d642e074ec66ff042e1b109f9603bc941ff25aaf7d9bc700f6c2fb1f60bf2a637a471e26ae037d822f0f1e2c518
+DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461c9a888afbdc1e214d9260b08324623e5828ce14b9dafdd42febc839e354f242e5ec53e78c9f61bd70338abc6de06090dd8197 SHA512 795de820e4a8622de316ee1b391a9c92476b3a67eee387278cd79f818c275df687ccacc60afbba20491dd813e442fa5a10d84b8b138f712c5a8705e884cb1d42
+DIST gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod 194 BLAKE2B aca56964199448b8220169f979c283dbf422308351fbffa9a858d0c0bf1f32bb7c3139a0738dc0409b4bcd3844a9596daeeeea8a0c79b9cdac7232dde6c47e1d SHA512 027bab5202a25d01ab9b9a87feaf66333ef376daa9c5c12d5bfeaf1624537a895e770c8e927a474589b23af2456d2a7f5a03708f80464cdb3351a64981a4a9dd
+DIST gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip 95019 BLAKE2B e78e242f9ea5824ffa2d8c1dda6df571eb6d27af59ac9bd5f09e09c398fe47098895000752c6b79571398a0ca7e163a58ba789b15f0451e98d79e273e1afb58b SHA512 7f3f556401d7ce27f1dc88e8a022f8885cddd488f4ece632e24cf9b9f6504d748519480dcf60a577a3a9451104340a917f353f43f89e05f868913c26357593d6
+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.3.zip 559809 BLAKE2B 55392e0d6cdb68f21348ef9c86b46797aedc94f8a47d7d7611be4fe489c1fca867ac184d1382480ce4a873cd5c435cf21825418bb3153420bd6f38157c332ae1 SHA512 64e810b40c1f64117074791cdab1dea4f282fb0a47df1cf82c6e26eae38bb893c9241119024d004b00dcb05d485bd5536f6ca90aee13200631c09da5c819c1c3
+DIST k8s.io%2Fapi%2F@v%2Fv0.20.1.mod 250 BLAKE2B e405b9fc54b7c3b375878adf1771869f8e5b64087d2fe9d3bfa9b3c6d30b6179c7ca193cfe29c5932f4ae85b31dd1db899100771fb3b3bb681ad6731eede4adf SHA512 89a8e511e48ef1df82e7f62cb9040c6ccc3bc2ce8a5e65af01195612546b05de24ab46294f88b9219a24863195e5c62c9cf8c32f205000d00e1e03da1486aa7c
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.20.1.mod 1477 BLAKE2B 9093190a164cf46f5342b17755d15608ea7e75253ba12916153c03e69b311a879810dd52b28763b3f75b9ebd31c26bc35504fdf15da30cc68d35c6d5ae063a86 SHA512 957f6ec445363e9e13c972c951c65b7932708bd460afb42b08191740bb1e0b1547aa4f6e3a34031962753497cd079e074ec8a462dd8ed0953e434df36a7128f0
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.20.1.mod 2341 BLAKE2B 6deb62d7ab353791a696e7ad13bbdacb2972918880592d1299e1255ef907b5aa6b69a3cdc9cc9a331dd004fee516d2fd51e0fd4ff939925b7a514dcc74162b52 SHA512 3d26c0e3346609998201db174c1661a52f8742209ad660f2f03e975235e6358a1e27f03e47a1bca3413d0e61dcb70d83bac88491949303cb226ba9fe8dc7062d
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.20.1.mod 1273 BLAKE2B bde3696d8cac6866996e59257bf27f2149e83caa46214f4b2504e037fd6bea229f8934f6501942c159ba77798e77d6e2c875cd172e1c339384b64dca34a4047c SHA512 1f044bb05f17979f521b3db67550f31a09ff670591d72d9e6db8417adbcd6a50a1af78699e78a06d94b99cde7248653050ba1af1dc9f9394aabedfc184d958e8
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.20.1.mod 1022 BLAKE2B bd4fec68f01133e508105eef2c629bfb56f083d7c348fbbd761b421bb572698ce0efce3d5a7a794abac9dc35216191e05717cda32036a419a7bdb2ead868fd49 SHA512 32c0ae219d6d8f2e5bd6935eb31db5ea9c9f4c12c840f7cf7f8a57e0657230cb9255bfd00f8c1e52fb4ef13bdbc5f1bd07402925019567507549960c3037599b
+DIST k8s.io%2Fcri-api%2F@v%2Fv0.17.3.mod 941 BLAKE2B 308754c84fcf1d8791cb4370e6d3862f6a6a8883cb0c8ddb45854db28b763214e189612245ac6060745a3513b17b757cbe0a36b45ea5df94761cd3af8824fc34 SHA512 608f947439cd7000bad07ce0c3c4155a8ed6cc8a61662e12487fba1c44627d43cda14bc0234eb3d5fd441e12a7be3ddd56345f3d7d8dce61f35e97b078975c14
+DIST k8s.io%2Fcri-api%2F@v%2Fv0.20.1.mod 803 BLAKE2B 981becb944601f06544d9e2100c82ad903393d9f7e25bdf5def56653278648b9d0f061eea4c94cb106d2835c50f4f1a2ab6a066bf3452071bbd08eb877fd4c06 SHA512 740016c54b0ee3aba85a2c8b61d1bd1f86359746de155139a5384d476b9fd7927eb6e2e4f35478085ef6d27cc7493c611ad1bb8a7a1234799b260f21a66aa2be
+DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
+DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod 71 BLAKE2B c6d2fc56898a5b4e11c13f2d102269674def5c651031128231aa23d016ac3e74c23c734c4637e574e7deea2173733ba6272f02fe05e3c39aa5d1de4713aa184e SHA512 29871958be33057ed4a8f81336085da0c633dcc4c00c4dcc134d1313b1220bd24124d5b2b7a47b26b56ba2e7daefcd33dbef7bbc0a344c72e6c2b039767f810a
+DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod 71 BLAKE2B 5379c4cfec1c33cee99fc39e4c30e0a83b523474b23c8fb332dcfe3e76463828c559e252a67f19c2b2421b36b5d3f85ab52915a5a959f02666f25bc97e6dbd0a SHA512 2addab12a7cc1ffa4b20d006278930f87efede3163ed08d93644668fd36b1878153e4e9bbc6562b09e2f6637024829199b90e827f94e0874c6fba40ef7d7ed8f
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod 1277 BLAKE2B 931fd6a123ccb62fee29d795690f778a4d39c8f84159bd85b80ff0d47f92d298985a6620eefece9c4c76d4e3ed795b4aaf8dfe6e53ceedebd68095a373fa2af9 SHA512 746bc18de0a8a3cfcd1707a3e6b01055a8e29dc2bebb6edb2a7abe8709c13199b288da6107ab3a85e35338a1b3c15eb73ac8f02243579aac0b9c4fe76c8f54fb
+DIST k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod 25 BLAKE2B 4060536d51fac9854215957b1108a158adb0b3aeb8bfc659eca1140efdcf79cffe378db6f3cb1f4a4b68aa36468b7d5631e993d5a089eb839bd03b6b608496be SHA512 2349b7dbe8409836cc70d97c5b336f518b809f5731baf05ce68d957c9970895a9b7f89caf09763794cf13824ee29410b3a6e431b2da7f64610895c44b86c4d2d
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod 167 BLAKE2B 2a61747d367153284e7e614a82f98c8913693f3b51174c24b7f25d8e9d236418c4da9e6b33c7cdb7b4350314373037e1e7121ad7c0ca5fbc9a3b4b711a078a98 SHA512 1117d2493d40a111a749b0033c92876773242b86da0b437ba063e5da21289102d784479b0c757ad8ce50de4b1d8a2f6956afe3b2656977bd76bfab9f97c1d8a9
+DIST mvdan.cc%2Finterfacer%2F@v%2Fv0.0.0-20180901003855-c20040233aed.mod 27 BLAKE2B 1fc5a95e4432c2d8c9c211155dc66a8bfc53f823f2129174bc7155b63f4c58607127dbd2d6bd793c91fde596a5c36a0acc527b13031dd29da156c04cc1efae32 SHA512 d58e0c14bafe02b1366d43f00d07951b4c11c3e4d8771d0f658367c107d7ed05266443e50a50e10d01ff57c9eb5bfd3bd95e56b2f56fc5cd704e48d9140d93e3
+DIST mvdan.cc%2Flint%2F@v%2Fv0.0.0-20170908181259-adc824a0674b.mod 21 BLAKE2B ed7272fd29049af9e593f73cde21d7f73b40817f1e7592a1a706ee58c251aebdd423e4b1ce25405eaacb9a3b9b101af042bf12615e0cd907c8b24e183795a0f4 SHA512 a9fafa4c84459dc2958a4587b99823476dccd1e245fde663c42c3fa8784c99df27a3d90e0f9f1125f0a3b82ca89dc28ae58cc0d90084ff9df16acde7981b15ea
+DIST mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190209190245-fbb59629db34.mod 132 BLAKE2B 0cfd958e837b6bbe113fd2272427856718bb241eff20fd6dc479e4a64303c9ab5323587bfdf5e731aa63da0f7af859e48f0348b5fcaf33d8cec272a84ae1a854 SHA512 cf385a4361bad78e100100fec51fd485600a90340028393ff9fc4b7fa7ed85c3cefee28c6a2789af8f0f4f92c8694e30c22d63fbceb9be1af1fbfe38072a0ba2
+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
+DIST sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.14.mod 175 BLAKE2B 62ceee8603e76513f82ac240141baa2752978c96b7f2d28dbd4ad5ea9136751af8baa7b0ecc539b22a5ec427446b091f2d33826ae7aff25dac6eb8635ccee4f5 SHA512 0d1d2566707d1ac2927404c5d08e75d4ae9818085c0a156ca81422a688575f913723be6ed07faabc3831fc467ae5e7a9f3d90a2609dbb93c47cc5b230f64ec4e
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod 346 BLAKE2B f7711e6d8685f0d5323a98161f831fbe6d411fba26a6b1ad91ea656faea33eb4ffd9a1b33539b585643006d468f804368ab277db997273da67fec3dc72042ed3 SHA512 ad7e33e7a6eea993c180fe2d26dfea41511ea39e1c28f03ef681dd45e17e2fc0917d673b2a8ca8c09afe5dd832d949873b98c10968e691396a28ccd7ba6bc839
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
+DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
 EBUILD distrobuilder-1.1.ebuild 759 BLAKE2B e6df503b7a2bce89b37da161b374880119722daac5af6afc09475a8c90475b073451e14eea2dc9182f49e16f45c78a99d93b768673e6157e58ab1bd98c9142bf SHA512 ef4b60e7406e759a71abad1f4f866669cdb87e1601b2380b835641915ab30f05ecbb7316ebeb894cd5437b659bb2385ea74ada60e5eda4098209593c4877ae0a
+EBUILD distrobuilder-1.2.ebuild 68625 BLAKE2B 0f8b66ffafc383cdc0465b7adc36e60fa335a7994b3d4245396b722e895c13813ee1d5a1411b5a0e22fce9cad9fac91c5f7efc8c220f08fa5a05b0da4cfa3a77 SHA512 fc34ab665973a6ffc6a76a6148298b74121bccd491461c839fa2cb8d98ca2320d26599c15f0b49314c3988ab16894d9f6dbda648158234bbbfd14629a6d32987
 MISC metadata.xml 503 BLAKE2B f42bbe0993502d3d1969100dd5086b7ac1ff52d6aedb65d6bbab72c4b63a2f66eb1c6c91d54ac65a02349dbb5040a5dd2c0a433dc5730cb9ec0af0d9bee9fec5 SHA512 e0f9ea85b0986a2a0c55c576cc96746f0e392544e1396c89c583316d4186ee885ec37c28a0e7959bae8ef36083f4f71a0dac1df782761501b94372b2b458de9a
diff --git a/app-emulation/distrobuilder/distrobuilder-1.2.ebuild b/app-emulation/distrobuilder/distrobuilder-1.2.ebuild
new file mode 100644
index 000000000000..25729aa303ed
--- /dev/null
+++ b/app-emulation/distrobuilder/distrobuilder-1.2.ebuild
@@ -0,0 +1,1240 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info
+
+DESCRIPTION="System container image builder for LXC and LXD"
+HOMEPAGE="https://linuxcontainers.org/distrobuilder/introduction/"
+
+EGO_SUM=(
+	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+	"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/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/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/firestore 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/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"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-autorest v10.8.1+incompatible/go.mod"
+	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/Microsoft/go-winio v0.4.11/go.mod"
+	"github.com/Microsoft/go-winio v0.4.14/go.mod"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
+	"github.com/Microsoft/go-winio v0.4.15-0.20200113171025-3fe6c5262873/go.mod"
+	"github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod"
+	"github.com/Microsoft/go-winio v0.4.16/go.mod"
+	"github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3"
+	"github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.6/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.7/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.9/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.14/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.15"
+	"github.com/Microsoft/hcsshim v0.8.15/go.mod"
+	"github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod"
+	"github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/OpenPeeDeeP/depguard v1.0.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+	"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod"
+	"github.com/antchfx/xpath v1.1.11"
+	"github.com/antchfx/xpath v1.1.11/go.mod"
+	"github.com/apex/log v1.1.1/go.mod"
+	"github.com/apex/log v1.9.0"
+	"github.com/apex/log v1.9.0/go.mod"
+	"github.com/apex/logs v1.0.0/go.mod"
+	"github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod"
+	"github.com/aphistic/sweet v0.2.0/go.mod"
+	"github.com/aphistic/sweet v0.3.0/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.11/go.mod"
+	"github.com/aws/aws-sdk-go v1.20.6/go.mod"
+	"github.com/aws/aws-sdk-go v1.23.21/go.mod"
+	"github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod"
+	"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bitly/go-simplejson v0.5.0/go.mod"
+	"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
+	"github.com/blang/semver v3.1.0+incompatible/go.mod"
+	"github.com/blang/semver v3.5.1+incompatible/go.mod"
+	"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod"
+	"github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod"
+	"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
+	"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
+	"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/checkpoint-restore/go-criu/v4 v4.1.0/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/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod"
+	"github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod"
+	"github.com/cilium/ebpf v0.2.0/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/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod"
+	"github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod"
+	"github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod"
+	"github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod"
+	"github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68"
+	"github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod"
+	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+	"github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod"
+	"github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod"
+	"github.com/containerd/console v1.0.1/go.mod"
+	"github.com/containerd/containerd v1.2.10/go.mod"
+	"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
+	"github.com/containerd/containerd v1.3.0/go.mod"
+	"github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod"
+	"github.com/containerd/containerd v1.3.2/go.mod"
+	"github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod"
+	"github.com/containerd/containerd v1.4.1/go.mod"
+	"github.com/containerd/containerd v1.4.3/go.mod"
+	"github.com/containerd/containerd v1.5.0-beta.1/go.mod"
+	"github.com/containerd/containerd v1.5.0-beta.3/go.mod"
+	"github.com/containerd/containerd v1.5.0-beta.4"
+	"github.com/containerd/containerd v1.5.0-beta.4/go.mod"
+	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+	"github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod"
+	"github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod"
+	"github.com/containerd/continuity v0.0.0-20200228182428-0f16d7a0959c/go.mod"
+	"github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod"
+	"github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod"
+	"github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod"
+	"github.com/containerd/continuity v0.0.0-20210315143101-93e15499afd5"
+	"github.com/containerd/continuity v0.0.0-20210315143101-93e15499afd5/go.mod"
+	"github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod"
+	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+	"github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod"
+	"github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod"
+	"github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod"
+	"github.com/containerd/go-cni v1.0.1/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod"
+	"github.com/containerd/imgcrypt v1.0.1/go.mod"
+	"github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod"
+	"github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod"
+	"github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod"
+	"github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod"
+	"github.com/containerd/ttrpc v1.0.1/go.mod"
+	"github.com/containerd/ttrpc v1.0.2/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod"
+	"github.com/containerd/typeurl v1.0.1/go.mod"
+	"github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod"
+	"github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod"
+	"github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod"
+	"github.com/containernetworking/cni v0.7.1/go.mod"
+	"github.com/containernetworking/cni v0.8.0/go.mod"
+	"github.com/containernetworking/plugins v0.8.6/go.mod"
+	"github.com/containers/ocicrypt v1.0.1/go.mod"
+	"github.com/containers/ocicrypt v1.1.0/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+	"github.com/coreos/go-iptables v0.4.5/go.mod"
+	"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.1.0/go.mod"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.7/go.mod"
+	"github.com/creack/pty v1.1.11"
+	"github.com/creack/pty v1.1.11/go.mod"
+	"github.com/cyphar/filepath-securejoin v0.2.2"
+	"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+	"github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod"
+	"github.com/d2g/dhcp4client v1.0.0/go.mod"
+	"github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod"
+	"github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
+	"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/docker/distribution v0.0.0-20171011171712-7484e51bf6af/go.mod"
+	"github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod"
+	"github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod"
+	"github.com/docker/distribution v2.7.1+incompatible"
+	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+	"github.com/docker/docker v1.4.2-0.20191101170500-ac7306503d23/go.mod"
+	"github.com/docker/docker v20.10.3-0.20210216175712-646072ed6524+incompatible/go.mod"
+	"github.com/docker/docker v20.10.5+incompatible"
+	"github.com/docker/docker v20.10.5+incompatible/go.mod"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-connections v0.4.0/go.mod"
+	"github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod"
+	"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod"
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod"
+	"github.com/docker/go-metrics v0.0.1/go.mod"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
+	"github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7"
+	"github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/emicklei/go-restful v2.9.5+incompatible/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/evanphx/json-patch v4.9.0+incompatible/go.mod"
+	"github.com/fatih/color v1.6.0/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3"
+	"github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3/go.mod"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/fsouza/go-dockerclient v1.6.4/go.mod"
+	"github.com/fsouza/go-dockerclient v1.7.2"
+	"github.com/fsouza/go-dockerclient v1.7.2/go.mod"
+	"github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod"
+	"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-critic/go-critic v0.3.5-0.20190526074819-1df300866540/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-ini/ini v1.25.4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-lintpack/lintpack v0.5.2/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-logr/logr v0.2.0/go.mod"
+	"github.com/go-ole/go-ole v1.2.1/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+	"github.com/go-openapi/spec v0.19.3/go.mod"
+	"github.com/go-openapi/swag v0.19.2/go.mod"
+	"github.com/go-openapi/swag v0.19.5/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-toolsmith/astcast v1.0.0/go.mod"
+	"github.com/go-toolsmith/astcopy v1.0.0/go.mod"
+	"github.com/go-toolsmith/astequal v0.0.0-20180903214952-dcb477bfacd6/go.mod"
+	"github.com/go-toolsmith/astequal v1.0.0/go.mod"
+	"github.com/go-toolsmith/astfmt v0.0.0-20180903215011-8f8ee99c3086/go.mod"
+	"github.com/go-toolsmith/astfmt v1.0.0/go.mod"
+	"github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod"
+	"github.com/go-toolsmith/astp v0.0.0-20180903215135-0af7e3c24f30/go.mod"
+	"github.com/go-toolsmith/astp v1.0.0/go.mod"
+	"github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod"
+	"github.com/go-toolsmith/pkgload v1.0.0/go.mod"
+	"github.com/go-toolsmith/strparse v1.0.0/go.mod"
+	"github.com/go-toolsmith/typep v1.0.0/go.mod"
+	"github.com/gobuffalo/logger v1.0.3"
+	"github.com/gobuffalo/logger v1.0.3/go.mod"
+	"github.com/gobuffalo/packd v1.0.0"
+	"github.com/gobuffalo/packd v1.0.0/go.mod"
+	"github.com/gobuffalo/packr/v2 v2.8.1"
+	"github.com/gobuffalo/packr/v2 v2.8.1/go.mod"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod"
+	"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+	"github.com/gogo/googleapis v1.2.0/go.mod"
+	"github.com/gogo/googleapis v1.4.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+	"github.com/gogo/protobuf v1.3.0/go.mod"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/gogo/protobuf v1.3.2"
+	"github.com/gogo/protobuf v1.3.2/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/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.0.0/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/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/go.mod"
+	"github.com/golang/protobuf v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.5.1"
+	"github.com/golang/protobuf v1.5.1/go.mod"
+	"github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod"
+	"github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod"
+	"github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod"
+	"github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod"
+	"github.com/golangci/go-tools v0.0.0-20190318055746-e32c54105b7c/go.mod"
+	"github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3/go.mod"
+	"github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee/go.mod"
+	"github.com/golangci/gofmt v0.0.0-20181222123516-0b8337e80d98/go.mod"
+	"github.com/golangci/golangci-lint v1.17.2-0.20190909185456-6163a8a79084/go.mod"
+	"github.com/golangci/gosec v0.0.0-20190211064107-66fb7fc33547/go.mod"
+	"github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod"
+	"github.com/golangci/lint-1 v0.0.0-20190420132249-ee948d087217/go.mod"
+	"github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod"
+	"github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod"
+	"github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod"
+	"github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod"
+	"github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/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.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.3/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.1.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-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/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/google/uuid v1.2.0"
+	"github.com/google/uuid v1.2.0/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/googleapis/gnostic v0.4.1/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
+	"github.com/gorilla/mux v1.7.2/go.mod"
+	"github.com/gorilla/mux v1.7.3/go.mod"
+	"github.com/gorilla/mux v1.7.4/go.mod"
+	"github.com/gorilla/mux v1.8.0"
+	"github.com/gorilla/mux v1.8.0/go.mod"
+	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gorilla/websocket v1.4.2"
+	"github.com/gorilla/websocket v1.4.2/go.mod"
+	"github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/hashicorp/consul/api v1.1.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/heroku/docker-registry-client v0.0.0-20181004091502-47ecf50fd8d4/go.mod"
+	"github.com/heroku/docker-registry-client v0.0.0-20190909225348-afc9e1acc3d5"
+	"github.com/heroku/docker-registry-client v0.0.0-20190909225348-afc9e1acc3d5/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.8/go.mod"
+	"github.com/imdario/mergo v0.3.10/go.mod"
+	"github.com/imdario/mergo v0.3.11/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.10/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/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/karrick/godirwalk v1.15.8/go.mod"
+	"github.com/karrick/godirwalk v1.16.1"
+	"github.com/karrick/godirwalk v1.16.1/go.mod"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.5.0/go.mod"
+	"github.com/kisielk/gotool v0.0.0-20161130080628-0de1eaf82fa3/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.4.0/go.mod"
+	"github.com/klauspost/compress v1.4.1/go.mod"
+	"github.com/klauspost/compress v1.8.3/go.mod"
+	"github.com/klauspost/compress v1.11.3/go.mod"
+	"github.com/klauspost/compress v1.11.12"
+	"github.com/klauspost/compress v1.11.12/go.mod"
+	"github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod"
+	"github.com/klauspost/cpuid v1.2.0/go.mod"
+	"github.com/klauspost/cpuid v1.2.1/go.mod"
+	"github.com/klauspost/pgzip v1.2.1/go.mod"
+	"github.com/klauspost/pgzip v1.2.5"
+	"github.com/klauspost/pgzip v1.2.5/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.5/go.mod"
+	"github.com/kr/pty v1.1.8/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod"
+	"github.com/lxc/lxd v0.0.0-20210322210645-afff9e5620d6"
+	"github.com/lxc/lxd v0.0.0-20210322210645-afff9e5620d6/go.mod"
+	"github.com/magiconair/properties v1.7.6/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/magiconair/properties v1.8.1/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+	"github.com/mailru/easyjson v0.7.0/go.mod"
+	"github.com/markbates/errx v1.1.0"
+	"github.com/markbates/errx v1.1.0/go.mod"
+	"github.com/markbates/oncer v1.0.0"
+	"github.com/markbates/oncer v1.0.0/go.mod"
+	"github.com/markbates/safe v1.0.1"
+	"github.com/markbates/safe v1.0.1/go.mod"
+	"github.com/marstr/guid v1.1.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.1/go.mod"
+	"github.com/mattn/go-colorable v0.1.2/go.mod"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.5/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-shellwords v1.0.3/go.mod"
+	"github.com/mattn/goveralls v0.0.2/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/miekg/pkcs11 v1.0.3/go.mod"
+	"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
+	"github.com/moby/sys/mount v0.2.0"
+	"github.com/moby/sys/mount v0.2.0/go.mod"
+	"github.com/moby/sys/mountinfo v0.4.0/go.mod"
+	"github.com/moby/sys/mountinfo v0.4.1"
+	"github.com/moby/sys/mountinfo v0.4.1/go.mod"
+	"github.com/moby/sys/symlink v0.1.0/go.mod"
+	"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod"
+	"github.com/moby/term v0.0.0-20201216013528-df9cb8a40635"
+	"github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826"
+	"github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod"
+	"github.com/morikuni/aec v1.0.0"
+	"github.com/morikuni/aec v1.0.0/go.mod"
+	"github.com/mozilla/tls-observatory v0.0.0-20180409132520-8791a200eb40/go.mod"
+	"github.com/mrunalp/fileutils v0.5.0/go.mod"
+	"github.com/mudler/docker-companion v0.4.6-0.20201209184016-2d26fc9143d4"
+	"github.com/mudler/docker-companion v0.4.6-0.20201209184016-2d26fc9143d4/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20160627004424-a22cb81b2ecd/go.mod"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20171102151520-eafdab6b0663/go.mod"
+	"github.com/ncw/swift v1.0.47/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.10.3/go.mod"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.4.2/go.mod"
+	"github.com/onsi/gomega v1.5.0/go.mod"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/onsi/gomega v1.7.1/go.mod"
+	"github.com/openSUSE/umoci v0.1.1-0.20191030112807-c0dd46ae078f/go.mod"
+	"github.com/openSUSE/umoci v0.4.5"
+	"github.com/openSUSE/umoci v0.4.5/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0"
+	"github.com/opencontainers/go-digest v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+	"github.com/opencontainers/runc v0.1.1/go.mod"
+	"github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod"
+	"github.com/opencontainers/runc v1.0.0-rc9/go.mod"
+	"github.com/opencontainers/runc v1.0.0-rc93"
+	"github.com/opencontainers/runc v1.0.0-rc93/go.mod"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+	"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod"
+	"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
+	"github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d"
+	"github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod"
+	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+	"github.com/opencontainers/selinux v1.6.0/go.mod"
+	"github.com/opencontainers/selinux v1.8.0/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pborman/uuid v1.2.1"
+	"github.com/pborman/uuid v1.2.1/go.mod"
+	"github.com/pelletier/go-toml v1.1.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
+	"github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.1.0/go.mod"
+	"github.com/prometheus/client_golang v1.7.1/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.6.0/go.mod"
+	"github.com/prometheus/common v0.10.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.3/go.mod"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
+	"github.com/prometheus/procfs v0.1.3/go.mod"
+	"github.com/prometheus/procfs v0.2.0/go.mod"
+	"github.com/prometheus/procfs v0.6.0/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/fastuuid v1.1.0/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.1.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.5.2"
+	"github.com/rogpeppe/go-internal v1.5.2/go.mod"
+	"github.com/rootless-containers/proto v0.1.0"
+	"github.com/rootless-containers/proto v0.1.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/russross/blackfriday/v2 v2.1.0"
+	"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735/go.mod"
+	"github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/seccomp/libseccomp-golang v0.9.1/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7/go.mod"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
+	"github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod"
+	"github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+	"github.com/sirupsen/logrus v1.0.5/go.mod"
+	"github.com/sirupsen/logrus v1.0.6/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.3.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sirupsen/logrus v1.6.0/go.mod"
+	"github.com/sirupsen/logrus v1.7.0/go.mod"
+	"github.com/sirupsen/logrus v1.8.1"
+	"github.com/sirupsen/logrus v1.8.1/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/assertions v1.0.0/go.mod"
+	"github.com/smartystreets/assertions v1.0.1/go.mod"
+	"github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/smartystreets/gunit v1.0.0/go.mod"
+	"github.com/smartystreets/gunit v1.0.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/sourcegraph/go-diff v0.5.1/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.0/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cast v1.2.0/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+	"github.com/spf13/cobra v0.0.2/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/cobra v0.0.6/go.mod"
+	"github.com/spf13/cobra v1.0.0/go.mod"
+	"github.com/spf13/cobra v1.1.3"
+	"github.com/spf13/cobra v1.1.3/go.mod"
+	"github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.1.0"
+	"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.0.2/go.mod"
+	"github.com/spf13/viper v1.4.0/go.mod"
+	"github.com/spf13/viper v1.7.0/go.mod"
+	"github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod"
+	"github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod"
+	"github.com/tchap/go-patricia v2.2.6+incompatible/go.mod"
+	"github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec/go.mod"
+	"github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod"
+	"github.com/tj/assert v0.0.3"
+	"github.com/tj/assert v0.0.3/go.mod"
+	"github.com/tj/go-buffer v1.1.0/go.mod"
+	"github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod"
+	"github.com/tj/go-kinesis v0.0.0-20171128231115-08b17f58cb1b/go.mod"
+	"github.com/tj/go-spin v1.1.0/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ultraware/funlen v0.0.1/go.mod"
+	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/urfave/cli v1.22.1/go.mod"
+	"github.com/urfave/cli v1.22.2/go.mod"
+	"github.com/urfave/cli v1.22.5"
+	"github.com/urfave/cli v1.22.5/go.mod"
+	"github.com/valyala/bytebufferpool v1.0.0/go.mod"
+	"github.com/valyala/fasthttp v1.2.0/go.mod"
+	"github.com/valyala/quicktemplate v1.1.1/go.mod"
+	"github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod"
+	"github.com/vbatts/go-mtree v0.4.4/go.mod"
+	"github.com/vbatts/go-mtree v0.5.0"
+	"github.com/vbatts/go-mtree v0.5.0/go.mod"
+	"github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod"
+	"github.com/vishvananda/netlink v1.1.0/go.mod"
+	"github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod"
+	"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod"
+	"github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod"
+	"github.com/willf/bitset v1.1.11/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
+	"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
+	"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/bbolt v1.3.5/go.mod"
+	"go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod"
+	"go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/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.23.0"
+	"go.opencensus.io v0.23.0/go.mod"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/atomic v1.6.0/go.mod"
+	"go.uber.org/atomic v1.7.0"
+	"go.uber.org/atomic v1.7.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/multierr v1.5.0/go.mod"
+	"go.uber.org/multierr v1.6.0"
+	"go.uber.org/multierr v1.6.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"go.uber.org/zap v1.16.0"
+	"go.uber.org/zap v1.16.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/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-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod"
+	"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/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/lint v0.0.0-20201208152925-83fdc39ff7b5"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/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"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/net v0.0.0-20170915142106-8351a756f30f/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod"
+	"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/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-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4"
+	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/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/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-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+	"golang.org/x/sys v0.0.0-20171026204733-164713f0dfce/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-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-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
+	"golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod"
+	"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/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-20190801041406-cbf593c0f2f3/go.mod"
+	"golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod"
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190913121621-c3b328c6e5a7/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod"
+	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+	"golang.org/x/sys v0.0.0-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-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod"
+	"golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod"
+	"golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod"
+	"golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod"
+	"golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod"
+	"golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+	"golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod"
+	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+	"golang.org/x/sys v0.0.0-20210216224549-f992740a1bac/go.mod"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+	"golang.org/x/term v0.0.0-20201113234701-d7a72108b828/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20210317153231-de623e64d2a6"
+	"golang.org/x/term v0.0.0-20210317153231-de623e64d2a6/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.0.0-20170915090833-1cbadb444a80/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/go.mod"
+	"golang.org/x/text v0.3.5"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+	"golang.org/x/tools v0.0.0-20170915040203-e531a2a1c15f/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod"
+	"golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190121143147-24cd39ecf745/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-20190311215038-5c2858a9cfe5/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-20190322203728-c1a832b0ad89/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/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-20190521203540-521d6ed310dd/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-20190614205625-5aca471b1d59/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/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-20190913181337-0240832f5c3d/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
+	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+	"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/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-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200308013534-11ec41452d41/go.mod"
+	"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+	"golang.org/x/tools v0.0.0-20210106214847-113979e3529a"
+	"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/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.20.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/cloud v0.0.0-20151119220103-975617b05ea8/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-20190522204451-c2c4e71fbf69/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-20200117163144-32f20d992d24/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-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod"
+	"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.23.1/go.mod"
+	"google.golang.org/grpc v1.24.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.30.0/go.mod"
+	"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/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"google.golang.org/protobuf v1.26.0"
+	"google.golang.org/protobuf v1.26.0/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/antchfx/htmlquery.v1 v1.2.2"
+	"gopkg.in/antchfx/htmlquery.v1 v1.2.2/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b"
+	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/flosch/pongo2.v3 v3.0.0-20141028000813-5e81b817a0c4"
+	"gopkg.in/flosch/pongo2.v3 v3.0.0-20141028000813-5e81b817a0c4/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/ini.v1 v1.51.0/go.mod"
+	"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5"
+	"gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.5/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	"gotest.tools v2.2.0+incompatible"
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"gotest.tools/v3 v3.0.2/go.mod"
+	"gotest.tools/v3 v3.0.3"
+	"gotest.tools/v3 v3.0.3/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"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"k8s.io/api v0.20.1/go.mod"
+	"k8s.io/apimachinery v0.20.1/go.mod"
+	"k8s.io/apiserver v0.20.1/go.mod"
+	"k8s.io/client-go v0.20.1/go.mod"
+	"k8s.io/component-base v0.20.1/go.mod"
+	"k8s.io/cri-api v0.17.3/go.mod"
+	"k8s.io/cri-api v0.20.1/go.mod"
+	"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
+	"k8s.io/klog/v2 v2.0.0/go.mod"
+	"k8s.io/klog/v2 v2.4.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod"
+	"k8s.io/kubernetes v1.13.0/go.mod"
+	"k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod"
+	"mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod"
+	"mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod"
+	"mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34/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"
+	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.2.0/go.mod"
+	"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/lxc/distrobuilder/archive/${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-util/debootstrap
+	app-crypt/gnupg
+	sys-fs/squashfs-tools
+	dev-vcs/git
+	net-misc/rsync
+	"
+
+CONFIG_CHECK="~OVERLAY_FS"
+RESTRICT=" test"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_compile() {
+	GOBIN="${S}/bin" go install ./... || die "compile failed"
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r doc/*
+}
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index 043e8591b637..890bdacefe8b 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -10,4 +10,4 @@ AUX dosemu-1.4.1_pre20130107-no-glibc.patch 559 BLAKE2B 93ba50a5acda4b0b556e5393
 DIST dosemu-1.4.1_pre20130107.zip 2767256 BLAKE2B 068c38108257b83d046682d4e9bda6f2da84195cff3aa5eb73764e88ba48bd415a6af9fa1b57059dee12ddd75b379df730fe6957014b554cc13b12ac029eed8d SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864
 DIST dosemu-freedos-1.0-bin.tgz 1205628 BLAKE2B e88a23b14cf1ccccb4f648b3c3af39330d8af29940e228b951cc7e48595f9838236066b67f841328e75ee7aee18f9e7814ea33382bb48902ca7947806b646852 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd
 EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 3107 BLAKE2B 66c5a51c0e8b994c173e6e93f082a2fc008242a53d585f3aafcce3812b526904762d1f38f980c59ce9fa8cc2a1df069413b494ac1b797b44acd65ca628c825c4 SHA512 becb59939f23bdc9b82e6334562612fe0a9442b7d5e53cd4d7d0ecb0ba89d7658d9178d6fb2654e4aa57e44b2949fc5cf827430453749fe41cbe633a1fbd20fd
-MISC metadata.xml 432 BLAKE2B 06cd4821f41961fdcf266bb1175ee118cd181d17c3b38508e2a30dbbfab9e5cb02608e2b8e5af905abc24718d410a24d112c073fd6ee460b33d904c975358a61 SHA512 da0538836dc326d714141ab6c7b9f00bc1604fa5b51df7d9d548a8e3d889072b3ee8890a25705e2a7c2c1c31645c0b9af85ce6a2d1e4aa142a4d83a08fd6f9d8
+MISC metadata.xml 348 BLAKE2B dcf51a639aabe83667825d11c026753aa268d98189d2004c5c3cc3649641334e4364a23e8715eb51af46a3ea7c34044daa4bb35a9deed2b1f8fa78fb8d2e509c SHA512 30be67d2c6013a4e090a25f2df4fd9447a93f387a2db388abf3cd0cccbf624f271d39aed977fbc39ff108cde24813f57fca13d2126aae0289c146cf25ec49cdb
diff --git a/app-emulation/dosemu/metadata.xml b/app-emulation/dosemu/metadata.xml
index 02fe93487b16..5a23870c6f2d 100644
--- a/app-emulation/dosemu/metadata.xml
+++ b/app-emulation/dosemu/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="fluidsynth">use <pkg>media-sound/fluidsynth</pkg> for MIDI emulation</flag>
 	</use>
diff --git a/app-emulation/flannel/Manifest b/app-emulation/flannel/Manifest
index 262c0c6e9ab6..159eae16846b 100644
--- a/app-emulation/flannel/Manifest
+++ b/app-emulation/flannel/Manifest
@@ -5,5 +5,5 @@ AUX flanneld.initd 518 BLAKE2B 36859121c77fcd7b53f679eff455ad1ba1f9c6c58fc6a015e
 AUX flanneld.logrotated 77 BLAKE2B 778f7289a6268cf6b150b1c58895514808c304b56baca56b1df3297df4ff0a4c9ec6e70a3ddbf16c55c0bd5be146bcfa20f7b4ac8ceb08fa9af223164c19a905 SHA512 d84258a164adcec0f1cef7fcafcf0cadb3bf3959b393b905c4897274adeff476279ce96ec42e9aa9d574c6bd7d37649d92c7c52563975f85d303cade990a3942
 AUX flanneld.service 476 BLAKE2B ea838e26be0834943bafb985a37e71b45219bffbd68784b8442c065d9bafc8c9cb2b097c8a00629c19faf4b7bb1fb4ae33071e51d4bf6ffdd62cf5898de1f3cf SHA512 4a7d09f25f117b1cda9b02914a394c0d6d6ddd6c02503f61c0646ede1934cb4cad831992058c5738401b1ac7be6e4c7cd83b1c4a70c04084bb4bb01338c08220
 DIST flannel-0.11.0.tar.gz 6443391 BLAKE2B 5358e513a73fec6d8fcdb0182ec814fcf204eb12830f7d60acb3d4432f821ccc9e174fcc7adb57584ab1782c3f285e46b51bb0f76635fab9cf851cb2bd40c1b3 SHA512 72d18cd4ec58ede3848da3b94b7f3e33f8dda59d9fceb13864757998a24f0b312bc5b5d7927d3da8a805475efee469095ac09390fa632eb0c6ef9dd0f5d38a3b
-EBUILD flannel-0.11.0.ebuild 1426 BLAKE2B 72e3d0d151d883a75228546e2e0d8d7ec2ee2a743678413a8ce43b8e6e2baa1f327283a879ff1d524801bf562b31e5a84a4f0845bca94ca588187c91cd1d8a7d SHA512 5c0f1916eef8df70f6f0871d114c084ca195aed4ca173ba1cece7b7ee94947b162d4f3307762b53c9afd20349a32fb0661e3a9683afebe2f40695a0a14b9bdbd
+EBUILD flannel-0.11.0.ebuild 1477 BLAKE2B 2cd6c0d2dfb46de7bdd8eb0f091bec5e170e6a6fe5db34f10c085cbecb4ab5e50da6bc40e3873c0c4c14fb0c5bd4acecf12a6b16a6bb8c033179038c5d688c10 SHA512 82f2f231da38cfda355979f0ecf47ae652ab57d96fa030a07802bac41bbfc9761137a9ce2ab065c09c31c466b3cbf625d78ed1a89be322d4bf7987e6d5e0a46c
 MISC metadata.xml 305 BLAKE2B d34792ab0473ba56a75b4e9dc559b4a12b2eed48313cfecac65ce7b13a9df59a651721fbdd72a744314181f4002b52510c9200b85c1fac6fa03d3d78573db842 SHA512 ff219bf7233d4659475fd4e25366d5eef5d3575cd1250d6c9bbddc7351515418ca17730a8df61d102c71b515813b20bb182b355448db16b5fb43a9a46401bd04
diff --git a/app-emulation/flannel/flannel-0.11.0.ebuild b/app-emulation/flannel/flannel-0.11.0.ebuild
index 2ba1cf0dfa67..9ddf9cc7bedf 100644
--- a/app-emulation/flannel/flannel-0.11.0.ebuild
+++ b/app-emulation/flannel/flannel-0.11.0.ebuild
@@ -49,3 +49,7 @@ src_install() {
 	systemd_dounit "${FILESDIR}/flanneld.service"
 	dodoc README.md
 }
+
+pkg_postinst() {
+	tmpfiles_process flannel.conf
+}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 5b1948f5e559..7eca2af676f9 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -24,11 +24,11 @@ DIST libvirt-7.4.0.tar.xz 8617788 BLAKE2B 06271895ac39865df632b6ad669eb20d1f1bb7
 DIST libvirt-7.4.0.tar.xz.asc 833 BLAKE2B c9d63bb9cdd604663754ccd927a5a1305131617b1d4edb51d289878ff67b7168e882ec1bf0f16aaea509aa32b8419a3c6420615051bd8f42216ce9d1aeae601b SHA512 9a887cf73fb494e55617a69863a0877fba56d180fecbec892a7990f76bc6e1fe15871b4e688e88289eb7acf3ab4a70c1d6202b224cf3c9a96ecb1ecfb2279b2c
 DIST libvirt-7.5.0.tar.xz 8642788 BLAKE2B 467dbd2a337beee5d9f10de7bc37ca988e85fad17fb75e6ab73c13cf79eceab27c9ff51bbe2ac9f6c121feed4c67860fa263e601e10f6b1dd7b8a647b53228a7 SHA512 cf89800c8970b8b1373ee32cc49ea88b87e76b50fd134df5da354be83e0ef490e514f16425c1c16eb3989fbadd3ba7d9976972fbbae6cb40db3d2ae94863219d
 DIST libvirt-7.5.0.tar.xz.asc 833 BLAKE2B ab9ba2a02e4af90002fffbcd0bc04f9faa1d5a23ab815d6b9b6ef1410d9d114fc07c1b29850b59d1ab4ea3a186f4b7d65f5a5ca37d65f3034146617445849dcb SHA512 ebcc1fcce10e19e0a4ae43fbf9bfd5b1b7732829eeb3543c84ba24e0a5d9872be692e7b6c105cdcd730d1c26b895b306387ab380623acf6bba242bd2c62ec7b2
-EBUILD libvirt-7.0.0-r3.ebuild 8786 BLAKE2B 6238ffc390bcaa58d3f22096c3fa774f1d584e888d5803f219a3fde22337119a8b66a72266405ec1c902fb083324da66492083ce8813d6089b913d97bc413153 SHA512 362878616424eb2416e3ce53d379864198bfddf47ef552c4451350a1eb1c52274ea8d158609a387d4d452d82097ef85d908962ebcfe5c29d31363ae3e77232d4
-EBUILD libvirt-7.1.0-r1.ebuild 8479 BLAKE2B 2b16121f4b0930eae86e7866ca7ad5859cc5009cca4d3b2d3e08566a40dbe94f54e324435fdaa8ac8c6b8eff269fc02421c503b52ffd7e5ab31577bc40b03873 SHA512 75a840582349c8c9373e6f15645818a0f5ba6c8aa4510ab62a16499c9dc7d06f23d1caf488ada35d6d51b24fb62cb96d9c362c0cef592b75adaee8516739c4c9
-EBUILD libvirt-7.2.0-r1.ebuild 8285 BLAKE2B 7d5c0c746e44714177a6192250992e190d57deb8ee342e7fe5f457b2bb6a905bff860544f7fd6267624d46b95b0e75caf905dc6c29ea273f8c72cb5edbaadd45 SHA512 a578a69498e3bbe5b5d9df0509c9cfc6294d49f351bdf4ab20df8392152d655777897c8d15e58c2ff344251c444b981f3f7e58c49b09d952816733dd73f0ab9d
-EBUILD libvirt-7.3.0.ebuild 8181 BLAKE2B 567f3971d685fb3a6a782b900e71bd176ccd4f14b4f62b3d713b3c17c5a1afcc9edd853b6d97cb4b5fa940ef9f1cd266b709c4b08ee87a9faf28f6548397c8ad SHA512 40d1484626c17acee923456ae6295a90a113b8d6810a4ca0c7a90e54fc87df3078190e4315b41f3f1a82af0acfe4c0222f5fd718215aabe22cf18b16b170ae1d
-EBUILD libvirt-7.4.0.ebuild 8205 BLAKE2B 3174d1cff6880724f68be9950b834931409a2f47860ecdc33bdf71d6eb1f5ab73112d37566b2b16e3d5321047998dd17a858e3901b1c4550855057631dc408c9 SHA512 582e804a9599f15666a1633709ddacece08238214f8a18c1372efa0ce3b67f5bbb3a492a5e334cbd2009a562c9d402d0afff5a366e981404fd95bc4a3f6c9dae
-EBUILD libvirt-7.5.0.ebuild 8209 BLAKE2B 110567e3a8c637fae3d590e9c10b4de7ae5f0e0c3742fb812fea64df9e5401a66c34cd3a312dfa2eb05636950cd54021c402b40ee643ed47920d9dcd01539ba1 SHA512 1e88f9c6779d494bcf33ee2ccf245fb1c2d45fb53e421d88c13edaef9fff69f1b5f20c8622d08af241ca717291c42a36f5eb2f70822f69bd68b40ba492a008a3
-EBUILD libvirt-9999.ebuild 8209 BLAKE2B 110567e3a8c637fae3d590e9c10b4de7ae5f0e0c3742fb812fea64df9e5401a66c34cd3a312dfa2eb05636950cd54021c402b40ee643ed47920d9dcd01539ba1 SHA512 1e88f9c6779d494bcf33ee2ccf245fb1c2d45fb53e421d88c13edaef9fff69f1b5f20c8622d08af241ca717291c42a36f5eb2f70822f69bd68b40ba492a008a3
+EBUILD libvirt-7.0.0-r3.ebuild 8827 BLAKE2B eed8aa4baf06ba16aaed2cf6fab85b003627a32c7279ebf2011a6c42da9f802e0d9db0fb19c0f38c49390574371f0b07ca10efbd4fc57f00ce56c24af4db64f0 SHA512 06fcd3e2a54acb7fc4963ad62cb82f8d30e671755cb1a3b4826161f7a528b60fb1472d0b96c0f8025619398842ac2e108d40cd9aef7ed8d0b7c3bb6052f8d489
+EBUILD libvirt-7.1.0-r1.ebuild 8518 BLAKE2B 25d37b8130237c1ce2f5c00f577196f361ffc23a33b1deccf13aea69320295eb08dac16bd4cfcddfa1274916a353a90befd7208dadeb3738ea305a3e4bba2d84 SHA512 701762b4a87afa9b4cf0eb9c2efc23d8fc3bce9cea11a1e9af2c9492b68a7ebb2f8feeb9ccf4229c1e8f77e4fa0e70a10e47ca17dfe906f25e9d50b06598bb4b
+EBUILD libvirt-7.2.0-r1.ebuild 8324 BLAKE2B d784f644bc4b404c2e53619d5edbef7c23dc9f05d48c1d487f7848c31d65f98a80b8a42f6c79f014c84b0206ea931fbd5473234ada7ea8c53978f94e7daba611 SHA512 dfd57fee30b103081ab144ba2aa97b491c4f9c708f31f7cfc1c1590a269d4767299f29537b11701e45b6ffb75380405969f11c1fa6cf1ece45e71631a8564341
+EBUILD libvirt-7.3.0.ebuild 8220 BLAKE2B 623174f24371ffa181aa18a70cd1f32a6ea3f7b7280608ba023b8f6d5dc0d40654abeb4f10407e74e83989a10b4442d0778d733f4885e795dd173caa86b062c0 SHA512 3aaa8e7979b4bf2382c7d76b5ed3d5e6f555e8884c04deaa53cad523482f0203f33ff202239695c09aae144480e3a896d43e7655325e1ea578681f869dd443b2
+EBUILD libvirt-7.4.0.ebuild 8244 BLAKE2B 7a47ef108058c902eebb346d9790ba4df0bb28b8a8496a96d1524f0729dd2505ebc2190cf0c0d59284713d5d6df90621c164e20c11d5e9d0dd78a3dc79e811b4 SHA512 9f9038cf92992f1af707dff71b666a3031a13bcbecd5c6f0dff5094fac33dd1685498873ad6f1e7df6548cccb2f79845ef985eff49b040b624cbe05e38c62a00
+EBUILD libvirt-7.5.0.ebuild 8248 BLAKE2B 94be85984caddd918f6ca087a529135968fae60029b0a2072927c23c90f6c3b7d0be50607a4a50ac7238bf26512d722b90ed118365199806d2ddc4bb921d8336 SHA512 0ca222fd6b8e7125d76859c4ce147455aee2ced256f6609912b57b0e9b899bedfcabf591101554a8982abb335d8b0e214283b5227937c87a10c944d26207b4db
+EBUILD libvirt-9999.ebuild 8248 BLAKE2B 94be85984caddd918f6ca087a529135968fae60029b0a2072927c23c90f6c3b7d0be50607a4a50ac7238bf26512d722b90ed118365199806d2ddc4bb921d8336 SHA512 0ca222fd6b8e7125d76859c4ce147455aee2ced256f6609912b57b0e9b899bedfcabf591101554a8982abb335d8b0e214283b5227937c87a10c944d26207b4db
 MISC metadata.xml 3326 BLAKE2B 70997d3eee5387a0735faad11a891927ad7c96b5fed632c3774611a7c35159eacfd6b0e9561c09dd08d64112c6bd66ff011fd58ed23520bc4f4f531c0d5f4693 SHA512 651bf4d8eec1af7b08c8b1050f2a4d57fa8e205205c59f231d3f84be643a71633b1426e9df1c83c838636245503bfefeef66696ddb9dc9e8da6b1aadee741856
diff --git a/app-emulation/libvirt/libvirt-7.0.0-r3.ebuild b/app-emulation/libvirt/libvirt-7.0.0-r3.ebuild
index c5547bdafed1..41c0cbe34cfb 100644
--- a/app-emulation/libvirt/libvirt-7.0.0-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-7.0.0-r3.ebuild
@@ -22,7 +22,7 @@ fi
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="https://www.libvirt.org/"
 LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="
 	apparmor audit +caps dtrace firewalld fuse glusterfs iscsi
 	iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
@@ -342,5 +342,7 @@ pkg_postinst() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 
+	tmpfiles_process libvirtd.conf
+
 	readme.gentoo_print_elog
 }
diff --git a/app-emulation/libvirt/libvirt-7.1.0-r1.ebuild b/app-emulation/libvirt/libvirt-7.1.0-r1.ebuild
index 985e610ef46e..276586548146 100644
--- a/app-emulation/libvirt/libvirt-7.1.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-7.1.0-r1.ebuild
@@ -22,7 +22,7 @@ fi
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
 LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="
 	apparmor audit +caps dtrace firewalld fuse glusterfs iscsi
 	iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
@@ -330,6 +330,6 @@ pkg_postinst() {
 
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
-
+	tmpfiles_process libvirtd.conf
 	readme.gentoo_print_elog
 }
diff --git a/app-emulation/libvirt/libvirt-7.2.0-r1.ebuild b/app-emulation/libvirt/libvirt-7.2.0-r1.ebuild
index 408b30efa060..90673e1f4840 100644
--- a/app-emulation/libvirt/libvirt-7.2.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-7.2.0-r1.ebuild
@@ -22,7 +22,7 @@ fi
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
 LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="
 	apparmor audit +caps dtrace firewalld fuse glusterfs iscsi
 	iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
@@ -324,6 +324,6 @@ pkg_postinst() {
 
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
-
+	tmpfiles_process libvirtd.conf
 	readme.gentoo_print_elog
 }
diff --git a/app-emulation/libvirt/libvirt-7.3.0.ebuild b/app-emulation/libvirt/libvirt-7.3.0.ebuild
index a07c38034e3b..36e4bd27d748 100644
--- a/app-emulation/libvirt/libvirt-7.3.0.ebuild
+++ b/app-emulation/libvirt/libvirt-7.3.0.ebuild
@@ -22,7 +22,7 @@ fi
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
 LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="
 	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
 	iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
@@ -321,6 +321,6 @@ pkg_postinst() {
 
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
-
+	tmpfiles_process libvirtd.conf
 	readme.gentoo_print_elog
 }
diff --git a/app-emulation/libvirt/libvirt-7.4.0.ebuild b/app-emulation/libvirt/libvirt-7.4.0.ebuild
index d41bb6fce53a..f863f02c1496 100644
--- a/app-emulation/libvirt/libvirt-7.4.0.ebuild
+++ b/app-emulation/libvirt/libvirt-7.4.0.ebuild
@@ -23,7 +23,7 @@ fi
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
 LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="
 	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
 	iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
@@ -322,6 +322,6 @@ pkg_postinst() {
 
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
-
+	tmpfiles_process libvirtd.conf
 	readme.gentoo_print_elog
 }
diff --git a/app-emulation/libvirt/libvirt-7.5.0.ebuild b/app-emulation/libvirt/libvirt-7.5.0.ebuild
index 2abe4227b78a..34cffee86294 100644
--- a/app-emulation/libvirt/libvirt-7.5.0.ebuild
+++ b/app-emulation/libvirt/libvirt-7.5.0.ebuild
@@ -23,7 +23,7 @@ fi
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
 LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="
 	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
 	iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
@@ -322,6 +322,6 @@ pkg_postinst() {
 
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
-
+	tmpfiles_process libvirtd.conf
 	readme.gentoo_print_elog
 }
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 2abe4227b78a..34cffee86294 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -23,7 +23,7 @@ fi
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
 LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="
 	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
 	iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
@@ -322,6 +322,6 @@ pkg_postinst() {
 
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
-
+	tmpfiles_process libvirtd.conf
 	readme.gentoo_print_elog
 }
diff --git a/app-emulation/simh/Manifest b/app-emulation/simh/Manifest
index 4af3cf19c243..cb06cbbec169 100644
--- a/app-emulation/simh/Manifest
+++ b/app-emulation/simh/Manifest
@@ -3,4 +3,4 @@ AUX simh-3.11.0-fix-mkdir-race.patch 333 BLAKE2B 2b50d8997d5a782391c6a0174c4c447
 AUX simh-3.11.0-respect-FLAGS.patch 265 BLAKE2B ba4134c8e3b0aafc71bbccb2e036d6532532816f30d1ac2a1759eb998479233c5e52a65fea77adf67c28a2e374b9edb998f91b30df9ea6e00f6f77723fdab61f SHA512 0e3c69ce2a7960c872933e60b0a8f043e0b0ae5563c4c5110045d53c34276a04cc110a0831057029ac84b21d818e1698514438d4f890bf4cd8d8e613af2cd9ef
 DIST simh-3.11.1.tar.gz 2576391 BLAKE2B bebaba75d4264c47202cc0daca2023c03d2e87722798f1ab37c9e3b2cec0b80cd180fccc0077347b2cb5255d26e1ce35f99a908deaf252c1e60e22e0a381e66d SHA512 7c2f81a64d3016b9a44409fc336c804c0da836317745d47594cc48c64cb57dc8f22084d9086e3f86868ec485ee56ac63301f350cee6d275e705b7c5fc82875db
 EBUILD simh-3.11.1.ebuild 1256 BLAKE2B 6334794360bb6a9201d94e49305f2b7eb3335c9e844977a09388bfd5d18565ef5cf302d50d8c785b225caae8feeeffaf8686b553651d2971f62f08709d77a41f SHA512 90525d3b1bb6fe3e3e347bfb8b947eeb5bef38fe948568a8cb0c0175612ac602cd3174c5e24dd68e1ffd014a5515de8097b450325edc2b412e880ff420798666
-MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-emulation/simh/metadata.xml b/app-emulation/simh/metadata.xml
index c5298995d2d4..7a38bb900964 100644
--- a/app-emulation/simh/metadata.xml
+++ b/app-emulation/simh/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index ddf005995384..8a4397354947 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,5 +1,7 @@
 DIST VBoxGuestAdditions_6.1.22.iso 61020160 BLAKE2B e6b79942ed905654ac98323fe5c960afe7467e4ee9da168f7a7b4856a001fa973418e979da57b6e75eedd801bd71f15700ac62a2dfac28b660b36b11287fab57 SHA512 826a4b7d714d1dcb3e7c5c3c95e2a47d2fef728172f2db0e9c983150d7cc335ca7ffd2c87c09e1ca3d0fb1342f4c6c03993f5fc8cff19f28e1f519dec0f3f96b
 DIST VBoxGuestAdditions_6.1.24.iso 61081600 BLAKE2B 66427a961c83f2de1a0b8671066154133795e8e4f50ac82e927e82e05594c520b155f29f7f19373e5846c36a1e3f6e5d2f5d17db1cebc1996c4d1737d5b45862 SHA512 8753558fcf467805bff801be43281597ef6738f90f8f7a62f6acbba2753e57f44bc72cb66411f0a0f413135026ddf683b0330b49ccad77676ec67b7bf3faf06e
+DIST VBoxGuestAdditions_6.1.26.iso 61073408 BLAKE2B 0711cb37ef21ce2fc277f1817d173f25686ae8f1f3cf983c93975f0e00df5e8e416f6bceaef3e1d1e30d0f3703186f9686a360a00683a89e5620603a41c21e63 SHA512 b1d9f02a740e61a8fdee7d8bc2ed87bbd4913ad367e8f1b7b964c496f9b10126337715cdcf5a3eb0fd299b11ae6324de8dd09657a55a7976dd14143a2d4ba285
 EBUILD virtualbox-additions-6.1.22.ebuild 777 BLAKE2B ef241fa299288ab813b6a6acfddb7910b3a8bd454527fd75143e8b3f404049374662c500aa17ce83a6edb080af267ed1710e09240058c877957e24272c782556 SHA512 53bddb2a887429730a34ea27a0859541c4c47a11a010ff33715314119500e337ed5849a8f76af106ab414dfcafbbe269ce2a282fb5137a324bac676dceb6080c
 EBUILD virtualbox-additions-6.1.24.ebuild 778 BLAKE2B 9224a26ec47d48f16e8e73333c7d87505d179c5435ad172226fa58017c6c3b5dc593dcbcbcd3174466f2f27f97ca09830478ccb13fa477be88fb2308ef2607a2 SHA512 7d80ce8e63384ca88fcde9dc3aa7f5ebbd21d527df271def115f5a700f4367a842b153d5dfc21f1ae193545f05563cbfe054d536fa9fbd7f5453e80e7b76c91f
+EBUILD virtualbox-additions-6.1.26.ebuild 773 BLAKE2B ec536183e374156adace80364b1b41a176a6906634168e87a9de31b57a2dfa131e6acfbffe0cb8397ba1c86108c197783a0a1b2a2bec06a1b358ad61c313ed9b SHA512 f43aba9da3873e6382a9580e2ac13754c582a52fb461b714eab134117ca8a849d205307b5045bf0d65604d0b4163584fd50c4ad5120b6f5cfcedbc0889dda78f
 MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.26.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.26.ebuild
new file mode 100644
index 000000000000..4a54ecd35f58
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.26.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 3fe83662ef11..43d46495c22b 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,5 +1,7 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.22-144080.tar.gz 11133865 BLAKE2B f0db84695d94d914afd22086ced2a2ca73f860a0bc91bc11744e2cc4a3203584b06f7c855053e33c5f775bc7f6db08b7400f5eeea89566b9146dd144ccf1a2f9 SHA512 71dc1a82b9b88f615ecc7172df344042366a9303115cf44685ea96e3e729b8280edd36377b207fdbbf8adb388d1ec9b21c3ee709cf44aeb52d6811b26fa69a80
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.24.tar.gz 11135003 BLAKE2B 53bb6dc35eb8ab1a58492ca3b67b63885ffa1ad3ed3a51a9e7e8c522845b082c420fb39a31a379ee56b45c9b02452acc5be4d72c5a5d9bddaa428bf7c9a3a086 SHA512 e2af2213e99c8c35a3090f5e36d05b1ef27c920cd31a2bf97b0368a89f27a5e2d0e0e0dced5e4e7bacda50fe4b57738924f13a933f5307ff2c8c4015ecc030ae
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.26.tar.gz 11134336 BLAKE2B 61e543124c7b2566175f35d0eecb046ce2c69a7fe8102ccbc96f61c4bf700d0b78732e535e09f9056ee8c53ca2f11615bbf5788684a35b04116501d9dc4b4f68 SHA512 b4be713b3e3bdbdecb38d4b27f70e9a34630ea6e4f10beddf96ad1372e3d64aa2ee85b0774e871aefb4f9872b3dcdd3005fc3a7bded6be37d06157f3fe2861e3
 EBUILD virtualbox-extpack-oracle-6.1.22.144080.ebuild 1083 BLAKE2B 088e4a97b7fb82fdbbe2206c79bf4296ca886d008df1c5cf1d789c0bbaced88b83fd8b5cee42f5aa6a5c9246c07ad9c8d2b7363a4a0f09cc687b3fbd6a64331e SHA512 e674994322cdcf4f0151f488c28324c786a72039ad32147dca57f84774ab39100f5534506e1ff5e6adeda75314ba3ef071b032c39ab4b6754b3469ccb79707ae
 EBUILD virtualbox-extpack-oracle-6.1.24.ebuild 1070 BLAKE2B 213b49c6213be21d5f5da9e0ecfb7fb43b0af9525ca9052660036c8fb2bdfd0153afce75e903fa178c7fb09a67e3d270bc9b054d4b1c2889727e5bcfe26e00cc SHA512 e2f3cf167a0a8781d8a4a7e8aeee4fb626e04db82203bc6f0202efb93d80c0e726bf5fc2fadefbaeebd82174859db4fcc4fcdf749d23256b15d31d44bb480ece
+EBUILD virtualbox-extpack-oracle-6.1.26.ebuild 1065 BLAKE2B 6728457bdc028b46b989d9d22f557fe7c026f6c2e89628defd10f98552f998e3a3952a5c4f0b259189d9b06cd2a6784fc1552aa14b0661f1ee5567b4231c5ff7 SHA512 7d5e08213780896e7162775760270df178838cfc0bbee7b49449263c94ee0bb504e6bec413c2cff4f185f2ed0f7097112e55e795dbe5d5dc290790685d6e9ed5
 MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.26.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.26.ebuild
new file mode 100644
index 000000000000..707f5fe35fdf
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.26.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+#VBOX_BUILD_ID="$(ver_cut 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}" #-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="bindist mirror strip"
+
+RDEPEND="=app-emulation/virtualbox-${DEP_PV}*"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index d10120b4fe2f..ffcb512b7dfd 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -8,8 +8,10 @@ AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038bab
 DIST VirtualBox-6.1.20.tar.bz2 165569564 BLAKE2B cf8c110e78e7d7bef3e3243a8966f4d816dacc8dad6cc44737023a13f1b89dfb50661f6dabc742f328e5c03556ec82e7a22f5c1b97cfef774652ec901e733e5d SHA512 b5af4e04e1a52c85b20226a274fac93712b79d426c0268cce3f2a337616a03161a55522ecddd13844bfc24a6808ba3d651366e74ce657cc6f8fd64c34ae745a4
 DIST VirtualBox-6.1.22.tar.bz2 165560989 BLAKE2B 871c2189827174561a2abce4d52056db892e596bcff76274770b43157cca93d2be9a3458ad3d41cca81d73d95f1db37e2d15fdbc192f4d5a59e3cc9b6365d3f6 SHA512 ab0fc7cea455f74598d5da18528404405221e9c96a34f0355a39187524240596db4b54e1b1af5f152d5329b8e7977218819c0605f0d0ba0d83a1fb8f8487548d
 DIST VirtualBox-6.1.24.tar.bz2 165754851 BLAKE2B 65bbc130281a745a00eee2a055dd59893e2f4b701cbdb31f4c45e2b7389f85f59d8a78ce1e03c83734a49b76fa61f56ea083a588874fa4023b723694f75ee8fb SHA512 cf2c5f58d2f160f8a22d94b7e30bcdaabd907661e05a72341bee93f5092b96c0c84d2291005f433040235227e3d6595ce0e66759c44c24eaedc6c9614646b3d6
+DIST VirtualBox-6.1.26.tar.bz2 165690074 BLAKE2B c522889191ca2ae2749978853463dd74a8ecbd312b6f9ee05b186577b675efd02b0f66293f7486a3a44cb9619e720f7a4012761ad98907496546fe9be362541f SHA512 7668abaa6e5e9cfbc3c7ae1c6efc11663bce906aa002f78cf2c7acbf9b47f96faeb64c2762330c7091694c191ff2311f3674bd930cfdc020c23ef1d4fd893c9b
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-guest-additions-6.1.20.ebuild 6205 BLAKE2B d1171f7d2e7f363eec0376812cfd34ac725f24083a4acc3ca4ca5346f84cbbeea1414a4c93915b5f82f323f641d78e0967a02f5f0853cd5c57b1b10fa5b0e455 SHA512 4cea83e923f2037bc3058bf349f640e46be929f5c5425d353923bf7ce6cb17ed2a53fe986f5e24fdc6a05f8c7f1a679356a71b6bc84c5eda74cdec7430afffd3
 EBUILD virtualbox-guest-additions-6.1.22.ebuild 6206 BLAKE2B ea540bc820358581e7d95aeadb13ad2fda156b0735b4a33676a163c1dbaae235db82907cf08ac833700fd297e57fecfe775bc1036f323fc04c2cb279ccf807f8 SHA512 f1ef13f8dd2d890e729c797375b5e8662fe776d008f78008668114e7467ef0fe98b277bd12e3a67a685d66c13ed38731e6dc7590722440acbe7541fcccf67965
 EBUILD virtualbox-guest-additions-6.1.24.ebuild 6207 BLAKE2B 4b06a2e8c1e0c9c4959a5cc1c47e6901ae99cf06f07ab67013558f09976130f1f5d13ad6da16f5e72dbb110306d8dedacd735d789c32f831d7b463569b0920ab SHA512 3563a5efa78257a211d4aaa9a4ed1639cedc7af6b9457d5a54a9711010130eedcdf9b914d00b03c9d87a4d22e40f8bd773c1c4bfe5636cee0d0a42545340450e
+EBUILD virtualbox-guest-additions-6.1.26.ebuild 6202 BLAKE2B 641664ed30c93f0e23ee6dd992b1851f19c9731a319f92623da31dfd6470ff168a369dc176f497a1a91346beda9e11037e7ea921d67b18f87e52f7949f563d82 SHA512 db330f5dec72d25937e4d3d014e6d8999b460d9241d71ef1a99f32389864b2bc0dad408bde877d7a0848150e4ed8be41469681ea27dda57f3d38f5bb38670f10
 MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.26.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.26.ebuild
new file mode 100644
index 000000000000..50023a853b94
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.26.ebuild
@@ -0,0 +1,221 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod systemd toolchain-funcs
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="${MY_PN}-${MY_PV}"
+[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+RDEPEND="
+	acct-group/vboxguest
+	acct-group/vboxsf
+	acct-user/vboxguest
+	X? ( x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE )
+	sys-apps/dbus
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	x11-base/xorg-proto
+"
+PDEPEND="
+	X? ( x11-drivers/xf86-video-vboxvideo )
+"
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}"
+VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
+
+pkg_setup() {
+	export DISTCC_DISABLE=1 #674256
+	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
+		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Provide kernel sources
+	pushd src/VBox/Additions &>/dev/null || die
+	ebegin "Extracting guest kernel module sources"
+	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die
+	eend
+	popd &>/dev/null || die
+
+	# PaX fixes (see bug #298988)
+	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
+	eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# Remove pointless GCC version check
+	sed -e '/^check_gcc$/d' -i configure || die
+
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	MAKE="kmk" emake \
+	VBOX_BUILD_PUBLISHER=_Gentoo \
+	TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
+	TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
+	TOOL_YASM_AS=yasm \
+	VBOX_ONLY_ADDITIONS=1 \
+	KBUILD_VERBOSE=2
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	dodoc "${FILESDIR}"/xorg.conf.vbox
+	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 47d2f3a752e9..45a8ba8f1450 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -4,6 +4,8 @@ AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1
 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
 DIST vbox-kernel-module-src-6.1.22.tar.xz 672348 BLAKE2B 331f81c370c24487f4966c745a72329065df2cc22918d03edefdf546d8e4ff0a36404ce98f1012faaacc301cd2c507b055db69b9125f91ad87fa5fde14d3abe0 SHA512 b50d7699db8909ea4e9126715152336a2c46e06f9fc24b5ef0624e7d26de1c83b2a57b0387dab0a46a9e50f9906126cfdcae4f290599de88a980adaff7fba180
 DIST vbox-kernel-module-src-6.1.24.tar.xz 674584 BLAKE2B 3a20f615426a7b788bc4bce00e416fa3822cbec3f00691651acd53b7c7bda8b43d3669195cececa83f1fc50a792e417adcd709d859497da143c4d93a2b414912 SHA512 220d57ab33a41464cd9e506d38390e60b9e67ca8262b1a13732f3d40820e038365c129eb7144f1932b8c2d3fdcea828de3070dd927788015301bf4aa59c1cc48
+DIST vbox-kernel-module-src-6.1.26.tar.xz 674624 BLAKE2B e38fdbb63e309463a526c4f6607f0cf6193109a9cd9ac4ac4cd752e614ce1594612dd76da7fda9d9453cbc45e9d3aa2989f370d8900f080e604ef1a903d8a736 SHA512 0755a802ae901664d3ef1481ffc8987a0f94d8be1d95c1969f370e2fe6eb479aba1da38d2206eb8191c05d3b7da4cf3d16e4e53d40fcb3f758622030a8864c98
 EBUILD virtualbox-modules-6.1.22.ebuild 1433 BLAKE2B c37f4ebb63aed96ba78b0135688f576a703fd2dcf2b677c64ead9b89dd1b0c4e40bff9076f433034c1330739c295c015a61e949118410c0c59ec609155d8f535 SHA512 31ab9638f1a2c89b9abf6cab996a345ffd9b72a57ed95046cea436aea25e12709018f1d3504cb4b0d1254a4ec8f2756612c682d5d84b2630dff9301bec24ef90
 EBUILD virtualbox-modules-6.1.24.ebuild 1434 BLAKE2B f799d32f49be7d6d343ab002f2b6d1f6d6ce17ca1f4973d5b375499b4f42dba23b8f467f807f6edc27bf534db2bbb671ab6984d32fdb9a0e42d9b7345491410a SHA512 c075093ff44a6d31d049a3182131ad084066b657cd4cbd15af9d4948944543231e9c67a12f96ae760b2fab953498c3bfe2cd5761a0292e2be3fa5dedd8187d18
+EBUILD virtualbox-modules-6.1.26.ebuild 1429 BLAKE2B 1faa947e406ad79161cd598d495989dfa82fe9a59d8668f6cf25ded538623180e7e67535698948dcc54e9e007531695e3dffd5ee8345104284ea7dae784d6161 SHA512 456a3f1c5fb2319059c9e60ee9dc4b26eed0c82839dabd3668ac3954d9d1545a757d10e49aaa93dfb8219619a9b61a8314d8ae089c87bc0e4d7dec565d144ec9
 MISC metadata.xml 352 BLAKE2B c8715abe9ff5c699ae15dd0906ac10eb7f750cb00092994d174a2a6a3315aff2601781a5392058087706dcf744614fa32cd950c7fa19dd896f7617f735089a0f SHA512 4e57c8aee47fe806315d0d138c81ac919197ed0a6dbf4273994228ceae32e06791e1951e9599bdfbdb6e2f329f74cbb08ce9d69ad3e6264668872dca3e4371f9
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.26.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.26.ebuild
new file mode 100644
index 000000000000..468a1ffeef51
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.26.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE="pax-kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
+MODULESD_VBOXDRV_ENABLED="yes"
+MODULESD_VBOXNETADP_ENABLED="no"
+MODULESD_VBOXNETFLT_ENABLED="no"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if use pax-kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
+
+pkg_postinst() {
+	# Remove vboxpci.ko from current running kernel
+	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index e180ddc95466..0b26b950f7cd 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -9,7 +9,9 @@ AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-6.1.22.tar.bz2 165560989 BLAKE2B 871c2189827174561a2abce4d52056db892e596bcff76274770b43157cca93d2be9a3458ad3d41cca81d73d95f1db37e2d15fdbc192f4d5a59e3cc9b6365d3f6 SHA512 ab0fc7cea455f74598d5da18528404405221e9c96a34f0355a39187524240596db4b54e1b1af5f152d5329b8e7977218819c0605f0d0ba0d83a1fb8f8487548d
 DIST VirtualBox-6.1.24.tar.bz2 165754851 BLAKE2B 65bbc130281a745a00eee2a055dd59893e2f4b701cbdb31f4c45e2b7389f85f59d8a78ce1e03c83734a49b76fa61f56ea083a588874fa4023b723694f75ee8fb SHA512 cf2c5f58d2f160f8a22d94b7e30bcdaabd907661e05a72341bee93f5092b96c0c84d2291005f433040235227e3d6595ce0e66759c44c24eaedc6c9614646b3d6
+DIST VirtualBox-6.1.26.tar.bz2 165690074 BLAKE2B c522889191ca2ae2749978853463dd74a8ecbd312b6f9ee05b186577b675efd02b0f66293f7486a3a44cb9619e720f7a4012761ad98907496546fe9be362541f SHA512 7668abaa6e5e9cfbc3c7ae1c6efc11663bce906aa002f78cf2c7acbf9b47f96faeb64c2762330c7091694c191ff2311f3674bd930cfdc020c23ef1d4fd893c9b
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
-EBUILD virtualbox-6.1.22.ebuild 14362 BLAKE2B 9573907516a31073da15e80b8b40c8947063eaee9ed67e2c46665097b88e0dc9bc8d5be2f804b62f6e347caae910fc35fd7fac98d30ecfe9f2c15bb8a7450177 SHA512 dca9ddb099f17bfb2e77f407cfbcc3aa1464d49d3312d1a8be4bc971d1bf896e8bc1a675103dc4f4cecd99d77bc0aba7035dfb0d6059a6e6f64b3b8fda5d9c8b
-EBUILD virtualbox-6.1.24.ebuild 14363 BLAKE2B c0f9760a9b272fae7fd7bbc0b3879f0869be119773f64ee0a0efb48f3b0d5d478fdcbabf50f56084e613f8717f7c46ed9af6ce8d37e4d38e2cb04b31e797770b SHA512 724ee41630dd9d7247d682bddcfc278219048a9574a4afa9eb61a93ea8a2d21b60e3486b44378dd0bc1d086a5980886735b501fb2305ad2ac618a6adfab3d955
+EBUILD virtualbox-6.1.22.ebuild 14342 BLAKE2B 8f7472f3cb2b25c9aa9079bc6732ba65c33a67fc166cc28d3dcea83886739cae019f6f5572301b7bde8c1b2c825677b610ba571462a187b3bb1f53cd84dd1bd9 SHA512 cebb5863ef8538ca1d503cd85605f279afb0d46d62f6b1ba343a4af422aceffdbac15e51ee20428f11dbc4361aeef91a59c77c489c08a90dae8709fd39076b3a
+EBUILD virtualbox-6.1.24.ebuild 14343 BLAKE2B ce8b34283b04367d1bf2c22af58bb0fbae9b513bd82cad3826f989633a40988cc5e57f5360ad02d452f789e8a7c118338ad0deb874cf350c03f397e405b6fe24 SHA512 791567627577a0025fd95c0aad0667e9b4ff6ea3636f709a7ef5010dee157d16bd5d42edc192ef73e2da13e918a4d38c7a535d3af1f7c46362b29196933dea31
+EBUILD virtualbox-6.1.26.ebuild 14338 BLAKE2B b30000a66c4bf1b34587ba2b3383c1ec52fa8690f5b54ded5423f124d8d9983b43968bbc33d4f24187db87cc92b6cf783e417fc76a0ff52ee69cdd81a7d5aae0 SHA512 7c8dd48f616b88613e896e2c7756b99b7a9fc9bcc7e77011f6756a223a1556c4e715d4fb9a01ade69abad6ac4a66c685256441cbda927c0a7f3a5dd085fa05d8
 MISC metadata.xml 773 BLAKE2B 52e55a63efff63886bedad4ac72e8b31088834ee55f3ac257f874afd77cf7763c5343ebce6defa399c55f8045dd1b17bfbd3ca3669adbfbe51585a59aa62bf0b SHA512 212e94588bc598d27ab46c3955b1e9963c38a7fee58502b13ce56bb14f241fe37961cd2f57150f96943f893314c2668a67afbb5b3b7e7db4354436965b7c66e3
diff --git a/app-emulation/virtualbox/virtualbox-6.1.22.ebuild b/app-emulation/virtualbox/virtualbox-6.1.22.ebuild
index 325ffdbc6afc..8e2979cd1985 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.22.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.22.ebuild
@@ -467,7 +467,7 @@ pkg_postinst() {
 			&& udevadm trigger --subsystem-match=usb
 	fi
 
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
+	tmpfiles_process virtualbox-vboxusb.conf
 
 	if ! use headless && use qt5 ; then
 		elog "To launch VirtualBox just type: \"virtualbox\"."
diff --git a/app-emulation/virtualbox/virtualbox-6.1.24.ebuild b/app-emulation/virtualbox/virtualbox-6.1.24.ebuild
index 0749d1ebaa9f..9e63054b0210 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.24.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.24.ebuild
@@ -467,7 +467,7 @@ pkg_postinst() {
 			&& udevadm trigger --subsystem-match=usb
 	fi
 
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
+	tmpfiles_process virtualbox-vboxusb.conf
 
 	if ! use headless && use qt5 ; then
 		elog "To launch VirtualBox just type: \"virtualbox\"."
diff --git a/app-emulation/virtualbox/virtualbox-6.1.26.ebuild b/app-emulation/virtualbox/virtualbox-6.1.26.ebuild
new file mode 100644
index 000000000000..d7cbd13be91a
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-6.1.26.ebuild
@@ -0,0 +1,502 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}-${MY_PV}
+[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz"
+
+LICENSE="GPL-2 dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+
+CDEPEND="
+	${PYTHON_DEPS}
+	!app-emulation/virtualbox-bin
+	acct-group/vboxusers
+	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib:=
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? ( media-libs/libglvnd[X] )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	dev-libs/openssl:0=
+	lvm? ( sys-fs/lvm2 )
+	opus? ( media-libs/opus )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+DEPEND="
+	${CDEPEND}
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? (
+		x11-libs/libXinerama
+		opengl? ( virtual/opengl )
+	)
+	pam? ( sys-libs/pam )
+	pax-kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( >=virtual/jdk-1.8 )
+"
+RDEPEND="
+	${CDEPEND}
+	java? ( >=virtual/jre-1.6 )
+"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_pretend() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something less stupid.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie ; then
+		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
+	fi
+
+	# Only add paxmark patch when we're on pax-kernel
+	if use pax-kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
+	fi
+
+	eapply "${WORKDIR}/patches"
+
+	default
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--disable-dbus
+		--disable-kmods
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex opus '' --disable-libopus)
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex qt5 '' --disable-qt)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	doecho ./configure ${myconf[@]}
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
+		TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		VBOX_WITH_VBOXIMGMOUNT=1 \
+		all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst rdesktop-vrdp
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use qt5 ; then
+			vbox_inst VirtualBox
+			vbox_inst VirtualBoxVM 4750
+			for each in VirtualBox{,VM} ; do
+				pax-mark -m "${ED}"${vbox_inst_path}/${each}
+			done
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox{,vm} VirtualBox{,VM} ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+			doins -r UnattendedTemplates
+
+			domenu ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
+		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
+		|| die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
diff --git a/app-emulation/wine-gecko/Manifest b/app-emulation/wine-gecko/Manifest
index eb9532579e81..47393ad5bc99 100644
--- a/app-emulation/wine-gecko/Manifest
+++ b/app-emulation/wine-gecko/Manifest
@@ -1,10 +1,6 @@
-DIST wine-gecko-2.47.1-x86.msi 50735104 BLAKE2B c082e22fdbf1681e0c38e8822bc1a8f99b47d91f7d32f22bfad716685553d3d10fd4004f90135d90f39f4ff05cba37665455679e08ce3a140ca8ded76cb7a9ea SHA512 ef13838bf7d5bdd74d06bbbdccc6b18cc75b4d0c2b3db8c978b9500cdfeb058bf5532d89b77c164eab52c1f93ae2e2540b37f6694a3e560aace3ebc7da2c7596
-DIST wine-gecko-2.47.1-x86_64.msi 52311040 BLAKE2B 2a9aa68461d2b9f69ada1e50925de7ba9804a4992c9d0a717c9c5d1340179e7f10e550c8db170bb33c79e24dcd068e00648c572c6b4e4d836a507ada6e7bbccd SHA512 f875d9a7c68a33abf6dd25d61ff6dd3e5ff246768880e3ee4984ab63b065a7b0ef55411b710e4cb9db48bd2114cbd3fbd97f24e819d7d71c2212dd612abaaf43
 DIST wine-gecko-2.47.2-x86.msi 59162112 BLAKE2B 75197c5145dd047d637ea950ed1df918b79446bbb5aae642a90d95af96870cd1756b8469deca105d986ae2dc166ad1b2b89dd7e16c7d13baa4b215b30c3ba909 SHA512 4e6e688fada1edd3d7e0e131246dcae8c6db1a2fde946540b6f8c8b2deee8aa19f210368132f00789d4f49bf2b5e5ac671d4d3699f557e652ece50e55fbcbd43
+DIST wine-gecko-2.47.2-x86.tar.xz 45556880 BLAKE2B 43334edd68f22e21347a49bcd7321d90111652fe6143fcb94fa97cee950701f1891b41e8c4ea75854d5232a74c2007534d3fdb190c6abfb96290193f6a4546d2 SHA512 de39bacf9e8b45971e3e675ccbbac0731855b81e148619a98fb126c38ab385f10f1e68e0a52a663fa1a079192b378f4d4e4cdb0a11c5e9dd46221a9604214250
 DIST wine-gecko-2.47.2-x86_64.msi 55354880 BLAKE2B c234602e29a6597d26e7a78ec85ac66471ecd8fcea5360d6f32323e4cbee4aca2ccd5530706e8779346ff2d08f1c4900fef198763e431ce7cd232ef117933336 SHA512 9bbaf061d5d2035e6df0898a847697bbed071abaf95ccde08b5ace7a2c6fc871db16443596b23a889def82f98591973fe8ca88063021d8779f8faa48973f239c
-DIST wine_gecko-2.47-x86.msi 49266176 BLAKE2B 6b1d4ebf53fac422c2da9ae7f5b6ab9064d2b6cc20d57fe13707395e71305ac1607a440624d3a545fe1e0391bc92bf5b594173549e519eda967bb833b69b2f52 SHA512 e0d06102dcb8ec2d24e8c8c3f5c2ee5cb47c18e203dfb43d85de008d682ff874fb664fef1df909a5a7857de39c7e8ce5175e734a11964ec4cd35f8fbacaea3a4
-DIST wine_gecko-2.47-x86_64.msi 50806272 BLAKE2B 6f91d4661a322eca41042cb7a246d5bff76ab72b4bda67183fc36735c923bd6d76624f21fd3e59f63fd872704edcf0116a6e7ab4fa6f074f5098c8fb5307534c SHA512 7c2496b15a06bc6906bc60afb3ac082e3f9931207fa624e60297020211d66aa9b420a61e95730a0dbdcefbe4b26c811d0c896ecd9c363b5107d08c3fa22fef41
-EBUILD wine-gecko-2.47-r1.ebuild 738 BLAKE2B 65313aa36c6b1f633ca53894a66824517a233b8c3d4056a951f8ec98ef0c653790b86f18a5ac046a0eab2c07107f27e5eaa981e70a91c4defcda297ccb02e75e SHA512 7c35333e8defa6956de3befa1bb6187a1353137334ee272c296d00eaca731c826ccfd6cd491a76bbec1bf36c6d4e2e8be124ca3eee2a3a7411ff3446071c2d32
-EBUILD wine-gecko-2.47.1.ebuild 709 BLAKE2B 1e3574c3be03d6e3e335d7c88f64f7af09af770ee12a4544181a7820404b0d9d7b7982a293e94b7264390a82114ae4cd4a8ca9580f920809d45526cb561396b4 SHA512 e3b7c02da2974dfaa2737095d7b9b394096ecb0f3af0a5fb729c1ea3d3efa3887921c719a14ba732896f1b6d7866ddab116b3f54673ebd40ecf42e5cdd116598
-EBUILD wine-gecko-2.47.2.ebuild 709 BLAKE2B e7fce0c4d8a3a35d9b855bbb4b537f13de39e8f5f2c784992d03e63141934b533fd6f52bc96b186967b1484f7cf2aabefda2cd4dab06edee1e8e9bf25a4993cd SHA512 9c768b284e09868a2f3a66ac094f762372b85a6830dedf735782e345754cb7742d3931eeba3b791d9ec6a7638858ed0a53cd7cdddeb1669f6792d000663b234e
-MISC metadata.xml 321 BLAKE2B a78cdbf0755ae73cb4ec393d3febc46f39267e069001646a3db9af89382c09b2b7667edcce40975bfd890057466f8b86d14d3415b7a820d01198d8976bd5300d SHA512 a4a66f08ca203c1620732dd42b5e281d03d24675e4e471b7d6c6cd5a88b89a47b73b68b0b82f70eecee91c5c943e9886d8930f39b65b59ea285d23b010ad7635
+DIST wine-gecko-2.47.2-x86_64.tar.xz 43025348 BLAKE2B 0c956043d7a49cdd88a3af4b25191087fd638a68b958e13a46bbf4310ecf7cdeb973eb3ea5b254f2d4f90f2a715d35c25a67b1883159a60a0ff6eea70e0f1077 SHA512 cf7af1087823188c3be6665d7662bf1029c58b4b8db271e5f4bfed15df217b905653b034b62ed0fa961f528be40f0325b378669d27c9a18ef5b9d98ef8c63aeb
+EBUILD wine-gecko-2.47.2.ebuild 1027 BLAKE2B f9148675665fa0e6d0f4f8e00a58b282ad489ee4bbd8ca9ee6aad69d2dbd7b096f3bb39e16acbd3254bac1b2775f68d00b4a2e66c0725707d62c63824e906c85 SHA512 ea1371d7805c0ffa6c68f5030549ce051cc4cd2f000eebf193f371f8bc5174d76b09c10ec9fc59f50b0cd032c51d0f3ae8464e8df4cca385b498d6f0127c059d
+MISC metadata.xml 545 BLAKE2B 22e5b4c5297b15ecc5c2b6c0a48081e8d13a6995982296db5df91749e6983bbf94a33cfe1d09271f02ed997b0f2e6203f6b288ff50a016165b4792a0b8e380db SHA512 0fb8b2c9b91ef764f66a8e7adc3c9b8fecad998e73597d1cab6b10f99cf987f357dbe83ff8573107e8ce0cbd65170b54c4ba124a111aa48e8f891ece400f7528
diff --git a/app-emulation/wine-gecko/metadata.xml b/app-emulation/wine-gecko/metadata.xml
index 921f5a737f83..26d83e5be35e 100644
--- a/app-emulation/wine-gecko/metadata.xml
+++ b/app-emulation/wine-gecko/metadata.xml
@@ -5,7 +5,13 @@
 		<email>wine@gentoo.org</email>
 		<name>Wine</name>
 	</maintainer>
+	<longdescription>
+		A Mozilla Gecko based version of Internet Explorer for Wine
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">wine/wine-gecko</remote-id>
 	</upstream>
+	<use>
+		<flag name="shared">Install pre-unpacked files which do not need to be copied into the Wine prefix</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-emulation/wine-gecko/wine-gecko-2.47-r1.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47-r1.ebuild
deleted file mode 100644
index 6a66a478caf1..000000000000
--- a/app-emulation/wine-gecko/wine-gecko-2.47-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN/-/_}
-
-DESCRIPTION="A Mozilla Gecko based version of Internet Explorer for Wine"
-HOMEPAGE="https://winehq.org"
-SRC_URI="
-	abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${MY_PN}-${PV}-x86.msi )
-	abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${MY_PN}-${PV}-x86_64.msi )
-"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-IUSE="abi_x86_32 abi_x86_64"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/gecko
-	use abi_x86_32 && doins "${DISTDIR}/${MY_PN}-${PV}-x86.msi"
-	use abi_x86_64 && doins "${DISTDIR}/${MY_PN}-${PV}-x86_64.msi"
-}
diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.1.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47.1.ebuild
deleted file mode 100644
index b71c2e539912..000000000000
--- a/app-emulation/wine-gecko/wine-gecko-2.47.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A Mozilla Gecko based version of Internet Explorer for Wine"
-HOMEPAGE="https://winehq.org"
-SRC_URI="
-	abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.msi )
-	abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.msi )
-"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-IUSE="abi_x86_32 abi_x86_64"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/gecko
-	use abi_x86_32 && doins "${DISTDIR}/${PN}-${PV}-x86.msi"
-	use abi_x86_64 && doins "${DISTDIR}/${PN}-${PV}-x86_64.msi"
-}
diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
index ef4f3027be56..e5a5a8df49a9 100644
--- a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
+++ b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
@@ -6,14 +6,20 @@ EAPI=6
 DESCRIPTION="A Mozilla Gecko based version of Internet Explorer for Wine"
 HOMEPAGE="https://winehq.org"
 SRC_URI="
-	abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.msi )
-	abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.msi )
+	!shared? (
+		abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.msi )
+		abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.msi )
+	)
+	shared? (
+		abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.tar.xz )
+		abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.tar.xz )
+	)
 "
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="${PV}"
 KEYWORDS="amd64 x86"
-IUSE="abi_x86_32 abi_x86_64"
+IUSE="abi_x86_32 abi_x86_64 +shared"
 
 DEPEND="!!app-emulation/wine:0"
 
@@ -21,6 +27,11 @@ S="${WORKDIR}"
 
 src_install() {
 	insinto /usr/share/wine/gecko
-	use abi_x86_32 && doins "${DISTDIR}/${PN}-${PV}-x86.msi"
-	use abi_x86_64 && doins "${DISTDIR}/${PN}-${PV}-x86_64.msi"
+	if use shared; then
+		use abi_x86_32 && doins -r "${P}-x86"
+		use abi_x86_64 && doins -r "${P}-x86_64"
+	else
+		use abi_x86_32 && doins "${DISTDIR}/${PN}-${PV}-x86.msi"
+		use abi_x86_64 && doins "${DISTDIR}/${PN}-${PV}-x86_64.msi"
+	fi
 }
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index 972034de515c..b40fb4582cbb 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -1,7 +1,10 @@
 DIST wine-mono-5.1.1-x86.msi 84130304 BLAKE2B 05a5344b59249a758443cf91670eaef71d9ad3a3024b11442a8d3512ba54356439d503629fa799e2454975f47c0eaf6ff9e25ed61b020f29efceacc78347d578 SHA512 c518b93a470cc897abaf1dba18cc773dca0df62a28d35f32f2ddbe39b4de616c0307545bea5dc3ca87a01fd96b47feb3e1d8c3778106304b9cc08ebb3d1d665f
-DIST wine-mono-6.1.1-x86.msi 87879168 BLAKE2B 3bd7ce6da017edd7d462e91afff17f17bf22179d7ff21f479de92d768c8414e329e497ad3a5860499db7c2075629020aa190cdba80285e28fac8996d3e4337ad SHA512 3d2c7b14e605023f45eedf487e14a106f751b1c8da1063efddf5875a7ab9d9d064489940e499b509a573b0daf8274f2375f80fc8e9c10419cff249048fba8a87
+DIST wine-mono-5.1.1-x86.tar.xz 44710604 BLAKE2B 162e5c8b12a0384d218ae049c8a948d48fe50ca51212e1c00f11a207f26a759c749d1b8cd416990856358af3d9899670a363d568eda83b66f5e94efc72eea1ff SHA512 9d2e1c42669164bb3c0096ade0dfd465f633436f18246b1a4d169ae0ae2e3b51d8f94d79409cb71a65b878705d5d38e6f4aa155787e340a9294ff22dbe39cf95
 DIST wine-mono-6.2.0-x86.msi 87498240 BLAKE2B f7e20876732cbdfc472d5f850b167feceb4e09dd1d14db2d5e81580fb28cb1ec2fc7d1a48a187a0b0d0ad3884c3880a9f3512efdc5ace02795c3158b404a6770 SHA512 99007d7bf3bbdb97babdcc9411a3c9583c261918889e72f785e41cc0638fe4774d81040eebb7d3547ac2609a4684263feefa9e70b662f277ea1717dbd604d3d2
-EBUILD wine-mono-5.1.1.ebuild 509 BLAKE2B 71b054382d6629d5828bb3e82b2ba8b5ee7b6582e3cb4e787ceb99b6386f26aef0f205cdcb86154ee1b1000abbd17ea1e0d85c5200962c782e25080c12340001 SHA512 377135ac3b6b82ebefd2411351e8a97a245f21f2bdf713b89ca3774e0950cff39095728ec577a59426010ed3d1fef01b9af58b81c5684a46036c0f7557027293
-EBUILD wine-mono-6.1.1.ebuild 511 BLAKE2B 2807e1fdd29bf3200690e008a981cf226dc1ab60c18437227bffd99fc683e3a8316e173937c775a910f3ccb2afcfd77b7bf9c1ab1d662048a1ef60d51d5508bd SHA512 37243bd166422fce836debc9551230290ffcc7b62f30f8676fd8b5640a9b6a6dd580a9d0af1fae4e3b4e5921cc723ea66186d859250a68ac4df9f96b41ff56b8
-EBUILD wine-mono-6.2.0.ebuild 511 BLAKE2B 2807e1fdd29bf3200690e008a981cf226dc1ab60c18437227bffd99fc683e3a8316e173937c775a910f3ccb2afcfd77b7bf9c1ab1d662048a1ef60d51d5508bd SHA512 37243bd166422fce836debc9551230290ffcc7b62f30f8676fd8b5640a9b6a6dd580a9d0af1fae4e3b4e5921cc723ea66186d859250a68ac4df9f96b41ff56b8
-MISC metadata.xml 614 BLAKE2B e45f9e8581cec69afc21a5af29aa71eec05ba7fa626624e6c06000a5f013a3606674074beec999a0f8f91c91fc8912995b20cb88f8ad8a40bffbd964c5bf020f SHA512 5655c4bd737975334e66b4ea0c6cdb447dd647a7a3c76c0cd9782c405c9540ae396c87677bde408d3977b838813e00f12249f0f84267b75894e5554b2c6bcb6c
+DIST wine-mono-6.2.0-x86.tar.xz 43071332 BLAKE2B f334600697375757c734ff22274665b3bc1cb7495d465e1d209b240b9b2aafdd93f9f246f5415e9f36526bceee6066a13fe01a81d93779dac35687fe0d44f7df SHA512 7e5ed7e4abf88d915d59715b107722135af08bb43e6356f9ae95fdafc539332150a82f85b67d15710ae4ece6c883733bab142f59894f70acd893cac85f6ca905
+DIST wine-mono-6.3.0-x86.msi 86689280 BLAKE2B 5c3cbe92dc055e97fa6dc894659cbd2666bd6a2ae0ee08c998c5326379a205596d89127d22aeabdf73c99aa8e4ade4d5e05663d0a1e1f9f1d322c7c18a4cd4ea SHA512 e71accf7d649c576728a41e9dda5dc9c21e3ebc0330e01be30c1f196bdb2925c5fefb6e9337cc8043f4b42721702dda4dc9224cb7a31e322410f4002d1f84f42
+DIST wine-mono-6.3.0-x86.tar.xz 44392520 BLAKE2B bdaa64005564a134605f924f256a709e40cb713bd1f24f2ac5e82a095e353a81487c74813c88e74ed02905cc23a3bf50e99e908a3536a9671f4920d9093cbe75 SHA512 d39bcbaa65e4299711351516e74d559887b152caa3731cc72bbb23412ed76f5b8cf124c2f46241b677b074277c680120a645f738cdcd840ff60465b20deda3b7
+EBUILD wine-mono-5.1.1.ebuild 658 BLAKE2B d54b9115e6f11315cd10a07a68c2e8f6afa48ca12c8a32c2ccfa198d51732f869c011c124f58ea07abaa491e5dc7914a6cb38ce60189e2a109731d67920d4e86 SHA512 4c457d143b0dfe54317961f77947dbad60be83cabd3e335922a7b728ff266ed6fef4aa14fe9e561c02fe679ad11b6dde5bc366862b185dfb3bf152d828a316a9
+EBUILD wine-mono-6.2.0.ebuild 660 BLAKE2B df73bc6c9a6866f408ea1d0751e2e8b3b1b2112a296f0f8f34fc1a83e6e2a3b4a83fc267e7a73bbfab8550a679edec9b95b1a92d2663aae208dde085588f9519 SHA512 a9d82573e2b61f84ed51b64a83d6ae4793077d17995402cb6822eb9e71d6cfe2c441eb70f706eb6b2df3b03ea7025a46e4824567c86189cc8f3a1f578a043e9b
+EBUILD wine-mono-6.3.0.ebuild 660 BLAKE2B df73bc6c9a6866f408ea1d0751e2e8b3b1b2112a296f0f8f34fc1a83e6e2a3b4a83fc267e7a73bbfab8550a679edec9b95b1a92d2663aae208dde085588f9519 SHA512 a9d82573e2b61f84ed51b64a83d6ae4793077d17995402cb6822eb9e71d6cfe2c441eb70f706eb6b2df3b03ea7025a46e4824567c86189cc8f3a1f578a043e9b
+MISC metadata.xml 737 BLAKE2B 471ad99100fd1dd91037db02da7579ab24ba1287a11fbd96e28aa341fd3a6fd6b3d166afc705d4182dbc3c3e23399791b18c60143d3dd3c9985899e09014817d SHA512 1c3c1ce34970dad787f5da755f72dd7a65f2c643d37d469df35bde6849398bd49d6adaa54a15699c41fa568539959dc963012afa725f9369480babc4014635fa
diff --git a/app-emulation/wine-mono/metadata.xml b/app-emulation/wine-mono/metadata.xml
index a64284bc1ee9..279a9220271e 100644
--- a/app-emulation/wine-mono/metadata.xml
+++ b/app-emulation/wine-mono/metadata.xml
@@ -11,4 +11,7 @@
 	<upstream>
 		<remote-id type="github">madewokherd/wine-mono</remote-id>
 	</upstream>
+	<use>
+		<flag name="shared">Install pre-unpacked files which do not need to be copied into the Wine prefix</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-emulation/wine-mono/wine-mono-5.1.1.ebuild b/app-emulation/wine-mono/wine-mono-5.1.1.ebuild
index 291b0ae7c2b6..d5f8467a1af9 100644
--- a/app-emulation/wine-mono/wine-mono-5.1.1.ebuild
+++ b/app-emulation/wine-mono/wine-mono-5.1.1.ebuild
@@ -5,11 +5,15 @@ EAPI=7
 
 DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
 HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi"
+SRC_URI="
+	!shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )
+	shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz )
+"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
 KEYWORDS="amd64 x86"
+IUSE="+shared"
 
 DEPEND="!!app-emulation/wine:0"
 
@@ -17,5 +21,9 @@ S="${WORKDIR}"
 
 src_install() {
 	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}-x86.msi"
+	if use shared; then
+		doins -r "${P}"
+	else
+		doins "${DISTDIR}/${P}-x86.msi"
+	fi
 }
diff --git a/app-emulation/wine-mono/wine-mono-6.1.1.ebuild b/app-emulation/wine-mono/wine-mono-6.1.1.ebuild
deleted file mode 100644
index 0860b6bcb4b4..000000000000
--- a/app-emulation/wine-mono/wine-mono-6.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}-x86.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-6.2.0.ebuild b/app-emulation/wine-mono/wine-mono-6.2.0.ebuild
index 0860b6bcb4b4..b396802d99cc 100644
--- a/app-emulation/wine-mono/wine-mono-6.2.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-6.2.0.ebuild
@@ -5,11 +5,15 @@ EAPI=7
 
 DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
 HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi"
+SRC_URI="
+	!shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )
+	shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz )
+"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
+IUSE="+shared"
 
 DEPEND="!!app-emulation/wine:0"
 
@@ -17,5 +21,9 @@ S="${WORKDIR}"
 
 src_install() {
 	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}-x86.msi"
+	if use shared; then
+		doins -r "${P}"
+	else
+		doins "${DISTDIR}/${P}-x86.msi"
+	fi
 }
diff --git a/app-emulation/wine-mono/wine-mono-6.3.0.ebuild b/app-emulation/wine-mono/wine-mono-6.3.0.ebuild
new file mode 100644
index 000000000000..b396802d99cc
--- /dev/null
+++ b/app-emulation/wine-mono/wine-mono-6.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="
+	!shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )
+	shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz )
+"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared"
+
+DEPEND="!!app-emulation/wine:0"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/wine/mono
+	if use shared; then
+		doins -r "${P}"
+	else
+		doins "${DISTDIR}/${P}-x86.msi"
+	fi
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 7accbf81f27c..56e5290afcea 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,16 +1,16 @@
 AUX wine-staging-6.12-winegcc-equals-args.patch 666 BLAKE2B 1546e146a5942c46c01e72d06693e0875dc84483159a404d1a13824b29e2539f2abe95f2086509de049ef0477a0846be7149e82949f5c55aa5c8da925679773f SHA512 6377b3f86966a19c1129c75da6e2bfdbee2c2ee7d7c38460778239adc01fd56328a20b74b9c73d5b757f0d53abc91bc498d71f988eba316267bb508234a98a8f
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
-DIST wine-6.10.tar.xz 24562432 BLAKE2B aeb4efc6fcbdbbbfa71a99112224c77e1da10468e47d49de87ecf06556008e83d6e3d8655fa4439293820663910897d512a77bb78ab771632f893b46745915af SHA512 f0e8f0bdab09c979772965d167d687e88998f3fd6537a592e201a2dc9097552e03b1c413516cc8c82665a8bf17580777f48bd1ed9033641f04e7ef7f0b29cc60
 DIST wine-6.11.tar.xz 24599644 BLAKE2B 47b8eefadd59e649ac331ee236b90dfffd86ea812699f3d804bd3a7d939d099c88c4b19cf8d8e0bbe2463298abe398528c132443350f3d5eba0d23e7a3a2889c SHA512 d041ad99b6311f99df6ef40a64bc393acdc77ad4bf5f28111ebb88c133c3d338aff18f129fb30ae38cca24bf579834d4e6c7d252d5391f35b1ee81a91cc70c21
 DIST wine-6.12.tar.xz 24666960 BLAKE2B d8f33ac0d15977c1e0c206662c370feac351c7399c91cf5669fce50e60684ad85b40244925b4d304b540f5a78edc19b4ee32fe362250f8c390347d71320a09d8 SHA512 6d5646c44e656a88eb25174ce16038a8b0e1495c3deed8e959825cb26059fdda6e6519afeaeb28e4070fc5e05d7a3e1e5812ef09c31875f14f9233ba6a52f14c
 DIST wine-6.13.tar.xz 24704408 BLAKE2B abd79fd0d2a364fd6b7c2713924ad9883cf62e0febd7653984ce7520f41eaad71c06e0874ff46343ac7c253abb7d5e026b878dcf40235918f075e2bf7da0b8da SHA512 7e1a16873f1a160960e44a38c7af743ea3a10bc545c5724745733d14093188134b74a4f60fbc54f38546b0ed053209b67e35ea131a9cda58ec8041855100c5ee
-DIST wine-staging-6.10.tar.gz 9673740 BLAKE2B 3ec1dcc96dcf583f061408b7bdf4adf14fddf6bf0dcefbb9a060a63de7ea87c3df0a5a76c14e01b248c9b21c1ed25379867f9e4d392b251f56deb93a78b2752a SHA512 9ba4fb7451f675fd9ad3e872adada708e9e7e8875f69567d9f2bef2cc8024667112538a385769eac2fd4b3c157266488458e76a1abc92d0a76109ca032103bcf
+DIST wine-6.14.tar.xz 24721316 BLAKE2B 3965d4071006a54f595baf329c1b238c4faa506d60597cfb5f8ccb127b9881d34d66e89cbdeff0d05a5e4a203a541edea8953565e2edf464ce4d2bfbf5e7a437 SHA512 261858dcf11604a6078b39faf64bd05288194647f8397efe03abcda1934ec5452e18f85dbb269e728ef532ac8ad39af5bbf5d8603f3598a20e2ef16f60405581
 DIST wine-staging-6.11.tar.gz 9672754 BLAKE2B a2d77fcfe198f9c474bb754b02c3e279faec73a30678b899aeaab53cba38b74bf43724d5b1f3d46dfa7a502b0ce637d5908dea09b386009acb937d1033445d99 SHA512 b9b6f206d7a37699887a9bd65c30b9d2fc333b507461dbd532fe17db881db1e79ef5620ce2421cdde8548411924fabba0f98123342f30c8d93a019b3a2125303
 DIST wine-staging-6.12.1.tar.gz 9658943 BLAKE2B 9ea46ef75f2fd42790da35631893d63471980794238862fab23f06433ecb6adbdd204de49b61f33e7600020d9b3156889709bcd58810f2f332ee890cbb17bd03 SHA512 d92f4e8e3cc81e9ede21135f35679d1b2de07bf75f4fd3878551cae74cdf5165c62573fd9e143458535565e21e8888f7f61cc413fdcef24f8958ac2de366a10a
 DIST wine-staging-6.13.tar.gz 9658122 BLAKE2B cce777895de69df8c659f010e432ee1d1f1e13c79d5453f4460e63e2572aaa7a9c92786170707c5616a8d182138822c0c6e27897706f919daf5597f6b595e478 SHA512 83a40b5a344db334541d94d58d287a1b8ff616114051129db20ac6b0365004a8753ec8d77a16da54ac26400eaa3e2d147d50a5ac8e17203898eb61cb06ff1f0c
-EBUILD wine-staging-6.10.ebuild 22003 BLAKE2B f325adbe8b0047c01bfce27cafd46a31adbc9b73193f8b1276758a21ff15fd6bccc875a9b41365b3ff0cead2d9999de958de12eeb9edb37a263bfbdede2fe07a SHA512 b57148c1628c8cc4d2a911bc2585e64011c2269bac1f5a2e21a729102811fb75439cf5d902311ea014594efd9651a0d1dd2dcac15eaa4938601c171f984e7624
+DIST wine-staging-6.14.tar.gz 9658088 BLAKE2B d64bc0476b3d46b9ba812c956bb1eab1e4c3ec0dbd2145ae1f38c95ebd9b7151222e375690c1bd601f3416f362e50ea3f670e9940977005dc67623de22e82485 SHA512 5b4db5c1af316c8e18e2e318152a44e45521dd939e3a341dd533e819263109237c4fd0e25ee2b23bb7cc75f4c4afd7d8900b23d83f955e4ff56ee5fe7aa84fd0
 EBUILD wine-staging-6.11.ebuild 22003 BLAKE2B f325adbe8b0047c01bfce27cafd46a31adbc9b73193f8b1276758a21ff15fd6bccc875a9b41365b3ff0cead2d9999de958de12eeb9edb37a263bfbdede2fe07a SHA512 b57148c1628c8cc4d2a911bc2585e64011c2269bac1f5a2e21a729102811fb75439cf5d902311ea014594efd9651a0d1dd2dcac15eaa4938601c171f984e7624
 EBUILD wine-staging-6.12.ebuild 21999 BLAKE2B a55e122e3137af8e2a6d1869aadeec0991d6b92f00f38f89a21c0234a1759247050632a86fe92ff971f3e0c15a454bb8591089887d89c011cc6136b987f4aac9 SHA512 8dc858b772310f205c7f7f3f8e0d971a45b09b4ecb78429f1da4c2379c9acbb7da7415718f82d18284d3ec4462255e0fa8fa560ec5873652c8eea81d438e2243
 EBUILD wine-staging-6.13.ebuild 21995 BLAKE2B f68471e5f6caca5bcb33a0119fd149f107c92b2d7950b9b0b28d07ee1ab077eede74662bc79a59d222ebd6e255b7c9be90471797d455ce2f0bd0937720cd42ff SHA512 160a3b7bc2e04c68b6b1c4b7a5c5e26e38ac2795f021628c05c8aa625373426fdaff23ee4843cbb10bf126ac71f1641212cf65cea1262224d3bfd921458f4a31
-EBUILD wine-staging-9999.ebuild 21928 BLAKE2B bdeb1480f4cf1a6643307d0418e40e0ce7a26e73d13567d041c5dd6cb295a4510cd61d1bf091fe04e3f487e44386393c2c8945636bacdf77a07df6053a3c5ddb SHA512 9c0ff3b14a7d47dcdc5ef5a0ef2fc49aacd9a184ac2397f81ab68db23d8d7afad2afa1404814efaf6fb6a02dd84fc08c4221b597694f99239d3a3abe8a7d8d0d
+EBUILD wine-staging-6.14.ebuild 21926 BLAKE2B 8c37ab954d9b015068d617ad9a22ba8025ef3a7f30c78335b782da14e707f5032dd1f9ea55c4cc7582ffdcecf367dce5924626b4df1e1afbf9ff3ab496b59abb SHA512 57a2eb3cb33bdb360c6dae8ba258b3d5c308c9262df68a87db36f5430f682ad54e3946d6286cfb592ac37ae761cad9065c458687a5100ee01b24d2f75fe86689
+EBUILD wine-staging-9999.ebuild 21926 BLAKE2B 8c37ab954d9b015068d617ad9a22ba8025ef3a7f30c78335b782da14e707f5032dd1f9ea55c4cc7582ffdcecf367dce5924626b4df1e1afbf9ff3ab496b59abb SHA512 57a2eb3cb33bdb360c6dae8ba258b3d5c308c9262df68a87db36f5430f682ad54e3946d6286cfb592ac37ae761cad9065c458687a5100ee01b24d2f75fe86689
 MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033
diff --git a/app-emulation/wine-staging/wine-staging-6.10.ebuild b/app-emulation/wine-staging/wine-staging-6.10.ebuild
deleted file mode 100644
index b8f90b4648c5..000000000000
--- a/app-emulation/wine-staging/wine-staging-6.10.ebuild
+++ /dev/null
@@ -1,665 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
-MY_PN="${PN%%-*}"
-MY_PV="${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	MINOR_V=$(ver_cut 2)
-	if [[ ${MINOR_V} != "0" ]] ; then
-		MINOR_V="x"
-	fi
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${MY_PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20200523"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-else
-	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	pipelight? ( staging )
-	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
-	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.2.0 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	staging? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${pn_live_val} ]]; then
-		if use staging; then
-			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
-			eerror "cannot be used to set the commit. Instead, you may use the"
-			eerror "environment variables:"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-			eerror
-			return 1
-		fi
-	fi
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environment variables:"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		wine_build_environment_check || die
-
-		# Verify OSS support
-		if use oss && ! use kernel_FreeBSD; then
-			if ! has_version ">=media-sound/oss-4"; then
-				eerror "You cannot build wine with USE=oss without having support from a"
-				eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-				eerror
-				die
-			fi
-		fi
-
-		if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
-			eerror
-			eerror "USE=\"mingw\" is currently experimental, and requires the"
-			eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
-			eerror
-			eerror "These can be installed by using 'sys-devel/crossdev':"
-			eerror
-			eerror "crossdev --target i686-w64-mingw32"
-			eerror
-			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-			eerror
-			die "MinGW build was enabled, but no compiler to support it was found."
-		fi
-
-		if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
-			eerror
-			eerror "USE=\"mingw\" is currently experimental, and requires the"
-			eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
-			eerror
-			eerror "These can be installed by using 'sys-devel/crossdev':"
-			eerror
-			eerror "crossdev --target x86_64-w64-mingw32"
-			eerror
-			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-			eerror
-			die "MinGW build was enabled, but no compiler to support it was found."
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${MY_PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${MY_PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-		if use staging; then
-			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
-			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
-				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
-				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-			fi
-		fi
-	fi
-
-	default
-
-	plocale_find_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	if use staging; then
-		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
-		ewarn "Wine bugzilla should explicitly state that staging was used."
-
-		local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
-		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-
-		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
-		ebegin "Running Wine-Staging patch installer"
-		(
-			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
-			cd "${STAGING_DIR}/patches"
-			source "${STAGING_DIR}/patches/patchinstall.sh"
-		)
-		eend $? || die "Failed to apply Wine-Staging patches"
-	fi
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		plocale_for_each_disabled_locale rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-	if use mingw; then
-		export CROSSCFLAGS="${CFLAGS}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gcrypt)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		# TODO: Will bug 685172 still need special handling?
-		$(use_with mingw)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use staging && myconf+=(
-		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		virtx emake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	plocale_for_each_locale add_locale_docs
-
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-
-		if ! use mingw; then
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
-			}
-		else
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
-			}
-		fi
-
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${PN}-${MY_PV}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${PN}-${MY_PV} || die
-	else
-		if use staging; then
-			eselect wine register --staging ${PN}-${MY_PV} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${PN}-${MY_PV}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${PN}-${MY_PV} || die
-	else
-		if use staging; then
-			eselect wine deregister --staging  ${PN}-${MY_PV}|| die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-staging/wine-staging-6.14.ebuild b/app-emulation/wine-staging/wine-staging-6.14.ebuild
new file mode 100644
index 000000000000..99423da3b703
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-6.14.ebuild
@@ -0,0 +1,664 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+MY_PN="${PN%%-*}"
+MY_PV="${PV/_/-}"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ ${MY_PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	MINOR_V=$(ver_cut 2)
+	if [[ ${MINOR_V} != "0" ]] ; then
+		MINOR_V="x"
+	fi
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${MY_PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+GWP_V="20200523"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${MY_PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${MY_PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:6.3.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environment variables:"
+			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environment variables:"
+		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		wine_build_environment_check || die
+
+		# Verify OSS support
+		if use oss && ! use kernel_FreeBSD; then
+			if ! has_version ">=media-sound/oss-4"; then
+				eerror "You cannot build wine with USE=oss without having support from a"
+				eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+				eerror
+				die
+			fi
+		fi
+
+		if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
+			eerror
+			eerror "USE=\"mingw\" is currently experimental, and requires the"
+			eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
+			eerror
+			eerror "These can be installed by using 'sys-devel/crossdev':"
+			eerror
+			eerror "crossdev --target i686-w64-mingw32"
+			eerror
+			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+			eerror
+			die "MinGW build was enabled, but no compiler to support it was found."
+		fi
+
+		if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
+			eerror
+			eerror "USE=\"mingw\" is currently experimental, and requires the"
+			eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
+			eerror
+			eerror "These can be installed by using 'sys-devel/crossdev':"
+			eerror
+			eerror "crossdev --target x86_64-w64-mingw32"
+			eerror
+			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+			eerror
+			die "MinGW build was enabled, but no compiler to support it was found."
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${MY_PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${MY_PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+	fi
+
+	default
+
+	plocale_find_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		plocale_for_each_disabled_locale rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir="${EPREFIX}/etc/wine"
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gcrypt)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		# TODO: Will bug 685172 still need special handling?
+		$(use_with mingw)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	tc-export PKG_CONFIG
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		virtx emake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	plocale_for_each_locale add_locale_docs
+
+	einstalldocs
+	find "${ED}" -name *.la -delete || die
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+
+		if ! use mingw; then
+			rm_wineconsole() {
+				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
+			}
+		else
+			rm_wineconsole() {
+				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
+			}
+		fi
+
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${PN}-${MY_PV}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${PN}-${MY_PV} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${PN}-${MY_PV} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${PN}-${MY_PV}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${PN}-${MY_PV} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging  ${PN}-${MY_PV}|| die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 12f275eb2297..99423da3b703 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -134,7 +134,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.2.0 )
+	mono? ( app-emulation/wine-mono:6.3.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -571,7 +571,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name *.la -delete || die
 
 	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
 		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 8e0345fd9d8f..0bcaf20895e2 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,15 +2,15 @@ AUX wine-vanilla-6.12-winegcc-equals-args.patch 666 BLAKE2B 1546e146a5942c46c01e
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST wine-6.0.1.tar.xz 24210540 BLAKE2B 2075e59024e75594e0be0851db33981ebfcc57477bb9864055a938db0e39b8480f3c501b1d1fc39a9eee52303ad71ef71d24a0fb546697eecf3bb098f13317f1 SHA512 06b720d6adbbb7e2f15b963e4f3f1ff06e6d0d3973064d866ae720e6380bab8881fd1ebf16665435f5f7976b2c6dc72fd20631678a28e9d4d7b068c30cd22bb0
 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
-DIST wine-6.10.tar.xz 24562432 BLAKE2B aeb4efc6fcbdbbbfa71a99112224c77e1da10468e47d49de87ecf06556008e83d6e3d8655fa4439293820663910897d512a77bb78ab771632f893b46745915af SHA512 f0e8f0bdab09c979772965d167d687e88998f3fd6537a592e201a2dc9097552e03b1c413516cc8c82665a8bf17580777f48bd1ed9033641f04e7ef7f0b29cc60
 DIST wine-6.11.tar.xz 24599644 BLAKE2B 47b8eefadd59e649ac331ee236b90dfffd86ea812699f3d804bd3a7d939d099c88c4b19cf8d8e0bbe2463298abe398528c132443350f3d5eba0d23e7a3a2889c SHA512 d041ad99b6311f99df6ef40a64bc393acdc77ad4bf5f28111ebb88c133c3d338aff18f129fb30ae38cca24bf579834d4e6c7d252d5391f35b1ee81a91cc70c21
 DIST wine-6.12.tar.xz 24666960 BLAKE2B d8f33ac0d15977c1e0c206662c370feac351c7399c91cf5669fce50e60684ad85b40244925b4d304b540f5a78edc19b4ee32fe362250f8c390347d71320a09d8 SHA512 6d5646c44e656a88eb25174ce16038a8b0e1495c3deed8e959825cb26059fdda6e6519afeaeb28e4070fc5e05d7a3e1e5812ef09c31875f14f9233ba6a52f14c
 DIST wine-6.13.tar.xz 24704408 BLAKE2B abd79fd0d2a364fd6b7c2713924ad9883cf62e0febd7653984ce7520f41eaad71c06e0874ff46343ac7c253abb7d5e026b878dcf40235918f075e2bf7da0b8da SHA512 7e1a16873f1a160960e44a38c7af743ea3a10bc545c5724745733d14093188134b74a4f60fbc54f38546b0ed053209b67e35ea131a9cda58ec8041855100c5ee
+DIST wine-6.14.tar.xz 24721316 BLAKE2B 3965d4071006a54f595baf329c1b238c4faa506d60597cfb5f8ccb127b9881d34d66e89cbdeff0d05a5e4a203a541edea8953565e2edf464ce4d2bfbf5e7a437 SHA512 261858dcf11604a6078b39faf64bd05288194647f8397efe03abcda1934ec5452e18f85dbb269e728ef532ac8ad39af5bbf5d8603f3598a20e2ef16f60405581
 EBUILD wine-vanilla-6.0.1.ebuild 18930 BLAKE2B 93bb18a7e02a46a2cdb448a5b6ea97dbd3353361730f9e6a571d93129b0f084133a4d29fe4686c9ff3219147779a018c6efebc13c25c04c3e13d5969ec8a1e6f SHA512 adf6b9fbe94882bd43656124bc7d670c7a2030aa63d9124bcd7a3a349da5897e548b9ad5072299e5eee640b8ed33890074b9605580959847f04c9ceecff3ac51
 EBUILD wine-vanilla-6.0.ebuild 18930 BLAKE2B 8aae443e03983edc1f972805d62af4e131fec25163f478851587bbf106d366cd6b64f8b789cc3c12d66d74072b70a38706f1a2045c8dcf526f63e16473af944c SHA512 f155ff81b2a51bc570f6d126b7052b862284463e375346b787a580e663319598424d33e48fd7ab5ac7116675e09a30fa96ae6976ced7890c01fefbf114830239
-EBUILD wine-vanilla-6.10.ebuild 18899 BLAKE2B 18e25525d7ac893717e1107ce765369795d1a0afec1e479c498255d9980ae7b5455efe192e695a3f44fbcd2e14a0afa76ab40e6cb2b7af6b48053cee8883f4aa SHA512 c82e0f327ab194444b3487574eb17a5e398cb7d272054317095949a2b3935fb99d2255ad9b2ef9def11c3ff1dd5656588b66bf4101013e1b641183ce2a2e8b2c
 EBUILD wine-vanilla-6.11.ebuild 18899 BLAKE2B 18e25525d7ac893717e1107ce765369795d1a0afec1e479c498255d9980ae7b5455efe192e695a3f44fbcd2e14a0afa76ab40e6cb2b7af6b48053cee8883f4aa SHA512 c82e0f327ab194444b3487574eb17a5e398cb7d272054317095949a2b3935fb99d2255ad9b2ef9def11c3ff1dd5656588b66bf4101013e1b641183ce2a2e8b2c
 EBUILD wine-vanilla-6.12.ebuild 18966 BLAKE2B ff96fc3b65e63a4435dfdc855660196374491bff091da0cdb953ebf050c5fa50e1056537d87b40f0c75ee9680f8ceaabbd74d29d87a0187cf03e368ba85ca82b SHA512 17b6509df64baaad62fc917cc2191ef0a65345eadf62fc813e09a121de2ca19751f454ac1e90d88d3b3d3f3409423097f30f3a7ed9b4f45ded386b5fbd147e85
 EBUILD wine-vanilla-6.13.ebuild 18966 BLAKE2B ff96fc3b65e63a4435dfdc855660196374491bff091da0cdb953ebf050c5fa50e1056537d87b40f0c75ee9680f8ceaabbd74d29d87a0187cf03e368ba85ca82b SHA512 17b6509df64baaad62fc917cc2191ef0a65345eadf62fc813e09a121de2ca19751f454ac1e90d88d3b3d3f3409423097f30f3a7ed9b4f45ded386b5fbd147e85
-EBUILD wine-vanilla-9999.ebuild 18899 BLAKE2B 18e25525d7ac893717e1107ce765369795d1a0afec1e479c498255d9980ae7b5455efe192e695a3f44fbcd2e14a0afa76ab40e6cb2b7af6b48053cee8883f4aa SHA512 c82e0f327ab194444b3487574eb17a5e398cb7d272054317095949a2b3935fb99d2255ad9b2ef9def11c3ff1dd5656588b66bf4101013e1b641183ce2a2e8b2c
+EBUILD wine-vanilla-6.14.ebuild 18897 BLAKE2B 39847117b0a7d36dc30292780af1b5633ecbd617961a3991a950f0a3f440270c2811df7476bb125edc5465e81a250869d7680e3d5f8225efc9ebef460bf4b446 SHA512 f58436347505b474e01b827c5c3d0565bea1716c9b2a2cd767cfc82327d36a7837eced155d6db164cbb4922ac66287c74b808f3cb14e7b2ad5c34cca1a64f53e
+EBUILD wine-vanilla-9999.ebuild 18897 BLAKE2B 39847117b0a7d36dc30292780af1b5633ecbd617961a3991a950f0a3f440270c2811df7476bb125edc5465e81a250869d7680e3d5f8225efc9ebef460bf4b446 SHA512 f58436347505b474e01b827c5c3d0565bea1716c9b2a2cd767cfc82327d36a7837eced155d6db164cbb4922ac66287c74b808f3cb14e7b2ad5c34cca1a64f53e
 MISC metadata.xml 3493 BLAKE2B 5574a661321f07674198bed06bdd632ccd5e46a4b4a15b49aef8882f5f6afa1a087a9fdb308bfecd80a9ea32d6b1135ff1bc2733ac3748d83d8754e4228ac1da SHA512 1e7d4867143412d7261b8f977f82df67ea9777dc1168e0ac3e428f68ac93314528df75b45a573dd96910d02a2357b75509c90b2de531b8188ce2e474a30d52e8
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild
deleted file mode 100644
index 834f66e2ec07..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild
+++ /dev/null
@@ -1,577 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20200523"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.2.0 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "EGIT_OVERRIDE_COMMIT_WINE"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-
-	if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
-		eerror
-		eerror "USE=\"mingw\" is currently experimental, and requires the"
-		eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
-		eerror
-		eerror "These can be installed by using 'sys-devel/crossdev':"
-		eerror
-		eerror "crossdev --target i686-w64-mingw32"
-		eerror
-		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-		eerror
-		die "MinGW build was enabled, but no compiler to support it was found."
-	fi
-
-	if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
-		eerror
-		eerror "USE=\"mingw\" is currently experimental, and requires the"
-		eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
-		eerror
-		eerror "These can be installed by using 'sys-devel/crossdev':"
-		eerror
-		eerror "crossdev --target x86_64-w64-mingw32"
-		eerror
-		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-		eerror
-		die "MinGW build was enabled, but no compiler to support it was found."
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-	fi
-
-	default
-
-	plocale_find_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		plocale_for_each_disabled_locale rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-	if use mingw; then
-		export CROSSCFLAGS="${CFLAGS}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		# TODO: Will bug 685172 still need special handling?
-		$(use_with mingw)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	tc-export PKG_CONFIG
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		virtx emake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	plocale_for_each_locale add_locale_docs
-
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-
-		if ! use mingw; then
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
-			}
-		else
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
-			}
-		fi
-
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.14.ebuild
new file mode 100644
index 000000000000..6f3f1c572f47
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.14.ebuild
@@ -0,0 +1,577 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20200523"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:6.3.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "EGIT_OVERRIDE_COMMIT_WINE"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+
+	if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
+		eerror
+		eerror "USE=\"mingw\" is currently experimental, and requires the"
+		eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
+		eerror
+		eerror "These can be installed by using 'sys-devel/crossdev':"
+		eerror
+		eerror "crossdev --target i686-w64-mingw32"
+		eerror
+		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+		eerror
+		die "MinGW build was enabled, but no compiler to support it was found."
+	fi
+
+	if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
+		eerror
+		eerror "USE=\"mingw\" is currently experimental, and requires the"
+		eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
+		eerror
+		eerror "These can be installed by using 'sys-devel/crossdev':"
+		eerror
+		eerror "crossdev --target x86_64-w64-mingw32"
+		eerror
+		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+		eerror
+		die "MinGW build was enabled, but no compiler to support it was found."
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+	fi
+
+	default
+
+	plocale_find_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		plocale_for_each_disabled_locale rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir="${EPREFIX}/etc/wine"
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		# TODO: Will bug 685172 still need special handling?
+		$(use_with mingw)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	local PKG_CONFIG
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	tc-export PKG_CONFIG
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		virtx emake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	plocale_for_each_locale add_locale_docs
+
+	einstalldocs
+	find "${ED}" -name *.la -delete || die
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+
+		if ! use mingw; then
+			rm_wineconsole() {
+				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
+			}
+		else
+			rm_wineconsole() {
+				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
+			}
+		fi
+
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 834f66e2ec07..6f3f1c572f47 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.2.0 )
+	mono? ( app-emulation/wine-mono:6.3.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -492,7 +492,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name *.la -delete || die
 
 	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
 		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index c3ff2d65ab1e..6f32987654bb 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index 1a00fa37bf60..50ef76913bbf 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,5 +1,3 @@
-DIST eselect-repository-10.tar.gz 7123 BLAKE2B 786255e8b83c1348c16ec6e30495e7a0c305d48430712fd2bba28367d27d0e5eea1fe9176636f7896f48feebb71a9a3daa025fdc2f8032d2e6a3c59bd6b5c0c4 SHA512 4a03e1b9ddf3d8f79429e0a98cd03804867ba4594945ddda518be06c07e6e5737c77b8c57893a8cf5930548c96f0d436786d95bed624041ad52ab603348337b2
 DIST eselect-repository-11.tar.gz 8554 BLAKE2B c7bdd1559c310c492b2c00c7a7cb92d48ad24a69ff4485c1282c67b7dd211360fcda6d96eec2b9e734a1b4745f2a0fe9da1ff20d62bf1174a64b6016097ea634 SHA512 31b0b36122e580a018ca66d112cdddfbfe1568030fb9a20440450c17c759bfb872eb7ef99036a3dae14e8384a8f770354fd4cd362ed594408ae9e8dbbc6dea68
-EBUILD eselect-repository-10.ebuild 969 BLAKE2B a4122bc0eb40145e010eea9ec409384b15942dc4a5fe34b2b04ff49883d81cb84e8687f5cce7c90c51b7387fc5ac4722e401b915b429ea40df868dd83b315e23 SHA512 497bbbfe2a9bdd6015a61eab9b40e062824beb50e59fc9850dc76dd9bd1389aecdacbc6d3c1536776d6dbbe406a47d78f9ab713c5ba92127ba1108d8b3e87697
-EBUILD eselect-repository-11.ebuild 1133 BLAKE2B e5b8008ced2b478c424cdcca871c8f1746a20c5d519495811b1fe551149ba50c16f0e435b3ce7e4ed49c47830c5f9360b8ac87a273855a1f60bea6e279a37835 SHA512 65c1360324945f1cba4c4b2c5d6abb32bf08b0dc547ce424fc12884cf64043c080183b5ab59da3486c14ace6f589d2a0e10334369b8134d4ebd072f17bf85ae9
+EBUILD eselect-repository-11.ebuild 1127 BLAKE2B c04450bc4475cd5b82aba5c55ea817d93f078cf60c0f0595b1633f85fc6615fbb39766d19536dca4f812131f640d55c5452424e64bdb69823e143e9012113b89 SHA512 ff82297e608c46e8afdd106b28ae7c02d608e28b2514b6aa99cd90ec2b5f14972c2ca134b2df0d5c75de8238ffcdd83a7cbdbbfbeee502c3119de483d01affa2
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
diff --git a/app-eselect/eselect-repository/eselect-repository-10.ebuild b/app-eselect/eselect-repository/eselect-repository-10.ebuild
deleted file mode 100644
index 17abf1b7a558..000000000000
--- a/app-eselect/eselect-repository/eselect-repository-10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit python-single-r1
-
-DESCRIPTION="Manage repos.conf via eselect"
-HOMEPAGE="https://github.com/mgorny/eselect-repository"
-SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	app-admin/eselect
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-	')
-	net-misc/wget"
-
-src_compile() {
-	MAKEARGS=(
-		PREFIX="${EPREFIX}/usr"
-		SYSCONFDIR="${EPREFIX}/etc"
-		SHAREDSTATEDIR="${EPREFIX}/var"
-		ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
-	)
-
-	emake "${MAKEARGS[@]}"
-	python_fix_shebang eselect-repo-helper
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/app-eselect/eselect-repository/eselect-repository-11.ebuild b/app-eselect/eselect-repository/eselect-repository-11.ebuild
index 8a6bf3e77577..a27e3190d6f6 100644
--- a/app-eselect/eselect-repository/eselect-repository-11.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/app-eselect/eselect-rust/Manifest b/app-eselect/eselect-rust/Manifest
index 818c773cde36..7764d5e2d1c0 100644
--- a/app-eselect/eselect-rust/Manifest
+++ b/app-eselect/eselect-rust/Manifest
@@ -1,5 +1,5 @@
 DIST eselect-rust-20200419.tar.bz2 50278 BLAKE2B 5d5e773a0e0481403e1645cb5fdf642e1ce5d1819e9699a79fcaf822ff3e6f258b2d1958548e00df200d9aaf061be1d3b1773e6b0e92b498fe75316ac13ff235 SHA512 68db32df19864a8365e272946161966b9cb513d7403dd1df7a4c7d87fba3b8bfcad59b407dca7dd6c8e0756f2e5cbde367ade69629eaa78d019d2b524051f741
 DIST eselect-rust-20210703.tar.bz2 4253 BLAKE2B 1d04c00db1794148b6d908c44172b8958f5ae2c7753875675387eea175ce914b7315452923a819d1b77bf22f10493ba9704c70d48388faa080b6af49efccb956 SHA512 b8f4f03f299a8415019746964347dffc5520dfcf79fd9d059bf600f63045ab80f8692509f0358be427c676ce98692ac8342b6f447aef21ce4d7ca048741b5e47
 EBUILD eselect-rust-20200419.ebuild 759 BLAKE2B b449fed659a0f996b3f8f055a520e2d1b5de8bf4a4e61a75000343f794d5b24aa33a746d19a695d934334289d5334427fe8e6077dc4ca2a35e5f0b8667a22835 SHA512 4378cc45dd44a93cf6a13b7a754ece71efb05f171079c29775b11e3d460c6fdbe067acb5c53062db3b73fe2683915dec80dcbccf18657bb5aa03ca75ec7627b1
-EBUILD eselect-rust-20210703.ebuild 759 BLAKE2B 8c6b9a996d741ba2380817066bef8aa7a677571b084b3b3e42bf2d36072a6227e294b71ade17d13d0e1d665307c1620050f26830410a207ba2edf2dd521d832f SHA512 20b7a506a811f03531bb10480c0b1c3b45052cbdbe0b7c71aab9d884b1d8ec1f54aa820c28fd7fb37768eaf19f82d3ea81b8a12eaa8665501a9927bff1736290
+EBUILD eselect-rust-20210703.ebuild 752 BLAKE2B 87e2a2742e174bb634b7929023164ed3ee16ee63fd33b4c584dc20b737a9caf41f62722017224080e7c34f6816f85a046fb717ec3c24880612b791349e89ce40 SHA512 36e633f63a3509eef7ed497dbf6a25dffaadabd9cfeb74833a9e7c04903d3fae32c693b622545e0da1dd7a96c3b029a0e9bb3e5c9c4be8abe7c65faffa173583
 MISC metadata.xml 240 BLAKE2B 691410804dffb7523e05b7d379ed7ac5a84a52c7e725b795112e708763c421963513389c35a127c3d62124a5c092cee6e9f2a527ff89b2bcc9ee2911c4256255 SHA512 becc7240bf6a3df9a43834f2933c1fe6fec75a4c6a861595d69a61bddbb68d61af2ed24666f249575c8ddee8cc36ed1f27b030839430436c91d747252d761a99
diff --git a/app-eselect/eselect-rust/eselect-rust-20210703.ebuild b/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
index 6971f663f9db..210ce3086bec 100644
--- a/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
+++ b/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
@@ -3,13 +3,13 @@
 
 EAPI="7"
 
-inherit autotools 
+inherit autotools
 if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Rust versions"
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 52e1952bd0a8..e25c2ccaa93a 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/chkrootkit/Manifest b/app-forensics/chkrootkit/Manifest
index aaddc38757c7..1ffc27d228b4 100644
--- a/app-forensics/chkrootkit/Manifest
+++ b/app-forensics/chkrootkit/Manifest
@@ -4,5 +4,5 @@ DIST chkrootkit-0.54.tar.gz 41461 BLAKE2B 61384fda7db08ca2a52ab060ee4ea3edb7311c
 DIST chkrootkit-0.55-gentoo.patch.bz2 5028 BLAKE2B f8f809252d89b9195601953c6741c9a653b658d86669f149380dc94da91085921f58fef7e6f232cc421cf62f7321630120a85ec4dfdf369d6e92c0a7ae81e0f1 SHA512 bdae4fed6f8c61337e855235bf84b20faa363a3dfad9b2f22a017bd232aaf7f4bc0680f2b5567d6545ef3cb6ce7d41cc2287f4f0a2baf68ce3c56c68df8c77b8
 DIST chkrootkit-0.55.tar.gz 42630 BLAKE2B 0e6bc4d411a7836cd8ab72782027e5bd80b5c8845d8de1f48ff57bc0617a368cff2471835a66c30d007f4cfc243639110e0c39e02eecc3ec9c5c0a66a4b7891b SHA512 742dca90a761ecff149d8704cb3a252adfe8f9d5e15dd060e9db4d5f6dcd3820933ae13cbee99ea5a8c6144932cf97c0616a177af3ba5a1726b51bb304e7d63e
 EBUILD chkrootkit-0.54.ebuild 1283 BLAKE2B b86b5b2cfe78135e5d9caa6323b2e2ccdc0584c503d84354276c4d1843234e39a598a4e352af6925738595859a8a74ea0700fba44765d7c587c7c03c3d8bdec5 SHA512 beedbb3345b227c9273b4a33de22bca4edd768b1b317a967d27b3da99aa8b45003bfb0f63d65275ba13e0aa9b0988771a5b3cb265da87935b4aa62c46e75368b
-EBUILD chkrootkit-0.55.ebuild 1321 BLAKE2B 6148f473ee67bb07b925b01d05069749ff521b246caa231c01e685125661ab0653fc12732799518a1175a65dc7963ae3944613524651c4fb3331a91810bd475d SHA512 a4aa7fa821ff774fe3d1f79c2af29f68b7d0bd4ecb4c73a6988ba446d51e7a4ae57c97d5ae2436b42dc0b95a5761612a02b0101f62ed2dd7245953a06d69dfeb
+EBUILD chkrootkit-0.55.ebuild 1315 BLAKE2B e0ec329741218f8488fb05eb4ca2aaa30e889da18ee9dae3fbb27e9e1b55a7c2ff887faf669e6c256d0873387a9609e69296c0ad70abf393d958412703f9c3a7 SHA512 8df914ccef498dd24003d07e0883fb7c5ad02d77852a7d1882a3114253ae2ccc7a143250ea716849ef2e829b73dc6951be631554a1b6efe205125ff32983c35c
 MISC metadata.xml 254 BLAKE2B 82f42628c121ed27ad00d04687d2f6b52148571b49f1c8f4a81cf47ccf2e857b16c9d0c6a3da2f8bebd6a8803d433a874e8066f48bd18ff960923f53bd15da7b SHA512 f0b5ba232a76e933dd34a7e3e7fa04e627de0201610166f4758c5ccf888f509815b5cc39f5373b87a413496318f507bf28599ec0995d32bde98a7c65287d39bb
diff --git a/app-forensics/chkrootkit/chkrootkit-0.55.ebuild b/app-forensics/chkrootkit/chkrootkit-0.55.ebuild
index bb1c05505fc0..a81de87dc1c1 100644
--- a/app-forensics/chkrootkit/chkrootkit-0.55.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.55.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${GENTOO_PATC
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+cron"
 
 RDEPEND="cron? ( virtual/cron )"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index ebd082a163f9..794575dbe7ef 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 7521d92fba53..fd1f9ca26ce8 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-m17n-1.4.4.tar.gz 490328 BLAKE2B e7b5c417d4cc16cea736dfadc504137218397ed1ce6318dc6edc48ec33b13051b43d2f7926a959aafe79025c2af1a35374a7dcb4cb4fee952df85b25b604d07a SHA512 df8be7ceaa2183ffb377e39f52b271f18825a8970f88972d0a43ed1fa2721d36bf564a20f89311541ffe19546441322fc568c4819e42e41bdff45ee137d6de80
 DIST ibus-m17n-1.4.5.tar.gz 493250 BLAKE2B a5fd4de169997dea78acf6273a7e44cefbc9ab4499cbee92c30f394ef7267c15fb1af42d45d227bc160150f35195477f9ec3d2534f9764bab4fa86c0fae046eb SHA512 64bed564d59b0992ebc8a931e0845f687c176e5336d7c7fbc1d575433eb276714615f8fee412a532ec2c8870e46d8d6c41636c984b666c92427dadbdc84838b5
-EBUILD ibus-m17n-1.4.4.ebuild 894 BLAKE2B e546c29fed4e3155af586f96836a8720427d272a3eccd432d92778b765dc7ec3347056168eb1decfa0166ede011225a95c80cefa28d68a11d69b30cda91f0590 SHA512 a7e6fd76f12992613c486857b0dd30471175bf56bc0ee5cc273bb21e999cd59a309e1922b204633dd113e18b220051dfc6bf1b6289e56f168b5302fe77fa2a38
-EBUILD ibus-m17n-1.4.5.ebuild 896 BLAKE2B a8a7a9cbf44d8325aa3f59c87ab7b2d1407ae9306c089aad54c7368f315be9bf83bc3b712b9e6e2f42b48e428af4af1431a4b51e24bc5861be6061bd06e47451 SHA512 f78da526515464797d8e98ed7af6879d53da7b61131ffd8332a3e7631d6b8f886b3d7aeb4dfc0a954d0603d2a1bb81d69864fe1742b52592644cc9e110aca12d
-MISC metadata.xml 679 BLAKE2B a374aafbf949a9cb71906396787329ea1cd31775b29bf1675b30c98098e1025ee5e96dcdce2e8324bd6d3bfc05e854f89b1120a2e9410834a4dab767db1336b0 SHA512 c07286ebfb6f8bcf82c4fe6b5d02cf0a49287c7609daa42a356b8bfe7b3c074558d39d987decbffd15b10a33d475630b5f7194ff9941c9762c87dbcbefada953
+DIST ibus-m17n-1.4.6.tar.gz 493592 BLAKE2B 1b9978277a008a4e72ffe03306d409532da7757d53cdb8bae9d6b5776b417e3b731fe432cb5f5c50f7f52d83ed9a2dd572a866111f9186ac42f5ce8afe511ad4 SHA512 d33c89735e5e6c93301a3c3985f46708e41d44b66e580b282e484a7497c0b9d2615c66931cdd7260b4a63d9e9af4d9ebbad5e23d4a3f8a7773dcab61a7600c57
+EBUILD ibus-m17n-1.4.5.ebuild 801 BLAKE2B ae98e47abf2b6a6df31f97e538132ff89550861bcb6e736f7cc626ded61eea34d7e7437119f67483b70a24190e16a26bb47345e7dc023bf8f0d88a0b1fd8341e SHA512 c4e4525aecd307997c3a7a497355fb91cbdf50eec1e1596ca812b7188e2de71b54626bf8efd33efaef28625a015e5aedd91c962409b521f59e05e739be5a41da
+EBUILD ibus-m17n-1.4.6.ebuild 803 BLAKE2B 407d381baf82ab7a97876f9539735575b68175e745d0f7e8b4a83d4bf89e1b8aebfd56dc0bc462c2a751e39e2677a8e3b25c7b2e3cc0c7d1d6d74ad1d3513110 SHA512 f8a64621c6d98ec52730f3fd9713245a8b9f47c076b67c786b291cfa39febd66bd51132845f4a2b205a00006488c83b4b83b9f43de633a37ac5e743768499899
+MISC metadata.xml 554 BLAKE2B c3d636f6ca66bf158aa6435c5c77b83be2a60a0b61b54bea1aff3ea80f85e4169179da60c854de6a4691d4b2eb7c6dc3e77f0242767b389e4b66538d79a5c3ea SHA512 10c6ed207eae7ab5ec04dba82c51a2f1f57b2ddec109d6ab108e6da1c14d599db5a9af9e674844383244b063bfaf2a3c47c9639f87f4c2b45b304465cb350796
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild
deleted file mode 100644
index 79d7891abe84..000000000000
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="M17N engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk gtk2 nls"
-REQUIRED_USE="gtk2? ( gtk )"
-
-DEPEND="app-i18n/ibus
-	dev-libs/m17n-lib
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	>=dev-db/m17n-db-1.7"
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk gtk $(usex gtk2 2.0 3.0))
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
index c8aebffadc30..8ec1183befae 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
@@ -11,16 +11,12 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk gtk2 nls"
-REQUIRED_USE="gtk2? ( gtk )"
+KEYWORDS="amd64 x86"
+IUSE="gtk nls"
 
 DEPEND="app-i18n/ibus
 	dev-libs/m17n-lib
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)
+	gtk? ( x11-libs/gtk+:3 )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
 	>=dev-db/m17n-db-1.7"
@@ -30,7 +26,7 @@ BDEPEND="sys-devel/gettext
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_with gtk gtk $(usex gtk2 2.0 3.0))
+		$(use_with gtk gtk 3.0)
 }
 
 pkg_preinst() {
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.6.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.6.ebuild
new file mode 100644
index 000000000000..1fabfb506072
--- /dev/null
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit gnome2-utils xdg
+
+DESCRIPTION="M17N engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk nls"
+
+DEPEND="app-i18n/ibus
+	dev-libs/m17n-lib
+	gtk? ( x11-libs/gtk+:3 )
+	nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	>=dev-db/m17n-db-1.7"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gtk gtk 3.0)
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml
index 481dbcd8c9d1..b120c362d923 100644
--- a/app-i18n/ibus-m17n/metadata.xml
+++ b/app-i18n/ibus-m17n/metadata.xml
@@ -9,11 +9,6 @@
 		The M17N engine for IBus. It allows input of many languages using the input
 		table maps from <pkg>dev-libs/m17n-lib</pkg>.
 	</longdescription>
-	<use>
-		<flag name="gtk2">
-			Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:ibus_project:ibus-m17n</remote-id>
 		<remote-id type="github">ibus/ibus-m17n</remote-id>
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index e83c990e9aed..5e0bcfe41fc3 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-table-1.12.4.tar.gz 1371890 BLAKE2B e0d531bdd38e536ac9fc92465a651e971969278ab4826198d12399ebb1cd747d1f5d21713ecc86311ab3995b04a2842d230da8caed962045a959ba136f197cb1 SHA512 3e175dad8d9e12be91f6b6878b67301bbbf04c55e43d483162d3b10d2edbdcf1077d1f37beea2ef36323eb7de289a0c60cd3d055357a580e5d18bcc642bb907c
 DIST ibus-table-1.13.3.tar.gz 1408143 BLAKE2B fda380e284a996d34053f6bae543ebc2c072ffbd870a9421b76f18a3fa5e45ca6e687818f40bd1335791f1b92dc7ffa1ccc35c7cb55d1a6ade26bc958a2bf8d4 SHA512 2959b2f96c9a490032dafbce2b4164fcc07797ab73e735f26003156a891e1e3760e6a4f42713084b5ce1e408cbe21c3060d99615d898fe50b8d51405dcd42a3b
-EBUILD ibus-table-1.12.4.ebuild 1035 BLAKE2B 3d6f6497234af6e53a4095bc5fed4eb26c327efc72ab66133125aa015548d22117a97d4547acea1cd72b176c8eee9c8cbdf85566d87dec87b9d84f872fa92e34 SHA512 846f9911b80ed5230af4957c490f34969f4608ecf6f5011eb4ebd7742bdd5b64493df1b06951dd1edb678a4e8067400b5c6a28f8acdd6728990801e40d6ae29e
-EBUILD ibus-table-1.13.3.ebuild 1037 BLAKE2B ae710df21cae6d1efc385cb6dc2bac6cfc5dc899307a7b983f317d03160d0f7398afeebf2a5e040a422efba2fa98c508ff52fa38205f6b49c1d42191e5dc5c8c SHA512 8f1fa8e7a21ee39a7513413068f4a4e4c8e7e1f53249278b9db6a351caf763e401f70b1b51ef44efde28de9f88fa4116c1663f1de621ec84cf368e6b55768af2
+DIST ibus-table-1.14.0.tar.gz 1450310 BLAKE2B 72a655e378b39324ff849e6941dc28920760d030d748a5b4b0899e14b94874a52581d03ccbef2d72c5eaae51d20a0e19690bde5a1411960347fe49cf3137d21b SHA512 60e570b82c4f05200410e9e4e155089223a20ebcf66d1c039a783108005f63699e75bc528fc30cd370c1400b65e765ade0d069184bd2ab81e2eda9bade2e8ac9
+EBUILD ibus-table-1.13.3.ebuild 1035 BLAKE2B 3d6f6497234af6e53a4095bc5fed4eb26c327efc72ab66133125aa015548d22117a97d4547acea1cd72b176c8eee9c8cbdf85566d87dec87b9d84f872fa92e34 SHA512 846f9911b80ed5230af4957c490f34969f4608ecf6f5011eb4ebd7742bdd5b64493df1b06951dd1edb678a4e8067400b5c6a28f8acdd6728990801e40d6ae29e
+EBUILD ibus-table-1.14.0.ebuild 1037 BLAKE2B ae710df21cae6d1efc385cb6dc2bac6cfc5dc899307a7b983f317d03160d0f7398afeebf2a5e040a422efba2fa98c508ff52fa38205f6b49c1d42191e5dc5c8c SHA512 8f1fa8e7a21ee39a7513413068f4a4e4c8e7e1f53249278b9db6a351caf763e401f70b1b51ef44efde28de9f88fa4116c1663f1de621ec84cf368e6b55768af2
 MISC metadata.xml 314 BLAKE2B bf730195fa020f6a78881c37dcca2874ff8d055f92cbfdd5c8a051bae6e6e7ba79f3346962e9dba9b424e69e6c01dbaffd65b2ba27aa374bbb34d7569f360868 SHA512 9abb502029e18744eee84d9a362594222a10ae9efb9a4d42d9bab1fc04b57c1067051676b028b10304d10a3925b23ee8bb5542d289db071b1c189d19764f81ff
diff --git a/app-i18n/ibus-table/ibus-table-1.12.4.ebuild b/app-i18n/ibus-table/ibus-table-1.12.4.ebuild
deleted file mode 100644
index 98017235346d..000000000000
--- a/app-i18n/ibus-table/ibus-table-1.12.4.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"
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="Tables engines for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-RESTRICT="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	virtual/libiconv
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	python_fix_shebang .
-
-	default
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-table/ibus-table-1.13.3.ebuild b/app-i18n/ibus-table/ibus-table-1.13.3.ebuild
index ff60ef200c5d..98017235346d 100644
--- a/app-i18n/ibus-table/ibus-table-1.13.3.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.13.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/ibus-table/ibus-table-1.14.0.ebuild b/app-i18n/ibus-table/ibus-table-1.14.0.ebuild
new file mode 100644
index 000000000000..ff60ef200c5d
--- /dev/null
+++ b/app-i18n/ibus-table/ibus-table-1.14.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Tables engines for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	virtual/libiconv
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	python_fix_shebang .
+
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 7bc051932e43..4cc2208b4e05 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index fda2c4d0f80f..e8980e10e0b8 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -2,6 +2,6 @@ AUX 0001-Fix-case-sensitive-name-for-lmt.py.patch 1515 BLAKE2B b4a3007cc81d31c03
 AUX laptop_mode.init-1.4 1059 BLAKE2B 24dcf91d75df6cffe13cda1c8b9c85c016dae393f79f14ac0bc37c293e0d40e7e7cb34bc31b1c387c10ee74978d1c030fafad60f4e2428a8fcadf03163d5e48a SHA512 4242cda1df6b55cd0bee66dfb9137b6f63118bc31c5f703ed44c42738f47dc794d7f1ed6dd9ba5696b606c4bf624428e8f21e1683cb698d8dda249833a4c5f68
 DIST laptop-mode-tools_1.72.2.tar.gz 121437 BLAKE2B 1fdcdb88183156e4983b4561218164df5dde9fc91e85ab0ec1e6a401d3e5c5e70597a97e16c476949e80a674c34683eac6429e64e76c7921bd28f560e4ffe3cb SHA512 9a3960bad518aa73350b72ce30aeb80f3cbb1bf0fd6a11d5afe396b25c2b73f3b3d2fe7de0741eb94c9e3467c85a99741dc7acfd85339b9eb1daca09d3f8c56a
 DIST laptop-mode-tools_1.74.tar.gz 124163 BLAKE2B 5080a646b7e0ddd53709aa445abfdde2ea4a7643bf97f86c6d7ca612b6e46210c825df1c01389125ff2dd79e37d2421b76db28f7415454c77a776c3526a08d12 SHA512 70154c5833c02e2adf50bf03b3d05b98946cb7fc5acb73c05f105e3bc34d62e54e57db98be6877b8ebf2d1b951de73ad5afee9a5f7c85a76055ddc0868d5397d
-EBUILD laptop-mode-tools-1.72.2-r1.ebuild 2651 BLAKE2B 6029a915aa0984c9c7646291c8d733e1d7bffc46ed20690624eb386d2f4f75c95f2c65be8f0b1821c9d2b0bfec3f347bfbeac57024c04d3464be4f020bbcfe32 SHA512 2a5f2059ff323c87851600d2c8d14565cbb3e5abf3b767a471b4e74c1b024b4c0ce874cd52e90ac4812ac276f66b0717e324b377e057cb1e353992eece6f1e12
+EBUILD laptop-mode-tools-1.72.2-r2.ebuild 2696 BLAKE2B dc189d0081dc0f9e5d4ff0f2000e30678070c21161314ee9aec8719d29825fc2036a2265822a4d37adfa7c0d560f4b3c71ca348cdb3ca4e6fc73b81154598ba3 SHA512 527a0efc0a04930aa6272b8c941a87405c0f90c587902ce70dbff4abb3c9761fcfc77cad2fed267245a189873588bdb1f09ebfeb17fa15d7772c4fcaad0d2d9e
 EBUILD laptop-mode-tools-1.74.ebuild 2194 BLAKE2B f3f0d4c0b1098100f80a2e3119b56c9278596c575ad76adf8984ec50f88e03b37cc638358567371d60a1da2b26fe80e584c5f989eb28a489140807a5611f2446 SHA512 399d7cff9d1647abf70e95984d541786eed205cff72f445a5da723aac98a9832df44f5919c81fce02bf6ee44677b104aab3fd16f245f45db800f5d47360375c1
 MISC metadata.xml 471 BLAKE2B e78c61ebdef3dba3257d29e1d8c05cc392ec9fdf0abda9ff606ce9b76e2b41fd82723f26d5c22bafdbcfb58233e051e9e14c9438299671a57ef63a93aafa9bb3 SHA512 a205fcdb7c635d58b94b1dec541b117534420c38135eaa5567814529c8effb00cbd3c17aa022b69d57adf48b3ab4115d4bc0ef3bdc1a26916ce9fcd05a6f8241
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2-r1.ebuild
deleted file mode 100644
index a9ae177ba5ad..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd udev
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="Linux kernel laptop_mode user-space utilities"
-HOMEPAGE="https://github.com/rickysarraf/laptop-mode-tools/wiki"
-SRC_URI="https://github.com/rickysarraf/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+acpi apm bluetooth"
-
-RDEPEND="sys-apps/iproute2
-	sys-apps/ethtool
-	sys-apps/which
-	|| (
-		sys-apps/sdparm
-		sys-apps/hdparm
-	)
-	acpi? ( sys-power/acpid )
-	apm? ( sys-apps/apmd )
-	bluetooth? ( net-wireless/bluez:= )"
-
-PATCHES=(
-	"${FILESDIR}/0001-Fix-case-sensitive-name-for-lmt.py.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	# This should avoid conflict with pm-powersave wrt #327443 and #396703
-	cat <<-EOF > "${T}"/${PN}
-	HOOK_BLACKLIST="00powersave"
-	EOF
-}
-
-src_compile() { :; }
-
-src_install() {
-	DESTDIR="${D}" \
-		INIT_D="none" \
-		MAN_D="/usr/share/man" \
-		LIB_D="/usr/$(get_libdir)" \
-		UDEV_D="$(get_udevdir)" \
-		SYSTEMD_UNIT_D="$(systemd_get_systemunitdir)" \
-		TMPFILES_D="/usr/lib/tmpfiles.d" \
-		ACPI="$(use acpi && echo force || echo disabled)" \
-		PMU="$(false && echo force || echo disabled)" \
-		APM="$(use apm && echo force || echo disabled)" \
-		SYSTEMD=yes \
-		sh ./install.sh || die
-
-	dodoc Documentation/*.txt README.md
-	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
-	# See src_prepare()
-	insinto /etc/pm/config.d
-	doins "${T}"/${PN}
-}
-
-pkg_postinst() {
-	if use acpi || use apm; then
-		if use acpi; then
-			daemon_name="acpid"
-		elif use apm; then
-			deamon_name="apmd"
-		fi
-		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-			ewarn "To enable automatic power state event handling,"
-			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
-			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
-			ewarn "added to default runlevel:"
-			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
-				ewarn "# rc-update add laptop_mode default"
-			fi
-			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-				ewarn "# rc-update add ${daemon_name} default"
-			fi
-		fi
-	else
-		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
-		ewarn "automatically disable laptop_mode on low battery."
-		ewarn
-		ewarn "This means you can lose up to 10 minutes of work if running"
-		ewarn "out of battery while laptop_mode is enabled."
-		ewarn
-		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
-		ewarn "information."
-		ewarn
-	fi
-}
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2-r2.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2-r2.ebuild
new file mode 100644
index 000000000000..4b6591ed5208
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd tmpfiles udev
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="Linux kernel laptop_mode user-space utilities"
+HOMEPAGE="https://github.com/rickysarraf/laptop-mode-tools/wiki"
+SRC_URI="https://github.com/rickysarraf/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="+acpi apm bluetooth"
+
+RDEPEND="sys-apps/iproute2
+	sys-apps/ethtool
+	sys-apps/which
+	|| (
+		sys-apps/sdparm
+		sys-apps/hdparm
+	)
+	acpi? ( sys-power/acpid )
+	apm? ( sys-apps/apmd )
+	bluetooth? ( net-wireless/bluez:= )"
+
+PATCHES=(
+	"${FILESDIR}/0001-Fix-case-sensitive-name-for-lmt.py.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	# This should avoid conflict with pm-powersave wrt #327443 and #396703
+	cat <<-EOF > "${T}"/${PN}
+	HOOK_BLACKLIST="00powersave"
+	EOF
+}
+
+src_compile() { :; }
+
+src_install() {
+	DESTDIR="${D}" \
+		INIT_D="none" \
+		MAN_D="/usr/share/man" \
+		LIB_D="/usr/$(get_libdir)" \
+		UDEV_D="$(get_udevdir)" \
+		SYSTEMD_UNIT_D="$(systemd_get_systemunitdir)" \
+		TMPFILES_D="/usr/lib/tmpfiles.d" \
+		ACPI="$(use acpi && echo force || echo disabled)" \
+		PMU="$(false && echo force || echo disabled)" \
+		APM="$(use apm && echo force || echo disabled)" \
+		SYSTEMD=yes \
+		sh ./install.sh || die
+
+	dodoc Documentation/*.txt README.md
+	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
+
+	# See src_prepare()
+	insinto /etc/pm/config.d
+	doins "${T}"/${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process laptop-mode.conf
+
+	if use acpi || use apm; then
+		if use acpi; then
+			daemon_name="acpid"
+		elif use apm; then
+			deamon_name="apmd"
+		fi
+		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+			ewarn "To enable automatic power state event handling,"
+			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
+			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
+			ewarn "added to default runlevel:"
+			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
+				ewarn "# rc-update add laptop_mode default"
+			fi
+			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+				ewarn "# rc-update add ${daemon_name} default"
+			fi
+		fi
+	else
+		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
+		ewarn "automatically disable laptop_mode on low battery."
+		ewarn
+		ewarn "This means you can lose up to 10 minutes of work if running"
+		ewarn "out of battery while laptop_mode is enabled."
+		ewarn
+		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
+		ewarn "information."
+		ewarn
+	fi
+}
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 06fc14634c89..e9d237da16db 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index ba5681fe7c04..4ecfcf271db7 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -1,5 +1,5 @@
 AUX collectd-5.11.0-libsigrok-0.4+.patch 5447 BLAKE2B 6de12feb7226ae3a16a89f3282b54d363cc64e176fe4f9cc9a6bfef0874bca0447a8d21689f8d3c91b2840d12ba4abd3c6f38cfc0b4e885582cc42c81865a1f8 SHA512 a7c99664f632eaff35eef18a0bd8da5bfa39812d223eb6449acd0fa871c5d43a401ed48b1003275a2ae0362b92c69ab52b46af39fa69dd7e4cc2b2969dc4b2de
-AUX collectd.confd-r2 2001 BLAKE2B fbf1a64aab6ec60111553466c3a8b725200ab13d0e09c1ba1d71e68213e8f978c3cad0dfc5eb2c536ced8213f172804f0596b3494f9b42b0cacf3432105cab5a SHA512 729f2b4e06c4a8c95d32c03c6f3f292eaa4895780ace180b74fcf139a949e9c28a2b3ae823bdebec0014f9b4d919adb399bc7f019c68c0e268b263326959edb7
+AUX collectd.confd-r2 2005 BLAKE2B 1f68f769d06b1f486c33f76060cf13f784d5b45ff7a04c209a6e23b8a9af94b3db54744532c74f8c95dae4fccb7f89a4e9a5f5353575c7099da0a2db3c1f8f37 SHA512 89fd2d60e1e0c7f4145d0791d65e29821e7f585015f1ba6bf94f80f47ffcefb7bdd75b2ba3e0acb18f0ee27f64100b3c4737ad30ce516785571d277a6923666f
 AUX collectd.initd-r2 1843 BLAKE2B ccb12e55de72565aa7b6bb0f2c4e7a5a6d15ff23d5bc75e9cb36e1f2dba85b3b2b587336f976059af165ae89333d681ffe0cf53bbcd8098eaeff75228cb80b68 SHA512 8f0a73f0f2b2280c0f2e35894a9dfa38af937930eb090eab52cbe81089a146bd974f6a2a3062b7147611f9c13b770a945a1a9228a026405d31578e27a3fd3b80
 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e
 AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668
diff --git a/app-metrics/collectd/files/collectd.confd-r2 b/app-metrics/collectd/files/collectd.confd-r2
index 835936d5bce2..38fb9a6057e6 100644
--- a/app-metrics/collectd/files/collectd.confd-r2
+++ b/app-metrics/collectd/files/collectd.confd-r2
@@ -27,7 +27,7 @@
 # isn't used anymore.
 # If you are going to change UNIX socket location or change COLLECTD_USER
 # setting above, make sure you overwrite /usr/lib/tmpfiles.d/collectd.conf
-# via copy in /etc/tmpfiles.d/collectd.conf to match your setup.
+# via copy in /usr/lib/tmpfiles.d/collectd.conf to match your setup.
 #COLLECTD_GROUP="collectd"
 
 # You can use this configuration option to pass additional options to the
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 545f88d70dc9..d7368ff14e93 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/abook/Manifest b/app-misc/abook/Manifest
index f844c1fc6af4..22574875f6e3 100644
--- a/app-misc/abook/Manifest
+++ b/app-misc/abook/Manifest
@@ -1,6 +1,6 @@
-AUX abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch 1292 BLAKE2B fafc126e41c7dcd599d4101245b83e29814d5e5f1d9c1073b3bcc7385899909bb68f33e4d84a93a4cc3d4fedb2bcf19cfec4f1e7d9ac883c32f4962a7d9b5a45 SHA512 d0a779700e21b5a0c76e0ba3cafe9a85478e4f22b1d33e8486a2efdf37817e6ff9683d7e59ae6905578b48434e375f7f1956f86c65cd43abf6a231189cfa3474
+AUX abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch 2061 BLAKE2B 1b4dbdbaf2f73000c61d6e3472e8194c48ff0b3f75d3f2ec2f842823ae7eb4adb3b4dbb203be7a434cdb1ec42fb9896aafb5cd2a0a5e36721975dadd446d464a SHA512 9f26da7d0c6a5c5f3af3a4f19a0514aa500dca66f55b42f3c0a0ff396e3f609ea603a4a8b30065b15385ee6e3f07b77b0c7717e2065e807bc8278921c3306062
 AUX abook-0.6.1-use-newer-macro-for-readline.patch 986 BLAKE2B bec102b0110e699df64758e0092d1e1bfb26b5e963f073e51f03e002d5cc31d34162ec5daf466866f032c64744bcc8ea4a1b6a930e3bc8a843303adf241391b6 SHA512 559551548a10a82ad529ab1181d42ed43f45c182530d88dd9c0cbb6423679109b5556cb9c1a27e7ea328db63e54b4196005850a1f8fe2a1dc95f3302c7efede1
 AUX abook-0.6.1-vformat.patch 336 BLAKE2B 9a45733e1ea3ddf996b6e75582771922c9189117580202e3f1270d6394b92ec0943207f803870709b2288755ac8e3ba150ceb3835ad178313eadea3bede347fb SHA512 e1da5d70edc8eecf0f860b0423a260bfb9b1f706a38872d8c793c76af3b899c86b9700df8816f952fb1430999acb00ac365dad58752c78c7535cae5d8b2814b6
 DIST abook-0.6.1.tar.gz 319558 BLAKE2B 9d750d97aac2336f1de22121035c0fc9c4707d970976f95890907e5ae2ae3249f563dc45fb34c32c2a5303a9cdb35256dc4581b5759058e14486ca2a7cfe3cdf SHA512 993895ef2fd6d98d50db610699f8f0a28112778065ac56484373eb814afd8ab7371201fc21506c090514f4b29570ec229dc62c606ab068301152567e2c47fe66
-EBUILD abook-0.6.1-r3.ebuild 1083 BLAKE2B 74c1023058e261847f0fed2b6cc04e67c4b288e5a8eb3ef54cac79e92106c2e166d35b30d2c917209281d948b854fd2c67945b3f5213605868bc7adc4f451f62 SHA512 90443a2c98e0e3519573fdf04b612502c3f140fb20bf5feeb8a7014b434d4b1124e9da246e37d5406e6776ab1c7c840c1d65f7d4c8d77fcd3224adc163850178
+EBUILD abook-0.6.1-r4.ebuild 1133 BLAKE2B 750adaed6728a5e8d811131403d713e601f92ed7af093e97ee3c06be111daaee1e7e8998d95e08039dbf119461db6f881b9b3b807018f3275d4f4b63c60c6260 SHA512 87a4e4e2d540bee9777e04b0801eff00c7adb2a068e46311e2d2faad3f0d15be491e0c758d6f2cf8d1a344858b664d10fd43d05fec84fcc94c493d267844ec76
 MISC metadata.xml 290 BLAKE2B 0ad2ca84b0fa7d2fc2744789323d271079956e468a6d8e17d7c21e1d17ca57fb78ce17b48f7bdb97fd24e1a456d8dcf5d403b499fa1827ba70789617413b3feb SHA512 797a9fb6890d0692924901c9f1a2ab118f628fd00a293c84c466737ac69f22e592510b825b935a9183cc4e6c52529d82aff1da1b841b5dfea64bc278104daeba
diff --git a/app-misc/abook/abook-0.6.1-r3.ebuild b/app-misc/abook/abook-0.6.1-r3.ebuild
deleted file mode 100644
index 0d55af71738f..000000000000
--- a/app-misc/abook/abook-0.6.1-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="${P/_/}"
-DESCRIPTION="Abook is a text-based addressbook program designed to use with mutt mail client"
-HOMEPAGE="http://abook.sourceforge.net/"
-SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-RDEPEND="
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	dev-libs/libvformat
-	nls? ( virtual/libintl )"
-
-DEPEND="
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( BUGS ChangeLog FAQ README TODO sample.abookrc )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
-	"${FILESDIR}"/${PN}-0.6.1-use-newer-macro-for-readline.patch
-	"${FILESDIR}"/${PN}-0.6.1-vformat.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-vformat \
-		$(use_enable nls)
-}
-
-src_compile() {
-	# bug 570428
-	emake CFLAGS="${CFLAGS} -std=gnu89"
-}
-
-src_install() {
-	default
-}
diff --git a/app-misc/abook/abook-0.6.1-r4.ebuild b/app-misc/abook/abook-0.6.1-r4.ebuild
new file mode 100644
index 000000000000..f6e46075e42e
--- /dev/null
+++ b/app-misc/abook/abook-0.6.1-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+MY_P="${P/_/}"
+DESCRIPTION="Abook is a text-based addressbook program designed to use with mutt mail client"
+HOMEPAGE="http://abook.sourceforge.net/"
+SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+IUSE="nls"
+
+RDEPEND="
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	dev-libs/libvformat
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( BUGS ChangeLog FAQ README TODO sample.abookrc )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
+	"${FILESDIR}"/${PN}-0.6.1-use-newer-macro-for-readline.patch
+	"${FILESDIR}"/${PN}-0.6.1-vformat.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-vformat \
+		$(use_enable nls)
+}
+
+src_compile() {
+	# bug #570428
+	append-cflags -std=gnu89
+
+	emake CFLAGS="${CFLAGS}"
+}
diff --git a/app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch b/app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
index 00b8e4449048..8d7a6cddd7cb 100644
--- a/app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
+++ b/app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
@@ -1,11 +1,36 @@
+From 243d3c265289171f59de68f5da4de086afb58215 Mon Sep 17 00:00:00 2001
 From: Sam James <sam@gentoo.org>
-Date: Wed, 21 Apr 2021 06:06:13 +0100
-Subject: Use PKG_CHECK_MODULES for ncurses
+Date: Sat, 31 Jul 2021 03:21:28 +0100
+Subject: [PATCH] Use PKG_CHECK_MODULES for ncurses
 
 We don't _always_ have split tinfo, e.g. Prefix.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ Makefile.am  |  4 ++--
+ configure.ac | 26 +-------------------------
+ 2 files changed, 3 insertions(+), 27 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8faaa11..18c6892 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -22,8 +22,8 @@ abook_SOURCES = abook.c abook_rl.c database.c edit.c \
+ EXTRA_DIST = config.rpath  ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc \
+ 		abook.spec contrib doc/HOWTO.translating_abook RELEASE_NOTES
+ 
+-abook_LDADD = @LIBINTL@
+-
++abook_CFLAGS = $(ncurses_CFLAGS)
++abook_LDADD = @LIBINTL@ $(ncurses_LIBS)
+ 
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
+diff --git a/configure.ac b/configure.ac
+index 5a9ae3b..73a7af0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -74,31 +74,9 @@ dnl -------------------
+@@ -74,31 +74,7 @@ dnl -------------------
  dnl (n)curses detection
  dnl -------------------
  
@@ -35,10 +60,9 @@ We don't _always_ have split tinfo, e.g. Prefix.
 -		[CF_CURSES_LIBS])
 -	])
 +PKG_CHECK_MODULES(ncurses, [ncursesw ncurses])
-+LDFLAGS="${ncurses_LIBS} $LDFLAGS"
-+CPPFLAGS="${ncurses_CFLAGS} $CPPFLAGS"
  
  dnl --------------------------
  dnl end of (n)curses detection
 -- 
+2.32.0
 
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
new file mode 100644
index 000000000000..f6e97893befc
--- /dev/null
+++ b/app-misc/broot/Manifest
@@ -0,0 +1,234 @@
+DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
+DIST ahash-0.4.7.crate 51474 BLAKE2B 0974b90539398d61903ce7fcbecdfcd802fcb5c7ed631be919ec17be6951e68bc80787876cafebd33e40a80605f6e2352a86047077bc40575420bb6ee1a4915a SHA512 2f42cdbacb2b2f9bd7d94a4cc61294d7813428157ce242ba82f7c3fccb6e4b83c767f4dedd35ff26ae61a89506b388d7cf96af4e727c29a14b25b9f82b1f2126
+DIST ahash-0.7.4.crate 37072 BLAKE2B 3b82cc45993fd48d9eed018e14af005e2513938f34b195d4f33bc0d4031bc8027b082aa155b14e20e0e1e34b0f829849e8c614458805ce830652f34477b1d6a4 SHA512 f84e16f3b2764be95b4d82c9ef4bcd4c80983e977b33e1d4cc3c119398de6084428a0e7bccc1b182bccc21aa97855fa30b6a4041b961b58bff79b75dcc788005
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
+DIST ansi_colours-1.0.3.crate 10419 BLAKE2B e140d65a40228e2df42f2d8d5d5ae6809e1e30afa007d97d07ed14ed6f8f4535c0adbb497cd417c5ef6528e5a60a997d4ede66709581a653c5e3dff83bda9ea5 SHA512 98ca71c01e3c5b86022430823066b68621904398f69bb7a3d13dd2b999b343a72151568d837cb0d811826204e538a34ff88590cb72f7da5d2bb2a365a264bca2
+DIST ansi_colours-1.0.4.crate 10525 BLAKE2B f71ef0dc730cb35e634623cbf6888abb72519fa53b40aba49ad1151a37d98bf3ff93652ad67d276243c7ef9435a19b839a43a4122e451a2defc96231fba145e9 SHA512 36eef5c4c84f7f8bf3adb65eca5d7d2da48190c127cd76b78b7bb035cf98afbf2534b82bb293cc1e472eaeb08d541fe28a87b99ebd53dbae8a50026898b043b3
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST anyhow-1.0.41.crate 34561 BLAKE2B 32889ec5ad2750e97f9d5486c7b367edc2fbaf19480bbe8114a2deed3f78e4c3e2cc31304a33fd60bc70c33c17ed8020f6df0c05a958f4016d363803dc5a08b8 SHA512 c6fba5fbb5646d195fdbda65003a8741188d49db02b805a84e695c81a054d9d5265b1c296c23d65cf089af35ce470083de88e1b65aadcc3ce33c8fb22b9cb91f
+DIST anyhow-1.0.42.crate 34827 BLAKE2B adf276a869889819c78dc10cf9ceb310d57fc64dd00b603a16e7b6f111d446ca8ed43439c3f18f590c28c1e59a67cbe39fafb00c510d03b65eb8ba15a18d2b0d SHA512 7bbafa2fc5d78a6d8e68b44b104fd8d6a7882fc127b39e04c5a76240ee24ccf311004b754d93836d6daf1918be9c33fdb68a6baf55eab8f1e921b7aec3a35455
+DIST argh-0.1.4.crate 15100 BLAKE2B 3043c53e02b63ed679ed055ec48d238d4cd9e8b5d4ca05dcb3efc6177bae98709cac7102d41987ab172484b277a6806febd36b598a6b170183a1f8fae7cd8caa SHA512 85d70299e93fe5c33e1d76c3f56ba2a4d6692bb761eca355f2fbf3b5d239e1256e7c9af2feb827341f51f6c08ec5e536a2e3250c90ec4a6de95b91d4f211b31f
+DIST argh-0.1.5.crate 9745 BLAKE2B a4210582842f855eccc3d6d3271ee261a90086929d46d99e4518cd1b9fb1f14e399902d1b332ac1d56a24980be148bfa85645f613af74605d6fa59ec70e0e3fb SHA512 04c609af2d840ea083d4422f785b001c1bbd37c90b78b01151336145b61713a7e800d2f2707f36e579f89d254e78352086f2401f1cbcd9913885932b79c3ee5b
+DIST argh_derive-0.1.4.crate 15677 BLAKE2B 9a9881579ba24c9a68bb8a0f6b7c8675e7b23aaa7208035b54b265671a16d636ae571dc90fdc9e1b63d9d175a116186896e51bea91c00bb71560546feec5af23 SHA512 7acf2b19f13fafe64d7c236d851c91ccacc6f869d1495d57fd52b2ed53dec31a345a837f31fe51926db8e8700e1ba88d5f7f88f22029c68c63f803385b5c1aa3
+DIST argh_derive-0.1.5.crate 17472 BLAKE2B 693f29c62ea8e7cc10743027fb264df4d0e234fa25a9a3c1fda431803d0de2e6344378598a7a0d6a566e6a37156d1882aabe686dd2e1c8a4e2eab7b1b95e09cd SHA512 9fe3284f42ae56ccb9e05d90a7cd3eee8e04d3795058a7ade3358a49f3414e4ba951b8dd0da897546637545a3d65d392db98ff7f085e13f3f59efd193dd36811
+DIST argh_shared-0.1.4.crate 2583 BLAKE2B a1c3a76267253bd379070f142ec5462604fbb048de41bc2109ed564cfec8356e86cd0e425ccb4c313dc7eff056e1cb3cfde104fb67a192bb2803f66bbfbeac09 SHA512 7371ff18b8d89dad661e3a25f18f2e4c488aab4fafc7a83c327cd89cac73035a8fcf403c86c60d5e43f14bc0f301d3c98535313e2b4f87c2ab01bb506201baa9
+DIST argh_shared-0.1.5.crate 4102 BLAKE2B bafe6f40ec42ce501973eee35f1001f15e977480bb8abdf32158fc0596fcfe8201facff6fecb526b1c7fe62f7884057f4cd242fc9ae468f0b1a515b44ff83b45 SHA512 f95290c9369a17b0cb93dcf43ad156e768bb3a7b92003a08ac132cc3cfd0562b1059571a7ed76543613177b24f5836f0ee23fcf6b837516bba306dfbb05b13bd
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
+DIST bet-1.0.0.crate 6620 BLAKE2B 9e0ca0ba1cf8947799e9c5c9d1d3e05ebad42921a09f2d73baa137b85d4995ef44a6acd583afb96d36367939a7891c7ce52e21ec2033cba76e8f71414e65a6e4 SHA512 511a3107767de8658f4180a56da891d3879ce7c7314e8d3732d03949b0da98e9d65aba9b3ae2fb4555676bb3ccb2089782c2c9771ce01024a73e1acfe2767418
+DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST broot-1.6.1.tar.gz 8710957 BLAKE2B e2fc170ef09ae4207a83412f7b51141e08fc815a9cf9199768f79ce81befe2cc39fa1e5e698d42c38fc8125ca347cced5520eb08d7d0d4bef34783d03e1dbf62 SHA512 0a4df51c13455e13ac4b13e97d02016a70da7d2c37635ef8f5cf964b3cbaa9cbe40eb73380587e15749042bb480be5e3b1b67c54eaabf52d1b0fb9671ab13ce9
+DIST broot-1.6.2.tar.gz 8712669 BLAKE2B f69c5baad6b6c61a18007035aaa527db798c155c02ce39994a1784d9d4cd28d6ac35d72e29e360ee0f471f544b1f54f9f531869b9388b0437c9086cc98006cf2 SHA512 8200cf386b89cdc8ed20d9130ecd578fbf60dd5641bf5b27020fd5f5c8e882e837b488a785f44bb43dd67e3629acc2214b4a62dd35f8615e5984b6baa73ca954
+DIST bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac
+DIST bytemuck-1.7.0.crate 27057 BLAKE2B 8ee0782cc080cae2c76738931be7076c0ab3529c07b1e03e2924e5e2940210ada4129731376016bafdceeff42984a5a3e5f9db7789071ef11d4e3902edac2857 SHA512 1512e461d17d65f9f462ea12151ebce82a84924a83422d213e690c68f41a024f99d825131a6f5de19994c5610f264c42ef8e09eca8378f5a99e325eecb2bdb00
+DIST bytemuck-1.7.2.crate 27489 BLAKE2B 2541a7561eb34351f58266451a020858d8ac1ad30ecb95b97d576e72532cae37ef0b747e2259aaf6052b65f951586425044f824a00dfabf54bba9462edf94c2a SHA512 fae361f5abe67215a7591d421a0b713b77b437123c56e21dd00421e95ab86d9dd9b0bf1daa6623b833ea65681fbeeb58f6feab9d323964304a3250f24df1ace2
+DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
+DIST cc-1.0.68.crate 55936 BLAKE2B 9bbbeda78b8c3aca487e770cddbe11bf4686424bd33d023ad66e1fbdfc8dcbc17fd85c15905e0edbed8745202c01aea13d4f03a7f8f655e5806da152565419aa SHA512 faca9aa91488808f920f1d88422cc8a69790aa6dbd7bd2cc5d08a579d248faafd0fd675e8499e56aef6715398c278db1fa2079511d211d41aa65741de5d5ac8c
+DIST cc-1.0.69.crate 56044 BLAKE2B adcd10bf4faf6835ae8feb79ce5e7a4895700d9714fc4322dd52e37bdd8db66b849d5e59aceba6ef0edcf9a5c7c0e2bc616de4acd98b71999bd63592c1c69dda SHA512 ba2b84fb61b4097a96f9013f9925b1985263ccd75274186f5d37589444e390ae8d5d1f88c210822a9e9dac2db551c24aee2b12bb61801aef8b31a72b2ac77437
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST char_reader-0.1.0.crate 4559 BLAKE2B a347e612e1291bd26fc56996e1f6cbb617c6d8b6549aee049428689297b61a20efd068179f887bceddb538db28e172c3e9edb771ac7ebc977d4e5069a21f268f SHA512 a1aa8c3b46af6a2a7a4084723917e0b77939c2836c00d5a399d33625fb71755b2ebd78405bca252dfd611643fcb8b376e8cc85343171b6daad8c71fa1cebc66a
+DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST cli-log-0.1.0.crate 3775 BLAKE2B 9d76b5ce12221e330be1a93b42ab2691f47fdf96345a47f3f660c2c46feab871ae5f4c6af521c03d07a9d1f91270868d7c863c477305143c6f4967b6ccff1cee SHA512 5c5e9682f1e139bec816854295a8fb94ab5c1aedbec2db9b87b1625c269690bbda6c9804b89ac32d4c5a3e8f868887f08d2d2a6a6436be6fe59e2ca688abb31f
+DIST cli-log-2.0.0.crate 5302 BLAKE2B f36b117e4b2e89ca54132c9227236dd663256ccb16afefa414ec6bdc11d840fa2565ddaf6824a6a87c7bec8499df1686b068b340c2b9ed4c368fe802c2652492 SHA512 16273b783875c80a43fc9ff86e3d35b47226a6cce2ea2c258b2fb24863d75cc01fa7ef447b1ed5ff775ddd57aa9ea39a45fd483d0db079a8f2fbc50d9184aa43
+DIST clipboard-win-4.2.1.crate 12142 BLAKE2B 6818d38ca338b91263d0f2149c6657dd34d5499879d407c265ff7c0734a67d92bb3334175b4dc738e12aaf335d7350844225ba874877ef891e266edf1b2982ae SHA512 77a0bc140dc614cf763968d60e0ef8407ad7758891e08377f16031e5df783c9338aa0a3f4da1402f815a14818de074a9bfd8a273b07ed5724532335e177b0584
+DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
+DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
+DIST crossbeam-0.8.1.crate 10429 BLAKE2B 4f915d623533a226370eeceefa5c196438b1b332a8b5eb6223853e416385ac4e1a207bf1989646478b219f7a68c8ca0656a808e87db58361f1d77a5554cc2a76 SHA512 564f5623d1a4da7b0253f14946f2e71d14ac9195d80ab3b0ad8e2ba6fc7229745c8c70c2899852d48fc93cef009109d7d7cf2dc9c875273cb8ce9223b92b0beb
+DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
+DIST crossbeam-deque-0.8.0.crate 20756 BLAKE2B 6bb602547cb0ca65552a9b981502221f1d3570422d22c867f654ba677e5c95aa5f81ed0022a498d3408c3f69291e1805b49fcfbfaff0d9a6075b75be3bf926ea SHA512 4efa73dcb9ef40b841039d24ffaf9bd7c63f8c0233bba1e0728fd5558702b4ef0af117543834c527335e99384d3c80d56293e891c9d94440f51f454b1b90c399
+DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064
+DIST crossbeam-queue-0.3.2.crate 14993 BLAKE2B b22d68d0bebcee8eeb53fe431f54ae2193a837a0ce8dfe7a49c3c1a42c2de895dea1ef1d71b0909abf9e89442efb14c8fde932553ba13dff8af9d155d7e6dab7 SHA512 7e67037b7a7f134a50e34728813b85a4a6e062895b9f482fa4ef7b1e1e9cc15c9c2836b9b5dec2a4ec36eee57065dc2f1066937e1ffc5b77fae253f60cf3f05a
+DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
+DIST crossterm-0.19.0.crate 104572 BLAKE2B 13b341870516c5ce4f3ac1d4f40567a2a465d65f9dbe9f627821bd6dde994fa5f8d9802a1b42f19ff91d5511ef7d03a0b62361fe8addbb18e74c624dbe66c9e9 SHA512 c46c095d73be48a3c1875806547ba708a40abfc8e5cd89514162e0d1636675c4f4e2857ac3b4b32239d14f7ab57a61018b6a919160b2136ae761dbbde726b932
+DIST crossterm-0.20.0.crate 103025 BLAKE2B 8aed50d2df3e3705134f1d20bdd37a8a0b9c16afdff0701073723b038f916f6104d48d646fd3aed8fc93baf4e749f7447149a099829b137055deb9aec00eaa0d SHA512 998d5377b5e204375ba6016da678d3d3a4feb5174092b9e2dd8c8d26d8a5c7f321d60d829262f4b3a962566204fc6e804e3637494be97760e6ef66f888a6ab38
+DIST crossterm_winapi-0.7.0.crate 15187 BLAKE2B 5407aca29ccb36473b34527d977fd3fe9d190d2dd940da7077535351458fc0a06af114c145a0f3e741402f2df98a98605a8fb02e2e07c5bb107679a24260fc96 SHA512 5efbe7992b4a19725b5992e0b29a77673e8ecc03d28da35580a5cddaeb32b7e30c7bdb53a2392ebb5b1218617045c306d78451f109d5b836f0e00dcab59e0dfd
+DIST crossterm_winapi-0.8.0.crate 15531 BLAKE2B 663d08cffbf1996d585922ce09d486afa288b998b6509958ee0c89f8ca4ae316c8d404b326961a464435d22bfcb91e9c3fd26a48e90b8b267c40a7ab6f596c17 SHA512 e246db39c7adae89ee1699b6a0ca2f5aec2dd053db0698ee25c320eb315c59be51d6db2193493ebecadeebee5a4b6f3c52c2e9ede8088da7f9d102ff7ac1e936
+DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
+DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
+DIST csv2svg-0.1.5.crate 166306 BLAKE2B 09fb46340d24e08838d521b0b86e7819449c80990c727337c3b70c44f8fdac86dc2b36891ee34e3a5b04f6aeaf49b7074d52eda088231a0f55c8db3f3a2d96db SHA512 194bd4d44790872f348af34a043ce4ff1f5747239c5cd290cca02b40180d53ac6d96847ba11f904eb94ba8b51a5033c01d18589bfd9444e3ba4912eb76da8c62
+DIST custom_error-1.9.2.crate 10826 BLAKE2B 24186a381d6df9d0262e123208f8bfda21dadded4fada889aea627c07e9812f8b16ce383dcd4ffed87f8a71a06bd92ea2ef12a0f835c67a82a436f9078c53f6b SHA512 6e91d3b1f82f7bcc5d4f3d22aa1f3cef150be130bf6f7785eee7511b8f6581384d82f532049570aed76278486ecee17d9896e1da9d3fce18d54b189fcb0a3984
+DIST deflate-0.8.6.crate 62365 BLAKE2B 05b1f81e4c423f9fdd823bc33352d8421f2ca0c26d43cf0c5990db12f5e31c46ff7769f1baa3b971166b4146eb448ed0bd3ffe68f7c4aff5885b47826f77d847 SHA512 7e2e23205c56cc4c834ade2a6a22b056253c32e29346907558117714a18d8433882a712711413addb15da79f9f59e089a06dfd680b756ab2725b500a49dc16b2
+DIST deser-hjson-1.0.1.crate 15602 BLAKE2B d9abbb6d53c20c7f7a6a536c06335be83c4e5eacb12444ed3b02bc33c54ed4cbf64abdc67832ae8d68f1c16fb0498d8db48587d121f77214320a27534fc74bf1 SHA512 bf3e2d9bc3caa4e34682e2550e6daa544b6adab1095b9bc5a9337b210bc501756373a2f4164478a700fb772fc6cf503c38eec2744567863bd4297ea0f953a67b
+DIST directories-3.0.2.crate 15593 BLAKE2B a4ecfc7968a0eaa1ae34c7cb0a33aaa3dc0b1d972fcc013fe6349a03e21bba1740950c62fc0d096945b4b29c275081ea0d7d1d57fd659acb22004f75a090a230 SHA512 9bccbb99a832d092dbce0ce5ae98c2e1eb58febf0fbbf410152bb0d62324141957ed04284c71809a692fc2d2ba0e9b41854d892e68269893850ea3645a9549f8
+DIST directories-next-2.0.0.crate 15153 BLAKE2B 8bbd996cfa72d75fe7177a9d8be7fb6b96ff3fc456b7e06db61cc463a83290765d68f09da3bf8b9e958553b1940ef35f3a4a45d179918ead92f604dd05512470 SHA512 5a0c094dd2e858c59c93655d5abce1282866ced1e7657397c62f959078adc544bb895dbcd2ed578ad7dd0122d8025deb0bbdad955ab2aaf43d9a0dc7d37162d8
+DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
+DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
+DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
+DIST error-code-2.3.0.crate 5327 BLAKE2B afac0fbe2b989672d03f9d999952923e1cd500085d529323699a8ae4eb965308fd2f1e6c703006f5f316d0f27b39252a5472e5bfe7827c5886f1075eb2713ad8 SHA512 875f73996231871b9554b959ea2d3e044292b8c4f9cc8ac6b70f9c42e0bb83275dece02956f038cd20ab180a60f23af091b3acabc4e200c58793e58a726368b6
+DIST fallible-iterator-0.2.0.crate 18509 BLAKE2B 9630fcadb2f30fbd8a2a057eb992bf33c0aa2d163e6fbd43de9c8c350e3e932ebca79a6576b215e17a0566898f6e37aef806a643d20c16a6aa73ca515fcf30c0 SHA512 c558fea3fcf3a7756acc0b63d38f76dfe7eeed4dd9c12c46b7a7e8b8bea64d00e0cc115492e8b3a1a19e86e6083477dcf7d2d72ef960b44f24d61819a3077e79
+DIST fallible-streaming-iterator-0.1.9.crate 9249 BLAKE2B cc4459b34a9ad00552a5248d090d1f25804b92838f41131e475abb83ae0b89401248feeb52a49dbffd499ccc0ba0f2f1d044f2f3e9b06662be01fe2257a4e885 SHA512 34824e2007cb944eaf54b10d6d3885bb17ef2a2976c6dd7695ff82a937cc95eb65d343dd7a5cd2fab5aa5859faae3352a9e1c78f239ff736900c1dbc3f5ef7dc
+DIST file-size-1.0.3.crate 1819 BLAKE2B 6bab7dd8da03815b1f98d5dc16cac8a54da6e9fbc441bf6b2735cee95f138c566237100736eb99855d9ae951dace57a0d84556a7d252bcbf1f1eec16e9acdabe SHA512 2fb1289b4ec3b092fb260f93356a35a1714ca0aa9fb0a3b0e7b626e8a5f1d2998165799ec3ee5a07f4c7beacf19ca9d94f0787e2305c8137643509693462ae67
+DIST flate2-1.0.20.crate 74036 BLAKE2B c5a1270debdb42f8612c0db9b684d339dfb668dfa3b06f6dcef94b43c115daee99c3558562d605da5ba1a554930030083baa8128036e9999d47907f29687ee0e SHA512 1415cba53183b7ae0f3396859186b92001060a78fbee10dd0dd4c8a93119aeb78bd8d782735c292badc1ae6d369badc6fa1a0105835614a6f70e82b080d8549b
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
+DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
+DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
+DIST gif-0.11.2.crate 34068 BLAKE2B 607b96e55a606137f25fe2bcbae52f3a708d7507de8c0b1e3546644f6ba94210571b32d2029f9ddc32ecff755f6869be7fff286b2c8539bf44062174a7bfb16b SHA512 02f2bacda1e4f43ddbb4f7c6843478056ff01cb815a7c8f9c4d14618781bbafe113cacb812c3788454e8a4241efd6a90792a00cfe84c334349331258bbec71d7
+DIST git2-0.13.20.crate 190365 BLAKE2B c4f3420f19cdfb420576bc8c38dc45d1c7f3b74b5a2d23c85154dec35916d3d588c86aaa50eca52b427e5d044a07ede7cd1445ef1ba53ce08c70ff39f7ac56bc SHA512 2c0a9cf3391f4ea5eaa48c8fcc08a1cf27b877cc4960332bfdbb95620f9b161f720c35f87bf98e3771749a01444bf8e2337e6d8fc1a34962d4b041473115293f
+DIST glassbench-0.3.0.crate 1256368 BLAKE2B f6d0bd7993271f6d035a964947da2bbeb486d4b07c39d41b2d644ef72ee3092b040f763a1509c9e3538740fb9dfbb641ae072c5dcb18c8867a5a83b7ea8e2387 SHA512 325d8d71bc6aef0e618d3d662d9dd775e7d8aa88475b5331149869d11a13b0cb944161427d2aebc7385bc0ae19ca45884a75f9ed6d9621e9c5db541b4b31ff31
+DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
+DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
+DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
+DIST hashlink-0.6.0.crate 24952 BLAKE2B 3bc2588dd7ab04a9f49a1bfcdb633c09cd4031177d104ef4ead0caf8d3352383f60b3550bdead591bf21bbbdc097407d4de2525fbd3012d0772c40b9413162b2 SHA512 bd019fb982f8521b818d2862b739b489539d7e15d6ffbddc0c6a11a9611c9e0eaada767f3d9c9b8a966dc0c408b8cb475298fc97c7f6afcdedbd6e8cfb5e4df9
+DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
+DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST id-arena-2.2.1.crate 12203 BLAKE2B d5cf0da97a7d95e57f2281f7ca64bc1f58578e4796af6cb9d4239dbc60ebed6f6ef0f5d2fb93f9563bab68fb4139672acbbb23ac6c48fabdc835e08def5a9956 SHA512 c07f748b4f1d15f0e84a9c1c3e8c5b1fc95ef34d81751f6830cb57cd1ba445635da0ef50ddb6959e29eafad65865951e14f4655f6bf4cc79608c00fc032db0a2
+DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
+DIST image-0.23.14.crate 226804 BLAKE2B 0debec9484b54cb56eedbf07c246b80afc6de99b03e5f41b5cb9aa29ad2269cb7e9891b7377ef7ff53200959317bd38b24e823ebe5c2125677ef2588eec81ae8 SHA512 4eb07fd698c2d902979ab06ae0baef4a53db74da78493c45f0c32d5903c5399cb8a1a25a2e89bf504ffb612e8153eaba4ae41df3d17f02c27e7991fdca518f63
+DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
+DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
+DIST instant-0.1.10.crate 5218 BLAKE2B 1e4203d235006ca922134c715781a5bda5a932f6740b7e22505db21d3b675758bce10dbb370e96694574c40c43a1d71ea2e6372df7116b30fe8cb0b65a3b95fe SHA512 a6b2c7e0a7b954e961f2d904a4cd6f701617ad70a7ea13230ee157c473c903803dd64596baa0fabd075e995cd3d013e10681c8d712977341ea2b6f97dd48d596
+DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
+DIST is_executable-0.1.2.crate 9131 BLAKE2B 7e8f6c37a17a15677d24b1a6087402dfb509c15e7feccb79cf393c877ef471286ae297ee2aed1dad92d4a07544af3466883a82d1261c790572cf5060f22dd681 SHA512 4749e5c20a44a5012ae3420f8af1f59c8bf4f47f281c779a86284d774a9bfc9c9ce37addbeac451792be581aed76c3dbf820a69325dcc249b398698fc2674d69
+DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
+DIST jobserver-0.1.22.crate 21175 BLAKE2B dc0f20541fd14aa5c8b161cf36829a36e550ef414215417e25516ef1cf67cc1c7100cbe4ebcf8d2530e3245f8793a3ff11f407a0ec5d96385ecb6618e2de7a20 SHA512 ad3d180bb49fbaf51c9a2f40de0e2082947a0cb5bef95001bcc664e4c98f75a4c32a6c53f5eba90595e415b600aacae54d92c2f613dbeb8af94fa08b6d770d8b
+DIST jpeg-decoder-0.1.22.crate 228366 BLAKE2B 97dee932aae8d7d08ceaf37c9659d52a93be7c964468087aa39377fb2657c64cf8fe20516337cbe5fe0452c3686e9d1b7cd6c0932bf1ca6562358fd4a8cd69be SHA512 3edf415eb11909b7b16755f54c6a5b082200f81e6ce5dede413e41be221c8be5c14035a171fa1c21771c8d11f30cd990f57e6e98e3204e34e3f0e7ca2c3e38b4
+DIST lazy-regex-2.2.1.crate 3908 BLAKE2B 324c07ea69b3721d6b821ac41dcdc29dc69c6319092fd8887097c02454df8f3a525ec420b25b2ad8a9c579849c984434552726eb0da7225e05360aa2a56127f7 SHA512 a0bc84c3c3ccba701bccb7c8ca92e809e38d71a523429eb1d47974b43c3f23a2f4f0cf1969d155f5fc09c2e5d4a2c3af412b705b3043f7f54306e342f74bfaee
+DIST lazy-regex-proc_macros-2.2.1.crate 3261 BLAKE2B 616a3a020105025296ca9f605ebd2cda3058c3975cf45b08211d8356ebf1888b15474ea3c987e99d4aaff04792a98293c4257fdef22aa14bb9128e1d2dccf985 SHA512 30b3cc90b277769817d16b4ad96c4a464fc04f7c114bef77ac8f561301e392505d9d64fda89b9dd2e45f2df15bfb554ea3a41de5f230dcd78c263231f8ca16ff
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
+DIST lfs-core-0.3.4.crate 5967 BLAKE2B 1e78fc6af66befa0c698adf45e99855f3ce650f3ed5276e6be1a5014e0cc85489e54305e19eaa842c24211982106fc28af9f1f8bd0855f83c52f3a6ba35080d1 SHA512 e04bcdf6ddb7da30aa182fc6343c8c61a386ecbc35841dd3f94df8a22cf604d4bbab9cfa35ae4d144f60bb99a24b46151ef6531b1d62601d61af54b8241d00ab
+DIST lfs-core-0.4.2.crate 6384 BLAKE2B 0226e53626bbbc42c3dca8279b5a8ebeb28a045651f027b3f981e9cc6a237ffa3097aec4ae55e993e1eed490a6c8bb90a3eaf21334b7f7e93cf5b57e36ab0793 SHA512 e72c72b78a9e582eddaaef805d9411517963c4bd0b9381477cd3263b270e3c190c0a2b4807f405c9807e1d0414b750a7ea94d1ffe9faf84814d78c393c005712
+DIST libc-0.2.97.crate 517712 BLAKE2B ad769579a8e89e9e0ea6a08b8fd82b69a3a299721d63b63efcb436b333021c097933565e86f4b66ffcce6a589718bed2aacb36b80a936dd3dda763b9c0c240d7 SHA512 9b94a43d7da1e419900f7a016d5eb958bc42a006e1bb621ab8e2be2167e91f05cee81144c25e81a85c1b1ea2a26ff88980a4cc292fd42db8b09c5c49bf5531ed
+DIST libc-0.2.98.crate 522087 BLAKE2B 950686d7cde31322e1cdf82ae189192091b8543d14d0da0dcf3892910f4216e8e46bb1d5e7e8fcb1693a372577c57a6eb6538a0fef997c1c1a0466c3a1f7acb8 SHA512 2e730b8d46c42608c7da5ff4c5475667171b552b485c2684d3821310ac0f55c1a7a12d9a2cf68a05608cdd2a0928da5e290275c70a519a379d0ed25350689689
+DIST libgit2-sys-0.12.21+1.1.0.crate 1443245 BLAKE2B 794ff535a97d051cd12993f135e61e391e1d8406f8346dc9d1417a1ba433c0e1400f17d7e5bd90674110a3502ba7a38fffac8da008ee350a47061846ed2764f7 SHA512 fd6acaaec704fb2d159cbaf0bd1b81c7afe4d22aecd836b174001b017ed8421507739fd99da968cfb1d46db16a64fe6568f53e872aa5f9a9dd7fb2cb51b02d74
+DIST libsqlite3-sys-0.20.1.crate 2306064 BLAKE2B 9e0276c36311a7aab2613735c13b91f8dcd77c02f98bf38bce5f84852f1139d9c8dcd077bbc6ab55560fca69b27e08d4d1a0a7ed17152465267cf1cb4477d5ef SHA512 8ba1e7c7a6a5dc11ee4a2c817879478c7e3d349b237b418edf72489a232d39904537abfa2274553b06ae2dc909f4f9e2b3d8ae91a4c75768a3215ebeb5c057d1
+DIST libz-sys-1.1.3.crate 1341394 BLAKE2B 24df26f2102fb05231bf1c866ae4bb33aaaa0db7e963f452d29091b870d3cdb80736b8013bd39c028ec84b97d265f005dbd650515f503d04655bf7054ee537b2 SHA512 9ad3ac88cb3c436ba046a55123b7a3c96c56a8ae2a1b85a3eb39339e84441b16c82d35630e9aad1d51db83943f2d08cf0bd45e212b7284c224de451a0f0c30bb
+DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
+DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
+DIST lock_api-0.4.4.crate 20356 BLAKE2B 1b4a648467eba49232df5c595d7c5a0444018269a67db1768c7711d9d1a903a1dd00f99d8654c30186a470c035abdcec9994c8b1a347fc559c684b1792ec7f49 SHA512 655c8a1503b6e7f833b4c62109e1c5005727054847bff81e17d4159f91c02ac97512da0673ab227d17bc9ed0342fe3476247daf74cbc9a0b470e68c648ba706e
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
+DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
+DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
+DIST minimad-0.7.1.crate 17812 BLAKE2B 861d0dc7f8fe732a2120014a30119e42fe8b261e9c88952bd45fc0187cc018e9254843bb6ac881b07118991e16e824e671c04013388a0696bb9a02141eb502f9 SHA512 fd584f344ee36de445e19bec22909b254502cb86a14ba768f5feb5e5937e3833d350707c84416de00fbb9fe485432242cd9f39418df5211d577931050dd25858
+DIST minimad-0.8.0.crate 18040 BLAKE2B 9a8417dfb5c69e94f7cc5608290d9682db0e1908bbe7d0394c1b92e4f8ca6d8cd80bb498e71d181cd95726a212226020fc1e45d5f126ffae9a2523b121cb43b2 SHA512 ba38c81a91276b672a5831a452694a45b86e89673ddab2bceb29102cf30c08ed8c76f0d7ff5448195ce21b00a78e7d339743dc9d2437be3843d2d930255fe133
+DIST miniz_oxide-0.3.7.crate 44996 BLAKE2B 0e89ec4131e7abdadaa9feb6019b31853976a34434216e0f89ddab519559d0e1feaf2228fbc09906e51fb0242a18abe1a67a5362e080c19fc7cd00c2f95f08ae SHA512 d4eff239f8d6e947b94619e80fe03ed32aabd1a6393f63145d70ed7f08c51c45c7261d8157bf61c78d1637ea1f71ef15f9813ec733efd8afe6aa14810888718e
+DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
+DIST mio-0.7.13.crate 87027 BLAKE2B fa1b8287981c3a96c0b6f29de221241d12bbda1c19a95e315f5e026e130e2bff6199774524d5c178718bba47710cc50dc632e942a590f5d5af598e4d59fad269 SHA512 3f9adb95db494dd39041ec1abda0d476b308296024347f28bfaf5883d7896ee052edda026c25a9ccea9a31cbc5431d95c0e13948e90fc8ca7b1a91a19748a45c
+DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
+DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
+DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
+DIST num-iter-0.1.42.crate 10450 BLAKE2B 8ef03f8f84bbac51a11d22ad79d745c74c4092bdd6e65b91c472967c006fb3cd6b944c4bef913465e39e6a2fd734ac2b1ce1f21b332b2faece823fe410b54340 SHA512 46b0e05c4f4587121ec300da51cbf02e04ee8f8441eb4dcaab5a2ccee3b40210f1badde56addf053fb876aed3749dfb5f01e757042573fdf99defc77fb265f3e
+DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837
+DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
+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 onig-6.2.0.crate 30671 BLAKE2B 5b284338aa2860209238312dd2aaeccb630d4614f45e01d06cae7b14766fc9fb2bc490d65fdf68b7e4b2433166a5426e7b4dc6d7d6e0893b5c09c1aa71c2ad26 SHA512 f744cfcc1d6a3ed4e753087e179a1e39040e178e4abbba91bbb8cbde4e2a744bfa5e3dcdb764f3f5109b04ec82a6f4182fdd917dd0bd458ecc477aefa39fd675
+DIST onig_sys-69.7.0.crate 631318 BLAKE2B 3c13902fc1d3c27f809b61535dfdd27c2f96e0cf3c1889ba723d57b9a149534f91e925f52e7534722ecf56095a0a6819c9c787c29dcfec97a63c706ee540d434 SHA512 56be1a8088aceb3348d349fe0b2692eb2fd7810b4aed1c878ec402af848a0bc4563e0721685597ab3d77c037874d00acafcb7b735aa8077d0a36c19f82f13a0d
+DIST open-1.7.0.crate 6101 BLAKE2B a0ab3b5c9c48999962dcd7af73231f3b2887fdc4244ac066998660029216f10c71cf32e7f08e788bb6cf4f945569acdc4ebb2ce2094d82377b7a4f38304a03da SHA512 755d199424644347dc60527865141616a64d86c2629b35960e30a8130f6f1e6c389c1f6cbb13b9c2f8746f9bfbf599ed708a54aeef95a107ab73631e8006921b
+DIST open-1.7.1.crate 6129 BLAKE2B 024657c1e17e73f1aa24921e0b6bcd11b94754cb9032dfb1aafd6e3f58e484d0f5a1b4e504febfc514dd15e947791095465d2090ac4bd7b6dc43cb38b1e63ac3 SHA512 97c064ade1c9e1329aef03cffc6dbf565a7a3c0acf41845236202b0003d4d709b769e22cef0190624c32b5b6e1506964028a4649e4bb79f1ced5ae9f954508b3
+DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
+DIST parking_lot_core-0.8.3.crate 32147 BLAKE2B 5218cfbff706c4388fef31c885c7a5d53566005775a3c440c6a2890efb189a4edfe8e99f6499cac36038846628a915ac988c15e1ebab1b3a3ffb53a64631dc19 SHA512 1dba5a7e68ee007918fb210ff308f7382ed1c54d2fe6db36a8246453434246b71e6795db107c83ca39c2bddf5e4a27da7978a464b53d41e150e744d81e75b341
+DIST pathdiff-0.2.0.crate 6189 BLAKE2B b04f2769452686f94651251f017ed03c264b4fbd471a1ea1c529d48d0a2899a491aaa7f757dc6e5338e4536fcb0641bac46a7c6bc99280bdea7f6b91c7231bfb SHA512 9527aa96b6f873014c216c6326e0d235f764951d244f5cf36e2eaa0b8182b25e7766a46967b5b0b936163c6ec4796a15e72540dd3faca8abfdcbeba651c21f71
+DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST phf-0.8.0.crate 3902 BLAKE2B 3f1d4f9c23cfa2a3a0b7e4f809ff00783d71bb4839b27246d5244e5aee61a211498715ed576f00749e8132a6af1cdf50b2eb27d2f49896f006212981886a0e44 SHA512 a3013c4106ba72aa3cf22bd3f903eeacc24ac7cc47aad791bc5e9a63e1aff928a537399b6a86b0346c5eb37979ec01b404807e622e79a0a70a0e01e63c07a47f
+DIST phf_generator-0.8.0.crate 7604 BLAKE2B 936c9ad95d2d5b6b4bc97dac9bcf99813462950f6280d9cbb8c8ae9253d3197f25b8173c202cdd51c4a2d3f422ca1d6f5c9055e7a87e45b2dc5fbe5aa6aa45ce SHA512 de045f47567defd43fe32fc62191a9a892e5a478e1a84b853cff3005e94967ded68e5770eacb43f2e97e58b8f4283327a38a3bdbd55e1d5c708dab601ea66270
+DIST phf_macros-0.8.0.crate 5814 BLAKE2B 39f40a52c177da227b3bf54d0fe4f05a2d6c382183ab0400d74a06d34fb3f28a23342496f6e0d48d25a792bb848bd9ed740a10d37c39969ad79c929fdc98d743 SHA512 ba56661aa92393fad7712f774fe4f0b7bf25d483aa7d4c4617409e655e9448b39780a904b8865293e16f8e63d62440aa0d653fe231beda4f58194de455598170
+DIST phf_shared-0.8.0.crate 2860 BLAKE2B db48d88ad6e7aa6bdb2f6750ab66063a55d005b4f5e92ededb59da1f1fa9b1296d30f87d32d036f08e3a74111ea4d8287e8eb6c86d0edd76b3ceb38f223696db SHA512 6ad7ac732b7cc42e7e179329fbfee7074d26652d73eb4f2b97224491d978ad9b14c66e5a539c96b84c70124ac44cfc009bf963a42c438d028bd9737b99f463f3
+DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
+DIST plist-1.1.0.crate 40173 BLAKE2B dc689529f09dc5370e4e98129bed5580a7d8dcc8b588d4acd66aea9c13d49ec67f449c26dbeb300016585f707267c03fbcb1310b033f423d3a03ea93026bb8f5 SHA512 11617001327b310978bfc114cb4549586af2f25d03563adcaba062d78f34ef2ccf72b4779877f206a06d0a7aed62253fa853c4544285542b6ee88331845c28c9
+DIST plist-1.2.0.crate 41056 BLAKE2B 9d23b210569eddc25da3cc6632b88345fec54f7a725617d7b71f90abefff4ea4a0ab58dec044fdfbca817c08bfcadac9bed3bab1e9f63890cf4535196d48d67f SHA512 545ebae943341302edd992f7937f43fa7c931e3b9e499b2a933901549b9dc16a8398216b5aa50b3cdc8175519769af1662996513085c4711400eb9cbe6fbe0e6
+DIST png-0.16.8.crate 52598 BLAKE2B 03f706591182a89b0566f8a793163372a4db3e7a742f3aadf06fda93068c42a4351722796ddbbb013fdc1be5a88dc02debae50ab1cc3ac81d72d07a814b456ce SHA512 df96f8580d8cc11df54788ff64ab3269b14369a467d7c29964a5b19add5e7a82258e6bfda40eedf135bffa98a2a86afbb725cd085cf37f6c433abf9a7485edee
+DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
+DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
+DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
+DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
+DIST proc-status-0.1.1.crate 4136 BLAKE2B b5627ca489e6235f587ddd284040db3dc60d3c8c2c7120d101a07b4e6064aa297d0838b547feea0b81d2e2b41fddeb68ffbe46b5922f8cf03b0262d5d0b9ff44 SHA512 1e01be4b3d4ab90f450a760a129e614fede75106ed595e477227925b0dbbe96adf3957d47a42b6fb61065c47f0ac71c937facdfcdb1aa3cdd4259763c89536dd
+DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
+DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
+DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
+DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975ecc68289fd10a5c97323de9c1106de9847fc798f50d96044e46cca9d41f1635130be40bc789492bfaf999de9 SHA512 612c0d1cdc591f80733bf8097e251f02ef7a7e71cafb74e37b63ac68043558045c0c96196200ad07ce7aa9f2d373640c20e598ae5774935c8b52350ec20958ba
+DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
+DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
+DIST redox_syscall-0.2.9.crate 23533 BLAKE2B edff38a41e57f40f9285d43deaacea32d518f5d87382d535b0349f123569613d50e7b45a70e4013f35632485951967a5157146593811102f3c0a7d9177f07fed SHA512 4f3c9dcb925c57253fa27f6355482d4f984fe31c4f562f2cd22e953c6f1f475e0687003e495167f400f77d2594ffb9a69548454db8086da5913c00643ecd337f
+DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
+DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
+DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
+DIST rusqlite-0.24.2.crate 120103 BLAKE2B b72c206b640a692f466afb6262ffbe16520b1ebd25e5c6c59d618dbcf3cc448c279f56baa5eaf351b98dfd7a21e42bdcb8e43ed8a74536625369ca66f7a08951 SHA512 47c7cd04c666fe42edcd667ecb3289c7a2b612446b2f95d78bf576fb691a167f372ec48e0d4cfbe973b32068b4f06e664d079fd3358a69fde895295a80d20caf
+DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
+DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST scoped_threadpool-0.1.9.crate 7800 BLAKE2B b6f887c1af054666ab7f717dfdafe5701bbc0a778169d885a1837202d4d215970af567ea620c6ef47db69fa664c6be65c782aa87d9efc1d9c8c280b6210e38f1 SHA512 df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST secular-1.0.0.crate 183767 BLAKE2B 76d7f862542b1b494c89b2be9801e56147e22872d67580a5c2d9b8dba97682bfe8f79076bf33775ff7dd99e3ee08ea5573227caf8d8bf471cac82578bdfb6c5c SHA512 fd4650aa3ceaf15f701609776a23cb9ad1e726634272df43baa5ddab02e7b09a7afbdc8d4c6decdc7746ea7db05096c2aa3289b5782a723cd18599d07d299b1b
+DIST secular-1.0.1.crate 184234 BLAKE2B 879ed6ecc460ae065dd1033417cb3f72acb82bd27df3d20577005c18f33f782ecf9347bd328ec124b34547202d2b5843cadd4b0f60ef13ec753dbd2d8d2423df SHA512 3b5af4087272bb07f40e1f1309470da29405a60bd0fdadbfaf1969acb5ec626efde4549d12c06c819757ef4e5932a8fcc44b0719bb65ad30db54de0109bd1f2c
+DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
+DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
+DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
+DIST serde_json-1.0.66.crate 115121 BLAKE2B c46c65339ff79138649df206f2ec759945c31ac11bac4807a8d1e76095c1937211b0b4ebf88c69d2d22cbd90ba25643a74cafeb291e815ddeb5c5ca208eec9e6 SHA512 8cbb64a24781a94e9448dd39f9429830fff6fe61be3772c1ca825f7d489ac3c06b189c42730129e281d8f43f7128b3b9cd2308727e625763588bbaf61b54d1d1
+DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
+DIST signal-hook-0.3.9.crate 48416 BLAKE2B 1075d4b767f3d3c2e556ad1ca2511eee4eea8674989ee76cf4234ebac78f1351291f3dfff72605ec9fe92e978fc9ba25298182564e5a17676fb14441de6bb6e4 SHA512 bcb6cfd4d062ed4a2a83a7fbb35ec90f7dfa5e875807fe6b7c65d0393447b56fee613eac2b3dd08dae0cf2e3cdee920f2c3b3d27ccd1f6f8dbec849c3e6e4261
+DIST signal-hook-mio-0.2.1.crate 8893 BLAKE2B d3dad6a9bdaa52c3a45b9839608fed8e79f44916a07ea36e342a7a29d2ff81c0c1928fbd8628130203f00d2562bdf7e191277d6ba2c3bc51f94edc15da455809 SHA512 ca95684574e2934e138fcc2bdd023960cb4207095916650710e76b6fa32f8bfbfc8c5119d3bc92e31a55a2edd6e63b47a2119ff31cef5ba63719b9bec0b438e8
+DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
+DIST siphasher-0.3.5.crate 9455 BLAKE2B 73a09ba949dc4ea670a01e4cfc4f34d8f6ab53facd656beadda396fee087b36afd895e2acba5fecb796fb629b0f56bca84f971970c2f771ed84f74f667f9708d SHA512 4887f7b7b4c0df55c185249a16041052e16ad1f7c80d69ca69dba76af7b25095f2ace3d5b2a33346797f74b63c476a67055929c2856a6b4dff60e8fe2147f8ae
+DIST siphasher-0.3.6.crate 9708 BLAKE2B 652b226927c1a2020a1d407bf53582d10d9e2cf1e0a71ff07c6b30edb31d3def77b9e9e1f9bd3c5cc6206b2158cbd5753d6c05ea0010a2ada3a26ebf64c425d6 SHA512 2b2295b4807ae418ae03ad5b1d1a9adb8c29706179e1e77a483b0d1786736385e0681384e8f5879d21c1b009958659f2efa8c553a2a93618e66dd0660aa1e169
+DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
+DIST splitty-0.1.0.crate 2594 BLAKE2B aff4e2c5aa006d55a48dae1bce769b060f5dab500e40b69a049b6a20fd075c0293729ed4b24399a1cd27fa61e9a13f6c545ed84edd8b45198f6e4d6413747793 SHA512 c243cae82aa3a72d5c41dc7b92a9e3bfb0b83689cb378d5bbc22835206519718d71c42f752cfd35c0645e52a650ef4aad0ad854a6af5c12e69070ed9d9deb676
+DIST str-buf-1.0.5.crate 3852 BLAKE2B 94178810ed2476c2a47a63a6efab8022cba9341c7ce04caa2ff09c675baa5b17327bf4824b7d24339896143ab1baafe6edf6c6a4bfd7367e16a5506346dec6a1 SHA512 d474b6cbcc53d72587b21e8352239dd7eb7eeed859493382d5cf052ff78997e72ea19c9d0e9afb8471853fc71d38f404b877a09dd6dd92a7584fc6733516e823
+DIST strict-0.1.4.crate 3436 BLAKE2B ede207b05d9bdcefa1381dff2ce1d292cfdf53a572518241362d01f1b9c67f4f79ea3ee27891217374803a3a40a4c7a32cdf0e05eb59c8d270e18f954dab53f2 SHA512 0d6e23221d06e040bb4351c0558405a3271b2f0aed4a365560a2dd66cf1f1c7b931a81c28847472b724aaecd28304285858ba8a2c44fda3d5c6456638e3a3a75
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST svg-0.8.2.crate 16556 BLAKE2B fd95aeb18358349be6367f1c01ba9e1e396a588228f872d690fa8d60a4d3350d1683392d6b60e8962b798345fcc89f2abddf300bb08a8f07c3c0d5bb99d47153 SHA512 b5101e410e39c44e218c23b5a417bcab851fb8773d51af3db479c5c09080ace322d90cccc9acb06374a021fcc18304323e4bfb9f5e48eea6fbfa8eb51c873966
+DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
+DIST syn-1.0.74.crate 232974 BLAKE2B fc17dc2645fbe2d1ee409f895732b86cb77dc14837d35d7773e7f9f055e0b56f70be86203f13c549f0b43e1e4e1e777cc5bee2f08a733fe447f907dfaa443da7 SHA512 5aae03a68a4a8c1234d4e9a69cd37b9f6c698e2b635f10a030c0fac22cf00414c2a5e7523e0efe43181bc29c17abe6abc0eab103391259c97ce566713e3349f6
+DIST syntect-4.5.0.crate 752883 BLAKE2B 9c9ff2cc63ea421c0b8928a0578b278883d0a86be7f7c256820120a858f8c02b1d292e2474e5f2b63486e45cf5387e1a8ba4db2a5c9e7a2b0cf4eb687b42ffad SHA512 17653ae9baa4da049c899820f6033b3e7d71b96ab70b9c12e57a1ab305d155b12acec470167be2a0a37ea9c89ec4d19850f72d456e6857a7cf4dee65fc288273
+DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
+DIST termimad-0.10.3.crate 316247 BLAKE2B acda7abe193eeb015c9e144e765b3fe075fda1fcba410a41ecea84f72d3ba455f528267a7300c5e5ee626a1c1f87a9bd7ee7ab336812718c66fe2877f3ff855b SHA512 c25aa79fa0053c1e7ac88405b45742d3e34d58f4293405699e601122451e18ac9532b80413df9032850d983e3abcb1b1656de3428bface46efd2505d2a2137bc
+DIST termimad-0.11.1.crate 316869 BLAKE2B a669f9cf3b4b8ff9179b475f4d5c73282beb8cde520de7fa074feff17274a5597cc5c929525d9996397104131d978d095efc8880f9efab7c5b5ffd6c695c7ce1 SHA512 b930c5b9da286a0754bdf7749cded52aaa4af8c050f88b5aeff2a4f3fd95720ca82ed90d2f4249054ca7f2b1cf31fde8a8808fc5bb1c63649da325c017658433
+DIST termimad-0.14.0.crate 334991 BLAKE2B 0bd2d35b68f841e0c764a0b489b29767a141b54576259beecc39adcb1105f952a248cb3030b6e79a819148edb61f028b5ecb64b221cb21236bd031194404e983 SHA512 c96c2c43b091f174bbe1105c91d426786964dafd6477004828e798c3e911f391e12c33afdc4c9872523206481100c4656e722acdbd4a64db92ac88ec1b5040fb
+DIST terminal-clipboard-0.2.1.crate 4056 BLAKE2B 638662ebf46e0cb67df5a33905b5384b9270276c243b6f53a66415509eabb4da48c2d8257b5f67518712911395698cd02a745b6daf42d1cab30a1253a7dd98bf SHA512 10b6d024b24fb236954a981c17dec25b4d4b8f06c4cef3edb9137cf291099453926b5793c6f19bd3b69a9db88e38ed4ea72bbf8aa6f57434a30974b9fb9ab763
+DIST termux-clipboard-0.1.0.crate 2033 BLAKE2B 33003b25e6236370b2423472e87deaac8ee282c375e02faa3575aaec7ef547674f0218a50f0a2d42ff75dcf088ef31d94f44c4b05c0f526dddbaef2e06a8c722 SHA512 acd972d9c9eaa20dfadf1ec01274ed27fb33d16d97b504d8f41fea9c6598557a32d939d0a8a8585d919ee9d1b411d714851d662b5bc7d1a5f3b97d8cd423a434
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thiserror-1.0.25.crate 16690 BLAKE2B a03107d70186d46870050ef86cb1f49aa99d91e509bd9ab22ee6cbac28d37176b2bafbadedc237a25d233abf7816cb3d85d88c140f172ede40d309ddaa1223dc SHA512 f408c2722060c6f707b9afcc1d9f3cb175bcf955263c4e643ef7ee935fd68299af835f4ad489ace814a7bcad6dc428eec5df2858453834d0b6154d22a38ba1da
+DIST thiserror-1.0.26.crate 16711 BLAKE2B 4524c3ef351eaa1266cbbbafec6082695d5c1485cec7bcfdffd64719fd57efb4e40f119435eae5c6f574a80f59a68bd8c868e2493ddf36f4882e7de65fd4bf93 SHA512 bfe93a14006a3d9e0e996b310718223f8442802a384a1b999c15dd1a25f642c5cb2db7a50a69cbb097ec50ee3b0129b509f19225ca714a5c459d4dfc8255d84b
+DIST thiserror-impl-1.0.25.crate 13364 BLAKE2B 9b0eb7a6fd5f290d7a666de6065edc210ab9ef35960c424258d5039f24433baef7d1228ac2e962e8ef9dcb673979c9d3c09ef3f3d20533fe2ad1500bfcb20015 SHA512 a2d2f39d3c1e5a722d7020672f63fc312dd9f8ed73863971814f1fd12faac4ea5d8546e06b26838d8224b1f91161011f51dda476848b2555153203ee9f7ee3ca
+DIST thiserror-impl-1.0.26.crate 13431 BLAKE2B dc753a4cc1e7b8b3eb44bd9462b6b19ee983fefbfe1f60a974195a536fdbc68395942a229a1d2ec7a8594669a439a6efd3cd22573a647a7fb7a371e793fba645 SHA512 43eea818b72469bc4d5c28e449c2e284c1e11b2674b9e67b1788af7ab66bd64afabfd8f5861938a7f9547a9c13387e0ce400419c6283bbe1e899d18d998cd921
+DIST tiff-0.6.1.crate 1399263 BLAKE2B 4a0bec5d2f2d254505c3492e519c584e2f80f77a6429f44da36862b5d9fc1ef9f7396689005b136c92f6786ac64f9418ca7bbf49f36afdf3f10e8d2c77cf0f51 SHA512 ece5aaef610e0a7bcdea8c40571d497cd3ec79931e25129060b4f51cb40a28ef03fc131494bc841fa5b08eaa49a5acbc9332553cbc542019f1ec5eb5945d3538
+DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
+DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
+DIST tinyvec-1.3.1.crate 42386 BLAKE2B 9fa7dc7c4967bc3ba3f7e5fbef54a7b6fca46f6520aed2482d355b1f6434ac702e073df19034908f214e5c0ffaaa3bdb41c7d394d9f828dbeaa177158ee99ad2 SHA512 ad07998e9bacccf8ce2bcb01fea8008c6514ad73c15c6426453cfdbb432dac7d588d05551b179c83ca062ea02f0853e97e2b9712da0b8dc20ddab4c0efd5afd2
+DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
+DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
+DIST umask-1.0.0.crate 4380 BLAKE2B 3e1adf758039cf60d27d62417bdfd6b6fccc5fc4c2db483c81698e83d2689a7a6c89a9c45e68a8808d50f2481b0bdcb1a224d18eaed7ad9aafaecb5c2f199a1d SHA512 096b11f02ba12e0bc112481920d600d3e782ad296f6a287c4d2a36d78e35f0b4d38d13d32d73ccc58830711521f27e3d22f204d1e4474596973dc8fd8ef3c4b4
+DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
+DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
+DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
+DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
+DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
+DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
+DIST users-0.11.0.crate 21980 BLAKE2B c106e9ed67b9ad766bb7318506261579768185aea3d956d9e8b2adb52349525fe69703ee3bb2e4fb02aa223bfa6fc92a14d8128412623f70654254f842d7322c SHA512 e28028f895780bd59a11069b81b87470a287a447e42566cfb8de0e2d4ba8c90a3ce92901e253dcd2628383c8ed06c10714bc0181a57bf257f7edb3510936e596
+DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
+DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
+DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
+DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+DIST weezl-0.1.5.crate 34944 BLAKE2B 57db23ed5d92b658a3ace462194763756a3ec3caa530296efc3255ae1d14f36ccfb4841d2417028ef57f093eadfa19b157f9cdc29d37b2f72fb661578cc7e907 SHA512 1fe4352dc8c773ac1297ba23ca3236dece6cec44887116afb1b3760dd0cf3ffcf5faae3aa98814775fddc38032c97c26a14684b47e7aa9deaecafe8c908e0735
+DIST which-4.1.0.crate 7684 BLAKE2B 4d8eb0a263c14b506f446fa808d9326c6e4e781cc2d79a1f6efcf7b9bb9a294d3266a2f3de4526ac0ec08ca65a18622ac064e9ae1e86dd1b325b122f684371f8 SHA512 4fffd3dd4ac73f5c232ee8a53bbc948a7295a2a51ec3f792d5d0aa84ceb6c2322fc11b35d29f5d3181c763b34c434c5ea2807ae6cc3393cd30d68b0fd44c7a22
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST x11-clipboard-0.5.2.crate 7634 BLAKE2B 03c8f76ac5da33559f90fe777b802f1c0429412d8c72e7dbc43f5d4d7359648e408da7d8c31a7bb61da8ffae71d2f302fe131fe11817005f23b7bd4f9d5975c7 SHA512 e3ab302b7b7b82e3d869d61e6349780ca67750713d51102d910b17ade033066187486743920a35b3e1c03e78b2e525f4cf5fd44b92ab0dd79e576727adf6333c
+DIST xcb-0.9.0.crate 129744 BLAKE2B 5854662e87fc75e07ea707263808c8a5c6fd53a65e4f5034413227e1150a9110075449b17318861828667f47fbee0f673920cf9c6197ef15fdf0dd592dd3b1c4 SHA512 183d59745daa048335e7081add8ca1ea6db3fa77903bffa8bf34de538efc4618755fda1344cd36bc1175600d3df341ac1bde45706d3809a266a25eaf7c253dac
+DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
+DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
+DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
+EBUILD broot-1.6.1.ebuild 4004 BLAKE2B 408b4110e0ff1395e0005df4796ad82d7e9ae5decf5fd463d623aa4af73f3af05cccfe0fcdc2a4012eccf3a1df710bcdbaff488d518cb42cb3b92ce64f661430 SHA512 519ceee993b558e09a778b14cd243207d418f85b7c6c1d93166b230f6450e22728436eea0324e124f08a7498b6b8de67dee34bb5a7d3799adf8037e9aeaa904b
+EBUILD broot-1.6.2.ebuild 4135 BLAKE2B 8c39e8ecfaf64768b0bc31cc9bd3133b9ae138f1bf307c0296d474ced6c77239c8b77d9e8f721d032b8c09f403eb2895ceefd117d4333258a762623be7abcbbb SHA512 2caf1be25e7d4750d4ae8cef126bdd735cb604628f13777cee731aeb4ab3eda1c53884bb4a0b8aa14c14f2fdb20d88f778f6f7c5522a6fd739348160052af124
+MISC metadata.xml 498 BLAKE2B dd706df194ed867320c798e5a48aa01133ebd84f608ffedc3990de9fc50d6469d5026a19988916a8f7388a18968f969178a16bb85838e28cf572949071bd965c SHA512 9dccd0262eb426807aed1b952145ca4f8962da83a3f16b4890634a1896032ba4c03f8b87254cc59fcf1df61c75ee8e2143f40bd79560dcc4dc3deb435c73df7f
diff --git a/app-misc/broot/broot-1.6.1.ebuild b/app-misc/broot/broot-1.6.1.ebuild
new file mode 100644
index 000000000000..9f1da71e6417
--- /dev/null
+++ b/app-misc/broot/broot-1.6.1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+adler-1.0.2
+adler32-1.2.0
+ahash-0.4.7
+ahash-0.7.4
+aho-corasick-0.7.18
+ansi_colours-1.0.3
+ansi_term-0.11.0
+anyhow-1.0.41
+argh-0.1.4
+argh_derive-0.1.4
+argh_shared-0.1.4
+atty-0.2.14
+autocfg-1.0.1
+base64-0.13.0
+bet-1.0.0
+bincode-1.3.3
+bitflags-1.2.1
+bstr-0.2.16
+bytemuck-1.7.0
+byteorder-1.4.3
+cc-1.0.68
+cfg-if-1.0.0
+char_reader-0.1.0
+chrono-0.4.19
+clap-2.33.3
+cli-log-0.1.0
+cli-log-2.0.0
+clipboard-win-4.2.1
+color_quant-1.1.0
+crc32fast-1.2.1
+crossbeam-0.8.1
+crossbeam-channel-0.5.1
+crossbeam-deque-0.8.0
+crossbeam-epoch-0.9.5
+crossbeam-queue-0.3.2
+crossbeam-utils-0.8.5
+crossterm-0.19.0
+crossterm_winapi-0.7.0
+csv-1.1.6
+csv-core-0.1.10
+csv2svg-0.1.5
+custom_error-1.9.2
+deflate-0.8.6
+deser-hjson-1.0.1
+directories-3.0.2
+directories-next-2.0.0
+dirs-sys-0.3.6
+dirs-sys-next-0.1.2
+either-1.6.1
+error-code-2.3.0
+fallible-iterator-0.2.0
+fallible-streaming-iterator-0.1.9
+file-size-1.0.3
+flate2-1.0.20
+fnv-1.0.7
+form_urlencoded-1.0.1
+getrandom-0.1.16
+getrandom-0.2.3
+gif-0.11.2
+git2-0.13.20
+glassbench-0.3.0
+glob-0.3.0
+hashbrown-0.9.1
+hashlink-0.6.0
+heck-0.3.3
+hermit-abi-0.1.18
+id-arena-2.2.1
+idna-0.2.3
+image-0.23.14
+indexmap-1.6.2
+instant-0.1.9
+is_executable-0.1.2
+itoa-0.4.7
+jobserver-0.1.22
+jpeg-decoder-0.1.22
+lazy-regex-2.2.1
+lazy-regex-proc_macros-2.2.1
+lazy_static-1.4.0
+lazycell-1.3.0
+lfs-core-0.3.4
+libc-0.2.97
+libgit2-sys-0.12.21+1.1.0
+libsqlite3-sys-0.20.1
+libz-sys-1.1.3
+line-wrap-0.1.1
+linked-hash-map-0.5.4
+lock_api-0.4.4
+log-0.4.14
+matches-0.1.8
+memchr-2.4.0
+memmap-0.7.0
+memoffset-0.6.4
+minimad-0.7.1
+minimad-0.8.0
+miniz_oxide-0.3.7
+miniz_oxide-0.4.4
+mio-0.7.13
+miow-0.3.7
+ntapi-0.3.6
+num-integer-0.1.44
+num-iter-0.1.42
+num-rational-0.3.2
+num-traits-0.2.14
+num_cpus-1.13.0
+once_cell-1.8.0
+onig-6.2.0
+onig_sys-69.7.0
+open-1.7.0
+parking_lot-0.11.1
+parking_lot_core-0.8.3
+pathdiff-0.2.0
+percent-encoding-2.1.0
+phf-0.8.0
+phf_generator-0.8.0
+phf_macros-0.8.0
+phf_shared-0.8.0
+pkg-config-0.3.19
+plist-1.1.0
+png-0.16.8
+ppv-lite86-0.2.10
+proc-macro-hack-0.5.19
+proc-macro2-1.0.27
+proc-status-0.1.1
+quote-1.0.9
+rand-0.7.3
+rand-0.8.4
+rand_chacha-0.2.2
+rand_chacha-0.3.1
+rand_core-0.5.1
+rand_core-0.6.3
+rand_hc-0.2.0
+rand_hc-0.3.1
+rand_pcg-0.2.1
+rayon-1.5.1
+rayon-core-1.9.1
+redox_syscall-0.2.9
+redox_users-0.4.0
+regex-1.5.4
+regex-automata-0.1.10
+regex-syntax-0.6.25
+remove_dir_all-0.5.3
+rusqlite-0.24.2
+ryu-1.0.5
+safemem-0.3.3
+same-file-1.0.6
+scoped_threadpool-0.1.9
+scopeguard-1.1.0
+secular-1.0.0
+serde-1.0.126
+serde_derive-1.0.126
+serde_json-1.0.64
+signal-hook-0.1.17
+signal-hook-registry-1.4.0
+siphasher-0.3.5
+smallvec-1.6.1
+splitty-0.1.0
+str-buf-1.0.5
+strict-0.1.4
+strsim-0.8.0
+svg-0.8.2
+syn-1.0.73
+syntect-4.5.0
+tempfile-3.2.0
+termimad-0.10.3
+termimad-0.11.1
+terminal-clipboard-0.2.1
+termux-clipboard-0.1.0
+textwrap-0.11.0
+thiserror-1.0.25
+thiserror-impl-1.0.25
+tiff-0.6.1
+time-0.1.43
+tinyvec-1.2.0
+tinyvec_macros-0.1.0
+toml-0.5.8
+umask-1.0.0
+unicode-bidi-0.3.5
+unicode-normalization-0.1.19
+unicode-segmentation-1.7.1
+unicode-width-0.1.8
+unicode-xid-0.2.2
+url-2.2.2
+users-0.11.0
+vcpkg-0.2.15
+vec_map-0.8.2
+version_check-0.9.3
+walkdir-2.3.2
+wasi-0.9.0+wasi-snapshot-preview1
+wasi-0.10.2+wasi-snapshot-preview1
+weezl-0.1.5
+which-4.1.0
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+x11-clipboard-0.5.2
+xcb-0.9.0
+xml-rs-0.8.3
+yaml-rust-0.4.5
+"
+
+inherit cargo
+
+DESCRIPTION="A new way to see and navigate directory trees"
+HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
+SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="usr/bin/broot"
+
+src_prepare() {
+	default
+
+	local mandate=$(date -r man/page +'%Y/%m/%d' || die)
+	sed -e "s|#version|${PV}|" \
+		-e "s|#date|${mandate}|" \
+		man/page > "${T}"/${PN}.1 || die
+}
+
+src_install() {
+	cargo_src_install
+
+	doman "${T}"/${PN}.1
+}
diff --git a/app-misc/broot/broot-1.6.2.ebuild b/app-misc/broot/broot-1.6.2.ebuild
new file mode 100644
index 000000000000..4e0458ede56c
--- /dev/null
+++ b/app-misc/broot/broot-1.6.2.ebuild
@@ -0,0 +1,241 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+adler-1.0.2
+adler32-1.2.0
+ahash-0.4.7
+ahash-0.7.4
+aho-corasick-0.7.18
+ansi_colours-1.0.4
+ansi_term-0.11.0
+anyhow-1.0.42
+argh-0.1.5
+argh_derive-0.1.5
+argh_shared-0.1.5
+atty-0.2.14
+autocfg-1.0.1
+base64-0.13.0
+bet-1.0.0
+bincode-1.3.3
+bitflags-1.2.1
+bstr-0.2.16
+bytemuck-1.7.2
+byteorder-1.4.3
+cc-1.0.69
+cfg-if-1.0.0
+char_reader-0.1.0
+chrono-0.4.19
+clap-2.33.3
+cli-log-0.1.0
+cli-log-2.0.0
+clipboard-win-4.2.1
+color_quant-1.1.0
+crc32fast-1.2.1
+crossbeam-0.8.1
+crossbeam-channel-0.5.1
+crossbeam-deque-0.8.0
+crossbeam-epoch-0.9.5
+crossbeam-queue-0.3.2
+crossbeam-utils-0.8.5
+crossterm-0.19.0
+crossterm-0.20.0
+crossterm_winapi-0.7.0
+crossterm_winapi-0.8.0
+csv-1.1.6
+csv-core-0.1.10
+csv2svg-0.1.5
+custom_error-1.9.2
+deflate-0.8.6
+deser-hjson-1.0.1
+directories-3.0.2
+directories-next-2.0.0
+dirs-sys-0.3.6
+dirs-sys-next-0.1.2
+either-1.6.1
+error-code-2.3.0
+fallible-iterator-0.2.0
+fallible-streaming-iterator-0.1.9
+file-size-1.0.3
+flate2-1.0.20
+fnv-1.0.7
+form_urlencoded-1.0.1
+getrandom-0.1.16
+getrandom-0.2.3
+gif-0.11.2
+git2-0.13.20
+glassbench-0.3.0
+glob-0.3.0
+hashbrown-0.9.1
+hashbrown-0.11.2
+hashlink-0.6.0
+heck-0.3.3
+hermit-abi-0.1.19
+id-arena-2.2.1
+idna-0.2.3
+image-0.23.14
+indexmap-1.7.0
+instant-0.1.10
+is_executable-0.1.2
+itoa-0.4.7
+jobserver-0.1.22
+jpeg-decoder-0.1.22
+lazy-regex-2.2.1
+lazy-regex-proc_macros-2.2.1
+lazy_static-1.4.0
+lazycell-1.3.0
+lfs-core-0.4.2
+libc-0.2.98
+libgit2-sys-0.12.21+1.1.0
+libsqlite3-sys-0.20.1
+libz-sys-1.1.3
+line-wrap-0.1.1
+linked-hash-map-0.5.4
+lock_api-0.4.4
+log-0.4.14
+matches-0.1.8
+memchr-2.4.0
+memmap-0.7.0
+memoffset-0.6.4
+minimad-0.7.1
+minimad-0.8.0
+miniz_oxide-0.3.7
+miniz_oxide-0.4.4
+mio-0.7.13
+miow-0.3.7
+ntapi-0.3.6
+num-integer-0.1.44
+num-iter-0.1.42
+num-rational-0.3.2
+num-traits-0.2.14
+num_cpus-1.13.0
+once_cell-1.8.0
+onig-6.2.0
+onig_sys-69.7.0
+open-1.7.1
+parking_lot-0.11.1
+parking_lot_core-0.8.3
+pathdiff-0.2.0
+percent-encoding-2.1.0
+phf-0.8.0
+phf_generator-0.8.0
+phf_macros-0.8.0
+phf_shared-0.8.0
+pkg-config-0.3.19
+plist-1.2.0
+png-0.16.8
+ppv-lite86-0.2.10
+proc-macro-hack-0.5.19
+proc-macro2-1.0.28
+proc-status-0.1.1
+quote-1.0.9
+rand-0.7.3
+rand-0.8.4
+rand_chacha-0.2.2
+rand_chacha-0.3.1
+rand_core-0.5.1
+rand_core-0.6.3
+rand_hc-0.2.0
+rand_hc-0.3.1
+rand_pcg-0.2.1
+rayon-1.5.1
+rayon-core-1.9.1
+redox_syscall-0.2.9
+redox_users-0.4.0
+regex-1.5.4
+regex-automata-0.1.10
+regex-syntax-0.6.25
+remove_dir_all-0.5.3
+rusqlite-0.24.2
+ryu-1.0.5
+safemem-0.3.3
+same-file-1.0.6
+scoped_threadpool-0.1.9
+scopeguard-1.1.0
+secular-1.0.1
+serde-1.0.126
+serde_derive-1.0.126
+serde_json-1.0.66
+signal-hook-0.1.17
+signal-hook-0.3.9
+signal-hook-mio-0.2.1
+signal-hook-registry-1.4.0
+siphasher-0.3.6
+smallvec-1.6.1
+splitty-0.1.0
+str-buf-1.0.5
+strict-0.1.4
+strsim-0.8.0
+svg-0.8.2
+syn-1.0.74
+syntect-4.5.0
+tempfile-3.2.0
+termimad-0.10.3
+termimad-0.14.0
+terminal-clipboard-0.2.1
+termux-clipboard-0.1.0
+textwrap-0.11.0
+thiserror-1.0.26
+thiserror-impl-1.0.26
+tiff-0.6.1
+time-0.1.43
+tinyvec-1.3.1
+tinyvec_macros-0.1.0
+toml-0.5.8
+umask-1.0.0
+unicode-bidi-0.3.5
+unicode-normalization-0.1.19
+unicode-segmentation-1.8.0
+unicode-width-0.1.8
+unicode-xid-0.2.2
+url-2.2.2
+users-0.11.0
+vcpkg-0.2.15
+vec_map-0.8.2
+version_check-0.9.3
+walkdir-2.3.2
+wasi-0.9.0+wasi-snapshot-preview1
+wasi-0.10.2+wasi-snapshot-preview1
+weezl-0.1.5
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+x11-clipboard-0.5.2
+xcb-0.9.0
+xml-rs-0.8.4
+yaml-rust-0.4.5
+"
+
+inherit cargo
+
+DESCRIPTION="A new way to see and navigate directory trees"
+HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
+SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/broot"
+
+src_prepare() {
+	default
+
+	local mandate=$(date -r man/page +'%Y/%m/%d' || die)
+	sed -e "s|#version|${PV}|" \
+		-e "s|#date|${mandate}|" \
+		man/page > "${T}"/${PN}.1 || die
+}
+
+src_install() {
+	cargo_src_install
+
+	doman "${T}"/${PN}.1
+}
diff --git a/app-misc/broot/metadata.xml b/app-misc/broot/metadata.xml
new file mode 100644
index 000000000000..e7db7018b5ef
--- /dev/null
+++ b/app-misc/broot/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>creideiki+gentoo-bugzilla@lysator.liu.se</email>
+		<name>Karl-Johan Karlsson</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Canop/broot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index a6982c3d86e2..8225d286fa5f 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -1,3 +1,3 @@
 DIST datefudge_1.24.tar.xz 14152 BLAKE2B c0a386193e6761abade4643e2f56520738baf4bb739d4c94cec3e47a8feb5ebdf32a6e8b4a0c3dbb9584136b9855abcc68f5134e082083dfb61e977ae45c0bc7 SHA512 cd548a7e8ff10189e101fa339b2845cdd19a59354e43b02cf47e466855ec192dc2084951f7663a94da56a580dd24524047651d8bcb41aa478fe94b24dffaedeb
-EBUILD datefudge-1.24.ebuild 794 BLAKE2B 852cc8b3b7624626b684480d91679c886a4710690238d2c13dd1a8d05bc15083f3e03dd5ca69c9b9c95438b80fec864318ef538a22111ac50bfa5859148c8276 SHA512 4b4bbbba80b6fe795c94b6383db226c0886b7fb1368f207fa455baf99ad970b478798631f87c8f0f830849164bb749fefdb37430d4f54d033cdab426ce635fde
+EBUILD datefudge-1.24.ebuild 801 BLAKE2B fa1c8d8ae57b18579afc93fe7f74da1651709d4c2216dee9c9dcdca076d1c6953dc7ce5e8b9318c5721ccacb05961cdf6ac71f58ca8b17ecdd8024606cef7bc0 SHA512 a9d27df8475d85650f67a218560d53cef70cc7f77f46754953cbdcf5a31523d888e681d74fb3405d963b553c70156feec1732b5a849dfb69ba7992b5ab1b6837
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/datefudge/datefudge-1.24.ebuild b/app-misc/datefudge/datefudge-1.24.ebuild
index 002e37e93e9b..8744d0294c1e 100644
--- a/app-misc/datefudge/datefudge-1.24.ebuild
+++ b/app-misc/datefudge/datefudge-1.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 src_prepare() {
 	default
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index b8494e7a2cb2..e91c6392c34a 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -9,14 +9,19 @@ AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
 DIST elasticsearch-6.8.15.tar.gz 149102328 BLAKE2B 0ce9ba565d751cd27721f3d49dd24761937c3476cee4896ba1a4d84e4fc238296129481f18cad64270fe8af71a043c2e8e583df14f2a084850fb10c93fcea0ef SHA512 c62c4d9d1bb83e10d3e1079f56b834f2f89b1f712c29d9ce7e81786199c71d287ecbf6df158eca56a7af711eafe13dfb276e12b34e1a0a6cf6719e1fbb44a142
 DIST elasticsearch-6.8.16.tar.gz 149125098 BLAKE2B cafdb7fd97b3df087472c65ede9eb9c703f6499a03d70c5fcc497bdaafc0757d0b9e7fe84d0a8c710cdecbe85654fdad1f854209015a545e0bf43d8e585a481f SHA512 0b15f77ba5962970ef38869a233ee3d091a64b218cf42dc5f4bdd8a81322739992f75e3c438295435f28af20af1e138c2f5e3afed76a7ebc0f348764528dd0f3
+DIST elasticsearch-6.8.17.tar.gz 149132823 BLAKE2B a83d4e81059a717e48ac54e7565efe282f42103718ba9cef9994a6970769bb01248e99ffbfe061ca85a7b44890604c6174dc11046a94c455dc01da7f495524ea SHA512 5eb365efccff4e371d9ac873b45684c36cfd7f25ec51a86c3cd74beff4491dbc0097dba22f91335c35478e3b25decc6ae4bc5d538add0e17a39eb063dfa2d88c
 DIST elasticsearch-7.12.0-no-jdk-linux-x86_64.tar.gz 173069694 BLAKE2B 5de74b1e6de743246cf48e32254f9646fa25c2820d0be9df886fdefe131a302ddb8906546147f0d284e2fc0faf8cc0238bf854fe1611d28bf1e7cb1518bd4e31 SHA512 205aa2a2fa2ab7eb7b54087420e0123aa97e5456e2e1f31cad9ea7b84be3f9823a2a7c47d4cf1697833e5f795359477d3a3b0ea4955a8f92583cf2228071827e
 DIST elasticsearch-7.12.1-no-jdk-linux-x86_64.tar.gz 173079845 BLAKE2B 98214508c2c1dcb631f59d9e51d5949f9a7c5d1f68ff78c8d93af04c6a21fa1e1c6e2051f04bbdb8154443d6295ad54af2016695fcb9193b7595e1486777ba98 SHA512 c91fd66668977280d7339caf6b4fef9fce5640492f0e2a65bc537c6da8397c801a3727f1ff56b7a1591b11ea47195720c588a4eba473043f829a87cd3dcc0af4
 DIST elasticsearch-7.13.2-no-jdk-linux-x86_64.tar.gz 174688419 BLAKE2B e8541581dfc856b9b005bc7fda29c9aaf82d61c406df1f7e06ea8997a71567047d4822e5e873aee41f7a295f2eba10508c966e9ebc4e8b7c734f1c100f4a05f3 SHA512 4d02faf019eab1fc590d76fdc50c6396cfe5bc4363baaa3d1e63ca7210942cbdf5c08d28e5d4b7d2cf47fb18ee83b94529ecb2bdaba6521798721398c8a06165
+DIST elasticsearch-7.13.4-no-jdk-linux-x86_64.tar.gz 174690446 BLAKE2B bab17a006f14d262ee85918c8b2e5f610a1e726d158cf423bf306971826f182963e0231456539253f5054069b82672e8803c0da06166215d128bdea02e6738db SHA512 5d6d53d9d6c6faf5d6599019882aa4b5d91f04944ab26c496cab033880b71f1ce2addb98bcf12b21891c005e810ce4a0493627b9ec9f0f78b4f7786efa398eab
 DIST elasticsearch-oss-6.8.15.tar.gz 68240776 BLAKE2B 431d845e02f2118a98021af4422ece34274b6d0811a32c5a3e679da3f8f56ca9cd45949307268811edbb83327a4a80fb84866cbbaaf01f7d3af042412b1e1bfa SHA512 7e6a819339ac6043af218f9d97d5d68c50ac46900e4293e7fa18992f7a50b10b0ab2434e26ff0dc1546204ae7526de8ac6ef6545fc0db9c862ceeaa0d96c56f5
 DIST elasticsearch-oss-6.8.16.tar.gz 68248767 BLAKE2B 2c8c14a6e2f837bc547de2e8c97f2fbe2dbf7743978a00e2fc37cd61eb46144df2a24f67360761e0342987b9194176109cfbd07545d2e8f88cae48f9508c659c SHA512 0f46c69136312d535ccff4663655500538ffc924bbe50350c2eed3372609a28e642bb906cbb9a631af5fa10568a16c1a630ef181c383ee247c98325ddc85e04c
-EBUILD elasticsearch-6.8.15.ebuild 2539 BLAKE2B de446b12484037a7952b5b21537189b1ee7157d87a779109e025648fe8cfe3c82f3c8d59dc823350faddc5ec0c6b01e7461739da052226134353ae9c3e388cea SHA512 ee3431551b5a0c2896172e00f42b96da8c400526fd907ba6c4e6e0b352a224fa85589c5b17924d42915490b0449b207652c6442b6fcd51a37d080f82b944069f
-EBUILD elasticsearch-6.8.16.ebuild 2539 BLAKE2B de446b12484037a7952b5b21537189b1ee7157d87a779109e025648fe8cfe3c82f3c8d59dc823350faddc5ec0c6b01e7461739da052226134353ae9c3e388cea SHA512 ee3431551b5a0c2896172e00f42b96da8c400526fd907ba6c4e6e0b352a224fa85589c5b17924d42915490b0449b207652c6442b6fcd51a37d080f82b944069f
-EBUILD elasticsearch-7.12.0.ebuild 2454 BLAKE2B e41faa9592270795a3778d345db25c8029f8872644fe456dde749df19ddb6bd9fad3bc746e1b08ee94238ec437521d28cbef7c113d6ac85218bd1c4bdd03104b SHA512 c361cc56c306005896562c34f53fadf0ac586df353f9db925ff2e9abf07e7534bf8d3b33f5c04998ca06835d265bf58f1562f8a9e7314f318868fe526699136a
-EBUILD elasticsearch-7.12.1.ebuild 2389 BLAKE2B 0a33190cd4dd3c80a69bd4356ee696639c17f8e1d8b97780bac4a12435a03cd3fcb6186e0a7f916f04dfcd0358055fb6153fe3f090f9c4cfabfc982727f2fb88 SHA512 7fb066fb4aef44bb335675a20b52857d3b1cef213401bc48fc333483bc6091f8cd52e0056e0b93e1da3bba9cc571985ece4329397c93e401c7bbd9c012642ce2
-EBUILD elasticsearch-7.13.2.ebuild 2389 BLAKE2B 0a33190cd4dd3c80a69bd4356ee696639c17f8e1d8b97780bac4a12435a03cd3fcb6186e0a7f916f04dfcd0358055fb6153fe3f090f9c4cfabfc982727f2fb88 SHA512 7fb066fb4aef44bb335675a20b52857d3b1cef213401bc48fc333483bc6091f8cd52e0056e0b93e1da3bba9cc571985ece4329397c93e401c7bbd9c012642ce2
+DIST elasticsearch-oss-6.8.17.tar.gz 68247749 BLAKE2B 12e85804a7d58dc27d85fbed6501831d92428405cb4636355c523a370863e00301bd75d7d12404ee0c7eefc32c53bc4b23e8fc1fecf2f606faf85369b2262cc7 SHA512 0f165357b1f389fbd01f07397a2b3ea5d493fae720c15213f2ee47a0c2c75bc4a448384767646d7585a18d4577899b840121c1829a987a16d2de68f216b28f7c
+EBUILD elasticsearch-6.8.15.ebuild 2569 BLAKE2B c9d4ceaa7e325b36bd5dd839147c1a317f3b3868680d99d125b31db162db41dacc1404e90855cef66f7f6e1065bcd421ba6d1851b71335a773f1ddf46823636b SHA512 ba88be72479b2123e152a12c59c1057078d0b61ad420f1922d07aa1d0fcfbf57ce48e23702f4dc24f0ab8524035cb55da52d247572f5788b40c14e1ce18c22fe
+EBUILD elasticsearch-6.8.16.ebuild 2569 BLAKE2B c9d4ceaa7e325b36bd5dd839147c1a317f3b3868680d99d125b31db162db41dacc1404e90855cef66f7f6e1065bcd421ba6d1851b71335a773f1ddf46823636b SHA512 ba88be72479b2123e152a12c59c1057078d0b61ad420f1922d07aa1d0fcfbf57ce48e23702f4dc24f0ab8524035cb55da52d247572f5788b40c14e1ce18c22fe
+EBUILD elasticsearch-6.8.17.ebuild 2539 BLAKE2B de446b12484037a7952b5b21537189b1ee7157d87a779109e025648fe8cfe3c82f3c8d59dc823350faddc5ec0c6b01e7461739da052226134353ae9c3e388cea SHA512 ee3431551b5a0c2896172e00f42b96da8c400526fd907ba6c4e6e0b352a224fa85589c5b17924d42915490b0449b207652c6442b6fcd51a37d080f82b944069f
+EBUILD elasticsearch-7.12.0.ebuild 2434 BLAKE2B 2594f0ece134b0c9a1f3c3aa8df7cafd7d53fc7314b80891abab549d9e33f0b26585dab3f8aacb53d700345572e409816971736e05509d3d93e9f5a355f09518 SHA512 7c9a37f4243e1a0422dc1d5afd95d1c3218d2e00963342ef43574eb50b5b0013cad5ed1073fdc90b54a205d92c4e6254b638bb955941f8e3d318a0c67d5cd1e4
+EBUILD elasticsearch-7.12.1.ebuild 2369 BLAKE2B ce1ecc30a04fdf3b9942c2925bff8394049bcdc860ffa02a98d0cbad63beaf29437afca9412fff843c5fbe7e10ddbb253b56298de9f20e7256e22f1dd50a71bc SHA512 0be9c9db4eeb66bfe204005d4210d693199a447dbfb3298c13112c90dab84722a4817529f80e91b4672a838c5e7bed6d2a9711a92607369e245e3cb22006dfc6
+EBUILD elasticsearch-7.13.2.ebuild 2369 BLAKE2B ce1ecc30a04fdf3b9942c2925bff8394049bcdc860ffa02a98d0cbad63beaf29437afca9412fff843c5fbe7e10ddbb253b56298de9f20e7256e22f1dd50a71bc SHA512 0be9c9db4eeb66bfe204005d4210d693199a447dbfb3298c13112c90dab84722a4817529f80e91b4672a838c5e7bed6d2a9711a92607369e245e3cb22006dfc6
+EBUILD elasticsearch-7.13.4.ebuild 2389 BLAKE2B 0a33190cd4dd3c80a69bd4356ee696639c17f8e1d8b97780bac4a12435a03cd3fcb6186e0a7f916f04dfcd0358055fb6153fe3f090f9c4cfabfc982727f2fb88 SHA512 7fb066fb4aef44bb335675a20b52857d3b1cef213401bc48fc333483bc6091f8cd52e0056e0b93e1da3bba9cc571985ece4329397c93e401c7bbd9c012642ce2
 MISC metadata.xml 611 BLAKE2B 91d02c98271689922fc5d79355a378cb29a3c88e45b089ad89afb182e50f6a0bb19fa8160e2455eb8815e9b2655cea6232ba7845cfa970b4d82529993b5447b8 SHA512 daa5f2349a139c5952f9831c9517e6af48ebe337506f77e7ddbe67fc5ad6f243ecea82c858b7687e3baef26f20e1e3f0d2453f72ce00a5985c2a618dff2a6361
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.15.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.15.ebuild
index 6b347e7957c4..e090a2d2fede 100644
--- a/app-misc/elasticsearch/elasticsearch-6.8.15.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.8.15.ebuild
@@ -72,6 +72,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	elog
 	elog "You may create multiple instances of ${PN} by"
 	elog "symlinking the init script:"
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.16.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.16.ebuild
index 6b347e7957c4..e090a2d2fede 100644
--- a/app-misc/elasticsearch/elasticsearch-6.8.16.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.8.16.ebuild
@@ -72,6 +72,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	elog
 	elog "You may create multiple instances of ${PN} by"
 	elog "symlinking the init script:"
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.17.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.17.ebuild
new file mode 100644
index 000000000000..6b347e7957c4
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-6.8.17.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	virtual/jre:1.8"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+src_prepare() {
+	default
+
+	rm bin/*.{bat,exe} LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+
+	if use x-pack; then
+		rm bin/x-pack/*.bat || die
+		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
+	fi
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	if use x-pack; then
+		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+	fi
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.6" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	newtmpfiles "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild
index 01bfc5af53fd..45949c1449de 100644
--- a/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.12.0.ebuild
@@ -66,7 +66,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
+	tmpfiles_process ${PN}.conf
 
 	elog
 	elog "You may create multiple instances of ${PN} by"
diff --git a/app-misc/elasticsearch/elasticsearch-7.12.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.12.1.ebuild
index e2035c21e8ff..bdf9f6e767d4 100644
--- a/app-misc/elasticsearch/elasticsearch-7.12.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.12.1.ebuild
@@ -64,7 +64,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
+	tmpfiles_process ${PN}.conf
 
 	elog
 	elog "You may create multiple instances of ${PN} by"
diff --git a/app-misc/elasticsearch/elasticsearch-7.13.2.ebuild b/app-misc/elasticsearch/elasticsearch-7.13.2.ebuild
index e2035c21e8ff..bdf9f6e767d4 100644
--- a/app-misc/elasticsearch/elasticsearch-7.13.2.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.13.2.ebuild
@@ -64,7 +64,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
+	tmpfiles_process ${PN}.conf
 
 	elog
 	elog "You may create multiple instances of ${PN} by"
diff --git a/app-misc/elasticsearch/elasticsearch-7.13.4.ebuild b/app-misc/elasticsearch/elasticsearch-7.13.4.ebuild
new file mode 100644
index 000000000000..e2035c21e8ff
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.13.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Free and Open, Distributed, RESTful Search Engine"
+HOMEPAGE="https://www.elastic.co/elasticsearch/"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz"
+LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	virtual/jre"
+
+QA_PREBUILT="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+src_prepare() {
+	default
+
+	rm LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	fperms -R +x /usr/share/${PN}/bin
+	fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.4" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.8" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
+
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
index eb4ef44a8ed7..8b8245970602 100644
--- a/app-misc/fhem/Manifest
+++ b/app-misc/fhem/Manifest
@@ -3,5 +3,5 @@ AUX fhem.initd 447 BLAKE2B c724aa0b16fa7c6e1018e78c6ece9d1ba6357d147d1909326a5ad
 AUX fhem.service-r1 240 BLAKE2B e52d6d324db876a1b477f09a480b8a7053af9bfc7264d3cc1fc35f7dfd9401c4a415867d7ac295f4750d6633abe9b9f24b7250c7dfeed31799597f42157a209d SHA512 87f10593f57eb5775a729005ec28fc0d5673044eea7a38ddcb32596ba6b26cd52d866fc2c1eb71985bffd3820f8574f965f42341761bb0ac95d042dca39d8320
 AUX fhem.tmpfiles 31 BLAKE2B 57659fe7fe189d03cd1fdbd073421f2215b90db9d2c00b335ca3b98b7c42b23085c9ccadd85fc40c5c21e393c571bacc6804b06dc47de88bfcfe4384d7be88f8 SHA512 4e29020ae5d114c6ab3ad1935a8b4b1b4d6d521771554130304534f69a0ec6961f93b64ad45aabeeff9ab1a73dbe97187922f845c849565105801edffc1ac0ce
 DIST fhem-6.0.tar.gz 28562819 BLAKE2B 4bc4f232caf0adc35ded72f380c1d4c816a22304af357f9b204fb856c2053038e3db2d834b7448d3cf43e84d3f435a36d047e48606b9e1083ab4963b38a75301 SHA512 a8e9d74b1d68ad7c9aea0a4d463aa877cb607458cb6ecf76203c96ff2156fd8b8a3b9cb5687ac0a5cd1eca5f94552433de55f3696b7be54a3cfa8df9cf74fbe1
-EBUILD fhem-6.0-r1.ebuild 2334 BLAKE2B 1569c1749c5f173e735b580e99244872bca75127e129704d6cc23311277bc2f49175ed3d49ef00080fbb93e442abffc8835468d93ee15d5c6e10208b7ae54cdb SHA512 0f35daca32cc0f4448830edf08ebcac54c7e210ee686215f105f82da9483447628b73f9cc38bdc0f1e16c78fd24b30fe48febb9323c49397a5a22259f3ba22f2
+EBUILD fhem-6.0-r1.ebuild 2382 BLAKE2B 37f251813c0975d52116a57f257384d53953c2a0ee29ff06930f37f41856525e31b51cd8a0e48732df88cbd434d36de7482b3c0304f84ce50ed8b28982125b63 SHA512 ef616c697168a8f60732419533c395da530f5c49bb3063785b76fe6cba9819d93e2b00ee2d1e0f0426da24e76ab12c817cf90c1be96af97f248f6b80a9546d38
 MISC metadata.xml 648 BLAKE2B 7d812ebc3a0e960a7a3eb744d339820af256c558220e3bc3e041751a253890be6227f7b6a19df7ceec363318800c18838fa6923a0d5c71049fc1352416d6d9f7 SHA512 4518524695a6efbfe86db125d625bb5fe58174c74968e336a34f648bf2784832eea99f322e340c922aca9c5ab43d50f3f4d0334377eed4447ea1f3c5ea6e995a
diff --git a/app-misc/fhem/fhem-6.0-r1.ebuild b/app-misc/fhem/fhem-6.0-r1.ebuild
index 9ad9768d8330..e85f6305a8f0 100644
--- a/app-misc/fhem/fhem-6.0-r1.ebuild
+++ b/app-misc/fhem/fhem-6.0-r1.ebuild
@@ -101,3 +101,7 @@ src_install() {
 
 	fowners fhem:fhem /opt/fhem/fhem.cfg
 }
+
+pkg_postinst() {
+	tmpfiles_process fhem.conf
+}
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index bf254aff5c86..a112a8aedbde 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,4 +1,6 @@
 AUX gramps-5.1.3-test_locale.patch 1195 BLAKE2B 1b1aeb08b90bff9db9d028499428efa60a16b48597bcf466c07a77e3f658c8550eca84b899047d1bc6e20eb26e8dfab9637ae7aced1b99167466ea6c51707132 SHA512 70daee9afdce0f939ad3cec094fb4004f5c162e6b49849f83486db5baec074a8673d7a6096a367279019712a11f0b40e827f6cb3019e7dc3cc6bad327fee35ec
 DIST gramps-5.1.3.tar.gz 17352457 BLAKE2B 8356e29d4e9e2ee78f0f09e54db8f77b2db991652f2c6b2fdc742b8f2e160a2c9c2b7df1a43c34e5d05b12b540e88cd8572fe89cfbb3a1ecb6df650a39ac0651 SHA512 045d5dd6aac4745ce527624657bbee25b9130e63b1b66bdd6a8409cdc876f1f3a4a6c0435d433a62bfffb723f6ac66d93829b79fc12c8768694c266b7a3b82cc
+DIST gramps-5.1.4.tar.gz 17425713 BLAKE2B 9b3761906b70ed6b85112e502290013cf421669418355ed0dc54d00adbcc2af4cd74c596bacaad50cdac6457e7a3b7675d4afb7b471fd471af8b7a6adae3ad82 SHA512 f43fc250142968331db1875260577e022898cff2d1453ee6b74be760d798b75cfdf93492d8d823dbb094da2ddd96a4f249e813c603e7cd9d0585641424284734
 EBUILD gramps-5.1.3.ebuild 3423 BLAKE2B 50c35c845943c62d32179ca86971636e459f2224ebb81f23d342242d682f8ac040fbd6d2b65bfecb2a280496161cd2c379c9cc11f9d64df11efc1f1769961e1f SHA512 4ae9b62f164d9ffc977751cefd8d96d4e1987c05bb384b9fd73bfb23a56f82ffae630468000881c24dfdf975165ad420bcb4c7d05ad189dad780be7437d66919
+EBUILD gramps-5.1.4.ebuild 3487 BLAKE2B e74e3d579630090d44a827088a8acf77a2f5d3c492dd858548abef60c548d4bea745213a3957bc11b42f785aceb805cf35744f028d77bc70249db87d65f1b7c7 SHA512 fea05cfeae5ce519eb8c20b0d0e397246b62851ab76dea52af61cf2fd2d7ce209b4cad313dce25fa732d54c95eb43cd53ef5d0ab96df7df442f108256437adef
 MISC metadata.xml 5702 BLAKE2B 21c6b024222b3d4cc29ea388a8f16cbc158850ac5bb0ac32bd55205abfeb91d48d400be992f4f50c2af7e05b1c768e7916b7ff3db16eeea2b33dd294c27f7637 SHA512 e95b67c7b179bfd9bf280d9c8dfd69cc533562abf8b07a433a5c945cc76468f8f7d2097a218a406c71afe4a97ff8e8a790feec8b097c82ad24eed9b6ac8ec99e
diff --git a/app-misc/gramps/gramps-5.1.4.ebuild b/app-misc/gramps/gramps-5.1.4.ebuild
new file mode 100644
index 000000000000..6b2c20dec3ca
--- /dev/null
+++ b/app-misc/gramps/gramps-5.1.4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Community genealogy program aiming to be both intuitive and feature-complete"
+HOMEPAGE="https://gramps-project.org/"
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="berkdb exif geo postscript +rcs +reports spell test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pyicu[${PYTHON_USEDEP}]
+		berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
+		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
+	')
+	gnome-base/librsvg:2
+	>x11-libs/gtk+-3.14.8:3[introspection]
+	x11-libs/pango[introspection]
+	x11-misc/xdg-utils
+	reports? ( media-gfx/graphviz[postscript?] )
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	spell? ( app-text/gtkspell:3[introspection] )
+	rcs? ( dev-vcs/rcs )
+"
+BDEPEND="test? ( ${RDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.3-test_locale.patch
+)
+
+python_prepare_all() {
+	# Install documentation to the proper location. This can't be done
+	# easily with a patch because we substitute in the ${PF} variable,
+	# and that changes with every revision.
+	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=(
+		--resourcepath=/usr/share
+		--no-compress-manpages
+	)
+}
+
+python_test() {
+	# Gramps builds just fine out of tree but it confuses its test suite.
+	# The following might be an ugly hack but at least it lets the tests
+	# run properly until either I or upstream have come up with something
+	# better. FIXME: test this when a new release comes out.
+	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
+		die "Failed to symlink build directory to source directory"
+
+	# Set a sane default locale for the tests which do not explicitly set one.
+	local -x LC_ALL=C.UTF-8
+
+	# Note that as of 5.1.3, test failures do not actually propagate back
+	# to this function. For now this is fortunate because the test suite
+	# does not handle the absence of bsddb3 well, in the long run however
+	# this should be fixed.
+	esetup.py test || die
+}
+
+# Ugly hack to work around Bug #717922
+python_install() {
+	local DISTUTILS_ARGS=(
+		--resourcepath=/usr/share
+		--no-compress-manpages
+		build
+	)
+	distutils-r1_python_install
+	echo -n "${EPREFIX}/usr/share" > "${D}$(python_get_sitedir)/gramps/gen/utils/resource-path" || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	if use berkdb; then
+		ewarn "The BSDDB back-end in ${PN} has got known stability and data-corruption issues. It has been deprecated since version 5.1.0 and might be removed in 5.2.0."
+		ewarn "If you have any family trees in this format you are highly advised to convert them to SQLite, as described here:"
+		ewarn
+		ewarn "https://gramps-project.org/wiki/index.php/Gramps_5.1_Wiki_Manual_-_Manage_Family_Trees#Converting_a_BSDDB_Family_Tree_to_SQLite"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index e06cf5cdc972..881f4f16bfa1 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,5 +1,5 @@
 DIST khal-0.10.1.tar.gz 173636 BLAKE2B 97158bc78dfbda3a3555df3588c61f6a5e8b20d71921099a74ba997eb7ccef05ed931e930afbb09f9c125f3e0e782143dd2cdf4d0da6bd09952765b9117d6ac4 SHA512 5b81a60099c201fa112ab17740b73edb17b29efa1548086766d57d9d595451e7d779aad5a2ce7a2afc78050116782ff6696c4bd284021a5e12c87fe361d15e47
 DIST khal-0.10.2.tar.gz 182534 BLAKE2B 0c7c4ab1234ebe90ef9ad8291f2a0087a3f6a60d25f5426445eedadb25f236b3598dacc051e959a108ad472efc56628bf7ba11ed714c885d956f1a8f905029ca SHA512 e15449b73175190f02b6fe5774a8feef8a5390966da3836624c94a044d146cc6e8a73985d991042fbb617f736c6759ded387a65292529e71f5b2f34bc80a686e
-EBUILD khal-0.10.1-r1.ebuild 1278 BLAKE2B f88037dcccd4f5bf878687f42a96459b84d4c1e57b3b2e797542db99cafc14efa9c65d08bfad762a450b53d2338087138ed64dc440b1d155a0057d028b7e8dbc SHA512 6e6156925243a298f179b0bd3d9815d7c869fc837ba7c1e26cabb0e4911c8a469e32ece04338c2bf5366da98991ba650938477552492947e04739b74a7608d1b
-EBUILD khal-0.10.2.ebuild 1275 BLAKE2B 3a233fea7cbcb682aad88d7ee07d4af5a185820678208c0199092d254015cc5eeafbe69c667820b24822f094172711be28f2414db0e2b92ce8f53914d3d58c64 SHA512 3c49d19a7c5381cac8bab6005a5681cf7bff46410802972933b70aef1397795b40ec94954caa53808774af8dcbd5b44ca49323c384331c601d099e829025bc54
+EBUILD khal-0.10.1-r2.ebuild 1183 BLAKE2B 442bc8f5d6196c95b76b47452dd304c9ea829a4571ac4b8b4b65b7973de87433e4397807d91d064acfe18e9cb4e03ebcf9cda7afec642650d70a137c9785b302 SHA512 bafb6223c051b7ba8372990785eb843d9d8c57a0ef402173e888bfe1c9a98257a684ef75f76f598403788a0bba6b789d9c3f6f3422f7cc0a048f0bb1570dfdcc
+EBUILD khal-0.10.2-r1.ebuild 1182 BLAKE2B 98fc81a1109c0a5504c096c3a3e8c2c04a85752e0e656bed86e0296b0d61181cfb509f9dd7e55127565d133d349d0d54b07bc5b00e38bd063b0e211721d3f468 SHA512 e93945c3f242a6b11d7131f7fb771de8e52c7115659cd6e9a87502bfab048ccf87d86e092c321a898da30b7ffbd18ee798e01ce6b02c67d1a60f9fbcf595ce7e
 MISC metadata.xml 284 BLAKE2B c98ae36013f5470384f56f63dc1cf49d8499e20d5062bd5adccbef7e84b9cc5caef1c76da113adfa81272b83099b71e8495282bf52ed2571a5cfe751fac88381 SHA512 0cc5d1286118b00aa801004d68df0c5cc780f4c2e4cec3f4652c5b1ea27cdbcef2fb6403482f56706239fae3dc4bbfe55eb5985da6ee9aaa9a286cdcd660eb50
diff --git a/app-misc/khal/khal-0.10.1-r1.ebuild b/app-misc/khal/khal-0.10.1-r1.ebuild
deleted file mode 100644
index 6ef78da963d9..000000000000
--- a/app-misc/khal/khal-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-SLOT="0"
-IUSE="zsh-completion"
-
-RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/icalendar-4.0.3[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	zsh-completion? ( app-shells/zsh )"
-DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
-	dev-python/vdirsyncer[${PYTHON_USEDEP}]
-	dev-python/freezegun[${PYTHON_USEDEP}]"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
-
-src_install() {
-	distutils-r1_src_install
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/__khal
-	fi
-}
diff --git a/app-misc/khal/khal-0.10.1-r2.ebuild b/app-misc/khal/khal-0.10.1-r2.ebuild
new file mode 100644
index 000000000000..a4bd58a90c09
--- /dev/null
+++ b/app-misc/khal/khal-0.10.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_8 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A CalDAV based calendar"
+HOMEPAGE="http://lostpackets.de/khal/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/icalendar-4.0.3[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]"
+BDEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
+	dev-python/vdirsyncer[${PYTHON_USEDEP}]
+	dev-python/freezegun[${PYTHON_USEDEP}]"
+
+DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/__khal
+}
diff --git a/app-misc/khal/khal-0.10.2-r1.ebuild b/app-misc/khal/khal-0.10.2-r1.ebuild
new file mode 100644
index 000000000000..0348736d1e30
--- /dev/null
+++ b/app-misc/khal/khal-0.10.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A CalDAV based calendar"
+HOMEPAGE="https://lostpackets.de/khal/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+	dev-python/click-log[${PYTHON_USEDEP}]
+	>=dev-python/icalendar-4.0.3[${PYTHON_USEDEP}]
+	>=dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]"
+BDEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
+	dev-python/vdirsyncer[${PYTHON_USEDEP}]
+	dev-python/freezegun[${PYTHON_USEDEP}]"
+
+DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/__khal
+}
diff --git a/app-misc/khal/khal-0.10.2.ebuild b/app-misc/khal/khal-0.10.2.ebuild
deleted file mode 100644
index 0c6dcfa5d3e9..000000000000
--- a/app-misc/khal/khal-0.10.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="https://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-SLOT="0"
-IUSE="zsh-completion"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-log[${PYTHON_USEDEP}]
-	>=dev-python/icalendar-4.0.3[${PYTHON_USEDEP}]
-	>=dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	zsh-completion? ( app-shells/zsh )"
-DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
-	dev-python/vdirsyncer[${PYTHON_USEDEP}]
-	dev-python/freezegun[${PYTHON_USEDEP}]"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
-
-src_install() {
-	distutils-r1_src_install
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/__khal
-	fi
-}
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index b0916833e0f2..66f040fb4868 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -1,5 +1,5 @@
 DIST khard-0.13.0.tar.gz 5083020 BLAKE2B 6dc95335f89d5034ddc5fdfafca06b2bfc96c2dd05e966d975eea508a939cc4d64b749c3c6c2a7ce6e74ac40835b33f90442d357b871e47b8f0b2df351225c16 SHA512 353a51a06d6c7aa27b0f1cf35b3f7c113097ea4fa5e27bcb400f00de0cdd65ccaeadcc835b1cba541361a0395265cb967f731b23d875162f2be13381bc0979a6
 DIST khard-0.17.0.tar.gz 593928 BLAKE2B 488e1df70212c856d8dfa43955e681344fb1a257d765c81820444f6435d39aec782da9d01edeeaac0b9a87412db680fde368c39c74faa82b0eff2d7a0a2dbc6b SHA512 9cb936aeaa327b9837488a752906bf603429ca0c7240703829220119049f5f62e84f7e4c90bb81799307fe446c3aa47fe6ee4112c276b6bb329c959be438ba25
-EBUILD khard-0.13.0.ebuild 1235 BLAKE2B 55db533885da6339c122802a22806fb789d7d10af7d9fdfe07eeff2ac6716ae69ff6cb48e85535bedc2a4d04b302e8045f8e8d3f8ae5a43b04c6efc4297daea2 SHA512 199f0c7adf2192b699926113a62813c9c3ef6fb357e8afb7a51fae19b655bb5dfce8ba9311f700fe26b8f55e65f2ffce5185f4268487eaaf396a98d3c7a5edcd
-EBUILD khard-0.17.0.ebuild 1206 BLAKE2B 176fbd0e298e324ed63d251ca19bcd158c16f1002c74f462deee2466349c3f9bcaadf07108a2bf6fe47f758f99d59a6650daa909b4a50786273c51a3b9cde8cd SHA512 b487c3793a47b1ec82fde6c48bdb5b2c384cb459625ab8677309b3e0e89dda5ebdb4da111e0e0a846712bfef69658bdc29d680f385739967d28b124a580bfeb9
+EBUILD khard-0.13.0-r1.ebuild 1061 BLAKE2B 43d57e3fb8cf0c37d8d4e916e4542bb35da78fb1729572d8f4abaa2790930b48d8995f60c496a641a37ca3d481c15493bc157f71f733af322bd00f4e6d6f53ab SHA512 64f4a9530d8754e4712614c88c51a896bb3707d1e102c2328f942c426590febb6cc712fdda9db080f9f3ba8e07d18e3d2300dd9a4337bdfbec831e5f5bd606d9
+EBUILD khard-0.17.0-r1.ebuild 1061 BLAKE2B ca10ae7831d69b6880c5745fc8eef52b1531ede5463e392573493f82e735f1033611360a37e26f2d78f8e98871a4bb4270c96d3ea7fd21d1a834da16ad5e6b68 SHA512 06a1002f38d11dd5a74c9a80b4fd6aa437bbaba805ba46bf29cd2594897915576f70bc830641942cf9fb496af72d79cb94b52014cefa512e48b1ee06b15b7f3f
 MISC metadata.xml 573 BLAKE2B 11d9867c3a9f752b077267755b4d0d8bacc55678326774b756a9efe2dbfea462159bdde3d709e963e590dd9023ce645687ceeb76a474e9c0809a7200d5e4415f SHA512 afc9fd7488d435781bb8f5ac10192e2a8a3e200a4fac861283b5c0843a3ce04a8218eb561f3430ac77e8934b0af6975ca1e7bd75702e14ad4a5ff493b82edd22
diff --git a/app-misc/khard/khard-0.13.0-r1.ebuild b/app-misc/khard/khard-0.13.0-r1.ebuild
new file mode 100644
index 000000000000..3606d1e02eb9
--- /dev/null
+++ b/app-misc/khard/khard-0.13.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Console CardDAV client"
+HOMEPAGE="https://github.com/scheibler/khard"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+if [ "${PV}" == "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/scheibler/khard"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+fi
+
+RDEPEND="
+	dev-python/atomicwrites[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	>dev-python/vobject-0.9.3[${PYTHON_USEDEP}]
+"
+# vobject-0.9.3 breaks khard, see
+# https://github.com/scheibler/khard/issues/87
+# https://github.com/eventable/vobject/issues/39
+
+DOCS=( AUTHORS CHANGES README.md misc/khard/khard.conf.example )
+
+distutils_enable_tests setup.py
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/zsh/_khard
+}
diff --git a/app-misc/khard/khard-0.13.0.ebuild b/app-misc/khard/khard-0.13.0.ebuild
deleted file mode 100644
index 7b7ff564f1b5..000000000000
--- a/app-misc/khard/khard-0.13.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Console CardDAV client"
-HOMEPAGE="https://github.com/scheibler/khard"
-LICENSE="GPL-3"
-
-SLOT="0"
-IUSE="test zsh-completion"
-RESTRICT="!test? ( test )"
-
-if [ "${PV}" == "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/scheibler/khard"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
-fi
-
-RDEPEND="
-	dev-python/atomicwrites[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	>dev-python/vobject-0.9.3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-	)
-"
-# vobject-0.9.3 breaks khard, see
-# https://github.com/scheibler/khard/issues/87
-# https://github.com/eventable/vobject/issues/39
-
-DOCS=( AUTHORS CHANGES README.md misc/khard/khard.conf.example )
-
-src_install() {
-	distutils-r1_src_install
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/zsh/_khard
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-misc/khard/khard-0.17.0-r1.ebuild b/app-misc/khard/khard-0.17.0-r1.ebuild
new file mode 100644
index 000000000000..10c6d6bcb525
--- /dev/null
+++ b/app-misc/khard/khard-0.17.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Console CardDAV client"
+HOMEPAGE="https://github.com/scheibler/khard"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/scheibler/khard"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 arm arm64 x86"
+fi
+
+RDEPEND="
+	dev-python/atomicwrites[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/vobject[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES CONTRIBUTING.rst README.md doc/source/examples/khard.conf.example )
+
+distutils_enable_tests setup.py
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/zsh/_khard
+}
diff --git a/app-misc/khard/khard-0.17.0.ebuild b/app-misc/khard/khard-0.17.0.ebuild
deleted file mode 100644
index 3d491af83fd6..000000000000
--- a/app-misc/khard/khard-0.17.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Console CardDAV client"
-HOMEPAGE="https://github.com/scheibler/khard"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test zsh-completion"
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/scheibler/khard"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 x86"
-fi
-
-RDEPEND="
-	dev-python/atomicwrites[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	dev-python/vobject[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES CONTRIBUTING.rst README.md doc/source/examples/khard.conf.example )
-
-src_install() {
-	distutils-r1_src_install
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/zsh/_khard
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-misc/livecd-tools/Manifest b/app-misc/livecd-tools/Manifest
index 4d6ab8e46234..59e3c598c51e 100644
--- a/app-misc/livecd-tools/Manifest
+++ b/app-misc/livecd-tools/Manifest
@@ -1,4 +1,6 @@
+DIST livecd-tools-2.10.tar.bz2 9999 BLAKE2B 866bb49d70b8008df30357beb0be7692cee44053bcf25f9544f67ad3ef1f53ddd38604d70ea7db791e6a81cba8de4bc62cd31753bacd01d45d5e6cc558da3d7c SHA512 dbd66a9a6e94b90d06231af2e4d677d97394b765502a72e81a7dcc7ad591d458ad28c69f1de96dc8c9fb10e7ac7031f6595aa89ab8d343f6bfcde875889fdfcb
 DIST livecd-tools-2.9.tar.bz2 9987 BLAKE2B b24ee78aa0111950322b4424d630f640aa2d525c5c87b5ff3397628ed3e1c55eb2dbb71c32cbd5e57fa3a4310af1f541c1acd370b4f829dce49d2beb6f1be442 SHA512 89e892dfa8581e0f1f8208fecb7a686f19da100751e3430b014e90455c391efd2a3d25f3fff046576f8f739090715a2c14bc8c0b1fc9fe7db03455d84426a889
+EBUILD livecd-tools-2.10.ebuild 1029 BLAKE2B 510eff7574f7d1ec4111c90975ac078bf7a029504e5cb34cde033a0110c58627d6607c14c17c3ba7362d9cbdbc6dc0a4eef38d3a0bfcf629c5ed9cb54a2d8947 SHA512 bef1e2ae561ea47a057ab62cf3fc02b9196f8e86482a3cd2a93d00dcd659125e47482c3102cbc8b7a5851062d0a75f9fce79550c63e4c43115cfbb22ee3b38c0
 EBUILD livecd-tools-2.9.ebuild 1024 BLAKE2B ead007f9eb78af83357aed50233e83833e5e378bb251345b3315e1b3b4c2640d0dfd6d8ad386336881e67a5cbfc7dd641cebfa6c60b4b3b7e2782022df28e3ca SHA512 bf53ddb65432d50bfaf104f66cc5ab2962532a3784b2784c7d84c7ec762d58fc90a4b63249dff50b9f422d1686c3aae9de78e211e512f170484abe3ebe3ad3e7
 EBUILD livecd-tools-9999.ebuild 1030 BLAKE2B d899e32ca5e11a0eb3fbd0ee6ef4efcc9159ff15f94e3d7b43ab6d5911d7bf859b278985525159b3491f9e4d733707f526b8b3c4e5eb4aef61dbfcdff353546c SHA512 431cdf1dd314eec95e2afba09dda9309b14aa24f5e958630f47f6633a885892d7a1dfc90f277aad63558ae071aaa29b9172e34f10325a9b9a5c5532b6d5f0342
 MISC metadata.xml 256 BLAKE2B d02b5b33f7375594b6e77357966b74fd698579fcefce673bde9b7082e2a56a47b1b8824d5aa423ad7271113efc568997c476bc0106d147dbc1a198b201def869 SHA512 b301300f23bb631f440eef04dce17f16cfee618775d38013cfded6b0e8b806d772749578a39c43143104a1716d2cc6eefb3af7f6865d85da5b2cb6f1e78c7c68
diff --git a/app-misc/livecd-tools/livecd-tools-2.10.ebuild b/app-misc/livecd-tools/livecd-tools-2.10.ebuild
new file mode 100644
index 000000000000..35cf3408940f
--- /dev/null
+++ b/app-misc/livecd-tools/livecd-tools-2.10.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/livecd-tools.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
+HOMEPAGE="https://gitweb.gentoo.org/proj/livecd-tools.git/"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPEND="
+	dev-util/dialog
+	media-sound/alsa-utils
+	net-dialup/mingetty
+	sys-apps/openrc
+	sys-apps/pciutils
+"
+
+pkg_setup() {
+	ewarn "This package is designed for use on the LiveCD only and will do"
+	ewarn "unspeakably horrible and unexpected things on a normal system."
+	ewarn "YOU HAVE BEEN WARNED!!!"
+
+	CONFIG_CHECK="~SND_PROC_FS"
+	linux-info_pkg_setup
+}
+
+src_install() {
+	doconfd conf.d/*
+	doinitd init.d/*
+	dosbin net-setup
+	into /
+	dosbin livecd-functions.sh
+}
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index ae1da0765103..7f8bd2ff7e7b 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -1,132 +1,131 @@
-DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
-DIST alga-0.9.3.crate 37838 BLAKE2B cd5e31d9445c5a1e4b4f86f333843bccb5600416b43f5ff5e90540e0ddbe72fde1aadb0a7da81aaaaaa1537a2ca865e262ee828386192c20f66ec28e3e04c6f7 SHA512 dbfbdd98b4fc382e98efd0a63b28fa8591c6c882ad238ea376640ac3362003de0c6fa7997e4001f248710426b330fca735515c3827e7eeb064bdf470aef9086c
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST approx-0.3.2.crate 14288 BLAKE2B 601eb7b83c6f0e41a4d64db5669b7058b4038319414bde74761f0b1584baf8426f9735cd0076d1dde829a056a07e8f820d85737e5b1bf371d9510551c367025c SHA512 3853684c3b1c5c63204304f2e4f1c673b92311125c1df0fc16e96bd6f765e8266079e8d4ec3c85fad933361638c7515d5be18a2fc551353c4097051d0bd96ae3
 DIST approx-0.4.0.crate 14280 BLAKE2B 8508006fd4b31290b4a3e0b26f521af94d5014774b7295705ac5d03099de1d9e22a26c4a1ad3fc0e70d1c6642c30034a7971ed4d57e0de766129213e2d025ac9 SHA512 eb63504a72065362067cd213543f74206fd6ee93d94d12ed5da9d430341b20cb51c860890465a4118ea0ea30baf84013ab81468b73677742af8a6dbb16121568
+DIST approx-0.5.0.crate 14359 BLAKE2B d1811157cb560d24b559b5f4954654dcfe4d1d418f90ed98536c0f8c72584b9cc10c93c4e89fa376f96be043338964d07bc722ef16ebf3041e8c7eb755f2941e SHA512 4c7ef7d54b6a9fac11587fd16638d36d8738e5156f5abf77cd994056377427f12170b61c03d1acf591dbb897911babc852c2a4a12b3c5277e1065d952c9e7dc6
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
-DIST assert_cmd-1.0.3.crate 26323 BLAKE2B 97fa287db425901474b2e9c4e0b9c500209e6ae23de73d079458ef21e8d1f6a49837683c543ce05ed79b0a07a4e1075d02630789760b52956f16e2f629e3d439 SHA512 3205f9eac594113996287dab2a641115e5fdb4e92734fa34e12d99b3808597e13371658857896c76449ab1fdca4cf4e675d812ea120602e16024409483b60bf2
 DIST assert_cmd-1.0.4.crate 26621 BLAKE2B 0acd8a6c09cfe51594508fa7c4dc27e8831672c4e1ddbd6d392c3b439b21f3cffd8613c4abd379cc69ac500d640433aae61f5ae5a3e5908deaec193fecb70146 SHA512 125d792ab8078a205bdf5cb396c8ac4b0c7330b7773af0014c4f17e23af56dad30f14bee51a87cdf615bdf17c849274dcf7df1ebcd9c479cc8c2223c6203784a
+DIST assert_cmd-1.0.7.crate 26777 BLAKE2B a27a6c59969b6202ceebc72b50331e056f02e05befe710f3f1fe77622a61ed4ed11e258cc2df43f52a7f57c18e4bc9b33c72946d012a4fd6f5417c1a5fedddff SHA512 9e0e67bdf14df8235cdd11d9c453bb2f0723188a39961d8aab26fd98f2c64629d085c8d3eb50ee88371ecdc2ea306bfe5dda1ca4872082b40f13a4cea99e05d1
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
-DIST bstr-0.2.15.crate 344206 BLAKE2B 3a4f24d2a039f7aeee3b6fcbfcc2fa72f1ef8a06ff8bc039af055739436655851565a57e5a4f86a7984b00ee7598c1fbdf26f3302929f91d7efb1327fd36eb57 SHA512 6e464ca1aec722a283759ff6978bab1769dfc8d61aa683f8e4c59bd69c7be2fe86c5470f4c54457871c6640e2d50b6b882747ec567098eb78e62f7cb07cb93a2
 DIST bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
-DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e43bbd6c8251b5a2f9fd574522539814098b17da03ac5222177332042303f129e0c2729db6bc80e8f76bf4b097d973d4 SHA512 2e89ceea586873e957a31b510f8e8cb0c6675def32ea6b9a9483166b47f69c1ad448a79d897796883b696bf77cb0fcb1d0ac28ee779146f6500ca9a54aa7b4fb
 DIST crossbeam-utils-0.8.4.crate 37279 BLAKE2B 55372ee1bec00b4bb3ad8fdd1df3bae4b0c166aa08898c0400663b4ea8610c956fc5376fd1638492e0d887abe65491e380eaf73459545325a2ef1d23234eae6b SHA512 6147ee3048f2df2c311c6d9d683b239249e6f49f8b2b27eaeaea9361b32fccb1ba37fd8bd3fa147d70b7d7d8d3281d3018939c4a70a75e191da7d86128c4648c
+DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
 DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
+DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
 DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
 DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
 DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
 DIST downcast-0.10.0.crate 4923 BLAKE2B 3e69a1dcd0f2ad487273775b304ea6fa26f225eaab012219072cb5ef3ff60931ff3ffd616e09f3708895b2d01538c8e46e3e91aa1f4a288bdf910bdc7043acba SHA512 f618ec81bcdf74e8851703c6dfe92b36c9a035214635fdae598af20258549ef31a1c23a4d220c67505aa403fcc8a0b99a990fda01305a71b801acd5044f91c12
-DIST dtoa-0.4.7.crate 15910 BLAKE2B e6b4ad0c4a81d73557f93675671735eca3c5c31426319e746c73b65a34847085ee82f50a4f561036dae31a4fedf24a307e6edcd756cc1e6d46f2f20fc29bf456 SHA512 df090a5ea273265ae2f05aac2ae364cd0b606872a392411359548b9e780b2bc8dcb999254186ccc2da0a7353a4e0f1b0f513b2cd83d7e4f1290dcb1f466847f7
 DIST dtoa-0.4.8.crate 16175 BLAKE2B 5fff15e66c2edeb9eb9da89c66389b3a9bbb891d75afc3bb7da4dcbe9cad9e50af318cc8cc01cc7e56730763e8ea8ceb33b9447d1a7fa52a8d0f0d2060a97522 SHA512 fe1701ba2c40988b92f5f4ef78a8c81718b140ff8ca2d04023b09a89440e6ddb53ef36d1ebd9dd3e948428b361ed6611bd24ec1a31b5010c220c555e1f0bf6b8
+DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST float-cmp-0.8.0.crate 9640 BLAKE2B 5e4f7dfb115b558c517f704a7ed292801ec979b2d27c89d1a2a733c84317934fecb5cc9a92c25284f5d59ad8f284186f582e67285a67e99e67b05887fef334cb SHA512 6c98f5eb4fd748c8192cfeea1f2b9679ede01745ebfa01b08bf19d796c985c1b2779fdc77984f26ef9c9a06a979ae3f0b14676e0c8b28defb7717bf10119c718
 DIST fragile-1.0.0.crate 10315 BLAKE2B 5f81d144012372be3504f151e9740d422edb9e29224ce2be4105d7aebc8bfc0b882e1a3a8a0eb6ff1f314264e3c70a6054196703cb69cf43560dc9711340fc69 SHA512 bbdd87f97c494495f4db10c68121f4b6f76e3752b9e4b363c0dde24a96a1344868faceeaf7e6df1edfee6ec107f10b69fd26bf271519675463c0235ecec3780b
-DIST generic-array-0.13.3.crate 26956 BLAKE2B b8df2cfb4b37543eb1d2803ab7c6d2daf4a1dfe7d652513c259f93e26ab3049aa033072ea486f83744effd188cc53fc785c3e4f3c256677f0fcb221603221ee4 SHA512 d66ea808aaf085c9162fa8c96a5655bc60b42df764c5dc17226e0aa24792d48230d51c9df61db6f551d491cd173da48a5e06d5e4e010901b14c3f044c7f38fcb
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
-DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
 DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
+DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.88.crate 514138 BLAKE2B c9c6cd0b5456ee2706e7b572ba8df644abeb2d1297abe4f5d2b480e7b7b6b1024cfde98adea2822045b605949505c133538c74b0676c3ab5a2db8aed04605b4b SHA512 c1ad5dd0efd8117da798fcff84082e3b831cb1ae04c26ca8d87936057155e2ca08f0a693cf2c79c5db2c2dbe6b64e254328439b303ba952559f4c524466ad243
 DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
+DIST libc-0.2.98.crate 522087 BLAKE2B 950686d7cde31322e1cdf82ae189192091b8543d14d0da0dcf3892910f4216e8e46bb1d5e7e8fcb1693a372577c57a6eb6538a0fef997c1c1a0466c3a1f7acb8 SHA512 2e730b8d46c42608c7da5ff4c5475667171b552b485c2684d3821310ac0f55c1a7a12d9a2cf68a05608cdd2a0928da5e290275c70a519a379d0ed25350689689
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
-DIST matrixmultiply-0.2.4.crate 32929 BLAKE2B bd3c6b2d11202ea9390760ca59b7452beb4094b4a95314c1a1c596ff623eb985ae5cf2b3821d365dd2e2912c1bd25713188de07b4555a996a667cb4d6b0cfb11 SHA512 3ec6846e1342d6dddb81f5bd4495e940f011a3e048c712262cc413318c087aaa137550cff6d969873ac96bb628f6a460e92536674c0d503d5c609d9be5d9d184
 DIST matrixmultiply-0.3.1.crate 40550 BLAKE2B e6ba7aef3ee1ff31da639492e3baf73c127bacedd20c9b08301ac6bc6baca92122d99f313fecc6cda955cb0e3c9f28d6ce26094d006e15afb3041e1c90348dc3 SHA512 d4db1b27a41078a49d6cff5a3d4a723bbd2029f8007b50a69800ab5de7952978d81749b6dde80706f62efb848c4d1577e039828183533a2b68db80b699cfc4b1
-DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
+DIST mockall-0.10.2.crate 21911 BLAKE2B a48f09488ee4d0da1b0c767f13b89fe70e1c35c1bf12501d31ee14f1e16d1c8fcc96492a931f5ec977adc80b84158f5972b518db69d3bcf3e51be75c3a166dc0 SHA512 7613d35f9ca12a895c00167f43385b19f7f045ce59b44157f72ad2a4dd5ed106b5c2f3fd03bc362c09f5f88b3929f61c0611d9c52b13cd039834b98c32b409f4
 DIST mockall-0.9.1.crate 44172 BLAKE2B 7f6acce0914d526ffc88f9965142cd5785ccea0633ae163cfaa9266a24f1ff144fc17899e6ffc28585d1c55200deb7278269ed7c475601c4d5030526c0961605 SHA512 351c81daaaf411c4e7bca2a9c74b7eabf4a3a45772b5dd1b15d04994cfa759ad6094230b7410e9ce12db2dc99d8450f949276583ce210d200f12fa95b98ce6de
+DIST mockall_derive-0.10.2.crate 43024 BLAKE2B b2b65ed252b18f1537402ef78226366295e233ef7ad3b28ebefe99482732c42a32e71925072dafe62b63b051ef0c1a524c34fa233f7d2c267db2ed028f63d999 SHA512 01f9462935afd961c830b8a44d016d9461f3aa77534d7cad29723445b4b257ee19894006865bc38d63976b522502cc19ab8b78422e2f72b53542e79e66f88c5e
 DIST mockall_derive-0.9.1.crate 41256 BLAKE2B d6c162162e5a83773401de5582955592c7592490d31d793b5c02aab049f3cde63a40e31df72750d5da74f998a2343ec935844fd2e78c1d2806d6b60ac42e4911 SHA512 dc01d735ca2b05a903f169b9deb2f9dac70e89d2ccd469c988ac93d86d9c2dd101d17fc4bd0ac6d184b0de86f13bfb0c7cc869d884a48509791903b32785735e
-DIST nalgebra-0.19.0.crate 253667 BLAKE2B e8959c237f4fff99e0deb8726e63a0536459b9bb9a2b8a2b2561fccd34d54bca57e3af9a86ef4543dd3bded627367900a5a03b38e9fb3581377b6dedf01c8669 SHA512 d9dc64a9e27af77f77eccd59f2dd672e087153dabc35058f6c7dd0c29bb9c388179606cdb20402f13a325a235e27dda65232194f572b701a3a3ccf38862106f8
 DIST nalgebra-0.26.2.crate 325684 BLAKE2B c8d2d61fa5ce06d15c7830d870c822cb3f71cd3678cfe1d6814beb71912695f5bbe7c2a44a20727c4fac2f6e65857bc8ae80bccabd130b81aa6b8ff642f5a9cc SHA512 579b66dd1dca0ff50fe6e2f4a6237f3b50d155571dd976f2b93b1886f89f02e3a1db7f6d856d3a23f7c60244b0ba84da101f12d236fa42a14f3afc92d27cf7f2
+DIST nalgebra-0.27.1.crate 330962 BLAKE2B d6f9d3b8481d6bd14469fca902e801f56422581953c9d99c0f7c7c8260e9db0da0be3c30420f4e564ab636b39b51ac4ed70a9f12bfd51c60558dddcb54f076c7 SHA512 dfb8c4679e1818030c46a526bf18a2367b8418115af6bbebd22bb47eeea10ea0bbd387cbd7a18f7ad436ead1ece46051bf112a4c21529dd5d842f214e361798d
+DIST nalgebra-macros-0.1.0.crate 5758 BLAKE2B ec39ddfbd14e8e12c0661280ac1ccc583c36155014fbde712a89b2312b484029d080c34d8acdbfdca3717ec0071c81b0b431afacc5c3ff61d52b9fb4a44bb57c SHA512 5b7e3e54414653822a3a0e1a89a97f2dcad53851b2d97db095c6a058009f5ed62a130b12dc35befc43ce7c1095904402910f6453df059b9e320e42571d7b3f37
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
-DIST num-complex-0.2.4.crate 24679 BLAKE2B 175ee644720b6bbff108eb4ef94d0fea8f340533c2be0e18524e54777734d1c7dc10a7c36b1f2ca3f032ddcb3dc351e60564340aa59b29aa4fa7ecb2487314c4 SHA512 53be64d6f67b1ff7d0a4e1723ae21035abfd300ab27bed0976e0c3903fe8e29f47ffe75040832ee2f81da5c2f4f671d3d845d308365b9a5a989ace99a7d463ea
 DIST num-complex-0.3.1.crate 24541 BLAKE2B 10777a6df568fb94740a2bf2a84d68c5612efae200f99be1c20114d0adb0672f08b512f499ea4f86e19e3f20e98a7213fe116509651071b979e59515fb9958f8 SHA512 d24d613f20e04dcfdee68e95b2d4b06ba99db637a96e41a55c4f599626951a44cc5f8adf8e8c86003d42c316aaea0c27739e812fcd4d4bb6efca5b2d9cecdd71
+DIST num-complex-0.4.0.crate 24805 BLAKE2B c9ca4c01f59bea06e68de80aae5fb68362eeadab92f8f2cdf0474d46339b606d4921b80b4ce377771a1c08ea4e38a335e6fe2ddb412dd2842966b824c1252f3d SHA512 ececfb4ecd82acdb038322ffcb431a09c271b33d3f028f90577f585289251c38ba425d67413815442cd5c2daba821ac9b3b45b09122b1ca2cb7d35f45dd9d2d8
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
-DIST num-rational-0.2.4.crate 21694 BLAKE2B 6e8dbb873b1c62046c3fc45eeea0533a8375224fee6537e369a6042a42f98865c010635f3723c8116c32b365f8dd553831efeac4a1fb2bd0cbb169c90d7035cd SHA512 06e55f17a1ea58fd465a232ebd687686c922669f0b561f648717164f3fcc8fe2bb43213d1e6377158d2542f633ef2e1482a7c3cef8090328c34feacf7f9bdd93
 DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837
+DIST num-rational-0.4.0.crate 26428 BLAKE2B db676676735ca603df8e35707d2068e89245e2a0c9f80b0baf519312622c1611738e8a02f8cc8040f3599ea0777ae2193d177a61aeb9a9f1d56612b9951bbca5 SHA512 96b5fd3d407210e6e81aac72b542be5c5acf0f1132097e4b82a65042fb2bd98591e12e5153b96b38c71f69e613e295542d23dc73a98b08ffd49d9ef2a062eded
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST paste-1.0.5.crate 17669 BLAKE2B fa8eafd98dec09e488cb7ce0600c18554887249f1f1dd4c4cf3d1902b7ace184324a4b9afe16a7f16bbbac0d7b15885649bcf8a33473413e37fcfe3fa1b57c4a SHA512 c363e56e1b9bc2e401827c292625951cf577ede568033cee53da2ec2383c4ca17082b52b82477c48d65881a8c76f535a66768022d1eae2cd5f55218dbfb9be22
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
-DIST predicates-1.0.7.crate 274733 BLAKE2B 5275012b3759356882fc1256119b52526eb8a39f3670d8e38d10ea96918bdc3bd13fbdfc841c6784aa3dbe8147777048f751886427c1ee8c4380b5084c5a70c5 SHA512 6d72f940714d698f5ff92f16a35e26675d995ea94c82de9bddbd386e7783ce0ed726b21c85bac3dd21e8f8a92cd2d4ee37dafe1cbc42e8e6b30ba13f06858b40
 DIST predicates-1.0.8.crate 26996 BLAKE2B 0e45f2de536395c001475654c5ec2327c66151999ac00fba34abe637c4a2cd10e380597745de0e0bd85b3b088d09d171ec21d40664d878e100cc5d73f3eb5c6b SHA512 a6d8278c331223c24a7189e9dfeddd11a20e7e9010e647a8fbc554f4847b72a13aba2ad22d4e0fedfb2ed4490fd11b05fb2d0e7fda373794b7c0a70094998a6a
+DIST predicates-2.0.1.crate 27077 BLAKE2B eca1527c1734b3bbd674dd5fadbe040187b95f66480b6cbf322f225db0b47e49d5a510bb97e861fb28a6ddaf56a1f10ae8c3136a22953c86a491086d63c08848 SHA512 81d5faa0224c430d467d22edc20a02dc214852d937f948ca1d51eac61788f4340a279a93ecb8a9bea495f2a45e2c86a42b8b495c431f50e752c2ee0c422b946f
 DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
 DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
 DIST prettytable-rs-0.8.0.crate 29000 BLAKE2B b214efcb12d0fcad44763b75e89bcf21923cb3a09764314cbbdb7f8d7fc585550c86ce77e1d97b1cad65f5e72554dd07e354c97aadb415b87464e6b4868bbbe6 SHA512 67a4e7eec303b44e084d80f66ed3c07450fae3316c824da1043a7e348c6895cb30807dee83296e2143405fce8360d77117c8755e8450bac0a4981b6ed102ed35
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
-DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
 DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
+DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
-DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
-DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
 DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
-DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfca1242d820d760bade713822b7b8e283852a2e337a6d33b40ddbd95f86c36bfc4c418ef0ded86f59ae4a4df56a SHA512 f1f21dd6306d6f4b5666d1ef4994d0d68f10a7a94fe628a5aa8ba28ae0376cb34b7c091f82e2db8f2555eec4f35088f6c4df42ed84de7467d5780e284b397115
-DIST rand_distr-0.2.2.crate 40805 BLAKE2B 9c4ff7770da3e04798c5de17a43e7943cffbc3adce334e7bd8ed3720787ad029c5127523bc3128b54736e4071d2ccf7b699bbf00d9ff9c1d39d47a988e5b22b4 SHA512 15c710f3ec4e06fb4c356ef1016431c8b7e6fd6d7f03f2fe56b7ffd34cfffd728d3b3a9c92ddca36fb4920154f92589dc9c91b1735bb32d5b61eaedb24d702cc
+DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
 DIST rand_distr-0.4.0.crate 51930 BLAKE2B 67731792f82d012cdde89b8d67b444ba06727675b384e52ba7ede682ec247c8c2e6f956e00bb923f37cfce4c2d584ba8aa3af1d72de5b84ed4ed0cee5e1c5656 SHA512 e4670482a411be4257a7b3ebe4fa13a1f63acafd3a4bcc95a54c2e84183491b2539b02952b7ba654ed30e0c4e589ec452accf4c331af118285e26ac535278190
-DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_distr-0.4.1.crate 52510 BLAKE2B 7da4a2d3cba604542da016c177c500307e07ec83ffd32efc9b3e5724c8574ec1c2bd0139509586cc3fcadd05b784c262f8305d1af749a5614a97d5d8bee96f1b SHA512 e5ef15e3dd9d537310f59f33b7e76c789f724e20d2fb4e43b4972b1dcb91bb8feb91e00ec1172fe8e4193e089cca4ad07a58dcb940948b84d4f78c5dc0b6f63e
 DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
+DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
 DIST rawpointer-0.2.1.crate 7490 BLAKE2B ee4542886347f2bfc7cb32cf4f7d025d35c78cb763e6d6acf2a8f85ae8d0261a2a20f86903952bd33b886dcaff789bd30c507b4e5d53c0debd2e6696291a825b SHA512 bff9ba7b69e7754e89ca6d42bd3b7a547f450404de999e35c10e4002fe03ee1f563b9799673c5010aa4c2f80885ca9e45b5560c5093e117be3b75d86affcb62f
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
-DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
 DIST redox_syscall-0.2.8.crate 23697 BLAKE2B 5a084a48e06ab0dc69f64b05058b78d994040da6c42f04c8b615b1977fa3e813cd5a531ab33402402914362301670709679aaaa321e8904424c38d35c284b7ec SHA512 250556a7683254c9daf22887b39abb010eb9d4fe08b944e52bc6595ef6d8acfed76e5f43931fe20c84bdb3743772fb62a0be154ecfb6e66c2facb4c73546eacf
+DIST redox_syscall-0.2.9.crate 23533 BLAKE2B edff38a41e57f40f9285d43deaacea32d518f5d87382d535b0349f123569613d50e7b45a70e4013f35632485951967a5157146593811102f3c0a7d9177f07fed SHA512 4f3c9dcb925c57253fa27f6355482d4f984fe31c4f562f2cd22e953c6f1f475e0687003e495167f400f77d2594ffb9a69548454db8086da5913c00643ecd337f
 DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
 DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
-DIST regex-1.4.4.crate 241266 BLAKE2B 1f5877002d9fb2eb83146207232ba53fba02e8f19de9afd9f39d7c25acf7fee1be9bde0ead5211a81846ff52f595bd2b6885d68ed2c1e43466de38a323ff844a SHA512 1d7a0303c8a8106278516ecd3dbe3dca331f1a91fecd4bfed6d9744654447cab597f7dbfadf6b0e7ef7b4fcf357a6258bf8d517e5bef71f6e6dc46f7a9b1b2d9
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
-DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST rpick-0.8.2.crate 40556 BLAKE2B 7bd2216a30ec8a8e81c7f1081455460a59875ec304140269df2927ce464e63895ceb2160c3326c89f22ccc5bd26b2ee9f59f437afc30939b1c25aa67aa001480 SHA512 8362e89c6601d6fdc5f4d1c8548e8359625d8f8225399bad6650035fddd3fe6c3e52c25d5eb83dbad7f10adc92cf3e013f851ee435d307bf6d586c266ac2973d
 DIST rpick-0.8.4.crate 40230 BLAKE2B 714c120a39c3bac961015f3a7efd2b121bd41782653d1f7d2b9176dda3d2ecb53a3940a2117193ff7ad5b497cd43957560ccff8d69f2b09954bee56842b181b7 SHA512 8007d5599625d7cceac2c7380c96924de2be3f301e3f2849e91573a794618f692922d7a249d11946c213a1c6b5dcf34aff15beeebd7eac618c1efc4121e31f0f
+DIST rpick-0.8.5.crate 40588 BLAKE2B ee5a24934b3e9544bf020ea3672bbfef94eac621928689ca414e1d7de7019c94b448d4b1f6da34f5b54315e667d14096051186120e979d2d58de1bf1a2a27ade SHA512 8552c62c4b5f435092c28ab6456ed43c5b7faeb643323c1900cb0313af3314b286d184383f618357c6d795e8e7d17d780f3361eea5a4120a420c6cd2ae24810f
 DIST rust-argon2-0.8.3.crate 28313 BLAKE2B 2d3468c7b5dc027fbbf6ceb264d77f4ae9b03526e0634c645ffd32a4c87532f5a84c224c6c39a15c9e267d268b187ec65210a2edf7df8294913e4958fbc83352 SHA512 f336dd3f90e1a49be107b641f9e9d513b6f8098dbdd1ab8aa2bd1fae329ce6840ad11a902b599922bef45d96ffb556d52b57d61218271bdccb7c85f9fe1da033
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
-DIST serde-1.0.124.crate 74508 BLAKE2B c2201c9f1aa7d3f72bdb5ca56b888d40d7606d019d86f3b2dafa93d67e768a8f79ac281c3e8442a4efae676de3b3556c55ca7234fd962809e035631a7f824191 SHA512 3106e446875b6a45f59f23d5619e62e6b97ba5462f38f768b68bd33a3679ee22f4821f460646133eb626a9e529b704e405388425ee2353a4027b48f7e36623ea
 DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
-DIST serde_derive-1.0.124.crate 54147 BLAKE2B 313a601e7fba1d23a4029fb40946cd0c54ee100d5eb76e81d33d289debd96b63c862d2797b0b4de49df8b417d711fbebeba7660b4243dbd147cb75d04a2f78a3 SHA512 6da069bd2ffa101bf0c83748417e14cab93b898313a33bbb2584ef4bb85924a92b24c54f61906a42797d409ad47c313089a31549c2e6be1513220e3145a76c8d
 DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
 DIST serde_yaml-0.8.17.crate 40805 BLAKE2B 8f70ed3efa5afa1f8f45b2c107463799269d745705ac2b90e8ce69c090f4f52721d49723dc48967bdbab30efe853c661631063fe16bc3ceaed4d0158f90ffbcb SHA512 3e7a4baa156ca1d9655a76fbaccd2d87b6929165972f6390316c9d4d55fc9815827e3c4bbb8a1c594f048dcc9c3fd6f4c55370df27f6257dbc28e2066274a7c1
 DIST simba-0.4.0.crate 48743 BLAKE2B f164b4111abe689b943b8eb0f0cbd9c60987e333751a52b3b6839c4c72d8182e5b8a7f2fa754ae389165b7f5f05f6c0c7938fdd352729448b2889dca62c51d07 SHA512 94346886ef76ad2b9631f6d6dad76ca48c4e9b60f2d6bb757db413aa36b45c9df78e66dacd2be2aa62f99501c114694d403ec07afe6097b47d0a3ada555ca69f
-DIST statrs-0.13.0.crate 123300 BLAKE2B 2c4c0f608c261ff6feea282fa28aa4d7bdf6b8dfbc5c8b927c0253bd1ea49e7038513c2f3cd15237ac11a01978c2d5794dc4e104ac6d50b882fb5cda6cf9f485 SHA512 3ce6f35dba25e27535dcff6985ebd2b24093b9b9b1911e151be740da3c1ad0722a3c35fba1fc6ef105e9d1aec122c56e0d3a9f223c3327cf970e3c720d16a996
+DIST simba-0.5.1.crate 48512 BLAKE2B 51d513e08a6a7d8d1ec4530804852ce0e1494e9e1a405b5ba9525e51ba5fb92a8029a14bcf74a34651f257644a8e7b1209ef5e3dafc06ce52a90d517ced48354 SHA512 8e2dc3cfc60f64b307f9e9e6670cfdefdacbde24cb8f73529cb42ddefbbca09522f97972dc1567811b6d55f7bb6f818907f349c6584bd7063ebedb8d68c5cc5b
 DIST statrs-0.14.0.crate 131422 BLAKE2B 9fc474662cf33c94812cd84fab9a9ef98cb60f3bc8a60ede0a4d2af2aa7b97199478d26b9eed4e243262c8cfa0d4cd9cef986214a4d0db842c04ca53222dfc99 SHA512 f007e23423d453e5d70911a3a497855a005defd18f4fd0d3223d77dd91ffdaa82926fad57a53c32f050eaacbdb3920930435050ae475d7ac18b3a9b5661c5c18
+DIST statrs-0.15.0.crate 131157 BLAKE2B 164d668cfc305c16f7d75581ed2345691af34fc000781b69c0505a8205e058e86df258cb19ebc9e662503445c93d59c30d50a42f500d5fe56ce2fc40a35c0e3b SHA512 e2eeabcec11fd5253695549f4dd953d71ec6e21bc982da5d74467bd241c87eb00140a56b68a3aaa306b48eea3d78c147f60cbbe0ffcb473242d90dd14f9aa111
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
+DIST structopt-0.3.22.crate 51665 BLAKE2B 310597cd82596b8a63501d122b20d845d5f9bdef0f3babcc53e9e6f93f9cc11f2aa4702bf2c20cb0b2105b4cda4ca0dcaf79c67454261424c3e5d90da4261a48 SHA512 fcd37107dc6cff85e30345c816ec6ef9bca57f05e9b67d8dce196a94fa18d79d33e953036b394521e76534fd5cc9e4fbbe14588d7cd4ccb01076f4c8ae8f5739
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
-DIST syn-1.0.63.crate 231524 BLAKE2B 43398bc3ca9069db4d44af3b28e5e48034d6ac4f38bd1e3da8c77c9d1468d3d9f6f7b7c6711d1dd232d5f2d9477c5929a18368a003be42f6254f270cf5d6a74a SHA512 a0da342e44dc6509f35dad8534acd93bf1a9e3104c2d9eb9d66c38a25036c5aae0503bfee3e09d2e42cc117022b328b6d966444dfb434b780c78fea64dfb14b6
+DIST structopt-derive-0.4.15.crate 20861 BLAKE2B 3c97e31f8f3c549af548a3c75eef06b50039e513171251162af08eb7a70d900e0fc533d5bc711fed489252e5102e5245d343197eb03161c2d03e4464c6319fed SHA512 a241cd02ee91195548759e6143f4c08eac70466d6e13fc5af59a09c15dec27816cfb766c7f2024d4a678a1a1fc8fe5d78b858b3ac0f53fda914ec9ec1d8abc8d
 DIST syn-1.0.72.crate 232500 BLAKE2B 8f71f7fb66426f78eec3439688b0468fbef582c8ca912781f19607acd9e8371f2230b305a96f613c16f7299e66fdb2395dc037e1093d3897864bd2bf50ab3d7e SHA512 f01e2ef74fc3f84a753c1c379c24e3c63f3c575d72ab865f8e7d51f4dee4293ac8197b4e123ebaa942e9199bf0a0d8194e57a5aa6314bee6951d3d458dfc3da9
+DIST syn-1.0.74.crate 232974 BLAKE2B fc17dc2645fbe2d1ee409f895732b86cb77dc14837d35d7773e7f9f055e0b56f70be86203f13c549f0b43e1e4e1e777cc5bee2f08a733fe447f907dfaa443da7 SHA512 5aae03a68a4a8c1234d4e9a69cd37b9f6c698e2b635f10a030c0fac22cf00414c2a5e7523e0efe43181bc29c17abe6abc0eab103391259c97ce566713e3349f6
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST term-0.5.2.crate 37638 BLAKE2B 58a496673b9033416f40e29a0a53c0b8d50e413d3922d3685252c96fd880659961b4ee48281ece5b9d6d97e895d81839cdf886fb0a6945af25b873a905b09700 SHA512 421b04f067f66ddecb615d715c828c98d3fa351b3490ec76bfa02bf430039717da5a168c20033399d5544ded5aed35c2aa4c9e6ea5018211bfe615389d18f3d6
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thiserror-1.0.24.crate 16580 BLAKE2B 5cda4153e32ea4cf2f4f45fb60f18230dca61bc8d9b76aa598f7336babba8d6615d929ae325c84976ac60f4e8afa803f96d1b2afb6369445934e1e657bd9c846 SHA512 38ff620f1d33041600faaf3162ca0c1cfbe191100b6442513e4076a35296e97e28dedfda25dd0d7613f6a81b6b72816c11ac37424d94baa295142b1002d0e962
 DIST thiserror-1.0.25.crate 16690 BLAKE2B a03107d70186d46870050ef86cb1f49aa99d91e509bd9ab22ee6cbac28d37176b2bafbadedc237a25d233abf7816cb3d85d88c140f172ede40d309ddaa1223dc SHA512 f408c2722060c6f707b9afcc1d9f3cb175bcf955263c4e643ef7ee935fd68299af835f4ad489ace814a7bcad6dc428eec5df2858453834d0b6154d22a38ba1da
-DIST thiserror-impl-1.0.24.crate 13361 BLAKE2B 4ae667e69d3dbe755cfb07083649c6d41bd5bddcfbe1d8954980e93390fb8eb51ffce6fb2d24c51fb676b6e75051ac66cff8c0cb3ad6683275581749f7c9f9f5 SHA512 4309506b8cf939e6a400542dce772b951d40faff3b2fb765ef87299547615fe18dfb877844b5ce892c594623a2de941a32629e53e2d59b03f611cfefeb169db5
+DIST thiserror-1.0.26.crate 16711 BLAKE2B 4524c3ef351eaa1266cbbbafec6082695d5c1485cec7bcfdffd64719fd57efb4e40f119435eae5c6f574a80f59a68bd8c868e2493ddf36f4882e7de65fd4bf93 SHA512 bfe93a14006a3d9e0e996b310718223f8442802a384a1b999c15dd1a25f642c5cb2db7a50a69cbb097ec50ee3b0129b509f19225ca714a5c459d4dfc8255d84b
 DIST thiserror-impl-1.0.25.crate 13364 BLAKE2B 9b0eb7a6fd5f290d7a666de6065edc210ab9ef35960c424258d5039f24433baef7d1228ac2e962e8ef9dcb673979c9d3c09ef3f3d20533fe2ad1500bfcb20015 SHA512 a2d2f39d3c1e5a722d7020672f63fc312dd9f8ed73863971814f1fd12faac4ea5d8546e06b26838d8224b1f91161011f51dda476848b2555153203ee9f7ee3ca
+DIST thiserror-impl-1.0.26.crate 13431 BLAKE2B dc753a4cc1e7b8b3eb44bd9462b6b19ee983fefbfe1f60a974195a536fdbc68395942a229a1d2ec7a8594669a439a6efd3cd22573a647a7fb7a371e793fba645 SHA512 43eea818b72469bc4d5c28e449c2e284c1e11b2674b9e67b1788af7ab66bd64afabfd8f5861938a7f9547a9c13387e0ce400419c6283bbe1e899d18d998cd921
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
 DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
 DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
+DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
-DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
-DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
@@ -135,6 +134,6 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 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 yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD rpick-0.8.2.ebuild 2647 BLAKE2B 68028dec9ac8da55d7d8e335ad188581b11c90fb463270ee9a522e1de821182f737df8f30f2a4ec0a42c26519e5daad24d2d373b18ec952a62b7360832b24fef SHA512 4ab8741291f5f1664e1f8bbc4c80ff2330fa7928b41d4d82536fae9d3d5312d941242d714984207ac83f1d7d2e832f929aaa2fe02ca1c8b66d6f1a8ac268c168
 EBUILD rpick-0.8.4.ebuild 2550 BLAKE2B 6f54bd38027af0a269eabab5957909b9d81773bd06a1bdba0f79f6ebcd591afaacf3679a2c434d3c938870b8db6d740c3727799c9901fde12784f09a94f6cb54 SHA512 220dc3261867c11f8988d7f7e169f26a6b509355cc7bdd0f9f6e0e992e4470cc248a2a78446cadf2e7a46e02c7a5a9985c5b3015ed0bfce4a39224e5322b6f9a
+EBUILD rpick-0.8.5.ebuild 2521 BLAKE2B c9472cfbdc8c2943d4f858575a77e0f3b52fb4657f983aa5628092705093730c84901cafa73b93545376da9a3d5b14d55f9302b6f23eecab40e13b8a9b793714 SHA512 5b9882d9c360add0db6fbfda759f5ddb79fd3b70fc34edfd233026479dbc6f97e9e841ac53e7ffd7aa53fea6d5e45108522000c966a11854fe8292dbae2be860
 MISC metadata.xml 982 BLAKE2B 81e304c7c73f959b09d1bb5f2d26d1495930f1b340552fbdb989c8741dba6f5ee7b8801e3eb1d7063947f8f424d0c32ccc66c29cf6508ce8c11305e45febf322 SHA512 bfa865140ae1320670b94f4f383931dfc9bbf1a0278597a283cd64d538362d95751e9b9b53a1a46aa96a835a69b9425518760bd286d0375c550d0e110d1f4f08
diff --git a/app-misc/rpick/rpick-0.8.2.ebuild b/app-misc/rpick/rpick-0.8.2.ebuild
deleted file mode 100644
index 030cd52c5bdb..000000000000
--- a/app-misc/rpick/rpick-0.8.2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.3.1
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.15
-alga-0.9.3
-ansi_term-0.11.0
-approx-0.3.2
-approx-0.4.0
-arrayref-0.3.6
-arrayvec-0.5.2
-assert_cmd-1.0.3
-atty-0.2.14
-autocfg-1.0.1
-base64-0.13.0
-bitflags-1.2.1
-blake2b_simd-0.5.11
-bstr-0.2.15
-byteorder-1.4.3
-cfg-if-1.0.0
-clap-2.33.3
-constant_time_eq-0.1.5
-crossbeam-utils-0.8.3
-csv-1.1.6
-csv-core-0.1.10
-difference-2.0.0
-dirs-1.0.5
-dirs-next-2.0.0
-dirs-sys-next-0.1.2
-doc-comment-0.3.3
-downcast-0.10.0
-dtoa-0.4.7
-encode_unicode-0.3.6
-float-cmp-0.8.0
-fragile-1.0.0
-generic-array-0.13.3
-getrandom-0.1.16
-getrandom-0.2.2
-heck-0.3.2
-hermit-abi-0.1.18
-itoa-0.4.7
-lazy_static-1.4.0
-libc-0.2.88
-libm-0.2.1
-linked-hash-map-0.5.4
-matrixmultiply-0.2.4
-memchr-2.3.4
-mockall-0.9.1
-mockall_derive-0.9.1
-nalgebra-0.19.0
-normalize-line-endings-0.3.0
-num-complex-0.2.4
-num-integer-0.1.44
-num-rational-0.2.4
-num-traits-0.2.14
-ppv-lite86-0.2.10
-predicates-1.0.7
-predicates-core-1.0.2
-predicates-tree-1.0.2
-prettytable-rs-0.8.0
-proc-macro-error-1.0.4
-proc-macro-error-attr-1.0.4
-proc-macro2-1.0.24
-quote-1.0.9
-rand-0.7.3
-rand-0.8.3
-rand_chacha-0.2.2
-rand_chacha-0.3.0
-rand_core-0.5.1
-rand_core-0.6.2
-rand_distr-0.2.2
-rand_distr-0.4.0
-rand_hc-0.2.0
-rand_hc-0.3.0
-rawpointer-0.2.1
-redox_syscall-0.1.57
-redox_syscall-0.2.5
-redox_users-0.3.5
-redox_users-0.4.0
-regex-1.4.4
-regex-automata-0.1.9
-regex-syntax-0.6.23
-remove_dir_all-0.5.3
-rpick-0.8.2
-rust-argon2-0.8.3
-ryu-1.0.5
-serde-1.0.124
-serde_derive-1.0.124
-serde_yaml-0.8.17
-statrs-0.13.0
-strsim-0.8.0
-structopt-0.3.21
-structopt-derive-0.4.14
-syn-1.0.63
-tempfile-3.2.0
-term-0.5.2
-textwrap-0.11.0
-thiserror-1.0.24
-thiserror-impl-1.0.24
-treeline-0.1.0
-typenum-1.13.0
-unicode-segmentation-1.7.1
-unicode-width-0.1.8
-unicode-xid-0.2.1
-vec_map-0.8.2
-version_check-0.9.2
-wait-timeout-0.2.0
-wasi-0.10.2+wasi-snapshot-preview1
-wasi-0.9.0+wasi-snapshot-preview1
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-yaml-rust-0.4.5
-"
-
-inherit cargo
-
-DESCRIPTION="Helps you pick items from a list by various algorithms"
-HOMEPAGE="https://github.com/bowlofeggs/rpick"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-# License set may be more restrictive as OR is not respected
-# use cargo-license for a more accurate license picture
-LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
-QA_FLAGS_IGNORED="usr/bin/rpick"
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-}
diff --git a/app-misc/rpick/rpick-0.8.5.ebuild b/app-misc/rpick/rpick-0.8.5.ebuild
new file mode 100644
index 000000000000..f869a24aca0c
--- /dev/null
+++ b/app-misc/rpick/rpick-0.8.5.ebuild
@@ -0,0 +1,133 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick-0.7.18
+	ansi_term-0.11.0
+	approx-0.5.0
+	arrayref-0.3.6
+	arrayvec-0.5.2
+	assert_cmd-1.0.7
+	atty-0.2.14
+	autocfg-1.0.1
+	base64-0.13.0
+	bitflags-1.2.1
+	blake2b_simd-0.5.11
+	bstr-0.2.16
+	byteorder-1.4.3
+	cfg-if-1.0.0
+	clap-2.33.3
+	constant_time_eq-0.1.5
+	crossbeam-utils-0.8.5
+	csv-1.1.6
+	csv-core-0.1.10
+	difference-2.0.0
+	difflib-0.4.0
+	dirs-1.0.5
+	dirs-next-2.0.0
+	dirs-sys-next-0.1.2
+	doc-comment-0.3.3
+	downcast-0.10.0
+	dtoa-0.4.8
+	either-1.6.1
+	encode_unicode-0.3.6
+	float-cmp-0.8.0
+	fragile-1.0.0
+	getrandom-0.1.16
+	getrandom-0.2.3
+	heck-0.3.3
+	hermit-abi-0.1.19
+	itertools-0.10.1
+	itoa-0.4.7
+	lazy_static-1.4.0
+	libc-0.2.98
+	libm-0.2.1
+	linked-hash-map-0.5.4
+	matrixmultiply-0.3.1
+	memchr-2.4.0
+	mockall-0.10.2
+	mockall_derive-0.10.2
+	nalgebra-0.27.1
+	nalgebra-macros-0.1.0
+	normalize-line-endings-0.3.0
+	num-complex-0.4.0
+	num-integer-0.1.44
+	num-rational-0.4.0
+	num-traits-0.2.14
+	paste-1.0.5
+	ppv-lite86-0.2.10
+	predicates-1.0.8
+	predicates-2.0.1
+	predicates-core-1.0.2
+	predicates-tree-1.0.2
+	prettytable-rs-0.8.0
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.28
+	quote-1.0.9
+	rand-0.8.4
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	rand_distr-0.4.1
+	rand_hc-0.3.1
+	rawpointer-0.2.1
+	redox_syscall-0.1.57
+	redox_syscall-0.2.9
+	redox_users-0.3.5
+	redox_users-0.4.0
+	regex-1.5.4
+	regex-automata-0.1.10
+	regex-syntax-0.6.25
+	remove_dir_all-0.5.3
+	rpick-0.8.5
+	rust-argon2-0.8.3
+	ryu-1.0.5
+	serde-1.0.126
+	serde_derive-1.0.126
+	serde_yaml-0.8.17
+	simba-0.5.1
+	statrs-0.15.0
+	strsim-0.8.0
+	structopt-0.3.22
+	structopt-derive-0.4.15
+	syn-1.0.74
+	tempfile-3.2.0
+	term-0.5.2
+	textwrap-0.11.0
+	thiserror-1.0.26
+	thiserror-impl-1.0.26
+	treeline-0.1.0
+	typenum-1.13.0
+	unicode-segmentation-1.8.0
+	unicode-width-0.1.8
+	unicode-xid-0.2.2
+	vec_map-0.8.2
+	version_check-0.9.3
+	wait-timeout-0.2.0
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.2+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	yaml-rust-0.4.5
+"
+
+inherit cargo
+
+DESCRIPTION="Helps you pick items from a list by various algorithms"
+HOMEPAGE="https://github.com/bowlofeggs/rpick"
+SRC_URI="$(cargo_crate_uris)"
+
+LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+QA_FLAGS_IGNORED="usr/bin/rpick"
+
+src_install() {
+	cargo_src_install
+
+	dodoc CHANGELOG.md README.md
+}
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 4d997987b9c9..b1fa87080291 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -3,6 +3,6 @@ AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd
 AUX screen-CVE-2021-26937.patch 1864 BLAKE2B 7425a49e003601f21130cf9c42354aaeb5f3cd639dd274971393420ccf45e8273539ae020f8a1a6e4063e741e75dcbf8cecd4e35b26c6d04ffca108ddea7bd32 SHA512 419f4d10b23369fccdadfb024b6ce268794e7f76188b25dd9051ff8cd6080dc0c70f66b9c2480095d655bb63f20ba1fdfa1ce0c681c9b8aff4d4918764018516
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
-EBUILD screen-4.8.0-r3.ebuild 4178 BLAKE2B 57d59e6fe7cbef9b277731c0bbc1a7045222c2f80ccfec404278a197bc39da4f67cbb39c8b883f9969e0eafa23bbced7d1082e96b683e37e6631059d768a4787 SHA512 21f9d6153c112693936fa28ef9ebe5402a5f7e478e5410efd324884a416c7dc7a3ff634ede0eeaa225fe043dbb3c2cf57a65dbe09b781ac40c117e4a98cc2018
-EBUILD screen-9999.ebuild 4241 BLAKE2B 23ba0ca01a4f1c279fc59895eed1191c64046f25d2fabc73b0569a348ffe1e1a84598092e5438def0edf1b646d15162045c169c17a557b012372b850776166c3 SHA512 bc7cdd5e34914086081496862ec84cb2ae39a3f48ab60c1fc36999ec1caea90ace33b311b957b9d55945f6041935ced0e05a6d0f777e480418f8f5961c527025
+EBUILD screen-4.8.0-r3.ebuild 3848 BLAKE2B e861b10538b50fa4d53a9b42fc3e69409c2a9d6e24d4f757b9905fc2f48b2ebcc94066f7c7b25f5dfc0c6661b696ca878b9a4a8fce694ed847e6e0eab2095112 SHA512 5c51dde15eeab2e1f0dbf3120ee20cdc1ec22666ad62bf4b86a9db85793d1293673071d2a5cb620726abbba6b2318f172248d381383338b23ba89f1e03cbef3b
+EBUILD screen-9999.ebuild 3911 BLAKE2B bc3d9c871ea0659fbc880229bda56a541b7bda70e26270cbd621e38b0887e7da0d0c89c9a8038f44c0f9ddc2a16f663fe0079590d4ab5affce11d45847563070 SHA512 69dbb37a84024e208fce48cc9804f0c2a0ca2f1cd039ead9087a3d994348d1d1f143832b53f62f769a9263a696a17ab9734d39b38bc10c8a2e9ccea559dd1ced
 MISC metadata.xml 1782 BLAKE2B bb6d45dd49af2c1abcaf4801d509421a885cd9c636c44e71964962abbd111a54505cd3dcdc594479489b943714a4b534332eb4aa1c5a43d0d679a18866983920 SHA512 d12c60725b314af0ea8ea909d387699e18da8a742036c35f2822235536b6787595ec5acaa8b7e1af0a429e0eb618051e62ba937dcf53a245ae804c3ace29d47b
diff --git a/app-misc/screen/screen-4.8.0-r3.ebuild b/app-misc/screen/screen-4.8.0-r3.ebuild
index 565bb0f58b8a..dd1d7780d693 100644
--- a/app-misc/screen/screen-4.8.0-r3.ebuild
+++ b/app-misc/screen/screen-4.8.0-r3.ebuild
@@ -143,18 +143,7 @@ pkg_postinst() {
 		elog "applications. Please check /etc/screenrc for information on these changes."
 	fi
 
-	# Add /tmp/screen in case it doesn't exist yet. This should solve
-	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT}/tmp/${PN}"
-	if [[ ! -d ${rundir} ]] ; then
-		if use multiuser || use prefix ; then
-			tmpfiles_group="root"
-		else
-			tmpfiles_group="utmp"
-		fi
-		mkdir -m 0775 "${rundir}"
-		chgrp ${tmpfiles_group} "${rundir}"
-	fi
+	tmpfiles_process screen.conf
 
-	ewarn "This revision changes the screen socket location to ${rundir}"
+	ewarn "This revision changes the screen socket location to ${EROOT}/tmp/${PN}"
 }
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index dad214f37c40..e41146f416bf 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -145,18 +145,7 @@ pkg_postinst() {
 		elog "applications. Please check /etc/screenrc for information on these changes."
 	fi
 
-	# Add /tmp/screen in case it doesn't exist yet. This should solve
-	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT}/tmp/${PN}"
-	if [[ ! -d ${rundir} ]] ; then
-		if use multiuser || use prefix ; then
-			tmpfiles_group="root"
-		else
-			tmpfiles_group="utmp"
-		fi
-		mkdir -m 0775 "${rundir}"
-		chgrp ${tmpfiles_group} "${rundir}"
-	fi
+	tmpfiles_process screen.conf
 
-	ewarn "This revision changes the screen socket location to ${rundir}"
+	ewarn "This revision changes the screen socket location to ${EROOT}/tmp/${PN}"
 }
diff --git a/app-misc/tmux-xpanes/Manifest b/app-misc/tmux-xpanes/Manifest
index b464fca8bad5..a06496e7b5cd 100644
--- a/app-misc/tmux-xpanes/Manifest
+++ b/app-misc/tmux-xpanes/Manifest
@@ -1,5 +1,5 @@
 DIST tmux-xpanes-4.1.2.tar.gz 63337 BLAKE2B 1ddc0c0422eec64697aea7eb97c8bbbbd4005f4c470d5d0bf1fae4eab01d8ced50503180f76d0ed5aa9d29e854b54aab8f8216ac945e6c1c2e4b4833c5661ceb SHA512 b18445940052a6af848286b901bfd81abfbdf83356cd1b39ac592e1509c9d63b81440978a8c2632672bfb7a2429a7fcc57b7c55c91a00d751b43aa9f368a5c57
 DIST tmux-xpanes-4.1.3.tar.gz 64101 BLAKE2B ec7e025adcfb2436b416a37de87cbf335bdc92d7653a65be9299c10993d273746a0678ee3e418df483697f1f2dd556063e98d984006e2137e2cdeb6f8634f75c SHA512 6545ec75a522b05eb8079c93830c81ac3c6a9ac338a3cc51c491f69a4602bef5b9f19c9f18b2975d0470c4af0a83ebf2357a4461024508ff0f6ac61d1099b22e
-EBUILD tmux-xpanes-4.1.2.ebuild 691 BLAKE2B c8c07e13c12878e54d347c9e4fd08b99710fcfc449abbba9f4c0c39ae4dba2ad8a5f463d34208ca5d15d60bc9eb9437e41c87ea1c1e9881917d695bfc64c76d0 SHA512 c339ac55bfbd1b01f7d5b2875d99474f1a2bb7185a346102fd48d50152b9bed886d269666571b0e7396b715bdd191f1c702af286747a80e9f75609027895dff9
-EBUILD tmux-xpanes-4.1.3.ebuild 600 BLAKE2B 6a0d2dc689bd865c124399d52f1a01d75e685c737a0bb2194de86dd0b90b23b9a6fc075ed2b817f1ff8b4c0a8741f740ba32c836336f846a2ad565e27623e636 SHA512 06a5f75f9c4d3fed3c8d10cfb191820b639b83e99b88b021aa4b4ae303a1a98c3d43aa87ca045a367984a49b45558b701faf424bdd9afd6fca4e5946a12dbab9
+EBUILD tmux-xpanes-4.1.2-r1.ebuild 577 BLAKE2B dbf2634b99daed9cbad1b8114d7217f13978861264c0ee3c7075595918145bc607508ee7718070783bfd099f96347d8af5c720d2a4a1bd10737a756a7417001c SHA512 5a7b71dae2a67e6c9d145f92a7dba31e77d5b74de6dd0719503ef98f7a9cbb1b02f65286549b360703b02031a01b01c9210e9c346a3f432b76148727042dfa82
+EBUILD tmux-xpanes-4.1.3-r1.ebuild 579 BLAKE2B ce2c7a24062172ad021212bf28ef56d7d815fe24ec6b4790b1392e92f41cfe06c161fbd90d083c3652752aac5ecc5dcdf9ae3f13b22fa16090b9a1002d67b4b1 SHA512 ae9809ceb3df5c2d3a9f635c978614ded26f69922b52acff855dea5d1185e0bd0d8aeb64eeac1b75c0033ded64e69cdbbe839690e163d74a6cc4d35436b17c28
 MISC metadata.xml 460 BLAKE2B 2f0ffe7b708299dbcacb08b48bc4cc78ab360310e1234b0d06efb65543de75996ad5f1469bab45f912ba44817072b4f1b845bea50ec9ced322b90bbeab07042b SHA512 b275a2b153cbe7d0a1f4bb5492bb0b884e16aba4baa543f050e316d9086d6d1661d6b49c11ff49711b91672fe1f4c8ffb54cf98abca409e6c50ea0001ca2516f
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-4.1.2-r1.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-4.1.2-r1.ebuild
new file mode 100644
index 000000000000..1fbee411365e
--- /dev/null
+++ b/app-misc/tmux-xpanes/tmux-xpanes-4.1.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="tmux-based terminal divider"
+HOMEPAGE="https://github.com/greymd/tmux-xpanes"
+SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="app-misc/tmux
+	dev-lang/perl
+	dev-libs/openssl:0"
+
+RESTRICT="test"
+
+DOCS=( CONTRIBUTING.md LICENSE README.md )
+
+src_install() {
+	dobin bin/*
+	doman man/*.1
+	einstalldocs
+
+	insinto /usr/share/zsh/site-functions
+	doins -r completion/zsh/.
+}
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-4.1.2.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-4.1.2.ebuild
deleted file mode 100644
index ed4e2949a395..000000000000
--- a/app-misc/tmux-xpanes/tmux-xpanes-4.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="tmux-based terminal divider"
-HOMEPAGE="https://github.com/greymd/tmux-xpanes"
-SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="zsh-completion"
-
-RDEPEND="
-	app-misc/tmux
-	dev-lang/perl
-	dev-libs/openssl:0=
-	zsh-completion? ( app-shells/zsh )"
-
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-DOCS=( CONTRIBUTING.md LICENSE README.md )
-
-src_install() {
-	dobin bin/*
-	doman man/*.1
-	einstalldocs
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins completion/zsh/*
-	fi
-}
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-4.1.3-r1.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-4.1.3-r1.ebuild
new file mode 100644
index 000000000000..3d28ac557e8d
--- /dev/null
+++ b/app-misc/tmux-xpanes/tmux-xpanes-4.1.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="tmux-based terminal divider"
+HOMEPAGE="https://github.com/greymd/tmux-xpanes"
+SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-misc/tmux
+	dev-lang/perl
+	dev-libs/openssl:0"
+
+RESTRICT="test"
+
+DOCS=( CONTRIBUTING.md LICENSE README.md )
+
+src_install() {
+	dobin bin/*
+	doman man/*.1
+	einstalldocs
+
+	insinto /usr/share/zsh/site-functions
+	doins -r completion/zsh/.
+}
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-4.1.3.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-4.1.3.ebuild
deleted file mode 100644
index 1f0e2733e1df..000000000000
--- a/app-misc/tmux-xpanes/tmux-xpanes-4.1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="tmux-based terminal divider"
-HOMEPAGE="https://github.com/greymd/tmux-xpanes"
-SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-misc/tmux
-	dev-lang/perl
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-DOCS=( CONTRIBUTING.md LICENSE README.md )
-
-src_install() {
-	dobin bin/*
-	doman man/*.1
-	einstalldocs
-
-	insinto /usr/share/zsh/site-functions
-	doins completion/zsh/*
-}
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index 5839479a79b5..dd1bac09a472 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -10,7 +10,7 @@ DIST tmuxp-1.8.2.tar.gz 1019801 BLAKE2B 1e02139df6cc5ee0aec31e3a39413297195b6951
 DIST tmuxp-1.9.2.tar.gz 816621 BLAKE2B f471ba2b7a6f97b123661ca2473c63273dc79b08cbe25f4ea756d174ab58e5070d0fc2dfbe8ec254785946e2fa139121d2e9fa5d7d5c127c18580e514064523d SHA512 e4af94fde475c999cee5aa6ad4b60a05c3a9f6f338290406043544250c4dcf688bc39e501631f442b59009156e04eb383098ea717fe7be8e9811b44886515935
 EBUILD tmuxp-1.5.4.ebuild 964 BLAKE2B 643aaf5a7db258f05164547d93e0dc4a63af82a79048a247f08bb8e8cbd5ad5bd71d27e1c708f4f63573424ed70804dd66a6e25b62460e641339bc4426384444 SHA512 f9ed588279ec0739ffe842847a271144c8418d1dcb1aa8190816320eb621a1900b77a1a5bdb5dc037a0b12cd266b10334c72562e8b0444acd5cbdabf3e74a061
 EBUILD tmuxp-1.6.5.ebuild 1122 BLAKE2B 005720290707591c2291ce5f5431fc10484945080fe3d62b437966acab6fb6395f031f24793cd6a9b2321597e7f0dbc8341d541ebf9ccff2870f8397f7485b3e SHA512 f4bf6bfaab0999505f3822139d9ce10128e57f56a74d42ece314c900d128e9a9f8042e40f722e4776ab35cd990041193cc476b1512649a284f34cce88a357864
-EBUILD tmuxp-1.7.2-r1.ebuild 1028 BLAKE2B f85c50f310a394e8c04b9becfd180956aad59b4ddb9b24313d107d03a567892032977b1cc6525edfd25d33d582aca9c4b2e3b19d0ebc2b099340a553bce2c558 SHA512 896e236ad5a5b537c7f53b2662c06d07f9c37378f3259e5288a9b28095157f97050bdef41ba46fb7051fedcbff318d7de1e7d58eb42b7d747288c57c68f40f3f
+EBUILD tmuxp-1.7.2-r1.ebuild 1027 BLAKE2B 4c01323c11b87b7c9cdd0363619482b0d223c5f1ee2d9a00939632d0f78cb40df42c5395e4d345421475deef63639db695e450a04fc01ff301bee07a1e98ef1d SHA512 ea39bf844846f078e9fefeba04e74c215cb8d511e4fd1820ee14d58ef43e0bcdcb85d8a5370159d6b3b23431f8214724bb457fd821d2674c0b2b2d6bad17b846
 EBUILD tmuxp-1.8.2.ebuild 1029 BLAKE2B 473845e85cd9d4a5637efec7c4f693c6d51cd2498739b181c981eba65c82b5d447d335cd2d45db8b6bbb4f9b090bdadfe5e0628f26a1b94b0b244836c8fa9f0c SHA512 75510a50fa787d40051b7531440654aa770d6b090c95d5ff1518df589a2e4968e83a2a1f765d5df8f65bb9a941082a9eb862643ffa29f5c5527f058388eee283
 EBUILD tmuxp-1.9.2.ebuild 1035 BLAKE2B 8d1c7d60b3ed255893682dedf9b7ef24a4104da64767feb6ef063a78bb9f0aaf3eb3bb7b401ebb30c6619b671c60a0cdd7332d82a9bae357d8e3a0909981b211 SHA512 1d5ca877103ab636935924918fa44f7b095dadd6814e89c2394e66e1c5fe59dcc1dfc853394559f8f080581a317ee64239b2066ed9779f5322e7b29a2bfc37cc
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild b/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild
index e6a24a27eaa0..c8ca32bc1028 100644
--- a/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild
+++ b/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=app-misc/tmux-3.0a
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index fb4d11d4d5e7..6cd831d1adc2 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -2,6 +2,6 @@ AUX 2.3.5-fix-autostart-build.patch 3518 BLAKE2B e41b39cb8576a533bb4e1bae9b96daf
 AUX tracker-miners-3.1.1-Fix-asciidoc-manpage.xsl-location.patch 857 BLAKE2B 25e6a69bf2d868b5ab9045e4f890079a1edf81fb737e74beef7ac3037366bdc0986991aeb94053f0f027287e824abd2a4e0cc6a9ac94be680f1494bc0c4abc20 SHA512 112772fcf646a4b4c81473ac28a74f31706f41340c3867cd8272ecfb5b512158fdf4ed4756fb2d661883faa8478f51ebed897744582b42891e78039eb170139d
 DIST tracker-miners-2.3.5.tar.xz 3128428 BLAKE2B a45c642fb03433a6cf12d0904a82498aa6645f97ac70b1cfe04cc3b739b33b5d3fe307cd96f45a5a4af8927f029b4eade60195d2f72c1a684aa26ee723025d8a SHA512 13da1106bc1bc8a550093c4d1bf4336a205f636e0487dc9d42cee9ce2666eca73ead479fd04f03ccf15acb4e3b27a1c898860f63bdfa69ca74b02aa041731fa9
 DIST tracker-miners-3.1.2.tar.xz 4068980 BLAKE2B ae396ab4bbfd9043c0514f815fa5968da8c6103cd6d734b2a270b450ac6ab0905f080859fd44b94c1e7b08e681f67275066e8ea49b8d14a544163c837a499ba9 SHA512 c5f65d0928512156bad3cc90f51374052afdd5ca70e6c151ca76a2ab971515ba10b967653cc9b1c94ae979f83b1ebfb6355f1d5a452982a89d403aaf7df70d8b
-EBUILD tracker-miners-2.3.5.ebuild 5001 BLAKE2B b683e12c111b42c22a1703d14490809af17d54e1bc2943c2f208706eee6b715261a2e39a923d4d622a224f402c32bbae41e0eff45065dcd63848358976c1694d SHA512 ab5f4f7bcb7577ee88d96c19ebace33c85e4b71b54bcaf903a54e837d99e59575ae0c426bf61f9e93e2a85053c4e9609d80d514d2ce85ca1e343bf2ced27f8f5
+EBUILD tracker-miners-2.3.5-r1.ebuild 4728 BLAKE2B 5c6b74b18dbe2aebb821d1d2c193c67e3503ee9fc1f9681f1ebc2858b57499a05ffab60cc0f55570f6594ef0d1238628d3777a4d5941ca982013424674d16133 SHA512 d0091dac5a17251612eeaf422bd7f4a62c2dde7be38c936295a8ed3ab98dd0d69a1dd610b8a4b121e2419fd28ec23a4559da4c3895f0188e04095612e64d6b08
 EBUILD tracker-miners-3.1.2.ebuild 4675 BLAKE2B db61ac9bcbde15ab93549b367443b4cee697b0cc3b05675a88b09ace2ef15afd425cfb104290730975482fd54ce21ee128fcea4c6eabe76984e01a239444a982 SHA512 372f8a746bfc51ae8103eab9f47bb9f64cc66ba3188afa55359a94d09ea43c68c2bd255afbf727401615872e2fa1ff5a8be2dc80717d205c673c61e4f34b887d
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
new file mode 100644
index 000000000000..804672ef7215
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
+
+REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	>=app-misc/tracker-2.2.0:0=
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-meta:1.0 )
+	!gstreamer? (
+		ffmpeg? ( media-video/ffmpeg:0= ) )
+
+	>=sys-apps/dbus-1.3.1
+	xmp? ( >=media-libs/exempi-2.1.0:= )
+	raw? ( media-libs/gexiv2 )
+	>=dev-libs/icu-4.8.1.2:=
+	cue? ( media-libs/libcue:= )
+	exif? ( >=media-libs/libexif-0.6 )
+	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+	xps? ( app-text/libgxps )
+	iptc? ( media-libs/libiptcdata )
+	jpeg? ( virtual/jpeg:0 )
+	iso? ( >=sys-libs/libosinfo-0.2.10 )
+	>=media-libs/libpng-1.2:0=
+	seccomp? ( >=sys-libs/libseccomp-2.0 )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	pdf? ( >=app-text/poppler-0.16.0[cairo] )
+	playlist? ( >=dev-libs/totem-pl-parser-3:= )
+	upower? ( >=sys-power/upower-0.9.0 )
+	sys-libs/zlib:0
+	gif? ( media-libs/giflib:= )
+
+	rss? ( >=net-libs/libgrss-0.7:0 )
+	app-arch/gzip
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS}
+		gstreamer? (
+			media-libs/gstreamer:1.0[introspection]
+			|| ( media-plugins/gst-plugins-libav:1.0
+				media-plugins/gst-plugins-openh264:1.0 )
+	) )
+"
+# intltool-merge manually called in meson.build in 2.3.5
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-autostart-build.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+	if use gstreamer; then
+		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+	else
+		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
+	fi
+	xdg_src_prepare
+	gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+	local media_extractor="none"
+	if use gstreamer ; then
+		media_extractor="gstreamer"
+	elif use ffmpeg ; then
+		media_extractor="libav"
+	fi
+
+	local emesonargs=(
+		-Dtracker_core=system
+
+		-Ddocs=true
+		-Dextract=true
+		-Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
+		#$(meson_use test functional_tests)
+		-Dminer_fs=true
+		$(meson_use rss miner_rss)
+		-Dwriteback=true
+		-Dabiword=true
+		-Ddvi=true
+		-Dicon=true
+		-Dmp3=true
+		-Dps=true
+		-Dtext=true
+		-Dunzip_ps_gz_files=true # spawns gunzip
+
+		$(meson_feature cue)
+		$(meson_feature exif)
+		-Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature gif)
+		$(meson_feature gsf)
+		$(meson_feature iptc)
+		$(meson_feature iso)
+		$(meson_feature jpeg)
+		$(meson_feature pdf)
+		$(meson_feature playlist)
+		-Dpng=enabled
+		$(meson_feature raw)
+		$(meson_feature tiff)
+		-Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature xml)
+		$(meson_feature xmp)
+		$(meson_feature xps)
+
+		-Dbattery_detection=$(usex upower upower none)
+		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
+		-Dgeneric_media_extractor=${media_extractor}
+		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+		-Dautostart=false # false to co-exist with tracker-miners-3
+		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-misc/tracker-miners/tracker-miners-2.3.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.5.ebuild
deleted file mode 100644
index 2572bcfe9e5c..000000000000
--- a/app-misc/tracker-miners/tracker-miners-2.3.5.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
-
-REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
-RDEPEND="
-	>=dev-libs/glib-2.46:2
-	>=app-misc/tracker-2.2.0:0=
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-plugins/gst-plugins-meta:1.0 )
-	!gstreamer? (
-		ffmpeg? ( media-video/ffmpeg:0= ) )
-
-	>=sys-apps/dbus-1.3.1
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-	raw? ( media-libs/gexiv2 )
-	>=dev-libs/icu-4.8.1.2:=
-	cue? ( media-libs/libcue:= )
-	exif? ( >=media-libs/libexif-0.6 )
-	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
-	xps? ( app-text/libgxps )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
-	iso? ( >=sys-libs/libosinfo-0.2.10 )
-	>=media-libs/libpng-1.2:0=
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-	tiff? ( media-libs/tiff:0 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	pdf? ( >=app-text/poppler-0.16.0[cairo] )
-	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	upower? ( >=sys-power/upower-0.9.0 )
-	sys-libs/zlib:0
-	gif? ( media-libs/giflib:= )
-
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	app-arch/gzip
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS}
-		gstreamer? (
-			media-libs/gstreamer:1.0[introspection]
-			|| ( media-plugins/gst-plugins-libav:1.0
-				media-plugins/gst-plugins-openh264:1.0 )
-	) )
-"
-# intltool-merge manually called in meson.build in 2.3.5; might be properly gone by 3.0
-RDEPEND="${RDEPEND}
-	!>=app-misc/tracker-miners-2.99
-" # Incompatible revision for (upcoming) parallel-installable tracker-miners-3 due to autostart; a revision that disables autostart and drops the blocker to be added together with v3
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-autostart-build.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
-	if use gstreamer; then
-		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
-	else
-		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
-	fi
-	xdg_src_prepare
-	gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
-	local media_extractor="none"
-	if use gstreamer ; then
-		media_extractor="gstreamer"
-	elif use ffmpeg ; then
-		media_extractor="libav"
-	fi
-
-	local emesonargs=(
-		-Dtracker_core=system
-
-		-Ddocs=true
-		-Dextract=true
-		-Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
-		#$(meson_use test functional_tests)
-		-Dminer_fs=true
-		$(meson_use rss miner_rss)
-		-Dwriteback=true
-		-Dabiword=true
-		-Ddvi=true
-		-Dicon=true
-		-Dmp3=true
-		-Dps=true
-		-Dtext=true
-		-Dunzip_ps_gz_files=true # spawns gunzip
-
-		$(meson_feature cue)
-		$(meson_feature exif)
-		-Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
-		$(meson_feature gif)
-		$(meson_feature gsf)
-		$(meson_feature iptc)
-		$(meson_feature iso)
-		$(meson_feature jpeg)
-		$(meson_feature pdf)
-		$(meson_feature playlist)
-		-Dpng=enabled
-		$(meson_feature raw)
-		$(meson_feature tiff)
-		-Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
-		$(meson_feature xml)
-		$(meson_feature xmp)
-		$(meson_feature xps)
-
-		-Dbattery_detection=$(usex upower upower none)
-		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
-		-Dgeneric_media_extractor=${media_extractor}
-		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
-		-Dautostart=true # turn to false to co-exist with tracker-miners-3
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index fd6c495f7029..148149fe706e 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -2,6 +2,8 @@ AUX uptimed.init-r1 730 BLAKE2B 21d7b8f5fa4daee5a3807d35f749a467731b5e2ebc0e2b74
 AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bceee3bb7856e67c1010d067c06ae699f4dd0389228392d5828e1bf75636c69171e2d21509330f6baf SHA512 949baf12782d4b8a976d29ec44bd31323500de763b82601634eea3721ce9035bb9b7ca906384e2b8ebd57371a1116a95dd78c3610c27fa1d93e36b9f897bcd98
 DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd989687fa8f5a40f160f2912c21d09298bbb9c676af5387d96890a98acf3f21b60e046a9548a735ca10dbc4006 SHA512 a18cc8580a4dc7db7f4d97d70e25d76e7b98b9d328a0fa4ece4176d40fc26589149d63ffc9d2638cc35003cf485b43ae6e115aa1821c662d77f234eb3c4c0a4f
 DIST uptimed-0.4.3.tar.gz 55396 BLAKE2B bebea6559c436d2700df905b63fabd73b1c55463e8633409bc05cd16c7d110d8116f52e00d63879cfb2e0482f648bda04dcb5a1d5ff629699d2758dcc85ba53a SHA512 f9485224dfe7173bab135a87b047d749f9b61d3c29d50523126b585ae77e68837680fdb725a08fd7cad39f0b35b2da7a6923b8540700881f9638286ab5082260
+DIST uptimed-0.4.4.tar.gz 55491 BLAKE2B 8c4d19733e1b8f8ae682ac3238677e6ab24f9a5e8f948a130a2f6e345afe4cbb70e19ea789772fa9ec9c7f89fe1ea72e6a3c549dbb6e95e66c83a0a4a6966db0 SHA512 a39a3fe54dbd9373f1bf081584b16686f3a4ce742e282f8dfde7460ac156c2e189f48976fe32723468316c231ca6a3ea404ce42465460b2b52e96b7dbb92fe48
 EBUILD uptimed-0.4.2.ebuild 1604 BLAKE2B 957c1478d4812c478c44e1f9b94e638681468103bc0e6600f231bae7d975cacff1e3aed5907f5346dd0dddfe845cb5f146d8c99749fe2443e3bfc5e9e98c8a89 SHA512 72978d6e27db7aecd5d8724df5f183e7f23498358705676c1ca40851d0a72138dd8000361425f4fe648a9cdd98e9c0a86876296dcb5611cd0267dcc777b67c00
 EBUILD uptimed-0.4.3.ebuild 1617 BLAKE2B 9fc292ba43d86ba69ee0eefe2b53c93a65b7bc7a3b53c3c0a3e9f4d0c7f3690fac8b21823d5f27f6b43284423cbf2c4126153966ee79ec0270311ff1b934e292 SHA512 f741e02af02fd1b87950ba59ec96c03da3ee94a832ba4e8a9c8e96d957b84d2d9227a296b866da8b7addd09ffeacfcdd26e59a1ce9bd3589cb57f40a98003695
+EBUILD uptimed-0.4.4.ebuild 1490 BLAKE2B 57fbeb864568557bcae900bb43934fd1ceee9833bde3436561b6145bbfa3745bdf30059972f83e20201b4815383c87b046b99ea6106a989b009123a5ec0b880f SHA512 0343f658f21ea9b72d844b87d282e7b73ea5e26faf37c2ba82571656b4b2c9d31378c813a9aadf85003f7c33c5a518d9f31728469e9b8f8845e2e3c50bc4ca6f
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.4.ebuild b/app-misc/uptimed/uptimed-0.4.4.ebuild
new file mode 100644
index 000000000000..e45cede0338e
--- /dev/null
+++ b/app-misc/uptimed/uptimed-0.4.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
+HOMEPAGE="https://github.com/rpodgorny/uptimed/"
+SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	acct-group/uptimed
+	acct-user/uptimed
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	local spooldir="/var/spool/${PN}"
+	keepdir ${spooldir}
+	fowners uptimed:uptimed ${spooldir}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	local spooldir="/var/spool/${PN}"
+	if [[ -d "${spooldir}" ]] ; then
+		einfo "Fixing permissions in ${spooldir}"
+		find ${spooldir} -type f -links 1 \
+			\( -name records -o -name records.old \) \
+			| xargs --no-run-if-empty chown uptimed:uptimed || die
+	fi
+	echo
+	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
+	elog "or systemctl start uptimed (for systemd)"
+	elog "To view your uptime records, use the command 'uprecords'."
+	echo
+}
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index e3c9c910137b..cf2e74dfab9d 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/smstools/Manifest b/app-mobilephone/smstools/Manifest
index 83bb04e52467..95da4d6ad719 100644
--- a/app-mobilephone/smstools/Manifest
+++ b/app-mobilephone/smstools/Manifest
@@ -3,5 +3,5 @@ AUX smsd.service 232 BLAKE2B e02904692d7d397618e03a759a5d515c95b6c3d7e34f6e8a686
 AUX smsd.tmpfiles 28 BLAKE2B 1f7dc406901d08d362ad2ca8ad236c8d5c45166c97501d0b314a644f2fb9994e2d3f9071f61dc8d42f1d1b7aa272b1741aa97bcdffce457a385d0c3f6ec4ad1a SHA512 e8169ac96bff820996b13971f47e40550cbfa87a46f74304c4a42afe5a0fb779e65244dda5c7b3fae40d3eb0a669f2b4d5f5bfeeb576e88e04ddda812da9234a
 DIST smstools-3.1.21-patches.tgz 6961 BLAKE2B ee70220d96645f1cdea403ebcc3a199e16aeea2c11d222d4013d6ae08be43daa089f1c6b770ad79edfe783f534913c0fad547181aeeb51796f41420a1e43d505 SHA512 9d6697f64a1af00664bec734e638dff810c984de959675ba856fe4f74290bb971425c909c2e245a62bb8d1991811c79dd5b10864a0f4cc14c5773bf5e01d07a7
 DIST smstools3-3.1.21.tar.gz 356548 BLAKE2B 8bbb65761128a86200a6d47e90456fef076be10cd4081b4e3cdc9456c0176996ee6ee9afbe3d9f2a989d93db706bf5461ddf7f739bc8d70337a842b96eb27a5c SHA512 0587e5020a0318351ca99b68baa1c19411824279055857a5b5aa4e346cae373fe94a811eaca6767bcf991cf849eaaa66ec120f046420531a6088cdde9373db31
-EBUILD smstools-3.1.21-r2.ebuild 1728 BLAKE2B a62cf3d6dbcdb81845244382897cea8dd1e65f53891ce76ed7a6acb6efc9c5bed2d35c7684a9188c553119e499cba4603e500cc74ba13217208685ceac08a4fb SHA512 17dafd9a9931b5b514b77a6440864936704a09e6a81b0c9cb8b3e7b13eaf8f3116a3173c693c6db343d2ad0ba2f35fb05359aa6c6b688432b848ea556fa88809
+EBUILD smstools-3.1.21-r2.ebuild 1757 BLAKE2B d8670544db8bcf2b550f5b9ac55d9d048aa130bbf06d13bcb150c1f633a0caac59137a7273db3d3109af71aa9648afe24c984ea90aed23c546a051c070e1aad4 SHA512 ffe935326200220f4c24ee28ff1a09037b929e7fd17bd77d3d87c69fd0d90cba2d1aca38b84370c2c115347bcb5fda2c7cb80bee567c2f148ea778671f68be49
 MISC metadata.xml 237 BLAKE2B 3b569af95a89d9801550d6365d4bf1a048a58382f930e6ddcd07ce8be538234eef2629c8914a4c6142f349173775b180350d8ce09db858566d0194d4baed35a2 SHA512 bb5fbe6817acbe2a0572bc0c17a8c1fc9bc6dfdf37f1690748a99a5ed6b39b59b3a38c40ec9fb60f5b010f482e1669c3dc9f06187833a7b8287a0c52c6ae0c51
diff --git a/app-mobilephone/smstools/smstools-3.1.21-r2.ebuild b/app-mobilephone/smstools/smstools-3.1.21-r2.ebuild
index 1ff5073bc2fa..2316c15de039 100644
--- a/app-mobilephone/smstools/smstools-3.1.21-r2.ebuild
+++ b/app-mobilephone/smstools/smstools-3.1.21-r2.ebuild
@@ -70,6 +70,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process smsd.conf
+
 	touch "${EROOT}"/var/log/smsd.log || die
 	chown --no-dereference -f smsd:sms "${EROOT}"/var/log/smsd.log || die
 }
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index ca8f9c507ff8..ceb6e067db1a 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index e6f06a33ddfa..77b6fbcd4445 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -182,189 +182,6 @@ DIST LibreOffice_7.1.3.2_Linux_x86-64_rpm_langpack_xh.tar.gz 289680 BLAKE2B 7546
 DIST LibreOffice_7.1.3.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 1048753 BLAKE2B 12946d48ce5a3525ff7738dfdd8aeec552c593aca890803aa17f68ab9331220ae3d7b89950881755e1b80035fc6b9f0c24aeb665720f8b0ee0f1118bc76dfee1 SHA512 a4d3f1e302105838736507bb0fd73ffc636350722636dd174f2fb69242053ac0717b20808cdf79b44e9b2458283be32e508b326a9cfb2732f249ccf4cad70785
 DIST LibreOffice_7.1.3.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 974883 BLAKE2B deaf8359cd219bf7d9388a256d5c5a5e403623a14a46501c786251c4c72e90e2c25a51a5ff8c10fbe98ceb2c8bea925292e0ee5ca7747ec24947b82297d1e851 SHA512 22a84664caa0e2d156e5585ad67d1746f7e63fa10b01108baf0c02fa6ef2fe3e907c2c13effcb8c7cb6bffe499d485eb07bd72cd24762f5398ebb21f9e2398dc
 DIST LibreOffice_7.1.3.2_Linux_x86-64_rpm_langpack_zu.tar.gz 319472 BLAKE2B 4bd5a8b68f1bf6f9a0704207c4e8c00d560684f0539b0868531f9374f73ce9ae7c1eb2dedcd2822b328e5068cfc0da15f4d84d29c7fcbed53f0ed8c09ac9acf7 SHA512 18eae4a6ab4fddcf600a45b5e98bf5b74c203f31b81d4292f4fde4659e8e3cafd717ada160ea6da8ce859655e749651ef1dab2c804af8d9d48736df7650aa442
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_am.tar.gz 4126949 BLAKE2B 42c71c001fdccd041c6d72a7906998f413cda6341a9050f8662f42948b9f22786f4fafe9c3b783a17eab5cb380b03baff46c97be9fcba600f28314f15c11683c SHA512 fde17b27d9042fac59b9684515780805897c4f2bfdc9dca9f92337627be638fd886fa75ffe8b4c7f232ca2840e9b39c0d4fceb45cc26faf78528c55348df308a
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ar.tar.gz 3598466 BLAKE2B 71a91901c7e9278e881dc712c653f10f52a31bf6c50e3aea46cd6c65495ceb1e99db4bf71af1d0c0e4d8b856d77e19095298c66acc3dc579dc671e582b64ff5b SHA512 1267a1249474534e7b13014e778233658b516d781eec57d38a72501011a0bfbffd53386be864dc628f70d52adcef6889950ea2ae0fd663fe1ceba1cb2b8975e0
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ast.tar.gz 3837112 BLAKE2B 5f31fe2f8892e66a576feaf9ba515ce0a3abe365294b80b0554784c8fb91f5996edf1441d28a0c9b5d3dbc188af799479824ef1e3cec7db9d0fcca5bfe9846b8 SHA512 9d0b7776f22a8c66a54dcd59a86029968411e58328de492bdcf13529010266c9a0c050fb6fa8644f9f1d08b960f59a7f8983d566b85848147ef53e2b0430a17a
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bg.tar.gz 4167486 BLAKE2B d85a0c86ee23deacaf6e6287a1d2725faa2fce1b43c0e38035e9459572bc5f9f2c5282c8652e5de28860c2cfd84ddb506a1c6adf7acb4918329cbebff9712198 SHA512 cc3875629591c5e83336ce1ec206b2eeb9703da83a5b2700fa6c250f2d82df32cd25380b4ab8cf80b22b5c9b67d407eaae17878a279cc629abffbeb3fc1508bc
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz 4303274 BLAKE2B cbfd420e870500d1f5c069c05f315654d3f48b716c2611cc84363dfdfe8f6224e9202a26594e3b50231dec002ffc2e52cc6713a583c7c82cdd9f83b321d47330 SHA512 3aef15e70f16aacff0d80f34eec79b623c4ca5a8bc3b5e74a8e49c60ff201c85f66ccb04faf0e2fe70636be918d3120a6297ee137417298eb227b186c9cc81c0
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bn.tar.gz 3980813 BLAKE2B c7da3972337ffe610a1e2be946ced8de88f63c1f6bd8c2b0f0a29d6111d969e945ead5af89f7ccae9f0584ba26ec6f0b69a23154d1f4dd5e1bd05d91089297e6 SHA512 9b51cd98f1de14282c0ee17e5d12c23c9a2a0f693d7b7689e0448a76cfcaa5422a11b3244f93a249c3a9fc87cdb3faaadeec9802d512acb39990d7079fafbd13
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bo.tar.gz 3989839 BLAKE2B cb2213e6ac58d1a7e0bad2976d8e4790910e06e71a0b150716977184d4ac2b998a73ddb32cf21bc64c7e014d3707ddc93ca8f3fa234b8716a6488d48c24b9d51 SHA512 70b184129a1ae925f9bce154787fbf93c657e71e7eac9a430e3c2132ae1a5985b1e1390e4cae11865617b84d2428d60116659ae703281d1a4dc0d84711abb610
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bs.tar.gz 3721217 BLAKE2B 3293a3fb57ec8697f57e89858148d8c339f181e29afbd6ddcfa3aaa3fc1c3406cf2b8bd9852ab2606d155cee4f51868b4874770e613968817a05cb4459c4835a SHA512 257f43917b3d595c7adce515a91d6c6c882e8cc55c0e3340950c86162709b278b0aa7d7d69257d441be37ed62b9f74ad5260684256ab6c7f028d61333527117f
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz 3866204 BLAKE2B fd8db18cfa3ee5ad6c3449ce59bccd900d603c4a9fcea779671aee502d3ab3985420c4ed9a7becf1ac212804684cc3598ea10ef64c0e4ff04513ef918fa39341 SHA512 4f4a73a143ca47c07da22821cda8aec6407936d4a4e48d7114919bd9c67b5cecb2416ca2e9e36efa7c3056265b2a4ab088da04c81077bb37d174c06f2e0d457e
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ca.tar.gz 3856444 BLAKE2B 94a2521d3ece2216695101403e2e1961612e9c56b772d0468c9305bc0efb64e0939c4253e3ff2a5a3da9b5a70deb6bcd73fd26caa1d82eca61a2ac54f585ea6a SHA512 a410d1b6d34dc20fe82be7669d6643240e6ecdb2aa8c554af2e2e41638aed19f73c10ea2996e36d51f24ac13e87d73fb47a2e22205eb36d36ea5680d072e0214
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_cs.tar.gz 3880462 BLAKE2B 4a4d0d369cebfafd5914d6e223ed9610eb7d3bc277f8322a82df00558b9db621b20e23d36772a14d65ad540a9e4b80730d4155baa22abef0221de3edd6e4512c SHA512 1a93d8e95468e24802694718cf95cdfb451ed019e09724430758c30bcb19e0fd98a66cb1052095b1204f16a34306299b8fdfeae83f8e8477b7ea87008397e1b6
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_da.tar.gz 3784436 BLAKE2B 9b325e32d840bbdbe3ae9a553af8214071ffe21e171368452fd172c8aec9581fe5f381d712343c97932268c0726bab7ef2982a6739b7d2149213ec979cfaab86 SHA512 7074830b7ab252ba99da90146d2f2bb0771804323e070fbcdacff44363ae7b957401f2622b3ee72ab1beb8f0226f7971406cbaccca3fc146e1c76657b39e3a80
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_de.tar.gz 3952660 BLAKE2B 3287c681f2870359eea6aa23c3885a21fcbe939db2db51757cd1bb7cabe4667f274cada6ec4e8b07b868ff2af9e01c6099bd9ff00813cb4575df6e9b0bef9d9a SHA512 998e921e066a416259312c33da0ae9d555d0c85e1d68d46f8cafcf4b560332e65c44392bd3ba5412a0433e560980ceca77d5479657af2509f3d47e92d36b0b25
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_dz.tar.gz 4137317 BLAKE2B 306bae918500df431fba7f06ab73594aec0a169182497871edbda555a9b70bf8b453f711fd8be52dab690a9875a75a92dbf45f74189d01f0eda794c762245345 SHA512 a2f9b9459175aff72546e3cdc76224e9f0d4744b29360ed5908ff2aaad231ebd7cc1a7c73a868faa5b8cb3f4797073e4984f764312f9aab2675cc0899f976374
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_el.tar.gz 4591286 BLAKE2B 0e3a19d1e816676191806bbd360ac6067460321c624eea7930d309a428e11206b08a7bdac71cade6fbe0c0e32825b8c8b6581a6cb49d5eee2a8f0ff3b0183ca5 SHA512 c1f1844ff0ec56a6e24fbd9ad4bf451296db69b697b13089640adff62fcb0f41b8dbec406f25c8b57087c3d54b2d14074934749da4348595d9697cec5c680196
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz 3607686 BLAKE2B d2715788cfdfbf1b75ec50cee2fc0c52cd8fc75d3a317dac841ac11a1ca90eae5c9ed928baabeb430871bf9a3f347f460ba5688c29636025a0c720b92b9f9d56 SHA512 3246242cda5d5e28af2e96f00ed05fb9331e90345feaeadbbfcb223fd2a3f74dbf8e48f1d09df51d771847cad0323b977ec0c2fb490cd528e4a351b430e1aafd
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_en-US.tar.gz 2286755 BLAKE2B 857f84dbbdd153a8d82ac163a47fec884073bc2abc54a90f66a296b19b4088676756ef2ac114a0ca81d890bd113c9a95e4100a621f0a077ce30ea4f42b821e29 SHA512 8fa8487053014f6c73cc73fe401947fb14e4092c3d652795da7fad84f260b13ad0840b2b57d6f00949829505e0a4ee73f8f0e4495a4704144a3d5c22566bf9d2
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz 3600130 BLAKE2B ec385b489ca446820683f60c27aec591dc7379869d0d8aad686aa4c12d568a400b2c134402b1c28c875c4ecc6f488ba8a7e94e38f24e0035fb4e3564cc693367 SHA512 6168321ee2fa62f34c9d5ec16efdcd878e71713eb56c4d7e08a93f2c4ddc824198cb2376a175ab6beaef7e82d2007b444530fb4901fc39c963408736ba941e58
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_eo.tar.gz 3701417 BLAKE2B 9b7350b0c1d8588855735251a2dac3bb10def03341fbd80326813d8b6cc402d1db2e6b39817fe71277519a73376963926ef765b7ec9d8b211fab58c8310fa78c SHA512 38f36938ab125c5cc16ad61389e539bab0e994ba20f3b9f1c8141a1126e185d3a4d33450c63ea77468171d142edb1b782e5ca1d47ceddcc365a044cdc4cf6997
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_es.tar.gz 3899143 BLAKE2B 414e52898f881c963c1d47f584b2585a8638a5f76785d85256233473b8a741eee0a2f6d31926cb23e3c94673437de3eb3ada4f545b009602720d26ac78f0cfa6 SHA512 71e9071115fd1cfa0be3cb8567ce2db2194799bb6c0b62ca13d9aa9f2a46d3fa221dab321fd47631c28f638e50243c3b6506abd84e5765cf3503207ff691ffcf
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_et.tar.gz 3744538 BLAKE2B 350eba3dab02ace022f24241923e308bf828e5710bcb11f0c96051bb731499a4069ced42388e60a3351e33d7bc81d1234d53d8202f1f14461533ee7fe0207afe SHA512 e6edef378b806081f0d52e44cff4dd6f05284bcb9a79b0b89cf22f06789d706208ecd46351c7ff97948398441b572df9af3e1d51c99c0cfb8e5fdd807560f5a3
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_eu.tar.gz 3727863 BLAKE2B e124c21d46048c1a1465be06a2f6c0a19aadf2f000a47ce1599fb0b8a8933418fa79a394aa8620a0f0e2bae577e5289bfa098eee431aa14f138e10f1a0d013a5 SHA512 b8e48946845ef108614ec4e0e531675b0de7d49f420f31601ba1216942245a9afae2168ac487eb4fc0df4f20dac5df8393f462bf36faa974e7c506676ec65f5c
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_fi.tar.gz 3750808 BLAKE2B d25b5acd9926f349ccc9f841a0c8538e7ce2ee6ff2879c6f26a31655bbcac3e8b65bc9f164e822a6342dc768a8ab21f39166256ef0619f6a569a17d0d1beb282 SHA512 a14158f036544d4f69023d177535926031d179a611ed4eef99ebb4cb2056a2c55bc819981035aa125f9e6d8884e32b44456f02706a307246df3afb9122dd5f18
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_fr.tar.gz 3883057 BLAKE2B 6573127798b4b00d8b148d142ee265c5114a3409088f0c95f8dd0f8285f5ed6e59f75717a206550df0362bf8d1515ff42291b8a06bf13fb0900d6cdc691efd52 SHA512 9368c46523ed82614dff23abfc1657920d78ca148c5f4a349a7bbb304f468cc569142566ba13a71155632874f4683e5fa233a9ae1d8eff7662934b49000b592e
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_gl.tar.gz 3835848 BLAKE2B 6c41866305f982706521e10ec05f8d26c979ac01960fe270cc85612981f20523b6e7065d772e1c6d8b78ab2400f1edc6409cb5d110a70a1e59d46a5427eadb6a SHA512 e352a4697392a2ee5ab51a7ef60ccac5bd7ef1dc0a91e62d6a2b438674933640342e9ae96f23ce205acae3451a246f1b8bf4e3a5f10e09a0a1bd6ce780ef753f
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_gu.tar.gz 3687764 BLAKE2B fb4d4e140c10909e6a863af143a09b7a17394e7775fea2c76ac4b538fcfdef24221417ed86b16a8c6d7cd77c351b0e487c7ec3e2f7353dbeba9ed6bafea3b254 SHA512 15cd5387bf41e68674450ad389326e6d40dcbd869dfae579ceff0a18a6a2004cb3d5456be60d53efc22e4a00ae283ef27b2d6f49c71670a21b769ff4e38c63a5
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_he.tar.gz 3460416 BLAKE2B 73e68b6a4ef33cd20775c738b1ac565c14a381d30b3ed92211cd5257b42c68bb0e2efc76f4e42f5460310da3c88fad8be282f4ba591545a8cf17c13709297d56 SHA512 3256deae1c48d8cc5a800c1b90616ba627024615b9c549f30d1b04d5e3a75be65da6ff2acce72d11300db8c1f453a4364ea68338563ba1ac2a45e1a8a85f0f7e
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_hi.tar.gz 3815810 BLAKE2B a93ced371a499a5275341a222b40dfa1fe2638f69778e65cd9d47e04c18bd99b83728a32c95f1fe7013fdb0a473bc7064779b2b6b79e0f0712c8c81e663adde0 SHA512 ebde14c014eb16e30d4d5310a261ed30f9a8109a764436e6acd2584f05a431236eabeb708fe1de0a96f9981d7f24ab745b417f997c251ee80d820de894b3c9f6
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_hr.tar.gz 3726551 BLAKE2B 4469c546550b8c6349c9ff7fb4fd0b67cb792eba18f00797f7314eee4b2bb499d9f5f19b2d2ca79a511f790591cb4030278fc773432f8c2ba0233c5cf4e86a92 SHA512 5bbb23b2dd97e2d093c3f6d072f9b3b6d86cff885edd883bc5c7baf900111c718f65c6fe30fd4c4130304c9390c8826c90e508a027fbdf4c2bb8ca2d303fada5
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_hu.tar.gz 4004434 BLAKE2B 3f47b1eb9a93c0e9c9e1338a160e7842778ec554f73f472e86b209bb91dd7c9abb2b5f553c3ee5478eeaadc0fbeb650024f9f674f35fc4c315305a935c7507b2 SHA512 0c190f0ecf0dbeb4b2f0378622343b565f654d638b2673597396579b2871a4b56ce3bc2d68e55de6690e2f3d2f0a825c8f633ef8ecadd1e8944702727209e8c1
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_id.tar.gz 3682184 BLAKE2B 7babf21894660f4963dcac8a603411a4dd910838db1a7a2c7c1a5e87d1141d41a64ad941acdffa03f5f6066acbf5d94c50be273445e8ce75ce21f2c26f8a5a01 SHA512 fbd203f0436853fd244310e6f3264cdf53f460efe4dec2f07bf87e2c2fa5ab967f3b8ea1b668aa7458d18e722343fe1dfa249fa59419feee4e1cfca3d3b9d73b
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_is.tar.gz 3744084 BLAKE2B 1795f3f5a03e7609b82e432d527d671b34e4619720812f7a632b80dfac2bc174fa1f082779d3512483353b695b42839cf508bebc676103988a1542a722db0f57 SHA512 336fd61701b5ad63249b4c422a007c73550d063fc02f3597a2546631a461639d9f1075fcb69cb320909556bd7db73b6a05cfa42472731654b0ba1ea56761ac63
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_it.tar.gz 3806210 BLAKE2B 31cd4a5c00e2407120aebbbfef28a16e5145f2d96b2224b3ad80905f5d215c75b4d2ef3b0b9a51e06570d0317898fdac829aae315c5155a21083d6de4686241b SHA512 b67b8c8e16a2f92f2bd6b029eb30cffebed376eac52927b9b77599f8266c61e6cd9dc84815a219161d8f14a0ac1943a0dcdcf963f7ae8f4626898a7c7c876e60
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ja.tar.gz 4462854 BLAKE2B d5d35dc794db555810a39e9a7b1130b305b8dcb659ed63e0c8cf9da7b07ef27b72a8c0e5b323117b28e33eb46b6c764e0e2df6d8d943f9eb1d86e28f8a9acafa SHA512 6f40622f9722969ff2bb67b08ea87108c5f2e7e04b9338f7c17c7a9d101691ac55c491ff585208dfc9fa5af89f725870e9e8ebb709f8416d50214bf175cde6ae
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ka.tar.gz 3932296 BLAKE2B 0642329dbea2d25dcfb3258f5affe705cf515da1fd3e6d682e83089a595267d0a4c612931c7d0867fb3701a6bc6dca6e809cbfb789b085080fb477aa2cc9c6d0 SHA512 ed48f406cef09e71ce7b54a585a7c6ca2af970f6242e23a0e6db67855d2a7e3b515fa0075b4df4e356dca412e6e256fa15d70e6b26b0c19832e384e92f79f943
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_km.tar.gz 4268969 BLAKE2B bffc6fc9cbf0c84afa4ef68bc0b39cb3d70e0f23bc9bd814a8ee14965508c3e299dca5e0c6c37ca8d09127d45a65ad191cd7dce5523d03ee41e7e7dace71eba2 SHA512 3568b1acaaa1bbd271a29493595d35bc2e8869635c90c231a6b899f77263b81713d8591d78a48ce44a4316c1c2883502bc998fee55611b3740844777ee1a2e2d
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ko.tar.gz 3964617 BLAKE2B 3f9996a0a52d56c33b18c00a36b25dd67a781e4fbf6b66534cebd036cfcff2fb1ef9cba07182cff84b438db233394a4b319f41315e92b6c6ef8ac5441556c2a9 SHA512 14a5744e7c6901bb72ce21d844ac6549fbe37a83607f0e221c64ff0d6af1c80f7a691fca5ee622a347f5b4f5d1cfb5df157d6ad4b334777bd8048872f49dc434
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_lo.tar.gz 3685593 BLAKE2B af8054e3c55261484e4bee2567db01eb28fd322861132cd2a905ce62c4bb58869163d09282338e8db75ceab2df61a1eb468e6c5109860be428f7763e984cb423 SHA512 26c239e2b018b73b916837ed47241a47aef20b97b21fac780e89214c6c98c68bc75d5a80f74150f3558c6a8b236881c4fc3db04a4ea6b53065b0541cbee0c163
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_lt.tar.gz 3902673 BLAKE2B ad203345c8bc6985e37e32aa489f956cae74e627747b75dddf38d74e78457396cf6e9570f3cd28ca7f1aaa5cafeefd96f0524f88184c77e392ecd9f020a15e28 SHA512 ac55e74e82f4e76d73158e6cdbd83a05ebb7ab8a30fb8f9fcb67bae9efe347dff04fd081fadecb6d6d927002eca62486a5314f6a09f4c846f8337bec1bdb77e1
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_lv.tar.gz 3738472 BLAKE2B f65f86bcf712fd462de9a6e4cb4d9755c51d8a370e02a9b232041611fd5dd4bf689c3820f539afc5f2ca762b2b8858b36a43501f2ef2531b53fa7ea3095084ba SHA512 a4da2aef46bb6a9c91f2898e50f1b31687ee0329463d8a8d8c19db4b1482613f064efafca2c71b374051db31ddd0baa8064b5be73bbbc3a6aacae227e69e91d3
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_mk.tar.gz 3780203 BLAKE2B abed3bde264e7de1a59572fb06ed57b8532ab1627e88cd35c0b08238dc5db78a115b42c94f53d9fcdb11378dbb93ff4cceaf60ea74b13392dd60fc372de76d00 SHA512 995a83cc32d5b2be77dfdce5658391c952ec38d6a71ecbafb729fca995400f810ebd2e9f7068802ca0fd440854c5c1432218dbe1c1473ed3cf57a6cd4a869d8d
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_nb.tar.gz 3742525 BLAKE2B 34da21671b3f9e3b6b9d39aae562fd3a1bc18e6e1ffa2595538e7399924065cbba9016e190c84b8804a35b930a380979c0a40257aedcd992b3f685ae3bd6418c SHA512 e5599263922c26663ed094e44dfdfae90deb9172b9f3ad9b5685ecbbcc41895d6568fb60ca61044b96553ca825030840a4058c4d812e7bd1faaaddcf7a3c331a
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ne.tar.gz 4019457 BLAKE2B 9e46944a9553a749fce18228770f00a889f7beffb0e9f101e6be5c41207353ae26294a368fea04172b6c64778802d457d0d3b0051a0d40b43b2be29bd36d03b5 SHA512 2841f1223d39ce2d2578748203fe37a744bb2b2c076083ada798e34370668d79072d220900b75f89aba87367c1fbd8ab83c534c8d5d5563ffa2333965e8e20f8
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_nl.tar.gz 3849602 BLAKE2B 5a96826a6ed57794f153da76d43c542cd8838db340268a41adbf357f1453a54cc6732e5b74d90dac285f54394a2ec1429382b1400726fc3dddcbb9f7c4331a86 SHA512 f7e70459c9e55d5a27e6c0a49b4589bf7c6b50e0fae788fcd5dfba090706482cc2c8b934ef81e32e782f617105436573b1855691c641f3d64bb9368ae1041279
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_nn.tar.gz 3895520 BLAKE2B a4a510cd444ddb3e89a735275aa038d54bd6183966f9d47b272f52a882b9191b446624e5d3a10f664d684c326fb2f0c9feb580dc1e3fc68992469b48da5d1187 SHA512 58fb560ea9483e8e3fc033828e9fc0efb9fba55a4baecf01b3fa525ff394f704a7265a1eddc6a441bb3c1f5b10c46d702c5f12ba71962f65dd36a38125b874d5
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_om.tar.gz 3791708 BLAKE2B f51117b57ad70caf088e0787cba21fb7272a5aafd6f6dc95a98d8db34af8e70b88afb73ae4ae5576d47658c9285597a728010d0bb5e804243a17f272e82f80d3 SHA512 440f9f5abcd0576bf59ede0d265bea28c8464f3eaa59fefb1d7c2c08559f3a1d4c2bf37ed98b36c7302a01e22d25368d9915455be4044e5359663a96cd67d4d2
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_pl.tar.gz 4034909 BLAKE2B 978382f10b998070cfba36a070b707cae517138ab613cac9273fa48b70601a3937228437705b1fcf0873305af309a09d9439bc9c804063468bbc17431f40f8aa SHA512 7bb6097f6d5c04be9b00159265eb3f6eca6917a88e48a034d7fdd2debeecc30a8dd9085fe6b1af9b4f153009828345d42bb2501a59ae00e5d6255fc8387106d4
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz 3841985 BLAKE2B 7cd868b774fdb647dc63c706d76c782396418e5d47818b1c703da08c21124012cc03e829e51977dab3e5ed57b580b742bf4436a7aceca38afb3049d214dcf1a0 SHA512 7b43b62328b27b9049a9057453e6acb110259608a17166db740a3eee0db49b190a5504e3f31b0ecf7fc4fddb6ac2606d68ab03cb26c4f78298c7e042e9f8cdab
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_pt.tar.gz 3830145 BLAKE2B e9c16cb5fc9c17ed3e320b866c19d2f5e59679a497d8b3bed821aa13bf454df00e5b4a39c53a9c1a6b25ffd6f74323dea19ca4b55152ea9bfbabdb7a00ed189a SHA512 6ead2243fec56c2d7d10fe3811e0cf83a3ccb60cf69a490977e314c36849c89567bd4824e72c05b09fda7f49897398c07b1877b93b21b87d0aa75b1683e1c2ab
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ro.tar.gz 3634673 BLAKE2B ec93c797e15e4895f70dcc08101b79929297dcb2d528cbfe904738bae1eece9f3adee0339cfc31d79f853ff48ee7c4c19992edb1e6b5f2ae9fd0162812bd2122 SHA512 3f8e71bd0128f8686c8b31c8ac070581c97b7042638712532687dcc7bc9af52c8beeaf4e526ed9fd39328178e2726c1140df9a566c15d59f759622bb43b76db3
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ru.tar.gz 4185371 BLAKE2B 05190840180dc9dc24eb326b602267f25eeaa2965b6bc5f494b9718850dda6dde590bf96d4bc8d2dce4b8f0c165481afaf617be78d0aa5f28ce9a866bae4aef5 SHA512 302a77e0297d98a1ee3b721d0b8e4aeb12113708313f1e7848211aed5d4668659740077c0b02db578307c204e3431c82413b2d2ef884339399ef9552476a0f3c
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_si.tar.gz 3916639 BLAKE2B f295e9d3e000d0436abf0a1d122a4dd22c184d5a3a9ee3f8ceba7fa94fcd20196169d6454cde7c7d2f33b67d863b386c307ac360672d6ff64499f9a290922a14 SHA512 537dc0109ced52418073189858f4ae79c16f1b41cffd25def6a66344c7b317fbb204d37aa1cac49435d515ceacc2f452a69d9220fcfe54f97ee84a0ac9c2dd5d
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sid.tar.gz 3780732 BLAKE2B 08aa53c6b8230c9bb39f852ce6b7058dab0c2a7f3171f099a5af0549f08144bc1d9a2bbba50ae311a0323a70163460838899b3bbf8d94eaa21339f1a0f52513b SHA512 c8e0ce887090698454e06b1c1721de053c69dd31e355e3a5041534b6e4c45b4eb22732df50676f75d001e1d733a21bef15e5272881ca60d3fed7005d5095f286
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sk.tar.gz 3939265 BLAKE2B 9733ad69ef96e601125c87bea11c8adaa75d4e23c2557b0f3bf6b20c3b04002429138b70f4d68895a060cd076e06b2665eca28b839ee381d18f05a65987d17d1 SHA512 8021496fa04703ef3b58def2e5b6928dc231885590430ad0bd2080af59529678fb78361a3a431aaf757f55b9b2fe682c53f712ece6cd54e18b7ff11de284bdc9
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sl.tar.gz 3795197 BLAKE2B e30562a483da372fda72c58fc4b407a118f04929965643a79170190fb0f5944740b16ede1e533a791e62d20f2bb7f2cd6d8d6d9ecdc164479292aca1673a0429 SHA512 1baf39fba1062ec21c5c3cec8878723854e184f01278a985b768112bf9c4f9910eb6724e729b68d36eae3121cff2652939e2e1046855b181fb9cf1c0db6fecba
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sq.tar.gz 3695165 BLAKE2B 6440c512c205a60cbf9df94c3d93b5471e55abe437b9acbb1ec4bcf667a14335964adedd8aef00b5ce8022aeb075c138f2a7de5982a8d60aac31a6f1b5c695d1 SHA512 16a5bdab7d7e4b99c4b866dd09cc90216b65f0a15cb63804c448d17d1d87e597ef5390f80c3e8f97b380fb7d11d597224569bff1637dfaa53dc77a961df30791
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sv.tar.gz 3782674 BLAKE2B 70c385f278a61e1f31e2ee53c31c2abe771f02fe16eab3bbee78317259a1dcb34e09a3aade229ed517406557dadddbb9ddb30fbf20de0ab8d33738ba16a4e9d0 SHA512 e6a7dfaed0cb08accbfb439e0019766c95883e1aa94c8fc12e2479830ab2c2cf358a62e045aaaa1c9c85a2645f575192fa4a537720a55afbf0bbe232f15e354f
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ta.tar.gz 4128995 BLAKE2B d018b7e44f6042194599e5c64d95b31c0cb08946d4400565dda12d1d784c81ad0dcc622420aef7ca266e8c111f9e48a747d6c92eddb04a9d4fb209f03986d0f5 SHA512 0fc8c47ae181c0222a46c8739031ef0e851823ad894ebebce7952c4dcc4019481f71c6a23550cded28884aef9e96f61a812fb1727dc9d481bec28464b3144fa4
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_tg.tar.gz 3750564 BLAKE2B 5309e3539e0d1c726ce4ff60413b7f0dd43fdaa569dd5ab14f2bc053ab5334121781d9a224e87b2554f92ebf8b83b747ca44b7ab5292ce7d3300bfb5904ff092 SHA512 909627162c526ac7752e75c720e362f8fecc508dfb0cec1d8aa51fdf6096683cddfbd2431c7eb19b34f3166cd00622cb63c9f9fca087e367eb284d995c3a0ab2
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_tr.tar.gz 3847950 BLAKE2B 5ae5181589167bbbf8f15b2c5a34baeaf0215a0d5a384b26c51e9c1d19ef6725da664348affd96df66cd1cf939b9479b22139ffaa2481d331faa129e882353f4 SHA512 b3c1ffcb12d18bf4facf4c8b83125aa729c7f702a0f48741f16f6dc8f2d180cd172fd9065bfb0c8d4eb41719278a906832b029811c77af84cac7909b53881670
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ug.tar.gz 3862480 BLAKE2B 90b2bbdda19cc71c64a26e76de0331497718c70bf7751fb83f6524f8f64650db3a9c087e22cdb41ae0f776de420c30a5531bc1b11de211c30758ef43d284a16d SHA512 d716f6aff824c3cfbbecc7341990282d27da35dd7c6f67d4f19b6b7ee1c9fd7648bfa6ae360b65668a1a1db37b2ee5045bcc925531351ddcf1b58a1e4de5956c
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_uk.tar.gz 4173833 BLAKE2B cec60bac6d40c34e5f3932d8c943ccb14b24c7eec97a8433c724a549b901c1f3788f77701a1f7e145cfd0c28f04a83495483f00656c14e871de1deff1288e4d9 SHA512 f270ea6e6350df9392a2f97df859b5dac84bf53d8162f0878dddeb09ee7f93d3788e3eae8fa428dc45c811ac0577918b2bab6d1346bc6dc8295beeb882cf0e37
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_vi.tar.gz 3824361 BLAKE2B fb0bedd3aa0496d64e44fb8ced4d123625c2be0878e559bd80002f15c7af6645844b4a6de000247806982b4af098dd2743a34f7ef57d85053f408d386cf857cf SHA512 7166a5fbbb31b115d577e8ecfaf05d590a78b01064871971600bcd0386697560af58f135a78ef54bd1d076e798b2588878f783132147c4f30d22cb5417d46693
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz 4091429 BLAKE2B 7f297dc6e9f8acbc8c2a153745ffe4a352a9b1dc9c37d22b346ba070852833a5ed1203b5be7961072f06a8162776e8d71ae1bb9fd926db7a722bef7b278b7283 SHA512 6915a60debce07e2dcb622c968c4c16e751e1977bf449470d23d55d6117e2c34935db6ac47c442a730f5039758d9052f968bd992d99ec52cdcd8d6d63633ea88
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz 4208143 BLAKE2B 99f720c3da43c9f91d40214f174ce4367e0444f9b218ed9e3734b6ccb9f6bbce12a52af48aa2f04bbd80ce1d074367b75824a3cea0b3eecd868dedd6d13d762f SHA512 b3aaf69ee647a52a2aa742ec84217642d5914f9b2a6623348a3819d4fd1855304a19805ef88e3b7e076f4ce129670b6814f6ca758090fe1a25ccabf376680a8d
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_af.tar.gz 1487025 BLAKE2B 5bf90b27276452b20ffc37f9aece8a0d5581847ac448dbb5b5ba897071543d2203b5c64d2f3ce0f8926200599625a4f9d93529c873fa4d26fb8003da63c87984 SHA512 c4b8d82adb200a2560571dc5fdd3b717a992fe4132b69ea72d3ae4700bf969a84a526a8527706ccbf63696e8b169d584d0e188a2370d2ba759b865075ededfa8
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_am.tar.gz 959518 BLAKE2B 02bccbc537de3db468260788c13dd380ac1c4d46815edaaf076dc36f3779425f6377b13a7e0aa2ad027f0e3deaf25f7080808cab8c71b68405679ea2e5ad8327 SHA512 c90663f7e3808d31a488052942b65dee7c2b75c51f3e35ab9cc26f1684b153c2cba17c07e8e11dcd6881738a861b3d0f462be28f31b8752142a936c29ec5f3d0
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ar.tar.gz 2445374 BLAKE2B a676386b2dc1f29cbcc342a6ba81efdb55a444a70dcd36ebf67f4d44316e034c1feace1aafb74ac077bd4186e198a464ce8dd58bfd38f042642f7ba8b7f416f6 SHA512 7bc1643dd6f95f4fefa1233638db2c29e404624f74c1a9fd0a99f600319f32f1caaff6b907b26339d78eb9fbca2b3a193f44bd4482ce77803df23e3ee731e05a
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_as.tar.gz 524195 BLAKE2B e296ce817cb6ac7715504b09e1dbe6d24f45352287eff1cfd1db1aa76dbd290b937c7cae4e9e6ec6e7f0a47a28113b43abec21e019e4aac24f8dbdf4c840e142 SHA512 73a6eb9200d30805a3d795c2c1acf984e3d1c092f3dd990e253b1571260a7864a442f5d42113b305a2f00c4bc1a605cdf3f49f2aee35518c040aa71b29e0ea96
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ast.tar.gz 573383 BLAKE2B 66855ffcea4b4a7b2ceb3f3485d1988a22e94059e956d5ec1023ee5d9c5794e78e93bfb93be4c9cb174c8452aa20e7b5db5e604fe92a747d740bb343b6fe19de SHA512 d79cd833f8a5fd1e8a1b1692d08e3615813e08bdf2d1f8b582942f5ed16e7c1cfb445f667bcef30b97162b0b24ff28fbd18954d50d40fdf3488e4c0eed8849ec
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_be.tar.gz 1051569 BLAKE2B d4ba30f8f6774edc65c85ef4ddaf008c41b7dfe83584c6223a37f060809fe1f085b6858a947efc62ccc9f2103f9c78a9045c7fdc04b626481f831e2601e06186 SHA512 ee1ed14f290416c64261164154130b644f1f59fbd6c0bc1146a766e203ccd20fb3a2f3ca7b4430b9e96c859003d8efc0793fe1ceb89ced4dec92d88efe4189cd
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bg.tar.gz 2749202 BLAKE2B 57f8ccd57c4abe48be6463520922f556eea3b6c1548a020f457f1a712af82d2634fddebb15fe71455590a28cbe5ea6d81a8438ae6fe68f28c08ad9bec0c98ad1 SHA512 66647195a55bda65e16f7e075b81543233526b8de7866b3ee37a8bc3d46b60e3176b102fc33a8fa3173e68d93e15dc26abef8017e71a2354ac01da74eabc3331
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz 724981 BLAKE2B 894be8deb0970ce4e6b0af6a9170a0e907410936f0c279a3dddedbd7713496f93c3cb81c4ef54f4d9310b7cf4b51e29fe432b42bf0617ce452d710c7d7b71c7e SHA512 6f203ac3fe08351a0661ae9cd65f0f240f220445efdf521cf73980fce8d75ecdf9923ae624beb5a85568e55d2fa644f97a7a99c376b6127497f1108e04035120
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bn.tar.gz 879965 BLAKE2B b73b4384fb45ad1977287e5a7bc98eead59d13caea1aa9410633285f5641ac615b613b3627c71b1651f6845b4930a9bd179e55c0507f946b6b7969b685acc141 SHA512 f74145dd36746fcd5006b783760eb1d378a4fa43e342ee1aff3b5e3936fa514dca697f0e4d45a24f6465e4a3f775245f89164ebab3a3bb5774c682f67d437f2c
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bo.tar.gz 458438 BLAKE2B 6f16c037697d8cc6340d96a515a705288b6ad146e048c16755b5508e85811d7ce5f463ec417b628e6680e60045a364aa99ca235be7406b786643683f845ebd04 SHA512 20d591aea84360366fcfa0c525ff5ed931fec9d43e41a887b540f21d3b06c6b888cfcbbd3ef5726ad77a2ad4b81434d8e6299d54aa22dbdd188a44ef82b13a00
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_br.tar.gz 1519561 BLAKE2B 4545ba076a4a043845446516e836aed9b3954ed015e98acf6f3de2f5da81b24758cbdea771c0d0654b6bbf59d5dcb41659c192fc0cc6e84300c7cac642728d68 SHA512 d165a0a7531b72ce1af0abfddf99a937e91447e0952ff153ed9bb3ee56a0751ec795ab003fd4c04971e730aec005cd07e7928dd2684d0f3871334ca63d435dd9
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_brx.tar.gz 336042 BLAKE2B 69167a75e2b00d5a5b65525beda054c7f5bf9d8ccb6aa9bc99b6f9930da792d8f005f8e3d5f311e8455bc4c34b7b86db6349016afbb34be6444792eb4fa4973c SHA512 f7e386e15e7268ade99eae124201a2e0420d672077fabeb8719cd84cdfbc1535e38e4a22a9fdf8e1c8fbd54917479614bf916bd0c3f725acdce0c3c5f56ec040
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bs.tar.gz 672656 BLAKE2B 39e1321878223e8eeddb5d16295ef3f8d774daffe6fe07a14e6a1f00f0353cb8959f6414ea95204b46cc30954ffc2ca7cb00679a9cbc88762728134e63e37a76 SHA512 a52e0b2c9a809b7d9ec53dabe60f90807d6f8fc72537efbe27fcd02b1805959643371ca0624502c4de1e1ebd09253ee2c95a16d220213e4e8739e2910ef50456
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz 2656963 BLAKE2B d2e98132d089bcf8358659d867e8fa67253612132802e1d4e947c981d773973055daee7a2c0bc3ae89dd2677311480b554efb3a81a6fcf3299f6385e38216d1b SHA512 27f05486092a950a18e5d83c9130fd9a2d64f6a0607ed79ff179d4c9d539bfb2667a15742ebaf2811dc9871c6b36bc197bda61fede0a99106cb9fa921c190f8e
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ca.tar.gz 2724865 BLAKE2B c0b5d3e99530ab0af4d71060f57d07da2878ad4f27b2a070482072c41354b9859458a6b250439ccf2e66f391a20af3638aa4ead74fe0103fd706711525eb81c6 SHA512 a8017f7cc7717ab046ad7d348501ccb3e88c9fcc220c24e10622b6924f4ec8591eecf58d62377c55ff25c721b6fed048760c9d981d7084af25024e6d4f8e18f6
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ckb.tar.gz 365042 BLAKE2B eb5e92c39448c425e2774bf8e6515e2102bd82da41a81631e5514a7e01a3724c455c80d19c6793b6190714a5b0fbc0ed359f6d320de1b8cbc9273bc9d636fdc8 SHA512 f88f83c3e212ed9527e4b66331bd43da7b072f69d911c9ffbf6757ea0b2053a1aa092c55f9d9bc2ed08e1cf9f1954c3436edd7879f043ccf3ef5ee1c61920762
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_cs.tar.gz 3471406 BLAKE2B fdff54769ea1ffb0a0015199a653b5bcb3321170bd054f9b72775d9b169e2325aa0d07c4e3e0446ee0c31174e6c89076864b1fc32a74837d7b64035aaf608310 SHA512 5af3abc47edd19aaf8cbe352342c1d730ec32f29ca52e2dfba8c481c2f64b40d38d8dcb2cbf19e2fd1c7be11abb2e8da00311f9ebbaa79c27ee46378665f9f1b
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_cy.tar.gz 1013060 BLAKE2B eef94079fcc32d67a324ff42e5bd56875d2d29c28f0979e81b359a1e32ef222f770aadc74bc3f4aeea6d2ec7466dcdb159d4acb052e1ba426cb20f820962311b SHA512 b56e8b79ce207766099421b25a03c8194e365f591eec33572f09834722891bda0cbef4698a626a61543811d6b8358afa7088dbf0d2eeffa80e383d434aa70eb2
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_da.tar.gz 3112209 BLAKE2B f3970b732888ebb114fc8cba863fc04d5bd2653b24e130e5839ecb4e25decf895a084fbec4e70bca115f7745fb0a58b7f4f48c5d061d72e1a4dd5cffc9f44134 SHA512 214b5a83f9e4ffdc8bdc075b871df66eb92fcc656927698d2cb70e60a6295d661a708610b9d3af92b0878d7d639f791c9fd2bcf27aa67efbccbdaabc5c8e84c2
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_de.tar.gz 22051297 BLAKE2B ece37eb7a931f823023df261d14f08ff10bd335107ccd01fc9bfb49c53b6af134d20abe10c9f2817a016f17d88b7b8dd5b3481d285bb2250df20062be5438847 SHA512 aa5ec0b351028cc51a0f781f30cdf739b8b7c19dcab053541eca3e212714c740099922cbd8f3a6869274e3319ad6516dcf6f56735c2131f790322e50fdd1994b
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_dgo.tar.gz 435414 BLAKE2B 3756059a815289a0982403317a73d24e2b453f43e46b5977132f91937a438564be45d1038ed303f046f4cf936a3e7577ff8b5b58c16a28184d725059701a2a2e SHA512 70f2ee961fdb305edeac26ba2c80c61b629eb88b79e16f7bbfc4b328d8f7130de8c3759c1e8618faf048316c3eeae32a4f81590febeb2fe81debd134d2267edf
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_dsb.tar.gz 908561 BLAKE2B cbf014c9f243a92f0ab37a6aef4bcdf269ebde59f20a365b29c1a5c401038cbb943b9acea6427e41bd4d4cf0bbe1e511774d3b176bc0ecd74d9305353216c1cb SHA512 0d46474a39b9878f74c0efbc175245fd2815542ca0503096ab8d9de6db86f5a4181ddebb9fe6d7190407b42388c6e7312fdeaa7eb74a8545ad26e8b3c733db76
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_dz.tar.gz 484810 BLAKE2B 20589af253029937564067ea5a4324e1695ba83cc561ef946c695be685e5cff3250fddc1dad8f6186475f5c978c6da61f8552dad3abc12125cf1cb00d1740dc3 SHA512 9017e731ec150a15103f7e0180ab6dbb78bc2453a49f9998d131b474c0721c37f155bd6ab38ab713eb433eed9d83caa7e5f02ec6412c58f46224d5728af5f8af
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_el.tar.gz 3151810 BLAKE2B 70eb656b97006eb5ab1d2c7520d6c6a67972060ec52fd107e04e642624d8a2d2b088ab77c645394842180fab1e8d3e4eccda053868deb1d3a5fa38838252362f SHA512 6280c315aab8788eb6c7b234b1dbb484e8f27e0630bb9c3bee5991b0605c6d310286da363886c8e2716c2065a03f3e36f81bf4348c3b6912a5c270d19bac96e1
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz 7620668 BLAKE2B 8b7840550b81402c21dceca6025dfc280cf06f18d293fe1f0fff0e0e93f21f11c62a3aaf65194516d7ba5397a52705e348adcb100e433079c4d8527f6f1342b3 SHA512 7a2185c273ca01e7d73f9c02525107892b8053826273cdfa9d42bf763b00e2bdd6031cca255fd6de219974f6648071e352cef70b6b1a9bb85f61197eb55661f4
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz 7050257 BLAKE2B e120a6037e9e9979635ebd5da207b559f5c7e2b05e5bd23fb6445de6b3f30a888a538b4a26c3988365b939bdf77b314ce7c679476f65eb2fc56772ed1b5cf6c3 SHA512 88bf7e85a04d150a3f5987abab760f1b2e52973277a3c28e360a0509c7be73467c5027aff104810fe3a70dbb147ae4bcdb9ac5248c92552b0bdda04eb374317d
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_eo.tar.gz 974346 BLAKE2B e8ed35f88aea05ef9c0ea634fb6d1a72162e2c41269f32f87f9b05afb7773e9a57d23601fc5eb23d5040de32843224a3dad6d89b6b9ad8fb9f86c6ce3f8351d3 SHA512 c084df9a55cd28799a107fc870cb671146eb9f783d06a518b33019a39fe649cb095fe4e9576e9f8cdad5cf8ae6ca0b7c2846fbd0d650b302728e6192b74eb96b
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_es.tar.gz 7780579 BLAKE2B a55af9a8490090d1ad0034e31a3090ab4b4245d6de40fb2cf27172b498720f04ef1008123162af1a65ceed3f1f24185e78d256677f43fefc94ef289bf60a10d7 SHA512 c08ef4ccdf3f94dc1adef1305bfcbfca3187c4545e7f6c6f787c4b91d9c3111154b25afa998af48c83558ad356b9f4c5c2ffa79d7a3e50a4993a3e0bd1a97dd1
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_et.tar.gz 1869554 BLAKE2B 68885a49d55a4d57753ad74c85fa1060814c95988842324bfe3fbe6a9883dea57558fcc840381827135ababc08bc4c9a6817514b91c80552a1a787806c05e293 SHA512 4e30e303f33fd30dde1d32f6f4aabb1d19ccf63594ac6409f124b6b78bd70238762107e0038d77445cef0ad3d130bfcb6578735abb76a6dd448214982ac3e858
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_eu.tar.gz 1013435 BLAKE2B 1e1523447b9960c75443c185547ca47e19568b8fe1a94924d47dd0494d05e97ce840e2a902c4441e49346af4616465ad09ddfaeb61f2ff938381c0e23ce06187 SHA512 f106ffb2d6254dac0dd32189d0c413d006077e6306b9a9d3b4b6dd062ea9f27f2044a58e85869df969cead042774bc5220a33e4517477e8f7b978e591ebadc7e
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fa.tar.gz 352216 BLAKE2B dfe14943ed7b959b17aa60773ac0dbbc5b25f1464e66d74f8efcf044900d55d08b458722dfe66e4a3f64d7fd00653751167de2d3ca6e2909b9447b5e0acfcdf1 SHA512 f855140c5cae9c549395f9a9db33ab3092bf9079a5fef2995688f8b74d5429e3aaebee916166f1bb327c9e948791927d8b0e5a3c688f2a3e6796c22e06b836db
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fi.tar.gz 882657 BLAKE2B 35ca1118dd861a922aae770026d79d03799ef2f8f3c3b7e52d0de3ac1aaa5c744335d90f34f3c2c892a55f3b3e597700395df63bd7ac15d0f6feb5d3034773d2 SHA512 904f67bb92b9fb26c436f26a9a4cde01997cf6df4d94765c8ad3e486a2603c42e0aec6df2a903c44f7a0f17fbf3c6be4fc18208a1efc4bead27873c8cd6fe25b
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fr.tar.gz 3323160 BLAKE2B bbbe9b619d1a0dc8c12524e771da2b76d3d4cc269fcf80b0b714fe0cc6bf5f72ab1f8c631e549c211c96e590d81fc5aec1fb356a2b87ce9ec289f618cefa9eae SHA512 897d6b34fdbabc54a8c7834f31521715c929bd047d0e025862619a43044f57281ffd4098dc282f6a5f7697dfff19ba4477732565ae2f017c40a9a332ecbc4953
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fur.tar.gz 188568 BLAKE2B a253d61c1276eb8f8aab63036b1e96b5b79ebc914d8d8ca84829855aa55d19774adf8464dace53b77b83516b3a3c3d6be927561e6389cd711e9174f7fd08db23 SHA512 ad5371ef73672eeb6a18dddbd4e8ff25ce71ba7e49d42afdf055d28aa20722694f2afdce2922c9662d7e213928da38c28cb1b0e6e018a5ee93b046fa6b13e7f0
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fy.tar.gz 904666 BLAKE2B f5ec4278223523a5f1f00847cb01b217e7b4f063b6b0d3505210f1f24d72c37d1c59187cc125cf981a4857b745840f06599b50a3df0b0d55d3c8307fbf6fdfe7 SHA512 62f146537d057b183a149d08d029e7418911471e2b994e22f13ebcfc5b0dabd00a37838dc579926cd07d05206e778b3153fc24771184a0bbb968a62622311de1
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ga.tar.gz 725833 BLAKE2B c7f51c05132f0f1abbf8948fd20f674cd424e2bba41aa0836c4c337f033d642899d24c60ed3b398d1ff4bd075b8c05af6cb683398d6cfbf7befb2c9388af4691 SHA512 ced8894cbce07d927462f9c7018997a32e18ff2b240f2a074069c421cac67eb5045e89abc686046de07747769f43aba841960e69a2c5c8e935ad59911ebbfa5b
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gd.tar.gz 1771717 BLAKE2B 03cbf9c78af684581a6e884feb444dd22ca4e8ff8e72a7621180d16892b1c662cb79f891a8088df827ab3a17a807e0ed4e2f23ab8f9a61e3e5eb78b4bf1ac5f4 SHA512 2011cdcf2a3370261141f45104311ad2c41c9a634ba2ea4ee931df2de631a40a2898b0d4c3174197f7cc26425de0e022fb531b9b5062a05f288bd6e5d54f72d9
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gl.tar.gz 2907239 BLAKE2B 49de35e70da17b893d6d0cadca01500c9e8ad09468b5ef011c5968d739ead5d40dc19dc5d53483819a1a418c7e3d99fd11987a3a8aa66feab9f90d3088df9bb4 SHA512 7e2a55ce14827d7ed799c8179ef02e9a2af320cb29fbe59dec1819ddfe4ec0e2a24878c90b13d5114d8c0c2e7241e2f36da93aec604bdb052e89cd703b43530a
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gu.tar.gz 1304710 BLAKE2B b6fb5023cc41d145e930b5f2f6bef566424c87e43480e15333996bb46e2a61d61a14c8d5c7779aa9f8e1bd14c526ebb7261033777b00e93853b667d03228bb7d SHA512 4b2b5d7ab25a0fa898fbc4c5027c3c5866a7410820ae8f0519707056f2e9b509b21980129cc75cb12e1e3f13ff7a3a1093027201b05183be7b6336c448f7b2a2
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gug.tar.gz 511838 BLAKE2B cd9b587bd8ea161e632b0af7483a9b0b7f0e8267f16a7b3922458214c633b3911ae8f6c8f6b604c1d795e34f6e84cf0d300dc95ec4b4e6f4084ccc0e8cd8abce SHA512 8388d407f712bbde13783fea32c7d955337906ceaa013bf176e31f49d3b55feb9d6e462c212c6c8ab79029fb3ea3d015630c300c81f63cd70d87da7d7843faef
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_he.tar.gz 1683927 BLAKE2B 94fc7a1e6e97797d64978b4e1919d81de4ce20119f944aecec921b288e2be3ce8b8961a8784a33410f2e65ea378bf32b612fe5befeb74762a72bae2c4d970955 SHA512 0acb88ae57d8c5839c6b4762433fb7e1a4e9bba71b33b7189db7a90400a810243ee253e5250955cecf9a4a0af69190c6aaec217e66aab7e7126b5ae4e07d3b54
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hi.tar.gz 563365 BLAKE2B b0c75c141281ffed33f6faa494f613f5f0b45e86090ff77365b7a9ffeabfcd48f824f456310754745f150d33c698d1f748bd1a9713e550067a31cab12b4dab0b SHA512 2bac6ea3a7305c6d08cec07c09f3d1b29d4d36499932649fb2fdadaf1162e740b0478be595788d7395b0aea98fa7ee17b5c047f819867d509c614f042ccddbf8
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hr.tar.gz 997802 BLAKE2B 97f2bb803aa476d1e51951f5d59fc92b9d0c0ece8778098e78a0208b61a135257092d3755a0f8d104de9f1f93bf94c8561136048154cd9abbe125349ff91f1cf SHA512 1ba209c6b4078c7414851362114a5bd4f596427d0004be2e056d03fd8dd61c75d8086cd2606d277a295e45a72cee0cf1936f18021d236e0ed9ece8ea073e099d
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hsb.tar.gz 917832 BLAKE2B 3867f03461d1442b3707dd7cfb622c5973b2ebba995c50937b51701789435776439f214b06ad4433cdbabe406e10fa4db37029f308e7adace84a798eaf66f924 SHA512 47c6f22fec632ee235bf15943dc58fb66d3e660ef10b444e38fea59414269ecbff19b50c0462d8f33b9bfd87cce8ebd6f11ad0cccfd69ee9ee7c12f847ae9618
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hu.tar.gz 3314597 BLAKE2B b7ec83f08e36ba6af83e40365eda6f9c58d73067ae498dd92f233a50edfd05c16dd6aa83b2cbf343ec9682ab1427788e2a143868f8b863e5722e8f0564f4b4ff SHA512 9e46829c22a9560f92e66fd708b1b2c139ebec752413163de3fd826c225fad4d51cbb39d642c3f810b0b127882e941c43280b6e315ab71a43e484889975877d1
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_id.tar.gz 1858506 BLAKE2B 06ca4f78233d0f3754c9c5b04ea0811029d5fb2cbe3bfadddecc0ebb08147b321d340ac53ec5d63224964921d66f539b0c931cd8160c1fa4038a164bdb160df4 SHA512 016ff727dd16b3063dfbe56fedfff7d0506df8efeb7553a7e1f2abeef407c5988c98333e5c500b7c1bb2b1e58159fdee4726f80c1f724659bd80016629e90243
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_is.tar.gz 1540159 BLAKE2B 3ec57498a2f464d526cac08164ed46b76764b2a83b14eb17497b0ac38cdcd121de079620d4af5fed5ea8db11730cda531e13fb70e3f21deb028c174ba2c8a0c1 SHA512 4d4ddbf9a7c6a6818db8f09f1a26fd5ad53d32df53cd56a8b7a87c5f4f29bdf43ebaa044d570031673e0ce2091aa5ceb2cf3d01201e369514e86b81678b69f47
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_it.tar.gz 2354904 BLAKE2B 9e9d061b34b03fab013c6c18b0aa4915ebdc21701a2de40e268ff577c90c592ad7250829de9d3d2bf6093903c95149c0df1315174af48b1d30a63621e2e6fee0 SHA512 8a23a6d9eecb452f12e2dbf97e8a45445609181d586927f21157dc44bc4b3ff2e86632f7b0a2ffee3928b770b343b0c03f2530bf3ba82722fed1d8fa1f0f47a4
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ja.tar.gz 1008058 BLAKE2B 6b5ba598ab02c5bd2d6c40bdde0fcb31c26fc0fe7868772987aa64017a062ad4ae9b8ca0a621b5c597d5fa01861d7148640905d7f57c30609dcfcfab6c1f0b94 SHA512 4dc2716e06c1ad33643bb965e059eae87bed714301d19dac4dd113518014c5a508d91991fda66e386a3a9c223ec2d73eb4b0803204ab3fb692a867c868cf8a0c
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ka.tar.gz 401392 BLAKE2B a8adf73d48fbb8ec837a56088fa5a05f1b01a553f442247c61ec355d764bc096389a839346b57c241db109d5d05e98cd5d3f32e6f1510eb1fcd0bef83e41e23b SHA512 8a7c6ea483dab0384735827740692fa42aad8a2dfb1928877f1cc35f260369dce50d6c654b09953f9abdcd2f729caf33d09fa860d4e5f09be8c3b1adfd0eeba8
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kab.tar.gz 638645 BLAKE2B 0bf33e9659a25c98da7efa1b8afd5d84f9aba6bc2f645e2e4de7b0ec5d10fa56e2fb9542494fe6b6cc229a3afacfe1fafb2bbe2debbee75aa5e50cc5c5b66b1e SHA512 163913a8815d5e5b4a80bf2c90270680ba1022aa253d26cebcf0b16bb22ca0884d83beee413d419e36e8c97cf45f234f359f3ed9b9426de9609df7d8c65cdd53
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kk.tar.gz 831970 BLAKE2B 1a55c254051c54af71b6147c4eb6282232c765c0a4acb8c744fdd97f95666500a8a31378604d6fe304e8f1348161ca8aecce3cc028da1283b24ed540e2615f03 SHA512 e2112056671ecfc65eff73a08e7acb93911f53db06e0e54b6f1b817bca4d37b6f763614efa019e953e076e37a5493a543679317cc6aa15f6c44361bad1b23238
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_km.tar.gz 823803 BLAKE2B 327039a616d30fd0df7ee9b318baf29e94f31d42d2dd2840b019268a95f1bb2db9d1f1d96a5b9108ca39ef8e2ddce039b05d97fc51905e8a481d87afad5e1baf SHA512 757ada172d541e6e1cad70a90e9bace0e9609f8dce883ae89ac28b187ba64d797ebbf1eb9c55bf0b3b7bbc9c65b8377801bbc97d9ebde258a88ee281ded29d26
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz 335414 BLAKE2B b3dd2d96db187d956689e34007c3a42ba7613463a0bd0921a2b29de8568d7137e1af16bafe2d998a1657520803868f27da9597453aacd3cf8d502ab150b51199 SHA512 dd94dbbe2a974532623d3432765ff0e7aa4d6aec2f20aabe73018d2b4d6fefbf6bef95a748ded0a2bf4454b08f4519c1de8b04561b816ad438b2e9c64ec6c92a
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kn.tar.gz 573081 BLAKE2B b826ef306da47a1f74d8da133f83a554cc53e4da5f632efc582bd8e2befb36b4280656edd113aee47e8c17fed715c09aef68946006933b9ccf6bc0f08b352ed2 SHA512 1bed92495abc2c9fb45d91c0bbb18cf885337d8fe874f3658c2a7146adb637ab7dd3168029eb6b4edd5d954ec6c26eb40fe11764758661e1528db5567404426d
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ko.tar.gz 1701905 BLAKE2B 8688b0c470445d55ffa3d93e373b587561dd8db8c2363de938e123446434fc8f2dd6d8b77df0bd5887adaed5ab43c16fd9e5e9f116549117ec09c7e2bf4efe42 SHA512 30eccd8ff209f1ff4f13276cbb5dfd643bb810dee4f962614030ecf1b07be009f612d2aff0b0468bfb3d44127d33429619b1661609ff62a210f2fcb8691b94c1
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kok.tar.gz 408917 BLAKE2B 16f2a760cec8e04b0ce9a2d362536a2e07d6aa8a286fedc4394dfd8ecd9920edebbf719c29ee73eb6f1d9b91891b66a6c3aff1445868f04ccde0f4a9bd529e41 SHA512 8854e03fa72369ef9d4dd2131c0b9f4f44c5e43dc461aed91e65ec17f7037466962afc11c0eb954a0b743c16ee9218e9de7023f266efce891d5b7a225cfd64fd
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ks.tar.gz 329318 BLAKE2B e53206c99b49c5d54e078f7503734aad5dc4e6e7fef2232f407478323b44540d184242349c43ca81a2ca093f0ecf02a9d2db7433090d25cdbbb58b124c42ce95 SHA512 743fff0c6f88d17aa5247e58553f0d587e9ea4e1b9b37fde08fa7685063338a72dd5c3c11ada9905be2a481a700f8d747c9d194056342ddf745f4c2f76f1c26b
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lb.tar.gz 147750 BLAKE2B 4872aebf7dadc436594a7c84f467145ac8c13c457a6ef334a5c7a28d787bcc78a5741bb70636cf83be6d03a7ddfa5e20ed1d75816e8f4a3b9c599b721f87f5c6 SHA512 07f03e430a14ae04cf68ea10b3a05401b995663c202829e25e7c2d61f2004cdc1275471f60c002e8e9cea7a6fd86f4350daf3024d327c668ff7ac29dcac04571
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lo.tar.gz 432760 BLAKE2B cd4ea6ce9fbc7bcd8664dd1c725bd311077a730dec28f3348d3abbb68ffaac3283ebfe071beda734b23686e6fe5ab6b5f3154aae1f8e32eebd472ae4d9f31a9d SHA512 4c9a24d39797e011c2312be4d77ab49e84d31862ee1158beec8c8a2378b19cb3fc6f50266c67ea8e5be23b8c17ea0ddbbda72991e634ad35b4daacc3168e010e
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lt.tar.gz 1247928 BLAKE2B 0b8062cf3a5ba8c67d2653560258442ff25d166ed51315ee5cbaf4d4534f0621c771976d77e3bcabd0f2da5c64b011735b82850c120112bfafce7fdb427bb122 SHA512 946580a69b383d770773cc95a774a99c63424260fdec2eef6e6b1e54d0ea540abb22d8c92827573253ea7b19631dcf64375cca1cbccc11b34d2b2ab25e05c89d
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lv.tar.gz 1176231 BLAKE2B 360e818c548a36455d09dc81faa0f9449669850f59bace51408eeab202e8ed3af7da7882e9893517a1aea68a1200aa77b8c8e3237c120a62f5b5716b6e74eee2 SHA512 7a2e5c5a796a63d4e90e29cdf157970a4de620f191477b2e708695b21cc0ac308f12d8f3c40cd401076f4b15bab36ca523b83361a1eb16de2c4800e853c17127
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mai.tar.gz 331212 BLAKE2B 69492a075086a2fca935da7f23ed99f8a1885d72e9be57fe9f96886e40d92b0b5bd9881ebba47cdd6510f17cf15e34a772c69bb97eebadd064fdab00f2ac031a SHA512 961d5bf5c1ad721e7eaa9b9a5053941d2719cb8e3cdc61ba2f32891d81517d58098d7df8b7964c94e9cd41dde1d452ee1acfa9097748394ac1fd4c096ba6abf9
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mk.tar.gz 486142 BLAKE2B 6aa1d5b290c6fd039f6c4f037c4cfe92e3ba0dbd5d3e2a08a84ac4b65afb48745f7d5328b627283f99f32d19d79d7ff46023080b85a888d2a44caf8896461b8c SHA512 a8ab8ca3fbdafa4e7f6d783da020bdcba2f135b27560ca3ce11296441dc22b4a8fd57f053cb2da57a8f6d8973299d8b8612c511e81b690449f232a818937fded
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ml.tar.gz 533477 BLAKE2B 653b97ac7c1e7ba47424f0d6cfc15cc9ec39432aa214f91fc44b3f419d734d3cd8367bc540446c0cc40cd0c99cfd33bf39ddaaf31c5fa548b1d8e371fe086974 SHA512 893b48e666cbd05c85c0f25a07847b31bce001fe182c2833c8fdca2bafe961406f962b90f8de870565f9777f34c2f869132c9ad2ff3523201544b7f5607ca4f8
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mn.tar.gz 691864 BLAKE2B 7b34609f35074e489f7300d29e4cc6327e2e221290874a99ad2132653a9b6b075f17ffd1336fd4f7cfd57936a1f7325d0121d509e0f301f87ef2e1ce83f2c622 SHA512 b591db04a408be2b32119bc79e58d0dc82fdc6a67c524513761f775ce8d6b54afd43ce773d0ee2a4a5d8a7b2c7b953e66b08fbc298bc1dd175150bc305c24ce9
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mni.tar.gz 399274 BLAKE2B 6019eba2c0eed9d2b98ef481f18fd6658b03781adff9e825f02e0d234b37349c43a0ff0b7c5ea2eca8f129b4322336951c2410169f0ad4d8441bee88bb7f67a9 SHA512 4238e792b3284840a778fb3fb445cc4309308e4e535d6125aca4d1560ab6a7ad9d8179407535673cff9da49f52b6fbdd3e9fa41784dbd13511e2e515eb1bf377
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mr.tar.gz 567865 BLAKE2B 1a6dcf952df2e2c8110a8c218e499d17a1a20d2f30ee7fdea4729e4046fc84c03858bdb98f0536926b04a4ee0111ecc5a5c342272d9a5e1c3b68ac9948b8e8f6 SHA512 0984cbc6a5bda4ce05172e6d861269f415bab9cbd2a273a1ca3b702b8d1ec711eb676ffe96c593bd91aa363fea8c8f04df8fd3f544c799b4145942e4a721e4b2
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_my.tar.gz 458185 BLAKE2B c03c5316362c9c40d3acd41764adaaec0d46ee049e9936eb16c696e65bb2436f8a208eac60b250228c2c1d79cdd21a46c5de43e591237f10bda0d0aed7aee948 SHA512 157b8f97f588ae606b289438a4cc17e71e80e0bcb544854eaab673cc2128781cb6b74403012c2d5dd18959d143e7b1a234f1d92a1b118f1c74150aa5151f9ed8
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nb.tar.gz 4347641 BLAKE2B e9b31bc29066642b373809c0ddb0227b68eccce1b7c97f23497445d8f24bb6cb695588432e39cb817022923e3c5f624cb91a437c045849b0fcede1ff44b52f3d SHA512 9f35c52dc37cd887d635a966aab5fcee23a46ac4c64c9935c3afc99d88fea5af486cd52e3d90f131bd7c38e1978b65810c447703ed7a0f05261a133e161539ad
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ne.tar.gz 948423 BLAKE2B 2fb2d42344a350cddec47da0e81314453300a2f029f60f54a2d941510706c02b09eeee9389a15c92c0c79ffbb423d66c1f323fe91dc5843043675641c4b43e07 SHA512 d0825a126232c1ad133feee3643dc8dfd44822f4d6115ac07f2e9758ae11591faff9af0f181f87bc8d72038ef9385e3cf33a2c4376761766ca518ccbb1803053
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nl.tar.gz 1811126 BLAKE2B 3a14157fa6f0aba358f0d19f9eca4ed497922bb9aa6d1bba7f6624c380201a7dcec5f00b0c94d72a19dd7b0e04739782cfe76b31e89956c8cf7dc5710e64de00 SHA512 9a2c082653183e71be641b0252f06d082ffaa7329bc27d60489c97ea88ef16a16417b87b8340ea3c0b19c9c5fc231530c657b812be3f38642318153b31ce5d61
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nn.tar.gz 4350466 BLAKE2B bff9c948d2ed11b383914d6e306f2cf77da269db82cb23c341cd6e96a4eacbb20fc6fe4edaaa72def1c565af2716ec9911b8a64aa2d0ff77d3c47a6d17ec75e7 SHA512 5b627a1b8e808501fbe75d0d1d2f982ee7636d26c8bf8d7197d5d4b254968a34ad5a687f1b0f50f24d60cd985425babd88fedcc86ee4027f5fddbde4000b733a
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nr.tar.gz 278958 BLAKE2B 54565745dfbb4654d5557595f0e7a6f43fc93a352eeb68d5f6630883d6a5dfb2fde74fd045c68843099f819bfc90347049b948a696dd08fe690e7585a8a43fdc SHA512 37f2da11552a8b318bb25796509dd9a9e49802e5cc191811716f6d8cb5a765efada82a491717a257684d67a67ea3e17c986da9ec608906c1bbcb44bcfea87971
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nso.tar.gz 321594 BLAKE2B 893c25d81d9b8c6230acc331bb6fdd41208ac0515ead79a8bf421df88c75bb587b92f03b0c377a9f4e44dc0638015acd67db3aa93a491f3753e5bf53e07fa373 SHA512 1427cb766677c392ca2eec341c651d770f992ed76c06416ae89449c420910018d5def733f54b7ca7830f777d1beaf8ba5839157c95febe30cf95d16c097ccaa4
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_oc.tar.gz 1322263 BLAKE2B 924b35b1b0129e136cafebc55394238955668e5a48bef9402b4598fabf0bf940fcb11e395edd17892e5afed6b90d6c377ecfa815bd7bd0a75b98f6ae6850a559 SHA512 d77f524d0371dd2c2e4f6c7736495b9e69f2dd7d15df5d2938b9b719503a96151450d06cfbd51e8ec22cee985047b9a7136d52824cf5df008dc8393e808683ec
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_om.tar.gz 486383 BLAKE2B 7779944ab6ebd7101cabc1fbb723c3e9f6afb18f0b599056517280b7556dd5901f3e25792a2453e15010bc64324a9fc2d2c0e325a6730b9e4eb8b4877ce509ad SHA512 18934d59ea0654220ece09ef49f9f28fa74691d193397dd4847f57cd12fc26b940dc312f0720e0f1beeaea1f693c7e054b452fed60cbe9e43d4a18793e562539
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_or.tar.gz 588172 BLAKE2B 2c6f10c4a5b5836553297707c3228b5a28d737f7c43471005836729bd1d32a156a189511128d480168165a2f9d6ac3e126b6081110c747615d8ac409f96e999d SHA512 45cb4eb036254c1cdd7e4e1071a1c7cbaf3b593ada6d9e38f9413d4b9d7e776bf45b9bb0e33d2ea490724d7f106115c5981c9d79eb861f68684b3d16769c0201
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz 482274 BLAKE2B 4a7b742cf1fc959966439f411e7f735ff72e405bc69eff0f194562baa4c7df69ef18dd9593da291f804dd856e8a00b3a3dbdab0a43457711fddd9accf9372b71 SHA512 e8b9c70c64f503743db4c92efbc1ecf6b22c2f1e77b9dc6353500def02b69909727eeed21c1afa7f5e8316c233846f6b50218b755efe72afabee46ddf23c1873
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pl.tar.gz 3381826 BLAKE2B 2766008c4347dc987d2e38ee19c827fe3e7612b62dff36105fb24ccc21fd47d6c1d4f362c674c67bae4878197a77e38bb2fec6cd6774c0c11fb3d4cb010cb1aa SHA512 6b2a53d2d4c4a5424be6ad3aeb3d925b7e764025ccf43f5f083a491d3b1061d9a8bdb6ed0833da5e0c1091b36a3017d2bbecb77cb577a312eb217babd117c4ce
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz 3096185 BLAKE2B 489645e65822bc395abc6804bdd1b7868fe30c31d6f69b821c6644d1af52c07d5ac6378a8b5d6cd0a5d78ba24901aa7829857bd3d840f359157be6e7bdd5bda5 SHA512 35d98d15dae8501ef3abbe0700218c329c82ffea9b0978c3872152c66c34d2a0bb15ae3ed8aafdf0add4b58c4d55ae28865289336a97319c1c9b49a1300d0010
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pt.tar.gz 2643057 BLAKE2B 0071880d2753cfef290ab6ef405070a12bed8cb3c66afca24bfd4e681114d043daf731b3d411e3868c5ea2a35560770b5d4f6c1c4b503eea2c05a4dc850e4d14 SHA512 88b05f8abc0f240954bcff76684b1545e424edebd53af9b907fe3cc1739e73b073160d403f5abd653141554c98f2cfc4989857f2aa17b130f5674e1485c554d8
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ro.tar.gz 2510703 BLAKE2B b3a7dfac99f2fa086ff54623cad5b032c7ef48f017bd7e440f30b317fb3866bce48f04e7d92a59482a600bfcd032e1693dfe4270c00a534181568f68f06f9e71 SHA512 66f01f86199fd5f48986bd4826a62cbc114a113a8411fb25e8e4a27c7e4d8500e923fc4825c283df97f66c9557c8a9ebdb78d319a51f29d1ce81e520b5ae4611
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ru.tar.gz 2361481 BLAKE2B 21d4c1f966412a87e23578719c91b191d30583cfb8e2893bf78e2fed9e90b431e0a6752a20ff83886168b6602b1abe515d13bacb1b890806fbb5f59f6db526ee SHA512 7f20a4985a536c59deab93ef237e405d8de64595987acaf51d877544b081e187f3a71b4d6ec8e9458df188bf3cd575f6b983ff540cc9ddd9960e81559d304416
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_rw.tar.gz 346101 BLAKE2B 4c106b1e827a2882abb543f8fcf553aa45df2a0370c7b870bfcc58ee7c63f3a78ff251481a1e264509ca08bec5e4944b3f5d597d210153a67877ae04f6a40331 SHA512 5f37afaf6075e87c98450883758bc25f0aaf708ee6a28c08f142883f06065478e279464b456768c9796eb17507081577c0c323fa267fefd7339ff948c0fbad33
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz 445194 BLAKE2B 48deb163326b13a952d22edce5959f021b5b280639d99480c1a24988d3ec5fab48cce80f29e39bf7fe67172ba74f4436e59086ca2b27781b9834fcb5f5d79759 SHA512 958e4cea01c13d5ef17c665a5a6bf9763ff66d1dfba1eba3333e56b0b992ff3328a1ac4c089af36e539fecbb0d717262b0b3984fea05e9d494f0eac5a71ad6c5
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sat.tar.gz 512557 BLAKE2B c35c76b16a230d9d5d2779b363d8c40d40be9e57a20c5910183f243effe8e2135744bbd065ec0d0cee9c6e91728f1da673084f1722c437d32e0c19c31e57d012 SHA512 09ed45a42335dcf1b276a5ccff383f308504ccccccb9ef12d032ffd8306d2d48a9127c01894078cfe05bcf027004c03696bdf2cd7b43d0e6656f06e78ead2b2c
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sd.tar.gz 432985 BLAKE2B 5d212bb190a850ac940a169dac4fa6377eefe9500fb4a27f3ea2664d106ae457d315470e84f7662ca08b4a1f6471385ce05d62dccb2a0df9577dd8a4bea7de34 SHA512 54c7b0b649524963c0de6d5fb0610a76f9fddfa6fec6a125d6ba4e9652822e1e717bf75cceb74f1c6b849f8b6b0953e04e6e08cc5af727fe8724ee519d697e24
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_si.tar.gz 754523 BLAKE2B 8dccf62b32c5fb021dad6ed18647eeb03369f706f44318a8585c2a21b46e4abf42c527fb88ea2041acc38e7eb63673d2c1a37a9f20932880bf2ca2a960e8f9d0 SHA512 0008ca9832899391a1ca454d2718c1ba4231e17d9eaf2461bad02d5fdd3da78198b47d54d29dde99371b959829d657ae4a5a345a40e763a6cc0a7df5649c9941
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sid.tar.gz 522874 BLAKE2B f219ce27f1d2a62db1cbf42d0fbc2775dd0ea41aab1876d2a694cbb4838838e0df7af1a72617a36089cb9f0fbabdf037d914fafb37172f4398c5e0d0f50c49a4 SHA512 d83b9d5374c133ab0bbaf2d96b8b921dd7cc21cddecd58e416c0ca16a1f3573ed883e1edcb2eff4d27243c277a67e02e2636e76eefc3a85310517f9bd49e71be
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sk.tar.gz 2358924 BLAKE2B 997311eb21b8b4ba573bca0fa2c87cbc8e018efdce0f90f67354516fa8d43b10e277b2a99db345912bcf46742a4457f2328f2fb7f60bce6cb8264b1cba3a8a27 SHA512 ef3aa25a3ab5dec0a4a6e38a9d4c5ee03ce699e2e2dabd8273d8a61c202d71023b3317141d28359493721ffb80b6eb740beb2c1e79182b3b956c75c889e140b2
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sl.tar.gz 2763925 BLAKE2B a395f9b6e55ebcea9c6013542774fc078a7ead06a444233426300597718c2e727e4d875f557eb1c65f6f165f052c5fb99c40a734d605820688508a1d3fead491 SHA512 8fe606f4c90998c6a47abb30ec4feff0722a8acbe0edb5162cde9a6c336ec38965211bdf7a593da6cfadabbcf837ba0a36db6de28f8f0a977139ddaa94b98c40
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sq.tar.gz 1165730 BLAKE2B 9dafddb17a4ce57e18f07668b242a54b7551f446aa8aa7f4a50bb1a1846b5c8be20fc8b2539a9a709cff292be1b08ca4c28ac2b4663615b5ffdd0aecdb5c1fe2 SHA512 932b7c6f8955c60bb9349cb38bef15666e0691d490d2e944f6347e63788f26cef8902aedf905675a8ab4d467828931b2e5566f28de06738843ff0053822e8b62
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz 2406792 BLAKE2B 50c610710746fb9eaf0cb65dcbba3ed2ddeb187fbf2eaa899d7c792e8b8a108596017cd4fdd41cb13bebdae6a50078862532fe8e4bccd7ed0e775e8079021609 SHA512 7710786b4635ec09430866cacc998a0ad4d368d203c4fd3aaac24a51b87c74f9e3fb21e38ef01499bd5343f85a38d00a5f4dd2e532f3d480768668d58f9fab82
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sr.tar.gz 2775477 BLAKE2B 400c1b7ace6a83ea5d3588469abf47f463004632b0fe6120d8e768c910d8a5b13d9cc4381e30e6a15dfad08673abd7a65f81716427b310b943f1660efa5c02a3 SHA512 7584a4e77dd16b587dcb150f2de0ca1ec1bf7a0921e95ca698e858b967546def69a1cfbd07e33bc699a3fe6dea98e276264a866e09fcec48c1543f9ac55f9bfa
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ss.tar.gz 286855 BLAKE2B 873f5fd7e75f08b3c04ce49a62e9d35f03defe7eb38409cba9dee177ba5422f1cf9eb00454602bb281d160f3e1c410f16f59fec1280ce22dc299fae00bb44ffd SHA512 a00f67d30576956220a3fbc99ef4e0b61f373d5290ea27e7f53afcdedd3d45dcc2ac05b0f24f1cd125da9e9d4f44139ccd353e28decc182781762ddfb2a976f7
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_st.tar.gz 281174 BLAKE2B 0f30a5c19d3236e2a5833a940c38992a5bb843e99516c27aebb1d23a40b77d87c6cf774eedc738bbfe56dbf8853db70f10a4f09f5f2af33d7684598ed5366da6 SHA512 bedc61d663ce5536a9eb6b1381f3d8632b21e9db0df00feb5f9c3dfbde0324040149119f60fabd50add999b2f20ad3ee5bd8222ab880101d4b16cc4609b83341
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sv.tar.gz 2836538 BLAKE2B e6a0c968c212b94c653138d4e73388e556feab7be5e71f0f0da07d1ad14e5a15294fa925d77b0a0fac24f4a5b711f7d7131eba359cd1e1c3bea5a6aacb79fd3e SHA512 ec890c757ccbaebf78527f26ba1ae3747a1fe6d22c2e7dcef3f892b98dc7b8e6bc0b51e6d89439316c5a1b369c37875a0bd85af97410420a53415e1545850110
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz 317817 BLAKE2B 4c87dbbde1c7338208b63836ab5f6cf04542ff6fb27b7d763011fe4394304c6c9b595a35de1cadcebd7320c3d3ac0038bd47fb96fc7261ae1b39a78cb5c71b78 SHA512 ff3711a2f34bf25c6df43a13814a849b45a33722f8d77d210ac2c8e83c732b77d239698bbbe3e174d1212c31719d5c59d2148bf931895b84f622150d52adadea
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_szl.tar.gz 733827 BLAKE2B 68f7d23a95ad7fcfe260c7ff5b27b9fb7867e3ac2a76e51475afafad0d7a0dc18d0884726c5688c641a30ecb7a4a1e5923233e3feb6cb3937eb61b32e5f77119 SHA512 869337f8941bd4b326feb7863e6bb6efb2988de78c83d28ac920f8e7ea5bcc9713bdf42212b14b236d23eaed87974f0554633015fb897a22f15f41a39df966e6
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ta.tar.gz 731905 BLAKE2B 097547cf630346e3c01c434d72e36a5f474d681965819b6297611a11d885754cfb778bb56ebc497ecc46b8fcf9861a762b5be6cbc17ffa9d8aec0335b393bab6 SHA512 ab07d4073799d455a4ed2e935aad589357842bbd3ff5b51899fff6ba7d0e594dde30628c852922bc064080fba520e8b03c4595b3edb615771a7db09fc32c8bf6
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_te.tar.gz 1077579 BLAKE2B 34fd5631821443d6ba85ba32741ba868bef89560be94619d1f3c1d720110743b070c991bd1d75181bb36194443335d40ac5d515541b16921d78cb697f9bef58d SHA512 5e790428c11abfd9170013241b4a537a3d8cc9985ac06299ed410f3b3fa7ac032612a897e14081cf26a93f2d95aa4c871dae75cf2c92218095329ff50aec6de0
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tg.tar.gz 390323 BLAKE2B 7fea8135a13b142a79fd43cae31efce261693e8c332863a575e7fdcb2e752c6556d947ecbfa72d1e466c44c387a55ba7eca5c8cd4f7ac03f1c935fa397ebf238 SHA512 ce4447fe1d72adf6363eada4631ca5317c7f1f2ac213a43248f8c073b02d4910fa7e5efaeeb370b2f382d79e27302a48d3ad5c3559b80c5e6ce66110c4aff0d1
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_th.tar.gz 741070 BLAKE2B 43570b5b12a57b3b261aca12ca74064151312144242c8a3f85fdf13e6b6d4274a34ba6da4e9b3ed42a731aa94bf21162713ca37f1dbe80ac824c0a8590d1a028 SHA512 18ce9702e46164232510432187aeb507902a081a836778a571520e678a21407381964f6710d7aae1331b8f37c309471cfeeb074bf11f80d18cd04a2727037497
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tn.tar.gz 260612 BLAKE2B ad8e5c72a0cd4c5b11cf9978e3ed0f6603c35d2f3e643677f43c325830257c716ee54662aae19ec589e5a60bd63dbd16985b5f312c9e9baadd0f1e7528818cfd SHA512 1c65e6422694f70e3e83526854de71095effff5ec8b396c4a70cd7341dbb027e5f6c394e6001c37f89557c3e36369c8cc94c576d8439212f927aaeecb4a0c9b3
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tr.tar.gz 3331588 BLAKE2B d49659034744e3af6a69cd57417978a561ad2e92bc2556a05876998c72ccd53ed31ba803a48fa1c3de8f2462d525916ba07ac99a07973e1a74782f74685bd4c0 SHA512 ec691996fd81d436acd519401f839c2a73f298d5fe82dc2958193bd6998fb54407dab49d1b2173518cfbb564d1aa722bdab9662720bc9f056a4075301efebacc
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ts.tar.gz 278246 BLAKE2B 632d3f85050afcfe7de2f59482d08c2ed6874e84a7ffb7b50dbe49cd6ae44139af365eccac4a1b78c5b27a9ecb8c68387795bfc2d89071b806d02dcd20798d17 SHA512 61ad174b2134aa8632b4976700acb5dd9c1f981f26be3845d4363eada02974d943097126a9a0a43d49191b42c22c26f99fd9a0f11ea07b01114edc02b45bcd14
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tt.tar.gz 187146 BLAKE2B d5d708e0ea073847ac28d3bea1dd9d68f147a19e3900942da183fdb3362368bf2c4ac824dd99361e07f367885bcb8377d2c9610c1b62d1279e79160d07c6ca7b SHA512 7462d4cc3cc329fefc4ace6556e6e7f99cb166df3223f9c238ec13af49fff3d22fdcedf3f1710d79560a78ab8bd975e8cabf27eb73e691ab346d1f837608ebb1
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ug.tar.gz 540373 BLAKE2B 5f4135938eac894c5fd60aedd84ba6e99af2fe2839afb897f02f3b3813c5508d7d4194af07ea85db6607fc103a1dbc3adec143420f323c6f08789b6f4c69444e SHA512 6f897f8ac312f69c31b03d409d03128f30265e055ff3e32a13a5e697b6b72e28bb0e9fd77ba926ae1dbf2d1cd21546a6b9a1cc059f4ba42fcc2cac624573deb1
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_uk.tar.gz 1910533 BLAKE2B 9ebdfe49140d793109b0045d0c54ce22d1bffb765c0eaa18af00c13b9be05a7ab172f7aaace6e3ae267c66999c4732dccbf40112151a24a0f6c88d0019560d6e SHA512 11fff247c4abc2879bda821a70e533c215f9dddfcd3f006dd24ba59f37528ee0edcc9abca8c8f082eed36576923bd094f32685bc16524cf76cdcb4e87fdeb525
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_uz.tar.gz 313782 BLAKE2B a0b9729311f227d150eeb74fde2eae8e405c257b8f8b686df8689458fffcec788912fb42586b66297ccdb851f10edba2b3f5acb56b9af45dcae5ee68a79a124e SHA512 73b5b9b88909652929230beb4005beccb6a554f745fa884f6ba25bbffbf2b37c291ed5a17946d638ecfa4d46c97d4c3b632785251afe1d578cffcfd9b9878b13
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ve.tar.gz 283503 BLAKE2B ce110182c3bd88713b5f32c1d1fca3d253f6032ce6c692bef2ae2660ca7da9e8ea759d9d1bc61db9ac3bb51f5f2b8839813c6048a22add79d5bd8f76f58f6c18 SHA512 3bea5694ccb9630d17f6cbb3bf1c9a1813ef839982a6e8ce04e757c3654d612d60e0ea133949729575086a291a8d3fd5d648ec285f43228c796e3cd0a3f8f1ac
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_vec.tar.gz 755918 BLAKE2B 8e23a98d07f97d921990564ce87c7af0dfa148919755a8145c446daffaf6ff9903e14a9aff842683bc96533218e5faf39594d9ba6371adfca86084c2f1016eb4 SHA512 249dfdadac6586ae1e6813774b8d489334b1109fb8196bea4a2516777cf38f51b30c5c55f1c2546fecaf8e866786a6ebeed3f24e1a8b1575747c5bbf0705fbbc
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_vi.tar.gz 567255 BLAKE2B c57a7196264ddef8b8138b8559bbf38a28ec5d3b7350eae97118a381670a12d1f7603cc56806f68bf7a472cd7ec4778b0e6949fb0518a65c9c01dd8fb3b041ee SHA512 0b82d36da2236bdd8a952dc98e76defd3a0294736c95aaaf04bc68d874dc6ea411e203e2995931aeebb8a4be6c4179ed82113670f47ada31fed3c63aec7292ae
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz 290349 BLAKE2B 503a39b6a3c7882d631c2a5f03db0ab54905f9049ee6004542882215f3c6310aab4c8a2cf1a9d7da8fea08148782c441581b9fc5ff8cac8d0bdb1679e3bdf42b SHA512 c648b54f39f59d9c70627630c436002567b469d754f48a3abbb0f6417541173343b1bdcdff90b5e2d0447a6d675f6b5563b3ca00525c48ad311b033c21f95c61
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 1049341 BLAKE2B cdce93c542342e56864980e052c78e4d1bfd0b1939ea27511e66a88a821dc83318729f85258adb47943d41b3440e5561a56e57dc4268d93c6ddaaf21a4a4eae9 SHA512 80e69367d6cade76997cce796d94fd49f944e4dcbb232fd097185b64c9d15409dbb550c91af8afcba8a4488947abeb67a86da42e4cf85d773be7dd94e1dba00f
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 984558 BLAKE2B a2883925b36cda669f1737cd196a9c0457718c76ca50aaf7c847e3bb8cb3349b8a84d91169234324af80e396806a9619127abccdda72ff5f225ebff0ce6f60a5 SHA512 24f08efcb7831fb0516be389d5ddfe33a4299b2a7057714c457589c2f90dc84fd94333e0c3bc024f803ff44d97979a49b7811122d2baead5e4cfb1a9b075ffe7
-DIST LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz 320136 BLAKE2B 71c261a3a66819c65be221001a7f4a9c1356e3980cd030f0e785e5e478ff6ddd8ba277c1d9dd55f37331f439f7971b83aedb7f5738e73503d84b25483bd5b567 SHA512 3966db55370f59f2f4f1fdd1981b7102ef7852b461fcb84484c8d319733261138f4004d38c84f4584cef60e1248e8ae19d474b2e1a664fec08bab7c30ec4257a
 DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_am.tar.gz 4127872 BLAKE2B 7f9afb43ad16a75df6b9ddbfdffc5ea0b82a7fec8e5334e5b2f44f0338e4efbf3e5968a28860fe53e4bbe7987f90d79d60e52134fbc3ef38d73bf75bc7da8b98 SHA512 b0b819277d8d6d530900dd2c53dc15d1767d9297d42bc016554bebdc9f71d87a980f16e336da584026e0c372d63c4b6c5ec9cae1b761c216f7d2fd6e52da5fd9
 DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ar.tar.gz 3599123 BLAKE2B 5db9fad077ff4936d35ddd8183af2dec4d9bd3998dcf0f1d3a1f2d6edad459ae21cfece71e296d156d8f631c89c3479ebdf637434308ed866aca68ebf41fcacb SHA512 456f9fd7add645379f790535f74da7aa6fb2c32fcabc542c53a2796dfc8fabe65eddb8dbdd18a1a91d33b212fe4ee5a12971b0537981aa4817830b4626572a2b
 DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_helppack_ast.tar.gz 3837450 BLAKE2B dfe9506f2ddb5a71e67b5f875a225b4462971062517f4bbe1d044882b1d29c9fbba853875d61d58136179140a5e8e7d65372e01b0332beeafb5c6b4f0bf8aab9 SHA512 14fdc51bb62940fba4a96a2c8c91fca40e94c0b8f669cd36eaa9c1022f058a0048001f1944d0c000ad806c025cd495f15c9fb4dc261e756adf4f49748ab31aac
@@ -549,6 +366,5 @@ DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 1050281 BLAKE2B
 DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 987668 BLAKE2B 64780a374b7c10bc55e91425adf6b1d08e2ae2afb450088832ff9a646ea7b23431b8919e59525ce4161f6c28963844175031c5a03972c426e763051e54e7c6c4 SHA512 55c18b812d559512c725e0bcb42d9b36548ebac1054f6ee4d64d084757dcd371eb2b9e8c87ddae7a1c4cedbe862ef338c189292dcca60bfffb209638062ca639
 DIST LibreOffice_7.1.5.2_Linux_x86-64_rpm_langpack_zu.tar.gz 319620 BLAKE2B 1adbb995324a146c0f5d009961a3bbded522394e08a5791dbbfccda6fad469ea11aaf73a9f876b862de5260eb75c354a4120c3f195b70102e31ab3a1d3dbe5c4 SHA512 a1a8bc2e7fcc14a47b493eef30062511b3eba4843d3b5f66d4f32e4b05d41a96e8d6d3a5f05bf4f5249b947e2a2d7e0f51df72612ccf3fcf3147d8bdd88e1852
 EBUILD libreoffice-l10n-7.1.3.2.ebuild 3686 BLAKE2B 92110978a07882d8a24f9ea24f30c0fb5109bda02508e5b8f93f3f2d440177519da9e28b392b7beaad2498dffb32982974317ba8bd8c68527b25e1ad9de93866 SHA512 a28a7b8109c8d863daba8f9cb3d7662fab4ef06b428cae0bb0567c6e13e8fdf7c76380f5b96aeb9d069593abf984c357f60fdf4ab65b8c17b51b5c305aee7a68
-EBUILD libreoffice-l10n-7.1.4.2.ebuild 3688 BLAKE2B ecd55ba287977b5d1a1e5b7f5b5f4337834da81bb08a4f7b490fdf5fe77d5810276234daaae0b7b52350d308fa71efc6b915af114c9c59d1b090aaf3d1187928 SHA512 84a8c639fdc7dde3cf1440c6f56188919ef34aa4cb7e549d9826ec52c5e0553b24cc9590b7a6d16534b2fd0cd72cdfe2fc1ee4d5390573439754b3062632a83d
 EBUILD libreoffice-l10n-7.1.5.2.ebuild 3688 BLAKE2B ecd55ba287977b5d1a1e5b7f5b5f4337834da81bb08a4f7b490fdf5fe77d5810276234daaae0b7b52350d308fa71efc6b915af114c9c59d1b090aaf3d1187928 SHA512 84a8c639fdc7dde3cf1440c6f56188919ef34aa4cb7e549d9826ec52c5e0553b24cc9590b7a6d16534b2fd0cd72cdfe2fc1ee4d5390573439754b3062632a83d
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-7.1.4.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-7.1.4.2.ebuild
deleted file mode 100644
index 5356be44837b..000000000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-7.1.4.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm
-
-BASE_PV=$(ver_cut 1-3)
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-[[ ${PV} == *alpha* || ${PV} == *beta* ]] && PN_DEV="Dev"
-
-DESCRIPTION="Translations for the Libreoffice suite"
-HOMEPAGE="https://www.libreoffice.org"
-BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${BASE_PV}/rpm"
-BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${BASE_PV}/rpm"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-IUSE="offlinehelp"
-
-#
-# when changing the language lists, please be careful to preserve the spaces (bug 491728)
-#
-# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
-LANGUAGES_HELP=" am ar ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko lo lt lv mk nb ne nl nn om pl pt-BR pt ro ru si sid sk sl sq sv ta tg tr ug uk vi zh-CN zh-TW "
-LANGUAGES="${LANGUAGES_HELP}af as be br brx ckb cy dgo dsb fa fur fy ga gd gug hsb kab kk kmr-Latn kn kok ks lb mai ml mn mni mr my nr nso oc or pa:pa-IN rw sa:sa-IN sat sd sr-Latn sr ss st sw-TZ szl te th tn ts tt uz ve vec xh zu "
-
-for lang in ${LANGUAGES_HELP}; do
-	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz )"
-	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
-done
-for lang in ${LANGUAGES}; do
-	if [[ ${lang%:*} != en ]]; then
-		langpack="${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz"
-		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
-	fi
-	IUSE+=" l10n_${lang%:*}"
-done
-unset lang helppack langpack
-
-RDEPEND+="app-text/hunspell"
-
-RESTRICT="strip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	local lang dir rpmdir
-
-	# First remove dictionaries, we want to use system ones.
-	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
-
-	for lang in ${LANGUAGES}; do
-		# break away if not enabled
-		use l10n_${lang%:*} || continue
-
-		dir=${lang#*:}
-
-		# for english we provide just helppack, as translation is always there
-		if [[ ${lang%:*} != en ]]; then
-			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
-			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-	done
-}
-
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
-	# Condition required for people who do not install anything e.g. no l10n
-	# or just english with no offlinehelp.
-	if [[ -d "${dir}" ]] ; then
-		insinto /usr/$(get_libdir)/${PN/-l10n/}/
-		doins -r "${dir}"/*
-	fi
-	# remove extensions that are in l10n for some weird reason
-	rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
-		die "Failed to remove extensions"
-}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 531ac7fa5d42..0eaa54d8c7c8 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,15 +22,12 @@ DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48d
 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
-DIST libreoffice-7.1.4.2.tar.xz 244336900 BLAKE2B 97374216593edb0b33fda80b19686bd95f517c36e9b2a347854af915be169b4d22963f765dbfa48ded75f64e94212e6d5cc862809ac775dc25c6b6bf1c1cc2c0 SHA512 b6c0d5ed91cd69e20e70b2fd5e6f53f05eb0fbd73c41208c317116c636b2ee8cfd848370389dd61d3c243b259ae66b9bd5de9341cd9009279ccfd299015c88c8
 DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
-DIST libreoffice-help-7.1.4.2.tar.xz 111785284 BLAKE2B 66b7da9d986a6abbc314dbb33be8297e7241f98983c4a864c26e3b6984d10d79f36a5307e11ed549289f2ab5e15ab05e7e81c9fad3d2ccd43dff114b327d266f SHA512 7730a17cd171d126b3b094abde1797524ff7250a5895d6d80b10b30944225d318001cbc66bdff06019be69434278dfd864aec71b0b9572c6385639620b416268
 DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7
 DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
 EBUILD libreoffice-7.1.3.2.ebuild 19593 BLAKE2B 0ad7019e0cef8ab019f5993897ba2641c95258cf21251b0b86266a1c9af92e01153895be1198b234ad4381546366642412739ba79d9aee1cb258ae2bcd48f717 SHA512 909cf68a3d06c287feac0b104a9f3e262e5216b11722029f486e2e982f99d07d259db4e04125c9016d19c350d7599f5e6b72ffbae59c9bb070d4569136bda740
-EBUILD libreoffice-7.1.4.2.ebuild 19604 BLAKE2B 5cfcaeb55d88132f18c70f268d0ca070a041a00c071dc46bca6b0bbac064841c5ce902c452ec9ca27e8d946f9c3fa1b8d9807279d11671130a253700ab62dc78 SHA512 653d02dd4736e98dd1584b9dc906381476d00476bc44a45ad575d5547ec93420bd4aaa8a414699831fe09d2b7b8a63460f9af219b9e0dd6a7bb2ea5e5933ebd7
 EBUILD libreoffice-7.1.5.2.ebuild 19609 BLAKE2B 83226e67fcd0f3fb54690687dcf0c8ee7426c1d97a9be7b4fcb3702752aa06ac3eb9d815b34d9614e758d920fee56ed5858a387261818d270bd04517a59d686b SHA512 cfd2da54051e21a35ff93999c14dd0fda841bc081d1398990a1674f820d3cd66a55bf50769f39e5bc97f76d21fd70e8ab9e9ed34af93baef4e539c2a90eeabaa
 EBUILD libreoffice-7.1.9999.ebuild 19530 BLAKE2B 200d1bd15a68070a7dc1f11a57bf06af8f4da3f1fddc77572e6ebb9dbcdf6e1cbf341c7232ec8b20d9ab5c35a800fc47c896df31c0534fc0ac9a33c72e05f97c SHA512 a3ddf9d003d4410c630afa09198e535ac774b49ab68a57512d814c0574cc2a602ee106d7aa1e67f9ed81f00b7ccdd3e94db25eee76eb133b05a380242650a634
 EBUILD libreoffice-9999.ebuild 19514 BLAKE2B 1e87e2b25207d53d88727d2347b853ca778f791c83220fc52d4563e8ddbf1267d0e0e3d587e39ad997d8f6351330ec78a4369756f15059cb0a6821bb83e96b0e SHA512 445c191747de6e1000ccad00f5ba7981e28ff113eb11490f15a417aae40042d94eec748f0f40ff56c38b97e05690604b2427e4ce2c04c96364bc6563ea4e49eb
diff --git a/app-office/libreoffice/libreoffice-7.1.4.2.ebuild b/app-office/libreoffice/libreoffice-7.1.4.2.ebuild
deleted file mode 100644
index 23d791513de9..000000000000
--- a/app-office/libreoffice/libreoffice-7.1.4.2.ebuild
+++ /dev/null
@@ -1,664 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
-	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
-	"${ADDONS_URI}/dtoa-20180411.tgz"
-	# not packaged in Gentoo, https://skia.org/
-	"${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
-	# QR code generating library for >=libreoffice-6.4, bug #691740
-	"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
-	"base? (
-		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
-		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	)"
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	base? ( firebird java )
-	bluetooth? ( dbus )
-	gtk? ( dbus )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libnumbertext-1.0.6
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.5.2
-	dev-db/unixODBC
-	>=games-engines/box2d-2.4.1:0
-	dev-lang/perl
-	>=dev-libs/boost-1.72.0:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	dev-libs/liborcus:0/0.16
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.28[nss]
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	>=net-libs/neon-0.31.1:=
-	net-misc/curl
-	sci-mathematics/lpsolve
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	accessibility? (
-		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-	)
-	bluetooth? (
-		dev-libs/glib:2
-		net-wireless/bluez
-	)
-	clang? (
-		|| (
-			(	sys-devel/clang:12
-				sys-devel/llvm:12
-				=sys-devel/lld-12*	)
-			(	sys-devel/clang:11
-				sys-devel/llvm:11
-				=sys-devel/lld-11*	)
-			(	sys-devel/clang:10
-				sys-devel/llvm:10
-				=sys-devel/lld-10*	)
-		)
-	)
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( sys-apps/dbus[X] )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl]
-		x11-libs/gtk+:3[X]
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	ldap? ( net-nds/openldap )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mariadb? ( dev-db/mariadb-connector-c )
-	!mariadb? ( dev-db/mysql-connector-c )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-#        tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3.1
-	dev-util/mdds:1/1.5
-	media-libs/glm
-	sys-devel/ucpp
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		|| (
-			dev-java/openjdk:11
-			dev-java/openjdk-bin:11
-		)
-	)
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-		media-fonts/liberation-fonts
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( || (
-		dev-java/openjdk:11
-		dev-java/openjdk-jre-bin:11
-		>=virtual/jre-1.8
-	) )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-	"${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
-
-	# master branch
-	"${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
-	CHECKREQS_MEMORY="512M"
-	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		CHECKREQS_DISK_BUILD="22G"
-	else
-		CHECKREQS_DISK_BUILD="6G"
-	fi
-	check-reqs_$1
-}
-
-pkg_pretend() {
-	if use x86; then
-		elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
-		elog "most notably Report Builder in LibreOffice Base, will not be available."
-		elog "See also: https://bugs.gentoo.org/785640"
-	else
-		use base ||
-			ewarn "If you plan to use Base application you must enable USE base."
-		use java ||
-			ewarn "Without USE java, several wizards are not going to be available."
-	fi
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${MY_PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${MY_PV/.9999}
-		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-		LOCOREGIT_VERSION=${EGIT_VERSION}
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sandbox violations on many systems, we don't need it. Bug #646406
-	sed -i \
-		-e "/KF5_CONFIG/s/kf5-config/no/" \
-		configure.ac || die "Failed to disable kf5-config"
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-	# Note: these are for Gentoo use ONLY. For your own distribution, please get
-	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# Show flags set at the beginning
-	einfo "Preset CFLAGS:    ${CFLAGS}"
-	einfo "Preset LDFLAGS:   ${LDFLAGS}"
-
-	if use clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-		LDFLAGS+=" -fuse-ld=lld"
-	else
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if use custom-cflags ; then
-		elog "USE=custom-cflags has been selected. You are on your own to make sure that"
-		elog "the build succeeds. Good luck!"
-	else
-		strip-flags
-	fi
-
-	export LO_CLANG_CC=${CC}
-	export LO_CLANG_CXX=${CXX}
-
-	# Show flags set at the end
-	einfo "  Used CFLAGS:    ${CFLAGS}"
-	einfo "  Used LDFLAGS:   ${LDFLAGS}"
-
-	# Ensure we use correct toolchain
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	if use vulkan && ! use clang ; then
-		ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
-	fi
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
-	local gentoo_buildid="Gentoo official package"
-	if [[ -n ${LOCOREGIT_VERSION} ]]; then
-		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	# --without-system-qrcodegen: has no real build system and LO is the only user
-	local myeconfargs=(
-		--with-system-dicts
-		--with-system-epoxy
-		--with-system-headers
-		--with-system-jars
-		--with-system-libs
-		--enable-build-opensymbol
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-bundle-mariadb
-		--disable-ccache
-		--disable-epm
-		--disable-fetch-external
-		--disable-gtk3-kde5
-		--disable-online-update
-		--disable-openssl
-		--disable-pdfium
-		--disable-vlc
-		--with-extra-buildid="${gentoo_buildid}"
-		--enable-extension-integration
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-tar="${DISTDIR}"
-		--with-lang=""
-		--with-parallelism=$(makeopts_jobs)
-		--with-system-ucpp
-		--with-tls=nss
-		--with-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--with-help="html"
-		--without-helppack-integration
-		--with-system-gpgmepp
-		--without-system-jfreereport
-		--without-system_apache_commons
-		--without-system-sane
-		--without-system-qrcodegen
-		$(use_enable base report-builder)
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable cups)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable eds evolution2)
-		$(use_enable firebird firebird-sdbc)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk gtk3)
-		$(use_enable kde kf5)
-		$(use_enable kde qt5)
-		$(use_enable ldap)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable vulkan skia)
-		$(use_with accessibility lxml)
-		$(use_with coinmp system-coinmp)
-		$(use_with googledrive gdrive-client-id ${google_default_client_id})
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-		$(use_with java)
-		$(use_with odk doxygen)
-	)
-
-	if use eds || use gtk; then
-		myeconfargs+=( --enable-dconf --enable-gio )
-	else
-		myeconfargs+=( --disable-dconf --disable-gio )
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-		else
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		myeconfargs+=(
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-		)
-		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
-		elif has_version "dev-java/openjdk-bin:11"; then
-			myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
-		fi
-
-		use libreoffice_extensions_scripting-beanshell && \
-			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
-		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
-	fi
-
-	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
-	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	emake DESTDIR="${D}" distro-pack-install -o build -o check
-
-	# bug 593514
-	if use gtk; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
-	fi
-
-	# bug 703474
-	insinto /usr/include
-	doins -r include/LibreOfficeKit
-
-	local lodir=/usr/$(get_libdir)/libreoffice
-	# patching this would break tests
-	cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
-	sed -e "/^import sys/d" -e "/^import os/d" \
-		-i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
-	cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
-	cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
-	# more system pyuno mess
-	sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
-		-i "${D}"${lodir}/program/officehelper.py || die
-
-	python_optimize "${D}"${lodir}/program
-	# link python bridge in site-packages, bug 667802
-	local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
-	for py in uno.py unohelper.py officehelper.py; do
-		dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
-		while IFS="" read -d $'\0' -r pyc; do
-			pyc=${pyc//*\/}
-			dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
-		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 233adb08001e..4998c7c2b409 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,3 +1,5 @@
 DIST skrooge-2.24.6.tar.xz 22187100 BLAKE2B 8657397c1faef949e4d2aa5a23b35433695329e9b00e62f11e4b60b78b3d0e92c32ff93219a4931b9baa08ae1bbdc18285728c97b0d49ca71bad37ee37b01a83 SHA512 a253bdcd966dbb3b0b2b078a88b8de7e9fbdf7700ce91850c0a174c3bb2f56aa04a00250e8164a5e9387699b4a6162052edb4a064293360a3b5ef62c350912df
+DIST skrooge-2.26.1.tar.xz 22138584 BLAKE2B 15328406763c69a1a746dc099be815e8c49163c5e99e5d8c985a368b1d629759c519b261b2f06b27e83bb538f6ccbf4a2a2d25ca31262f0e407805639bab7d8d SHA512 03263689310e1c7538acdd133f7b6cfcd67c51a4d426ee4512609408c91968a1369f2ef09da851958c210b4399c706ad35af5b384fcea8ec7a25705a548ae537
 EBUILD skrooge-2.24.6.ebuild 2556 BLAKE2B d1c89d00e4e0b8b870a9500fff0bb90a877fbddc8df3f397133d63c5f6d700051d7289bd662edd8921e30796fb978d43c9320ca8e1387025a68c0ae26f9ea685 SHA512 55046b4cffc5a83e7157f77021a8245fd0658ee837b5aee69e5b690ac4302e43a36e78fe3626320bef7ad89f13107e16f42464eec55ffa6a6a643e345ee3560c
+EBUILD skrooge-2.26.1.ebuild 2577 BLAKE2B 06dba2f4c9df3c2aa5e49ef6129ebef8b6e78f8ff7eab8f78226730923171e508f0a471781a2d5c596b359790fda99d8d95b6c1b911346ade35db9fa2eb7a71a SHA512 497484e885637fd8b02e20cbde85cfb2d1cc4f978faea1c05b29a1862e8988fb38cd927f1dbca3e47e7154f7ecc5e305a2667a4166db0d0115efb2c189ed755d
 MISC metadata.xml 324 BLAKE2B ffd83d73c861eb5aa5281a859162ba693bd9ac642f7475b28419aa92c512e6caeef1fcecf56faade8b9c6573f9b09c9023dbc7f1a153f59aeea9e4c7dfa30571 SHA512 a5af84ff6c29117ec87f605e4d565a133656a05a9669a6fb2190f6c8706c4cee56c40df024c0160d391ca5e74be7a3d45244a86039cd403b0f60bc0334977a7c
diff --git a/app-office/skrooge/skrooge-2.26.1.ebuild b/app-office/skrooge/skrooge-2.26.1.ebuild
new file mode 100644
index 000000000000..b169e5038dcf
--- /dev/null
+++ b/app-office/skrooge/skrooge-2.26.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
+HOMEPAGE="https://skrooge.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities kde ofx"
+
+# hangs + installs files (also requires KF5DesignerPlugin)
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	>=app-crypt/qca-2.3.0:2
+	dev-db/sqlcipher
+	dev-libs/grantlee:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5=
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	kde? ( >=kde-frameworks/krunner-${KFMIN}:5 )
+	ofx? ( dev-libs/libofx:= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+"
+BDEPEND="
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSKG_WEBENGINE=ON
+		-DSKG_WEBKIT=OFF
+		-DSKG_DESIGNER=OFF
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package kde KF5Runner)
+		$(cmake_use_find_package ofx LibOfx)
+		-DSKG_BUILD_TEST=$(usex test)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=ON
+	)
+	ecm_src_test
+}
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 7ba6d1cfda51..a30c7eabc5f0 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -3,5 +3,5 @@ AUX texmakerx_my.pri 128 BLAKE2B 2821eff5f67ac93334518b84b7e1a9b8157de8be13b3d6e
 DIST texmaker-5.0.3.tar.bz2 15783226 BLAKE2B e023b79a49629f70da234c2194230891da755ce18d0a81405f25d08825f13259f84cb5e7960ec3c2d182179e1695ba6f5b7145a2bd03e0cd0b95723ea88cd456 SHA512 fed09b1ac628f4a8cab24257f2ca35093f20a82d1a3b8c38d12878ff94f0933b7449e5ba651831612b62417426396327ea8ba64e830fe0537757abe65bcd5284
 DIST texmaker-5.0.4.tar.bz2 15812468 BLAKE2B ad252827c7db90ad20de5ca59958124714b7abe660998ef21b983a7888831aaa12fedc018a764ad8898780b18ca97b44145afe548817a867f74b407f0a2c9399 SHA512 34ff5773358c2fffbc9e7e61028cd74eef231152e3483531b66cb0d907dd8f70a4e8b6d6ea09b0b11387b592f6d1676ba8a1e737b26c86a45b16882e53edff1f
 EBUILD texmaker-5.0.3.ebuild 1701 BLAKE2B 8ce585a770cf87a30a09ee73fa23e7ce2b88b7475f4f288789e760223df800b24c1bac708e678e114f5db215be8331aafff36005613c786d78dd51137484c400 SHA512 a11a5a98bd5cc3705a2e827a517c557b97f9adc4b7d7fdbf98bc71840381889c681b0f4d22e700122254665a3d2b58eeaf73636f2076b0496dd30d5d4cbdce2b
-EBUILD texmaker-5.0.4.ebuild 1703 BLAKE2B f468b48d59975c905e45f779132de631187f4af641416e03ee628e07065585ebbbfaf4ab146b5bcaebca330f5b749325573523f57654bf64be9cdfd6d5a22967 SHA512 2383f7638fe8e73d8ee9199aa9ef3f5462a05b85b221915eaf61a5fe8564af384442df77751bc85145d4d7d584beb847955b5de2eef0db474a5db915da2cb5fb
+EBUILD texmaker-5.0.4.ebuild 1701 BLAKE2B f602de68522b4faeaac8c8029cbf857a8c24b6ca0fd6b3ccabe2eb2451a1cc0a58e433462458b7fa8fe8678bfd8cc420411f7f73f707d2bac48e7f06646765e7 SHA512 30c5914235c1828f3ec2310d4545f78869c57609591eff460b087b3d19587e25df8ce3c9c261caf92f578b53d965e8abc2d4d2c0e8166406bda8124de7101c1c
 MISC metadata.xml 255 BLAKE2B 6b27682960dec10824cb7c6a65ed79b11a5f68827ab8f8212311110a60af804b84d8d91d62745da2969736044dad091d4fcf92a9955c4ddb4ed57f5bc79e381c SHA512 91466f90d1ab836a4a6cb14dac0e7b3f585faf781a61e8fa3c95d91189034bd7723c3f27a81cad3fa44e320f70fa3973a73fac1b2cb1f694bfe3e6a7cac29191
diff --git a/app-office/texmaker/texmaker-5.0.4.ebuild b/app-office/texmaker/texmaker-5.0.4.ebuild
index d62ff665625c..c933d580dd2d 100644
--- a/app-office/texmaker/texmaker-5.0.4.ebuild
+++ b/app-office/texmaker/texmaker-5.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://xm1math.net/texmaker/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 BDEPEND="
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 97f651020a67..0b22c3bf7deb 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,3 +1,3 @@
 DIST wps-office_11.1.0.10161.XA_amd64.deb 228984666 BLAKE2B 2b2a5f2048c0e5b292571875197fa51cc5ec25bd59a03bdedad20513b203bc92ea9420881c87352cbe5a0aca25f386f773bb1e1e250fec5ba774b240fc649c95 SHA512 bdc0b8e8c04a904ed5e8f6ecf332db1217c0929dc845b63f13ea074fa508332c5272d087a0502ed92601ab964936c7b458ac5f37a72049d3a5f579649765285f
-EBUILD wps-office-11.1.0.10161-r1.ebuild 2041 BLAKE2B bbaebbac15181853f37c0657133747d982fe81f6eb9f503774df9b7aca2067aa6537e5145b342f0d9736014a331c818f765ce228657ac7c68314c008f67ee31a SHA512 ea7a25cbc7fea34df90945448af4284c1243ca60c1d737bfd5118678a1ff37d380ba32308cffd190cd27d3cb242e573f8db5250fa451203752cba1059792d370
+EBUILD wps-office-11.1.0.10161-r2.ebuild 2073 BLAKE2B 7fabbe26a855ddca1b18f20da07919b52835406f552eab8d7fbe96a30d6d412d89fbc16baaa70bf3195fcc1d5b059fcd35d8ed5a73c72ba7db77301324095554 SHA512 6b612a1c97b65a9d624c01029626829a667d15f88dce5221171fc6d5251beb438bb4beff41625e624f659886ea6ec1ac0bedf164d5aa0251c2c2fffe364404ff
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/app-office/wps-office/wps-office-11.1.0.10161-r1.ebuild b/app-office/wps-office/wps-office-11.1.0.10161-r1.ebuild
deleted file mode 100644
index 03337b3698f2..000000000000
--- a/app-office/wps-office/wps-office-11.1.0.10161-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit unpacker xdg
-
-MY_PV="$(ver_cut 4)"
-
-DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="https://www.wps.cn/product/wpslinux/ http://linux.wps.com/"
-
-KEYWORDS="~amd64"
-
-SRC_URI="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb"
-
-SLOT="0"
-RESTRICT="strip mirror" # mirror as explained at bug #547372
-QA_PREBUILT="*"
-LICENSE="WPS-EULA"
-IUSE=""
-
-# Deps got from this (listed in order):
-# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
-# ldd /opt/kingsoft/wps-office/office6/wps
-# ldd /opt/kingsoft/wps-office/office6/wpp
-RDEPEND="
-	app-arch/bzip2:0
-	app-arch/xz-utils
-	app-arch/lz4
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libbsd
-	dev-libs/libffi:0/7
-	dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	dev-libs/libpcre:3
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libsndfile
-	media-libs/libvorbis
-	media-libs/libpng:0
-	media-sound/pulseaudio
-	net-libs/libasyncns
-	net-print/cups
-	sys-apps/attr
-	sys-apps/util-linux
-	sys-apps/dbus
-	sys-apps/tcp-wrappers
-	sys-libs/libcap
-	sys-libs/zlib:0
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXv
-	x11-libs/libxcb
-	x11-libs/pango
-	virtual/glu
-"
-DEPEND=""
-BDEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m0755
-	doexe "${S}"/usr/bin/*
-
-	insinto /usr/share
-	# Skip mime subdir to not get prefence over rest of office suites
-	doins -r "${S}"/usr/share/{applications,desktop-directories,icons,templates}
-
-	insinto /opt/kingsoft/wps-office
-	doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates}
-
-	fperms 0755 /opt/kingsoft/wps-office/office6/{et,wpp,wps,wpspdf}
-}
diff --git a/app-office/wps-office/wps-office-11.1.0.10161-r2.ebuild b/app-office/wps-office/wps-office-11.1.0.10161-r2.ebuild
new file mode 100644
index 000000000000..1dcdf6a0c449
--- /dev/null
+++ b/app-office/wps-office/wps-office-11.1.0.10161-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit unpacker xdg
+
+MY_PV="$(ver_cut 4)"
+
+DESCRIPTION="WPS Office is an office productivity suite"
+HOMEPAGE="https://www.wps.cn/product/wpslinux/ http://linux.wps.com/"
+
+KEYWORDS="~amd64"
+
+SRC_URI="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb"
+
+SLOT="0"
+RESTRICT="strip mirror" # mirror as explained at bug #547372
+QA_PREBUILT="*"
+LICENSE="WPS-EULA"
+IUSE=""
+
+# Deps got from this (listed in order):
+# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
+# ldd /opt/kingsoft/wps-office/office6/wps
+# ldd /opt/kingsoft/wps-office/office6/wpp
+RDEPEND="
+	app-arch/bzip2:0
+	app-arch/xz-utils
+	app-arch/lz4
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libbsd
+	|| ( dev-libs/libffi:0/7 dev-libs/libffi-compat:7 )
+	dev-libs/libgcrypt:0
+	dev-libs/libgpg-error
+	dev-libs/libpcre:3
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/flac
+	media-libs/libogg
+	media-libs/libsndfile
+	media-libs/libvorbis
+	media-libs/libpng:0
+	media-sound/pulseaudio
+	net-libs/libasyncns
+	net-print/cups
+	sys-apps/attr
+	sys-apps/util-linux
+	sys-apps/dbus
+	sys-apps/tcp-wrappers
+	sys-libs/libcap
+	sys-libs/zlib:0
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXv
+	x11-libs/libxcb
+	x11-libs/pango
+	virtual/glu
+"
+DEPEND=""
+BDEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+	exeinto /usr/bin
+	exeopts -m0755
+	doexe "${S}"/usr/bin/*
+
+	insinto /usr/share
+	# Skip mime subdir to not get prefence over rest of office suites
+	doins -r "${S}"/usr/share/{applications,desktop-directories,icons,templates}
+
+	insinto /opt/kingsoft/wps-office
+	doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates}
+
+	fperms 0755 /opt/kingsoft/wps-office/office6/{et,wpp,wps,wpspdf}
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index ea6da105b121..fccba836c958 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 24da4d4bc259..c664d2c5385a 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -5,5 +5,5 @@ DIST eix-0.35.2.tar.xz 636616 BLAKE2B 22c9ce54bd612ff7b8a085d91727ee7b472b9c3ba7
 EBUILD eix-0.34.12.ebuild 2539 BLAKE2B 9df22e7365f6a7352edf3326d405135fb2e2ef0f2efbed1b90f0ce2e5c834a4868e30f5db1b2ff3219bdbda16ef9b557c616fce63b24d7d9379a128391982f25 SHA512 af74697e0c3da63302d117405b77b3d85cd4c27feceb1af72e3ee7d0bd7fa51e64ede71c9327de7abcdb3e32baeb54cd7c58b265d59554360d08bf378f38bddf
 EBUILD eix-0.35.0.ebuild 2547 BLAKE2B 5e181c69cde90dca9c29816e3cbe630ca70434d09544b48269f7fe5dd743afb093b8259b00f284b7964b80275a1610d129e0d84f7d9f8f152955e0591e3398da SHA512 541beaba3647be36da2847e05e79631b671130fa281462f88e65e41eddf430b5b287de0f62580ee5ea962930ac695ea1c6e2fd7015128b705433bd9d223065d3
 EBUILD eix-0.35.1.ebuild 2547 BLAKE2B 5e181c69cde90dca9c29816e3cbe630ca70434d09544b48269f7fe5dd743afb093b8259b00f284b7964b80275a1610d129e0d84f7d9f8f152955e0591e3398da SHA512 541beaba3647be36da2847e05e79631b671130fa281462f88e65e41eddf430b5b287de0f62580ee5ea962930ac695ea1c6e2fd7015128b705433bd9d223065d3
-EBUILD eix-0.35.2.ebuild 2547 BLAKE2B 5e181c69cde90dca9c29816e3cbe630ca70434d09544b48269f7fe5dd743afb093b8259b00f284b7964b80275a1610d129e0d84f7d9f8f152955e0591e3398da SHA512 541beaba3647be36da2847e05e79631b671130fa281462f88e65e41eddf430b5b287de0f62580ee5ea962930ac695ea1c6e2fd7015128b705433bd9d223065d3
+EBUILD eix-0.35.2.ebuild 2544 BLAKE2B 5606c141bf654e08bc11629060629b8265b3f1e05819c6433a5ce92f52ec0b2f0b89ad552c9ef13b954d72c391ce4eec4007df8d8b33ac18a41207d7b783f9f6 SHA512 04eccfdb9f1ebe4b16629413c0f505af2cb14577678767bad0a97b7e708b6106997c47f3d25d48a231354d42821ca63a2a79b1fb93a004a587b0863058028f03
 MISC metadata.xml 1065 BLAKE2B aba22801b07a7346aab81b420cc8eadc9aabd68f27b5943b9f5be4f98bc435bd4db09fca13356e09ca16b753e7378459001501112e8358ff552e9efc46569626 SHA512 3524a0ca51ca92fcbdb2c7b4c862d8f71da8041fc8c968cf63840266d79c52b7d5632cfc479c4e9171ea4b680e986b10861afb3e49598e1e10327587937690a9
diff --git a/app-portage/eix/eix-0.35.2.ebuild b/app-portage/eix/eix-0.35.2.ebuild
index a13024c139e6..80ba61c83ee7 100644
--- a/app-portage/eix/eix-0.35.2.ebuild
+++ b/app-portage/eix/eix-0.35.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
+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"
 IUSE="debug doc nls sqlite"
 
 DEPEND="
diff --git a/app-portage/fetchcommandwrapper/Manifest b/app-portage/fetchcommandwrapper/Manifest
index 7d7b0f54ff46..9f239cadfabb 100644
--- a/app-portage/fetchcommandwrapper/Manifest
+++ b/app-portage/fetchcommandwrapper/Manifest
@@ -1,3 +1,3 @@
 DIST fetchcommandwrapper-0.8.4.tar.gz 4553 BLAKE2B 10cf10ec5e4af355940d3f02eb7e9d4dd79ed8c13b06ed2e4c4c5c23f257e54e0825387b3b646451f3229ae6e7ec4e9c2074734204caf20389a3009fa7767a3c SHA512 e32b1a774bcc2a52356ccde8ec29a2d42de08b1e4672a0cad11a187e7996ade491dfda4fb09526e77ff5a55abfda91130cec1d0b075541d227d0e34ecb55f019
-EBUILD fetchcommandwrapper-0.8.4-r1.ebuild 687 BLAKE2B 543ea74f79a0d034f5ec7dd13bbd50446f089a5b9b6b8b67c63637477cc72fb221daae7608f540e349e64bcda6cc43fbc51164b7da56e02e02891ea3dd0ee33b SHA512 856054dd640d0d972c55e7f734e25b3daa43afc6e22d777bf87b8d06325087b98003743e4b382b2ae5c2e5ff9e7ab571beaf3ff0fac7a6d958324c287fc3a89a
+EBUILD fetchcommandwrapper-0.8.4-r1.ebuild 694 BLAKE2B cda4976d475f7a9979e9bc2edcede45bcfbac5a3f92692109f9523981fc461c79e706af9180f041d27529236a4fd2014ef8527641760f84bf5d9680f26599aa2 SHA512 1fdf60198d2f136cadace1487a6f4b35301ab9b5f8113a5d176992e6db0edb2393f487cf1006707930fb41aa437d397648e25d0a7df5734f1a66b20d3ee17636
 MISC metadata.xml 350 BLAKE2B e6a5ab6c334161cc899297d647447e23a004ec3b4466e68a50b20ae25957d740935784224f54914e9d91a3384cd7d2a88eef19687aacda05fb52430fa5c3e9b9 SHA512 700ba67b643b208acca8a25e93ec723a25d23d0b14f52866e20935fc58487401a2b0d2f90df6804f5c660427a849a3d32e520725aff2e47319d8e4ff184fc1b8
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r1.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r1.ebuild
index ceb96bf797c8..744367c0bbab 100644
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r1.ebuild
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index fa8e8215785f..c81732d4bcb2 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,6 +1,8 @@
 DIST nattka-0.2.13.tar.gz 93917 BLAKE2B 48e5245234d0ef0fd47353bac0d971d6187f59d94c0fb58f4cce160ee28f847a8fb32f8399af3148daaac299b32b590899de716dee1ee9cf107b1efe2451189f SHA512 0d3428cb3b5dee3fcdc29b9d22b5c05d626d26060fcd5518f789493fc68e51762edf9162a9b5b19c6c08fb9cb9c0e350faa41d96c53bd924b50475176140ccdb
 DIST nattka-0.2.14.tar.gz 93925 BLAKE2B 2fa31e8b4ea8aa74d2af52e5a410288715495997c328c5415a65200a077a385eacb3050e593c778194f2e519fd28d2273679d822e0be55b815e19ff38882dfe3 SHA512 28e24576606813d56c8e37cdd203960a67394893b819d846595a03fd222f6ed2fd319bc5d650f229bf7a8979d3823f28de82a87e3bb76fdaf49e9e02dbf62ac5
+DIST nattka-0.2.18.tar.gz 94668 BLAKE2B 02e656eb079b76d0eea87093e9c58b57d29b53954d9301da42eef301373c742a06f80432831cfe27b6765f83420bf37d726933e8424ed842cd80b8fae6242c04 SHA512 fb4abbedbf50dab754721585ea6c50a0e220deb83e005a4e34215f9a66536ff131aa0bb4f2e25854c853f4aab4cdce7137e909d79f609f3e4b2a9964be5bfc57
 EBUILD nattka-0.2.13.ebuild 875 BLAKE2B 24bfcc07d615796c60c42dd28359891c30b1d2a6f05e263260062bcf359abb93df2053a953c3aca10712d520736b2c541a2c58040e5f253c399024510a6aaa53 SHA512 3182ea2999de12771ed47e91d9a84a39fb0f949ac9a14fa22ce2c7a699f97eb9bdd90a32c4ed1f9772a6d2f67f0dbe1a92e114c4e4c0f9180f6cc4a31b043149
 EBUILD nattka-0.2.14.ebuild 883 BLAKE2B aaa7d1f3ca53f47b3beb2f031373e9b752dfa2b8f79cf4fe01ba9e5f39a29590ab881303073b656b7c7cba3139c2005c9350573fef91e09650c365e72ab51a98 SHA512 285526769a6fb52ef61dce8304c78da9eadad72d780cdc27fbe5db1a2cad3a1bf5f192d509efd8e5811b6ec6913519dee6a000884230540b3cb28bcd8da053c6
+EBUILD nattka-0.2.18.ebuild 883 BLAKE2B aaa7d1f3ca53f47b3beb2f031373e9b752dfa2b8f79cf4fe01ba9e5f39a29590ab881303073b656b7c7cba3139c2005c9350573fef91e09650c365e72ab51a98 SHA512 285526769a6fb52ef61dce8304c78da9eadad72d780cdc27fbe5db1a2cad3a1bf5f192d509efd8e5811b6ec6913519dee6a000884230540b3cb28bcd8da053c6
 EBUILD nattka-9999.ebuild 818 BLAKE2B 2532291ee841df3052269b4cce9dd5ff17777ef2f2364e1e55c17be1462095e9002648d43f4e7e155e8ba4ff086fd05dd02f81fe336876ea18cf57cf1c6e7f43 SHA512 a8449aa98fbd5b0501e4fd1f91bb7df96f717efbf32acbecc349beba84ceaadceeef9ca9ac300e289de1df33f7d1a0507c038d2ee72b7dfc62533c95c0f9b9f4
 MISC metadata.xml 384 BLAKE2B 190cdbb5b8976f88c21c364eedd2548b16d7a0bdd72c546058271b9b70fe98fe52d29e26f16cf6039aee0be0a89d058ca80da3dbfbe7c8cfa9906c7797cf2393 SHA512 6f50634a08f13a36a3b8070e4cf41dcc8517e4677f973709003996321e38a61dd049a5415eaf3c12dfe21f03c347f3729e02c4740c012e2c4e9133230e9fc971
diff --git a/app-portage/nattka/nattka-0.2.18.ebuild b/app-portage/nattka/nattka-0.2.18.ebuild
new file mode 100644
index 000000000000..75261fa77b65
--- /dev/null
+++ b/app-portage/nattka/nattka-0.2.18.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
+HOMEPAGE="https://github.com/mgorny/nattka/"
+SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="depgraph-order"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-util/pkgcheck[${PYTHON_USEDEP}]
+	dev-vcs/git
+	sys-apps/pkgcore[${PYTHON_USEDEP}]
+	depgraph-order? (
+		dev-python/networkx[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	test? (
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f97f626a5306..90b7ef2eaeb1 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index 2295f745a6bc..d6d51afa3b44 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -1,4 +1,4 @@
 DIST fbreader-0.99.4-combined.patch 23589 BLAKE2B 81cb00abe9ba0f40723e6c1cac626916f90eede960d8b191bcb48c8186be8fc3d1fb18954f62e3ba5f15de159034a6060dc7efaf94f9531aabad9f76b6f53658 SHA512 c4dd5237113fa9d54ae3e63a19a06841570e5751108befe4d18ae7b4730628d3a4a5613dd302bc426b14c280f2b5abf9e394aedca821de995efb45ae7b32f632
 DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
-EBUILD fbreader-0.99.4-r5.ebuild 2044 BLAKE2B 4304693bb3ef9c76a768c15793cfa19bc8ff65d89150e38d603a2fd6e462b70b30c564c81288240db29a9414962537aed8fd41cf12c1bfa18ed48821df58b69f SHA512 11e6b89b3eff7e76437fa9b212264e9196bf82b4cb07e4cf0561492092dc5d88658676dd9a808e768313142999dd03c009c2bc118bf569b4f404058a845cff4b
-MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
+EBUILD fbreader-0.99.4-r5.ebuild 2004 BLAKE2B 50a43f8a9dc9cecf7e695baf2a29343e3e0bb88f47306f2f8226ac648c9c97992511e24b8b4dde17a05b08982113cc10ceb01b1893b74b23ea0e5699e466d39a SHA512 bf2e6d50be1739b7e69375c125d1bb7e43b607231620c93085392b4794ac5461bd4daf88e840130601e479d62b8feb8502374935ac8fdc1d8c7e4f634b9d2327
+MISC metadata.xml 299 BLAKE2B a270cef2ee64c0bf7da5db864e8747ab6ccd8485d4286574a59d57940cc80d70313b7773b502bb6bc63ccc5236c8b9c989ff1717d1cc2db9384fc4049dad0d3c SHA512 05bc9818c41502f60b21bf6b8ea839566712c894b6dafc242e7554c38d0a2526ed08a997021cec0f94c9735bdca99cc5062eacf4dd02a1bc6aac743cbdfe76c6
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
index b3b298ab9d81..76413d99296f 100644
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic qmake-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="E-Book Reader. Supports many e-book formats"
 HOMEPAGE="https://www.fbreader.org/"
@@ -39,8 +39,6 @@ PATCHES=( "${DISTDIR}"/${P}-combined.patch )
 src_prepare() {
 	default
 
-	append-cflags -std=c++11
-
 	# Let portage decide about the compiler
 	sed -e "/^CC = /d" \
 		-i makefiles/arch/desktop.mk || die "removing CC line failed"
diff --git a/app-text/fbreader/metadata.xml b/app-text/fbreader/metadata.xml
index 13830225acf7..c7713ae7f270 100644
--- a/app-text/fbreader/metadata.xml
+++ b/app-text/fbreader/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>grozin@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">geometer/FBReader</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 166a4f2e552c..89762e62fa88 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -2,7 +2,7 @@ AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c
 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
 DIST highlight-3.60.tar.bz2 1412486 BLAKE2B 3651a44c7e492ce02de04d21ed2e25afb40e871e21eacef88416f98226046e99a2a0a27c3354119715f320df1653ad7065c1c9a4a23b3081971df4d72c6fa19c SHA512 e4d0822592675115c7c2121d6ed066f997d315fecea384caeb506de1933f6bd60fd0dea57dcdafba85465f9f6b922ed168db57ce725bd7f19689d30624412f1b
 DIST highlight-4.1.tar.bz2 1469115 BLAKE2B 9ee4c61ea5ebdfd04c2bb341838cc66a755d5deb6dfb5d863d22dbb86be9b5d08999f22bb184053126bdaf8858777eb2ac504fed8998dc51bd6e1cd64f911ad8 SHA512 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731
-EBUILD highlight-3.57-r100.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
-EBUILD highlight-3.60.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
-EBUILD highlight-4.1.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
+EBUILD highlight-3.57-r100.ebuild 2392 BLAKE2B a3de7dd2b7c503d9f2231d0e2850d673e338eb10ed49c01bc43fd4520577c148b4d566515f143a1e23ce081e17529185db960f882e6457fa2a7b921f452a9bf0 SHA512 d8cf9752b5a3127bbc3a3db03a9473ba7fc551135eca0c7d61ac33aae0f496c1ddc756c0ff02df33455e4c46ec308232966288f3954085dc0224f70e66746eea
+EBUILD highlight-3.60.ebuild 2392 BLAKE2B a3de7dd2b7c503d9f2231d0e2850d673e338eb10ed49c01bc43fd4520577c148b4d566515f143a1e23ce081e17529185db960f882e6457fa2a7b921f452a9bf0 SHA512 d8cf9752b5a3127bbc3a3db03a9473ba7fc551135eca0c7d61ac33aae0f496c1ddc756c0ff02df33455e4c46ec308232966288f3954085dc0224f70e66746eea
+EBUILD highlight-4.1.ebuild 2399 BLAKE2B d22a7f2b7fcf146645e5c92f55feac8a3187afaa81b97b6178431e2df8fae954fe545704eaf5fc43edd46c6b157dbfe18cc80e73b30909300657332c09f0c573 SHA512 0a3a58ef57735e2c847e8ff7ad4b8fe4f707d4a8b092f1360719be010f107a7b5a58da9ed780c67d792b9eca5f31437093dbd6340325b9d10b50eed9e4e6b393
 MISC metadata.xml 330 BLAKE2B 3e7c157a3d1763cb2b5c6c65a9259c03ac3863056d55ddb6eddbb76e66f98bcd11f87a04ddae616657f88e0a6b1f7bab0d028b97c8b0091ab8daa9e8fb5bc70a SHA512 3b6739ebce190bd586ad2e1657460b3540ae5056f2f90fdeb68121da3215e32dc382a1e965038968ec23f0c46d4626231f1e261aa7aca184dc8e08d80a82a681
diff --git a/app-text/highlight/highlight-3.57-r100.ebuild b/app-text/highlight/highlight-3.57-r100.ebuild
index 30e6ae8553b7..b302b8a2f602 100644
--- a/app-text/highlight/highlight-3.57-r100.ebuild
+++ b/app-text/highlight/highlight-3.57-r100.ebuild
@@ -42,7 +42,7 @@ myhlopts=(
 	"CXX=$(tc-getCXX)"
 	"AR=$(tc-getAR)"
 	"LDFLAGS=${LDFLAGS}"
-	"CFLAGS=${CXXFLAGS} -DNDEBUG -std=c++11"
+	"CFLAGS=${CXXFLAGS} -DNDEBUG"
 	"DESTDIR=${D}"
 	"PREFIX=${EPREFIX}/usr"
 	"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
diff --git a/app-text/highlight/highlight-3.60.ebuild b/app-text/highlight/highlight-3.60.ebuild
index 30e6ae8553b7..b302b8a2f602 100644
--- a/app-text/highlight/highlight-3.60.ebuild
+++ b/app-text/highlight/highlight-3.60.ebuild
@@ -42,7 +42,7 @@ myhlopts=(
 	"CXX=$(tc-getCXX)"
 	"AR=$(tc-getAR)"
 	"LDFLAGS=${LDFLAGS}"
-	"CFLAGS=${CXXFLAGS} -DNDEBUG -std=c++11"
+	"CFLAGS=${CXXFLAGS} -DNDEBUG"
 	"DESTDIR=${D}"
 	"PREFIX=${EPREFIX}/usr"
 	"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
diff --git a/app-text/highlight/highlight-4.1.ebuild b/app-text/highlight/highlight-4.1.ebuild
index 30e6ae8553b7..0772a0b94e40 100644
--- a/app-text/highlight/highlight-4.1.ebuild
+++ b/app-text/highlight/highlight-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
@@ -42,7 +42,7 @@ myhlopts=(
 	"CXX=$(tc-getCXX)"
 	"AR=$(tc-getAR)"
 	"LDFLAGS=${LDFLAGS}"
-	"CFLAGS=${CXXFLAGS} -DNDEBUG -std=c++11"
+	"CFLAGS=${CXXFLAGS} -DNDEBUG"
 	"DESTDIR=${D}"
 	"PREFIX=${EPREFIX}/usr"
 	"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
diff --git a/app-text/ocrad/Manifest b/app-text/ocrad/Manifest
index d0f0d2ee8adf..93d5e0532805 100644
--- a/app-text/ocrad/Manifest
+++ b/app-text/ocrad/Manifest
@@ -1,5 +1,5 @@
 DIST ocrad-0.26.tar.lz 91450 BLAKE2B 9ce2324c30ce3236689236ff2f7079d89078c61c4c78efef8c7c34fad2351fdc59a67a1ef995b3ec1b64620f7262563126c0305e3ffda3c5ec04ee5cf4c39a05 SHA512 6cf4c97c4dbbc3a623192de2da261e4854dc3082a26d9731fd00feb8ed371cb18d41f5a8ed992f98e2a00aed68d60f1f3aa90b05f8472431fcf5bc5e3d10e70c
 DIST ocrad-0.27.tar.lz 91709 BLAKE2B 4dd152e6ccbd41d2ce7e7e3d4fc38e30af4f0bb9c36e32b1f32e67772347af133cf67a8b89c03d5c9924a1d4ffa009205b80609cdb96a59b3dbeb76709a8e8e1 SHA512 2a4731e0e26eefe6d37b08859c4d3cc2b54180411b0f846f7b7e873b9da5b4596ca3c6042ee42284a07aadfeb96d953dce3e95ce2410e48624d1b6020750539c
 EBUILD ocrad-0.26.ebuild 741 BLAKE2B b83ff39ca3eef412ea85a4ae8ced8a1425ac823a7297e22b4ea042c6e3deeacc11b93c402aaf65b8f4fc140961927a478b77d5092f9cc49f48a4150a81116e71 SHA512 f6fdb86395f1bb67f971f64d8e8e294df1850ed657cdc72d2bcf196c002498e26edfe49b1e963f1e5ee9bf4932800e9bff9a48bcfd0e49c97f1e3757d131e476
-EBUILD ocrad-0.27.ebuild 743 BLAKE2B 5e7e5f3b189d5cd46b0e6eedb772d707d8720b0b2596f2d2976d6275928f7defbedbd2b39e3631bd19a0118701c8807dc92f8834575eba4a8b824393600a19b6 SHA512 96834d5e6ecafdf80b67c88fd53f6a1993acb80a306ffb7923d384ea5e718230170f58be5f4881310ab8d1f58f0085e01931e6486d0197999863e7c7d068ed94
+EBUILD ocrad-0.27.ebuild 741 BLAKE2B c9dc2762e4cf62b178f9372b9af6b438f7024da5cb70bd837a0fe80b984652f71092a0c073a61fc31f19a73c96ab5ee7bd0ec9c4663521953b1e3a9630f4f25f SHA512 e45f7fb91165cb3b0d55d2bb1238837822dd4d9abd09b3be7d95b19bbf5f35d5e3856be9721a296075bcda5c5f4b20b67c61be0c65791db8327ebe0dcd17b2ab
 MISC metadata.xml 496 BLAKE2B 08ddfa7a7988624d9d48b627c5f29205a0615b73e956d9520f53ac0be56bf64303474fffbe02236c8c18a8cd3e0b5573d08c1f42a37d09a7f57e69f043867e17 SHA512 702db4a3d253c553bb6ca651e80da98099fa6bb275e3b166eb43f7324a9165a6d2db397b9339ad2909d6c276029a8dbfab63bb7d8087dfe2c78345b7ed8088c0
diff --git a/app-text/ocrad/ocrad-0.27.ebuild b/app-text/ocrad/ocrad-0.27.ebuild
index c47145c8d4dc..d7001dd7c77e 100644
--- a/app-text/ocrad/ocrad-0.27.ebuild
+++ b/app-text/ocrad/ocrad-0.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 
 DEPEND="$(unpacker_src_uri_depends)"
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index db815adef777..d557ac1dd0d3 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,6 +6,6 @@ DIST poppler-21.06.1.tar.xz 1708344 BLAKE2B 424888e16c72e9ad37fcb0aa3ecc7bef8c61
 DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
 EBUILD poppler-21.05.0.ebuild 3275 BLAKE2B 68c1ae9c653cc9f1ef2ec69f31729ba20d76ab5ee7eac8e19091e38f1eddb9d73714a69c0cda3df1abf9736d4dc1599f5754421da76b2b1adaaf729cb8d619e4 SHA512 e23de4db062620e849b62a511221b7871b0f1e927189c6e7424271f0eac7945a5af929ad12a604ee43fe7e00c2c49d2c99b9e74d955ca8ba64506fbaf473fc65
 EBUILD poppler-21.06.1.ebuild 3361 BLAKE2B cb35da96c00145776278ae7847683e30de056d73700d999ccca7614df7ef61058d0d2dba16cab47fa0c9854642a69303dac5d914700e489876d286ba95e74ef8 SHA512 5f6813eafcb7a90a0c5233d26d7d8803baa658d8c48ad8f6d0119bce04923336619de53c315c18a5822e1536c13967817f88d87a96c4533ea49d280aa1d63755
-EBUILD poppler-21.07.0.ebuild 3344 BLAKE2B c1faab826aaa80beac6c9ce7020c1a024a4b2210ad61e6de325795adb7e636309d8c7eba1f5184fb3ce2e8f097ac9ae695c2c4ab98568d9299bf0b620cd52ec1 SHA512 51b6cc650a061cef541a37d3f3c54b25cc7796e110185735c4b445e7969bc5505bd4c681d047ee4c55107464c9f2c6124743ec497b4b9d8f4e67600f125f4f92
+EBUILD poppler-21.07.0.ebuild 3339 BLAKE2B fa5a0f1aee4edc405149d5573b917320eb8748054687222ba9dab6c61105af7286022bfc7d7b685aff174966a7d0db1274dddf9464343fd4e35a4dd6d5c53921 SHA512 c0f8caf6a63c76024c668e8f98cdb67ddd5ff3a0798cd54d1276a1aecae54324dcbbd291e308a4e322eefa61ff13a34027fe86bbd9f464a8fc9873da6a41af48
 EBUILD poppler-9999.ebuild 3340 BLAKE2B 916235fb20cb98652c0f5fe4f738b513d8a987e2f9c94965ebdf7a7b284b2f317977f0cd43c2cfb0786db4b5bf90ec659dbd7f7b0ba401a63d139c892a396ec0 SHA512 17b37f071e8136c0b8be0924909e5000ff7f36af97e8917b282ba08536aedd6c1bf32674be101e48585a5e4744e36238565bae7fe73f96c323abeb816f39cb54
 MISC metadata.xml 1077 BLAKE2B c49251ca6f1d793da24746e5161d43b01550c560fb942d64298c19a889c531f4c5fab967cde87f7063ecb4789a6586e40ca519b196633912ccb55ed568a650cf SHA512 c09156d438acc9cf85e77fd1f57262596c28f305559d9635d4a457189f88e56e0689e102ad60d2be998b9e286c36ed45227e95ae5e9ce6a247662331d44f2076
diff --git a/app-text/poppler/poppler-21.07.0.ebuild b/app-text/poppler/poppler-21.07.0.ebuild
index 5f7e7038ad76..ccde4b8643bb 100644
--- a/app-text/poppler/poppler-21.07.0.ebuild
+++ b/app-text/poppler/poppler-21.07.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/111"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 2d826b89528c..720309c76ff3 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,5 +1,5 @@
-DIST sigil-1.4.3.tar.gz 24118565 BLAKE2B 4da0829cc82efe48c71c2a5d0be8477fd85291acd9578c14bd26f4521d2fd2322bec4c30002235254b9e731730a56b79787723059ba63884b75b33614cd94f39 SHA512 2f1e13a78a361df9b9031d5c04831d7e3ff09d16ed9cbd198b7735a4700f86e367f607554e805eb50db1a4562cbca33a8fb9cdf8167a95a43cbc2668ceb5550c
 DIST sigil-1.5.1.tar.gz 20020962 BLAKE2B ac70c117d69c4062d66151372fc8cbede48be6f38ceae7d1dd1bd49fd8a0a4a352c885a120e00ba729e64ebfa928103d07f7bb85d69cbb3385f640f4fcf42985 SHA512 281c8327f7a05b9c9f805b02ef4c21f50d340a2f9e09dcae74be30aad107b0f2605801f0239e9a503db70afa2b37b7931dfec0efa5662dde906ce6c014da8849
-EBUILD sigil-1.4.3.ebuild 2012 BLAKE2B cc0ff455a7cea95499872c82fe675f30ea360b5a6a2777bc448dd913dc0b896cf43c168d372dd4a61bce59e00aaf101643613217ea44bbe45aefa596b3608a1e SHA512 39ca3e0970b166450afe0c955725d99e89b2ba67f30e0d3d348fd87c6b1caef97201dc61286fec258dbc0e1de8c0f3542e2964b8f8217051855d0261256050be
+DIST sigil-1.7.0.tar.gz 21315598 BLAKE2B 29f7c682925d1e1bbff082e96b747ce32df82d78406ccd984b4f8de1f01944c35aa86587ce47a18687d5fe281b8cb656085b52d3a1e72ed17862501121d9d134 SHA512 9918bb0bfbe3d068c95bb31cd84a37a0fac6dd6be9e94cb382e8c0140cdb375f47384f33c62fdff7f27aed379037a4a64e8d4a1065ae297bb389e2be78597c16
 EBUILD sigil-1.5.1.ebuild 2012 BLAKE2B cc0ff455a7cea95499872c82fe675f30ea360b5a6a2777bc448dd913dc0b896cf43c168d372dd4a61bce59e00aaf101643613217ea44bbe45aefa596b3608a1e SHA512 39ca3e0970b166450afe0c955725d99e89b2ba67f30e0d3d348fd87c6b1caef97201dc61286fec258dbc0e1de8c0f3542e2964b8f8217051855d0261256050be
+EBUILD sigil-1.7.0.ebuild 1856 BLAKE2B 33eae27a66f606c38abb130e73a81bf08a4ce8077f3a512f46158c637dcf1284058fcb151defd9c23cafafb06af53c6a9672b6a518ab77f6ef6cefaa83dec4d0 SHA512 5d75662a62912f2f8f03371a7c43eb75a6fd296d4b1120e1ed6450aedf466b856e2aa50e73e935654993059c46f97bb6e7cb04e82b14ded87b99546d7612c128
 MISC metadata.xml 962 BLAKE2B 1f90625c7778f97227f27708f6ca94cc002fc587dab80ed64c0c8c1a809a759da20174ccc4ada91411ae1c9ed761600129caba3fdf81cae97ab544db46bf3258 SHA512 67046450741a9553bbb826b4ae1db7b99e9b09d53a7036fe13fd3c2a99ef41ed02efb6a3a2a2e72e845cf8c28395e87c949de0efc160910be2a6c02ed8b60aa5
diff --git a/app-text/sigil/sigil-1.4.3.ebuild b/app-text/sigil/sigil-1.4.3.ebuild
deleted file mode 100644
index c7f5b33a10e8..000000000000
--- a/app-text/sigil/sigil-1.4.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="tk"
-
-inherit cmake python-single-r1 xdg-utils
-
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+plugins system-mathjax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell:=
-	dev-libs/libpcre:3=[pcre16]
-	$(python_gen_cond_dep \
-		'dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]')
-	>=dev-qt/qtconcurrent-5.12:5
-	>=dev-qt/qtcore-5.12:5
-	>=dev-qt/qtgui-5.12:5
-	>=dev-qt/qtprintsupport-5.12:5
-	>=dev-qt/qtwebengine-5.12:5[widgets]
-	>=dev-qt/qtwidgets-5.12:5
-	sys-libs/zlib[minizip]
-	plugins? ( $(python_gen_cond_dep \
-		'dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/dulwich[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]') )
-	system-mathjax? ( dev-libs/mathjax )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/Sigil-${PV}"
-
-DOCS=( ChangeLog.txt README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_BUNDLED_DICTS=0
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-	)
-	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_fix_shebang "${ED}"/usr/share/sigil/
-	python_optimize "${ED}"/usr/share/sigil/
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/sigil/sigil-1.7.0.ebuild b/app-text/sigil/sigil-1.7.0.ebuild
new file mode 100644
index 000000000000..0b2453ffe0da
--- /dev/null
+++ b/app-text/sigil/sigil-1.7.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="tk"
+
+inherit xdg cmake python-single-r1
+
+DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
+SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="GPL-3+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins system-mathjax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/hunspell:=
+	dev-libs/libpcre:3=[pcre16]
+	$(python_gen_cond_dep '
+		dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]')
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	sys-libs/zlib[minizip]
+	plugins? ( $(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/dulwich[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]') )
+	system-mathjax? ( dev-libs/mathjax )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( ChangeLog.txt README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_BUNDLED_DICTS=0
+		-DUSE_SYSTEM_LIBS=1
+		-DSYSTEM_LIBS_REQUIRED=1
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+	)
+	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_fix_shebang "${ED}"/usr/share/sigil/
+	python_optimize "${ED}"/usr/share/sigil/
+}
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index ff5aaad0f236..7d4a1014448b 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/nginx-syntax/Manifest b/app-vim/nginx-syntax/Manifest
index a9678fec7ab5..55f868c77758 100644
--- a/app-vim/nginx-syntax/Manifest
+++ b/app-vim/nginx-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST nginx-syntax-0.3.3.tar.bz2 5675 BLAKE2B d642a6f34b10f1f4d32c772a3c434e30cba5a26c03234c76658c15a9216723a12893414699db9c998e31445c658db0d33db0e4967713b2863b73e71a059e09e3 SHA512 0142c9b825b9f9c262145c0d202651f020e5b3f3f3548ecbdd713cf66c5f7098b974e7d16eedfa9d722c2efdfbd9732097bf8b293a610a64c21571ec66a5886d
-EBUILD nginx-syntax-0.3.3.ebuild 327 BLAKE2B e64d6824c8eb4d877ce36ff5ca88d483ae8b188e8eba0c9807696f0b8896f1fbd0ac022b30555783d380099818189d086c44d65604e1fa675a973069db4bae09 SHA512 d81217ea3767838de625d512e42b2d911827c6edd1d45f512a2c8a96ece1359c56cd90e670903e08f979369c3f02b5d6b59b5a0500e152f1c5c72d8ca15718cc
+EBUILD nginx-syntax-0.3.3.ebuild 334 BLAKE2B 49ef4ddf174005f41128c7355cb63f25c2ff879e9277992510c3d17519005855d5e449007645eba00bb65277b1b6bff6d087e1b2a509e66abb2e9e93a3e73924 SHA512 f74c4e467ff74a09c50ead128a340dd4734570a28ad0b91e08296683cf9729fe46b165466d82b1bab764277b22cb653529b67527ccae3ffa3bfe5ebcb6c6e5a5
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
index 758e8e92c085..88de49d32a1d 100644
--- a/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
+++ b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
@@ -8,4 +8,4 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Nginx configuration files syntax"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1886"
 LICENSE="vim"
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index bc5238324329..a4384a6a5585 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 1c54c0b58883..d3ce89a5245f 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,7 +1,9 @@
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
 DIST Catch2-2.13.4.tar.gz 656645 BLAKE2B 7a8afb099d410af3a7641c948a59307ac72338174356c1219834f050e0971e410275f1eda911444c3e956320fa25b60f91a3aba75aa36d375ba38626a0246485 SHA512 eac081d750e65d4d8d8d5f32b53bd963c6566caabaff424c479fe080416f59b5387adbdf6dbac30fe265243cb5ed184baf6f8a9625052bd498c098b83463390d
+DIST Catch2-2.13.6.tar.gz 659811 BLAKE2B d876c51589259ef9fa9640811c17049ee5f1559a2863d146b0d8f79e9531b3528db34bc23e4fee090436a92b430756442eee4820083e71225da0f24399131a73 SHA512 f63e240994b5982cf019a33b8999b62237cce174962f00437d64fd287b34f7217d066225d99322431ef60da67b025f36db703dab94b3d58bbd81095d98917278
 EBUILD catch-1.12.2.ebuild 822 BLAKE2B 52621e2c55af3d4591bace41a4c21a49bd4e19a94685f7bcdc5214fbc9765ad3f0105fb5181e080b413f644dc572c2d283354d6b41a2ef3d5bde24a7cf9694d3 SHA512 8d8985429614e0276c5e3a95406bb363b0e405fd670bf078af9edc598fc5d1a8cd22703bf6b02a2fdf7a7de533e064f5b8824a6903e5707fc70df140d7daa8ed
 EBUILD catch-1.9999.ebuild 812 BLAKE2B 9b65c1ee08f9a4b25bdf2f2e8961e725902936cd9818c6227459493e53b771ffc2a4c396fd40f3feec715d95c2fa901ccee8c4f42680d2da08d058c0701fad1e SHA512 c3766bec94da74b8a4e2e54078e1b6b71db5a5403865123798ac00584e57fb8ebc6e29db40e5e426aebef26929ec1b89c997f717d2b6b4bc6e218f04c19b4832
 EBUILD catch-2.13.4.ebuild 914 BLAKE2B 3dfcc8823cc2f69d66fd255005f8aacd4a78813127f16dc84e9ecaffceee5d1430c4a06e790ec3a12c3bd0fc627da4df8e04f041283ecfe75fd2846e2468198c SHA512 6bff9973c470a356fb495ce003e910e5c645352abbb9facd6686269a5b5e14c753c18b0e1e90aee452263dbc2e791f03922a8df836fdc0ae9847c2d9b4d78528
+EBUILD catch-2.13.6.ebuild 910 BLAKE2B fef5a8ee3771f072401f0d5af0805dee98ea1b84a6ebaeaa9e59a7c97a7d5a3da9d202b092a50eeaeb865308029f7c9f77bc4d25e5a09e1a0bd9724f0ae03edf SHA512 3dc06f4b01fea561422692e27fc55389da99f0860931b8bc40b581db74488921d5e22a169eb4011ac855bab94d1504b12b407ce54db14020a22aab6ec5801aea
 EBUILD catch-9999.ebuild 957 BLAKE2B d8834959413b85dc5a5181a060a4e75730d5b258b113024e7e426793dfab806475bec2dd02ec24149086e98cfcc35e1def04a63b604f2fd98cf53034616586be SHA512 ded76b95e18991428e08d15533ec76db77226687955888f8db016d35c47aa00d25cac0e1749899dd5884d28c7f2e3afa77976ce3505f5e47a3e652c62383ef38
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
diff --git a/dev-cpp/catch/catch-2.13.6.ebuild b/dev-cpp/catch/catch-2.13.6.ebuild
new file mode 100644
index 000000000000..dcf3ff6e1181
--- /dev/null
+++ b/dev-cpp/catch/catch-2.13.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
+else
+	MY_P=${PN^}2-${PV}
+	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Modern C++ header-only framework for unit-tests"
+HOMEPAGE="https://github.com/catchorg/Catch2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCATCH_ENABLE_WERROR=OFF
+		-DBUILD_TESTING=$(usex test)
+	)
+	use test &&
+		mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/notcurses/Manifest b/dev-cpp/notcurses/Manifest
index 8b2b1cbe6b5b..5d37279bd446 100644
--- a/dev-cpp/notcurses/Manifest
+++ b/dev-cpp/notcurses/Manifest
@@ -1,4 +1,4 @@
-DIST notcurses-2.3.6.tar.gz 11835854 BLAKE2B d701d032db2596c9772396862fb240e3f4797c699c13f331ae0aec8aaaf874fd3547f001c27af1d4cee7ea3e85c6d1fe5e74ef05da9832b197ab297a63badf60 SHA512 132a033adad18d261c12de8de0227fa2b3d91c3dc10680919b9401a09d7643fe16bd4b8fa1a868ded7d4fd9f002e437b8ea9b3c464a22fcdecd8f102a05a68b4
-DIST notcurses-doc-2.3.6.tar.gz 124425 BLAKE2B 9edf3498b0f1ac9c0d6f9724715e33eeb6d008c515c16acb104ed92f066251e570b1cc9917e71465f21ed7d66702ae2f6c9aa303cca092b14a92b093048c413a SHA512 9bdbb6c1603dbcd1800ef6f72c2ae3f143625fd9be40f497df7473086f57a8fe6483e27db5905f0951f4e1ff4c988781cec71eb32d5fd574abb5aab2f7763c4e
-EBUILD notcurses-2.3.6.ebuild 1146 BLAKE2B f127e77839e49fb8b5bef79db19fe222e1fd9fe74bd183b65b4ca44b4a155a2f3e7d6481aafec8cc21f3c793cb33119b2471c4c213a57c91ebe27357a136afcb SHA512 50a76ff1d6b274f4f0ed24c5ddf4e5b022174a523d0b66e9f556c644c898a51e27ab334882df8d1313c74c367293bb9e3f7c32eee624e1fe795532722e3113ab
+DIST notcurses-2.3.12.tar.gz 12180246 BLAKE2B 9e5f5bfc6853b8ad04f33efa823b4365f496ae5ec854c40c19b1a17690c0f2ece4902673d13ce02f7ccf337393472fac60bce5fd63a0529fc3903195d0547282 SHA512 83cbc91fcee871aa88eca3857930e9767a743c889aa8a85bf5bf26d46ba739adfd8edf67bf53b92383de58cfdc9a761d0854a7689fb30a0d5d1e2872c27e5c48
+DIST notcurses-doc-2.3.12.tar.gz 128286 BLAKE2B 048e799ffd17f980f6653e3b639238c529fc613677a7b4e413296e87b0abd7ade4e63518ad8dd944691b2cb9e77812bb32efb337a991366351872597f2df2081 SHA512 c1636a2a4ee72dde60adcf0ebadf3c2265901ae99337ed3e91dfe915c518703f69bd302a85fd5733ca490abe89bf5fb65994945cdf27dd27a0d13d800800c4e6
+EBUILD notcurses-2.3.12.ebuild 1161 BLAKE2B 5630d0c846b910a0b60380f63f21bcc180abe6d47beb4ea796a097ac6b4956acb048b8f393782dd71f328faa5471a06a8e4b3300d1ca3de17ff13eabfd3ef121 SHA512 bfad666bfda214b9545ae9332770f14a36f9314d8311324fb5ecd39f0f1420e24f7965aec581d35aaad4c5713145a4c53a25aecef90b9262701d633b78fe26bf
 MISC metadata.xml 869 BLAKE2B c5414b2e27b44526c56e9c476d8c5540a3d7b462b70ed6e3e323c0dbee15c704055cc7d17bf270fbb7a6125bfa10a2934c9d56d5c727d73df0c8125ec30671d6 SHA512 f893bc5d9b44d26e178250432be8762524543f0c124c932d535e4f9742924d27a26b065a5d1275dc451f23b0ff72a55a2f5107749021081e7e399617de132f17
diff --git a/dev-cpp/notcurses/notcurses-2.3.12.ebuild b/dev-cpp/notcurses/notcurses-2.3.12.ebuild
new file mode 100644
index 000000000000..012a4e34675c
--- /dev/null
+++ b/dev-cpp/notcurses/notcurses-2.3.12.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+inherit cmake-multilib
+
+DESCRIPTION="Blingful TUIs and character graphics"
+HOMEPAGE="https://notcurses.com"
+SRC_URI="https://github.com/dankamongmen/notcurses/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/dankamongmen/notcurses/releases/download/v${PV}/notcurses-doc-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libunistring
+	media-video/ffmpeg
+	>=sys-libs/readline-8.0
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_DOCTEST=OFF
+		-DUSE_MULTIMEDIA=ffmpeg
+		-DUSE_PANDOC=OFF
+		-DUSE_QRCODEGEN=OFF
+		-DUSE_STATIC=OFF
+	)
+	cmake-multilib_src_configure
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+}
+
+src_test() {
+	multilib_src_test
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	# we use this tortured form lest we try, every time we release a
+	# x.y.1 or x.y.3, to install the source dir as a man page.
+	# exploit the fact that there's a bijection from html<>man.
+	for i in ../*.html ; do
+		doman ../$(basename ${i} .html || die)
+	done
+}
diff --git a/dev-cpp/notcurses/notcurses-2.3.6.ebuild b/dev-cpp/notcurses/notcurses-2.3.6.ebuild
deleted file mode 100644
index db8a559116e6..000000000000
--- a/dev-cpp/notcurses/notcurses-2.3.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS="cmake"
-inherit cmake-multilib
-
-DESCRIPTION="Blingful TUIs and character graphics"
-HOMEPAGE="https://notcurses.com"
-SRC_URI="https://github.com/dankamongmen/notcurses/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/dankamongmen/notcurses/releases/download/v${PV}/notcurses-doc-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/libunistring
-	media-video/ffmpeg
-	>=sys-libs/readline-8.0"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_DOCTEST=OFF
-		-DUSE_MULTIMEDIA=ffmpeg
-		-DUSE_PANDOC=OFF
-		-DUSE_QRCODEGEN=OFF
-		-DUSE_STATIC=OFF
-	)
-	cmake-multilib_src_configure
-}
-
-src_compile() {
-	cmake-multilib_src_compile
-}
-
-src_test() {
-	multilib_src_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# we use this tortured form lest we try, every time we release a
-	# x.y.1 or x.y.3, to install the source dir as a man page.
-	# exploit the fact that there's a bijection from html<>man.
-	for i in ../*.html ; do
-		doman ../$(basename ${i} .html || die)
-	done
-}
diff --git a/dev-cpp/tree/Manifest b/dev-cpp/tree/Manifest
index 31401cf33a2e..316d5f428479 100644
--- a/dev-cpp/tree/Manifest
+++ b/dev-cpp/tree/Manifest
@@ -3,5 +3,5 @@ AUX tree-2.81-test.patch 550 BLAKE2B fe73799591f7f0c65d2f031792bc87b2d85bc143bf4
 DIST tree-2.81.tar.gz 1167128 BLAKE2B ea92724b16fc7ea8a5f0036f5a7a57d000d66b332b4ba46139463f707f95922f38b1d4d56a6d2fca0a3c4ece8f11e28bbf4aa6bec5c5a7bc59ccaa36a01413d6 SHA512 85e910fdb19ffd03ae79302a95ebffdb44725fd9f291a61d6912f743b54fe9b3d1c863e00c7e75d238f428946809e42c7ae6379b1051688fb06ee6c6d761d294
 DIST tree-3.17.tar.gz 1178425 BLAKE2B f59239b861c0495c48036d0fffa49370d4cd78a94bfc35348bbbe0232a3c1221293a23366a6289429adabcb00b21292288ce085fa54f74dc204537c95c5b7c37 SHA512 af11f693c13dd37dddf016751c0f975c21d7a5ad405879e18fbe5387400ee1fcfb42942ee8888efffcb0c985d7875f2698591139aeb18b4809e83e225a743112
 EBUILD tree-2.81.ebuild 811 BLAKE2B 2b55073288c7c192ad70c07289cfb950d0f5b5a50d6374e6ca456ba3b62ce1fa0aaad4430d0479492978622e4d6efde76c33c8b1371ceea2441a2e07866190fe SHA512 3e6f39990b5457f9e55078b1625be939a05c33ad7fd40cdb7b64d726ba0b5ed183fcd9ee029d3a12498309529874b10a2b5fd228821e48299c05d1cd4ab8f003
-EBUILD tree-3.17.ebuild 746 BLAKE2B bb2bbc293508182fd862b6288db20b191272cf2580cfcde626e76c07a8cbe21ee44756ccb92bae02e551f8a23ad9b7446bddd8bbcdbac338d1044bb58dc72ec1 SHA512 a970cc1243baa432db7ad20b31e73246e36d1b188effc0c74e3f403d17443daf1b6843b4455c48bccc9b03f6f13381920822968914b3e5cfc17b51187908b106
+EBUILD tree-3.17.ebuild 743 BLAKE2B ee1f494c9b7a0b29c220135e3304e638e45e820718967582814de04e66626ec8dbb6c132fb4e739c4b7cdc49f89f9398da9516fa3900ec8bedeb5a3cc3491c08 SHA512 4d45fa7d72cf2aba431d8fb4560dbae9608b0f6152433c2844af683b767495bbcec666b11bb967b48ce178ed2f28bf11cba2d4699fe31f8dd30b1ae4f67d1a9b
 MISC metadata.xml 619 BLAKE2B ac5307e69727d5da71a21955619b8e322df63ebd877617c70b494ad541c470ef6df41a90ddf92b132452c293e2fbcbb85f2b72ee372f95491124ab50f7299ce2 SHA512 b2486910e891482643fc8464b11269ca6f83e87a8403edb78b2163e7fa37586b503597f0ea61332439322d257ad239d0c0a210707788043d555a96f3b712cc84
diff --git a/dev-cpp/tree/tree-3.17.ebuild b/dev-cpp/tree/tree-3.17.ebuild
index a07ad494486f..725e4cac0b55 100644
--- a/dev-cpp/tree/tree-3.17.ebuild
+++ b/dev-cpp/tree/tree-3.17.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}.hh-${PV}"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 src_configure() {
 	tc-export CXX
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 1b16593e8fc4..7628954f99eb 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/citus/Manifest b/dev-db/citus/Manifest
index fc9cfeec4857..ad0d86076df7 100644
--- a/dev-db/citus/Manifest
+++ b/dev-db/citus/Manifest
@@ -1,7 +1,13 @@
 DIST citus-10.0.2.tar.gz 5154816 BLAKE2B ace68ec3dcce3e2e9d872b85a864a49f026ba2c0c8b0919bb057b60921094a922f6fed8bc6482b3c31dad396550348d51a514aff0d877d851b871bb5b97773f3 SHA512 3f831c1efd1a54b9dee587f64eae2466691f8d8316643e459d00219c8ca710ea9d12aeac4f0e2e01cadc3dee29f2d8e59f9757d794e9b0bedfbe6ae107815957
 DIST citus-10.0.3.tar.gz 5165390 BLAKE2B ac9bca488cc5546d56f2b5dd2a14733a776fe8da6900650f0a41b0ee223af6b4ea56152e5351346c43de2c96d13b099cf8054692d038a2e8e73d7fc1ba423649 SHA512 1144642e460babca6919d1ddc1f00bfaaba5abc0b24869627fb230781d158f54d34e7c3039a65d79c46682a0e1732bebde3f16b25670a249753afdd7fb81de52
+DIST citus-10.0.4.tar.gz 5176434 BLAKE2B d77acf228b3effcdd47a300d74ce813632ad08d746b2b05cbad42accc9806b0e1d7c190a442a7d09bc1970fa1d1ee731e0125f83ec227fc72f8509e66dc43975 SHA512 73fae991c9176e14b92f2309856b2aa22ad34056573f21a918b82b05dbdc584a2874fbe9cc1b161e0a0c743d06aba8fc6079f81e07aeaebe15771d83f6f2e3ef
+DIST citus-10.1.0.tar.gz 5273973 BLAKE2B b9b17d29e1e213d99779e738a6333beaa0f817872194b345c719663971251ba1430feb7e5508923fe7ecc7df763b9c3a7a43e03d869e5cac6b64cac2370750d6 SHA512 7f3bf01e08a2f8087b570a9b54224878cbbeacaa19115f3dd3e4f45a517af59e920d6a1fc490f86c9d0148de118d2b1f6cab65a5df2b3729793ec70d85a4ba22
 DIST citus-9.5.4.tar.gz 4718209 BLAKE2B 706726c8ca6ffb38321e3b91395924e9b778c106096393992080f511338a7ae559f94336bb015508900f85290bd17cda8ef9ce6dbdc2e254f3daf7a09e243bf6 SHA512 3d5e956354e094811675b646a5baf75c26a3ac593c56ac5b6c4c711671002f78fb98a1a4879c4cc967fc4381ae971311f5d73ddadc78a39b66c3108978d677b6
+DIST citus-9.5.6.tar.gz 4723294 BLAKE2B f3e714c754e6f855322ded2f8e73b29e1d8b1d0bf81a68aa69a3b3ddb09a79aa1c088032fb294fb38b86b75bfd6211d0b1f8586252c53336df40dd94a0e3be1f SHA512 b711885e03424c0302c732a654c1b27fd088efc447a4481aeef124684e6c4fd01d2f535d1ebb8cd645df020895228a6450aaed9e00bf2666ab718c96c62c5423
 EBUILD citus-10.0.2.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
 EBUILD citus-10.0.3.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
+EBUILD citus-10.0.4.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
+EBUILD citus-10.1.0.ebuild 573 BLAKE2B a5572761f51a81157e42dc6d860cd0a8b91857102aa027b0e23d9aaff092798ebc3efa4fa560b5e52b3e7ddb37be79c7bb26c181e6f87c544862e47583bca25e SHA512 dede570d1b403a461bd9ded53857dcec565c52d11b1475074e40e0ad2ab74fe34bad726857025087152aaf7be7e53f00f89b068a51ca1f9dd58e6447a5d809fd
 EBUILD citus-9.5.4.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
+EBUILD citus-9.5.6.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
 MISC metadata.xml 280 BLAKE2B 75bfaba3095bd67dfa80654885579e51053fd130ae4e3ad61ac75192eebad9fe8d08cbdf63773dad3837ef2805e0594d0823655966fde8876ba5919e01f0e698 SHA512 efb5fb6652ac8cd75fff4eea8b2b044a2c9201cce2faf3bbe13a97565d150e64f9ba0dd8bb691a44a1b6726455306ea8b6c1b121678a721a82e7ea8b6589c94f
diff --git a/dev-db/citus/citus-10.0.4.ebuild b/dev-db/citus/citus-10.0.4.ebuild
new file mode 100644
index 000000000000..4bb39ab5f008
--- /dev/null
+++ b/dev-db/citus/citus-10.0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 11 12 13 )
+
+inherit postgres-multi
+
+DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
+HOMEPAGE="https://www.citusdata.com/"
+SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+LICENSE="POSTGRESQL AGPL-3"
+
+KEYWORDS="~amd64"
+
+SLOT=0
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}
+	app-arch/lz4
+	app-arch/zstd
+	"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	postgres-multi_foreach econf
+}
diff --git a/dev-db/citus/citus-10.1.0.ebuild b/dev-db/citus/citus-10.1.0.ebuild
new file mode 100644
index 000000000000..7c1f0e8ac75c
--- /dev/null
+++ b/dev-db/citus/citus-10.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 12 13 )
+
+inherit postgres-multi
+
+DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
+HOMEPAGE="https://www.citusdata.com/"
+SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+LICENSE="POSTGRESQL AGPL-3"
+
+KEYWORDS="~amd64"
+
+SLOT=0
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}
+	app-arch/lz4
+	app-arch/zstd
+	"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	postgres-multi_foreach econf
+}
diff --git a/dev-db/citus/citus-9.5.6.ebuild b/dev-db/citus/citus-9.5.6.ebuild
new file mode 100644
index 000000000000..4bb39ab5f008
--- /dev/null
+++ b/dev-db/citus/citus-9.5.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 11 12 13 )
+
+inherit postgres-multi
+
+DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
+HOMEPAGE="https://www.citusdata.com/"
+SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+LICENSE="POSTGRESQL AGPL-3"
+
+KEYWORDS="~amd64"
+
+SLOT=0
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}
+	app-arch/lz4
+	app-arch/zstd
+	"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	postgres-multi_foreach econf
+}
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 1fc51437f9ad..a7829fbc7797 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -232,9 +232,9 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLA
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
-EBUILD etcd-3.3.23.ebuild 2306 BLAKE2B a6eeb3fa9e8f6f0d240b44c115994f5e93e8f1ee562e88ba0307156336635f597d1b58c242577baf1b50f57bb8ab77ac33ae80c04941c4538686afebbe332d3d SHA512 60d7f589f92afb66801e4ea30006fde9f6976587595cb6ec3de3351f0733bb9b40c980f3b97d78931e314d0f4c93c2206358ad28072d1beeac87d2534a5ea9a7
-EBUILD etcd-3.3.24.ebuild 2021 BLAKE2B 246302b4346900e1a08f35c10e671930d9488b6e254f18f5746fa2e3552e007d165bef4dd65ed550e4778c612dddb0e7299e64261e1bd5922abeb44272600ef3 SHA512 006c625c6dacca95a5026ca882c5201de65c275910df497ad6663729836910a568be2ec7001f5247ef5d2cb344608e3c2dcb6703b42c84aa326a6e9102ce59ed
-EBUILD etcd-3.4.10.ebuild 2021 BLAKE2B c8bef5978243cb9b0017c7b114fa9839b406ec96de8f3cff5748768c4290ffd8670c4b67905de48d298c3b557dd640a3f33be6c4ca73ae84eb63afbef6444100 SHA512 a3399faef05a679736fef259b91fa06cbea44cfdb4f3acc86466b1aabc645014118b142cba993c7400c81a280059ec33e5b5bc32bfcf397cb754a5d3fe5debf7
-EBUILD etcd-3.4.11.ebuild 2021 BLAKE2B 4cc8a8b9c5a357bc6a5ff1a6f85a10e861d100db43cd30e02548f8d9eb8ed02c21002469a2db7efb528715a7b3650367fa47aadd9b334a4dced3001ea1861770 SHA512 759c0add461da1899382161a07ef1dc0da841a037c937a061a72ea381aa71de41b917053b9765884917c2578f67dcf8bf23016e01cbf8074d4112982ef58513f
-EBUILD etcd-3.4.14.ebuild 13586 BLAKE2B 548c156b5872210329929dfb3ac60830a99dd7555fb3360fb40e2d162e49441bda354ae762bbaa7634785aff7e28d4a9e70612baaf690e3ca83ec5c5c64114e8 SHA512 c37e313703e6bfd8c295a6acf7d6a507cbd3d699b3c9e5744f3b884c400e430fad031946989676c649147149dbdfa6809e24c2c142c75016cfcd6ef85fbe57d8
+EBUILD etcd-3.3.23.ebuild 2381 BLAKE2B ce52af82475f51fc98340a411851ca452172b394d8882488d9d1ff244b2ec8a6af333e63666a31dac2332e7c529e28d19bc8461c1c050232cde5eb6ed73e09e1 SHA512 ff533214ef12ebbd5b3aa8b8e7cc40298dff1fc0bffa9074e5063c5450d37247ec0915499171e8d6649f089e60a65f9bcb23f24e9eafbd0fc80d58d187de6044
+EBUILD etcd-3.3.24.ebuild 2096 BLAKE2B 3a3cd4275452e640e5444b041cd0b129327fcfdd649234ecb5e56c5ae491dab020a19b5cf6e9457d7a37e40b49aef0922539f2e858e36e86575055ab8caadd38 SHA512 6dffe2d033ebf443fd8039419764f27b9150b6f7256e8161367786aebe814fec1742d8215755e078b8158622c73345d5d0edb7213c145f0001ce2954b256d64e
+EBUILD etcd-3.4.10.ebuild 2096 BLAKE2B f7a807e38e50bc32746f4e161090b4a2c6fd4bd16eb80af7f4f52d4b481895eb706a18a4c91c15014ac7321e842b140f36fe14b84ec59f746cc07fba2bfaa767 SHA512 e221c476c263c0d7c0e1faf5912996f5927c5c2a39c18639ff27e57748233427a58c18b0c41e7f2b3ccca8c250e5e8db338e67e180ca04085401d02cf61bb8af
+EBUILD etcd-3.4.11.ebuild 2096 BLAKE2B 64db87167be9207ef373a3ecf812e9d378e6ebb30185d87b05eb3a69233b169d30185540437ea5610c58f8a380e539a52541a99caa3f1910c26345d746bad3cd SHA512 48eaade159c4a96fd91f0830b6a2e586ef2ef6b174de9910ba6750b06602fa3c35087ebd2ed8611f83d0b4e5c69946becb990a1f3bb3170590e23d413f8d08dc
+EBUILD etcd-3.4.14.ebuild 13661 BLAKE2B 267155a457e30b5bb389fb0ac5cf8cf75bd344408c7fcb4f8818be764fcf1d3df1db89f34780d13a732ce056d86e8697c93e24343a49606d52c489dd4f7f148a SHA512 30c7e62fa4fd19d0d72b9b6e02277a614f0c246bba9fa8fa163e70140e95b32c013b1c6447ac107561a7ee80afc36da9dd5bb59d2582cc5692b495bf7eb26aed
 MISC metadata.xml 573 BLAKE2B 48714fc34469739cf1fea338b8e686726692ee45be8f3b841e747cdb9f5f13f5e2964ced9423de8a2cde26fef9a0b9ee24e42c8ad6db43a4151194ee4b115029 SHA512 8162b96dd5984554115e7c889d3c6c015a5c07dc553baea6fd1d6263bde02b20bf0d9a411c93f06b537698958994f9d975782c8770cb33793776bf5fb7f999b7
diff --git a/dev-db/etcd/etcd-3.3.23.ebuild b/dev-db/etcd/etcd-3.3.23.ebuild
index 8381d1a4fae4..cf8a5c817d79 100644
--- a/dev-db/etcd/etcd-3.3.23.ebuild
+++ b/dev-db/etcd/etcd-3.3.23.ebuild
@@ -59,6 +59,10 @@ src_compile() {
 	 ./build || die
 }
 
+src_test() {
+	./test || die
+}
+
 src_install() {
 	dobin bin/etcdctl
 	use doc && dodoc -r Documentation
@@ -82,6 +86,8 @@ src_install() {
 	fi
 }
 
-src_test() {
-	./test || die
+pkg_postinst() {
+	if use server; then
+		tmpfiles_process ${PN}.conf
+	fi
 }
diff --git a/dev-db/etcd/etcd-3.3.24.ebuild b/dev-db/etcd/etcd-3.3.24.ebuild
index d42802d3d244..cfe02273d71b 100644
--- a/dev-db/etcd/etcd-3.3.24.ebuild
+++ b/dev-db/etcd/etcd-3.3.24.ebuild
@@ -52,6 +52,10 @@ src_compile() {
 	 ./build || die
 }
 
+src_test() {
+	./test || die
+}
+
 src_install() {
 	dobin bin/etcdctl
 	use doc && dodoc -r Documentation
@@ -75,6 +79,8 @@ src_install() {
 	fi
 }
 
-src_test() {
-	./test || die
+pkg_postinst() {
+	if use server; then
+		tmpfiles_process ${PN}.conf
+	fi
 }
diff --git a/dev-db/etcd/etcd-3.4.10.ebuild b/dev-db/etcd/etcd-3.4.10.ebuild
index 4cc5cd41c5e2..052158ea52e9 100644
--- a/dev-db/etcd/etcd-3.4.10.ebuild
+++ b/dev-db/etcd/etcd-3.4.10.ebuild
@@ -52,6 +52,10 @@ src_compile() {
 	 ./build || die
 }
 
+src_test() {
+	./test || die
+}
+
 src_install() {
 	dobin bin/etcdctl
 	use doc && dodoc -r Documentation
@@ -75,6 +79,8 @@ src_install() {
 	fi
 }
 
-src_test() {
-	./test || die
+pkg_postinst() {
+	if use server; then
+		tmpfiles_process ${PN}.conf
+	fi
 }
diff --git a/dev-db/etcd/etcd-3.4.11.ebuild b/dev-db/etcd/etcd-3.4.11.ebuild
index bb9e9a16f55c..572b8ec43e15 100644
--- a/dev-db/etcd/etcd-3.4.11.ebuild
+++ b/dev-db/etcd/etcd-3.4.11.ebuild
@@ -52,6 +52,10 @@ src_compile() {
 	 ./build || die
 }
 
+src_test() {
+	./test || die
+}
+
 src_install() {
 	dobin bin/etcdctl
 	use doc && dodoc -r Documentation
@@ -75,6 +79,8 @@ src_install() {
 	fi
 }
 
-src_test() {
-	./test || die
+pkg_postinst() {
+	if use server; then
+		tmpfiles_process ${PN}.conf
+	fi
 }
diff --git a/dev-db/etcd/etcd-3.4.14.ebuild b/dev-db/etcd/etcd-3.4.14.ebuild
index 63f03f9e8d4f..b21d65258252 100644
--- a/dev-db/etcd/etcd-3.4.14.ebuild
+++ b/dev-db/etcd/etcd-3.4.14.ebuild
@@ -281,6 +281,10 @@ src_compile() {
 	 ./build || die
 }
 
+src_test() {
+	./test || die
+}
+
 src_install() {
 	dobin bin/etcdctl
 	use doc && dodoc -r Documentation
@@ -304,6 +308,8 @@ src_install() {
 	fi
 }
 
-src_test() {
-	./test || die
+pkg_postinst() {
+	if use server; then
+		tmpfiles_process ${PN}.conf
+	fi
 }
diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index c878b2ef1869..cca4b597ac47 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -8,5 +8,5 @@ DIST libiodbc-3.52.14.tar.gz 800285 BLAKE2B 6d6c52ae6eb133c5d844a9106079878290a3
 DIST libiodbc-3.52.15.tar.gz 658200 BLAKE2B 856855f424e31629e3c3fb11f31e189d22daee877e989622a4f5c2a9c7145697a639fd79bd7bdc17be03176b0ee34a3bc02afe958c278531de0f9b9685947988 SHA512 843a938c961c77e12b6c5571fa7c5528e547c028e213195e72224166cebb49acb746e2e1e636c37991686d9e476dfd64ee42bb113013f01b4201d6d9cf99c3bd
 EBUILD libiodbc-3.52.12-r1.ebuild 1643 BLAKE2B dea967ae40cab28a3d998d093ba65ea4e0d2d9f8dc47c947385b75472bf77103a19e9bed748f6801217d7ebabb36c4e9cffc6aba737b7359440acb8b203901f8 SHA512 7d77fe762ff7c2fc04dfa34eec505494fab7516942e8093b64d8b518e97235b216e9ed3d198a202f587ef0934ebbbdf74da9a3d2f4443d05badb6d5341e58071
 EBUILD libiodbc-3.52.14.ebuild 1590 BLAKE2B 9cf5ef322d0d9d12419256f9e48db9fe04c91a94732e985f8bde1a7c649ec4b189f1a05ae3ee9cd53d7310da167d6b14b48eb0a4f492538c75f0289ee214d4e8 SHA512 793e1aab33388fda664e23b33f65dd41b89752fda3986a1bd4d8638e5bad9eb8f62708fa62ce44ea005885f8f1a64477c8cef82f840b6885dbc8da0ad92c2129
-EBUILD libiodbc-3.52.15.ebuild 1598 BLAKE2B 9d1e47306d4d86d0a34558f419c0677541eb46ef4ba21dd2c5cce5896ef64e754618565c55ee4351921bb1d5ab0b864e18217557ca3d6522c0fd34fdc0ebfbdd SHA512 d463fe93d4aab5f5c26433a317e37977c552b43dc12911b0ac3c488120cca604133f251618c027740c746603e75c272b6ce8f650ae43941aecbfc139a1c3b07f
+EBUILD libiodbc-3.52.15.ebuild 1591 BLAKE2B 77dcd48c9cd5ef1e5cf2ad5ead395f5559ba844b8de7b026e1c085861f36ed5a7d334d52729616c5033330caf4529074d5c0e8463f2036a7e7cf2fc5682e13a3 SHA512 7e85a80693881cae2ed30cd1473440d8137476409cdff4b21407554dbd45b25155fc940aafbf8f7c15938b27adb94fe5f757d4399d4217cd596db5df61052ef1
 MISC metadata.xml 251 BLAKE2B de1fe040cd23515516e31a81c78089f5fb4b9240f43a659d0e6981665bec427ebfe5f68bbea534b92dd4352f42e366c2070d3ef3e7fc0d3beee880445d973bef SHA512 ec0eb5cbc30d0a7ad8c74612255d84a473c370d977f9be4c95904eb5281060bbe3c23d97fb9537e844bbaf90c2f6dd1fae891d44628bbca29fbecb0fe0cb8bbd
diff --git a/dev-db/libiodbc/libiodbc-3.52.15.ebuild b/dev-db/libiodbc/libiodbc-3.52.15.ebuild
index e7acaba82d3f..bfc9387465e1 100644
--- a/dev-db/libiodbc/libiodbc-3.52.15.ebuild
+++ b/dev-db/libiodbc/libiodbc-3.52.15.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="|| ( LGPL-2 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )"
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 3e853b7ed62a..f0f7adf3886f 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -42,16 +42,16 @@ EBUILD mariadb-10.2.34-r1.ebuild 33768 BLAKE2B 2b667af186c56c34aa4811c897338a577
 EBUILD mariadb-10.2.35-r1.ebuild 33827 BLAKE2B adae13f4088dc225309d397515c8ee988857164628b34e8119bfbf6d279be3ca43a4c4fee346e23f8cbabd8e3d22020358da4a1e5318f8286cf7547aa0040401 SHA512 d1b3d89d084f11dcd03847bad555fdaa6589e320b1ceaf48a66368a69e4afccdd1431d6ea0a7bbcf10ce527c3e590b91eef0a56ef2dd150018560a723e40fa44
 EBUILD mariadb-10.2.36-r1.ebuild 33822 BLAKE2B b40a7f91ada12281e719d2104a6664df00cdf7a00dfa6ddfc06e2e3bd019242e608e80bdde4068d7d13200bd5ff4459a7a1bde65fedd4285b7437bf032950bc4 SHA512 141c66d81dbcb04e677d4124bafc86bd9f5bb04d4b51580d3172ebb6323f7f58f95410bf72a0033290b2cd6094a86395555c19a7e4cf57afacb9b5e55a95fa59
 EBUILD mariadb-10.2.37-r4.ebuild 41525 BLAKE2B de4885bfb27431c1d23c9496bf498a5be11d3bd398047ed6541379c0e422a6759859d6895eb27932cb40502c472b86d766c3cbd3a390a116cb6ee1060bd6831e SHA512 f44c81f92c49fc883586d988d2a0930ee0b06497cd136dc2992b041adea8b09ec2694ea57d340ebbe31a4e67888ce05f0eb2b61d366500a0d68a896397af306f
-EBUILD mariadb-10.2.38-r1.ebuild 41755 BLAKE2B 4d52765bdb0fc46e3c4dac19ba15b4700835e76666ad906f6c519a7123e462f478c4656d5930a0ce58638e24932fd337fa3745aa3f4bb739cf6fce7874d09c74 SHA512 2e420dfe7f9c0352cbd90370ead28119140dc2cafed2812cc6ed9c4bf5229d8a5724ce075c6e6207d8f1a4fc78f19029905349943d3ac8a688c75fe3b8648051
+EBUILD mariadb-10.2.38-r1.ebuild 41754 BLAKE2B f22455e75b197c6c1d1cd79ad8a4f10beac00d0e3c20c2f62ccb69f3651fd25b4a5523d222e1074ca01922a2fab84191a834ee8182591e695b7758f599227c19 SHA512 f9f9f81a9f9954dceb6fa26d4f9a4efaead59b587f8fbd19807da79c35e4ade3c7f434ee53b97e3ca239e3d1d3bc706318c2a466951aa62d7407a592a171828e
 EBUILD mariadb-10.3.27-r1.ebuild 33335 BLAKE2B da048552e021b826491eda064a6ca2deb9e7bb1a072c7742d83c48a487416989839d151278f62d05482d45003074bd5a6101424e6691c3a48fcfffdf0f3dde87 SHA512 7614cd9cb76f9ae92d5c1cf5862d6d7e40421e686f97654d3b2c68e0a666a14504445ff6648262a18a94af4a1b83f002f8db88d917e677c5e0bc6ee8d09a0da8
 EBUILD mariadb-10.3.28-r4.ebuild 41057 BLAKE2B e3cebad5a639a16ae3db81a52ee0ca5403a9513de2812b4bc8bd78f691912249da43a40fd4a048f0f793037e81a22ae2b4f8bc87bda68dcbcc5176efe9aec14b SHA512 7984168020200cf847ff397cbd4a4f8e9744d2506af10bcc16f3982c00a576dad9fe8870e487dd8998fa6320555eba8f7de62cf3959c0958a56321defaeb05a5
-EBUILD mariadb-10.3.29-r1.ebuild 41311 BLAKE2B 4be9f384362bfb5b1be34a2b752c32cf3f2080d5312b34a16b7e6f3bb632d85f6186a372d1f2749f751748034dfffd009a486d9760e104422229e4229670cba9 SHA512 72959af848d7d12df1f6c614d8a0a3defbbab9b91b05fe252c6666909094ad0ec94f8f337bab086bd8925e8a8112c642d7f72b3290e8e0d058294c3b5bde0dc9
+EBUILD mariadb-10.3.29-r1.ebuild 41310 BLAKE2B e3f1b9afa0e8b600d0a24cf2f0dc631eb5add48c6188274cff680ec127faf72d7e76a5f52c56efd77ffd5e31d7083d0fb87b9deca0b8ab18d3e57229bd8522c5 SHA512 851f9d72480344188915a3b8d4ec082308578803fd109c3a253a764d95b2a334d45be47532157d9bfcf604de50e248e8599409956876b9126d02600ee4bbc56f
 EBUILD mariadb-10.4.13-r4.ebuild 33955 BLAKE2B f06a7288dc01c7d11380f75a118dec8649d5f03d3bc376be44842c911effcec144b863b37500ff828f0d88a0cac041c29d4ba2b19f74e8f30e8277e255a57a26 SHA512 c65c25a7cd4dcbe57ce7245ff05968761a29e5d1c7ef69736268cc28bead8013fc70181e0322bce3ecb5e0a14d3c794c6fc06db06eb5c38cda0ec886ba3dc95f
 EBUILD mariadb-10.4.15-r1.ebuild 33986 BLAKE2B 07c94a20a76c3bd354ba6905acdfb24020ac1b82b7838bc3f78cb35eb308d9943ce60aa84253696337271f1733d1ce9aba3d08f59f41472cc3aa09f6b13e83bd SHA512 264df0c6bfa2bbe8f424b794e83c450cb7a59845fdeb286ea9d9fd9694e28b3e7bd3667925f4f9c07edb55dae7089cd0379d78e437598a9c9570e7167c242eea
 EBUILD mariadb-10.4.16-r1.ebuild 34119 BLAKE2B a2e9a0ca1a8d5be628eb2205a0f7b30a3e8f44e96f11bc92a8d69ee1208a3146b91b67a76ef215f221d0f31335d54925f5805de8b9476ae0220d3d15ea2bbf86 SHA512 5565d8ead2d1817a14fc46915f30b36b72e1760290582b2d9f9035769280db63197c1e7f0271ba6396fa99dec7cd8c2b6c9b331d9daa35935c2221ca3bb0b533
 EBUILD mariadb-10.4.17-r1.ebuild 34114 BLAKE2B 878cee3ab2d1b836ca6abdae13ba22e449a558ae6b429dbc5cf991ab41dd6fadd54c4141f7943ed6bfc467fbb2aaef737eafaf7e5fe3f2f92d6e0c9e23a75194 SHA512 659d7550bdd1eb580e28a710f3267f9673ee37ed0b8479cce9dbc2e3c9642018edaf2453dbd4e07680d76f867a298e28e2a0eb2f759a6ae55898335a4236fae5
 EBUILD mariadb-10.4.18-r4.ebuild 41614 BLAKE2B 0dcc328990ba19513e8e3930ebcd186c28c9ef52c0644db7298fb7a47981147a866117ddfc99136dfc2ccee8d3687ba0fd792d4fc061e584068a14e365f7d0ae SHA512 fc39145a63140ce0496d8b6cb003019de68eb24063d13baa0c1f27f97e803b5c4fb45a7ff4091b10add05a7fd19cf5177350837a7640d2c72c17f972ae15d51e
-EBUILD mariadb-10.4.19-r1.ebuild 42023 BLAKE2B 8ce14391589a0df73b6f2f100b9cb7fd680d057ce9bfafc51c2f6d8e18fd218004da26ae2affbe47ba6e2bcf8756daf2381d25d9d2955a50d5189e92aba8598f SHA512 383c511249db093c010fe54863cec7f39c86de69f2c4e5d2586a0e235175465c834fe8e479feddf476493b5ae201f9345c9785eb7fac1b6435d36f130e2a6b9e
-EBUILD mariadb-10.5.10-r1.ebuild 41447 BLAKE2B dbe99c0aa52367596551c6954a6f75e2d95639ab7c8835ce60c6c55546aa229a18c7a69db19ee19e12e7836ae881521a7a9556b6ae3b3f5c0b207e66d0304cde SHA512 79d98adbcd1fe30f0c3a5f8b1df53a7b4e798c33c148d8c7a23f02bc31175ad1eadefef24f152681053a82ed10de7099f623ccffb9cf9439d8bc7fbc5dbbaf66
+EBUILD mariadb-10.4.19-r1.ebuild 42022 BLAKE2B 1965cc832edb0cd426598ac24404ffc844b902cb9e9f56789524317ee77358c10d6a696d99f381172dd9fa74918656c2f0ad767520dbd840144c35d4ab00bdb6 SHA512 aa97eb90c9b28a0fb35889c43595d69e7d47938a96748db207366507dff457768a6d1428478f19c1c661231d2692b809b76efeba3fb8932b08b426f812413bdc
+EBUILD mariadb-10.5.10-r1.ebuild 41446 BLAKE2B 71fae3cbb88c3b5f99ec9c96695b02f4b27f702090c49f15c8873b640f55435f8de00a70817484a54820d9cd3c8234c61f8d0df8dd83179c514c96130b258339 SHA512 821d3b09025475f023feff22c28a2f3eb6ea7ebe65e6a25a369a223a0e35b7e767b8684dcd4c0729f81090e76a58a2707fb0ad918329c38c0874597269642539
 EBUILD mariadb-10.5.9-r6.ebuild 41112 BLAKE2B ddf6ef3f0176acf4d2a5ed9933a1246dcccbe4cbec4930f3fc435f1725d1932938b2cc37abf0f1428aa35e914cc594b7ad5a4a4d3b78286a2a7c88a2a84231b4 SHA512 57f3140ec63bf88e12b2ae9c1bff7bd585baefd0849a99f585d3df63729818caf02b562b63dfc8266f29664f704af19782296722f12bd2230e517c601deb3fb7
 MISC metadata.xml 2625 BLAKE2B 649e3bfdce49ed2352d31849a7d4547e0eeee23fab8ee58705fab62f8e1dee1874885027897bcb2895def5dcfeeea66caa69f83161ac1cfd19154a8712bdf573 SHA512 edbbfc7be64f124c0969f7de67337ba0b579292837d10e18da56b7e4e1cca88a36ac304e7c2625d9ae2bcf625d632a707f9813a0382242fc3d59d384b5b7bd54
diff --git a/dev-db/mariadb/mariadb-10.2.38-r1.ebuild b/dev-db/mariadb/mariadb-10.2.38-r1.ebuild
index ce5b4bee8a98..b345d2d922a8 100644
--- a/dev-db/mariadb/mariadb-10.2.38-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.38-r1.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.3.29-r1.ebuild b/dev-db/mariadb/mariadb-10.3.29-r1.ebuild
index 41b6508de74a..7cca8553ddee 100644
--- a/dev-db/mariadb/mariadb-10.3.29-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.29-r1.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.4.19-r1.ebuild b/dev-db/mariadb/mariadb-10.4.19-r1.ebuild
index 1b6f65b0eac8..6f9fd4728a2d 100644
--- a/dev-db/mariadb/mariadb-10.4.19-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.19-r1.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.5.10-r1.ebuild b/dev-db/mariadb/mariadb-10.5.10-r1.ebuild
index 6c847922246a..6cc60759fbac 100644
--- a/dev-db/mariadb/mariadb-10.5.10-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.10-r1.ebuild
@@ -31,7 +31,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/opendbx/Manifest b/dev-db/opendbx/Manifest
index 55c5b518ec8d..0e320ec792cf 100644
--- a/dev-db/opendbx/Manifest
+++ b/dev-db/opendbx/Manifest
@@ -5,6 +5,6 @@ DIST opendbx-1.4.5.tar.gz 582915 BLAKE2B 7a11947f73ba3a3d407fecf7600589b64a6a80b
 DIST opendbx-1.4.6.tar.gz 587514 BLAKE2B 0a6c983ac1ebdc3ad9390185938f32e13ba9ff2ced6d41390421e1e3a1e9eb639a85d89da7ce2dd67f05fd2fcaebb2f53146f43678e548511403d8cdc4de88da SHA512 dd6d53d29157057dbf4e273fd82c7694e8bc626d3409d6ab9c25627a0fec96418326550fa8004b5341facdc4cd8aae12516224e8bb84e2562482885780ff0e55
 EBUILD opendbx-1.4.5-r1.ebuild 2228 BLAKE2B 832e135e2c0e9b9d67767f49f75d913e456121d4dfaeeddfc0ce54d94da743c72555710ba220beaf50742eacc2bcfde0ae4fa8af4ce9aabb5c9add3de9d772c2 SHA512 05578fa43e0c395ef539cfea5b1c1e5f2d13275a2980220161836a25607c497eb6f77f3f4d2a3fe6d26cb8199158a5b64b92e93773b44a0ad6cc07cbe3d977a1
 EBUILD opendbx-1.4.6-r2.ebuild 2230 BLAKE2B 82bc09a1a2a2fa313b3c9b98ed65cce5b47bc3f1e914b7dca6950bc7df2afca4f29015ab2c01ae7b29f646e3cb4cb2d965a3199b35ff3cd8f07d1d45e0c350ec SHA512 a01eed48b3b438fbc225783d69cda10f57760996dabbda414c2fb9f4a264b22228a92da8b0283456a70bba5ce60e9c0cbd1d41887b58927b7dc66f4792d188cb
-EBUILD opendbx-1.4.6-r3.ebuild 2384 BLAKE2B 687c10c90f28357007d90c9fdb1c4355821b8232622a966cac968564f02c83c8b1b96a2e8e3e033c70cbeb3a02898c42f64cc9f86daa4916534b9a2826a09c27 SHA512 8ef6b5a8eb1177e185146d36f515a71b4d169f158cb45d92f87b2f62553c342b9fa593171e0fbfc5fd0c5b070c0ab371767f27c9969fa1c51f4e98e795416078
+EBUILD opendbx-1.4.6-r3.ebuild 2428 BLAKE2B c5d092a166a0d8cdcb07c6a20babea8e77770f97a8130aceea7c77b12df3f9e1f677b7b50caccc049839c31ca23f7754ca20351493014c8e53afdcd343f56a52 SHA512 7f0b73d7d80aa3361f665ea1dcbd9977ca27c54f00703cba4790664f04af73531a49a66fb76bbe829c896060e058c72323f1707adab3116e9ce1a359cc4accc0
 EBUILD opendbx-1.5.0-r2.ebuild 2298 BLAKE2B 934f07d98faa671002a3523f7394c8d7c3d6151b315e190a68316b8909eec1a252ddc34f04ab80993ac3f45362c5020789e87456608e9b063fba9fe046d9d772 SHA512 5c14130f10516e2c24186faed421dd130647e7d739dd7261e972b85a1cf428e249aed227e2d322d40047b732687462713528489cfdae1f8cb710336a70e5775d
 MISC metadata.xml 243 BLAKE2B 1d641d0445b6ef43e1ca3ca3f967b0580b0a5ba444509e092a8a51bba18564136091c2dacd69ed723e36cb851b3962176a8aca06d3b2e604cf089c4983dbb7f5 SHA512 2bbd30d145173aa1c10a47ec43bfc1f6b1aeda4b25ec40e534d08a35fc9a63ba9ba7826204cf4d561566ea0678f2d865cb7a947814f5e5e436a839d750f2db2e
diff --git a/dev-db/opendbx/opendbx-1.4.6-r3.ebuild b/dev-db/opendbx/opendbx-1.4.6-r3.ebuild
index 7bdd9b3e613f..30ade850db94 100644
--- a/dev-db/opendbx/opendbx-1.4.6-r3.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -68,6 +68,9 @@ src_configure() {
 		append-ldflags -L"${ORACLE_HOME}"
 	fi
 
+	# bug #788304
+	append-cxxflags -std=c++14
+
 	econf --with-backends="${backends}" --enable-manpages="$(usex man yes no)"
 }
 
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 5b21109b5f25..c7f9a125e8de 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -19,12 +19,12 @@ DIST postgresql-13.3.tar.bz2 21119109 BLAKE2B 395a3dc5cde8f579a3c35ea70346bdc630
 DIST postgresql-14beta2.tar.bz2 22555641 BLAKE2B 50d928c26d679789cda82b074150b78707adb8204fcc02392a027d8b71a61a2dc80042d9f9b68eee9a36f7991178e5e24f72ba1a931d16fc5d8e81097e2874f2 SHA512 fdda7b4ea178a1c0990952da2caf07186deb2047b292c49549881e34d2e7ebb09014f914632ef3342ab7184614d47320d280cceb6bd85a93f79dfcfa68137eff
 DIST postgresql-9.5.25.tar.bz2 17923796 BLAKE2B 432e035e78dacddddfd46fd4d04775b61e2e4db9e61945fa5f7e1c3c5ea3516a5e327489b4e57313b0d6ba4f2e20f52a164f96db01aa22b755ff625039f262eb SHA512 621b36d767d2c7eb2e942cb7b26ca7491450fcfd9606114849f7336b4d8a0bc0196badb44da4918e748145d21b6f72ccf1255a1309dff2427da8b39b63fca427
 DIST postgresql-9.6.22.tar.bz2 19003741 BLAKE2B adff6e81ec4b289bd5c51fa44adb38d7cc3936e2e5545ff23fccb0f3f1fe1c881ed70f9a0a5d366319f876eb01a9f675b66c9374b8b41615220f45a70450ad6d SHA512 371f85f2d02a8a3b888396440149e9b432f91e106a7feb8a163b275a0586843683124281a0965abf3c1215cb68e2002976913f88c75e35e52ac5f78d4145fd7b
-EBUILD postgresql-10.17-r1.ebuild 13643 BLAKE2B 06e48fa619942bbf5c9e83202988f410939bb67f08ae29b96508551103a335ad1667fad29e90144e27e0544bde1a408b64e6ef967b479fb72660a7dbd6f6aa29 SHA512 6ddfdb2b1822e1096980093432791ece0138703f6ba102f703bc1f969c5193ae312462b45f5cd0f08deeb92c4ef6d149574733ba8fa63dfe6cdf191d76285d19
+EBUILD postgresql-10.17-r2.ebuild 13662 BLAKE2B b4b813cfae66157cc760f7e117ce2bbd9c9f9c42030771ace9693355e1ba3d284871fb948ed0e7ee32c3e563e6085629f4192ba8d9593c42a3838590de6452a0 SHA512 46c5f06bded85409d65fc3eda42d677f6b052f0bbc6795722371504d4e192bb5b87282703d924e8c34e7a1ac19df2fe33af2818b16fd0037609b424ea4f41374
 EBUILD postgresql-11.12.ebuild 13593 BLAKE2B 9d4eaf3b84f0b5317fce6a35489a376a2e0ccd24d8096970bf24438b33dc1c0aaca22b032d5255b008b44950fdff7b5bed46e1a105e12c1c0502cd2da17a6780 SHA512 4fed5ba0d16e373c19f52a1ab8e3a8fa6cc24590f6ac914e4930dd1ed7cca1048449ad572f92a816b35f7455071dca717c480c14a334763f7cdf1a0ed1139bab
 EBUILD postgresql-12.7.ebuild 13565 BLAKE2B b4a8005b07b3cf5844bb46635216539d6740bffacdfed3512e10c44dc63099411d402e54f3e11732c96181381cd84e386ba700ad63800a1795a443e9e13e4261 SHA512 e557e572f9282bedde4f334c66f4f58b0fe83e8e2c5a57605037893eac904c617a6481469c5eab3ea684b4d3f4823ec28d46d6e5a6077f40cb9a1174aafc1df3
 EBUILD postgresql-13.3.ebuild 13960 BLAKE2B 87f1ce94709b84bb3aad8453202bff71b8b12a840432b4fdbf5a5428d2f26cde45ccc848322e28151386c40d22847a20b7209947974ead5d5b214aae533285b3 SHA512 793c3715bfb970b295da084075fa5dbf9b417766ee4f00ce872c3840468755101b942fd8a70046d4d54df464d382c1ddb47974afdce53171d5fbad5d423f6ccb
 EBUILD postgresql-14_beta2.ebuild 13830 BLAKE2B 52800e0af8bb24919d5f21ea065d4d4171b6ec12167dbbcf7ce7b4ee7b0b482cfb863956172cf39ea51a8ae6fa9d5ce9b27fca5a1844bc8d016d37cdb9e71d06 SHA512 a7d1150f5e673f1c8703fc112ccff0bbd155d3b79858b38cfc116f51cb88f0de2a3a347015fe92d8a43abddcd3cf041d984ba53149cad9d261130a3c4af09631
-EBUILD postgresql-9.5.25-r1.ebuild 14310 BLAKE2B f4a850ba573b2e6196a5eac4f5cbd2f08ce632d0f5fc4c3bcd666cf5d290baf22c764d39c65c51ba0dbf19ab3e4b604295d78841ddd140304037d248adae05e0 SHA512 38bb5974d82318af4fc0da054c44b450384e707c71ce42cf9270ca06865f186e3d843bbb48191631da8c85bdb745cdd7a2142a4481e4d367d8afc3722a124844
-EBUILD postgresql-9.6.22-r1.ebuild 14514 BLAKE2B d541ed3a385106c4ece340c3e6f59ec20aebab37c6dd2714955100ad381561cc29b51e32238a0eaeafc333b951965e4226913914b28d1390a5309a53db407c74 SHA512 bb62fd48fdb4d960694585f668f06b0c55ce97123ebeeb04b68c8a33befe092c7a7abfc1e12e6f0c519786f1dda4ae78c7cfb1b2e640ce839b4b1cbab2d57ba0
+EBUILD postgresql-9.5.25-r1.ebuild 14308 BLAKE2B 817bd6c284ab3f986fc2a10fd3bdc9c5775c085af764c175a61dfff6c350b4bac4b214f89c1e7bcbb9d9079da541b2cc14ac798a29206d85b4e85cc2815c534d SHA512 0d646a89e33ab0a7288b22709a321002f5f4b1c0b016e844e70fbf670f5f2ce40b988ba347003d05d2053ef9990527ae4ee05c608613a71894a687964a7517cc
+EBUILD postgresql-9.6.22-r2.ebuild 14531 BLAKE2B 6e4bebfaabd74d9e4b07a98797bb79faadb36f067a48966c0f2e6fd933422e14199e579078503aa940225309d5c2846ec724788d76b4483fd87c3fe2aa81407f SHA512 c6b49704e3e971ca772e6365501a0567c7bcba3fd6182800ff57f319481726acadf45334fa6e80fe3ad2db9bc80afb86630cbccb5449a0741ef52524eb70b5d0
 EBUILD postgresql-9999.ebuild 14177 BLAKE2B 78b9c2382fe99bcbd76183c729d47977bd042ee11b4a04df6708c99d30b37eec3aa3d8d9324df1fa29cd1d82b90e8522e3d55e2396f09f0a63b69c9c1bd60131 SHA512 821d3b47016f4adcff0df8a33dd2dd97f710b503925bb256f16fa09d206c1a9a1882c5c4f3998db89b897fb516924528aafc94d20eccf8622221a6544d23c63d
 MISC metadata.xml 715 BLAKE2B 71b868113676bdbb1996ecc8e3727b0cc16a559c5906e6459a41c330bcb5a5f4b3f4b5c4473a81905713c2f0735f185cd14612c69108b6bb602a7d8a92d6f3ce SHA512 4148c9c11ffaea5d30cd18befb06af914147d41eec4a8f905127f0abc5317ca370a745e0fd51b03c4583efde927fe9c1b3333853e80c2aa3e7677de65cd5d1ba
diff --git a/dev-db/postgresql/postgresql-10.17-r1.ebuild b/dev-db/postgresql/postgresql-10.17-r1.ebuild
deleted file mode 100644
index 7723abe23530..000000000000
--- a/dev-db/postgresql/postgresql-10.17-r1.ebuild
+++ /dev/null
@@ -1,458 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos kernel_linux ldap nls pam perl
-	  python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-10.2-no-server.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	# https://bugs.gentoo.org/753257
-	# https://bugs.gentoo.org/766225
-	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch \
-		   "${FILESDIR}"/postgresql-10.0-icu68-2.patch
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-10.17-r2.ebuild b/dev-db/postgresql/postgresql-10.17-r2.ebuild
new file mode 100644
index 000000000000..f3ee3cc29e7f
--- /dev/null
+++ b/dev-db/postgresql/postgresql-10.17-r2.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap nls pam perl
+	  python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libcrypt:=
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-10.2-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	# https://bugs.gentoo.org/753257
+	# https://bugs.gentoo.org/766225
+	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch \
+		   "${FILESDIR}"/postgresql-10.0-icu68-2.patch
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.5.25-r1.ebuild b/dev-db/postgresql/postgresql-9.5.25-r1.ebuild
index f5f6c1cb0823..fade6c5848a9 100644
--- a/dev-db/postgresql/postgresql-9.5.25-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.25-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
 
diff --git a/dev-db/postgresql/postgresql-9.6.22-r1.ebuild b/dev-db/postgresql/postgresql-9.6.22-r1.ebuild
deleted file mode 100644
index 6ef13fcda3a7..000000000000
--- a/dev-db/postgresql/postgresql-9.6.22-r1.ebuild
+++ /dev/null
@@ -1,478 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT=$(ver_cut 1-2)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc kerberos kernel_linux ldap nls pam perl
-	  pg-legacytimestamp python +readline selinux +server systemd ssl
-	  static-libs tcl threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-${SLOT}.3-no-server.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable !pg-legacytimestamp integer-datetimes) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT/.}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		# Temporarily tack on tmp to workaround a file collision
-		# issue. This is only necessary for 9.7 and earlier. 10 never
-		# had this issue.
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}tmp"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_preinst() {
-	# Find all of the slot-specific symlinks, if any, in /usr/bin (e.g.,
-	# /usr/bin/psql96). They may have been created by the
-	# postgresql.eselect module, but they're handled within this ebuild
-	# now. It's alright if we momentarily delete /usr/bin/psql as it
-	# will be recreated by the eselect module in pkg_ppostinst(). This
-	# is only necessary for 9.7 and earlier. 10 and later were never
-	# handled in this manner.
-	local canonicalise
-	if type -p realpath > /dev/null; then
-		canonicalise=realpath
-	elif type -p readlink > /dev/null; then
-		canonicalise='readlink -f'
-	else
-		# can't die, subshell
-		die "No readlink nor realpath found, cannot canonicalise"
-	fi
-
-	local l
-	# First remove any symlinks in /usr/bin that may have been created
-	# by the old eselect
-	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
-		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
-			rm "${l}" || ewarn "Couldn't remove ${l}"
-		fi
-	done
-
-	# Then move the symlinks created by the ebuild to their proper place.
-	for l in "${ED}"/usr/bin/*tmp ; do
-		mv "${l}" "${l%tmp}" \
-			|| ewarn "Couldn't rename $(basename ${l}) to $(basename ${l%tmp})"
-	done
-}
-
-pkg_postinst() {
-	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.6.22-r2.ebuild b/dev-db/postgresql/postgresql-9.6.22-r2.ebuild
new file mode 100644
index 000000000000..c105a7861618
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.6.22-r2.ebuild
@@ -0,0 +1,479 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1-2)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc kerberos kernel_linux ldap nls pam perl
+	  pg-legacytimestamp python +readline selinux +server systemd ssl
+	  static-libs tcl threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libcrypt:=
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-${SLOT}.3-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable !pg-legacytimestamp integer-datetimes) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT/.}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}tmp"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Find all of the slot-specific symlinks, if any, in /usr/bin (e.g.,
+	# /usr/bin/psql96). They may have been created by the
+	# postgresql.eselect module, but they're handled within this ebuild
+	# now. It's alright if we momentarily delete /usr/bin/psql as it
+	# will be recreated by the eselect module in pkg_ppostinst(). This
+	# is only necessary for 9.7 and earlier. 10 and later were never
+	# handled in this manner.
+	local canonicalise
+	if type -p realpath > /dev/null; then
+		canonicalise=realpath
+	elif type -p readlink > /dev/null; then
+		canonicalise='readlink -f'
+	else
+		# can't die, subshell
+		die "No readlink nor realpath found, cannot canonicalise"
+	fi
+
+	local l
+	# First remove any symlinks in /usr/bin that may have been created
+	# by the old eselect
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
+			rm "${l}" || ewarn "Couldn't remove ${l}"
+		fi
+	done
+
+	# Then move the symlinks created by the ebuild to their proper place.
+	for l in "${ED}"/usr/bin/*tmp ; do
+		mv "${l}" "${l%tmp}" \
+			|| ewarn "Couldn't rename $(basename ${l}) to $(basename ${l%tmp})"
+	done
+}
+
+pkg_postinst() {
+	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 6edc683adf21..f7304cea4e2d 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -27,10 +27,10 @@ DIST redis-6.0.14.tar.gz 2277029 BLAKE2B 1eeeae5243ca380e354dfe5c8ad5b869669dc94
 DIST redis-6.0.15.tar.gz 2282471 BLAKE2B b7f37a76d2a16e0f84f51a737e2c23ebc27750ece790cf800a0f70bfd481db01d82dc68511f80e5935dc73d70f02716a4f9005d4d177ecf3f2a0c5290ecd41ff SHA512 e7ba123798a11e1c68dd6d3ebb0586bed4f2bb33755871f1577f7e0229f826b468c2130c31bcc85a64ce7ff54e280df0a7c60e0882f3ed2a11d43e7819fe8b9e
 DIST redis-6.2.4.tar.gz 2457940 BLAKE2B 3e89e404a624db6f739fdab72b8b7f7f92b6e96b01e33c63b6f5fa2f80fc72d8b8eaca4ecb7c57cdaf127956ba1a580ec851012b57426ebe7bb4cba890e1dcae SHA512 22db5b64de20a4823fd219b559c05f329e37fc86ce32099c64655dc50e60228706c99bffeae8d7080d8689910879318ec6621388bde23bf1486aefb881f33cb0
 DIST redis-6.2.5.tar.gz 2465302 BLAKE2B 51cc672ab432bb87560151521289d04e8fefb8e4df820f58a9b742131a0f1960c0019dec42a601bad827ec2a172375b88b6cf32a19aef42964e18f5a7a911c40 SHA512 8c54451032cbb627ec2827251556cba2010e56544baca7ea117b5afd2c2add484acbedd3baf21bdb8fd10672602cf52294a4e26b135c1406d7a723c048275e3a
-EBUILD redis-5.0.12.ebuild 4616 BLAKE2B 230589c77919661022e95fa36143379c8e61d3cef8e4704d69762064eb04ddcf82a581bc9c32ff43c5443fc94ca65e24ccc7041340658c7cbb7f3b844b981d3e SHA512 ba4274c7cff7f2bf2340faec2ff53d8b8b1294797f4f361d23c059353d1ef60367a1353ae55970fd7a98d0532462914696988edfe4f610e47a5fab7b1ecb0fd8
-EBUILD redis-5.0.13.ebuild 4616 BLAKE2B 230589c77919661022e95fa36143379c8e61d3cef8e4704d69762064eb04ddcf82a581bc9c32ff43c5443fc94ca65e24ccc7041340658c7cbb7f3b844b981d3e SHA512 ba4274c7cff7f2bf2340faec2ff53d8b8b1294797f4f361d23c059353d1ef60367a1353ae55970fd7a98d0532462914696988edfe4f610e47a5fab7b1ecb0fd8
-EBUILD redis-6.0.14.ebuild 5092 BLAKE2B 82f39c67cfef273c174c0c7cd144e23a93833c2b00f6143e22ea7e3f3e7fe4f044a4f25f00cc72c7a6f72d934e5c4aaa66742ac7172737afa94cf15bc7188690 SHA512 dcb6983cf72b12b28d6dbef8041afd56789f7bd8d3373edd76bc0f09bb277ff78450ff8081e3a007eef0913944950bbe618856cf18c5e84915dc7245a0d80ceb
-EBUILD redis-6.0.15.ebuild 5092 BLAKE2B 82f39c67cfef273c174c0c7cd144e23a93833c2b00f6143e22ea7e3f3e7fe4f044a4f25f00cc72c7a6f72d934e5c4aaa66742ac7172737afa94cf15bc7188690 SHA512 dcb6983cf72b12b28d6dbef8041afd56789f7bd8d3373edd76bc0f09bb277ff78450ff8081e3a007eef0913944950bbe618856cf18c5e84915dc7245a0d80ceb
-EBUILD redis-6.2.4.ebuild 5091 BLAKE2B 4dc608e1a85408fcf537f082a3bfd3f689f0e29a33272cd87d60a925ee6693f599de989ea94871b707f4d0540b950990777a5209e53cea4eb36f9b8d6b0b841d SHA512 c5cbaf77c6af52e8a557858cd323f2224f5e547ffc9af38032dbfd1f309fb0b948101cb87966ad155ac8087e54aa8841462fcdfecbfdc60562d3f250bfff4baa
-EBUILD redis-6.2.5.ebuild 5098 BLAKE2B afae58d112a2f1df3417cdaf302baa035a584ebaee8cfdc628db502cac405045f9d3aff93127c8e25132cad3df7e50312a6528a52aaacf138728ff74f703a0d3 SHA512 7d127b8f751069a72db39c16d565063e20e0a152b49ced93a2954f0ffdf80e0e40a199915a8c18f557eada4d5b3c0d611ed48c3e4185fe50262d769e9d5e805f
+EBUILD redis-5.0.12.ebuild 4665 BLAKE2B d73dc631c2ee11c63c5333a2f87998ce36d20e2a368211d085ae13ecfbe80988976832fdc9afa2d8e33a5ce4b80103d1f005af14630055199d29bde5afc42148 SHA512 e9e7eb1ddf6c024cfdf98d9f765603dc27422d836f2d0e52bdf30b059db78672d5a80261647b52ec3eeb94b03dc31756d663533213ff519913ae2f9a9215d192
+EBUILD redis-5.0.13.ebuild 4665 BLAKE2B d73dc631c2ee11c63c5333a2f87998ce36d20e2a368211d085ae13ecfbe80988976832fdc9afa2d8e33a5ce4b80103d1f005af14630055199d29bde5afc42148 SHA512 e9e7eb1ddf6c024cfdf98d9f765603dc27422d836f2d0e52bdf30b059db78672d5a80261647b52ec3eeb94b03dc31756d663533213ff519913ae2f9a9215d192
+EBUILD redis-6.0.14.ebuild 5122 BLAKE2B 404341bf27355e08d34e15296c4d69fd30f91615d2f8ec2ea3357cf199398aa772b5f6faf009da179d6907407292f5390dfcfc2e91e27d503e85f16fbb2e0f26 SHA512 5c3388fb008e47e738f97c76c2c43e8870b415ea4efa3a67d5c63c7d063cfab721fe35eac18818fe2b38282c4533b39ea3a8682ab6273407ccf9b14af8b84df4
+EBUILD redis-6.0.15.ebuild 5122 BLAKE2B 404341bf27355e08d34e15296c4d69fd30f91615d2f8ec2ea3357cf199398aa772b5f6faf009da179d6907407292f5390dfcfc2e91e27d503e85f16fbb2e0f26 SHA512 5c3388fb008e47e738f97c76c2c43e8870b415ea4efa3a67d5c63c7d063cfab721fe35eac18818fe2b38282c4533b39ea3a8682ab6273407ccf9b14af8b84df4
+EBUILD redis-6.2.4.ebuild 5121 BLAKE2B d47e12817d964c31f0d1e7cedee5b644cc05958e1d2a8b60e9dc059ccf76b6fdbe0a01a0130f30dfdf697861e6f51f7aeb00c4d2d95c6f3bc860ff7d0f48b086 SHA512 77291013b979c23ebff0e2ff2b82bbb7ebb0e1af621c70b4be11e2039751c37cdf73eb5e9f34d99b6e4bf2c77bf1aa5b7950a746c0bbf16a6a1ab622098f7664
+EBUILD redis-6.2.5.ebuild 5128 BLAKE2B b1f9da0f33a4bd54b2d7031cd78f8961b65161ad739744b83db5ff49a60c46019f1461f8d5d890c2449dd4ea5917cca39a60ba26357b7555b8f9dc3c65a95ca4 SHA512 6bfb83e5c843a63fcc4a8d35517afc2ebd44b18cb062f9f5092ee6c02d1b8be3e13f8777844d33c81daf7e3475acf5366bb14524449ae2aaba91b5655e2bfadf
 MISC metadata.xml 364 BLAKE2B a997b9ef18f8efdcd191d4344898a373d3987cc8630d7d699af0666dac13261a06717e72320034fab170209ab2cc90db122e1a3756fa9ff9149fe7b7796328c3 SHA512 2d6a303748fd5cf5a3a12b382e0944046a7d200f19041a343603068a764f806fd748945c9d5ec2d0f4001f151bc66c1127a461abeefd7eb85a92d2238b74d521
diff --git a/dev-db/redis/redis-5.0.12.ebuild b/dev-db/redis/redis-5.0.12.ebuild
index fb5159d282a5..e3e81cea542e 100644
--- a/dev-db/redis/redis-5.0.12.ebuild
+++ b/dev-db/redis/redis-5.0.12.ebuild
@@ -158,3 +158,7 @@ src_install() {
 	fi
 	keepdir /var/{log,lib}/redis
 }
+
+pkg_postinst() {
+	tmpfiles_process redis.conf
+}
diff --git a/dev-db/redis/redis-5.0.13.ebuild b/dev-db/redis/redis-5.0.13.ebuild
index fb5159d282a5..e3e81cea542e 100644
--- a/dev-db/redis/redis-5.0.13.ebuild
+++ b/dev-db/redis/redis-5.0.13.ebuild
@@ -158,3 +158,7 @@ src_install() {
 	fi
 	keepdir /var/{log,lib}/redis
 }
+
+pkg_postinst() {
+	tmpfiles_process redis.conf
+}
diff --git a/dev-db/redis/redis-6.0.14.ebuild b/dev-db/redis/redis-6.0.14.ebuild
index d871156cf342..b61d5886247a 100644
--- a/dev-db/redis/redis-6.0.14.ebuild
+++ b/dev-db/redis/redis-6.0.14.ebuild
@@ -181,6 +181,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process redis.conf
+
 	ewarn "The default redis configuration file location changed to:"
 	ewarn "  /etc/redis/{redis,sentinel}.conf"
 	ewarn "Please apply your changes to the new configuration files."
diff --git a/dev-db/redis/redis-6.0.15.ebuild b/dev-db/redis/redis-6.0.15.ebuild
index d871156cf342..b61d5886247a 100644
--- a/dev-db/redis/redis-6.0.15.ebuild
+++ b/dev-db/redis/redis-6.0.15.ebuild
@@ -181,6 +181,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process redis.conf
+
 	ewarn "The default redis configuration file location changed to:"
 	ewarn "  /etc/redis/{redis,sentinel}.conf"
 	ewarn "Please apply your changes to the new configuration files."
diff --git a/dev-db/redis/redis-6.2.4.ebuild b/dev-db/redis/redis-6.2.4.ebuild
index 2546d4424d2b..5aa99d5a4880 100644
--- a/dev-db/redis/redis-6.2.4.ebuild
+++ b/dev-db/redis/redis-6.2.4.ebuild
@@ -181,6 +181,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process redis.conf
+
 	ewarn "The default redis configuration file location changed to:"
 	ewarn "  /etc/redis/{redis,sentinel}.conf"
 	ewarn "Please apply your changes to the new configuration files."
diff --git a/dev-db/redis/redis-6.2.5.ebuild b/dev-db/redis/redis-6.2.5.ebuild
index a140e3a10280..76be65d5e4b4 100644
--- a/dev-db/redis/redis-6.2.5.ebuild
+++ b/dev-db/redis/redis-6.2.5.ebuild
@@ -181,6 +181,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process redis.conf
+
 	ewarn "The default redis configuration file location changed to:"
 	ewarn "  /etc/redis/{redis,sentinel}.conf"
 	ewarn "Please apply your changes to the new configuration files."
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 08efcb52cf4d..58b72703ecb0 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/avarice/Manifest b/dev-embedded/avarice/Manifest
index 45a06c8bf339..7491b16a0e7c 100644
--- a/dev-embedded/avarice/Manifest
+++ b/dev-embedded/avarice/Manifest
@@ -1,4 +1,4 @@
 AUX avarice-2.14-broken-__unused-macro.patch 962 BLAKE2B 46012b3d49df83fd83397d8c8a0fd225b571dd8d1f568c1c065a6a21afe63053d426c952647bbbee709a4baaa5cc3b983390277c444ab818f506f402097254ea SHA512 5908a26c9cdc4175f14a7b46c413420517b93ebbf0474031bda9d6e07fd799c2e1effb1006de3831b0e5f3bf5aed7d48abd8201b68e0c6c00cf1c8180e1e4b6f
 DIST avarice-2.14.tar.bz2 253668 BLAKE2B 673c95d8f7f296ffdd5c225e82bd8ef348f0c222201acb826798451fa195ec9c2fd8e8d1ecd3f847f9e0ac069ee2f6a4358f660ff45343817b14d804e79a8c90 SHA512 e0b23bd02bfa7d4dc05027f0f59ec7da868d8d0c0cd4f66595f6aaa5c335fa4eb64fc47399e51c0ed5112803ee99a3f041812bf4072dc096cc933cd17f9348a0
-EBUILD avarice-2.14.ebuild 433 BLAKE2B 202e366fdcb608012b9d40f1fadcb8c6f771c684502dbf69e1a27dfa4e301cc9647154d334eb6a38bcb0b86d4849476be65aeb9a6d1e0dc4d257bd6bd05481e5 SHA512 65dea038232a578d681a6f39ea7dc5b6a4bedfd1dc7812b12ebb5e79bdfcf9a270597f45f62384013154690cc2842c8850cfb5ef0639f9870ebda8c2874bcb92
+EBUILD avarice-2.14.ebuild 529 BLAKE2B 6e2862fc1a4c116e63e8671e20bfea08e7f143d14619e09f809519b391217a6d368f7d7829dea2af9279a61669fc6489f764e0a85bad44eec91d2770fb6d762a SHA512 df88c6e915bb36dd5400675545cf764aaf76ff3759788c40cfe8a42aaa716190c52f293680ce530e70b45f48c31ffdb004d979a28c2728eec675c8546c778aa3
 MISC metadata.xml 328 BLAKE2B 62af0d18423f51f57fa27f945bb08d9db6d230fcb0f07210f3ee1fdc5bc0e21c4c59e152643f106db54e94087bba1b647e49e58abafef02e41963d8083da868b SHA512 1ee78acf39c10cd871e5ce41abd17adc3e3d5f8ee2443ad5f6798079ea7233010d65be08ed9e80df13b4d0326828702989a5b983ada32bf8029052bd996e2616
diff --git a/dev-embedded/avarice/avarice-2.14.ebuild b/dev-embedded/avarice/avarice-2.14.ebuild
index 99ecdf5b2e24..3486df353266 100644
--- a/dev-embedded/avarice/avarice-2.14.ebuild
+++ b/dev-embedded/avarice/avarice-2.14.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit flag-o-matic
+
 DESCRIPTION="Interface for GDB to Atmel AVR JTAGICE in circuit emulator"
 HOMEPAGE="http://avarice.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -13,6 +15,13 @@ KEYWORDS="~amd64 ~x86"
 
 PATCHES=( "${FILESDIR}"/${P}-broken-__unused-macro.patch )
 
+src_configure() {
+	# bug #788295
+	append-cxxflags -std=c++14
+
+	default
+}
+
 src_install() {
 	default
 	dodoc doc/*.txt
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index be94510af00f..b001773ff044 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/openscenegraph-openmw/Manifest b/dev-games/openscenegraph-openmw/Manifest
index f7392ad5cae7..e19a52764de1 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -1,7 +1,12 @@
 AUX openscenegraph-3.4-cmake.patch 4485 BLAKE2B 3d63d45b7af01dc4153c03edb828a609a0877e30a8aee9a36fbf69b171df04fac5945e69f91c5e107b55b3c771c5dbcba721f607fcb5a73e1c14dd5351854f22 SHA512 e0dd21ecbf92dec251bc40680106adea4c309badafef408473397b8078e20cd7fbd1d9cb1b1912466ded4156275cd5a1fc1e86caa2471670938e3d39c0c84a97
 AUX openscenegraph-3.4-gcc11.patch 1038 BLAKE2B d460790c49c060f79e0311913314f38d32d3cae0056fa2b65462eeefdc7637750a04d3d13a54756e8d5129b9a8bde262e41ce540f480b55934dc23a933234143 SHA512 5e22bf470d18f166927a744f39b21cf9de72abfd17e7d96095943cb4ea698134d9cf4f68a99d4bf2b918f594951d9b9179e29e13d1016e1c0ffee1eb2e17513b
 AUX openscenegraph-3.5.1-jpeg-9.patch 1211 BLAKE2B 7fedf10332a13270a489c5d2e662947ca84659ad5abc43190d0415212b083b72933b01f84caed161d457490587c8236e38e070e734c649c44b0d67fdc7399a2d SHA512 404439415f8ff6881a90be44281e4a811f018c3e82c2981d076a106e63a3c44fd769867496b8f8a7d53669ba660ab9076a6ccab31e921e9abab65d2ba652b5cc
+AUX openscenegraph-3.6.3-cmake.patch 993 BLAKE2B 3adb6691bb1c2e9cc4e88ef5c1e107bd429564248fd72c6f4d70c1622b2933273e02f294d5fd3b2529fdbbdef65cdba41db7b441b7334b6180995896b52f8212 SHA512 2905fa5031641f2d3a8cec46c32c1cbf8adfb34b7c460c22eaecca66f5cc0b73c2bda4ed68dca3bda12a5f49385c2257bd5b4f3271b13eb979298eeaefb45789
 AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
+AUX openscenegraph-3.6.5-cmake_lua_version.patch 440 BLAKE2B 51a35309b01a096f9423ff64e66d62f99d3e26bd898db0b53c135dc99318b236a1b129211f51de9b1a29d054e0810aa4ff2a7c307dc4b4a606eb4075a60748d9 SHA512 a41c7a65b1cfd0dabc080f509cf288f575b3ec5d7666a4a889a8c3156e9d32559e1f802e23783c5c70376c82a24dd87813e9bfde0876085e0e3967b47852059a
+AUX openscenegraph-3.6.5-use_boost_asio.patch 6995 BLAKE2B 0b0c0af9980b59e1cfd4cc5256720d0e69d5e3a65173c9364036e42efa34377beb00811fc4a0aee0cead870abe0c33feaaebe57c22cbefac43d4dcf65a1d19e1 SHA512 fa7c702eaf69c7b7890cf44e5293f9c8ea73ac441af1e4573dadd62f3ca797ccbbc2fbafd8c946a936192f7331fa16d8d4247de8b657db77791d5137207c23b6
 DIST openscenegraph-openmw-3.4_p20200425.tar.gz 5698786 BLAKE2B 43684fa898912434dae9a7b41070a893c407dceba7e468a3f3dede32e24aea55d921098faf8d9d05708d2ef01a3507b2f126939dc13b8693002a0bec189bbaf7 SHA512 9bb4d2a6ca4694ee22a29508b74a095a483584ea801dc8298ec8a9b41c4d4fe18c52a21849ae9ec1065060479dcad5156227f82feed13c177415662ecba1da70
-EBUILD openscenegraph-openmw-3.4_p20200425-r100.ebuild 4362 BLAKE2B a8c82b42c5aa43847cef4cbafa0a171ca172760c147e65d2cf4476bd42d52744f75e86566a99b0e10a65f9ee78af5c5f61bb3d795ec6769d45739b8e7ae3d601 SHA512 514cbdabd064d058b0530d42c1393f351e277aee7706ea9971ba4603fabedbf4ed6de13f0fbae5fb2c52f6d451b90c074f144578a4afddd9b78305576f7258d0
-MISC metadata.xml 1690 BLAKE2B 4c99a953f827084c2a9d848f1bed0f1b7c885343ac2bb8ca57b2ada30ab8901e56ff1f7a37e97394c2fd0f8b0eff452ac0dc2a5fcab270ea8781999fd4bd45f6 SHA512 44a3d3a9af55c002330282ce036c3c455ffd7e9800c854657bd643fb3033645217e365a1a8dc8c7dbbff0d7038a9c6b0265fc824af71404a5b42d9a26a147645
+DIST openscenegraph-openmw-3.6_p20210610.tar.gz 5788655 BLAKE2B fdf345502ee7bb742741da758ae212028882544766a6acba3309d27e2fffa230e4a07626c9a39dbdf1310374b765b3941c915d7b6d527fc7cb75ba028230b4a0 SHA512 1964b12fedf297b8baf77d4db2eb4ce6732925bb3974fb4d8d20b1dec751400ceb57faf0b069c2a5cf45728cad83ea434356edbcb19413d650717c3d2ac39a03
+EBUILD openscenegraph-openmw-3.4_p20200425-r101.ebuild 4365 BLAKE2B 26544eb996114bf89a0f287fef932414fd0145a121a216cf4eeb924eeeecd499056f2ed7d6db6fabd61706e9058c6cd14c07d15bcb9c447c2c6d0c6c77a7a05f SHA512 cde9d7dcf3f02fea2aefef0e6ec545b763009e386f1e872266c89c6fed9ae5e42f67cd55d91c322af1a49f77768ecdd5d0efbf215fabf994d8e74f972308326d
+EBUILD openscenegraph-openmw-3.6_p20210610.ebuild 4378 BLAKE2B ce76a028ed2fceb73a5e422d69245ea52e945a2c4ba5c898e9afcede59b21e7e1258780f2686da51d0637b1d25cbb7a53cb02c4a6d113a4be30acc979af5bb7b SHA512 79bb3719c97f48a9c723e2208f82f392159267dfcdb6a471a9538d4c418cd4e28b5218858b478490df5ab55a43d7fb5c6f6f75e68eb2913d5f7f6eddb6577a03
+MISC metadata.xml 2087 BLAKE2B dd97c32c33ce7de4b65d721471a7ba9324d9cb2e8a704accb5d0b361dfab5885d7dd03ac3f9eb24bf2d91fc554a94bac0394cb5f8573aea8ac44c10fc743d623 SHA512 d17cd9e68467a03fdb352f14a0e748195e37a3d74d06fa6ef584d6ebe09d0b62d8c2e5ec08c5a99eab09c721bc414546b1b4dc4a8d924d6c06b25a50dc209952
diff --git a/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.3-cmake.patch b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.3-cmake.patch
new file mode 100644
index 000000000000..708c68659680
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.3-cmake.patch
@@ -0,0 +1,12 @@
+--- a/CMakeModules/OsgMacroUtils.cmake
++++ b/CMakeModules/OsgMacroUtils.cmake
+@@ -463,7 +463,7 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
+         IF(APPLE)
+             INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
+         ELSE(APPLE)
+-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
++            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
+             IF(MSVC)
+                 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS RelWithDebInfo)
+                 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS Debug)
+
diff --git a/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-cmake_lua_version.patch b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-cmake_lua_version.patch
new file mode 100644
index 000000000000..1373b296da04
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-cmake_lua_version.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -771,10 +771,7 @@
+     FIND_PACKAGE(LIBLAS)
+ 
+     IF (NOT(OSG_USE_LOCAL_LUA_SOURCE))
+-        FIND_PACKAGE(Lua52)
+-        IF (NOT (LUA_LIBRARIES AND LUA_INCLUDE_DIR))
+-            FIND_PACKAGE(Lua51)
+-        ENDIF()
++        FIND_PACKAGE(Lua ${LUA_VERSION} EXACT)
+     ENDIF()
+ 
+     # V8 and Python plugins are tests for linking against these libraries but aren't functionality beyond this.
diff --git a/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-use_boost_asio.patch b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-use_boost_asio.patch
new file mode 100644
index 000000000000..f9a32c0dc601
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/files/openscenegraph-3.6.5-use_boost_asio.patch
@@ -0,0 +1,263 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -764,7 +764,7 @@
+     FIND_PACKAGE(DirectInput)
+     FIND_PACKAGE(NVTT)
+     IF (NOT WIN32)
+-        FIND_PACKAGE(Asio)
++        FIND_PACKAGE(Boost)
+     ENDIF()
+     FIND_PACKAGE(ZeroConf)
+ 
+--- a/CMakeModules/FindAsio.cmake
++++ b/CMakeModules/FindAsio.cmake
+@@ -1,22 +0,0 @@
+-# Locate ASIO-headers (http://think-async.com/Asio)
+-# This module defines
+-# ASIO_FOUND, if false, do not try to link to gdal
+-# ASIO_INCLUDE_DIR, where to find the headers
+-#
+-# Created by Stephan Maximilian Huber
+-
+-FIND_PATH(ASIO_INCLUDE_DIR
+-  NAMES
+-    asio.hpp
+-  PATHS
+-    /usr/include
+-    /usr/local/include
+-)
+-
+-SET(ASIO_FOUND "NO")
+-IF(ASIO_INCLUDE_DIR)
+-    FIND_PACKAGE( Boost 1.37 )
+-    IF(Boost_FOUND)
+-        SET(ASIO_FOUND "YES")
+-    ENDIF()
+-ENDIF()
+--- a/src/osgPlugins/CMakeLists.txt
++++ b/src/osgPlugins/CMakeLists.txt
+@@ -299,13 +299,13 @@
+ #
+ # Device integration plugins
+ #
+-IF   (SDL_FOUND)
++IF(SDL_FOUND)
+     ADD_PLUGIN_DIRECTORY(sdl)
+-ENDIF(SDL_FOUND)
++ENDIF()
+ 
+-IF(ASIO_FOUND)
++IF(Boost_FOUND)
+     ADD_PLUGIN_DIRECTORY(RestHttpDevice)
+-ENDIF(ASIO_FOUND)
++ENDIF()
+ 
+ 
+ IF(ZEROCONF_FOUND)
+--- a/src/osgPlugins/RestHttpDevice/CMakeLists.txt
++++ b/src/osgPlugins/RestHttpDevice/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+-INCLUDE_DIRECTORIES(${ASIO_INCLUDE_DIR})
+-    
++
+ SET(TARGET_SRC
+     connection.cpp
+     io_service_pool.cpp
+@@ -26,7 +25,7 @@
+     RestHttpDevice.hpp
+ )
+ 
+-SET(TARGET_ADDED_LIBRARIES osgPresentation )
++SET(TARGET_ADDED_LIBRARIES osgPresentation)
+ 
+ #### end var setup  ###
+ SETUP_PLUGIN(resthttp)
+--- a/src/osgPlugins/RestHttpDevice/connection.cpp
++++ b/src/osgPlugins/RestHttpDevice/connection.cpp
+@@ -37,14 +37,14 @@
+ void connection::start()
+ {
+   OSG_DEBUG << "RestHttpDevice :: connection::start" << std::endl;
+-  
++
+   socket_.async_read_some(asio::buffer(buffer_),
+       boost::bind(&connection::handle_read, shared_from_this(),
+         asio::placeholders::error,
+         asio::placeholders::bytes_transferred));
+ }
+ 
+-void connection::handle_read(const asio::error_code& e,
++void connection::handle_read(const boost::system::error_code& e,
+     std::size_t bytes_transferred)
+ {
+   if (!e)
+@@ -82,12 +82,12 @@
+   // handler returns. The connection class's destructor closes the socket.
+ }
+ 
+-void connection::handle_write(const asio::error_code& e)
++void connection::handle_write(const boost::system::error_code& e)
+ {
+   if (!e)
+   {
+     // Initiate graceful connection closure.
+-    asio::error_code ignored_ec;
++    boost::system::error_code ignored_ec;
+     socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ignored_ec);
+   }
+ 
+--- a/src/osgPlugins/RestHttpDevice/connection.hpp
++++ b/src/osgPlugins/RestHttpDevice/connection.hpp
+@@ -11,7 +11,7 @@
+ #ifndef HTTP_SERVER_CONNECTION_HPP
+ #define HTTP_SERVER_CONNECTION_HPP
+ 
+-#include <asio.hpp>
++#include <boost/asio.hpp>
+ #include <boost/array.hpp>
+ #include <boost/noncopyable.hpp>
+ #include <boost/shared_ptr.hpp>
+@@ -21,6 +21,8 @@
+ #include "request_handler.hpp"
+ #include "request_parser.hpp"
+ 
++using namespace boost;
++
+ namespace http {
+ namespace server {
+ 
+@@ -42,11 +44,11 @@
+   ~connection();
+ private:
+   /// Handle completion of a read operation.
+-  void handle_read(const asio::error_code& e,
++  void handle_read(const boost::system::error_code& e,
+       std::size_t bytes_transferred);
+ 
+   /// Handle completion of a write operation.
+-  void handle_write(const asio::error_code& e);
++  void handle_write(const boost::system::error_code& e);
+ 
+   /// Socket for the connection.
+   asio::ip::tcp::socket socket_;
+--- a/src/osgPlugins/RestHttpDevice/io_service_pool.cpp
++++ b/src/osgPlugins/RestHttpDevice/io_service_pool.cpp
+@@ -11,7 +11,7 @@
+ #include "server.hpp"
+ #include <stdexcept>
+ #include <boost/bind.hpp>
+-#include <boost/shared_ptr.hpp>
++#include <boost/thread.hpp>
+ 
+ namespace http {
+ namespace server {
+@@ -36,17 +36,14 @@
+ void io_service_pool::run()
+ {
+   // Create a pool of threads to run all of the io_services.
+-  std::vector<boost::shared_ptr<asio::thread> > threads;
++  std::vector<thread> threads;
+   for (std::size_t i = 0; i < io_services_.size(); ++i)
+-  {
+-    boost::shared_ptr<asio::thread> thread(new asio::thread(
+-          boost::bind(&asio::io_service::run, io_services_[i])));
+-    threads.push_back(thread);
+-  }
++    threads.emplace_back(thread(boost::bind(&asio::io_service::run,
++                                            io_services_[i])));
+ 
+   // Wait for all threads in the pool to exit.
+   for (std::size_t i = 0; i < threads.size(); ++i)
+-    threads[i]->join();
++    threads[i].join();
+ }
+ 
+ void io_service_pool::stop()
+--- a/src/osgPlugins/RestHttpDevice/io_service_pool.hpp
++++ b/src/osgPlugins/RestHttpDevice/io_service_pool.hpp
+@@ -11,11 +11,13 @@
+ #ifndef HTTP_SERVER_IO_SERVICE_POOL_HPP
+ #define HTTP_SERVER_IO_SERVICE_POOL_HPP
+ 
+-#include <asio.hpp>
++#include <boost/asio.hpp>
+ #include <vector>
+ #include <boost/noncopyable.hpp>
+ #include <boost/shared_ptr.hpp>
+ 
++using namespace boost;
++
+ namespace http {
+ namespace server {
+ 
+--- a/src/osgPlugins/RestHttpDevice/reply.hpp
++++ b/src/osgPlugins/RestHttpDevice/reply.hpp
+@@ -13,9 +13,11 @@
+ 
+ #include <string>
+ #include <vector>
+-#include <asio.hpp>
++#include <boost/asio.hpp>
+ #include "header.hpp"
+ 
++using namespace boost;
++
+ namespace http {
+ namespace server {
+ 
+--- a/src/osgPlugins/RestHttpDevice/server.cpp
++++ b/src/osgPlugins/RestHttpDevice/server.cpp
+@@ -23,7 +23,7 @@
+     request_handler_(doc_root)
+ {
+   // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
+-  asio::ip::tcp::resolver resolver(acceptor_.get_io_service());
++  asio::ip::tcp::resolver resolver(io_service_pool_.get_io_service());
+   asio::ip::tcp::resolver::query query(address, port);
+   asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
+   acceptor_.open(endpoint.protocol());
+@@ -47,7 +47,7 @@
+   io_service_pool_.stop();
+ }
+ 
+-void server::handle_accept(const asio::error_code& e)
++void server::handle_accept(const boost::system::error_code& e)
+ {
+   if (!e)
+   {
+--- a/src/osgPlugins/RestHttpDevice/server.hpp
++++ b/src/osgPlugins/RestHttpDevice/server.hpp
+@@ -11,7 +11,7 @@
+ #ifndef HTTP_SERVER_SERVER_HPP
+ #define HTTP_SERVER_SERVER_HPP
+ 
+-#include <asio.hpp>
++#include <boost/asio.hpp>
+ #include <string>
+ #include <vector>
+ #include <boost/noncopyable.hpp>
+@@ -20,6 +20,8 @@
+ #include "io_service_pool.hpp"
+ #include "request_handler.hpp"
+ 
++using namespace boost;
++
+ namespace http {
+ namespace server {
+ 
+@@ -38,12 +40,12 @@
+ 
+   /// Stop the server.
+   void stop();
+-  
++
+   void setCallback(request_handler::Callback* cb) { request_handler_.setCallback(cb); }
+ 
+ private:
+   /// Handle completion of an asynchronous accept operation.
+-  void handle_accept(const asio::error_code& e);
++  void handle_accept(const boost::system::error_code& e);
+ 
+   /// The pool of io_service objects used to perform asynchronous operations.
+   io_service_pool io_service_pool_;
diff --git a/dev-games/openscenegraph-openmw/metadata.xml b/dev-games/openscenegraph-openmw/metadata.xml
index 6e5dbab66570..ffea23ade5ea 100644
--- a/dev-games/openscenegraph-openmw/metadata.xml
+++ b/dev-games/openscenegraph-openmw/metadata.xml
@@ -14,15 +14,29 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<longdescription lang="en">
-		OpenSceneGraph on steroids. This fork was created to experiment with performance enhancements for OpenMW that are too controversial to be included in the general purpose OSG project - either for design reasons or backward compatibility reasons. OpenMW still works with "vanilla" OpenSceneGraph, but it is recommended to use the fork for better performance (around 10-15% on most devices). Note that the improvements are very specific to OpenMW and its animation code in particular; other OpenSceneGraph applications are not likely to see the same speed-up, or any speed-up at all if they are already GPU limited.
+		OpenSceneGraph on steroids. This fork was created to experiment with
+		performance enhancements for OpenMW that are too controversial to be
+		included in the general purpose OSG project - either for design reasons
+		or backward compatibility reasons. OpenMW still works with "vanilla"
+		OpenSceneGraph, but it is recommended to use the fork for better
+		performance (around 10-15% on most devices). Note that the improvements
+		are very specific to OpenMW and its animation code in particular; other
+		OpenSceneGraph applications are not likely to see the same speed-up, or
+		any speed-up at all if they are already GPU limited.
 	</longdescription>
 	<use>
+		<flag name="collada">Enable DAE file support via <pkg>dev-libs/collada-dom</pkg></flag>
+		<flag name="dicom">Enable DICOM medical image file support via <pkg>sci-libs/dcmtk</pkg></flag>
 		<flag name="egl">Enable EGL support</flag>
 		<flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> library</flag>
 		<flag name="gdal">Enable support for <pkg>sci-libs/gdal</pkg> library</flag>
+		<flag name="las">Enable support for geospatial data LAS LiDAR format using <pkg>sci-geosciences/liblas</pkg></flag>
 		<flag name="openinventor">Build OpenInventor plugin</flag>
 		<flag name="osgapps">Build osg applications</flag>
 		<flag name="sdl2">Use <pkg>media-libs/libsdl2</pkg> additionally to <pkg>media-libs/libsdl</pkg></flag>
 		<flag name="xrandr">Enable support for the X xrandr extension</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">OpenMW/osg</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
deleted file mode 100644
index 08efaabeceae..000000000000
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-WX_GTK_VER="3.0-gtk3"
-inherit cmake flag-o-matic lua-single wxwidgets
-
-DESCRIPTION="OpenMW-specific fork of OpenSceneGraph"
-HOMEPAGE="https://github.com/OpenMW/osg"
-MY_COMMIT="8b07809fa674ecffe77338aaea2e223b3aadff0e"
-SRC_URI="https://github.com/OpenMW/osg/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="wxWinLL-3 LGPL-2.1"
-SLOT="0/132" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~x86"
-IUSE="curl debug doc examples egl ffmpeg fltk fox gdal gif glut gstreamer jpeg
-	lua openexr openinventor osgapps pdf png qt5 sdl sdl2 svg tiff
-	truetype vnc wxwidgets xine xrandr zlib"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	sdl2? ( sdl )
-	openexr? ( zlib )
-"
-
-# TODO: COLLADA, FBX, GTA, OpenVRML, Performer, DCMTK
-RDEPEND="
-	!dev-games/openscenegraph
-	media-libs/mesa[egl?]
-	virtual/glu
-	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libXext
-	curl? ( net-misc/curl )
-	examples? (
-		fltk? ( x11-libs/fltk:1[opengl] )
-		fox? ( x11-libs/fox:1.6[opengl] )
-		glut? ( media-libs/freeglut )
-		sdl2? ( media-libs/libsdl2 )
-		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	gdal? ( sci-libs/gdal:= )
-	gif? ( media-libs/giflib:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jpeg? ( virtual/jpeg:0 )
-	lua? ( ${LUA_DEPS} )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	openinventor? ( media-libs/coin )
-	pdf? ( app-text/poppler[cairo] )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( media-libs/libsdl )
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	vnc? ( net-libs/libvncserver )
-	xrandr? ( x11-libs/libXrandr )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/osg-${MY_COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}"/openscenegraph-3.4-cmake.patch
-	"${FILESDIR}"/openscenegraph-3.5.1-jpeg-9.patch
-	"${FILESDIR}"/openscenegraph-3.6.3-docdir.patch
-	"${FILESDIR}"/openscenegraph-3.4-gcc11.patch
-)
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i "s/ FIND_PACKAGE/ MACRO_OPTIONAL_FIND_PACKAGE/g" CMakeLists.txt || die "can't replace FIND_PACKAGE"
-	cmake_src_prepare
-}
-
-src_configure() {
-	if use examples && use wxwidgets; then
-		setup-wxwidgets
-	fi
-
-	# Needed by FFmpeg
-	append-cppflags -D__STDC_CONSTANT_MACROS
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDYNAMIC_OPENSCENEGRAPH=ON
-		-DLIB_POSTFIX=${libdir/lib}
-		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
-		-DOSG_PROVIDE_READFILE=ON
-		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
-		-DWITH_Lua51=OFF # We use CMake-version FindLua52.cmake instead which can find any lua
-		-DWITH_Lua52=$(usex lua)
-		-DWITH_Asio=OFF # Fails to build, similar to https://github.com/chriskohlhoff/asio/issues/316
-		-DWITH_CURL=$(usex curl)
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
-		-DBUILD_OSG_EXAMPLES=$(usex examples)
-		-DWITH_FFmpeg=$(usex ffmpeg)
-		-DWITH_GDAL=$(usex gdal)
-		-DWITH_GIFLIB=$(usex gif)
-		-DWITH_GStreamer=$(usex gstreamer)
-		-DWITH_GLIB=$(usex gstreamer)
-		-DWITH_GtkGl=OFF
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_Jasper=OFF
-		-DWITH_LIBLAS=OFF # dep failed to build https://bugs.gentoo.org/725938
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_Inventor=$(usex openinventor)
-		-DWITH_Poppler-glib=$(usex pdf)
-		-DWITH_PNG=$(usex png)
-		-DWITH_SDL=$(usex sdl)
-		-DWITH_SDL2=$(usex sdl2)
-		-DWITH_RSVG=$(usex svg rsvg)
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_Freetype=$(usex truetype)
-		-DWITH_LibVNCServer=$(usex vnc)
-		-DWITH_Xine=$(usex xine)
-		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
-		-DWITH_ZLIB=$(usex zlib)
-		-DOSG_USE_QT=$(usex qt5)
-		-DDESIRED_QT_VERSION=5
-	)
-	if use examples; then
-		mycmakeargs+=(
-			-DWITH_FLTK=$(usex fltk)
-			-DWITH_FOX=$(usex fox)
-			-DWITH_GLUT=$(usex glut)
-			-DWITH_wxWidgets=$(usex wxwidgets)
-		)
-	fi
-	if use lua; then
-		mycmakeargs+=(
-			-DLUA_INCLUDE_DIR="$(lua_get_include_dir)"
-			-DLUA_LIBRARY="$(lua_get_shared_lib)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
-}
diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r101.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r101.ebuild
new file mode 100644
index 000000000000..409ac1f6275c
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r101.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+WX_GTK_VER="3.0-gtk3"
+inherit cmake flag-o-matic lua-single wxwidgets
+
+DESCRIPTION="OpenMW-specific fork of OpenSceneGraph"
+HOMEPAGE="https://github.com/OpenMW/osg"
+MY_COMMIT="8b07809fa674ecffe77338aaea2e223b3aadff0e"
+SRC_URI="https://github.com/OpenMW/osg/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0/132" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
+KEYWORDS="~amd64 ~x86"
+IUSE="curl debug doc examples egl ffmpeg fltk fox gdal gif glut gstreamer jpeg
+	lua openexr openinventor osgapps pdf png qt5 sdl sdl2 svg tiff
+	truetype vnc wxwidgets xine xrandr zlib"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	sdl2? ( sdl )
+	openexr? ( zlib )
+"
+
+# TODO: COLLADA, FBX, GTA, OpenVRML, Performer, DCMTK
+RDEPEND="
+	!dev-games/openscenegraph
+	media-libs/mesa[egl(+)?]
+	virtual/glu
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libXext
+	curl? ( net-misc/curl )
+	examples? (
+		fltk? ( x11-libs/fltk:1[opengl] )
+		fox? ( x11-libs/fox:1.6[opengl] )
+		glut? ( media-libs/freeglut )
+		sdl2? ( media-libs/libsdl2 )
+		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	gdal? ( sci-libs/gdal:= )
+	gif? ( media-libs/giflib:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jpeg? ( virtual/jpeg:0 )
+	lua? ( ${LUA_DEPS} )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	openinventor? ( media-libs/coin )
+	pdf? ( app-text/poppler[cairo] )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( media-libs/libsdl )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	vnc? ( net-libs/libvncserver )
+	xrandr? ( x11-libs/libXrandr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/osg-${MY_COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/openscenegraph-3.4-cmake.patch
+	"${FILESDIR}"/openscenegraph-3.5.1-jpeg-9.patch
+	"${FILESDIR}"/openscenegraph-3.6.3-docdir.patch
+	"${FILESDIR}"/openscenegraph-3.4-gcc11.patch
+)
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i "s/ FIND_PACKAGE/ MACRO_OPTIONAL_FIND_PACKAGE/g" CMakeLists.txt || die "can't replace FIND_PACKAGE"
+	cmake_src_prepare
+}
+
+src_configure() {
+	if use examples && use wxwidgets; then
+		setup-wxwidgets
+	fi
+
+	# Needed by FFmpeg
+	append-cppflags -D__STDC_CONSTANT_MACROS
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDYNAMIC_OPENSCENEGRAPH=ON
+		-DLIB_POSTFIX=${libdir/lib}
+		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
+		-DOSG_PROVIDE_READFILE=ON
+		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
+		-DWITH_Lua51=OFF # We use CMake-version FindLua52.cmake instead which can find any lua
+		-DWITH_Lua52=$(usex lua)
+		-DWITH_Asio=OFF # Fails to build, similar to https://github.com/chriskohlhoff/asio/issues/316
+		-DWITH_CURL=$(usex curl)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
+		-DBUILD_OSG_EXAMPLES=$(usex examples)
+		-DWITH_FFmpeg=$(usex ffmpeg)
+		-DWITH_GDAL=$(usex gdal)
+		-DWITH_GIFLIB=$(usex gif)
+		-DWITH_GStreamer=$(usex gstreamer)
+		-DWITH_GLIB=$(usex gstreamer)
+		-DWITH_GtkGl=OFF
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_Jasper=OFF
+		-DWITH_LIBLAS=OFF # dep failed to build https://bugs.gentoo.org/725938
+		-DWITH_OpenEXR=$(usex openexr)
+		-DWITH_Inventor=$(usex openinventor)
+		-DWITH_Poppler-glib=$(usex pdf)
+		-DWITH_PNG=$(usex png)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_SDL2=$(usex sdl2)
+		-DWITH_RSVG=$(usex svg rsvg)
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_Freetype=$(usex truetype)
+		-DWITH_LibVNCServer=$(usex vnc)
+		-DWITH_Xine=$(usex xine)
+		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
+		-DWITH_ZLIB=$(usex zlib)
+		-DOSG_USE_QT=$(usex qt5)
+		-DDESIRED_QT_VERSION=5
+	)
+	if use examples; then
+		mycmakeargs+=(
+			-DWITH_FLTK=$(usex fltk)
+			-DWITH_FOX=$(usex fox)
+			-DWITH_GLUT=$(usex glut)
+			-DWITH_wxWidgets=$(usex wxwidgets)
+		)
+	fi
+	if use lua; then
+		mycmakeargs+=(
+			-DLUA_INCLUDE_DIR="$(lua_get_include_dir)"
+			-DLUA_LIBRARY="$(lua_get_shared_lib)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
+}
diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20210610.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20210610.ebuild
new file mode 100644
index 000000000000..1fe85653833c
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20210610.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake flag-o-matic lua-single wxwidgets
+
+MY_COMMIT="b02abe200c4847e73b887b064a89ea1758a5b733"
+
+DESCRIPTION="OpenMW-specific fork of OpenSceneGraph"
+HOMEPAGE="https://github.com/OpenMW/osg"
+SRC_URI="https://github.com/OpenMW/osg/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/osg-${MY_COMMIT}"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0/162" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	collada curl dicom debug doc egl examples ffmpeg fltk fox gdal
+	gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png
+	sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib
+"
+
+REQUIRED_USE="
+	dicom? ( zlib )
+	lua? ( ${LUA_REQUIRED_USE} )
+	openexr? ( zlib )
+	sdl2? ( sdl )
+"
+
+# TODO: FBX, GTA, NVTT, OpenVRML, Performer
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	!dev-games/openscenegraph
+	media-libs/mesa[egl(+)?]
+	virtual/glu
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libXext
+	collada? ( dev-libs/collada-dom:= )
+	curl? ( net-misc/curl )
+	examples? (
+		fltk? ( x11-libs/fltk:1[opengl] )
+		fox? ( x11-libs/fox:1.6[opengl] )
+		glut? ( media-libs/freeglut )
+		sdl2? ( media-libs/libsdl2 )
+		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	gdal? ( sci-libs/gdal:= )
+	gif? ( media-libs/giflib:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jpeg? ( virtual/jpeg:0 )
+	las? ( >=sci-geosciences/liblas-1.8.0 )
+	lua? ( ${LUA_DEPS} )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	openinventor? ( media-libs/coin )
+	pdf? ( app-text/poppler[cairo] )
+	png? ( media-libs/libpng:0= )
+	sdl? ( media-libs/libsdl )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	vnc? ( net-libs/libvncserver )
+	xrandr? ( x11-libs/libXrandr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/openscenegraph-3.6.3-cmake.patch
+	"${FILESDIR}"/openscenegraph-3.6.3-docdir.patch
+	"${FILESDIR}"/openscenegraph-3.6.5-use_boost_asio.patch
+	"${FILESDIR}"/openscenegraph-3.6.5-cmake_lua_version.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+	if use examples && use wxwidgets; then
+		setup-wxwidgets unicode
+	fi
+
+	# Needed by FFmpeg
+	append-cppflags -D__STDC_CONSTANT_MACROS
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDYNAMIC_OPENSCENEGRAPH=ON
+		-DLIB_POSTFIX=${libdir/lib}
+		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
+		$(cmake_use_find_package collada COLLADA)
+		$(cmake_use_find_package curl CURL)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		$(cmake_use_find_package dicom DCMTK)
+		$(cmake_use_find_package egl EGL)
+		-DBUILD_OSG_EXAMPLES=$(usex examples)
+		$(cmake_use_find_package ffmpeg FFmpeg)
+		$(cmake_use_find_package gdal GDAL)
+		$(cmake_use_find_package gif GIFLIB)
+		$(cmake_use_find_package gstreamer GLIB)
+		$(cmake_use_find_package gstreamer GStreamer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
+		$(cmake_use_find_package jpeg JPEG)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		$(cmake_use_find_package las LIBLAS)
+		$(cmake_use_find_package lua Lua)
+		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package openinventor Inventor)
+		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
+		$(cmake_use_find_package pdf Poppler-glib)
+		$(cmake_use_find_package png PNG)
+		$(cmake_use_find_package sdl SDL)
+		$(cmake_use_find_package sdl2 SDL2)
+		$(cmake_use_find_package svg RSVG)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package truetype Freetype)
+		$(cmake_use_find_package vnc LibVNCServer)
+		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
+		$(cmake_use_find_package zlib ZLIB)
+		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
+	)
+
+	if use examples; then
+		mycmakeargs+=(
+			$(cmake_use_find_package fltk FLTK)
+			$(cmake_use_find_package fox FOX)
+			$(cmake_use_find_package glut GLUT)
+			$(cmake_use_find_package wxwidgets wxWidgets)
+		)
+	fi
+
+	if use lua; then
+		mycmakeargs+=(
+			-DLUA_VERSION="$(lua_get_version)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
+}
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index c3639cc8714d..38f131dd0231 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,7 +1,8 @@
 AUX openscenegraph-3.6.3-cmake.patch 993 BLAKE2B 3adb6691bb1c2e9cc4e88ef5c1e107bd429564248fd72c6f4d70c1622b2933273e02f294d5fd3b2529fdbbdef65cdba41db7b441b7334b6180995896b52f8212 SHA512 2905fa5031641f2d3a8cec46c32c1cbf8adfb34b7c460c22eaecca66f5cc0b73c2bda4ed68dca3bda12a5f49385c2257bd5b4f3271b13eb979298eeaefb45789
 AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
 AUX openscenegraph-3.6.5-cmake_lua_version.patch 440 BLAKE2B 51a35309b01a096f9423ff64e66d62f99d3e26bd898db0b53c135dc99318b236a1b129211f51de9b1a29d054e0810aa4ff2a7c307dc4b4a606eb4075a60748d9 SHA512 a41c7a65b1cfd0dabc080f509cf288f575b3ec5d7666a4a889a8c3156e9d32559e1f802e23783c5c70376c82a24dd87813e9bfde0876085e0e3967b47852059a
-AUX openscenegraph-3.6.5-use_boost_asio.patch 9659 BLAKE2B b4ee11d6a69367e47b8a0f4fb9af81fafdf59d5358caaa0f096e0fd1d3ef08c88c1b52a43b32db2c79fceb0aca888c2dca64d90409de5249d0eab8cf5e659792 SHA512 2cd9454b13428811aac5e9a9d167265479b9368deac0e1676ccc51292f74740b9f26ab82d0f4ba074dcb454c3958bfaa8cc1a783bd6abd6161b2d9cea849ec03
+AUX openscenegraph-3.6.5-use_boost_asio.patch 6995 BLAKE2B 0b0c0af9980b59e1cfd4cc5256720d0e69d5e3a65173c9364036e42efa34377beb00811fc4a0aee0cead870abe0c33feaaebe57c22cbefac43d4dcf65a1d19e1 SHA512 fa7c702eaf69c7b7890cf44e5293f9c8ea73ac441af1e4573dadd62f3ca797ccbbc2fbafd8c946a936192f7331fa16d8d4247de8b657db77791d5137207c23b6
 DIST OpenSceneGraph-3.6.5.tar.gz 5780762 BLAKE2B 31ebeeae94eb6aff043788313946d5c08886f97d97cd5796e600918e137ef7f06839206b79b2f5649aac7f34037d4d79e18a5638152e150de931b7f7a7d3c38b SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b
-EBUILD openscenegraph-3.6.5-r100.ebuild 4236 BLAKE2B 5e6cfaba7258f31bae4c93bb6c725c63671fc5daf5218b1c68c887cb9e86902e484a027440f03208e50b7f105a64d0f51e9fd1b73062096e687144a85beb62ec SHA512 4e5d3750547244938aba9fcc5c8946345bab68b1b179eb83dd0586bc78ef4d06a94eeaaf1efd3d72e96224092ea37398f5f51904f710096a00fd338f1d0ae147
-MISC metadata.xml 1775 BLAKE2B 9646f239533a57882812428670fdc532671a096a476b9ad01904405ca5aa15316b6f43bf46588f72e19640be9ba5a179a471f11260a9250e090cda9f8fffde4d SHA512 4efe38c8f3be0ba9a3ff42290f7b9042740479474df73bdb4d2c73ef158cf79d9f0704eb5cb5b1ee0f80a3cfb1a13f96f7610753b0a55aa87ef22e92a922888d
+EBUILD openscenegraph-3.6.5-r101.ebuild 4239 BLAKE2B 13d97221c12e136146d4b45bdc1105145eaabcd227e5c6ea04e7862b7ebc6aa14c53a6ba963ef168ddfb211dbdf04c67f01aa44a92ab97c6bf2f2be098b16543 SHA512 2e209e92e96459e40e6c0ab3a4bb9386e0ea033ef2d42be28ef60f290e5892e9dfe7ed1bc59d090aac53529b76205e6d6c7daefa921df35f7fbc18b34ba017b5
+EBUILD openscenegraph-3.6.5-r110.ebuild 4318 BLAKE2B 33cb90c8c586662b64e2604e1ec0f5d0851eda7ca1b86e768b268977377d22093fa7e63525bc9328d1f995e86c72069cda7a6bc9a35b2655cf43f6497564c79e SHA512 de1ff9febb2cb269140d467185a578d1cad68dc14b12b5ae1730824cc2dfc435dfd62fc2511a321bf28797e77c82d2a5f2cccf69b0a30f051658f4ae7dd85ba6
+MISC metadata.xml 1865 BLAKE2B cf15bd9662c066b53209dc7938a965e2b9da9d3ea4992fd8dddafa13fed58aa32c52feca8f4869bfa076e077f950a18d0ecee9e61cce72e4ad4df24a94889e64 SHA512 d6c00457c1a94d0c6327eb629dd99a0fc82bacae57ef0afc3ba62a6fb3065947a9412e37f99e69d0acf33ac37f7351bd939ce68caaa700913389abd7865f6051
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.6.5-use_boost_asio.patch b/dev-games/openscenegraph/files/openscenegraph-3.6.5-use_boost_asio.patch
index 4dfeedcaf191..f9a32c0dc601 100644
--- a/dev-games/openscenegraph/files/openscenegraph-3.6.5-use_boost_asio.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-3.6.5-use_boost_asio.patch
@@ -1,6 +1,5 @@
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeLists.txt osg-my/CMakeLists.txt
---- OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeLists.txt	2020-01-31 12:03:07.000000000 +0100
-+++ osg-my/CMakeLists.txt	2020-09-26 18:45:41.191099844 +0200
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -764,7 +764,7 @@
      FIND_PACKAGE(DirectInput)
      FIND_PACKAGE(NVTT)
@@ -10,9 +9,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeLists.txt osg-my/CMakeLists.t
      ENDIF()
      FIND_PACKAGE(ZeroConf)
  
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/FindAsio.cmake osg-my/CMakeModules/FindAsio.cmake
---- OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/FindAsio.cmake	2020-01-31 12:03:07.000000000 +0100
-+++ osg-my/CMakeModules/FindAsio.cmake	1970-01-01 01:00:00.000000000 +0100
+--- a/CMakeModules/FindAsio.cmake
++++ b/CMakeModules/FindAsio.cmake
 @@ -1,22 +0,0 @@
 -# Locate ASIO-headers (http://think-async.com/Asio)
 -# This module defines
@@ -36,9 +34,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/FindAsio.cmake osg-my
 -        SET(ASIO_FOUND "YES")
 -    ENDIF()
 -ENDIF()
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/CMakeLists.txt osg-my/src/osgPlugins/CMakeLists.txt
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/CMakeLists.txt	2020-01-31 12:03:07.000000000 +0100
-+++ osg-my/src/osgPlugins/CMakeLists.txt	2020-09-26 20:04:59.345449848 +0200
+--- a/src/osgPlugins/CMakeLists.txt
++++ b/src/osgPlugins/CMakeLists.txt
 @@ -299,13 +299,13 @@
  #
  # Device integration plugins
@@ -57,9 +54,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/CMakeLists.txt osg-
  
  
  IF(ZEROCONF_FOUND)
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/CMakeLists.txt osg-my/src/osgPlugins/RestHttpDevice/CMakeLists.txt
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/CMakeLists.txt	2020-01-31 12:03:07.000000000 +0100
-+++ osg-my/src/osgPlugins/RestHttpDevice/CMakeLists.txt	2020-09-26 18:46:57.096859301 +0200
+--- a/src/osgPlugins/RestHttpDevice/CMakeLists.txt
++++ b/src/osgPlugins/RestHttpDevice/CMakeLists.txt
 @@ -1,6 +1,5 @@
  INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 -INCLUDE_DIRECTORIES(${ASIO_INCLUDE_DIR})
@@ -77,9 +73,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/CMak
  
  #### end var setup  ###
  SETUP_PLUGIN(resthttp)
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.cpp osg-my/src/osgPlugins/RestHttpDevice/connection.cpp
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.cpp	2020-01-31 12:03:07.000000000 +0100
-+++ osg-my/src/osgPlugins/RestHttpDevice/connection.cpp	2020-09-26 18:32:19.690576603 +0200
+--- a/src/osgPlugins/RestHttpDevice/connection.cpp
++++ b/src/osgPlugins/RestHttpDevice/connection.cpp
 @@ -37,14 +37,14 @@
  void connection::start()
  {
@@ -112,9 +107,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/conn
      socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ignored_ec);
    }
  
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.hpp osg-my/src/osgPlugins/RestHttpDevice/connection.hpp
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.hpp	2020-01-31 12:03:07.000000000 +0100
-+++ osg-my/src/osgPlugins/RestHttpDevice/connection.hpp	2020-09-26 19:56:49.410701890 +0200
+--- a/src/osgPlugins/RestHttpDevice/connection.hpp
++++ b/src/osgPlugins/RestHttpDevice/connection.hpp
 @@ -11,7 +11,7 @@
  #ifndef HTTP_SERVER_CONNECTION_HPP
  #define HTTP_SERVER_CONNECTION_HPP
@@ -147,9 +141,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/conn
  
    /// Socket for the connection.
    asio::ip::tcp::socket socket_;
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.cpp osg-my/src/osgPlugins/RestHttpDevice/io_service_pool.cpp
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.cpp	2020-01-31 12:03:07.000000000 +0100
-+++ osg-my/src/osgPlugins/RestHttpDevice/io_service_pool.cpp	2020-09-26 19:56:12.353279737 +0200
+--- a/src/osgPlugins/RestHttpDevice/io_service_pool.cpp
++++ b/src/osgPlugins/RestHttpDevice/io_service_pool.cpp
 @@ -11,7 +11,7 @@
  #include "server.hpp"
  #include <stdexcept>
@@ -181,9 +174,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_s
  }
  
  void io_service_pool::stop()
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.hpp osg-my/src/osgPlugins/RestHttpDevice/io_service_pool.hpp
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.hpp	2020-01-31 12:03:07.000000000 +0100
-+++ osg-my/src/osgPlugins/RestHttpDevice/io_service_pool.hpp	2020-09-26 18:37:02.119722575 +0200
+--- a/src/osgPlugins/RestHttpDevice/io_service_pool.hpp
++++ b/src/osgPlugins/RestHttpDevice/io_service_pool.hpp
 @@ -11,11 +11,13 @@
  #ifndef HTTP_SERVER_IO_SERVICE_POOL_HPP
  #define HTTP_SERVER_IO_SERVICE_POOL_HPP
@@ -199,9 +191,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_s
  namespace http {
  namespace server {
  
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/reply.hpp osg-my/src/osgPlugins/RestHttpDevice/reply.hpp
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/reply.hpp	2020-01-31 12:03:07.000000000 +0100
-+++ osg-my/src/osgPlugins/RestHttpDevice/reply.hpp	2020-09-26 18:28:42.741206569 +0200
+--- a/src/osgPlugins/RestHttpDevice/reply.hpp
++++ b/src/osgPlugins/RestHttpDevice/reply.hpp
 @@ -13,9 +13,11 @@
  
  #include <string>
@@ -215,9 +206,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/repl
  namespace http {
  namespace server {
  
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/server.cpp osg-my/src/osgPlugins/RestHttpDevice/server.cpp
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/server.cpp	2020-01-31 12:03:07.000000000 +0100
-+++ osg-my/src/osgPlugins/RestHttpDevice/server.cpp	2020-09-26 19:53:17.692061347 +0200
+--- a/src/osgPlugins/RestHttpDevice/server.cpp
++++ b/src/osgPlugins/RestHttpDevice/server.cpp
 @@ -23,7 +23,7 @@
      request_handler_(doc_root)
  {
@@ -236,9 +226,8 @@ diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/serv
  {
    if (!e)
    {
-diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/server.hpp osg-my/src/osgPlugins/RestHttpDevice/server.hpp
---- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/server.hpp	2020-01-31 12:03:07.000000000 +0100
-+++ osg-my/src/osgPlugins/RestHttpDevice/server.hpp	2020-09-26 18:29:38.894046375 +0200
+--- a/src/osgPlugins/RestHttpDevice/server.hpp
++++ b/src/osgPlugins/RestHttpDevice/server.hpp
 @@ -11,7 +11,7 @@
  #ifndef HTTP_SERVER_SERVER_HPP
  #define HTTP_SERVER_SERVER_HPP
diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
index 0f8459428abd..d265f9102bdd 100644
--- a/dev-games/openscenegraph/metadata.xml
+++ b/dev-games/openscenegraph/metadata.xml
@@ -13,6 +13,7 @@
 		The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well established as the world leading scene graph technology, used widely in the vis-sim, space, scientific, oil-gas, games and virtual reality industries.
 	</longdescription>
 	<use>
+		<flag name="collada">Enable DAE file support via <pkg>dev-libs/collada-dom</pkg></flag>
 		<flag name="dicom">Enable DICOM medical image file support via <pkg>sci-libs/dcmtk</pkg></flag>
 		<flag name="egl">Enable EGL support</flag>
 		<flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> library</flag>
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r100.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r100.ebuild
deleted file mode 100644
index 32d8c57d2b1f..000000000000
--- a/dev-games/openscenegraph/openscenegraph-3.6.5-r100.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,2} )
-
-MY_PN="OpenSceneGraph"
-MY_P=${MY_PN}-${PV}
-WX_GTK_VER="3.0-gtk3"
-inherit cmake flag-o-matic lua-single wxwidgets
-
-DESCRIPTION="Open source high performance 3D graphics toolkit"
-HOMEPAGE="http://www.openscenegraph.org/"
-SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="wxWinLL-3 LGPL-2.1"
-SLOT="0/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut
-gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2
-svg tiff truetype vnc wxwidgets xrandr +zlib"
-
-REQUIRED_USE="dicom? ( zlib )
-	lua? ( ${LUA_REQUIRED_USE} )
-	openexr? ( zlib )
-	sdl2? ( sdl )"
-
-# TODO: COLLADA, FBX, GTA, NVTT, OpenVRML, Performer
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	media-libs/mesa[egl?]
-	virtual/glu
-	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libXext
-	curl? ( net-misc/curl )
-	examples? (
-		fltk? ( x11-libs/fltk:1[opengl] )
-		fox? ( x11-libs/fox:1.6[opengl] )
-		glut? ( media-libs/freeglut )
-		sdl2? ( media-libs/libsdl2 )
-		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	gdal? ( sci-libs/gdal:= )
-	gif? ( media-libs/giflib:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jpeg? ( virtual/jpeg:0 )
-	las? ( >=sci-geosciences/liblas-1.8.0 )
-	lua? ( ${LUA_DEPS} )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	openinventor? ( media-libs/coin )
-	pdf? ( app-text/poppler[cairo] )
-	png? ( media-libs/libpng:0= )
-	sdl? ( media-libs/libsdl )
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	vnc? ( net-libs/libvncserver )
-	xrandr? ( x11-libs/libXrandr )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.37.0:*
-	x11-base/xorg-proto
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.3-cmake.patch
-	"${FILESDIR}"/${PN}-3.6.3-docdir.patch
-	"${FILESDIR}"/${PN}-3.6.5-use_boost_asio.patch
-	"${FILESDIR}"/${PN}-3.6.5-cmake_lua_version.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_configure() {
-	if use examples && use wxwidgets; then
-		setup-wxwidgets unicode
-	fi
-
-	# Needed by FFmpeg
-	append-cppflags -D__STDC_CONSTANT_MACROS
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDYNAMIC_OPENSCENEGRAPH=ON
-		-DLIB_POSTFIX=${libdir/lib}
-		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
-		$(cmake_use_find_package curl CURL)
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		$(cmake_use_find_package dicom DCMTK)
-		$(cmake_use_find_package egl EGL)
-		-DBUILD_OSG_EXAMPLES=$(usex examples)
-		$(cmake_use_find_package ffmpeg FFmpeg)
-		$(cmake_use_find_package gdal GDAL)
-		$(cmake_use_find_package gif GIFLIB)
-		$(cmake_use_find_package gstreamer GLIB)
-		$(cmake_use_find_package gstreamer GStreamer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
-		$(cmake_use_find_package jpeg JPEG)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		$(cmake_use_find_package las LIBLAS)
-		$(cmake_use_find_package lua Lua)
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package openinventor Inventor)
-		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
-		$(cmake_use_find_package pdf Poppler-glib)
-		$(cmake_use_find_package png PNG)
-		$(cmake_use_find_package sdl SDL)
-		$(cmake_use_find_package sdl2 SDL2)
-		$(cmake_use_find_package svg RSVG)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package truetype Freetype)
-		$(cmake_use_find_package vnc LibVNCServer)
-		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
-		$(cmake_use_find_package zlib ZLIB)
-		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
-	)
-	if use examples; then
-		mycmakeargs+=(
-			$(cmake_use_find_package fltk FLTK)
-			$(cmake_use_find_package fox FOX)
-			$(cmake_use_find_package glut GLUT)
-			$(cmake_use_find_package wxwidgets wxWidgets)
-		)
-	fi
-	if use lua; then
-		mycmakeargs+=(
-			-DLUA_VERSION="$(lua_get_version)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
-}
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r101.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r101.ebuild
new file mode 100644
index 000000000000..9ae46872143a
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r101.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1,2} )
+
+MY_PN="OpenSceneGraph"
+MY_P=${MY_PN}-${PV}
+WX_GTK_VER="3.0-gtk3"
+inherit cmake flag-o-matic lua-single wxwidgets
+
+DESCRIPTION="Open source high performance 3D graphics toolkit"
+HOMEPAGE="http://www.openscenegraph.org/"
+SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+IUSE="curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut
+gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2
+svg tiff truetype vnc wxwidgets xrandr +zlib"
+
+REQUIRED_USE="dicom? ( zlib )
+	lua? ( ${LUA_REQUIRED_USE} )
+	openexr? ( zlib )
+	sdl2? ( sdl )"
+
+# TODO: COLLADA, FBX, GTA, NVTT, OpenVRML, Performer
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	media-libs/mesa[egl(+)?]
+	virtual/glu
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libXext
+	curl? ( net-misc/curl )
+	examples? (
+		fltk? ( x11-libs/fltk:1[opengl] )
+		fox? ( x11-libs/fox:1.6[opengl] )
+		glut? ( media-libs/freeglut )
+		sdl2? ( media-libs/libsdl2 )
+		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	gdal? ( sci-libs/gdal:= )
+	gif? ( media-libs/giflib:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jpeg? ( virtual/jpeg:0 )
+	las? ( >=sci-geosciences/liblas-1.8.0 )
+	lua? ( ${LUA_DEPS} )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	openinventor? ( media-libs/coin )
+	pdf? ( app-text/poppler[cairo] )
+	png? ( media-libs/libpng:0= )
+	sdl? ( media-libs/libsdl )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	vnc? ( net-libs/libvncserver )
+	xrandr? ( x11-libs/libXrandr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.37.0:*
+	x11-base/xorg-proto
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.3-cmake.patch
+	"${FILESDIR}"/${PN}-3.6.3-docdir.patch
+	"${FILESDIR}"/${PN}-3.6.5-use_boost_asio.patch
+	"${FILESDIR}"/${PN}-3.6.5-cmake_lua_version.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+	if use examples && use wxwidgets; then
+		setup-wxwidgets unicode
+	fi
+
+	# Needed by FFmpeg
+	append-cppflags -D__STDC_CONSTANT_MACROS
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDYNAMIC_OPENSCENEGRAPH=ON
+		-DLIB_POSTFIX=${libdir/lib}
+		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
+		$(cmake_use_find_package curl CURL)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		$(cmake_use_find_package dicom DCMTK)
+		$(cmake_use_find_package egl EGL)
+		-DBUILD_OSG_EXAMPLES=$(usex examples)
+		$(cmake_use_find_package ffmpeg FFmpeg)
+		$(cmake_use_find_package gdal GDAL)
+		$(cmake_use_find_package gif GIFLIB)
+		$(cmake_use_find_package gstreamer GLIB)
+		$(cmake_use_find_package gstreamer GStreamer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
+		$(cmake_use_find_package jpeg JPEG)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		$(cmake_use_find_package las LIBLAS)
+		$(cmake_use_find_package lua Lua)
+		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package openinventor Inventor)
+		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
+		$(cmake_use_find_package pdf Poppler-glib)
+		$(cmake_use_find_package png PNG)
+		$(cmake_use_find_package sdl SDL)
+		$(cmake_use_find_package sdl2 SDL2)
+		$(cmake_use_find_package svg RSVG)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package truetype Freetype)
+		$(cmake_use_find_package vnc LibVNCServer)
+		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
+		$(cmake_use_find_package zlib ZLIB)
+		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
+	)
+	if use examples; then
+		mycmakeargs+=(
+			$(cmake_use_find_package fltk FLTK)
+			$(cmake_use_find_package fox FOX)
+			$(cmake_use_find_package glut GLUT)
+			$(cmake_use_find_package wxwidgets wxWidgets)
+		)
+	fi
+	if use lua; then
+		mycmakeargs+=(
+			-DLUA_VERSION="$(lua_get_version)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
+}
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r110.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r110.ebuild
new file mode 100644
index 000000000000..34031794ef52
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r110.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake flag-o-matic lua-single wxwidgets
+
+MY_PN="OpenSceneGraph"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Open source high performance 3D graphics toolkit"
+HOMEPAGE="http://www.openscenegraph.org/"
+SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="
+	collada curl dicom debug doc egl examples ffmpeg fltk fox gdal
+	gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png
+	sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib
+"
+
+REQUIRED_USE="
+	dicom? ( zlib )
+	lua? ( ${LUA_REQUIRED_USE} )
+	openexr? ( zlib )
+	sdl2? ( sdl )
+"
+
+# TODO: FBX, GTA, NVTT, OpenVRML, Performer
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	media-libs/mesa[egl(+)?]
+	virtual/glu
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libXext
+	collada? ( dev-libs/collada-dom:= )
+	curl? ( net-misc/curl )
+	examples? (
+		fltk? ( x11-libs/fltk:1[opengl] )
+		fox? ( x11-libs/fox:1.6[opengl] )
+		glut? ( media-libs/freeglut )
+		sdl2? ( media-libs/libsdl2 )
+		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	gdal? ( sci-libs/gdal:= )
+	gif? ( media-libs/giflib:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jpeg? ( virtual/jpeg:0 )
+	las? ( >=sci-geosciences/liblas-1.8.0 )
+	lua? ( ${LUA_DEPS} )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	openinventor? ( media-libs/coin )
+	pdf? ( app-text/poppler[cairo] )
+	png? ( media-libs/libpng:0= )
+	sdl? ( media-libs/libsdl )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	vnc? ( net-libs/libvncserver )
+	xrandr? ( x11-libs/libXrandr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.3-cmake.patch
+	"${FILESDIR}"/${PN}-3.6.3-docdir.patch
+	"${FILESDIR}"/${PN}-3.6.5-use_boost_asio.patch
+	"${FILESDIR}"/${PN}-3.6.5-cmake_lua_version.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+	if use examples && use wxwidgets; then
+		setup-wxwidgets unicode
+	fi
+
+	# Needed by FFmpeg
+	append-cppflags -D__STDC_CONSTANT_MACROS
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDYNAMIC_OPENSCENEGRAPH=ON
+		-DLIB_POSTFIX=${libdir/lib}
+		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
+		$(cmake_use_find_package collada COLLADA)
+		$(cmake_use_find_package curl CURL)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		$(cmake_use_find_package dicom DCMTK)
+		$(cmake_use_find_package egl EGL)
+		-DBUILD_OSG_EXAMPLES=$(usex examples)
+		$(cmake_use_find_package ffmpeg FFmpeg)
+		$(cmake_use_find_package gdal GDAL)
+		$(cmake_use_find_package gif GIFLIB)
+		$(cmake_use_find_package gstreamer GLIB)
+		$(cmake_use_find_package gstreamer GStreamer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
+		$(cmake_use_find_package jpeg JPEG)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		$(cmake_use_find_package las LIBLAS)
+		$(cmake_use_find_package lua Lua)
+		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package openinventor Inventor)
+		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
+		$(cmake_use_find_package pdf Poppler-glib)
+		$(cmake_use_find_package png PNG)
+		$(cmake_use_find_package sdl SDL)
+		$(cmake_use_find_package sdl2 SDL2)
+		$(cmake_use_find_package svg RSVG)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package truetype Freetype)
+		$(cmake_use_find_package vnc LibVNCServer)
+		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
+		$(cmake_use_find_package zlib ZLIB)
+		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
+	)
+
+	if use examples; then
+		mycmakeargs+=(
+			$(cmake_use_find_package fltk FLTK)
+			$(cmake_use_find_package fox FOX)
+			$(cmake_use_find_package glut GLUT)
+			$(cmake_use_find_package wxwidgets wxWidgets)
+		)
+	fi
+
+	if use lua; then
+		mycmakeargs+=(
+			-DLUA_VERSION="$(lua_get_version)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
+}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index f7d362a9f554..a7b79dabe20b 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/haskell-platform/Manifest b/dev-haskell/haskell-platform/Manifest
deleted file mode 100644
index d5b61f94bf56..000000000000
--- a/dev-haskell/haskell-platform/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD haskell-platform-2014.2.0.0-r1.ebuild 2120 BLAKE2B 91ba63b2313b9b27a63590b77758e2c228dbe888ae1da20046d7ff9196bc1bfa1a2761eb494d5ce0fbc159067983c0f8315d2abb8bb1b37f9c67c5380d4840af SHA512 22a7fb1fddd981246d17431556d152590c45c3b3637f0fbc95a52d3d83a0391cb97f874e2e207efe8f2b2d3091280dba2db1a642e63a9464ac6239956b6b2b43
-MISC metadata.xml 712 BLAKE2B ce35d5fa9cc59091ade2ae273780e09c16b1a7aed39ea8eba01e7164e0776903635cef566fa5801d826e14c11169229d23dc25c3afd8b19fb46c0289b61e79e5 SHA512 44c4ad8c6ffde41e1c52dd9b477ae002579b5fd2878a68a23826ff56aa856d8e0f5b5d7571de69dd6a5bbb530b59d84237313e575d853b6b054fbb2690d6e227
diff --git a/dev-haskell/haskell-platform/haskell-platform-2014.2.0.0-r1.ebuild b/dev-haskell/haskell-platform/haskell-platform-2014.2.0.0-r1.ebuild
deleted file mode 100644
index 682281b41f5d..000000000000
--- a/dev-haskell/haskell-platform/haskell-platform-2014.2.0.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The Haskell Platform"
-HOMEPAGE="http://haskell.org/platform"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+doc profile +X"
-
-RDEPEND="
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/xhtml-3000.2.1
-
-	>=dev-haskell/async-2.0.1.5
-	>=dev-haskell/attoparsec-0.10.4.0:=[profile?]
-	>=dev-haskell/case-insensitive-1.1.0.3:=[profile?]
-	>=dev-haskell/fgl-5.5.0.1:=[profile?]
-	>=dev-haskell/hashable-1.2.2.0:=[profile?]
-	>=dev-haskell/haskell-src-1.0.1.6:=[profile?]
-	>=dev-haskell/html-1.0.1.2:=[profile?]
-	>=dev-haskell/http-4000.2.10:=[profile?]
-	>=dev-haskell/hunit-1.2.5.2:=[profile?]
-	>=dev-haskell/mtl-2.1.3.1:=[profile?]
-	>=dev-haskell/network-2.4.2.3:=[profile?]
-	>=dev-haskell/parallel-3.2.0.4:=[profile?]
-	>=dev-haskell/parsec-3.1.5:=[profile?]
-	>=dev-haskell/primitive-0.5.2.1:=[profile?]
-	>=dev-haskell/quickcheck-2.6:2=[profile?]
-	>=dev-haskell/random-1.0.1.1:=[profile?]
-	>=dev-haskell/regex-base-0.93.2:=[profile?]
-	>=dev-haskell/regex-compat-0.95.1:=[profile?]
-	>=dev-haskell/regex-posix-0.95.2:=[profile?]
-	>=dev-haskell/split-0.2.2:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/syb-0.4.1:=[profile?]
-	>=dev-haskell/text-1.1.0.0:=[profile?]
-	>=dev-haskell/transformers-0.3.0.0:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.4.0:=[profile?]
-	>=dev-haskell/vector-0.10.9.1:=[profile?]
-	>=dev-haskell/xhtml-3000.2.1:=[profile?]
-	>=dev-haskell/zlib-0.5.4.1:=[profile?]
-	X? (
-		>=dev-haskell/gluraw-1.4.0.1:=[profile?]
-		>=dev-haskell/glut-2.5.1.1:=[profile?]
-		>=dev-haskell/opengl-2.9.2.0:=[profile?]
-		>=dev-haskell/openglraw-1.5.0.0:=[profile?]
-	)
-
-	>=dev-lang/ghc-7.8.3:=
-
-	>=dev-haskell/alex-3.1.3
-	>=dev-haskell/cabal-install-1.18.0.5
-	>=dev-haskell/happy-1.19.4
-	>=dev-haskell/hscolour-1.20.3
-	doc? ( >=dev-haskell/haddock-2.14.2 )
-"
-DEPEND="${RDEPEND}"
-
-pkg_postinst() {
-	if ! use X; then
-		elog "The haskell platform includes the 3D graphics libraries opengl and glut."
-		elog "To install opengl and glut requires the X use flag."
-	fi
-}
diff --git a/dev-haskell/haskell-platform/metadata.xml b/dev-haskell/haskell-platform/metadata.xml
deleted file mode 100644
index 991c27c26f8e..000000000000
--- a/dev-haskell/haskell-platform/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The Haskell Platform (HP) is the blessed set of libraries and tools on
-		which to build further Haskell libraries and applications. It is
-		intended to provide a comprehensive, stable, and quality tested base for
-		Haskell projects to work from.
-		
-		This version specifies the following additional developer tools be
-		installed, for a system to be in full compliance:
-		
-		* cabal-install
-		* alex
-		* happy
-		* haddock
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/integer-logarithms/Manifest b/dev-haskell/integer-logarithms/Manifest
index ed9ef202c394..f3a33d75343c 100644
--- a/dev-haskell/integer-logarithms/Manifest
+++ b/dev-haskell/integer-logarithms/Manifest
@@ -1,3 +1,3 @@
 DIST integer-logarithms-1.0.3.1.tar.gz 9023 BLAKE2B 29a9e2e73a6fb63f31ad87b53161b9f669a3cf6fed2992d7bf7414d9c9cff9cbe00baa301f7a7889fc0a31ff635d85dafc49ed5ce3f009202ba017b47e75c8a0 SHA512 670aff419de8d6afd1b7e1a40b68290bcf7aefad788c3b08aebfa5ca3e709f5d22543fce82fb75dc18b3ba0ef6d8a8f61735cde647a7a6c9392a60ec365534b3
-EBUILD integer-logarithms-1.0.3.1.ebuild 1185 BLAKE2B 55362aa678225fcd858b9e07794b784ca6b866b66a21d50c7535e0d7515b07dae557ebe068f1fdc11f644e5c51549cb81a8283962a88efca88a1b19f331a1341 SHA512 45ed7555a6864eaf414f23d390b03f9adbb076c9a2f9e1ed553a4c8ef584b0f4e3018fbad59c6eac2369add41edea1749960ec293d9c0f6e2147b8edc56dd729
+EBUILD integer-logarithms-1.0.3.1.ebuild 1149 BLAKE2B cef70a6613af65354d771bf81de23863169dcf28289ff971e27a9f6028bd50cf8d6fbd66edf52d29ea0467b9d01431e2b4c75542f4bf10898c2bdfe7df8088fb SHA512 e2b28c5a154ff168d90b2945b753eef8cb8b99d844713b1c6ff7ec2e9a0382218bb22b0db94b4a9aa3beb0aa94eb63c0071341d14d0f0bb7eb5176da53ef4aae
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild
index 862daf5a24e4..2951f7036eb2 100644
--- a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild
+++ b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -check-bounds,+integer-gmp
+#hackport: flags: -check-bounds
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
 inherit haskell-cabal
@@ -35,6 +35,5 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	haskell-cabal_src_configure \
-		--flag=-check-bounds \
-		--flag=integer-gmp
+		--flag=-check-bounds
 }
diff --git a/dev-haskell/quickcheck-classes-base/Manifest b/dev-haskell/quickcheck-classes-base/Manifest
index e16e8ec39090..2fe8363d75e2 100644
--- a/dev-haskell/quickcheck-classes-base/Manifest
+++ b/dev-haskell/quickcheck-classes-base/Manifest
@@ -1,3 +1,4 @@
-DIST quickcheck-classes-base-0.6.0.0.tar.gz 25760 BLAKE2B d09794c63da8311836e6422006d262fca21f7d71b473b69f57bd49b3ed2e39f29fcfd18b73fd311db4f6b1cca390cc579f2438481dbd680841c835d7d0d9f557 SHA512 3d0a7c68ab1cdaddbd272df633e0704f5ee3997b3a86fe79cb960f7c84f8546f3360b9d52ada45b9db6344135f0aab1093d5304935ae19f43d235790fba83216
-EBUILD quickcheck-classes-base-0.6.0.0.ebuild 1143 BLAKE2B 9f80f952b5ebe7f421bea47b9fd028ceb8f21aacf6a73dac28e5d7a321b43eef02df93ee78ba347a1e588ae56b5b8562b58b6c84fd1734e62143ea6940874993 SHA512 55d5b608286319e3bedeb2f0601556045420b05520062ecc5ef9e1b41f68b05a05ccdbcd204f38c73079da86ce494c60c8977cd9212cc92b667e7dc2f3327c91
-MISC metadata.xml 1568 BLAKE2B 977b3e776e54bd046d3dd86ee971c47c58f2b302cd1788ea4c5c379aad84e8f0915afa0b6c55148e4d8120fb26f23e8ca0787c5ff386c8bbedb457e35504fdb3 SHA512 481c27afee017ea85e28760e56ec5a5173c977683a89c27ab254db1c08935ccea91178017db2eb8ba489b1a8942f4963f6564b6b128ab064592b795af0192d39
+AUX quickcheck-classes-base-0.6.2.0-laws.patch 1639 BLAKE2B d07511518debc5aa09d712c460fd3414665ad0203fff44f42ea49b17db83c44b0095ac17716df76235d01744d75d65a7255ab33a4e3c98dc0444adc90c6f0a94 SHA512 03b78a341a3d81d096e65d8b038edf6e41b5525b8d6c1c2e44647a73c8980cdd199256ab3a717bf5dde43fe575da4211dff76853fd5cd4b353401ba6bdda1cd1
+DIST quickcheck-classes-base-0.6.2.0.tar.gz 26732 BLAKE2B aa3b7be411c66b72eb07c81e9fe2c1accdde254ae8e510080d7b0ea93df0148317a61633f96fe459ab329af112eee3d8243fb728f5416d95d258b90a40d1d9cf SHA512 730255f74582081e65fa8c6b36ab8a2c26991a8e7d8140361151614e7a9619f178e50820cdfc3bf5771f1688dce369f9d71de683bc89481a20f8d2382ae4b58d
+EBUILD quickcheck-classes-base-0.6.2.0.ebuild 999 BLAKE2B cd8398936d72fde7af5760c0a4a0bcdbf66f32ac343f52d9ff7a2268bc0eb30c39a68f7b8fa0aa5498aebdcf144d7b6e2439bf25c1defa6000e942f671ac789b SHA512 34a8bc4dbf1cc6f29575166ba739a4c3659062852fe33952301331285f0102d55e85f8f3ec61e40b76e1c19a56a537356922e303f900383974b65b45fafa76d8
+MISC metadata.xml 572 BLAKE2B d14ea6d21b0c3e817e7ee74ca37288963b20cd8225be8340f8dce74f5c7245076f17d743cc5b3406def78535cb1e0f138e93f5052683a03158fe40d1bb56db90 SHA512 91923b6821ff8fe60378006acd03cc8a1187fe79f22748df93b67bd27da20da2a23bc5a9a8e83d5dd4710dd7f722e2d89b485593ed686fedf5d1fab0e23f42f6
diff --git a/dev-haskell/quickcheck-classes-base/files/quickcheck-classes-base-0.6.2.0-laws.patch b/dev-haskell/quickcheck-classes-base/files/quickcheck-classes-base-0.6.2.0-laws.patch
new file mode 100644
index 000000000000..f806f226a06d
--- /dev/null
+++ b/dev-haskell/quickcheck-classes-base/files/quickcheck-classes-base-0.6.2.0-laws.patch
@@ -0,0 +1,51 @@
+From b59ab822c261283004c2e87cffc653dc2b35c030 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Fri, 30 Jul 2021 23:23:19 +0100
+Subject: [PATCH] quickcheck-classes-base: move qe1_q under UNARY_LAWS define
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In https://bugs.gentoo.org/804870 Toralf noticed a build failure:
+
+```
+    $ cabal build --flags=binary-laws --flags=-unary-laws
+    Configuring quickcheck-classes-base-0.6.2.0...
+    Preprocessing library for quickcheck-classes-base-0.6.2.0..
+    Building library for quickcheck-classes-base-0.6.2.0..
+    [ 1 of 30] Compiling Test.QuickCheck.Classes.Internal ( src/Test/QuickCheck/Classes/Internal.hs, dist/build/Test/QuickCheck/Classes/Internal.o, dist/build/Test/QuickCheck/Classes/Internal.dyn_o )
+
+    src/Test/QuickCheck/Classes/Internal.hs:79:5: error:
+        Not in scope: ‘eq1_2’
+       |
+    79 |   , eq1_2
+       |     ^^^^^
+```
+
+In happens due to a mismatch between export and definition #ifdef guards.
+The change fised declaration to match definition.
+
+Reported-by: Toralf Förster
+Bug: https://bugs.gentoo.org/804870
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ quickcheck-classes-base/src/Test/QuickCheck/Classes/Internal.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/Test/QuickCheck/Classes/Internal.hs
++++ b/src/Test/QuickCheck/Classes/Internal.hs
+@@ -73,10 +73,10 @@ module Test.QuickCheck.Classes.Internal
+   , isTrue#
+ #if HAVE_UNARY_LAWS
+   , eq1
++  , eq1_2
+ #endif
+ #if HAVE_BINARY_LAWS
+   , eq2
+-  , eq1_2
+ #endif
+   , readMaybe
+   ) where
+-- 
+2.32.0
+
diff --git a/dev-haskell/quickcheck-classes-base/metadata.xml b/dev-haskell/quickcheck-classes-base/metadata.xml
index 435de9480d90..26c36c8090b5 100644
--- a/dev-haskell/quickcheck-classes-base/metadata.xml
+++ b/dev-haskell/quickcheck-classes-base/metadata.xml
@@ -6,28 +6,7 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
+		<flag name="binary-laws">Include infrastructure for testing class laws of binary type constructors. Disabling `unary-laws` while keeping `binary-laws` enabled is an unsupported configuration.</flag>
 		<flag name="unary-laws">Include infrastructure for testing class laws of unary type constructors.</flag>
-		<flag name="binary-laws">Include infrastructure for testing class laws of binary type constructors.
-Disabling `unary-laws` while keeping `binary-laws` enabled is an unsupported
-configuration.</flag>
 	</use>
-	<longdescription>
-		This libary is a minimal variant of `quickcheck-classes` that
-		only provides laws for typeclasses from `base`. The main purpose
-		of splitting this out is so that `primitive` can depend on
-		`quickcheck-classes-base` in its test suite, avoiding the circular
-		dependency that arises if `quickcheck-classes` is used instead.
-		
-		This library provides QuickCheck properties to ensure
-		that typeclass instances adhere to the set of laws that
-		they are supposed to. There are other libraries that do
-		similar things, such as `genvalidity-hspec` and `checkers`.
-		This library differs from other solutions by not introducing
-		any new typeclasses that the user needs to learn.
-		
-		/Note:/ on GHC &lt; 8.5, this library uses the higher-kinded typeclasses
-		('Data.Functor.Classes.Show1', 'Data.Functor.Classes.Eq1', 'Data.Functor.Classes.Ord1', etc.),
-		but on GHC &gt;= 8.5, it uses `-XQuantifiedConstraints` to express these
-		constraints more cleanly.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.0.0.ebuild b/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.0.0.ebuild
deleted file mode 100644
index 8b0c61a1e9d7..000000000000
--- a/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck common typeclasses from 'base'"
-HOMEPAGE="https://github.com/andrewthad/quickcheck-classes#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+binary-laws +unary-laws"
-
-RDEPEND=">=dev-haskell/base-orphans-0.1:=[profile?]
-	dev-haskell/bifunctors:=[profile?]
-	dev-haskell/contravariant:=[profile?]
-	dev-haskell/fail:=[profile?]
-	>=dev-haskell/semigroups-0.17:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-	binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
-	unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
-	!unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag binary-laws binary-laws) \
-		$(cabal_flag unary-laws unary-laws)
-}
diff --git a/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild b/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild
new file mode 100644
index 000000000000..7bd0238e1887
--- /dev/null
+++ b/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck common typeclasses from 'base'"
+HOMEPAGE="https://github.com/andrewthad/quickcheck-classes#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+binary-laws +unary-laws"
+
+RDEPEND="dev-haskell/contravariant:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
+	unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] )
+	!unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4
+"
+
+PATCHES=("${FILESDIR}"/${P}-laws.patch)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag binary-laws binary-laws) \
+		$(cabal_flag unary-laws unary-laws)
+}
diff --git a/dev-haskell/reflection/Manifest b/dev-haskell/reflection/Manifest
index 1e62d5e46eeb..3eb0cef20fdd 100644
--- a/dev-haskell/reflection/Manifest
+++ b/dev-haskell/reflection/Manifest
@@ -1,3 +1,3 @@
-DIST reflection-2.1.4.tar.gz 18364 BLAKE2B 70cf5fc742deac5555be43a24b2b74930e54a7909e68dea53d8dba7b4547b99d97dbb361ae96776a54a7305069305ea085d8d988b70b86460bd476af6392c417 SHA512 3209bb44a07fedddbb2aeb5f2f09414e6672faff6c8fbdb78eaa8f61a1af4d9fba43be193854f8978ffdd82c0ce54bd79a5d875638a41b6a738bc489bd718295
-EBUILD reflection-2.1.4.ebuild 891 BLAKE2B de69c93cc7997cf24bf5c60cf09321e091a7fbbb061f25a0f4db6382be1635790d25faeb8abfa4e5df0019397d1b3864b8cb33f4af4cd4dc43cc241386e15ef9 SHA512 1aee0548b78d779d2bd2fdaa0f2a9f2bf606476fa7ff0c8d2609d6e74f15100c0b457e1fbd86fcaa1625a326e5c3f50454a1a6d067e31a8e1c66480be8e8b85f
-MISC metadata.xml 1993 BLAKE2B 24bce26fb7fbf2494ba2e5b5ac22623d73a1852e04aaefbcd3929ad22486790d7040e90b341de8e4f38952237ed6f7b1fee98db938caa443b4efca60c1f66d39 SHA512 eff155a85567f88de01d1232814c47444757d736e8237200b3043d40fa4f67d7cdf0e09b5614ed29c04bf81ab12cc3a5be0a258bf7db51813b4d58f4d137667e
+DIST reflection-2.1.6.tar.gz 19976 BLAKE2B 6e32e9300695b102be4039312b3df62bccce75a590eafa37d96d70cbf73acfc4be98bc716485235e4594548b8649b46bb554eacc230320abc2d92dd809f15176 SHA512 d7f615b6f361b2ca7266e8c4611c939d9f80684ca173080e9ad8227f04f2731899113dcb87ecb051d47b29fb860d7caa15c99c7d3d7493e7e73745d085518fdd
+EBUILD reflection-2.1.6.ebuild 823 BLAKE2B de51deb0b788e5c5f0a4ab4b9324dbc9b17738be8503e38985ef164779c26a5ede566eb01b60000f2fe7d392167990797f304e8430d45ca095d2c25cc6236dd8 SHA512 4ae79acc3dbd02f458c9f5987894e7f1bad908b8c34d2f7d412bc92d4eeab01f90970d9d7b1c13f173eaf51c71145346b92832c15d94ec46a79f9311f083ae28
+MISC metadata.xml 331 BLAKE2B 411aea540cfd43198acf1968c160473022e19466e2b9130233be8c3dbc4ab29ccae373a945746894eedab0295e8daf0de959e5f261591e664789e3de95f4cd09 SHA512 4056fd7eaf2fd369f78eb5ba59e29bdc0da20e6fa954bce416e60bf4a5a127a224de9931f16c619a6f3a746b04c9b59581a4e7a9545b1cbfec55e0a47df9332f
diff --git a/dev-haskell/reflection/metadata.xml b/dev-haskell/reflection/metadata.xml
index 0845fb397e13..81f795d4050f 100644
--- a/dev-haskell/reflection/metadata.xml
+++ b/dev-haskell/reflection/metadata.xml
@@ -5,50 +5,6 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides an implementation of the ideas presented in the paper
-		\"Functional Pearl: Implicit Configurations\" by Oleg Kiselyov and
-		Chung-chieh Shan. However, the API has been streamlined to improve performance.
-		
-		The original paper can be obtained from
-		&lt;http://www.cs.rutgers.edu/~ccshan/prepose/prepose.pdf&gt;.
-		
-		/Changes in 1.1.6/:
-		
-		* Relaxed an unnecessary strictness annotation in the fast implementation
-		
-		/Changes in 1.1.5/:
-		
-		* Both implementations now work on Hugs; the fast implementation ascends
-		from the ranks of completely unportable black magic to being merely
-		/mostly/ unportable black magic.
-		
-		/Changes from 0.5 to 1.1/:
-		
-		* Much faster implementation available that is about 50 /times/ faster than
-		0.9 and which runs purely on black magic. This version is now used by
-		default. To turn it off install with the @slow@ flag. If you encounter a
-		problem with the implementation, please contact the author.
-		
-		* Removed @ReifiedNum@, @reflectNum@, and @reifyIntegral@; @reify@ and
-		@reflect@ are about 3 orders of magnitude faster than the special case
-		combinators were.
-		
-		/Changes in 0.5/:
-		
-		* Generalized the type signatures in reflect to allow you to pass any type
-		with kind @* -&gt; *@ wrapped around the desired type as the phantom type
-		argument rather than just a @Proxy@.
-		
-		/Changes in 0.4/:
-		
-		* Converted from `Data.Tagged` to using `Data.Proxy` for reflection. This
-		reduces the need for helper functions and scoped type variables in user
-		code.
-	</longdescription>
-	<use>
-		<flag name="template-haskell">Enable template haskell.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">ekmett/reflection</remote-id>
 	</upstream>
diff --git a/dev-haskell/reflection/reflection-2.1.4.ebuild b/dev-haskell/reflection/reflection-2.1.4.ebuild
deleted file mode 100644
index 6330682ad3d4..000000000000
--- a/dev-haskell/reflection/reflection-2.1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -slow
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reifies arbitrary terms into types that can be reflected back into terms"
-HOMEPAGE="https://github.com/ekmett/reflection"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-slow \
-		$(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/reflection/reflection-2.1.6.ebuild b/dev-haskell/reflection/reflection-2.1.6.ebuild
new file mode 100644
index 000000000000..e869c96dbe2a
--- /dev/null
+++ b/dev-haskell/reflection/reflection-2.1.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: -slow,+template-haskell
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Reifies arbitrary terms into types that can be reflected back into terms"
+HOMEPAGE="https://github.com/ekmett/reflection"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-slow \
+		--flag=template-haskell
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 51f69a4c4cae..0edf9d64d9d2 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest
index 120cc4e239de..4db8c301d779 100644
--- a/dev-java/jansi/Manifest
+++ b/dev-java/jansi/Manifest
@@ -1,4 +1,6 @@
 AUX jansi-1.11-build.xml 14529 BLAKE2B ea9358a4a64e077ba9173f6f0d0548647489980cff2626760b6c92df9774117bc6ff32f4647c8b89b21b4e37722f018e4f1fd0ca2cfa5915a83e253f9c18d250 SHA512 cc60a9f48f220ee13a22ed814409126524d22f2329c574e61974e26fd70b9a53f703ade06bb6921c13f370016be79c00d111368018132abee20780e99096c0a5
 DIST jansi-1.11.tar.gz 252095 BLAKE2B 72b22392fa6731f49ebb5c2e94cdf7918ca37d5c73ccb14d8810402c9ec120b1220a739e54516eeb5355ad4dd74d01ae398a6003679c60b1dd6f1648691b2efa SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1
+DIST jansi-1.13.tar.gz 253219 BLAKE2B 89fc81710bc0860c717241c97fe2e7a148ccbaa5fb1e7db30b978aa69cddccbc9ea45a0e30ef384c42a741d707f5eab73ce8b2a76e1095c66a2c95f9088f28f0 SHA512 9c4bb0b7435c102068718e039900828994f1ba60ed44307eb726eb91a2884bc406688c2747635b9353f3bd68a6bf0e7c082a4069343b59efffc900f59c563fde
 EBUILD jansi-1.11-r2.ebuild 1151 BLAKE2B 6b7c02eb60055900d4ae9a2364e0615d70f8b4945e0b15a001dfd35db22d6c59fe1867f0ac4982bfe9b713006a9a8c0f9e01a0526d7836ce07ba1fc534828331 SHA512 aba4591b29d248fb320ccd8736c1b16ee67ee79b8608dad3acd7a44afeab1d75e562072741fe35d361bfc7e14bc7af94306d9f8871093a92015fe78ec5684949
+EBUILD jansi-1.13.ebuild 945 BLAKE2B 64ba4a11b95ff51520604bcd8fa306d9ebd89c78c817285aa90158a8acb18a7e9a46a4160f245536246d8ab76c3e6cd17e63718f3e04c1e48741c05d01d87cdb SHA512 4df74ce98dc044b91a51970384248f295364860b23d7c63bd5764b18722a0725943e9c6d7f6879843a5981d4ce6cea065da347829ef058c8f842a2afc1bf59ad
 MISC metadata.xml 491 BLAKE2B 57979797604525188358a5e2bbf92bd7cc40e9513710d9907302df960f0fb0961b3c8eca15bc09b53cae259dbe3b512d149a4e9fb2bb5e3b1ad6a13700af3c4b SHA512 46a12388363e4b59001bf8cf67923a4f38d8a4409fe158a813c9403e0da6067a8aff418cda7e0d02dc905e38591ded15e46b8f8095acb62d0a83a65146550669
diff --git a/dev-java/jansi/jansi-1.13.ebuild b/dev-java/jansi/jansi-1.13.ebuild
new file mode 100644
index 000000000000..f570a1b7b6da
--- /dev/null
+++ b/dev-java/jansi/jansi-1.13.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.fusesource.jansi:jansi:1.13"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output"
+HOMEPAGE="https://fusesource.github.io/jansi/"
+SRC_URI="https://github.com/fusesource/${PN}/archive/${PN}-project-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/jansi-native:0"
+
+DEPEND="${CDEPEND}
+	test? (
+		dev-java/junit:4
+	)
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/jansi-jansi-project-${PV}/jansi"
+
+JAVA_GENTOO_CLASSPATH="jansi-native"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index f2d6a1b313b9..89b0b90f944e 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,3 +1,5 @@
 DIST jdbc-mysql-8.0.25-sources.jar 1556319 BLAKE2B 75eb4837f6916247650a925f87d52e49848e3bc52cfa683a149624e4b749c3c4b3a7336a5659dd0c894f0285254c915364d9ffd7b4779c87e0894053a2854a5c SHA512 c4384213845c43a494360131dcb7b9b424473237b65504d5ed4a7929cb8bb7b4b3c7cce6fde2c20a7026891751e76c78ea64af746a053ca42567a7e68782280e
+DIST jdbc-mysql-8.0.26-sources.jar 1578978 BLAKE2B c42e22ea50b6c3890aaf51ec8bfe53918c680ea54b314cee80ecdd2be122f031000fdb70b895807a0d22e5841df6fe5a76ec49b2e3097749fb8eabff4afca68a SHA512 8bf73a2cd0b5348d79e81da9c96da625258066b0b40d05d085b3978538dad75f4540a2b8414f005d90b8b87303c357e762bbf81dd2d8e68ff51c18a92124b7ae
 EBUILD jdbc-mysql-8.0.25.ebuild 1569 BLAKE2B bc43d39641921dccf2d4bf61124d1c37fc0f89f98b581fc233ed82bedf833e09d295fdf52ce98436ef26edf850a53263ef603d18298866420a230bc8d5553e86 SHA512 cfdf865113f68213f45970553eb47f6d81bcb0811182d789589079759902c848f7c1eb5ad06fe316da0ae0b613017ee3394d0c8ffc5082fd8dc7c74389ef4a5f
+EBUILD jdbc-mysql-8.0.26.ebuild 1570 BLAKE2B 2eee88021a2628474dd7a292654fa0867d9f574125c40f7f51f711a6a680f6bbad93b33e5fdbb555a9c80dc6a2f49e9d920d7aa95e4b14e95de3f8c15602594d SHA512 da4f8168e9485b820049fcac840be52b00c3ae5d11663440b2365a16cfa5d36d868fde641e40e49d0e9afd82b0580f14b3e6d1dcb453de4a39bc5aa39e83538b
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.0.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.0.26.ebuild
new file mode 100644
index 000000000000..f943332913c4
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-8.0.26.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom mysql-connector-java-8.0.25.pom.xml --download-uri https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.25/mysql-connector-java-8.0.25-sources.jar --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jdbc-mysql-8.0.25.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="mysql:mysql-connector-java:8.0.26"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JDBC Type 4 driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/"
+SRC_URI="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${PV}/mysql-connector-java-${PV}-sources.jar -> ${P}-sources.jar"
+
+LICENSE="GPL-2-with-MySQL-FLOSS-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: mysql-connector-java-${PV}.pom.xml
+# com.google.protobuf:protobuf-java:3.11.4 -> !!!groupId-not-found!!!
+
+CDEPEND="dev-java/c3p0:0
+	dev-java/protobuf-java:0
+	dev-java/slf4j-api:0"
+DEPEND=" ${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND=" ${CDEPEND}
+	>=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+DOCS=( META-INF/README )
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="c3p0,protobuf-java,slf4j-api"
+
+JAVA_SRC_DIR="com"
+JAVA_RESOURCE_DIRS="res"
+
+src_prepare() {
+	default
+	mkdir --parents "${JAVA_RESOURCE_DIRS}" || die
+	cp -r "${JAVA_SRC_DIR}" "META-INF" "${JAVA_RESOURCE_DIRS}"
+	find "${JAVA_RESOURCE_DIRS}" -type f -name '*.java' -exec rm -rf {} + || die
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 250711591871..fcd7070be5dd 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -19,5 +19,5 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63
 EBUILD swt-3.7.2-r3.ebuild 4437 BLAKE2B f488c4f50f7019580f29cbbc374d440444a699934193db8f6251d76c2342c5a26a5b65cc7c993ffb90155f771bc9039075b6a202c06d98abbdf7a2ff5959f63a SHA512 afdf8e0de244d457b4aa857bc1f045d0a3aa304158ece0a147c7b20308a27c79b5f614dd7ab0143c4372f7155679019cd972ab28a997cd9fe666f0d2985ea21b
 EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 3c08a0ee771d859e07af9d01c9796571ec9295bc0be4058abb330bd62194f20c77744795fcd27412a7397e7a341b7556080d3a7589faa9548ab1f1ac97433005 SHA512 f5c8f79cb9c801062d21d17f6ccdc30b28d5d1716e63ecae00872fce2c7c1b8a6152882ab90ddf6a39d4f525429462415cef6597a9425ec59060d6d0fdbe5099
 EBUILD swt-4.10-r1.ebuild 4628 BLAKE2B 91201a8ef41b011d1727120b2bcd32daf3c7dd3e042f88e391b982234932751150425ff2cc119a82e0c5d58e4b9544f1e6568ce36f3a8a7ea69b522bbb2cf7d9 SHA512 826f37b9d626e79f22011a3f2dd64701a1899a9dc3009cac3fdbce2cf4ba0159133ec9355205eece0cc0ae6a6e6c6c98acd873a54fbf4a3080f00d92cc117cd0
-EBUILD swt-4.10-r2.ebuild 4528 BLAKE2B 31af6057258ccc6af0f8f5557f8a538bb9977cbd6f0815975e87530ce1b55d5910075d984c1e3643f5a05ac0e8f8cdf71443bf2fbd8345e16ce6885c981883e8 SHA512 11e03fc361c60a38149e9a9c2e063eb6429311934cb35a7b8dcfc74f740187fe4cece4d80bd0173bd524cbe29bca6177c76644ece05aa9fbaeb3b08b91e9785e
+EBUILD swt-4.10-r2.ebuild 4527 BLAKE2B 9f2d0c3eb9bf1903c9f14376a31d4e7e9e7dd0122dc4f8938f4bc38bf8bec5aaeb9257d90c3259257f666f48257176f9a98dd5ea10201a793a6c36a4b305ac61 SHA512 1aa4bba24a5dabcc1173cea8bf930a380eabab23ac26b89a564e683d711287fd6811bdfa7b114480951c914f4a533b4c8c9fda4db6f7377ee2074b1764e3c06c
 MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild
index 4387c8f78a32..ec723d8e5d5e 100644
--- a/dev-java/swt/swt-4.10-r2.ebuild
+++ b/dev-java/swt/swt-4.10-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="4.10"
-KEYWORDS="~amd64 ppc64"
+KEYWORDS="amd64 ppc64"
 IUSE="cairo opengl webkit"
 
 COMMON_DEP="
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
index 845c06bf18d9..6a4efe469aca 100644
--- a/dev-java/zstd-jni/Manifest
+++ b/dev-java/zstd-jni/Manifest
@@ -1,6 +1,6 @@
 AUX zstd-jni-1.5.0.4-filter-flags.patch 369 BLAKE2B d79c3f5bee1e8faafb96a6d87c03c1cf5d1f292697fef1d7724394b9a415a30d9912946a612003e93a278648e4e5b1cc532e28d2c296c90b683eb7e0e769ac9c SHA512 fb56c386c6db387aa2c27a722d3c417813c427425d0dc6fb350ca02bee3f261efbb639eefbcc5dd58107f33c0211dba1b5bc696680e111a6338d0a67381ab533
 DIST zstd-jni-1.4.9.1.tar.gz 9283717 BLAKE2B 1f5f397e6ee78d029110b98aadbf77e8acaf3b3721ff0729b1b382f193367c8ffb20e08c1f7f905c34a5128e6e061652792cdd4f83dd292e3a3b19906f3bf86b SHA512 2a3a2020e46fbf654796ca065ec84fdce05c308d7925a667b239aa0cc8607f78d8944230578e3c663cdd7932bce05e056895f8457af523d939afb24f68f8087b
 DIST zstd-jni-1.5.0.4.tar.gz 9296353 BLAKE2B 1b4011cc7876d3d4ca2636d9872b1127d3a700f4cc6b159a36dbff5e73a2ec3af91d4a27965123c9dbb9f017200bb68bf7e078806d25d7e395243c2251936891 SHA512 2d83a1e4ff6c25ef301dc25343dcfd4f2dda7f8c44aae2d1d5da2159affb6d0c2885693022dd5cbd2d360540092bebfe0635b61c899fc7ce8dc496a96ba6f017
-EBUILD zstd-jni-1.4.9.1.ebuild 1175 BLAKE2B 05110ee23b299827046cf47a18734131394944a6495701c71fdc486df616e6b1ebb2348407500000a4e0669343b3f02774d78ef5171de8ca1bbf533ed7155ba8 SHA512 2c858cf1079cbf408d8623fecaf010ca38a019d9d9364fbd538e7b21fc76f2c7cc9242e4a6e168777c4b0d9d8edbe26689f10269fa1681b721230f8b1eb9b232
-EBUILD zstd-jni-1.5.0.4.ebuild 1511 BLAKE2B 63a3a04987337af882ed5cec2b8ca0e3a9506faaa1dbb2cb611a7277715aababf8d83050f88bd95df0bf9bf9cef2f5689e5f2cfe62731115fadf32b99f0958f8 SHA512 beba7076a1a96f16f82b604a88dd1dbdc69397b58f608e83d3c125de116ef53d902471e6ca708dec8f521ef3f66a6dbcb77f1fd1d8d4575591bf7a38dea985aa
+EBUILD zstd-jni-1.4.9.1.ebuild 1284 BLAKE2B 08339e911cfff20e9e6581b446cc3f1a1c991900bce23171f9bf524e6c7d8d3868bd0cd63dac6e8732d648bc3d5d3c43aed06d0c730d04e93a7cf66d8c990c06 SHA512 0ed4f88409699665962e9ea34394c98413d90de77e7ee856f89b52a545b57f773395c2533e7b801dea7360043fc4cfc536d81e4e9ac35a6d800442582bbcdf6c
+EBUILD zstd-jni-1.5.0.4.ebuild 1620 BLAKE2B 39e16bf814663b196ad731b6f4aac1ca444bb66776e61e1607eb522a65a3a2934c4c5ea8a63ddbf6702c9eabe0dedf74d6de3ed5608618e435cf24b995028e9d SHA512 0d4550d8c99d2c7012d7f94f2a223e7956efdf5be646084ec50e4d59ab2c160d716fccf22eaa61e0287d05e67d40a0e872c493f5abd2d533f5231290ef4bf762
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
index 6428adfaaec3..91f20179a562 100644
--- a/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
+++ b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
@@ -26,6 +26,9 @@ JAVA_SRC_DIR="src/main/java"
 src_configure() {
 	local mycmakeargs=(
 		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+		# Resolve bug #776910
+		# Reference: https://stackoverflow.com/a/51764145
+		-DJAVA_AWT_LIBRARY="NotNeeded"
 	)
 	cmake_src_configure
 }
diff --git a/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild
index 116244dc24e7..d978a25ba299 100644
--- a/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild
+++ b/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild
@@ -37,6 +37,9 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+		# Resolve bug #776910
+		# Reference: https://stackoverflow.com/a/51764145
+		-DJAVA_AWT_LIBRARY="NotNeeded"
 	)
 	cmake_src_configure
 }
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a1bce4348837..79049ae5abae 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index dfe82b1fe60e..692d8fdd3f63 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,5 +1,5 @@
 AUX 50mercury-gentoo.el 130 BLAKE2B b0108f529cbe5b66b510b2ebab6f091825df9ac92dc1d98bc98b34532b6c217ea5ede7bc5960f6616c3a8201788c6a5094b30871fba15e5ded87eb97ab3f7c1f SHA512 e790f1b396f63bf36e57160d588b1377d3f889156446a7d26a6edd3f7175ee8ac5b8972ee4d0b6045b5442ae750341b5e06adc42f094fd6d08f2b519f4432071
-DIST mercury-20.06-gentoo-patchset-1.tar.gz 4555 BLAKE2B 8609ba7cd43d82ceb6b6e25fd6af3b2c750df6446c1235bd9c6f8e3bc87bb1fe0a43cafb9f1d061562bb80ade1deb7809889bf0d703c99ea1e2286bbeb7c5182 SHA512 23fae769c5c1204154c6ed55cc31644967e3554f499b23a6585d34615d062a214d6485de3a4acf8cf90a582a229aeab519e57a6df80cee62e9e6789f210e8256
+DIST mercury-20.06-gentoo-patchset-2.tar.gz 4834 BLAKE2B 33781113c4033b0efb19faf4227b609dd6410bf992fa8720302f732b18e669f2b7d5c650da4b04427ba94c9ce4fdbb1eefc2408e7927e360c531b88e1f2c1748 SHA512 22eb34d5a2d70d671ff717350770008fd844afbc39ae2cb7901407943500c6ebd6b8ebd81c19c602bf461c5772d915b2c1f1b2460b29e8b94df2ed6472eea971
 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4
-EBUILD mercury-20.06-r1.ebuild 5153 BLAKE2B 2e1ccc281035b3c264f03effec1b3d65766004430df07e397dff09a082b4be033ea0eaf37ac1c10a17f47b7bab096dc98565f8ccbcb90c6bd8c181f80044dc85 SHA512 d6a94cb0a5598145b5c9f77ad946a3b440acbaa5ca45721c0cb62dd5874fc3e42d304a3f54ce2799a06d7644711e52eef4bd5cbc2b58f0a694c3b0c170967b0e
+EBUILD mercury-20.06-r1.ebuild 5153 BLAKE2B 754bce920d5bda2a5c160548b4e7117dfa7cca4fa8de17c4f742964abc4963918ec7a183fd5026cfa2d159a9db4c84cbd2574a47689376e3d92b7484ed49f100 SHA512 f5a5b3c413dd9b76cc3519407392a01e540c836b26dc1f75b49dd7c64f374c40ca76a864d474b120fc4405f9a115ab8d03a971ea49d8302f0b19096baf8463a9
 MISC metadata.xml 384 BLAKE2B eaed468c341970157e4e641d25d5d87e0851bdbd31ba9d6c1e428c9f0239ad98220395858d6291fabe41561fb2ecc5c894700a86b290fc3cab2eaeda2a9df372 SHA512 c90a7a81ab16bac0af4bb9dd3f47cfb3987e0c3aebe08bb7ac6125baf7c619269318bd2c7a45e4213184544d981c920cace23ccb61fbb60c0872db77a10e3ecf
diff --git a/dev-lang/mercury/mercury-20.06-r1.ebuild b/dev-lang/mercury/mercury-20.06-r1.ebuild
index 56a047bcb576..e3819e130b4a 100644
--- a/dev-lang/mercury/mercury-20.06-r1.ebuild
+++ b/dev-lang/mercury/mercury-20.06-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index 95d8b80fcd3f..02269d1b6dc5 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1,4 +1,4 @@
 AUX nasm-2.15-bsd-cp-doc.patch 278 BLAKE2B eb2d6fffb03da68a43df8db6cbadeb72753f0474f91011038b6ec0b3a449fbd0e3cde59abfb1b22fa0c991629960f456815b1c86ec55292f54a879d8a0a079f1 SHA512 ba691e4f0fd3b676280de5b79e6872f7efe034da28fc66e247c3f757761e2191c54f585ca724747812fa55afb4b9d76366f50659702561c7eb69483de265b3e5
 DIST nasm-2.15.05.tar.xz 995732 BLAKE2B a41434965c2125577b762d907a0a3c251c75d9f9beac230fba4099182c7f7beb08c6d2c05c2432b0dc8ba829f24077f44c3096faea9bd0a533250e6dbbfaef35 SHA512 512f90a2584f1c5811429274b97c64a2cedf37b9fdeffb1bcd0ea64afd9ecc19a2d7877ca8f1e05393aa324153fc9f39ea51dacbf8d25a7d5a2d7728c925dba7
 EBUILD nasm-2.15.05.ebuild 978 BLAKE2B df60ed2c7c0e52cdd9e0aefcee9efe92149919b0e5d1818522f83abf307adaf00681fc6dcec3f537435755890209bb3eb288c309f7aee5232af91101f576575e SHA512 24ddd3d46b856c3ad73c818d0ec05c49fe2b4dad4ba021b1c7f789da53eb1992605a0a35556b5634f14d1c2582be15eaa1d4c4401fd02b338fc3c66ab10d24d9
-MISC metadata.xml 869 BLAKE2B 6acbe39b23e071849e6afd42da7ec5a56f017b708745e5efd09a288775da944fbb1185cead3ceaa573398f5874115139834584323e5b4cff360cf6cd9cca4ccd SHA512 a6bf522dfa6c43ea58a432577fbc31bcc9d262f7262c16d165b3cbacf8394a6d9e6d1eea9480cdb27b692cacada0c5fba3906e913259c2809a48159bce53e5bf
+MISC metadata.xml 780 BLAKE2B 682e76e5cc685f111127918d73972f760ae06a9c73372dc47d1852deec23c56c238220a9c32a86e09f320b6898b927076b6f9f01206b0655f61a0e3a150ea5ae SHA512 7ac362a8d02d7b762a0fdb9fc2993867a58f8cb8b3bdacc91b5b70eeadd4dbfdfd046a428eec068e9060415800bd98fa541379eeedfe50682d5cbae2bfa95323
diff --git a/dev-lang/nasm/metadata.xml b/dev-lang/nasm/metadata.xml
index f7462a193d87..9d9747cb8767 100644
--- a/dev-lang/nasm/metadata.xml
+++ b/dev-lang/nasm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slyfox@gentoo.org</email>
-    <name>Sergei Trofimovich</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
 The Netwide Assembler, NASM, is an 80x86 assembler designed for portability
 and modularity. It supports a range of object file formats, including Linux
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ee1187b5dc88..38202e8bafa5 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -8,10 +8,14 @@ DIST php-7.3.28.tar.xz 12139380 BLAKE2B 696c573878866e97fcae5fe3e33e83e75bf706d0
 DIST php-7.3.29.tar.xz 12139492 BLAKE2B 7e1287e0fd236252f5bc92009e4ff51676eccd197c1c579f0e79a5428fa3920b5d1f95a459cdd77c22699fbe83984a6d726ab4fc0fc1e309da8b34e0e3998071 SHA512 8a495546d575a31f864f85139d8d7931361e6ac421f2cf5ef3b4cb57f59c44568cb9ad0c8793f50169d8d9933abdcec14ab90add2d7fab056e19e7f66d60689f
 DIST php-7.4.19.tar.xz 10341424 BLAKE2B b5f549603a2d108d2d4c16dfb15c2088612e040e9e4756cc7c1403c67e152ad3461d84915e4f542b1e558469ae3143721c6d7ec25ef03c3b4a6142fe972bd775 SHA512 2ac51b9920069ebe8ac68a94f8e9aac2b3d44d69668f340aba95f8303632fe1bfc4c3f2ce398cc7e2c2ea48583d8e04dedfc66f7147c1f4470a55417554d0071
 DIST php-7.4.21.tar.xz 10346628 BLAKE2B f758d6bef60f5e0c99bd097533d1663640362c2b752a3bd54389acc3bd7d173c1ba5d4b1c119b6ad50f5029aabe2349bb4646a33212dc3cf34fd294f24def401 SHA512 778ddbfe614fdc6a00bc82c61f4c636bdbe815ce3398415a29bd24a2fd4ca2113b3b804303585d8830242e04b0c202bbc7c725a46c9bad79b070a0e896e5e681
+DIST php-7.4.22.tar.xz 10348532 BLAKE2B 20e4bfb0362bb13ca8cacf9fb2500ffdd2db011d69cb82f113dd0c25e8a5fd4a017d77481732930afd24a8e092edbce3eafe9d45f27718ddf7567469f80c5642 SHA512 80587ba613b8a863a666f44a16ebb33cbb5a5d396601d1eaf063c8f7793a98abae903cb76fca4216860f1a043d5ee997464d479d53ffff6a1d6a6cd31da9100d
 DIST php-8.0.8.tar.xz 10674548 BLAKE2B d2446ae5b80e692106b89418864e4253e000741addb7526599ec8db96713f91a5ab3bccd5bbd2f536b16cc58afafdf22b19996d424dfdce3218a8083ee2bdf37 SHA512 1f8b94083b64705e24365af57169f8ff08115f31a7471238d9ed7a24b692e46c789f3fc00ff2bef2205243b9cd9c4736831e995a004afc7fc4127f3b74932428
+DIST php-8.0.9.tar.xz 10678448 BLAKE2B 7d8684a353ccbcd2aaff4c240563cbd9f94b16ad29223d7e00e3d9ca8b564dabe3f1d0ac676e6499af6b95f24ac2104ed9cc0ce30d05c7c565ccb2067a86b355 SHA512 de9923bfa3ca37cd775ff743beb417152d7380fa5622f3fb0055b49e552c6484561f4f503bb11f535aadd12352c92f673f3e3cc86964c767b1f6cec21265d03c
 EBUILD php-7.3.28.ebuild 22673 BLAKE2B 6c64c471608b337f4ebd5d07a9cec58a38afdf3ca5b64d094e4e1a37040dc4f95331c1fb7bf8f3a8c5d3cf2b0f6b215b4b342fecb162c69bc29214cb250553bb SHA512 49b0d559c6999719ca732d9a40c9154806092083b7da2e5a11ab33718b638cb774de3a6af81949c408e99ba18a3720c4145022221921f3a7bd84572ac28c98c0
 EBUILD php-7.3.29.ebuild 22683 BLAKE2B c9a62b09e00619d5e9ddfbd20abcb2f424d1e6d6f702fae36854b4a0bb3e5a1ef49f1584aae2d2b5d225c4df763687ff3e319c720b3946766bd57fe07842a185 SHA512 69a574958c2b644a3c14d39dd8068af550547e4a86c685539fe6c82b9d4b9883fd22b03fae5e04d0a7df4970ba82a82e127afd4609cde177165d734fb1ad116e
 EBUILD php-7.4.19-r1.ebuild 21384 BLAKE2B f4a6d16ee301992c670ecb9e729a7cdb94cc012b5f825210be9a020bb12edd1ec05b9b3437575898f1825d91fdaa10e3164ae422e73fcbc60e0108e899c9cbaf SHA512 ac6f6956c8d253f2653f2b9f4e27940eae3af0f63c61175ec2a6ef7f87c95a4ecf51a77f6ad5a62eb161a2c7a6a697392f6bd75c9a0227653b910b867579a368
 EBUILD php-7.4.21-r1.ebuild 21394 BLAKE2B fb0dae734fdafad89d17b823c5a4b5e5956f821c73a9cfadd29d3b5fe163ffc412b19d6ba57c53873e7c165fbad1fcc45b8218f9f8a319e1be622aa1256d2eb1 SHA512 ece48ffcc67868e8745e62a207d00967eb47aed140f0ab631b97ec22ace9e3d650b2385da728997a266fa063b33c4f552b840485d6bfde937722064ed393932c
+EBUILD php-7.4.22.ebuild 21401 BLAKE2B a0f0b3016c360705f9c3138b3a8eb272d4d12844f65694229b8a7441391a295243af769940bf1c2394df354123ececaa041ee566151a5eb05bcd114c47235510 SHA512 ae81d70ee64cc5aef8f03b0d8598bcca7f75b71e8cb3a8a9161ba73536f41e6252cf587c999b37014c59a331d3c243c431548863c017e2da9949a3602a72dd9c
 EBUILD php-8.0.8-r2.ebuild 21420 BLAKE2B e34347417fcf4d27cba8f22b810bdb2adc397621d8977f24dae7e5f6d4e0a1ff618b51f5ff8bb1d2bcaa0598490202d921a6379b9cd0147d4a3d7cd0be9066a1 SHA512 de351dd668a70bfaab8871d1a92e3026227fa5cdda7a78529d7c8a0cfe25c8976fa0b7420f24bd17b69eb4bffd36453c9928125cfed22e37256f6a01e8d0dbf5
+EBUILD php-8.0.9.ebuild 21420 BLAKE2B e34347417fcf4d27cba8f22b810bdb2adc397621d8977f24dae7e5f6d4e0a1ff618b51f5ff8bb1d2bcaa0598490202d921a6379b9cd0147d4a3d7cd0be9066a1 SHA512 de351dd668a70bfaab8871d1a92e3026227fa5cdda7a78529d7c8a0cfe25c8976fa0b7420f24bd17b69eb4bffd36453c9928125cfed22e37256f6a01e8d0dbf5
 MISC metadata.xml 3377 BLAKE2B c192a67082e05c42b046547d3a126fbbbebee6576ec9b892d9e5240a7ed7ed80830e10a6b35651db9a0b7276c56482cc472f563652077005b3aeaa60d3152b28 SHA512 105448eeb1939694a3bc535b98d644f4ef34cd92524c0a2c678ec795cef414689e071444020da673ea7592493d755747de1e03af5a48552a3aa87c871aa53495
diff --git a/dev-lang/php/php-7.4.22.ebuild b/dev-lang/php/php-7.4.22.ebuild
new file mode 100644
index 000000000000..b959f63f92bd
--- /dev/null
+++ b/dev-lang/php/php-7.4.22.ebuild
@@ -0,0 +1,750 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlrpc? ( xml iconv )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.1:0= )
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.7.6 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}"/php-iodbc-header-location.patch
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xmlrpc)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-8.0.9.ebuild b/dev-lang/php/php-8.0.9.ebuild
new file mode 100644
index 000000000000..b602cca13124
--- /dev/null
+++ b/dev-lang/php/php-8.0.9.ebuild
@@ -0,0 +1,749 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/rc}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.1:0= )
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+	"${FILESDIR}/php80-firebird-warnings.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads zts)
+	)
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest
index 530a2aa6b86d..b12c16c37296 100644
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@@ -3,5 +3,5 @@ DIST python-exec-2.4.7.tar.bz2 88204 BLAKE2B c370d5f33063bf0dd02d1b5ddad27b32065
 DIST python-exec-2.4.8.tar.bz2 82671 BLAKE2B ac85f3dd6da3d1c535ad56a25edbbcb1d0e75b91e3567b80f27fd01d32a199a713909a8552dffaacbe96c43bca491f31c3f0c7f1a618fb9144814365686715cf SHA512 d6dabab217dc2f1817e2f4d159102a9467f51b26b91f4ae7fb7e4930d30334f74bd8a5f37cc60d58c6e1e61e89a3b4d2e1bd17413493ba86f38fa71250cf5ac1
 EBUILD python-exec-2.4.6-r4.ebuild 1706 BLAKE2B 5a41250c5ea33394a21cf523b48526cc7507441284007e5add7c818246af8637f186878d37bbc826fba987cd07ae1f12701badb478556ebde11d452d28cb88b1 SHA512 3f5935a169181f10b2667b91e35fc42258f9f555ac7e73b5ff08714678f403097901ccfe31a2f1df4f9d37eebf17a3dd3d9961c7a6baf5a0b4739063d21676b0
 EBUILD python-exec-2.4.7.ebuild 1714 BLAKE2B 271d84d7e17f608e30503261c2cb2daad2381a14136ac8465d127f750936d8c33f2e364c2649f47926ebd59230a987c316b2edf1415c15bc6ddbd64703d6942d SHA512 fe43e2d7ba2757c3e1a5e5a7815ba461cd0ea0fd3ee97cc44cb94c54fb80f263245c0545b28647850c26139861f4c00c06e2638171f9a368efcd3d2e6cecdc9a
-EBUILD python-exec-2.4.8.ebuild 2002 BLAKE2B 6f7ddc6314e51d24667b4a8a5926cdb96bb864a98cb55324ca64ace84593aef945beb497a6127a16acb2de52e35a5b80db6146c0ed520460b1f2c168a9af86ee SHA512 9694d4eab6a5a12c7be23cac48c925d453d5f2c13bcc4573adf86b8bdb8a667a984be12182081ca8f0a12fa774fff5bc0f146b2c5bd6ffb7171ae23c81005999
+EBUILD python-exec-2.4.8.ebuild 1997 BLAKE2B ec9b57756c03db32bdf9065f0e7bcd7c62784f609dc86a65016e9db0afc23e8b8631117d37b4bdf5cc03030f151c139075fc49cce96119c15113770dc9f9d86c SHA512 5b1dcc485120fda6b3ca35ad7516776eb7d534e5526ac9f38923f0d6aefa779d36e49d193c6158b534c4072764e3736d79119e39b60c266f7471198bbc825442
 MISC metadata.xml 791 BLAKE2B 5be47111a2bd77ad817b6c4fe9822b3ab0e859ccc13bbccf7439549e0b2f2ff4734896942aa4324f5c35fe2097b8454828df0b7a1e2c855824fcebe60925431d SHA512 a6782b79df1d7b130cb93cd77fa3292bcbc23fd0b35158ce8231904d1593c9e5659a55d00d158c88bb1326b5c375e7aa8591d9b74e9e12f5e1192a42c037a9ad
diff --git a/dev-lang/python-exec/python-exec-2.4.8.ebuild b/dev-lang/python-exec/python-exec-2.4.8.ebuild
index ba9bc52a3a43..225797bdda50 100644
--- a/dev-lang/python-exec/python-exec-2.4.8.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-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"
+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"
 # Internal Python project hack.  Do not copy it.  Ever.
 IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks test"
 RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a5e0a8859a71..bdbb6ad588f4 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -30,14 +30,14 @@ DIST python-gentoo-patches-3.8.10_p2.tar.xz 20288 BLAKE2B 4d9db5c8d5c27673d5a026
 DIST python-gentoo-patches-3.8.11.tar.xz 16932 BLAKE2B aaa1df33997f4077916fb7cca2ec3a2b2ac1c0ead3db7c638a5152a82cfaaf5fc2768a10ac7235c417e25b2b735c53628ec096878f08eef0d211b03f4747103c SHA512 d2639b95c5a32f7145f92e52a94aec7c63f3ed4a66036ff73f052ff6836742d1e1dd7180f8634b65b4a44a10bf336092695bcc2230a7fd8be35bae870ed64b08
 DIST python-gentoo-patches-3.9.5_p2.tar.xz 14728 BLAKE2B b6b0a0c316d99e8282bdbb5e62a90f84880ff89b0b1e236a5bce37fbdd3c3b187f7964873882dbcbc8c9765af107377240e8aac544987452830f0069aff471c0 SHA512 42e4dd48f4b93bd45a70093b447b4862ab286c1b5adc32d22a3e3d08e67db13bfa829bdbcf989fac9b7c8634a4735cfb4a7b16bfc40bdff0c11bc5a768bbeaf8
 DIST python-gentoo-patches-3.9.6.tar.xz 12432 BLAKE2B f63f39b4667eeb214312aa22142c728a1123e88f49c6de09d15e88434e9d630c5e0e588112d77c5cf1f5f25d0224e4fbf0c370488a908e9015f168d9f85e9eb5 SHA512 3e842fcd8574a7f026e401d725febb2815b2b7ac0a89b952a340c7974b911e81286b542d3de56fe5750296f2ab680415b54b8c35f219975af10354cddb1f257a
-EBUILD python-2.7.18_p11.ebuild 10241 BLAKE2B a86ed6151546258142c7f16b9bce29c70d661fbdacd0b06012fa13857312950bada51d146799771b9cc3d21e063341d797ef15546668c945e02ca7e0d644f2bf SHA512 a3d3be9c103d21881b73f7594c7df299d9f7d079a6a38f4c25561a06c3821df2534370dd759450a0cb7e8fedd3e074c0e4afe446687bdac720233f4354570dcf
-EBUILD python-3.10.0_beta4.ebuild 10016 BLAKE2B 04656f91662d38a3fe5b013ca103edd0eb81f18699df26380be118bba156e4b0875db393d73fc859248fc0963e432d1bc199e88d6135a891c8dbe14d0d0dcb36 SHA512 ba7426dbeaf91aad83da716b93c56a079f363fed1d0616e0a875f2ec4b69f60f44206125ec32de6d2e8e0f9daf8e1a98e887d31ae21739533822895f96d27861
-EBUILD python-3.6.13_p5.ebuild 9827 BLAKE2B 36aebe4d590f587b338484275c495d8111217a9448657e54d5e5e72e67345b51fd4e4efafe3051a22d203ed66432f2a9442e870e778620b6ae9007398a64ea2b SHA512 3663fdc6fd948efdf14dd6528bdb0510eb60a0258c200441ebf913a3ee6652845852363636520a8f324e597b01f19ed3a0dbb5d9d047d1e473fff8dd486c6c79
-EBUILD python-3.6.14.ebuild 9792 BLAKE2B 1dc37770270309e78a7123b49dd6dbd1a8fb45eddcb711dc93f290d4328e699172b9a5334969c8e808b0e8eb7c55f8a8d4f07466e82484794cfea81075ed818c SHA512 3e919ad0441b2a3e13fa641d7d49f1595da5984e18412caae1e2fa8dcac5e8ee0b103343087f8c3fa8ffd596cbd80ca3fd309d659e1d7673c0daea1383909ef2
-EBUILD python-3.7.10_p6.ebuild 9640 BLAKE2B 5a43fa23b8917e9c07c8dcc5ce844534dd8b564e04626655652397cf5a3e97fa5ad06d905c7e2b97e97dc6fce1216500cc04d6ad15aa6f42d2af6d7ec2174ec2 SHA512 791bfad2c60a020ff1a47923d399cabd71165acc2e37184649d4402b11ae1a6c07fefb93d543e146e648368cf8bbca7bb1eec30c38eb906a714ec31dc5512a8b
-EBUILD python-3.7.11.ebuild 9605 BLAKE2B 1199ef8797a22329b6384743ea878231db879f120fd1da1c652a2ec31bdd85902af40aed4d306befc00ca46c085de1e05bbf3788a55b130c2e0e11e4ee2ae5da SHA512 b3a7170a932f94b81ab921dec0cc580928da3b64a1e757bfe01d39a08e49841066684162d42612ed70f534fbde34c7ab8ab0812bb18c9a0ec702200357992a35
-EBUILD python-3.8.10_p2.ebuild 9794 BLAKE2B eb460d8f1402a8b5696e2d52c694f067cc53250e146ea7410b6f7358ae12c8624550f25d003d2de8930c80b1cbc650c597ad37cd9757204233a70008752d4666 SHA512 2d86f2630e01d9f486f24357919136553b27ebb6e3952d6602ae8119dfb1b08cf157e5ae1d24c6bc93d6eba6def497a0ad8ef76299ac996436aacced92d8bc0b
-EBUILD python-3.8.11.ebuild 9760 BLAKE2B b7ca15d84c41878c572f3b2d7ef9d8db29ace687a129a975281d360a2b8a0f897ab93ab1d65cfa3b58806ab494fd77bd1f3ca344315cd4e521ee5f83296bda49 SHA512 758d84463185f234885e8593786df8986555ce35eccde9db322154c0dc7eafa0d685bdc6044de70926e3d6885de6deea89760db9c8b87cd01f559354c3736cc7
-EBUILD python-3.9.5_p2.ebuild 9933 BLAKE2B 24599f7fd649834496d85a23e1d2a5d4db0fa102a2303883559663f97d0266e8d68da56afce41626208f2592789802885d994bcc0a8427e695c67f18482ca962 SHA512 1a9d998b6b8fa8a13089e4c8472c660b1bb76f823ca586070b9b0069c100d7a91271c9c73abdabd97e6b11479743e78ecb1e9f2db2b28220ffc923e638a72d1e
-EBUILD python-3.9.6.ebuild 9897 BLAKE2B 031bcd2ec97847981cadecef8f714c581c86d497cf72cccc57fbc337a492e3dfda367155b0fec81a27d7113455aaa36d642eb3957a1e31e20321c7177c057309 SHA512 ebaec2eaa73d53152160faed367ef598165090178ac7375f3bab993ed92b2224f8f9149edf38a7e8c845b1841a65f5f34dd4b9535e69aad7d353da93a8b3d7cb
+EBUILD python-2.7.18_p11.ebuild 10249 BLAKE2B 7df44b075fd81c950e2d377d5708486497ccf8eda891ff24b5a67ba57b034e0f358b1c2f17c299b8015f7d1f3fd48e70cd1875fe52f16cb037e4d36b30fd0c6e SHA512 bcf93335ab49c17e215b42d2bad2503ad23f1ad66585a6daad620cdab96b7d603616e1c58e8e57701a5106a7e169c5dcd85de10d6a2ddf7ecdf0174cb17e4f90
+EBUILD python-3.10.0_beta4.ebuild 10024 BLAKE2B 5abda5915292489bc352cfdcad07fbe77d07eb66c5ebacbe39f8d0b7d2dcc7d21e0c7719f35e34cf835ced2096d444c1595c26c5edb06389a99deb109d35eae9 SHA512 71e36dd8d82129a59786841dd03248a121732b12f6213ca8966a9e10b7d4e073814b861c9b89f9f6200ef2d07eb8b73f864da2d0b933e9baf01d34b1aafee7f5
+EBUILD python-3.6.13_p5.ebuild 9835 BLAKE2B 630769c3a0b69c33892b5959240abfbb7ab0cfb56d1ef13c073fd39b058862e6068a65ce77bedd8cc5550d4f266ce3b971642e61091c4e5a348b985f3e53cd18 SHA512 d5c2cbecb3b6089df656df3b366127892477867494b5887c1fe7ba2624a004e827875813a32035d60e309fd36a9bf3f739dead3b08718228b6cf107fc338328b
+EBUILD python-3.6.14.ebuild 9799 BLAKE2B 1076b93046a44e00004e038793a8863fbb0d9fab8f2e1957c26ca01196292aea288ad59148ede333183d3337b5e4f601a003a4a47e333cf81a9e9176e3da33a3 SHA512 5489f0609cae7889af61f84c41af18f54766e94aaab80bbd036b466707924393d8a2ced3dfc42b21840565842278c101b4747905de0adb33b66a4d993778930f
+EBUILD python-3.7.10_p6.ebuild 9648 BLAKE2B 9dde26fda02cfdd64f7fb46ccb9f858917fb41b01533dc383cb9240165e948564925adb09e519fd0bb87d012f6c3b09fd2327c26c1a3e8f5c1040eff258bf5db SHA512 35732acfe75bdfcbc9b2bf42eecf73cb9842f8d0d0e7b888191c674d2cbe57ded060e815980f6f48acad0aba777ff1285729846c0ef535df00563240f6f749fc
+EBUILD python-3.7.11.ebuild 9612 BLAKE2B f5fcd8c1f8fd30e66b6f8f15340933f0c01f46588b9bfed5e4bbcb6e3e715434c9df73eb32ddb961bf1b5a2f9fc1a612103da5600b67e9f3034bdb5224e0e2d3 SHA512 4087956b4c411b51c6619398abf1e9c3cac9aad5b72cc8df1fc6e9431c05b1349b86e8255f96dbf572705f5da4483d926bcea45626362c3034e6988151933614
+EBUILD python-3.8.10_p2.ebuild 9802 BLAKE2B 893e12b251eb4df0493662bc6d2f5fa613660323d67b2191b633bcd8fb9da707bf073ac283843342f59d05c864523f5fce1e01935f15414498430b3727301267 SHA512 5e984dd9ddfc63c23e59e9b881f7135c70f1ee2d4657f809b4e7abc6688cdcfdf20b1d805c0ed781386581c93357547f909148fdd19f1b2efe1640d260ffadc3
+EBUILD python-3.8.11.ebuild 9766 BLAKE2B 395069cd5d4d45cfbf01ecd5e1742a5b13792d9b8d7d6a154c593d30b0c39622732b82220a72cb66f3163c4513f1667edf06d7a9a6bfa2d94db05199eedd2b24 SHA512 48b0566da0472d08f0103f37939a531d21b42f6e92f77e5074898b583a57bdb7fc873a451924ab09e2d9ecb0949661e1064775ed62c3b732cd66a7b919e8f3ea
+EBUILD python-3.9.5_p2.ebuild 9941 BLAKE2B 430a2f50835be59619e6825a9127782f4492a45c3086606e9e0aa179d46a2d830fda58a2716fa339e4c62cc7f6d97a30d839c2c2aa6f496e4d6809ec73f99af2 SHA512 0761ac63773350c8979e0bc5b62e9063ee997536b123c10eef509cbb193d25492ea24e1503b87c512a388bfffc2875c1fdb971c8f4a81f9a5351f7ec95e3e040
+EBUILD python-3.9.6.ebuild 9905 BLAKE2B 983d4cbba0f00b45afb18dcc0fa9911e1befd5ce07627849699628f4bdd9753bec1ab0ff138f286bab820ac4ed6edcdc0dc7aedf798ed50c475545cdf2d26e7b SHA512 0c3b70c9b0db42c7e94f46f316508068bba10e839de2304f9caf35d98114bac1bbb1921392f0e925afe5a9fd2b87930b2ac9e3c332f0c37bb4f30b3625b92d7a
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-2.7.18_p11.ebuild b/dev-lang/python/python-2.7.18_p11.ebuild
index f474e3ffc3cd..e0d18d127c81 100644
--- a/dev-lang/python/python-2.7.18_p11.ebuild
+++ b/dev-lang/python/python-2.7.18_p11.ebuild
@@ -69,7 +69,7 @@ RDEPEND+="
 	!build? ( app-misc/mime-types )
 	!<=dev-lang/python-exec-2.4.6-r1"
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 
 pkg_setup() {
 	if use berkdb; then
diff --git a/dev-lang/python/python-3.10.0_beta4.ebuild b/dev-lang/python/python-3.10.0_beta4.ebuild
index 64b7a0044422..78403cbda835 100644
--- a/dev-lang/python/python-3.10.0_beta4.ebuild
+++ b/dev-lang/python/python-3.10.0_beta4.ebuild
@@ -64,7 +64,7 @@ BDEPEND="
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 
 # large file tests involve a 2.5G file being copied (duplicated)
 CHECKREQS_DISK_BUILD=5500M
diff --git a/dev-lang/python/python-3.6.13_p5.ebuild b/dev-lang/python/python-3.6.13_p5.ebuild
index 01b06863a38e..f7ff5c2120a2 100644
--- a/dev-lang/python/python-3.6.13_p5.ebuild
+++ b/dev-lang/python/python-3.6.13_p5.ebuild
@@ -60,7 +60,7 @@ BDEPEND="
 PDEPEND="app-eselect/eselect-python"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 
 src_unpack() {
 	if use verify-sig; then
diff --git a/dev-lang/python/python-3.6.14.ebuild b/dev-lang/python/python-3.6.14.ebuild
index f3d9cde99bc5..003f53696d2e 100644
--- a/dev-lang/python/python-3.6.14.ebuild
+++ b/dev-lang/python/python-3.6.14.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
@@ -59,7 +59,7 @@ BDEPEND="
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 
 src_unpack() {
 	if use verify-sig; then
diff --git a/dev-lang/python/python-3.7.10_p6.ebuild b/dev-lang/python/python-3.7.10_p6.ebuild
index e3bd9bd6bc81..f1e8f4a37678 100644
--- a/dev-lang/python/python-3.7.10_p6.ebuild
+++ b/dev-lang/python/python-3.7.10_p6.ebuild
@@ -61,7 +61,7 @@ BDEPEND="
 PDEPEND="app-eselect/eselect-python"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 
 src_unpack() {
 	if use verify-sig; then
diff --git a/dev-lang/python/python-3.7.11.ebuild b/dev-lang/python/python-3.7.11.ebuild
index 749c05490552..ba90458f3a76 100644
--- a/dev-lang/python/python-3.7.11.ebuild
+++ b/dev-lang/python/python-3.7.11.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
@@ -60,7 +60,7 @@ BDEPEND="
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 
 src_unpack() {
 	if use verify-sig; then
diff --git a/dev-lang/python/python-3.8.10_p2.ebuild b/dev-lang/python/python-3.8.10_p2.ebuild
index 409300beb1d3..cf9b8b124f3e 100644
--- a/dev-lang/python/python-3.8.10_p2.ebuild
+++ b/dev-lang/python/python-3.8.10_p2.ebuild
@@ -63,7 +63,7 @@ BDEPEND="
 PDEPEND="app-eselect/eselect-python"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 
 src_unpack() {
 	if use verify-sig; then
diff --git a/dev-lang/python/python-3.8.11.ebuild b/dev-lang/python/python-3.8.11.ebuild
index bc0e29759511..a8ee2b4b5f82 100644
--- a/dev-lang/python/python-3.8.11.ebuild
+++ b/dev-lang/python/python-3.8.11.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
@@ -62,7 +62,7 @@ BDEPEND="
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 
 src_unpack() {
 	if use verify-sig; then
diff --git a/dev-lang/python/python-3.9.5_p2.ebuild b/dev-lang/python/python-3.9.5_p2.ebuild
index b16fafd716fa..944292f8b1ef 100644
--- a/dev-lang/python/python-3.9.5_p2.ebuild
+++ b/dev-lang/python/python-3.9.5_p2.ebuild
@@ -63,7 +63,7 @@ BDEPEND="
 RDEPEND+=" !build? ( app-misc/mime-types )"
 PDEPEND="app-eselect/eselect-python"
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 
 # large file tests involve a 2.5G file being copied (duplicated)
 CHECKREQS_DISK_BUILD=5500M
diff --git a/dev-lang/python/python-3.9.6.ebuild b/dev-lang/python/python-3.9.6.ebuild
index 6d7b81073ba7..3528143ffde5 100644
--- a/dev-lang/python/python-3.9.6.ebuild
+++ b/dev-lang/python/python-3.9.6.ebuild
@@ -62,7 +62,7 @@ BDEPEND="
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 
 # large file tests involve a 2.5G file being copied (duplicated)
 CHECKREQS_DISK_BUILD=5500M
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index dfea3102bdba..755b8d56488d 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -62,6 +62,6 @@ DIST rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz 147158552 BLAKE2B 0e3037221da38
 DIST rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b40e46258e54771b814e07433318eb05e471c8bb65bfe016ad3830b94fe0be5234a1c9821c746cc452714719a78f24c5e0012f1d4c81569b36c6161c50ae034f SHA512 ecea8c4df0b72fa70d3a9a0c4b38812424006f21832c8805c9070ae4ee5255bfe6a7153eb44d453302162c7fc8a1a2dd6bb8574bedeb4e4f7a769d51de2cbde9
 DIST rust-1.53.0-x86_64-unknown-linux-musl.tar.xz 252250024 BLAKE2B e99c7a78d6d6a8b357ac17cdaa9540cc895d138480ddea25866d2f8235b48b6a1670ba7c9256355ddecfade28bed9eeec8b53e85f1c13af5c56c0ba7a12e2371 SHA512 33ee4d82cc1feeb4c478948a05eb44f7daa90f749191bd200a216dabe810420f47a3a258255c680302ddbc83020df4729d5b3ca9569003a89aa7768697e2fb64
 DIST rust-1.53.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 24283ac5457eb84de6a5588f69a22076a78c2ce9e5c3c245608bf963544a5c9f8fa8006e2ae216af65f5083cf5fe21f4d1c5286cf0b491ef4995be5ab8ac7c64 SHA512 fbd6b1477efbfc23da3f4f753c317f714a29495425a52d771d2527a42cfe7ad99b9973538da0978a6afa80f545823c9d0448d9cd29e6ef53559252e328d7deb8
-EBUILD rust-bin-1.52.1.ebuild 5372 BLAKE2B 9d0e86e08e792834811ef3336ca87eceec3da99853def2ae4143b5122a32d5a9f87cd269a661b4a7da3b1b5df7db2a2e392aeb95e62e84606f138ba319d7a417 SHA512 62f9643eb407f53c015e0abc0f1b2ca5eae8e53541ccc2c03501cd76f1418ea4766778ccd1c2c2527e51ca6403e5a5ee76ac5caa8141e5a945c8df295f4086b0
-EBUILD rust-bin-1.53.0.ebuild 5375 BLAKE2B 0a8ff7511e104d94461d8b89478a25a3a96af18fb2fd3d07379fa0c0abf0f5cd75079a281baf416b04f7c6bb1444073413d5639aa19092ad8ef707989c83afbb SHA512 5227f2104bcbcc613981b4a9bbb0f332409a2a3333baf1755d0fb8fcd9ca67bbfbbb6d6f092b920e1d3590e4021051c7e84ec8da3d2617c6f6e7675660dd41ba
+EBUILD rust-bin-1.52.1.ebuild 5378 BLAKE2B 88912dbecd970882f4a6acdc66f4058b2eca20541b77bf98f799354dc3c4e6c1606592e57bac4c05eb5aa44901b4bbd14577bcb3ded25db730bdcdf6d4eca5f6 SHA512 4d2f865a1431b13fe40d40eac7b8bdff6e3da4af094d2fa125369bc864bc6d9669cacf94401e33703284ff8b955818283f659157176a1283fa299555f0a30f34
+EBUILD rust-bin-1.53.0.ebuild 5379 BLAKE2B 94af16f82122fff5e8c59e77f5f30f42cd32de48fd249293c5da8da33c3d7fed5ee6bab226b81bd7ffb179ac9040ce14d0bbe82a16708c4e9ace78ab7d20d092 SHA512 866950661e91c8872b26d93dd71c204ebdc110e9ee52dc503a315e5a8c1e2fe388661e9459ffc4b431ae406ffc6a71ed42aa7e06be2a32dcb5ce3be6f6bd765b
 MISC metadata.xml 489 BLAKE2B b9c157f91a878ec1196183173bb339e9beb832e9b002cd72ac5b0fc8a64e7d7b27d165f79bf34eb1debfa69c2381b5b9a74a9b52cefc9efdfe41c93ed72ecd9a SHA512 814c53f00547b8a2b12cab136c95222480ab34b1cec307029e66c7d712e1e00eb2a725ccdfe73d7f1b154b362867c7150caef3609daba20f8d4c2496c47f6b09
diff --git a/dev-lang/rust-bin/rust-bin-1.52.1.ebuild b/dev-lang/rust-bin/rust-bin-1.52.1.ebuild
index e15339466bd8..8ae41adca726 100644
--- a/dev-lang/rust-bin/rust-bin-1.52.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.52.1.ebuild
@@ -33,7 +33,7 @@ QA_PREBUILT="
 	opt/${P}/lib/rustlib/.*/lib/.*
 "
 
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
 
 pkg_pretend() {
 	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
diff --git a/dev-lang/rust-bin/rust-bin-1.53.0.ebuild b/dev-lang/rust-bin/rust-bin-1.53.0.ebuild
index bbc3593f5a81..081b94ef3858 100644
--- a/dev-lang/rust-bin/rust-bin-1.53.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.53.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rustfmt"
 
 DEPEND=""
@@ -33,7 +33,7 @@ QA_PREBUILT="
 	opt/${P}/lib/rustlib/.*/lib/.*
 "
 
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
 
 pkg_pretend() {
 	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 23a11bc04d86..2cefdd2c58bc 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -71,6 +71,6 @@ DIST rustc-1.52.1-src.tar.xz 115109508 BLAKE2B c5d73f5884037d287d88ba9fdaf63a366
 DIST rustc-1.52.1-src.tar.xz.asc 801 BLAKE2B ea2f89289b4d9cf90a0d10148bf3494805c00e7822cc98addf0b602c35e4635bb1963d79168b395a5f7c7bd024070284fccd19757982daa0d554dcac166fd4d7 SHA512 0d692a085c017b03b8a135a28f7e6f1d7e05642d2e99f0f1fbc397e766bb8fed4b4c6b4c9157b79d9bb0c4229607dbc35711cd463c62a9966a4efb6f197de7d3
 DIST rustc-1.53.0-src.tar.xz 115686332 BLAKE2B fa068f89d42f927fdc79ee31aad1386eaf2aa596a060e059c5a1a73fe48c48d008fc952cd6c7912b743e41d77a94b205639eed0f728b2539b62f18a772cabfe3 SHA512 70485cf7a0f7fc36ee31644e546374079dc387a85b44e5e793707fd0a4d7ca05d311291e78b86db955485d8f21c47ff9e1908acc4da68ba04929287213a40c24
 DIST rustc-1.53.0-src.tar.xz.asc 801 BLAKE2B 75d3aa4122968f10a119f7a04df897f496588c7a1a2ddf1ea2222099c9efb0e320f5677a26c3271f86e7f500120664485f54c6025ae3c6df30d2b0fe758f5826 SHA512 e337579b9ab4febca4594c2c5d42c279b51cfc745c383be9a430204188311a25319c04c73fde34fdb2bb98a88bfd8daaddc67765834330e6c279a6e5a5648247
-EBUILD rust-1.52.1.ebuild 20192 BLAKE2B c7b559e89f8563edd64653522c9cb1e5413f72f6608dd18a9d04f92d73cf9ff5fd00facaf43ee863d159a8ee6db12bcdcf3015cadd2a6b021b13cc65fb2b238e SHA512 77a71ce215cdad5dab40f1a88281c28ddcf3d835a74a8fe63aacf3701b6bbf216217dcce66e776a9f5189279e641f8a00bcfe566de538aad0a04008bc60553d9
-EBUILD rust-1.53.0.ebuild 20477 BLAKE2B 785c86f9ef5028bfb3eb4934f5310300c08d1a1b0f621e2b1668076547c3022c4c2bb2956458d4ebafb16ef07e364059c5d4d81c1fdb4908d811e88a83b2244a SHA512 54af9d1604c395aaeee9986dd3a038d6ac9ba61904af64a031cf6fb4b45fc6ed391e5938ee8928e7b9a2179e202b5fd6da970ce3d2d10f45af3335a2900eb37d
+EBUILD rust-1.52.1.ebuild 20198 BLAKE2B ded64444104b75499de229c06c3d41b2651d3ee590f598f7b93965f9c70d22369a7b6f09d968a5618adb62ab8f8f423292f8766d33086be898d7b5960efa206d SHA512 9b54bcdae2b1584e73f005792d7382d264b057b70d3cdf3c8ac412ae66f8bc134ad0fa5e80d641fa101c8526bb3883a8043be64af611663ff1cb5e643f149373
+EBUILD rust-1.53.0.ebuild 20481 BLAKE2B c3f1df43691caf6b23a6a4da6f6736952ffe6b8aee54c407356b77dec56b439f9c3d856a9d191f77134493f2c90635b9f199dca077218680669f3a1b9440a4ce SHA512 ddbc3e41c47aa4a9eb0f19802ab72d97da76e21271d1c558c2e8227c584e66ac14611e36f4d78fdd9fc302d96fe1457a696b163656fdf402f93112580073befe
 MISC metadata.xml 1083 BLAKE2B 7a7b093c22dcaef58bd67f9c2fd84a000696b234d2bc27315999bf6751cfd2a79441fd22efc284a542ecc84ce1a12ff9ca3495d249eaffa5bc1722b385c6109e SHA512 bfe8c140753e93db67244c92e9a7d193691ceb67de796c30a851966a1262bc5c897ead6e13d728775fa524215b6851609dcbee582022d9d75bb8d1e6fabc4ef4
diff --git a/dev-lang/rust/rust-1.52.1.ebuild b/dev-lang/rust/rust-1.52.1.ebuild
index be3b4df7388f..903660103f67 100644
--- a/dev-lang/rust/rust-1.52.1.ebuild
+++ b/dev-lang/rust/rust-1.52.1.ebuild
@@ -141,7 +141,7 @@ QA_SONAME="
 # causes double bootstrap
 RESTRICT="test"
 
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
 
 PATCHES=(
 	"${FILESDIR}"/1.47.0-ignore-broken-and-non-applicable-tests.patch
diff --git a/dev-lang/rust/rust-1.53.0.ebuild b/dev-lang/rust/rust-1.53.0.ebuild
index 7df7d37dc122..1d9f2717d207 100644
--- a/dev-lang/rust/rust-1.53.0.ebuild
+++ b/dev-lang/rust/rust-1.53.0.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
@@ -143,7 +143,7 @@ QA_SONAME="
 # causes double bootstrap
 RESTRICT="test"
 
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
 
 PATCHES=(
 	"${FILESDIR}"/1.47.0-ignore-broken-and-non-applicable-tests.patch
diff --git a/dev-lang/squirrel/Manifest b/dev-lang/squirrel/Manifest
index cea75050722b..26142b1319ed 100644
--- a/dev-lang/squirrel/Manifest
+++ b/dev-lang/squirrel/Manifest
@@ -1,3 +1,3 @@
 DIST squirrel-3.1_p20200612.tar.gz 181047 BLAKE2B f6965b5e721919c6c33426843a9b73fb27f39b7341763c2ff01421e6b6dce6cb86c6a02df65af9cb2266e8a63d6612c0e857456c4bb6e2546760f937d1979990 SHA512 e9853c92c151ca35e137a91ba4e3c9ad9c4c6d95a22c3686ebbae74cea7c1bf704ec5274d610f9d8158d8662a2b1b1445664f3f33c11689553cfc090a957b204
 EBUILD squirrel-3.1_p20200612.ebuild 969 BLAKE2B 4e3862e00b94df35203c37e6ce4435b91a25af06bae774a777796ec05c5f3531eaa4ada5e02dee16bb53166829a33a9bce2fa0961d86f1ba506c79f777bfc2f9 SHA512 51194be28d9ef6bd7c8d2c3cd374369ddf4fc61112867abeb31655f9d889febd36d938684ea83b80ebbf3faddbbb24240a4d35f56597a4a25baae507f45027ca
-MISC metadata.xml 395 BLAKE2B 3e9c28568b3d5d1af34d28e3d0da4f765247e2b0b52e9f833ef4c6c9060de915cfff3c8f8d429098a2d49a2bf9ded44d34460de6eaba5799dcf516854094e0f6 SHA512 e7332967d7ada57304e4e9036a61fd27d9fac11dd62a3c4b3627515d4f69cea1b1182132388d480648c469e193fee85bf09220679eb180a9d10c57f78bcb48b4
+MISC metadata.xml 311 BLAKE2B 16202d6b52d3e6eadd66d88e18c6c5379c378c414a6bebfc9ca53e8040783653dc6a66ce6f975305987c7cd9734dab582632432d62058878403245ed50fa757b SHA512 9c28dad64ee5a7241af5cac8ae861da1de73a9e6b380b6ee974f92f5db50de75bbcddf2948c32e739bcda0dfbfa4246168108fbf6a90c128d1cf6ba1b333a5e7
diff --git a/dev-lang/squirrel/metadata.xml b/dev-lang/squirrel/metadata.xml
index cc06c944a210..aa224b895f84 100644
--- a/dev-lang/squirrel/metadata.xml
+++ b/dev-lang/squirrel/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">squirrel</remote-id>
 		<remote-id type="github">albertodemichelis/squirrel</remote-id>
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index cecf161706a8..6ba7a259952b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 77ed3d57f82f..7696c410b01c 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -4,5 +4,5 @@ AUX apr-util-1.6.1-fix-gdbm-error-handling.patch 2272 BLAKE2B ca68b87d6f19614cfb
 AUX apr-util-1.6.1-mariadb-support.patch 4929 BLAKE2B 9f8a06e657386f5f773642f36f0897bba5e55270e860f2f1edc86ebe44214395a64e70c3f984f324328a8f7a6276c86cb46caca16719ab3ad51aff995868818f SHA512 edd5e1cd7d31e7bfb1b166c162ad8c69c704c8e9a09e85770df3b625ed918ed52918a16728a9b4d69370ccc75ade32dd64ef73b31ce6e8dac7a360fe44ca34e7
 AUX apr-util-1.6.1-my_bool.patch 311 BLAKE2B c0fdf523983dc75ff977c8f602678cdd7d0b3e539fc266891e2266fa3b60e0971e93d77f2e28ed95959d8ca62bca4f9f566fefea525c845d49ce545ee6b5a99a SHA512 ed7d7857be8b5d29cc17a7216c1b06134798eb5129d50389bb0d5484a46e19e3169f8cea80cab7f845548e528a2cd9909b72016a7216b402092ae15879db792c
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
-EBUILD apr-util-1.6.1-r7.ebuild 3791 BLAKE2B d39ebd34de8dafd80580c38b94d639be7230f1513a276c478ed26672e27bbbb29a2b72d11ee53b8e77bb330c7a4da4c273008a4ca71324cbc58544ad8df6c0e6 SHA512 1faef36ded7dfcc11ab9e28b70d8a887ce3ebc5d7b306b4dfc9f7d7ea57fa06a6f7fc9c5e2cc143cfe7dfcc151f04e0e51ef23e1b3a3af201b7377e50bf1b913
+EBUILD apr-util-1.6.1-r7.ebuild 3798 BLAKE2B 110e252f13b93491bbaf30dbc9d92630b9adf454d4158ac526d7c94df94346b071ac1a0fd54343fd443c15e81091d3257cfd81ade6b7d318afcbaea25a327927 SHA512 1bb1759caa441c3230ae7e4539d6197381164ad50b6bdb8cbe1fc395e3a0f93b4ff0242ce7cbc5271cd1842422dbb6391a894c50e293fdd2568fb565aee9fa66
 MISC metadata.xml 386 BLAKE2B d4ab564afc7fbffd8fa2f7d3709fb2141bb794937aa9dd0049b14a8ff21a1176c518c63080427b9afa09719a33f0f567bce8696f8fcb1373bc608171c58b8853 SHA512 c8e150e115b2d6999508e7a6c75d78e3b9ed6d5fbae11895f76b6e3421851a926b36a6a9cc225953212088f899d26fd4281876df76edaabb99d33972146e4ff5
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r7.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r7.ebuild
index b54b74d8e7eb..5b5a167a75f1 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r7.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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 ~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="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 0174f5011267..b73ddbf3f211 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -11,5 +11,5 @@ DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb82
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
 EBUILD apr-1.6.3-r5.ebuild 4632 BLAKE2B 2fe447be53ffd513c3da12b2408db0ee4c2fbe1075b7d46fccf4eb82bcacdfd94df32ab0f721840cba3a9da6b8349e90c883f06a902532bbeb732268fcd48ac7 SHA512 e248703e1ff52e08288f0f3f04208e99d5b7e4a2cd586a55de18816a39054ad0a9614dd902221ea917f4109bd85bd563f7c3ad1d60ee4ab0502e5c6e88eff718
 EBUILD apr-1.6.5-r2.ebuild 4578 BLAKE2B 9b9a472c369276aabe416d3a36d92b7e1d2e890bbfe70afd1d010f49fa91668ea90ad319ecfcd210927bbe53218f57064ea259bb5c13531f14b1a3e45ba0ff9c SHA512 2a0a1867d03f658c7a1c39c93c26f4cf05b488e14d8c1e9c7ddd981a3493a68311dc69db04fe0ca3194bf1d3a98f990df67e1b1b4fd3c6be0b71965737e3fb56
-EBUILD apr-1.7.0-r2.ebuild 4541 BLAKE2B 07e1451afca4040255be80212f864c6195614df179a2b23ea1c88805eab8d36743e270ae4d67ccb0244f6a850228d4f685daf53b1ad51ffc71a3cbb3b3af6284 SHA512 fd22698c299e7c6ff3153dd62fd7437d8a1d070cb636914d9aca02e5a442e6435b92068801fdf283c89b7b56cafd848081cbe7b2b6cdaaa1c277a4bd612e797f
+EBUILD apr-1.7.0-r2.ebuild 4548 BLAKE2B dd203af3034da46c37ee1b8aca7d708d4e9642d04a3a40a5e52bb94d05f18049d1d2ef5dde3b55030044e4f83ba3e77dc5e75a0d8dfbdfe005356e661c77529a SHA512 60b6c77af2879ff2b9492a8df98b5215399e8da13d9866c621db6075175aa5f2eeda6935d34a8614feb494782d2a2a98f5db47f62ff7534c43a9ebb431b7aaa8
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.7.0-r2.ebuild b/dev-libs/apr/apr-1.7.0-r2.ebuild
index 8a231aa627f6..36cf05528757 100644
--- a/dev-libs/apr/apr-1.7.0-r2.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/atf/Manifest b/dev-libs/atf/Manifest
index 242ece4f87ae..801a7dfbdc2d 100644
--- a/dev-libs/atf/Manifest
+++ b/dev-libs/atf/Manifest
@@ -1,4 +1,4 @@
 AUX atf-0.21-getopt-solaris.patch 191 BLAKE2B 100e710c5cd10d5b0cd35fc2b6fcbba440496c3bdf99b7b88162b214e1fbf030cf54a0289b801b9946f89df0fe26ecc452f498ecd9e546462ccfd989aa313f64 SHA512 c98c062793abb014731e249d833e94fb4c0e7f5ced37f7310caa6e3a26a3b391c4fe90133656c21f6bb467af5d8039f887a3a42630b6e9725ecb84b99309a94b
 DIST atf-0.21.tar.gz 567791 BLAKE2B e9449bb61008a91c10050462e84ff65c6fd88124db56ff3f6c149ff47fe8647fe8fe786cd7b1106cbfd62723a57ab613432323f266a93a4c86d8a6ab39bfcc0a SHA512 9b4b67d7d0d1f65cc9571d38c67dfc620b08ff7c0abf57d87bcae54055b4af21f95f3363f2cf8ee9b13b89a5351bc58669b784a0fd8c1beb0664c14933c10ce1
-EBUILD atf-0.21-r2.ebuild 670 BLAKE2B 6baf882cafc989aae2c4503cb2e855dd45b9ada7f5cdeceec4f91446194d487e9f806e354818743ff203e80346dfc9567101ca20964039272eb4046df560c4a6 SHA512 698234808d7024ac60ba5e1731e498d434d4c0d6aefd297a6507bb924bb3634e775f2387fdc8bda14ac6a34c05ce6a8e59991f9d393a7856c1a0583bb0f8121a
+EBUILD atf-0.21-r2.ebuild 676 BLAKE2B 743f4fb03fbd6de0d0e4fe5e37227b9eb9121efe47cf2a3e229d78de35e5647e1e339b943bcab0cf144cc0adb35fb455cd4d89463b37b1ffbe206937a3285a70 SHA512 cb5748b1e270c313bfa0b9fa5bcfb0a4a4e299657f71a284c23f3461220414646b07c08b7c966ee8c95bd7a186e5c0536ea8317845ed65db4555da413df2c891
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-libs/atf/atf-0.21-r2.ebuild b/dev-libs/atf/atf-0.21-r2.ebuild
index 5376ddf5e0a5..019033ac1871 100644
--- a/dev-libs/atf/atf-0.21-r2.ebuild
+++ b/dev-libs/atf/atf-0.21-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Libraries to write tests in C, C++ and shell"
 HOMEPAGE="https://github.com/jmmv/atf"
@@ -9,15 +9,15 @@ SRC_URI="https://github.com/jmmv/atf/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${P}-getopt-solaris.patch )
 
 src_install() {
 	default
-	rm -r "${ED%/}"/usr/tests || die
+	rm -r "${ED}"/usr/tests || die
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index faf64a5a0ecf..f82938df3d6d 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,5 +2,5 @@ DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51
 DIST Botan-2.18.1.tar.xz 5953936 BLAKE2B 82f6a9563377542d059901adec0fc17a41b0184cf59af76084babec2591830314a4d7f8d3308eb393c4910c9b0e6c056625765f0d95b435f47dc94cf4b83b128 SHA512 2f11d1ab703d977a2d64504d2a2489ce56109a2a6c46c0dc7c8db428470ce511bcc0160f70baedad29237abd5e1622f2c155ea58c4dec4d3ae57ee7b350415c3
 DIST Botan-2.18.1.tar.xz.asc 488 BLAKE2B d7e6f18ba969b1fffe5aec27ec28839bb6eefac438b0971bb24293a9a1dc104d4355feaae4f8749ea9ea9a729e9f0c0368782c60c2f1aaed58620624248d09d2 SHA512 0cb24d544e31f347e649661d28fedaad4352cd5096ad41e1513c7915138981c7c099e4ee6025893ed829a65082aaded738a94018a8e0bc079f4f0fb63bbec262
 EBUILD botan-2.17.3-r1.ebuild 3081 BLAKE2B 8f1566d33d79f8c580bfc50ff282a54d1ad779f6394f9f78102f8364c39fe45902f04ebf41f14ff5c91a9c6ffe7c197727c86ecb7ef00b89b6da30a33a365eb6 SHA512 157e5dc7e0e502b06f23bf9c2961f5b3db6b85ca1e118a5035261a19ed11ebbc9105631ee332b1af4d70d83fd90d5806fc7345639b33609c22327413428d8cc2
-EBUILD botan-2.18.1-r1.ebuild 4140 BLAKE2B 6019744db3afa681660ff7f254357b05d02b9d3f108704b72f9b0c50d45fe8e0dd50fd7222c782f8dc62576efe5911b90b1b9edce877cd5e0570d89148d13d44 SHA512 519711a85c71389287a791583ba0ecaebee8008ff8fa25e0eb7e2a710f201365ebdc6812fff4dc78df980bf423e89c463ee5f07178d575de0d47302549ef1d48
+EBUILD botan-2.18.1-r1.ebuild 4146 BLAKE2B e3527bb61c9d012807949e8d31fab34fe1a18e18fffcdf779ab486ef54069695f50a20780968be9965465570e8511d0493f3f6a2adf014feb549c5347de914d4 SHA512 769e05bcebd7ef7706f8c04be1ad0b421df29c79682bebc3bd9238c5421b8644fad97d6abcb9ef168b5291eb954aa83aac9d25396da12517e5bb21b58c8d93c5
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.18.1-r1.ebuild b/dev-libs/botan/botan-2.18.1-r1.ebuild
index 133a2313d2bc..0764024db75e 100644
--- a/dev-libs/botan/botan-2.18.1-r1.ebuild
+++ b/dev-libs/botan/botan-2.18.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9,10} )
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/botan.asc"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/botan.asc
 inherit python-r1 toolchain-funcs verify-sig
 
 MY_P="Botan-${PV}"
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index bbc2350426e0..c03fe2bc1a3b 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,3 +1,3 @@
 DIST c-blosc-1.21.0.tar.gz 907199 BLAKE2B 08c52ce5f0d285798aef8720378d1cc3f2d2b0a99cf47f0a49dc82757a0edb4a37c5c0d226a80bae5f9be74b5c2a070906387b9677df71ea6b825662997168a1 SHA512 76758176f91979794dc3b8d46c21294d81e33fda4f2e299b031f2dc059d77e351e3f5f1c984b0263713d6e04c48534984d580244573dd96f0198dd3838b9f376
-EBUILD c-blosc-1.21.0.ebuild 1116 BLAKE2B 267a72b71ad922d3423f9ccc7277672dd7372f389e7c7119e0fe4622c37f7b1604b3e0bda1c3207bf0c230669dcccdc5c4ba39aeecc8d53437457126e3946c62 SHA512 7df851cf5d01648647edabeb015e9b927a2dc52f26ea6dab9fbf9df12129cb10f5f63cc222806a56c4a9db47ed68b52fc0eb05a4fbf2110a84acee6f614803fe
+EBUILD c-blosc-1.21.0.ebuild 1123 BLAKE2B 3c3466a25fef89ccd1a92b8eb5575db5a885d9d025139c478d0d86936cb034f60eb3291ed803053bf6d3f89e2852ba4ea5a73bd136f9f230a8f9b3339098bb2c SHA512 d27c22c1a388ff0f838564093a6f4e404953367fb1e47812f0104941e076e022381b43e94cb65423e574ded3b6ff328c7fa6c317dc8c32c39a7603de163825e5
 MISC metadata.xml 838 BLAKE2B 3dadd7fc571618d6b398e434354b65a7c59dbe07d2530069ac9ab7f879cc5b16407079a4e1fdbd54110b3be9a0bf25c13512c2030fc9042cbd105d9b294dd279 SHA512 5c1f4bd8e4ef92dbef6d9a6418fbdab91c377c275eeb572a0c0e785a25f342be0dd032ad14106b9139fb7208064f16fb428ebd7b65d50d35b87089244b026654
diff --git a/dev-libs/c-blosc/c-blosc-1.21.0.ebuild b/dev-libs/c-blosc/c-blosc-1.21.0.ebuild
index 206c6b168d2e..7473d8d05e43 100644
--- a/dev-libs/c-blosc/c-blosc-1.21.0.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.21.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+lz4 +snappy test zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 9e97f1fdbb45..0f951d711c5e 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -6,5 +6,5 @@ DIST cryptopp850.zip 9125575 BLAKE2B 857a65d63d17a3447d3cbd8370f9d750c480a9734c7
 DIST cryptopp850.zip.sig 659 BLAKE2B e56d059069aa233b11dd1dd2c555ba8b9b0d12474d4f5ec9057e626ad22449959b9474ccf9ce553a2507f50215b669cf4b90cab6b51697559a6ffb95d41da9ec SHA512 7b59fbeb14fea942c846573c7bf8e76d6cee86aca4b605ce06323bc6f5549232285864cd735c2a882ca4df3d93747436a5268fee63dbf8eb43c503143b660e63
 EBUILD crypto++-8.2.0-r2.ebuild 1775 BLAKE2B b53a3c343a882953244e8232e9ab7dcafb9ff0dfd60f80449d9057e9ac60811e628668704adc474f88385ae9fe363534990c162ca8af82f1d78c43dd333d38d5 SHA512 491829f87023ec95132521a1605a17b3eb9e8e58b92bb4ebcbae5feed98a058731398858d8c5e0e8af6f63d7df01ff13cc3154b0340f6e4ed7a226ee22fd1861
 EBUILD crypto++-8.4.0.ebuild 1190 BLAKE2B aaeb8f3171c59e2e8061b01fc8e515da289017720b162614ea77d0d7c49dd4c0d558cbf8042272f736a2786e2eb32d05b49669c5df6a1990dcadcae60004613d SHA512 1ec1a83bff3e783106705dfa46dad55bf80026dc0665e58e325f4b43fd314036f33e94a60b392b6fd9b48aae5e2c4534619ba22d4a072ccdfb4e497dd9df1cde
-EBUILD crypto++-8.5.0.ebuild 1434 BLAKE2B fc314b297117c99b70eb13bbd0a247609926b5dc7c1597ebc03b1bda8fc3f114f01a2c5e03ab15eeec53cc380a79dfccf06fd1a49c6d2f2650725086a25ea1ad SHA512 fa3f509ac975ab4237fd6b6db9b8c432920d7b6c0b6850fc3d54b78b301be7347261f5273581c7445f7d3b48e8742f3d1e75a6cceec570e035f747d20d193f27
+EBUILD crypto++-8.5.0.ebuild 1440 BLAKE2B 7cd32bba25234b5eca02babb5ea88f4a85a1e5572659bc2ae21fd0dad99107d61ee0fbf9b7502afd6c59437b60d38e64167c897573fc93c3eee03937534f7637 SHA512 30120d5abdbbd94ea21a3755cc80956147c26878c97c8f72e4765240f8bad4ef41637f80949faeb1219cd16ed97d81bb69d1271e22140c1ffc61a1e5af16ab46
 MISC metadata.xml 505 BLAKE2B 8c1bfd20c9717c7b410af1d0dab008327049437c0c3a046bd3d3d79cac08cac11fe39c29eb933ce5dce3b3a7b57c017367d486b0c1ed70c78496b61ae0ebf981 SHA512 1a4c274988ad19a49919d882eb403c8bb75ebef7ebdc6350e6d705ab6abe672bb6ee32e8be71dbc52c3b71cdd84aee6b7b44e0a42b571de2480b7b78fc871253
diff --git a/dev-libs/crypto++/crypto++-8.5.0.ebuild b/dev-libs/crypto++/crypto++-8.5.0.ebuild
index 8b0907f57b01..a573a39047dc 100644
--- a/dev-libs/crypto++/crypto++-8.5.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/crypto++.asc"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/crypto++.asc
 inherit toolchain-funcs verify-sig
 
 DESCRIPTION="C++ class library of cryptographic schemes"
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 7c92d63a902e..9c4b1f78334b 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -17,5 +17,5 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
-EBUILD cyrus-sasl-2.1.27-r4.ebuild 8248 BLAKE2B 722c8a1cca513249de2f055a6772d407972bfa3a866698c0a66c0240c85b0c4f507ce96286bf6c47871190c28bebe5f93a63977509ff03c66f035d7d3be9f95a SHA512 04f897526821ed6630b47b48d7c879cc70296ef445febaff254c5873611f989b3ce95fe81b3827a10b204e4b1e96c1e333c09f0fda6edab11cdb45616392cf81
+EBUILD cyrus-sasl-2.1.27-r4.ebuild 8278 BLAKE2B 9091aa27cc5e65a274cbb00091a679f80d2818c568050ba98dd5ab9dc8be04379c89e5783a1831de5b927fc0b7639d5c89c671126bec2621b419b89086d0e4a3 SHA512 57fae67af9e0419456995ba422e16c9e6e7b3a82f25920fc151673ea82aecb6d104221df59a56c38a1cca5cffc356fd6a6f6d9ebb4ae25b624fe930163d2d3c5
 MISC metadata.xml 720 BLAKE2B 47731fefd662b4ede2aa37d2eb8ad4dc8cc58c31d2cafd4127f06276023e9f3c9379a780a9b6f064c05f3b8974cf8e389ee9c5ccf85c3d856dcf60b6eb8d5f59 SHA512 4a08ed3009ae32519bc78f4f84f8f50cd04b2ba48afde0528374b38e64f2e4d7d93f6bce97476e9871ba68d18f26f18a00002ccf22d06e8eb1bb9ea4d4dabe1b
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
index dc7832f55a9c..209963f65410 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
@@ -241,6 +241,8 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	# Generate an empty sasldb2 with correct permissions.
 	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
 		einfo "Generating an empty sasldb2 with correct permissions ..."
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index 71e4a870ebec..2f4a48118b1c 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1,5 +1,5 @@
 DIST fstrm-0.6.0.tar.gz 135214 BLAKE2B 237b371450ea2e92e466aaeab2d6ebf9ba7c6bbf14d1517431818b01a2609c1765299bb576bb3a4a3a99a9ce7644992c3f5eaf82c01d903a1bad358d49ed47b4 SHA512 8e327f40fb49b36998d8bb9353b30b9924630b85adf1e4462ce4b456daa7eea727892a59f43ddd48de5bf5059a450fef54726b09af6d7f210fa182c4055d65f4
 DIST fstrm-0.6.1.tar.gz 135425 BLAKE2B 607852bd6bd18d2dc4e862c7425882274710674da1edb3a525b409f5eff9cb46748f8e5b7b1e88ab180ddfed7a19ee41aaa9551d70331ac80ff178ffa0b4ca98 SHA512 7bf2728e2d0d1fdbd4e93069ddb03a01dc56909dbac57650ed530c80f761170b257c7191a3d789d4661df1f09c15594f20ec93a4eb5e5deb7ea3a7eabe56806c
 EBUILD fstrm-0.6.0.ebuild 822 BLAKE2B 396271d57a86f3b2fd7352f33b3d481015406002790b3d62e7c069658cb382dd4f6a4c7ea47ee96941d894f8079dcf2c6a25895b15b4ed6c3279475e6e3f5a18 SHA512 5b50e0acf16f422e8b135cff76fce107397e48fce40ebb78a06b7a1fdbd3d641359ad6b1bd41b0c28ec3fb04ad8c926d790eae39d90e18ec119fa1a1d4b15107
-EBUILD fstrm-0.6.1.ebuild 800 BLAKE2B bab0f122ce2ae84d16f5712fc9042c9b7f2a5305391089b7115a511677706f0b857a0e5ae8cfcddf34089ed59fb134566d18e1591ca56507e6082109fc3d812e SHA512 bfdc42d0f0ee7380b33b9eb7b30b5d3e5a1b6398ef9c4e0078fd98c3e4017e5de47d0022eee2eb562cf3885b497d48d65a772397da3a183fb379396c93a4855b
+EBUILD fstrm-0.6.1.ebuild 795 BLAKE2B 625b19f47fec6e8730d8814c3b0f0fbc9ef894f9700bbcd869c7099b67bd58d927324e88a0b33be73019ea0dd80302ec7c5a3b536c82eef8ff0e59d3f59397af SHA512 98a7430e1c826b32a930c50ad84d1c65b8ff3f0c6102dc8f2ff389264fbcd795c5291ca3bb70512a8d8640010935242f2f6220d64ddd1952bba7eeea5f28293d
 MISC metadata.xml 321 BLAKE2B 4513b4f120d44149f4419f74664e9f345f365c4f6f3938f9c751021ce00a2bee3c1f655b2c47113eded5f743dbc8c8968f7e3fba76ff71189e4026777700724a SHA512 a2bd9cbe2b311f26fa6bb62aa783fa8577f0e07d6e284370c787386e08b6aaf98d4f5bf655f69283d864b0e7a7fe847c75142ac67ff12dd93596f9ddddcbb065
diff --git a/dev-libs/fstrm/fstrm-0.6.1.ebuild b/dev-libs/fstrm/fstrm-0.6.1.ebuild
index cc4ed85f22b2..310b233a8521 100644
--- a/dev-libs/fstrm/fstrm-0.6.1.ebuild
+++ b/dev-libs/fstrm/fstrm-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/farsightsec/fstrm/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="utils"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index c86f264706f5..0b1cd1f350ef 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,4 +1,7 @@
 AUX imath-3.0.5-0001-changes-needed-for-proper-slotting.patch 7130 BLAKE2B a041a7ce654c32443457b34d9c2c4d0d919b9fe373971675ec265218dff7f8a2b470a44e7af44d27cb4d8c8c4b8f3e405b4b9762e7f8cfa8ad84db9c37f4baf0 SHA512 6407eaf9041105da66bfd70fa6e8b99813f938636dfda10b29aa078c445244b0f188f097bd4540ab3e1f1113faff6e1e7531df5ebbba28b7ab511ebbdae297a4
+AUX imath-3.1.1-0001-changes-needed-for-proper-slotting.patch 7206 BLAKE2B b812c30370a0022824fe8d251e26ce63abc0ba3f970059336cd8402f899ecae456982e4a3cda0e152323005d5eba3adaeee47bbacf78084ae3dbafa5bd0a89f2 SHA512 5df522b31043cbfcaa21c5fca4e4d6866f3ed93530fd0beba81d2c6c684003cf3214e3e011816996e76e177cdb60d1aec584c454664362e6079f1efaf9e857d7
 DIST imath-3.0.5.tar.gz 528503 BLAKE2B c1fcb199a81aff25f1ad26ccfcef2802861401f3fee5dc24035216aa16fd9a5344ec6c37139a0850f1a4bc580dc1fdd068eca9473a19e4aaf329cfc5f53a4cd6 SHA512 df206315d822266cf32a5a4399abff7ad1dd0bd1f0372d61f61516e2acdefd13e3cfd9cf54373a3fb49bb28c9f80915ca5ecaec2a068a1d6ea231d71a5316da2
-EBUILD imath-3.0.5-r1.ebuild 2301 BLAKE2B 023e854d537e7599838e99aa99029fa5b354357d1f0caec38222d5ecf9efd03c902a0ce691b7d272f86de891e662ae8c6bbab4a9200fe19fe257f8811fffea34 SHA512 6e0b39b9136296d85802af6a76d0e63fcec7fd0b3ba3e21c0be231d24dfbde7fc81e0563bc73eb7732c5b38e410c804bda2a0434a936b87d5ff70f872986d7c1
+DIST imath-3.1.1.tar.gz 568231 BLAKE2B a1210b5f6ff4723a133d317c2b40338e387973a1409868a218192a53778b86a0912c77911bdf76286a6ed6931175aec38bf24ddc0c76eed3375b7a2945dba124 SHA512 b2f4cc21e44094ef139a1f04bb997c7e41770ff886457fff00d65ca477ba579c86fd5fbd465998c4519855fcb34328ac834d84d0d011f758f56a20ef79e9ca3d
+EBUILD imath-3.0.5-r1.ebuild 2307 BLAKE2B ea32f43a16047b17499fdbee21978bd3ad824bdc0fa543e31f0ac63b8694f084968fe19e746a2f0d40d92b82fb2501b3342d90cfa7587e33cb775af6814e1a52 SHA512 8bf1d5a7047b62bc5036b38e1d4ae5c5ccd41ac15c6f28de89cec79a5db30ba199e50406075772aa5b74c47ca4e25bf1caccd989b89817930c512aa550dd1eb8
+EBUILD imath-3.1.1.ebuild 2246 BLAKE2B 952a2801dcad6d79c53bb5375f391e9f4e0827b1f0b9c2837a13e77df08baaeb101ed8532ec30012ae2fa05d71f75ff18a9a5e239a148358e19225058a444a2d SHA512 eb9ac6c21b0c8ce528644999da28e0beb6653b860c160961def13f933c7e0af9f3b1439b8224b916851815a6767b0b8ee2fb063a0baf41666f26328c24175e66
 MISC metadata.xml 819 BLAKE2B 20d1b4527861c2c01c4e6b9f413f539b6119934932ec3c8d1a7a272f52a9579832f230279de518fee775e104c6f2f149479b6dc774567e28b612676b0ce6f399 SHA512 06d1832ce88a1a1c83ddd09687a242fb109c43e3d38d4d3d8cd236308d11a649a9f060c7fd7af7c69a209b560cf1e541e18212ce62309357186183d749304031
diff --git a/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch b/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch
new file mode 100644
index 000000000000..baa6a84bfb83
--- /dev/null
+++ b/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch
@@ -0,0 +1,162 @@
+From 19073a8ed52dbc02b64be4cb55a6203dbf36707e Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 24 Jul 2021 22:28:34 +0200
+Subject: [PATCH] changes needed for proper slotting
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ config/CMakeLists.txt                  | 6 +++---
+ config/Imath.pc.in                     | 4 ++--
+ config/LibraryDefine.cmake             | 8 ++++----
+ src/python/PyImath.pc.in               | 4 ++--
+ src/python/PyImathNumpy/CMakeLists.txt | 2 +-
+ src/python/config/CMakeLists.txt       | 4 ++--
+ src/python/config/ModuleDefine.cmake   | 6 +++---
+ 7 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
+index d51c25b..63cc98d 100644
+--- a/config/CMakeLists.txt
++++ b/config/CMakeLists.txt
+@@ -60,7 +60,7 @@ include(CMakePackageConfigHelpers)
+ 
+ configure_package_config_file(ImathConfig.cmake.in
+   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+-  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+ )
+ 
+ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+@@ -70,11 +70,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+ )
+ 
+ install(EXPORT ${PROJECT_NAME}
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+   FILE ${PROJECT_NAME}Targets.cmake
+   NAMESPACE ${PROJECT_NAME}::
+   EXPORT_LINK_INTERFACE_LIBRARIES
+diff --git a/config/Imath.pc.in b/config/Imath.pc.in
+index df11cfd..6eb4f40 100644
+--- a/config/Imath.pc.in
++++ b/config/Imath.pc.in
+@@ -5,7 +5,7 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
+ includedir=@includedir@
+ libsuffix=@LIB_SUFFIX_DASH@
+ Name: Imath
+@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@
+ Requires:
+ Conflicts:
+ Libs: -L${libdir} -lImath${libsuffix}
+-Cflags: -I${includedir} -I${includedir}/Imath
++Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
+diff --git a/config/LibraryDefine.cmake b/config/LibraryDefine.cmake
+index 4868954..60b6532 100644
+--- a/config/LibraryDefine.cmake
++++ b/config/LibraryDefine.cmake
+@@ -87,8 +87,8 @@ function(IMATH_DEFINE_LIBRARY libname)
+   install(TARGETS ${libname}
+     EXPORT ${PROJECT_NAME}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
+     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+     PUBLIC_HEADER
+       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}
+@@ -101,8 +101,8 @@ function(IMATH_DEFINE_LIBRARY libname)
+       install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+       install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_BINDIR}/${baselibname} -> ${verlibname}\")")
+     else()
+-      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+-      install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${baselibname} -> ${verlibname}\")")
++      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
++      install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}/${baselibname} -> ${verlibname}\")")
+     endif()
+     set(verlibname)
+     set(baselibname)
+diff --git a/src/python/PyImath.pc.in b/src/python/PyImath.pc.in
+index 8e8de6f..1902660 100644
+--- a/src/python/PyImath.pc.in
++++ b/src/python/PyImath.pc.in
+@@ -5,7 +5,7 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
+ includedir=@includedir@
+ libsuffix=@LIB_SUFFIX_DASH@
+ 
+@@ -13,4 +13,4 @@ Name: PyImath
+ Description: Python bindings for the Imath libraries
+ Version: @IMATH_VERSION@
+ Libs: -L${libdir} -lImath${libsuffix} -lPyImath@PYIMATH_LIB_PYTHONVER_ROOT@@Python_VERSION_MAJOR@_@Python_VERSION_MINOR@${libsuffix}
+-Cflags: -I${includedir} -I${includedir}/Imath
++Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
+diff --git a/src/python/PyImathNumpy/CMakeLists.txt b/src/python/PyImathNumpy/CMakeLists.txt
+index 7b4f6b2..8f7fd70 100644
+--- a/src/python/PyImathNumpy/CMakeLists.txt
++++ b/src/python/PyImathNumpy/CMakeLists.txt
+@@ -48,5 +48,5 @@ if(TARGET Python3::Python AND
+     LIBRARY_OUTPUT_NAME "imathnumpy"
+     DEBUG_POSTFIX ""
+   )
+-  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
++  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
+ endif()
+diff --git a/src/python/config/CMakeLists.txt b/src/python/config/CMakeLists.txt
+index 4f796df..15d7026 100644
+--- a/src/python/config/CMakeLists.txt
++++ b/src/python/config/CMakeLists.txt
+@@ -41,10 +41,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+   COMPATIBILITY SameMajorVersion
+ )
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+ )
+ install(EXPORT ${PROJECT_NAME}
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+   FILE ${PROJECT_NAME}Config.cmake
+   NAMESPACE ${PROJECT_NAME}::
+   EXPORT_LINK_INTERFACE_LIBRARIES
+diff --git a/src/python/config/ModuleDefine.cmake b/src/python/config/ModuleDefine.cmake
+index 7e30614..40d9032 100644
+--- a/src/python/config/ModuleDefine.cmake
++++ b/src/python/config/ModuleDefine.cmake
+@@ -54,8 +54,8 @@ function(PYIMATH_ADD_LIBRARY_PRIV libname)
+   install(TARGETS ${libname}
+     EXPORT ${PROJECT_NAME}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
+   )
+ endfunction()
+ 
+@@ -154,7 +154,7 @@ function(PYIMATH_DEFINE_MODULE modname)
+         LIBRARY_OUTPUT_NAME "${modname}"
+         DEBUG_POSTFIX ""
+       )
+-      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
++      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
+     endif()
+   endif()
+ endfunction()
+-- 
+2.32.0
+
diff --git a/dev-libs/imath/imath-3.0.5-r1.ebuild b/dev-libs/imath/imath-3.0.5-r1.ebuild
index a1bd6fa5cf4c..f2fc31012332 100644
--- a/dev-libs/imath/imath-3.0.5-r1.ebuild
+++ b/dev-libs/imath/imath-3.0.5-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://imath.readthedocs.io"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 # re-keywording needed for (according to ilmbase keywords):
 # ~arm ~arm64 ~mips ~x64-macos ~x86-solaris
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
diff --git a/dev-libs/imath/imath-3.1.1.ebuild b/dev-libs/imath/imath-3.1.1.ebuild
new file mode 100644
index 000000000000..3ebea9d135f5
--- /dev/null
+++ b/dev-libs/imath/imath-3.1.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+MY_PN="${PN^}"
+
+DESCRIPTION="Imath basic math package"
+HOMEPAGE="https://imath.readthedocs.io"
+SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+# re-keywording needed for (according to ilmbase keywords):
+# ~mips ~x64-macos ~x86-solaris
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="3/29"
+IUSE="doc large-stack python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# blocker due to file collision #803347
+RDEPEND="
+	!dev-libs/imath:0
+	sys-libs/zlib
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_USEDEP}]') )
+	python? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch )
+DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local majorver=$(ver_cut 1)
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DIMATH_HALF_USE_LOOKUP_TABLE=ON
+		-DIMATH_INSTALL_PKG_CONFIG=ON
+		-DIMATH_OUTPUT_SUBDIR="${MY_PN}-${majorver}"
+		-DIMATH_USE_CLANG_TIDY=OFF
+		-DIMATH_USE_NOEXCEPT=ON
+	)
+	if use python; then
+		mycmakeargs+=(
+			# temp. disable for finding libboost_python310, #803032
+			#-DBoost_NO_BOOST_CMAKE=OFF
+			-DPYTHON=ON
+			-DPython3_EXECUTABLE="${PYTHON}"
+			-DPython3_INCLUDE_DIR=$(python_get_includedir)
+			-DPython3_LIBRARY=$(python_get_library_path)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		pushd "${S}"/docs 2>/dev/null || die
+		doxygen || die
+		emake html
+		popd 2>/dev/null || die
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${S}/docs/_build/html/." )
+	cmake_src_install
+}
diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest
index c307d324bf7f..a57e921c7aef 100644
--- a/dev-libs/kosmindoormap/Manifest
+++ b/dev-libs/kosmindoormap/Manifest
@@ -1,3 +1,3 @@
 DIST kosmindoormap-21.04.3.tar.xz 337008 BLAKE2B d1bf349a5b4362fe3cca6a9003ccdf17eb9425e1e2525f3bda39c962658fb9265f7f9f5206c6caec7f26fbdd876f4c9b06ab5662fd2061d1059a51ab089ddcee SHA512 08dc32bd07cc6653f2f12dc3060b102d5c94505f6ff539cdbcd0ed1972a7bec774df55d74f2831b1e6c537167a15a241c0875c6abd73c626718908a3d9f21a2d
-EBUILD kosmindoormap-21.04.3.ebuild 940 BLAKE2B 548d94aefcd80da2b3813e3687874926b9a0f1fb2c9832ac6f29fe0595acbf3c234114195dd197f6bcfc21654e33134ad94ac32cbbf749f56d2d3074f59a5af2 SHA512 6a6074d104464cab2495251346f38eedbd8874ac3de3b578d85dafb59544cbcb08b312fdc641025e3ef2f82a73d870b5f468ff0c716dafbf83ca73ad19d3c59e
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD kosmindoormap-21.04.3-r1.ebuild 1063 BLAKE2B a4c288867a7579d9d9e213e349e99b0acc8700d5a84e22a0e81df4d026a602d03e3996b613be61473b0746a92dfb0c05507a7baa75316a0994c21b419e0591b3 SHA512 b5c65cb9c9dfcca952a73dc834d386f35bc719fae90020a7e38664670cfa6b17918ea5f1f5a269dd3af3fb30a25dc8141ab90c00af5a0d3283cd236c75cfb48b
+MISC metadata.xml 367 BLAKE2B c6573793a6237453bb476a88ff495f54403abd6d20a3df716c197109564e7ba9faaee6639ad8ab2234b90b7bfaf49d3bfc17d0da7654389eaab42cbbccee9b2c SHA512 76174042a2535e2bd49a13007d983b586b959051eea778823bb721dc1b464d4e579b7f62ebd741550318217bdc44cb3dfea25d71354c39b6049df73113b9642f
diff --git a/dev-libs/kosmindoormap/kosmindoormap-21.04.3-r1.ebuild b/dev-libs/kosmindoormap/kosmindoormap-21.04.3-r1.ebuild
new file mode 100644
index 000000000000..13fc1092d88c
--- /dev/null
+++ b/dev-libs/kosmindoormap/kosmindoormap-21.04.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KDE_GEAR="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.80.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
+HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="+openinghours"
+
+COMMON_DEPEND="
+	>=dev-libs/kpublictransport-${PVCUT}:5
+	dev-libs/protobuf:=
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	sys-libs/zlib
+	openinghours? ( >=dev-libs/kopeninghours-${PVCUT}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
+		$(cmake_use_find_package openinghours KOpeningHours)
+	)
+	ecm_src_configure
+}
diff --git a/dev-libs/kosmindoormap/kosmindoormap-21.04.3.ebuild b/dev-libs/kosmindoormap/kosmindoormap-21.04.3.ebuild
deleted file mode 100644
index a16f08aee91b..000000000000
--- a/dev-libs/kosmindoormap/kosmindoormap-21.04.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_GEAR="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/kpublictransport-${PVCUT}:5
-	dev-libs/protobuf:=
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	sys-libs/zlib
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it
-	)
-	ecm_src_configure
-}
diff --git a/dev-libs/kosmindoormap/metadata.xml b/dev-libs/kosmindoormap/metadata.xml
index 2fdbf33d963d..b76209edbed4 100644
--- a/dev-libs/kosmindoormap/metadata.xml
+++ b/dev-libs/kosmindoormap/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="openinghours">Enable support for highlighting currently open amenities/shops/etc.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index 49520587fa9f..278d62964c74 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -4,5 +4,5 @@ DIST kpathsea-texmf.d-11.tar.xz 12616 BLAKE2B f64dcaae859d6c95d534907f6951942897
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
 DIST tl-kpathsea-2021.tar.xz 32308 BLAKE2B 83052cefc5699d46ce104e4379d39eee8e86b514d25245a6104fc9940accf131790ae144ca11dbd3b99a31a06017495bb5a53afb1e49da71a2c9eec008200653 SHA512 398358b84ecb81fece969fbd3521b093f7e791feec828c218e6371c26d57956491328999517a65711d45dfb04c83fd643ef0fad6a0153590866eddf485d5c575
 DIST tl-kpathsea.doc-2021.tar.xz 1066608 BLAKE2B 798ccf9953e4fa2037f81b56dfa30cf99c56c17e2942d5a0f2041b871958284f05150e5d7631b542896190f178327f009130e6bb07f60e8173ec1e9f12c4cda9 SHA512 8ecccee7ad99220f91139dcd9c2ce0bd19eb0e2fe74f0a965f68e59a28bd3de454624d6e014ef2a5c481a537acb95b08a9546a79abd8df429300043ecf973545
-EBUILD kpathsea-6.3.3_p20210325.ebuild 3317 BLAKE2B addcbb537c136fd153fa0ea9f65806faa4e1ccc5afb2adad8d9f1276f629e436d3560663326b9957fb42630068c4cfcfa1b1d8c33579985ef308d209bb4a2854 SHA512 b826a5d2c10b5fe9ec947a7d936614062f5a65d3952b5ec58dd0d8036ac8246b64bccfd396dc4b98f0989a1de13f074bb1a20dafdf05ded539b3ece363f52154
+EBUILD kpathsea-6.3.3_p20210325.ebuild 3303 BLAKE2B 315d8a7a66c5b0a2489bc62797621a84dd7970f47198d86d47e3cef74cfca201d2521bc11dc68cf5ef501c6b940160e5a8874c8ec40ab67ba88db3da56f1e0ed SHA512 27d40f28bfd25feb1f8b67d4c44c3bb63ac637866a8999a57e1e17d0f6b55fd86c219588b21774a5086dca8f2529fd02c33409b254ba204c384c139dbee4f270
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
index 82053a77e2e6..8c4a6a6153cb 100644
--- a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
@@ -97,7 +97,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	tmpfiles_process "${FILESDIR}"/kpathsea.conf
+	tmpfiles_process kpathsea.conf
 	etexmf-update
 }
 
diff --git a/dev-libs/libconfig/Manifest b/dev-libs/libconfig/Manifest
index 39214b8d3eac..d9ebdd0cbeb1 100644
--- a/dev-libs/libconfig/Manifest
+++ b/dev-libs/libconfig/Manifest
@@ -1,5 +1,5 @@
 DIST libconfig-1.7.2.tar.gz 3017891 BLAKE2B 1b8bc54857feff506d5cd62312a35f0f8a123380567881bdb8241f2232c5281399e4283687a3254b8f43a92b8f7d5ff3f72ec4fd875bf1b9d5d6c7703014cc3c SHA512 9df57355c2d08381b4a0a6366f0db3633fbe8f73c2bb8c370c040b0bae96ce89ee4ac6c17a5a247fed855d890fa383e5b70cb5573fc9cfc62194d5b94e161cee
 DIST libconfig-1.7.3.tar.gz 3026416 BLAKE2B 94301be4d6e472fc9daeac7a04074855737ddda94bb5748cd0087fafe192cf674ea1c020808ebf855372188b6b27a57ed185323fa26988bb1fccde0566617cba SHA512 3749bf9eb29bab0f6b14f4fc759f0c419ed27a843842aaabed1ec1fbe0faa8c93322ff875ca1291d69cb28a39ece86d512aec42c2140d566c38c56dc616734f4
 EBUILD libconfig-1.7.2.ebuild 1048 BLAKE2B 5418b1b083ccee6a1669e5495ab1dcc200054b0e899603e55748842cfef1020b040284e7439e46f44056e7ca03ada1dc1264875328d74fdeaa864624daf5cca4 SHA512 c4826d32f5b89f4f59341cf63bcffad92f7ab5fe470f0ee7d19f7b6f136e158638ba3638e4e2f608c471ede9e0e975071f2c9d09e508d00ded606830f742c1ec
-EBUILD libconfig-1.7.3.ebuild 1052 BLAKE2B 939121f32cb48aae0e2f0f9d8654eda64b95dccfda1b0537c01c1fb7a6fec7a82a56c7ab33334062de1b8f6366b0d65c57c7a9b5f44b8f64e13dabc4d9d84ec6 SHA512 a8d792ba5252fbed97f9e5d20e661b44aab990e5e5a06128dafc6eebd04be36ea7ffae2393eea5b4ee8a943f577c2586934ab67f54ba12374476c07a840787eb
+EBUILD libconfig-1.7.3.ebuild 1048 BLAKE2B 5418b1b083ccee6a1669e5495ab1dcc200054b0e899603e55748842cfef1020b040284e7439e46f44056e7ca03ada1dc1264875328d74fdeaa864624daf5cca4 SHA512 c4826d32f5b89f4f59341cf63bcffad92f7ab5fe470f0ee7d19f7b6f136e158638ba3638e4e2f608c471ede9e0e975071f2c9d09e508d00ded606830f742c1ec
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libconfig/libconfig-1.7.3.ebuild b/dev-libs/libconfig/libconfig-1.7.3.ebuild
index a8f84e82f152..6e8adc1e93eb 100644
--- a/dev-libs/libconfig/libconfig-1.7.3.ebuild
+++ b/dev-libs/libconfig/libconfig-1.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hyperrealm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~x86-linux"
 IUSE="+cxx static-libs"
 
 DEPEND="
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 33f87299deb2..cc6bec1ee0a5 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -8,6 +8,6 @@ AUX libffi-3.3-ppc-vector-offset.patch 1425 BLAKE2B 334ed26ea082c603cfbf43d37e9c
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
 DIST libffi-3.4.2.tar.gz 1351355 BLAKE2B a8137bc895b819f949fd7705e405be627219c6d1fdef280253330f7407d4a548bb057d7bb0e9225d1767d42f9bf5f0ab3c455db1c3470d7cc876bb7b7d55d308 SHA512 31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1
-EBUILD libffi-3.3-r2.ebuild 2531 BLAKE2B 3641ea628b4739fc65860b02df30e911c03967fbdc9c29c0d3fae1af5e8ff80d2f47cbf4b316b7276695e3acfaaa7a61008e7970d17e714290437adac88dca0c SHA512 4bd62e770641663af4ffeb65a419015e83eb03ca7b5932102204de39cbf26ba15d3f7a64ca9de5270e9adf2ec2d97b172b215671f069739bd8c51249e631e2c2
-EBUILD libffi-3.4.2.ebuild 2228 BLAKE2B 31b9f428e2b026e56f0ccb8325a627fe04bf61635d1f6f4e1b7a5fbaa4d837783c5a086173c5d3359de1883db2bd34a695eec82e6a3fee61f931520f721b0339 SHA512 7040febd29aab4b8985a603de05a3908bb8abbec84e5126d7f1502f78c326dc422d04b32f65f0087a7ef63cf36de808a2b80b552995c7733d481e3137389bb26
-MISC metadata.xml 2136 BLAKE2B 355a8dd1a5ed19eeb00ebd0f3f1229253de575ebbbc6ce57d80b8b6d7b21e1baf53730a7914eb88c6fdeebb64cb1f4bf152b6843076aba85379a95c128b70155 SHA512 8ae782827907c40c8e975d5bf98fa3fc26ab53576edd3a1e9340570dc0bf1c7c715eebb1d4cfc3f82340f5cbab41490fcb58e69d92bd67bdd55d24958a97926e
+EBUILD libffi-3.3-r2.ebuild 2301 BLAKE2B 51983b388ddc5930ab59b82d1d4e7a5ce5c15cdffc09c3237d81453aa7f9fc59cfea9e23cf6e5b365719c3ce58d17eabb892331e918e7370fd9fe0d1bda8ebfd SHA512 8cd544d41c6d124c82c3c3188d6bef3b9230ab97150580f99944ab82067189ad71b32b7abca866fb048bc74d759a4c903da05141ac3af3f14165d5ea27382b90
+EBUILD libffi-3.4.2.ebuild 1998 BLAKE2B f80ecc2cd7f4440147fa9fc59a92d0f32d1a0b288bf5b24d89e7d14ca0c30afc5d66c65b0229f57c3f724a5e6e65614d6d135f989ebd5e3f0073a3077c0d70cd SHA512 86b409fdf330274210f5884e79d0aac309c59439ecd4ec80d3ed0512c9d0522418fd90d817b5658a953bbf8bd2228f8aed57af7741863193cb873a29433523e0
+MISC metadata.xml 2056 BLAKE2B bf10ba9f71fc556022c9c7fbbaa058602bcc51280b2d5faede5b65f0bd76931098458a84d95bb22e3c57a76b8c40ef6dd14841ca8c80804884b7dfee3e0d21e2 SHA512 e1ea336d07f6a934d35874797c8a2a951b0b120cf3d3e96396cd08348cfddd718e759d6614c4e85f09d6693d04024e0ca37d912be62758fd61ce0d401a0b6b12
diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
index 40e5b2deafa4..95c001856050 100644
--- a/dev-libs/libffi/libffi-3.3-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -14,12 +14,9 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 LICENSE="MIT"
 SLOT="0/7" # SONAME=libffi.so.7
 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"
-IUSE="debug pax-kernel pax_kernel static-libs test"
+IUSE="debug pax-kernel static-libs test"
 
 RESTRICT="!test? ( test )"
-# If you are USE=pax_kernel user you really want USE=pax-kernel as well.
-# That's a flag rename: https://archives.gentoo.org/gentoo-dev/message/273f5ec9ebc8075f6ee8d8cdda9e759e
-REQUIRED_USE="pax_kernel? ( pax-kernel )"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/libffi/libffi-3.4.2.ebuild b/dev-libs/libffi/libffi-3.4.2.ebuild
index ea7ec8362d07..71baf938aacb 100644
--- a/dev-libs/libffi/libffi-3.4.2.ebuild
+++ b/dev-libs/libffi/libffi-3.4.2.ebuild
@@ -14,12 +14,9 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 LICENSE="MIT"
 SLOT="0/8" # SONAME=libffi.so.8
 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"
-IUSE="debug exec-static-trampoline pax-kernel pax_kernel static-libs test"
+IUSE="debug exec-static-trampoline pax-kernel static-libs test"
 
 RESTRICT="!test? ( test )"
-# If you are USE=pax_kernel user you really want USE=pax-kernel as well.
-# That's a flag rename: https://archives.gentoo.org/gentoo-dev/message/273f5ec9ebc8075f6ee8d8cdda9e759e
-REQUIRED_USE="pax_kernel? ( pax-kernel )"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index 1846097c8bc2..a61504558736 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -36,7 +36,6 @@
 	<use>
 		<flag name="exec-static-trampoline">Don't rely on dynamic code generation for trampolines.</flag>
 		<flag name="pax-kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
-		<flag name="pax_kernel">DEPRECATED alias for 'pax-kernel'. Do not use.</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>
diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest
index 899906e7ede5..4c293acf37b7 100644
--- a/dev-libs/libgnt/Manifest
+++ b/dev-libs/libgnt/Manifest
@@ -2,6 +2,8 @@ AUX libgnt-2.14.0-optional_docs.patch 369 BLAKE2B 445d0c6a1632c3368f72777919ba20
 AUX libgnt-2.14.0-tinfo.patch 567 BLAKE2B 7d9b1c0b520a3f2c3d74d6659a503f554c5b7805f3e5f659bb6e0e58475f74633563d44f6667df64048bdb33437e176cf80a547b33e1939565938752e87325ac SHA512 56ce8dab03e74714ecfe0cb7dd274c5fce996d84793fff5e247ee329b1c5bebf2d933b96cc6fe916dafb4f402269d3b1b8cacda07deff4c149869d509ee5c416
 DIST libgnt-2.14.0.tar.xz 102444 BLAKE2B 303dc33e60571ba4b5b9cc8ce477807b9b2ed6b4d1ed14e40c43e146a6d3d156741597befdf3e6c0c6816e9d43955f57f9e1b61e3f1f2d2fc451bf53f7236022 SHA512 0d9c5550374696a0e6ede5246cda3c372d7055d21b9ffaf10be88d6a469bdf18c7dd1113ec612acf4889c0e5686ea87bb0e8348ca8985fd5ff8913afc5813b38
 DIST libgnt-2.14.1.tar.xz 106564 BLAKE2B 19eddef51b44fa82982c705415fee43bf7495bc4692a7371fea782bcc21acdb932f15e1e8de6af962a529eea59f54c0b116d96b87ed3616201e6370760fac5b8 SHA512 434fff31a0946dabeaadbabaf96b4a7cf7f2a7da6d7794b7cf8a75f3f959388d89b32ce5921a20d5d6532ac2fd851ec2f6c18cc7cbc5a0ae97a00ff1ee3f74c3
+DIST libgnt-2.14.2.tar.xz 106128 BLAKE2B d3db0ba3a297c14f32cc49b4e5b3392f47031e9406d862520a2f014f4d4e93c13e2ba5a2d61df81637f9dd7961d64ba69b393ee5b3cfebd7eb2768e3f16f29d0 SHA512 17b39e132b44b23486d7d39fa02761997a28abf53f67bf71bbad86d35124e5deb0363d670b2fb5ac99d47256282b0ef6ad1886e12984c868bb0d13ea7ba7d860
 EBUILD libgnt-2.14.0.ebuild 772 BLAKE2B a116663fc807313145fd230ea8ac48929d3ba4b51d637a8b04df095125dec039860957f40c9c20c9b434a38165d318007941b0d57dabc2bc14c2f5d274692b2d SHA512 50da75b92165b5fa72284f7757dc676376b35ab1ad3b4f878809d8375ee16f01c3f3043c39571dc591e52de35c103514ebcde35f01025c22a20ec58cce5ae098
-EBUILD libgnt-2.14.1.ebuild 779 BLAKE2B 1bb147612f6aa0a8bf813c5d11f18a3b143fb69a6fc457ddd8ebc06f877312ad02c6c9be503acc4a667c8e742e481fb449fe66c94fdf42422d345555254d4d3e SHA512 77e5cc120fe12eeb1c1b083cb979db55e0c129696c3d853fb6622edf45a7d653249f376b48056b5dd8953dc92ad6d899052bf6d4f7690e8701d4062604aad475
+EBUILD libgnt-2.14.1.ebuild 774 BLAKE2B d5a53c32b3e0b8c3402b8253482252893fb4faf112d7165752d5c0b3ed5dd936b44087e28dad890ca73e6a3e0dfd0504d75607e000214d7391f4f44e2774207a SHA512 6b18fd90f4d22a5c9962cdeafdac50a70b17be73e2d2f9f7eb8ddd119a6e294b4592f983c102c936420312b5dfa1cce14c5707a6dabd1f3b6e6571f20da26f43
+EBUILD libgnt-2.14.2.ebuild 779 BLAKE2B 1bb147612f6aa0a8bf813c5d11f18a3b143fb69a6fc457ddd8ebc06f877312ad02c6c9be503acc4a667c8e742e481fb449fe66c94fdf42422d345555254d4d3e SHA512 77e5cc120fe12eeb1c1b083cb979db55e0c129696c3d853fb6622edf45a7d653249f376b48056b5dd8953dc92ad6d899052bf6d4f7690e8701d4062604aad475
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/libgnt/libgnt-2.14.1.ebuild b/dev-libs/libgnt/libgnt-2.14.1.ebuild
index 17681c49a78e..b337db668ecd 100644
--- a/dev-libs/libgnt/libgnt-2.14.1.ebuild
+++ b/dev-libs/libgnt/libgnt-2.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-libs/libgnt/libgnt-2.14.2.ebuild b/dev-libs/libgnt/libgnt-2.14.2.ebuild
new file mode 100644
index 000000000000..17681c49a78e
--- /dev/null
+++ b/dev-libs/libgnt/libgnt-2.14.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Pidgin's GLib Ncurses Toolkit"
+HOMEPAGE="https://keep.imfreedom.org/libgnt/libgnt"
+SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	!<net-im/pidgin-2.14.0
+	dev-libs/glib:2
+	dev-libs/libxml2
+	sys-libs/ncurses:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.14.0-optional_docs.patch"
+	"${FILESDIR}/${PN}-2.14.0-tinfo.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 105559ad5f02..497d4829f28e 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,5 +1,6 @@
 DIST libgudev-234.tar.xz 273244 BLAKE2B c0556988e37d5a5c48ba906b121d3c7a16c6a8ee4d05eb0e51913b9cde51bdc10966dcf8ceeccf62021dd8e47b004c85ed3412942d9d2bd5176d604931745f50 SHA512 cb01906d532b05cf8f69acdf80a8f05fbd4863fd98e88928b491e3657e60844f7ae6ca903ddd773fbea37268ff85d12719de47fd92a2f18b98fa2dbfe85e8151
 DIST libgudev-236.tar.xz 28428 BLAKE2B cee5098f851183131db88812c8a985a3617fec7a2257f3c05ae0f06e423f15efa89801ef0c75cbb6e5ea9fb7a9db3c4d9215a3689e5d1ddb4832ef17442753cf SHA512 b00c30a7d57de8cca92a22f4c4da878c7cce448b1177858cc9ee0b99c5bc4fd0fbd01d8f4f9a9b9ef073af8f51c26533f2e7896c01ed9fed0a2bcfa6b2cfcbc2
 EBUILD libgudev-234.ebuild 1088 BLAKE2B fe5aab5e9c54d398446439680fbe90c11e1d8a4372effb36351b7b756c770591ac2c7526fe1007fb885dd461e761590c02d6c2ee9742ce1defd980d2ae88d3b2 SHA512 4e471b21732297933f8b6e48b658135a5b13f05d866059d0585c6d1b064c9f4a817c4d1c6429900f3191fb98f8ed192405281784c64b907ae36a825881fc88d8
+EBUILD libgudev-236-r1.ebuild 1327 BLAKE2B cbb66fad3854d66a495a4a1cc8b6565b7b88735a72cdd19fd78fd73250927b9a3e9d7f116c92d78756833422afca265fa183b462137bc65091f674cd652ad226 SHA512 e30d261c3f7e345b251cb518478e9878c5d16059df37201d4dc3774a59d30ca1b7adf595d0f918b73d813bc7c29e2a39b5792218d0c3ac0146f724fada69b8d7
 EBUILD libgudev-236.ebuild 1163 BLAKE2B 0ebc090e946fa572c444ec9890155010d417d85027596bda006711dad0cd4afaee9e82bc9737106639ef5f601b1907efa64378538976a2ca58e9fd051ebaa723 SHA512 6830ecc3ef4f78536db37044dd54f8bfe28734fa5fe2f505a0860a52664a8bca87401a6d61e4fc090ee01c0fa36bf29eefd4bf5c2a2b82bbbf611c7cb9bb6778
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-236-r1.ebuild b/dev-libs/libgudev/libgudev-236-r1.ebuild
new file mode 100644
index 000000000000..fc553df4242b
--- /dev/null
+++ b/dev-libs/libgudev/libgudev-236-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2015-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson-multilib
+
+DESCRIPTION="GObject bindings for libudev"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
+SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86"
+IUSE="introspection static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs(-)?]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/umockdev[${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	# avoid multilib checksum mismatch
+	sed -i -e 's:@filename@:gudev/gudevenums.h:' gudev/gudevenumtypes.h.template || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_feature introspection)
+		-Dgtk_doc=false
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_feature test tests)
+		-Dvapi=disabled
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# libsandbox interferes somehow.
+	# There are no access violations, but tests fail.
+	# https://bugs.gentoo.org/805449
+	local -x SANDBOX_ON=0
+	meson-multilib_src_test
+}
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 2680b62528bf..b07630c81732 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -5,7 +5,7 @@ DIST libsodium-1.0.18_p20210421.tar.gz 1855069 BLAKE2B f9b5843998b0045f97a303589
 DIST libsodium-1.0.18_p20210421.tar.gz.minisig 311 BLAKE2B 12d00384a2acd9c9ac5cfc2ce984c2254a69be93f9cb891513c2f575fbc0cd2c03c2f323aa4b363f54fd7e1bf6b73887c0919e919142f759f0f7baa8680cdba5 SHA512 80fe3a5d41a5550b310e1fce86eed142288c70bab46c761a21206cd0c441b9355d455df49916b3eca134af60444307baa8c5566f1ea369e79f7326a6fac822bf
 DIST libsodium-1.0.18_p20210617.tar.gz 1854880 BLAKE2B 5b421c7efacca5b2a2b5a99a04719d708c217bc6f0b344f08d566bde85c4f758862c0ad61924346eac508542c2d9c6313cb1e3e421743e424f396dd1972e8195 SHA512 d7cd64101fed11ce33c4865dec253f1058acab376c3a6097422508087f4449b2f7fd1b38835915843106f620bf86694d846695e0c8a35f921e4f190dea3164bc
 DIST libsodium-1.0.18_p20210617.tar.gz.minisig 311 BLAKE2B c54b76a9e29f49bccca80466a5aaa77fb8341e8164041331003710de8f9b173fd25de4812157377645d97ba8a97470076a7f5e037501ba8376b285a06461efa9 SHA512 2180beb872716ad6b728a455981b548003b18594c3f28435c5ddc9803ab2a0f8f1945b6c77de5928b948bbb803b4fa7527cc2e72059931364343a2fdf51ca1be
-EBUILD libsodium-1.0.18.ebuild 1556 BLAKE2B f2f3c2e042a14f76b944219175597afb36440eb93ae5e0ddf155cc219ea7fc554ce97b7c727ba147c9532d6999fca04eb8c68cfa446bf709be4f3966ef724d48 SHA512 7a036b36d982e96af60b5635629ae4bec2dea216e30b69d792e1bbbaabd77177d5d5e51a9eb5ecf5730948006f1ed23bc3be253662f7678a9d77af59c4308d8a
-EBUILD libsodium-1.0.18_p20210421.ebuild 2612 BLAKE2B 2aa57578e12e149c2b86896393a9dc9039b5c47548ed962cd65381a2db6ff2ca98d0a616a151afa14d2593ac896cc30d91beabf2170ab5d8b289707289929a0e SHA512 4cd7dee80fd529ee70bd97be4ae6314518b0d4d84a1200817db92f6c74763b12e07477664a8f4d6b5fdb00fab9d97ff8fb0662c858989d181613ee2f48fe5f15
-EBUILD libsodium-1.0.18_p20210617.ebuild 2626 BLAKE2B 4078b3c1dab4ee4cb40a040c8897906ed0d459a44d26b6cc47da6f882aeb5c04892595f77fcf336de823fe997c6e4c195d498a4d6e690d0aaf509c93d8eea407 SHA512 981d9bc77d0ec83da73b068a8285af3bcfb28988c8ed01b4bcabdee30c82f709eff348a8d844af04933f2759a56350161efa422431c106daaeed36f1680044a6
+EBUILD libsodium-1.0.18.ebuild 1564 BLAKE2B e38d0a2158c560d894579950aeb7f1deca649cc4edc8c1a7ba492e43b0cbab2a9d210f5610c657d75ffcfc1e7dcfd474b3350a9e5371f335bf6a2c59330509d3 SHA512 8aecc81582b1e2776b53483ce37db0a5a98f46aa29de8c1421e861db69513fc0df89fd82ca0fb647b9463871e923044915177ed1d24832e03613ff58e5e63a12
+EBUILD libsodium-1.0.18_p20210421.ebuild 2620 BLAKE2B cfb32d50a4e9eb20e91971833a7541afbbc9e5dcde8f9b9da4a02053e89c5494ffec5560dd4a66571d44b4b697cb14cf883548652c8bf88efa5d1bfdf3912296 SHA512 107a9f9a0c8a5e43f4bde75c4bf7666466b459c90b8813dcb11cffd27bf9c6aafe9a8d27466f52b4dc36202f0148728c2a235624956abaaa2caa6c7cf2350485
+EBUILD libsodium-1.0.18_p20210617.ebuild 2634 BLAKE2B a6c0f85ddd94f3d3dfd89539ff99356a298faad8d734321ac42c74a9b2b09153ede7f292acad02177552de42fa2df41230ef344ca7c81e86159d5bf70dab1c62 SHA512 98aec462a23a3b8362ca0bb16423bac9d8f02209c26461db60818ec0c561200bd767743014ca84e2d99d813a94ebba941b40a1ef1e3f2c5fc16d0bdc54eb9f43
 MISC metadata.xml 864 BLAKE2B 5776de362d73fafaf378d83f7c050cefced1e3659f95c87cd31ab4791d24a416004d806e14abff108a7c235b750c854d20342560372a6125564655303e098cc6 SHA512 e5ec535a7fe1a299357b7886d197bcfb7fe358cc010c89d8d030cf9a8250b3e5108e945aff5fda56014648969af33d32216c22b864ee68e1632cf08006ca95d0
diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild
index 238c5c7e06f7..e7131e1f44ee 100644
--- a/dev-libs/libsodium/libsodium-1.0.18.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jedisct1.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/jedisct1.asc
 inherit autotools multilib-minimal verify-sig
 
 DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild
index 3d4e4edcb0ee..86dba664b6ae 100644
--- a/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18_p20210421.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == *_p* ]] ; then
 
 	S="${WORKDIR}/${PN}-stable"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jedisct1.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/jedisct1.asc
 	inherit verify-sig
 
 	SRC_URI="https://download.libsodium.org/${PN}/releases/${P}.tar.gz"
diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild
index 7344bf6a477b..39dd36dc9236 100644
--- a/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == *_p* ]] ; then
 
 	S="${WORKDIR}/${PN}-stable"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jedisct1.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/jedisct1.asc
 	inherit verify-sig
 
 	SRC_URI="https://download.libsodium.org/${PN}/releases/${P}.tar.gz"
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 8f3e3b46b561..ab390debe871 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -4,5 +4,5 @@ DIST libutf8proc-2.6.1.tar.gz 182903 BLAKE2B aa2545136e084a44b2e3470e9395c15327b
 DIST libutf8proc-EastAsianWidth-13.0.0-r1.xz 68808 BLAKE2B e8bac9804aa195ebed82ba51f164166976e4feb2f8c3699847738bb2a320f2a00eada1743bcbadc398dbf7998a47d6f4de5826e278eba86a198748eb59abb7e9 SHA512 f74345a9f509865705d55f18a0f258346ba261d8b9a59e5fc4de51b84ecad6d1fcc9afa0af312b09fb76bacdf5f597b0f2a965800a18c80f65a604a0bc64d3d2
 DIST libutf8proc-EastAsianWidth-13.0.0.xz 62040 BLAKE2B 1665047336ded524d0b0a0c6a88afe0d9041a82eda688451b9b2556bcf9eebe6d817119e9aa6e07c602b076e710ecfc73d0bf3487ec5dcb131cd56914e1e6354 SHA512 8f6670299d545cc323a226cb310915ab2600d4e372221814afa67a75c6963bc0a4473a6e28fc847c0ad9761466c6f80de7b1eb3ed04fa28703a20ab34bcee0f2
 EBUILD libutf8proc-2.5.0.ebuild 1304 BLAKE2B 72b5926b5a75057ccf8edf2f8137faeea319e7346b9785b2977ec1d7460e8f6b58e759b27cc80be449b0d4fa366953a1c48228bbf6b31d0615e658250326bd23 SHA512 209ad6a8d3360e90f8bfe02e94771dede789dd9d403f2917d6cc0c82cc0c01b4a59f415f8db072b92cf0b2d6cc501982d0a3659ececcf4acfe228dc654b2031a
-EBUILD libutf8proc-2.6.1.ebuild 1421 BLAKE2B 2181d7b0fb6e532bf5699d855c4c6d7035c352c3110a8498dc64e0655e28b577c8d5c8e7b4a5cc6c501685b80ae6255b40d7c491e585032287a6d177785859ad SHA512 dff03a28363082c6b2b1441ef4bfa6bb1f86b97aabd68d40378e4ced3cfd6dab87684e4f42bf23218829b71321d286f8b4278cbd5bb2ca24ad8861ffead572dd
+EBUILD libutf8proc-2.6.1.ebuild 1428 BLAKE2B a3b29c2bcc1142908dfd9e085d1977c441b5665508d5b5933e100d59a24a264d43bbad2f584c611d0c11cd0735533847eb4d408dc4f44b321ab982ef7d4e5c4e SHA512 ba39903d5e564f38ad129a6b8986c30fbacc3c1ea309822215016ee87289ebad14a08a2bc32181b0fd131033559fe09e914e3fd4a1e4de513d8b0d56b509e000
 MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
index aaaea94a9ffa..4790df370ef2 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="cjk static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index a35e5259d71d..1fc9e0bc8817 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -2,6 +2,6 @@ AUX libuv-1.41.0-darwin.patch 1747 BLAKE2B a5a2d3ac70468515e395f69c9a80748d6db26
 DIST libuv-1.41.0.tar.gz 1281268 BLAKE2B 6d6fef33953c4d03835adfdd66e9a44c61071440ceeea48d88bcf6593e2a35c7d0878369c87b38a92f66ead2ab0f799d4b7476ced3707ca7f41e39f93875bdc4 SHA512 bb08a1970a10e8d9571ffea3d021643de30ec212cd51317b98d6cf0cfe55d6877992921fb01d1188a6d466687335b77885685d924f8cb7200a0bec30eee05c65
 DIST libuv-1.41.1.tar.gz 1281506 BLAKE2B 4102df9559724c4f6bab090c57c8c976b7784bdc28243047c6c4cb2d61ce97deeb6f02e322238b98e9900575c981e8a586db852d5d34f0fd222a0091fc391a5b SHA512 dfd4996a2e8d6cc1ffe141921b2472070c8678cbbb8f0cf333dba7e7a36be0dee7fc3515152a27253252bbe48a9b29766d654f7f77137dd6f6bf0a8330c90fc4
 EBUILD libuv-1.41.0.ebuild 1358 BLAKE2B 9747dc11abcd8beecfb0c266b7ab6614d9b4e59da41dc26adb95099f7c586039bfcf4b962dd08bab5fc6d4a07011b83689cc8bb5825f39c8cad90e3f123a2d4b SHA512 470307b8d473833c187302907a74378e20123a16a382d801a4850d2b8adcaf610f019e6592b9766a304c807a12614a4d018d3da7b6b74ee746be8259ce046d29
-EBUILD libuv-1.41.1.ebuild 1364 BLAKE2B f407c753abc2f44324dd3003f85e468163d4d71eaea2893932af72c528c2d66eb45250d006f4adda56115c6f429bb33d5e5ae8d332ede72f479168c688676c11 SHA512 d6e2d67da8ef8bc96766cdf25c3aea0aeaee8dffd6489ea81256c5b85b65e4fbe42d9cf3025f43bfdbfd24f48dbce9972461962c22d65e85babb3ae0c054240e
+EBUILD libuv-1.41.1.ebuild 1362 BLAKE2B 941439c78dbc66b59ed7c77563fbf1d0764a5144125d174d9ff68c7ac03e56097c30e6c58c899bfc7aa4aa2fd02ffa7b0b1a1e0f6606af6f33109f9891169000 SHA512 d21e25a28a2fb27d50502293b75215cba30f2c098e3f0a9aa7f332b6641bdf9f407d7fee767c24b08e49056d246d519df4d5d9c92efee938b0d74b12cfab8b3a
 EBUILD libuv-9999.ebuild 1366 BLAKE2B 417a761a89412ec9010fe8f7e28c64dd9faaa8c5dda6c5b920d372eb3283665db7cba9b73976264dbe043f898ae5a90e35e508cc628bc32491d803d38e141555 SHA512 265ab2037600825d36c12df3a4ff6db43631c28c481116963d9c5ba6bce555e18572bf91ac7900d74c1fc70d201d93499055bf89c9c8912b49ae7dda318b9479
 MISC metadata.xml 1429 BLAKE2B 78cfbe0bb9f028975aaf6721f96efe4e79ac0e14563a32bffcc4ed5509928c76ea28d5b7513290cdaf062c9edfccd8f8f1ffd30922739176a1919303a60e222b SHA512 c429cbb18602a7681a1c2bea6af32e889e33d788c5cdd1f1f5a8b99a9c533c5603bd612bca76ec37bbdc1eeb9bcf5ffa47018f71aaadf66785a3da06667661b0
diff --git a/dev-libs/libuv/libuv-1.41.1.ebuild b/dev-libs/libuv/libuv-1.41.1.ebuild
index 9506890cc165..15969ea173f1 100644
--- a/dev-libs/libuv/libuv-1.41.1.ebuild
+++ b/dev-libs/libuv/libuv-1.41.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~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 ~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
 
 LICENSE="BSD BSD-2 ISC MIT"
diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
index b59a97f5ac68..1633487c2314 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1,4 +1,4 @@
 AUX libxls-1.4.0-asprintf.patch 190 BLAKE2B 36c39cce45025c5498fefae2de5f9fb78f377463b4a761ef1abe89d8194b90b798e03dfa82561bc7cecd505abbdd5412b75b05194991257c600e4bbb307167b1 SHA512 c5881d63742b50f923c74dcedb5d2149bb55ea19bc611ba51c879f9ae82b8f87d9ab477fae57ef40814bea42f27a27d3be272b1c9fbd5e6c04d69078c8e7c03d
 DIST libxls-1.6.2.tar.gz 443736 BLAKE2B 46f875613caa423dcb3acac0c38a68c7274993b25cc9be891266b8cf59e8eb0f17580e399305cf927854e090f34fa34f57f7fcbdceb75dffaf04c3362fa63095 SHA512 55e5cb33ec63484063d0893eee7352b89f993363762cd5ef42b5f918b09d1eafcf933fba076255267d9413c963481eb07c7054a2495d2d529db2e1d626353d22
 EBUILD libxls-1.6.2.ebuild 636 BLAKE2B f074728dad2854ba9c91618e05799d4614942c94c75f84dc7aba30614e52d1593337fabc31272cbbbbbda6b81a33c4a282a7e842a5d7c34175ff6cf64bf2c7cb SHA512 9cd01561afc1a257356676a801f0d0e390c7dd2da11ff8a74debf56efc8d0a179d8613555a776b8aebfe7b21336fc63a06bb4cea53534ecb05a394cfa9360bfd
-MISC metadata.xml 392 BLAKE2B 77f7b66d8024437b9a7b2b07bb78f451fccc5636629e284d053be66efa136982d026f28912c0a7b407059f8f5e33618ae15c83113f8bd380a168dcc1032f96bf SHA512 ccf08982c319c4e2c3fa94d1920f012207f35c75c445555312d20976612436d21bfa1cf93cf6014697a0210fd549146ea0f3eb73fbeee45d09d15952286fe3aa
+MISC metadata.xml 303 BLAKE2B 643d08f831e02e13e43a66442f8d921199696109e54c74e75a0818a5f68fe101ab7959f77269ba35358641147981111330381b452b8ce054a1b8129e22fd9935 SHA512 fbbc9ae6e76769c1bcf5b98a3f2177d11e74509cb5b7caefeb6abf9ab2c4e9b99aa3d3a8723f7b2c94ef2a50af8973ff6e0f4716628006da57f78fb03cb522ec
diff --git a/dev-libs/libxls/metadata.xml b/dev-libs/libxls/metadata.xml
index 81bdb807379e..747d9df8effa 100644
--- a/dev-libs/libxls/metadata.xml
+++ b/dev-libs/libxls/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slyfox@gentoo.org</email>
-    <name>Sergei Trofimovich</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">libxls</remote-id>
     <remote-id type="github">libxls/libxls</remote-id>
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 5cea0804428f..652fb084d251 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -17,8 +17,8 @@ DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e3
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.9.10-r5.ebuild 6644 BLAKE2B ce2df74f087c8f2c44ddfcc7ed98ac916e9441e425d08095dcea55c4cd28e3e8954ae8d700f2668fa942ffda0043d132027c64b736994425a63c5ccb30bfa9d6 SHA512 2219c61e1a9a9ece9e926e40cd924b6a3f8ba53660bee201b0123d439e31ab1190f8de985a1c9f78f56f8fc3d791cdb907a23fab54f0d823581c1e9273de4417
-EBUILD libxml2-2.9.12-r2.ebuild 6944 BLAKE2B 52a117d89831d0fb07eccc94bfba0e28444c5704cdbd476fe3cc8a0ac886f02ef63b0a7c8ff53ef371db422827c3527811b8f7709e60b40cb8aa548eedde9e41 SHA512 62b49df2388d217dcfa8a2e2c013869ffd4ea86569ebe6a6b7855f6c6c9d067606a03b8bb9f1147063ec9881560c8f5851cb925372d0140f9d4bd6b8e6da4021
-EBUILD libxml2-2.9.12-r3.ebuild 7098 BLAKE2B 610470493d1cbfb4094e1c8c2466fde0aeb9026b29c31d6f2790ca99c90361017a4e857b82e9340c6402554ca024383c08c165ebc8ab3aa54a368420a9bfeba0 SHA512 707f7efa06e4440be182a8ed3e16ace92c5869c272ebde85d14f9209fcf935375324ae0989b7a192b0dec57ca582696de4355c89aa7f8a3a75fefbadaa9b0805
-EBUILD libxml2-2.9.12-r4.ebuild 7293 BLAKE2B 2eee9e328543a0bcee103ccaae3035ea42795358c867c0db8beee383ca4b3b036c21d69217badcf1d1a75d83285e02ed6a16b4c3012f33ae1b11160dd9ea2a87 SHA512 a55bbed4a4de87318b83f1062338b70e5267945f07c7e4a902cb5153bde2cce9c4a9ae873b99c110e97f34b831d06fa6ec57992b83d8ad993a157c90ed9b7685
-EBUILD libxml2-2.9.12.ebuild 6677 BLAKE2B 935788b21c4c8908152c50266b36653455703a471b1a057bc165268620d26a1b3c42c0901032dd5b47c87ff6765423ca61007af28669850bf4b6adcdb6176a32 SHA512 c1ee354ea4eec2cb8820059059b08112194777f351d1ff281561cce2bd8ad26aa3fe05d5db3826c2f4f1d10ef5ae8037409ac65b02577ce81f88cad8f607dbb4
+EBUILD libxml2-2.9.12-r2.ebuild 6952 BLAKE2B 8b347eb9379ba04cb83489e650a92e4f804299e0ca192826883a439c96dfa9a937e03444d1989bc0bf91811138b1d12d2c2d3fc797392af622afcf00d2d299f1 SHA512 8eef89efee52671e92e097cf09355a11cabd85eccbbc85c82e06cf0ccc8d9f7dadcb47463edc9b63a0a4302caceb8751f8abff38ec8e2b461d190945669b7613
+EBUILD libxml2-2.9.12-r3.ebuild 7106 BLAKE2B 18daefbb398537eb56e4f7a206f3969864cb6546407c950f8a96d2ced4f83a8e773d8e19769f5dc4b7822b8e13883aa5c4804ecf93305eb9475bb42c9d467799 SHA512 1372a0ddc39a2c6bf5dd43e0ab4c69c7d7516e8fcd38273ab20cb2ef280cbcb98a11ab3c55f300cb2509e91b27b3daaad7b99bc9813d3523c738f0d0eeb6540a
+EBUILD libxml2-2.9.12-r4.ebuild 7301 BLAKE2B 261bad6fb77dc6bc635bdc3961baf0b70ee65818388d3f5e585986ee5d6cd6158aad3c7e08c0aff2a582753e2deaec6e2489b92f9d0db6c346d6ee61bc7f5d9e SHA512 92cafc498e821fbaa310f068d9b23926a6d099db07855311f3ec586103d80614726ca13d9e219ba490d6a5212e5d438f05aa4ccddbf28eae4b8bff48d8aeff04
+EBUILD libxml2-2.9.12.ebuild 6685 BLAKE2B 1d06e3c9b4223044015ef74bc3a5707fe6f243c5c59f72fb3f9b7caa10ce8f60e43a16a029a2cbdb66d1cfe45cc7efca562137e400c08781642e8cdfdb174292 SHA512 b63076ac9a54870e42094952061641883571d0c35938241b66f2f06fcbd2f72658e47f9d3d2c192a5cb1cc44f3e754cafa9998d3ae8816bffec15fb4533d548a
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild
index 3a36dc6102fe..c00357fd49fc 100644
--- a/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild
@@ -9,7 +9,7 @@ PATCHSET_VERSION="2.9.12-r2-patchset"
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/danielveillard.asc
 inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
index 824b111956af..7d87a16e154f 100644
--- a/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild
@@ -9,7 +9,7 @@ PATCHSET_VERSION="2.9.12-r3-patchset"
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/danielveillard.asc
 inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild
index 6027333fb815..a128eab54832 100644
--- a/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild
@@ -9,7 +9,7 @@ PATCHSET_VERSION="2.9.12-r4-patchset"
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/danielveillard.asc
 inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/libxml2/libxml2-2.9.12.ebuild b/dev-libs/libxml2/libxml2-2.9.12.ebuild
index d21164e6cfc5..75db7e792513 100644
--- a/dev-libs/libxml2/libxml2-2.9.12.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.12.ebuild
@@ -7,7 +7,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/danielveillard.asc
 inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 9b8c4282d383..d1c2bd52d519 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,4 +1,4 @@
 DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
 DIST libxslt-1.1.34.tar.gz.asc 488 BLAKE2B fff407ab2c2bbafa804e5a1f84ca447c706d75fd7489c99ac6040b625d0417a0e6c189be3457e6cc6ecd6b7860829875ea95a132fef24f8a532156361f8a5308 SHA512 9b155d4571daede99cdbf2813a85fb04812737b5e23d3f7c9840225b38f3dbf171623a21645daaee190e7ff9ba38bde932922e96a2a2312c203ffa9917c3baea
-EBUILD libxslt-1.1.34-r1.ebuild 1888 BLAKE2B 4b010e456cdf28d3eab61f0e0a7302006d48c89e5eab4c7ae0d265c1e904a6ec204145a9e9e2027223517d1bd6d3d4eac92e8b799bc1ed49c4fd403c3a15825f SHA512 2fbaa330446c3c7c621c226c0afecdeaa9b32de0cc98523fda20b4b9417185cd08244a46d4876702e6882e75d4431e67e2c9d05c4d883cc988a04fcf5f8d0d09
+EBUILD libxslt-1.1.34-r1.ebuild 1896 BLAKE2B afaf24eff826feaaf6f2ce237c6576a9046665ffe7aca21de53ff39be1df5ad646997cc02e09ca97209f5be4b2649afa992fea78b4471d3f9408e702638e80d4 SHA512 c28937d9ca1b393d9ef56cc09025fb51390466c5c4eafedac6131917054b6846d981ea7d9ea0d0d66b5fce3edb8f633afebce2c98203adef4544dafafbe4ce3d
 MISC metadata.xml 457 BLAKE2B dea5177b6500449022319ee718e279c698edfbeff13027dbe4db1318126dd693560435a864245898d4f55cbdeb4d3f9605dfe94c1053b3b76dc96f5c80456709 SHA512 d03eecaadd8414b7d2bc73e7a0bb2f91317cc6647f584a8b94346d37ded1b37a32651f0e8c46d308861f18fef94641265b0058eb740c5bcb4f91eee6cf4c05e3
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
index c0f4775812b9..36b22c24d815 100644
--- a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/danielveillard.asc
 inherit libtool multilib-minimal verify-sig
 
 # Note: Please bump this in sync with dev-libs/libxml2.
diff --git a/dev-libs/log4cplus/Manifest b/dev-libs/log4cplus/Manifest
index 052ddebac316..2710cc834bd8 100644
--- a/dev-libs/log4cplus/Manifest
+++ b/dev-libs/log4cplus/Manifest
@@ -1,6 +1,6 @@
 AUX log4cplus-1.2.0-fix-c++14.patch 897 BLAKE2B c4067272e84b2e442ef61c5468734ee985a9931171e7651242e79029dd6c5c6a9aae03fb9aa9a3ec9c1d391763c7acc7d57c794904636a261b2ebefda4986fe4 SHA512 9771a43add0af52417d67f54c991d637928d5f8340e90a786f2e9714cbc206e4ce6e7cc55face0f2ed0ed2c34e0a52bd922fa11978b85ffa48f02235df7c2de9
 DIST log4cplus-1.2.0.tar.bz2 629119 BLAKE2B f1b4629f7b6184b3f34f9d702c17487e113548cba46f5a25bb0f4972d7f3ce207310b25c94abea8cc1360591f7d0ac3d466075e584f25ce1968fee9d5b5c543a SHA512 2c3f16645051a230f9ec9a6ac689421efc4b51d5f40cb772e552bd199d2ad13c39d7e577cc63d51617555941412da166a6cda8861ee219154a953d9926aae626
 DIST log4cplus-2.0.6.tar.bz2 1197177 BLAKE2B cb2d4635b109690a81f2e228d48424a67addfccec6f5c6a1ef0e91b8f4ee24d41ba690e812d812a157688e2399ffefc0574111b7c6b38ce3551c11632acf76e9 SHA512 9dbbcff18fb50e7dd1a43076deb1be7d00343fc7ba590ef45a8098b544cb8421262f21fb9f319a570adac59b93960fceb2748e04902a39a8a90903b650de8cfd
-EBUILD log4cplus-1.2.0.ebuild 1699 BLAKE2B e6028b3be7ce72af358501e817d9dd658435feebd2782f07dd3251beea841be737086d23bdb6bee2910f73db964f49ab457190da4af851d2878c2712ae141261 SHA512 39147130c61edf442f7645880ce9aded1389a192711b5a740ae31a30bafb4b6b7b457bda87d5d884f29952ae64daf217a11ba87bf9665501064374ffea346baf
+EBUILD log4cplus-1.2.0.ebuild 1608 BLAKE2B db26b191772d7a3b1f616fb713fa9d8fbba984c2aa1c62541c93a2ac18d2b98b3e82b863d1b0ce0b306a59bb8ca2ced8377c41a1637e7a7808aa3e063721f80d SHA512 36d58defbd0d2a7308951f3a1252773149740145b25080a3d2f5ad3fbb0c690507274c90ddd9a0b25935d9515a5e167c90fb14bea56c8a3b65a7945ac3bf9bf0
 EBUILD log4cplus-2.0.6.ebuild 997 BLAKE2B 6e9e46b01fac86bf12dbafd7b9d1e837784eabb800babe4731178e47d925d2b04f5e5df01c5d6cebb4522db492367b1d001449bdd36d187c598d4907c3d27b81 SHA512 c8a4e7daeef941b2c4bb304e3373e4e8fbca5aedb79515f8884b08264a7983e5b981ec7d6d8c3469ed2ed59942068abe3d99f0304f78d043f0b410f0deb16a43
 MISC metadata.xml 1018 BLAKE2B 3301bfe901b8f14c2545bb5ea1964cae44b63767ee2539d83fcc6460e66e3fdfb1880c345d51daacf9b104025a612d52bbfb3a7974a8cb7cb4ee4f105f18c3f7 SHA512 e4cc992dc013ee186498fe7cdcfd065dee29885d2f8165eaa43842bacb1e94310813148b9ecbfaa3fccd830af585673ff099b9d3cc6a5a1e607de273f6fdd282
diff --git a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
index ae5197583f34..5d5331b72abb 100644
--- a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
+++ b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-inherit flag-o-matic
-
 DESCRIPTION="C++ port of the Log for Java (log4j) logging library"
 HOMEPAGE="http://log4cplus.sourceforge.net/ https://github.com/log4cplus/log4cplus"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2"
@@ -26,10 +24,6 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}/${PN}-1.2.0-fix-c++14.patch" )
 
 src_configure() {
-	# bug 648714
-	# Qt5 now requires C++11
-	append-cxxflags -std=c++11
-
 	econf \
 		--disable-static \
 		$(use_with iconv) \
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index c3e0997dacce..29050c4a867d 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -7,7 +7,9 @@ DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e
 DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
 DIST openssl-1.1.1k.tar.gz 9823400 BLAKE2B e9bd90f17bc819c4960d07bbee04346e8a7adb87a764a09d033ef76f1d638c67b180c4f2beb84ec25fbff54ccc9c14c13b9b16a27cac231a5dd22b02635d5cec SHA512 73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121
 DIST openssl-3.0.0-beta1.tar.gz 14878832 BLAKE2B a2c8d8cbb226803e78ff00fcbee355f41da90275830714e8c0aea532309ef0b98c27f6796119e2942387a9e92afd917d766faac7b5ea65a36326c368790b8055 SHA512 fbb650638a7ca406b0b5d1eafcef0ca431172c8b255adaf7575325d9c1545dfdacf8e9550b8bec4e1ec73759a02c9efbd729a07e9959932564ba81be61238d5d
+DIST openssl-3.0.0-beta2.tar.gz 14912360 BLAKE2B f1180eee6561f04e778f40d3d6f9fac5645777de09d965662f00c2506da30d3c3cfa0e98a25fc668e2e1fd39b8d700d7f0fd901f80964be048cb3aaa6432a5f5 SHA512 3eb9b472429bc26a7fc5c5837e2ea496706e3c6273ba33f36bbe3dc13bf7dcf7cba08d19ce005ee9b1cecfc63de68ef86cd8d911df28c82873ee44ba5d7e253a
 EBUILD openssl-1.0.2u-r1.ebuild 9933 BLAKE2B 5ad3b7befdf48c6ddaa7c849b3970730b8b693ba722beb012d89d41bb3af98e4037b811587072ec5dd2b70e5eb3683ce5800907d2ae8cc4e03886da15720a627 SHA512 20aa5cecdaf61e66a126125da6d17696b47891f01939c6932d0b9ecd89a211fded135c0fbfa7eaff5d7cf46433c4b356961baf5fb325c698743b8862c7fef284
 EBUILD openssl-1.1.1k-r1.ebuild 10330 BLAKE2B aa105dcbc590f454e98b83f8fd72dfd2e8a88eaf9eaabde4c4fd97aa746cabfda1bb66c3752e5288b41bb83caf9e3feb571d848e81dc7348bb08e16748370dfa SHA512 1395224f18af894ea0da4b2191d3ba006d23de4d5d9917590e6c426977dde260149b72278cec3ef1bd437ea2ee84b6c9003bd5fde5afc8b892e82869397ac563
 EBUILD openssl-3.0.0_beta1-r1.ebuild 8226 BLAKE2B c402e43b11b5bba8245c3ca473fd09a643c405d11e87f78c0cb9e410362f5329d8c61a42b41de429ac7a552f1c116f53a77611e38013cfd83d65e49a48df28bb SHA512 87c308d72b48dead282bd92a9ad981480a60ca12e93c528982607d94649571139c15eb480b5a80750fce8709ae2dbed08216274ac756452bd69ca683b532312c
+EBUILD openssl-3.0.0_beta2.ebuild 8226 BLAKE2B c402e43b11b5bba8245c3ca473fd09a643c405d11e87f78c0cb9e410362f5329d8c61a42b41de429ac7a552f1c116f53a77611e38013cfd83d65e49a48df28bb SHA512 87c308d72b48dead282bd92a9ad981480a60ca12e93c528982607d94649571139c15eb480b5a80750fce8709ae2dbed08216274ac756452bd69ca683b532312c
 MISC metadata.xml 1438 BLAKE2B 2a55417670eacb436b450bd2075e6fca79413a6fa16947efed6dd824b465b81b1ab5869ba33e0ea734e644d5c51cd686b3f950b6787b4cdaad5b2e6feb42fab0 SHA512 8031ae2212e7d8217dd4a50be2564a1102f4ea067af07b722a22ca02f779f7973932fde66e69f957f0c1a9ac88b6f868b12c42f2172835e432b6eba9033cb633
diff --git a/dev-libs/openssl/openssl-3.0.0_beta2.ebuild b/dev-libs/openssl/openssl-3.0.0_beta2.ebuild
new file mode 100644
index 000000000000..f07fa0d1b072
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.0.0_beta2.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic linux-info toolchain-funcs multilib-minimal
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://www.openssl.org/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0/3" # .so version of libssl/libcrypto
+
+IUSE="+asm cpu_flags_x86_sse2 elibc_musl ktls rfc3779 sctp static-libs test tls-compression vanilla"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-misc/c_rehash-1.7-r1
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+
+BDEPEND="
+	>=dev-lang/perl-5
+	dev-perl/Text-Template
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}"
+
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if has test ${FEATURES} && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user
+
+	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export AR CC CXX RANLIB RC
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	local myeconfargs=(
+		${sslout}
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use_ssl tls-compression zlib)
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+		shared
+		threads
+	)
+
+	CFLAGS= LDFLAGS= echoit \
+		./${config} \
+		"${myeconfargs[@]}" \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile \
+		|| die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]] ; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+
+		[[ ${m} == openssl.1* ]] && continue
+
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+
+		mv ${d}/{,ssl-}${m} || die
+
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
+		ln -s ssl-${m} ${d}/openssl-${m} || die
+
+		# locate any symlinks that point to this man page ...
+		# we assume that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/pcc-libs/Manifest b/dev-libs/pcc-libs/Manifest
index 3bf91716a49c..fe350ce64418 100644
--- a/dev-libs/pcc-libs/Manifest
+++ b/dev-libs/pcc-libs/Manifest
@@ -1,4 +1,3 @@
 DIST pcc-libs-1.1.0.tgz 198204 BLAKE2B 7cd665ba6a1a69514ead9a778cb24fe35561a34ae72cd5e53b63027ae7d4261261542434e3ead68f74056f228c35fe599dd76982280d3fbd2f71f5dc957b30d8 SHA512 89d90f246300ab1da652f652c685756aa038017f5b7d57d050bb5c88e01e70b594ffaef8772230fbeb9461e07c5b1df60e85e550ec4717008159218d50c8697a
-EBUILD pcc-libs-1.1.0.ebuild 383 BLAKE2B 96aaa5418ac41b0cbc347d2d0585a1e878c26c53d500c914a5af49bcb0977ed089566387f9f8700ef1eb258a04b35bf5ca5a3fd18ca6eefe153bf95cafd7a77c SHA512 a463a2556d45ef6e265182bc3635fbec65df4401f028215c573d4c6148b2cb2a91e411e493dc5ed88df7d0983957b8b8f1ebeb47adda18c434af6b8292d3cc42
-EBUILD pcc-libs-9999.ebuild 482 BLAKE2B 8d9cbe06d3cf0d625b53207f5a57b9aec5645ad702c7315c2930f8edfe95a6c79d325a64565e26f552bf17bcfd2ad0350fd73494d472ed476ea9a38e573844fc SHA512 19ad3fd43c0967487a1b6f5c54052d1ed2ff145763e767a60e8f70368ddc66d397992626df7f99a8a9f7952a8eb957e561673cf2a37d7f2fc05dd30d742cdec2
+EBUILD pcc-libs-1.1.0.ebuild 383 BLAKE2B 0189ef4a96f3fe12c022d9a33eb26e44177047bb0e641b5a234ef2ad9f701f19b1564578b69fbb95a9cad718d7b6ae55cb5a7b64ccd698676916060283d0ef85 SHA512 ec292ec73c3acda5d93d26cbd1ff67d4c2bc91868256819eec8e8fbeb45c500ba5bb032886a1616dbe4f082e29ec42bfac3679cc46bb4dffdaeb08c0401d2a85
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild b/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild
index 7e0b2be67888..1935211c9469 100644
--- a/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild
+++ b/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="pcc compiler support libs"
 HOMEPAGE="http://pcc.ludd.ltu.se"
-S="${WORKDIR}"/${PN}-${PVR/*_pre/}/
-
 SRC_URI="ftp://pcc.ludd.ltu.se/pub/pcc-releases/${P}.tgz"
+S="${WORKDIR}/${PN}-${PVR/*_pre/}/"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-libs/pcc-libs/pcc-libs-9999.ebuild b/dev-libs/pcc-libs/pcc-libs-9999.ebuild
deleted file mode 100644
index acb5ea6516e3..000000000000
--- a/dev-libs/pcc-libs/pcc-libs-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="pcc compiler support libs"
-HOMEPAGE="http://pcc.ludd.ltu.se"
-
-if [[ ${PV} == 9999 ]]; then
-	ECVS_SERVER="pcc.ludd.ltu.se:/cvsroot"
-	ECVS_MODULE="${PN}"
-	inherit cvs
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="ftp://pcc.ludd.ltu.se/pub/pcc-releases/${P}.tgz"
-	KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="BSD"
-SLOT="0"
-
-src_compile() {
-	# not parallel-safe yet
-	emake -j1
-}
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index e54ea47f82de..9d2eb6774715 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,3 +1,3 @@
 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb
-EBUILD softhsm-2.6.1-r1.ebuild 1010 BLAKE2B d3f45642209e3917b749e10fdf690c499826c32a6bf0e77bf4e4d76b8fe1b393db59727b3dd1c9ac330436f1a1c3261e0fde0e05aba2d95f35565cc108a8e549 SHA512 1a12ea6533153ab8d15e3da7ea935d18007cb3a6a842b352a2259fc0282d0f736feba17bc4cd7e0e64d22ec9013cf340f62349b2cea15a733c78e4d1d1c524f0
+EBUILD softhsm-2.6.1-r1.ebuild 1017 BLAKE2B a1e514cca56474f94598cdfdfbe40c175be0cb3e2b473d1d1f680d9a2201295d92fe46f918f764de6988ce377ffb9e577ad7437bfc28c0a9b3630ca7d5bc2a26 SHA512 c442ea340ef1917c96a3293483c351812e1f824be0ca6f394b7c0f29318295161f14acfeebda3acd3f86b799552b161093693bf28ed6e42b82ce97b8994c5ee9
 MISC metadata.xml 292 BLAKE2B 273da0cfca0f98179144303c91b631ff47844748840f99b6bf1ece28ec442191e950756308242c25f4f27ab907674cdbd6efc88a4af1887676eb878d01b73f7c SHA512 7b3d1e2e5adc04c50256ea1f98490787cc0d2ff33af13462501cb5e08f482de3ce6da60d3026d5aacd1f46075915d1cc5c37206d398c61176ca7a023adae693d
diff --git a/dev-libs/softhsm/softhsm-2.6.1-r1.ebuild b/dev-libs/softhsm/softhsm-2.6.1-r1.ebuild
index 808ff4cbdbfa..c7e6688a6e9a 100644
--- a/dev-libs/softhsm/softhsm-2.6.1-r1.ebuild
+++ b/dev-libs/softhsm/softhsm-2.6.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="bindist gost migration-tool test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 409ee8ee074e..8404ca6564d4 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,5 +1,5 @@
 AUX yajl-2.1.0-pkg-config.patch 2299 BLAKE2B 1de5b3d183b692b8be1fe37d0f05e97141b82dcfce7770e9b4e27ed2443b8506efb8a6cff2bbc5ebac640ba87819833d0e6eb5d8cd8139a973861904afbea648 SHA512 0cc7f685b80280af209c8b3d9443711174a0439dc59f3e81dbd1f78b8aecca3eb29b2c8b88d94b8a4200a1248fb03948a1e51206373af49a55fb2eb32e9d7dde
 AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
-EBUILD yajl-2.1.0-r3.ebuild 951 BLAKE2B 87db0e670510662ea67c386e28a5e1e19c6c102044aa80cea1c4dc6f803044acb01a1be5e1cd0348bcdc8855448df8a1f5e4f311fe28d3b6a96ea17c6073ae20 SHA512 a51be6909954b36554263a0c7af42e04db4fc897ffe1168ad045ec1e4bbf72954313c3e60f7e4faa54daa67daf5d79bfa36182297742b3081574f7855f579187
+EBUILD yajl-2.1.0-r3.ebuild 958 BLAKE2B 928f4a31076f07a1a5e7ef790726e4117c3b779a39f7896979b52bd3eac39999509f3421bb5bb95dcc658d9ed4b40035a081b5d8be68bddf5ade72d877d06a7d SHA512 b42627c42d165340e47b795ef35810cfaeb9f7bf22c928c9b820e2fc05c2e56735a61f111231f0535c249ebe96d1a7a8311320bdbe3acbf93effc378188934e8
 MISC metadata.xml 336 BLAKE2B cfff08a4c7fbc2990928356c47d5110c6e6de6278ec3a45ac89f7dc1ae5f247a12214c41c884e622d264142b3f487fb82ff0457e15a0d39080e7680ad72d790e SHA512 c01c9b3ba695bb76ef55ede76c3e4b2e6843b27d4148aca7c290ac909aa8800541f0b85c043c5a74e518e4e84a0d3c6907cc4f93bbe8d0addfaaa40ede3a347d
diff --git a/dev-libs/yajl/yajl-2.1.0-r3.ebuild b/dev-libs/yajl/yajl-2.1.0-r3.ebuild
index a4afdebe761f..8115000253c8 100644
--- a/dev-libs/yajl/yajl-2.1.0-r3.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/lloyd-yajl-66cb08c"
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index a9a11a1054d1..5fb81e2196f5 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lutok/Manifest b/dev-lua/lutok/Manifest
index 275e33b45148..85ea8a5d1dfe 100644
--- a/dev-lua/lutok/Manifest
+++ b/dev-lua/lutok/Manifest
@@ -1,3 +1,3 @@
 DIST lutok-0.4.tar.gz 489570 BLAKE2B b4bc26d9a4901901e6ca66a41bc42ccc2f82697ff14e64c1bea35b4a9ed08b6f13ecfa9aaabb54e25fb3e4f3aea03791c225c4c8fc6ed3e0387d34d933a228e9 SHA512 664f30099bfbb30978e24068a9232a4ff1b5b1839c601bf784f35f6bb1394558067495093a3b0343c94e756d2e4186a32a8227baf5934c15c45905f7c0a5d19c
-EBUILD lutok-0.4-r10.ebuild 1006 BLAKE2B dd75ed81ad2ee69dd801beed2378490a5d4797323bb9df2da40e9254990c39488bdc7aa3fd14a2cd0bc1d535d4c971d798c9d03d002e6b99b90c31011cc74574 SHA512 cd4a7287d4df50af8df759969c35042af57410c7aa116a1b55b62ae5a289e05b7e353de082540ae9f141ab03ad2a9b7f6b6c41cb91ba205a7489848895c6c115
+EBUILD lutok-0.4-r10.ebuild 1013 BLAKE2B ab8dafdd97f024a9df4b795f4d3f5fd347c8bf01ae75774701c303959a2a7de9ff68df3d0d2a41e62cca3ffb788437bc4dc4ebfb0d8030e23ff91d3ab6d95ee4 SHA512 c20652bb79dd928a20e5baa6cc855038e427c4c8a1db630194d63c3beb3ea4b86d461b1334a63d7f6c08668499c388c98e3376ce872292c73a06b5e1d67abf2a
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-lua/lutok/lutok-0.4-r10.ebuild b/dev-lua/lutok/lutok-0.4-r10.ebuild
index df4e158db77e..27c4165dd550 100644
--- a/dev-lua/lutok/lutok-0.4-r10.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 75fbf13c81d1..7b34c54768c7 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index a323eaca3594..e2a5ba9b139f 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -9,6 +9,6 @@ EBUILD camlp5-7.11-r1.ebuild 1048 BLAKE2B c4d7f8810c781ea2959cadeb4cc57dda535271
 EBUILD camlp5-7.12.ebuild 1279 BLAKE2B 3f390b87e886b7a0527af8b1c6ea4f315085ed966bdfb690d856093fc898f2a878ebd900c3a59c0e9ef408d5662115e421cc899eca137e37d51a996016bf253f SHA512 fdd203a319dae490c6d23406798fc33bfa5b5218b12724c555943721231f4a2fc90e6039c0cb921b7e16a1b043c4a14f896d6b53c67674713932fd8e869d7bc7
 EBUILD camlp5-7.13.ebuild 1092 BLAKE2B 65a5d564b227635a01dd14e140193930ce7c903ca74b7a297172dc9c315c4d9b3d200a88ded86822d4f9ddf1cfb0c6ed3c492334b552d8b3a91fa7b21d064dfd SHA512 783b13558900be49813b26ca6c7f1cfd0fd7b4f93cbd4f0ecbcdcf19f371f6752032488c6cbc011be4f3bada5c3ea11f9154d0e9862e4e90c3b9608dc3d9a81a
 EBUILD camlp5-7.14.ebuild 1141 BLAKE2B 8f2d1d604a5761717a9191784540c11a2394b69f714c7ab9297742c189117b45c948a2a03268a3b9e9a5f53053a78f00ebb12da980ff16e73811b6a71a740a53 SHA512 74ecb555eb25528241136ce9b88bb2912ae3e54908b903d898bd82c441c27e4a9438e7303959309261325b3c759f782f0c206da1d6de69ef6bba53a58d93a2d0
-EBUILD camlp5-8.00.01.ebuild 1071 BLAKE2B cc312d026a490debaece3360362ab241b197f93f5ff4b8880cfa92c855a873c099622b212e2eb97a8b37ff733eb21f3e04d54a7798085ee7fe18512c2cdb0bdf SHA512 d53c252b747d0a4deaa85083bfa52075acd17e9d3f7152403a480be749d645038d36501e745a537b90166c30d2cc2f633b88bd62993baa01b89c2d90c734b641
+EBUILD camlp5-8.00.01.ebuild 1069 BLAKE2B 7f5efb45643cde63727e81f2560714d0da4425ee77792584b77c89da085b033c2db94b789e05361a0708929284997a094bd06bb225947a2cbed6186d34967c81 SHA512 6a6bd5b0314e4d1b44328ed077a3146e6c905c2d73fb5f422271624ef18f23e235e154aa7f837e6c2c1aec202ab201841f475618f3fa5013f2c2f3af98125bf2
 EBUILD camlp5-8.00.ebuild 1073 BLAKE2B 3dbaf6c7694f1a52ebfc7b67b34fdec0256a4f4a6b6fd711672756a5d789e78888b96e15f789bbf11af10bd2b4d5e7574248701597efcfe45d8b0f9d10a45c71 SHA512 02f0ee65b774f7ac70953f9b9ed41354de6a95748ee6ecc8b19a7067a4adf07438201f0e204a0d011e18134ef1cdb1b6147d185cfd29789179479ce0765ad79e
 MISC metadata.xml 415 BLAKE2B cba4109b6961dba8c767674cc6633812ed76c99e8091ae2b0ca0c285ead9e730d575cc96c448fce7873375a0aa8d16acbb2f80f85d8e26a174ca8945976580b0 SHA512 4e2255d7af948851ca86e708c01be5d61e46235078b6e5606687ca3975ae7d7618d8e531c5b9ca6f1eac893f065258d7191e544f5bb6331fb6e3a9c5ac274f93
diff --git a/dev-ml/camlp5/camlp5-8.00.01.ebuild b/dev-ml/camlp5/camlp5-8.00.01.ebuild
index d2ab69f64615..dc69d481ee55 100644
--- a/dev-ml/camlp5/camlp5-8.00.01.ebuild
+++ b/dev-ml/camlp5/camlp5-8.00.01.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-rel${PV}"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="doc +ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index ff5f2b6f5497..df196e6c8d25 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -7,4 +7,5 @@ EBUILD llvm-ocaml-11.1.0.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cd
 EBUILD llvm-ocaml-12.0.0.ebuild 3059 BLAKE2B a3a9b1a45127499e7212d30ce699c7a23229895e0e4ac14fe5f9e02d1bd401350b6f419eada422cf66f9301dc180d16ad126e43267a4ef7db797eab184dc7eb5 SHA512 2208b0de0343ae1d33385226eef2e5bef2185a3799a30ea74094c5b004d7b9d7f97f73a97191f46ecc6d3be5b05d647300e0eab5ee5b4649051a98135b2bfa91
 EBUILD llvm-ocaml-12.0.1.ebuild 3060 BLAKE2B ed1223c503df5487c666642a02df41095eb724b46a79c1204f8ce2ff6b9eb650fbb46907d00e721c1ecb5df6648afdefeca6dabca456ab54656fc45871beff80 SHA512 57cdf97cf5a401a5ec33f15f8fb1c83998a7503b4ebcab1c2e35c2b35519d9b30f4b25598ddc2f8e6757f6de42a6a5878ab43e50fd45f1df0db6549a204b1680
 EBUILD llvm-ocaml-13.0.0.9999.ebuild 3049 BLAKE2B b98f105c8171cea5be884b9dcaa58487d659ac0142c9d5e92d5b5cc6f6e338e6e8869a4a4aaa05078b4dc7185c87ecaf2fcaf4c5371974080358707801a422bc SHA512 846c778216f2295fa8ee87552317dd9260a87f39261bbee1e81a1d636d500fe57ac48b650bed6711db80ab936cec6a0a8c689a177ff7bf8227ebdfa048cd041b
+EBUILD llvm-ocaml-14.0.0.9999.ebuild 3049 BLAKE2B b98f105c8171cea5be884b9dcaa58487d659ac0142c9d5e92d5b5cc6f6e338e6e8869a4a4aaa05078b4dc7185c87ecaf2fcaf4c5371974080358707801a422bc SHA512 846c778216f2295fa8ee87552317dd9260a87f39261bbee1e81a1d636d500fe57ac48b650bed6711db80ab936cec6a0a8c689a177ff7bf8227ebdfa048cd041b
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..d082ba50ed27
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0.9999.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+	test? ( dev-ml/ounit2 )
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 06a9355decb3..978f09111e55 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -2,7 +2,7 @@ AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f055489
 DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B 26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0 SHA512 f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
 DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d SHA512 9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
 EBUILD opam-installer-2.0.8-r1.ebuild 1029 BLAKE2B 53066e7d4fe28f77ae2cbc1a1eb3056a60d04ada7eb72c0589498815c8ad3937ef6335b73a675bcf7060c6bf85534b3b497b55ac782c1f7a0d3e32537c1489cd SHA512 df08f41985fd16842021dc0e5c8a361a1d8376d1b716f3fb2aff8bdc007ff311ba51844894325e76657a688a03021fe7360c9522ac6f41231ef499de214d469e
-EBUILD opam-installer-2.0.8-r2.ebuild 1020 BLAKE2B a2b8afb4a80a772b812f7394aef05b7d1d8a30c23c8e6f8fc9d6d46de38b8389e8fe975be391f620f94586e459712c5522289bf74b1aee15a9e0a9da1a28404c SHA512 e8a63747de673e5fae11313803192c585d94e91c5d99eb36f8816013e905c305a5bfc21833a40f9291670201288aabe427454d4731d609e6702a891876925717
+EBUILD opam-installer-2.0.8-r2.ebuild 1019 BLAKE2B c45a32eb576fa8d9c3c1340d60744cba3f26ecb5d8b4479d31d6d8e69ae32d019fd43d020c02e10fe09934dca2cd929d06a3143f9ee23e961a7b4555e76874e3 SHA512 a7e20b91999336d213bd108c6ebcb6311b9da1115df85a5e6d8fc60215ce75744c66cb9d5e6d21f5297c84b69b85964a557a91a1541798c5f8aec29fca09ac79
 EBUILD opam-installer-2.0.8-r3.ebuild 1193 BLAKE2B 2146bb8d98820a6baeffb5ee098527ca75529e4fa8302efac24e455526242db224707dced11a2bad732da18db02e680d979518fb156e28974c4dac4ca833c909 SHA512 3572227ee5a0c0b89d4ed201da95d831056d5227673a5015bb4139fd08b2b5ff0e73a22c0e2e14fec989b18303222abf38ae7d78c7b7385f8e45c4420c9db299
 EBUILD opam-installer-2.0.9.ebuild 1193 BLAKE2B 2146bb8d98820a6baeffb5ee098527ca75529e4fa8302efac24e455526242db224707dced11a2bad732da18db02e680d979518fb156e28974c4dac4ca833c909 SHA512 3572227ee5a0c0b89d4ed201da95d831056d5227673a5015bb4139fd08b2b5ff0e73a22c0e2e14fec989b18303222abf38ae7d78c7b7385f8e45c4420c9db299
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
index fa67d1f64afb..0794b29319b7 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.02.3
diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest
index 94b1765e23bf..4d089065a99c 100644
--- a/dev-ml/parmap/Manifest
+++ b/dev-ml/parmap/Manifest
@@ -2,6 +2,6 @@ DIST parmap-1.2.1.tar.gz 47069 BLAKE2B 85d67aacff70c9d8b70c73e4673486804a0d0a4cc
 DIST parmap-1.2.3.tar.gz 47481 BLAKE2B 3c65448d244e6079444912ffaaea35982d44123f6259c2d15b7f1618afd10c79972f00f7e2744da270b298f4bca090c34c96e6e36638f2aaabba4ed774af24b5 SHA512 f050492ae1c5fc7c9d0baddaed44ea9920da7d2a5ed6455e93fd427648037a5e00051b6eaaf982174d88ed4de9b0123a1c4eff203f1ba6bef3384b5c7e2952c4
 DIST parmap-1.2.tar.gz 47083 BLAKE2B e790087273fcf749b000c7ad3a2f5b2cafea91c529e3a4687b1d882d203cb43e4069a42675319c27878d8bca3fa0e19af96ab1dfda8df3967dc48d28ec542b91 SHA512 69431e146e8aa01823ae1583c6a5e7753436cecee37c3da3064a836c20cf8c6b9033248412203406d03bd4efdd957b2e118ea5c5866e3bd1f668d8c4fd48777f
 EBUILD parmap-1.2.1.ebuild 608 BLAKE2B 92d88cdfa1a4b8d99d84592c40953d3188669e6b5720d4bb18b5fcf27e35477244085b841968cfdb612668c7447e2e77791a83e877339f8567080738899de8a6 SHA512 ebabf3baff2fa3ebc2776e280bfb6fbead79d5f0f4f4f476fe2de10d38d7e64af6896d315e2eb77488352441a3fc0d87d4267a3cdadbfb38a8047d1899845712
-EBUILD parmap-1.2.3.ebuild 607 BLAKE2B 1d959fdb02686a3426b08d766c37205a20b5987073718e066d1ba6357877db8ed5848eb6e8ff7e551e0bfb3b055f5d291a6d337b300c83f95544d3e88b54b7ec SHA512 3f3911e98860c33afd0ed8e02a357d0757ff332a16da571bb634041a47f893a407a9b0bd0cce13681527c3d2130ec6dacac9d96673e4f222e630aec3c1af1cb8
+EBUILD parmap-1.2.3.ebuild 606 BLAKE2B 7e0e4999f2ead10108b27165ad7eb25f14fdcb1072c20112ce08c24bcde764e5725604b21cccd91d4f36dad6585a2bad6039451611d5ec9be19fd209f3937382 SHA512 c6ea3ee713c4a6af92346bf34a31dfa8b6e85eca1bb8f39041fb3e6ab2c19691980b4f4f7f13e7f2b25e60cf15d3f3608357adab4024e9ea5bd92f82bf7eeb26
 EBUILD parmap-1.2.ebuild 602 BLAKE2B f818b95d8edfc4e83b56569ab59392fc0a142b224fa7df50b6b08e0fa1ee7df8633c36c563923b3000a2b38bc82d1976731ceca541d72ce9c24fa4e3cab109aa SHA512 4efeda43e48ddad028e583f8ebe3df12bcdf96e802de2555162569178298be87b5ce815537cefdc42c55c92eaa60f962d5ffc423f08b9087f68cdfa8c21e0f11
 MISC metadata.xml 322 BLAKE2B ce1a2f61e9f4fd4fd8286835af805812ab1fddb8cba9e85401f0967ed03ef6be8507868ef292accb826332b47f800b32229a0dc2ae62c2e8f44bae20bfcd9de4 SHA512 7d752bdbddf86b905a475ba3243f4bedfb1b07ecd70fe36f73671dd197c1bba4d1abcd8c44d4ffc94301417c33bb30e15d819645f63390d3c9ffc4f9a8fb6cd6
diff --git a/dev-ml/parmap/parmap-1.2.3.ebuild b/dev-ml/parmap/parmap-1.2.3.ebuild
index 57ce81d1da21..f121c81a3f1e 100644
--- a/dev-ml/parmap/parmap-1.2.3.ebuild
+++ b/dev-ml/parmap/parmap-1.2.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV/+/-}"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 BDEPEND="dev-ml/dune-configurator"
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index 2ccf1e2850f6..f9d93c2cea2d 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -3,6 +3,6 @@ DIST ppx_sexp_conv-0.14.1.tar.gz 49857 BLAKE2B ede55963d995917bd0c4a1464b58f8584
 DIST ppx_sexp_conv-0.14.2.tar.gz 49876 BLAKE2B 32109eb6300894156f91721a1c74e94803106cf8a9a9326bf815d3094e166ce34b19f3d28b770d381ca3ce32227a80b15baa61e6f9c2d0082c47b87678c0f239 SHA512 d0121770030da142fd559b5f8d52d4a029d032c5ac9c79bf235190e0aaff58e5cce0a5ca5f198ca8a112e0970ca27ab18d4f201376ca6b799b91d71deb915f25
 DIST ppx_sexp_conv-0.14.3.tar.gz 49886 BLAKE2B 9fda18267995cdd8efb9dafb069df6a51106a800b263f4c94129957a3f23d2bee72f39382623a320cb09ea13c255000ecf9670c19ccf49d55627c02bb0912224 SHA512 7de81d64e7eeb4d6097134606411830dd066f94222ed320a9c32752116961806ccf807f802e07c522c32aa6f7c20bb901804612a0ffc1b14807903c92acb2f44
 EBUILD ppx_sexp_conv-0.14.1.ebuild 722 BLAKE2B 56e8596dd6063a6ff69d82c8ca862357d25034add0beb42c4d5e044b0cc95de73c5cc93ceb4c8999df1a1eb3e0f8c11f434f4d1f1cbce157a476fc4c5491bc7d SHA512 569f6c2990f5197e1298ec369aab259143be88b267a0136b3702497fb36d00bebe761f0c443a528981dfd5b2239332d066d86945c1e29307b65be83466e9087b
-EBUILD ppx_sexp_conv-0.14.2.ebuild 711 BLAKE2B c226ef193c337168eee425e4e61e1090df76c6080f9b3725a6b0638fc5935adc50d68c1e6fa7e38d09b106e71d8f62b8241f226aee05434750b3b815edb1eedd SHA512 a2b5d5cb30d7fa31bf08b3831040943c2b849cd6787fde4feb999b7730dcfa210b239469369f913be535761811727a5f44b68cb53e7832ed410658b771e107e2
+EBUILD ppx_sexp_conv-0.14.2.ebuild 707 BLAKE2B e93cf87a55d8e7e770150d6c07a9251024867b477e21df2c20a0e3d2a8ae0f57cf76957401bbf0a185a667ced27062517c7d1ffbbec463208e8685d70e907a41 SHA512 421055d2101d9fc624b05d027588f9d91c4d21741686bf665b3d70bd60f7057351797da46309f905ca9311a2819630f38258028e01e523c720a448c7a39d94c9
 EBUILD ppx_sexp_conv-0.14.3.ebuild 686 BLAKE2B 791c5c21e22e2369d8a2020131e683606edd0fec0e3e37254b2e94cbe69f3c0e344d895d1c0d04ecdf573a429a992af48ff155b0139fa6b23adf530f9904db96 SHA512 74851675ca6d1c0a691588c415a7eb6ec69f7fe9394e283f3d5c98142cb1a4b33f2b493b402ded4353ecb2b18912b797ee61ca6be03e43ec4aa489c85a45871c
 MISC metadata.xml 426 BLAKE2B a3f335ad820fa9f62edfcab410b969c88ce8d17fab45f98700c98eb4314ecec2289681789689865f1b7bdec8317260372b55894213e4054b3ebea6e35d483e37 SHA512 086121552fc62e22d63cd4861b961916b084706c62f40f7d6ea7f6db40a250e026ba072b88a7315fdecc53ffcf380668af4257b96fcd97f9fb28686e46163d78
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild
index f3181789caf3..426c7be12542 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 # Upper bound on ppxlib for bug #769536
diff --git a/dev-perl/Alien-HDF4/Alien-HDF4-0.50.0.ebuild b/dev-perl/Alien-HDF4/Alien-HDF4-0.50.0.ebuild
new file mode 100644
index 000000000000..6ecb7127c2db
--- /dev/null
+++ b/dev-perl/Alien-HDF4/Alien-HDF4-0.50.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_VERSION=0.05
+DIST_AUTHOR=ETJ
+inherit perl-module
+
+DESCRIPTION="Encapsulate install info for HDF4"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	sci-libs/hdf
+"
+
+DEPEND="${RDEPEND}
+"
+
+BDEPEND="${RDEPEND}
+	>=dev-perl/ExtUtils-Depends-0.402.0
+	dev-perl/IO-All
+"
+
+PATCHES=( "${FILESDIR}/${P}-shared.patch" )
diff --git a/dev-perl/Alien-HDF4/Manifest b/dev-perl/Alien-HDF4/Manifest
new file mode 100644
index 000000000000..60a76149d8e6
--- /dev/null
+++ b/dev-perl/Alien-HDF4/Manifest
@@ -0,0 +1,4 @@
+AUX Alien-HDF4-0.50.0-shared.patch 1187 BLAKE2B bc4f13db33702dece41797761625842701b4023dacbf93d0c0ea12f24f0be77d5c8648f6137a308bc12dd792e16b5fc7969a824904c4ad49c075d9acf72b42fe SHA512 8cb49e09393ed983da6a65fbe8fdb42a4b156479d5b8fb65b7db0d7e674357d9ae749c64498958141215a7beb1f0bca61b738117550e03dbf253826a523d8701
+DIST Alien-HDF4-0.05.tar.gz 3408 BLAKE2B af2d7d924712c2f520b391c897172a5116f4bded164a9249270aa5eb130a0d0a95939591a0002115c9f07c4da89f6c1ab31411a6daf666f2d7f7f6b4b214665a SHA512 1c9a81a7cdb74ef86c9d0a295b9f7143d207f0b9afd19047592990c173889d1ee7cd5a33c5a6e0970cbec65af7dfd40a66fe122a32ce5864b3a461577e1754bb
+EBUILD Alien-HDF4-0.50.0.ebuild 415 BLAKE2B b345cc4eefb3808527aa9efd0f44ee71a1172decd8700b1fbbb66303b52c1447ae8a9adef1e40e0d2a3051aa5cce76c0df1f38a462f36401390b2a8fa122dded SHA512 af4560b93788f750c8b55ea904eec24136715471f10223fd7a7841a21e3eb4c528b4b1b52ec071a4eb9c81d16702053dc720d8a5715b0e83c0daa4e0e60859aa
+MISC metadata.xml 293 BLAKE2B 2cfc5b9af7026aa174a9e9b83d2932c543ad88b591bd3c39ea2843da3e5b7ed5140899d46c40d51638af5d196adf9aa7af3b614461cf353905e9ab69305c0bfb SHA512 8fc4213021fd9558e5c2b69cc38f21df7abd313ed31c216a0b718d61004b45165e7898aa43b07c6243407dfc9e5c43d8110557b5fa2516b571d943ddb7d0b007
diff --git a/dev-perl/Alien-HDF4/files/Alien-HDF4-0.50.0-shared.patch b/dev-perl/Alien-HDF4/files/Alien-HDF4-0.50.0-shared.patch
new file mode 100644
index 000000000000..ffeabcf5b29e
--- /dev/null
+++ b/dev-perl/Alien-HDF4/files/Alien-HDF4-0.50.0-shared.patch
@@ -0,0 +1,32 @@
+diff -ruN Alien-HDF4-0.05.orig/common.pl Alien-HDF4-0.05/common.pl
+--- Alien-HDF4-0.05.orig/common.pl	2019-04-27 03:01:25.000000000 +0200
++++ Alien-HDF4-0.05/common.pl	2021-07-29 00:47:09.923447920 +0200
+@@ -36,13 +36,13 @@
+     foreach my $libdir ( @HDF_lib_locations ) {
+         return (
+             $libdir, '-lmfhdfalt -ldfalt',
+-        ) if -e "$libdir/libdfalt.a";
++        ) if -e "$libdir/libdfalt.$Config{so}";
+         return (
+             $libdir, '-lmfhdf -ldf',
+-        ) if -e "$libdir/libdf.a";
++        ) if -e "$libdir/libdf.$Config{so}";
+         return (
+             $libdir, '-lmfhdf -lhdf -lxdr',
+-        ) if -e "$libdir/libhdf.a";
++        ) if -e "$libdir/libhdf.$Config{so}";
+     }
+     return;
+ }
+diff -ruN Alien-HDF4-0.05.orig/Makefile.PL Alien-HDF4-0.05/Makefile.PL
+--- Alien-HDF4-0.05.orig/Makefile.PL	2019-04-27 02:53:52.000000000 +0200
++++ Alien-HDF4-0.05/Makefile.PL	2021-07-29 00:46:34.395073467 +0200
+@@ -7,7 +7,7 @@
+ 
+ my ($libpath, $libs) = findlibs();
+ die <<EOF unless defined $libpath;
+-Cannot find hdf library, libdf.a.
++Cannot find hdf library, libdf.$Config{so}.
+ Please add the correct library path to Makefile.PL or install HDF
+ EOF
+ 
diff --git a/dev-perl/Alien-HDF4/metadata.xml b/dev-perl/Alien-HDF4/metadata.xml
new file mode 100644
index 000000000000..8ad3d950c4bd
--- /dev/null
+++ b/dev-perl/Alien-HDF4/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <maintainer type="project">
+                <email>perl@gentoo.org</email>
+                <name>Gentoo Perl Project</name>
+        </maintainer>
+</pkgmetadata>
diff --git a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild
index 9f6868720205..e4c142786ede 100644
--- a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild
+++ b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Install the C libxml2 library on your system"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Alien-Libxml2/Manifest b/dev-perl/Alien-Libxml2/Manifest
index 9df8aeb280a1..e8800568e6fc 100644
--- a/dev-perl/Alien-Libxml2/Manifest
+++ b/dev-perl/Alien-Libxml2/Manifest
@@ -1,5 +1,5 @@
 DIST Alien-Libxml2-0.16.tar.gz 19890 BLAKE2B 50ad3fd53b392de730a140fef350a38cfd2dec069354a45406a524ec1daa8a46cdba2398c20cd29ff6c9f8a2c52f7307130d1ad7d477d9a3b18c1c87a072d827 SHA512 54d3f670047b26934140be28bec5ab27c655daa459409bda00655d6f652f5099b07d2e286f59825a36e7dc56bca1e92a0af19c33582fa90f3f26aff4202334ac
 DIST Alien-Libxml2-0.17.tar.gz 20787 BLAKE2B c9ef905cdee44e649612cf54ebfa0875c8eadd278d17584c71db005e7f1eed4a9df00bfa83739067334828203d1159ee97b56461facf40364fab17b90a4c4474 SHA512 89f8034800f03e9e7f87871fec4da54313d0b2557efd9c4bbb2f01793e5679c6c355eb8bfcaf54540b50f9cf69e84d88835fee9b06f8b2f6c7dd7e6c6ed2c097
 EBUILD Alien-Libxml2-0.160.0.ebuild 646 BLAKE2B 8496be5d0c14508c8ec35c0cb936dedde65fcdc952cf1d3e5005ec67f6ba1a442930ef364f36be6e747868dd632d1141878f062f391d9681f9dec1924a628d7b SHA512 725b6855829e122cd28ccc029ef648e008c8e17ee6d224cb5b84a750ac18ec2af032ca7c668cf0cbe91b44b6cbcec20df4115943fcf8f459ff544b36527395b9
-EBUILD Alien-Libxml2-0.170.0.ebuild 654 BLAKE2B be4e40ed8f5c5a6bd9e2b9fe1ce6fe864c86df552b9fce1d42559d4da8397199f933c14bfa3182fb02e0d6790dcec18c67838eb8e42d0daff009c16d73d7802d SHA512 63cce2e19d57fbcf7001453266d0bcdeffb69434320d29eb60038ce1ba6fcb9d9840c6d2bb3ced8f12b989791c80a94a4e0ddd28719d344ad19ccc97a4307dd2
+EBUILD Alien-Libxml2-0.170.0.ebuild 651 BLAKE2B 8a9e1d0fc30e0da9cd1f91856291d18170bdc1790ad4afce7c9cebad86f34f100c7bffc649afe151cba09df04662e26f3ceb2f723174bbd4cfff8fa1e3f22cd2 SHA512 35a49dca7bda2df33070f1ade1e606bad9d738d824c92b5aff1c513f0523529bc3cc060a29292929d9c1a10397c2a483cfc6259e373e3036bc57217f36ee6045
 MISC metadata.xml 398 BLAKE2B 573fb504b4eec6a5e7768737ea93806ae4bc6208333e12d20cce0d26ce0388744d8a85f5ccf74665d37698688bbaf3d7c7a02475b54985e07f21f384f895ddd2 SHA512 92051468292aa25af81ada3e1482231921087d51be86df605c843a32de4ecbe42606da3abfca48f86d19111c2b4d486d65e867be8f3dded6b1e8bc764991c787
diff --git a/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.80.0.ebuild b/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.80.0.ebuild
index 0ab31107cf31..6483e836f47f 100644
--- a/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.80.0.ebuild
+++ b/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.80.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Interface to FITS headers"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Astro-FITS-Header/Manifest b/dev-perl/Astro-FITS-Header/Manifest
index 2d0f11533044..3aad506f8752 100644
--- a/dev-perl/Astro-FITS-Header/Manifest
+++ b/dev-perl/Astro-FITS-Header/Manifest
@@ -1,5 +1,5 @@
 DIST Astro-FITS-Header-3.07.tar.gz 105979 BLAKE2B 0193f6691aae31134e2537c328a0aaef501b1ac4289df2aa825f28e01ade37338d34ae3979f0d71c1d6706e5cd567cc158a5560b4002bdb8baf192109ca64fca SHA512 21b72ca2727fd77c6da01407ab97ac1bc3bfb4f6864d7a4728fa3f9cbad07b64ca20445bc8daf6c34a3523ab16a2b688cf99936157a41f36147b39f05a6c1f90
 DIST Astro-FITS-Header-3.08.tar.gz 116038 BLAKE2B 1b8b96e7a352634083322746970cf60855b81ec811fe82eddfd7b49bd037f660a292d9656bdfffc89b19370424ca1e8f343d7ab4a7c2c0dd8c457b0eab0ccd7b SHA512 c94a9da46212a2db95c1ce32da2609869bc85687c236919791c16b06f1787311ee3ac3323baece790c04d56818754c6f487b15c20487ded9ebe61bf97cc11c29
 EBUILD Astro-FITS-Header-3.70.0-r1.ebuild 453 BLAKE2B 1a1f02ac4777deeaa53e49e9968625b4de91f96f485eb93a6cfe71fa4f2ca6fc88bfc7282eb943e9b720d3cfb54d28e95e0f79c795ab7b4964bdc714dbe4c247 SHA512 331e409d797bb1710fdb11c4e808fc073b26fcf73e4aa0aeeaee3ecf26836c9ece2a751131329dda649e7a889806964cc403b198d94ba2748170c143a3e9fbcd
-EBUILD Astro-FITS-Header-3.80.0.ebuild 428 BLAKE2B e1acd5348ed9457181250b408ac49365e3745cf7b11174d30f9da36c47683db4c4f159465a38a116ef728260511390fbef41e3dc5c939c08dfc6d2ba3cc85274 SHA512 8b58f18af7f67d25d0e87fbaae080e66ffe822729ce13a868a0e5b997a74fb0e470f93212d99a21d3cc02c6b1f366fc0e3a6c8572c72422ccd1492c9aee5bae9
+EBUILD Astro-FITS-Header-3.80.0.ebuild 427 BLAKE2B a77288a5d014b07a68004e3c7bfe54c17e724655acdf55a81e55cdceffb0c1ee40701dbceed99f7c639762cf010a9bc4059576e4927b0f15b5d849fe65b90fa8 SHA512 5603c4d286694e50715dad0c561766890b90967ab3361002240ff8072fcfd5471e0526fb8bfbcf9f08523e4e8ae61b626666b4c5668ddf644701bd27087cd265
 MISC metadata.xml 843 BLAKE2B 76e91f5ecd3e1b2b2780a3f699552d0b1310859fbac1d695abd8234e6aafb621c8a1cdd5aec3f12e02ba0944801623aed39024355dd536f9303cce52883c68fa SHA512 a13eb0a2f1a21cb627a6f84224422e7fee029004d14c9f8b1bf4a9d4fe3712a16b823fa70dc494770a1397c8827060b1028e52e67356fb276529bfcfce861392
diff --git a/dev-perl/Authen-Radius/Authen-Radius-0.320.0.ebuild b/dev-perl/Authen-Radius/Authen-Radius-0.320.0.ebuild
index bff0006635e2..5e558706262f 100644
--- a/dev-perl/Authen-Radius/Authen-Radius-0.320.0.ebuild
+++ b/dev-perl/Authen-Radius/Authen-Radius-0.320.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Communicate with a Radius server from Perl"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Authen-Radius/Manifest b/dev-perl/Authen-Radius/Manifest
index 38a5da6b1543..815537a52247 100644
--- a/dev-perl/Authen-Radius/Manifest
+++ b/dev-perl/Authen-Radius/Manifest
@@ -4,5 +4,5 @@ AUX Authen-Radius-0.32-no-install-db.patch 1236 BLAKE2B 9e17c1ed8faa32ab0f7faca2
 DIST Authen-Radius-0.31.tar.gz 51311 BLAKE2B 52aaa623ca28b1b406c027fb54f38c9f24b347815aefb3336649b4ff505a0b97db516b6877546bd330505516f3481934b0c46975c017ae76ed475bc476bd1c6d SHA512 6b78254a6a94f67bd3a5529d4313da779d630a57e2300b02a49034c153b34fec0c6e745c5419f5a5e3ba2996d39907834d3f909ce9fdbd0edc6c43668f89d380
 DIST Authen-Radius-0.32.tar.gz 51366 BLAKE2B 12b18554fccd56aa3668224e2e1a932108993ef845b10b3220eed212fb3413d875cdeb8e8fdef2ba439b0b0ab72417bbb9c830bc2a023a03a0c221b3f52b3170 SHA512 323bddead9465d60da8d1b0f4500fec436c14a8c82552b24da54a6798c0583dffb37005f7abc627ea9532ca46bd442063cddd52d8c5923aa10fa7954c728bca5
 EBUILD Authen-Radius-0.310.0.ebuild 986 BLAKE2B 8ca3ef42d2ffa3dc40b93bcdeeeebaca6f903a8c67df69326e244eca7ac4d2bc10fe782572211a29433dfccb5fc47acc7580a786da1475dd6eb5f37375c9c6de SHA512 9c8fc015aa9ea0bd8dfa90d49d552f4ccb66daf43f8eb1f357df4a517cfd3199f64fa80aeb2e9e241e8bdbe2039a5ccc053abd440824589cde322d27f9133874
-EBUILD Authen-Radius-0.320.0.ebuild 988 BLAKE2B 8797eb6940cd535d086f87a63d4071c58a5b6a55a5e9557c872a0821e9dcb8be539ac8fe9166c9af4b35f34ca89ddd822680f1e820e885ab918f47692a6b596d SHA512 27eeb3e49ad672b3c979882c0cd543935ca0f732ae0ae8b90d7ddad5eaa0443a9ee464194314427711259a762611b82794835cd04660e6b1d1c0938b0e637163
+EBUILD Authen-Radius-0.320.0.ebuild 986 BLAKE2B 293423bb066dd4f00be145f7074a6c026354e5aa70a5cb68210e2b515f7b178e4b449c7f1b4ed7aaa601b7f2bed143da053ff1513b143bab9e875f2514e863a4 SHA512 bd2247a40a9f13a287313e9054071933697a0ff67deb1e310b8bca0f9f4e2b1389518dfca0591175777352eb69191a8aa3b8a1dc974c1bd41544d2959f25fe03
 MISC metadata.xml 398 BLAKE2B e4d3554055d85f7488c0b8e71da8792d7e86560ffe3cfd3037caf69e708f777ffc6e9044d76228463b71c82ad1ca85230e1aec637140fdc2ffe3f9042344acbd SHA512 780392f67556558208d30f88e4bb2ea9c58acbeb250bb01df4de7b9d1cc90e6d17634c4447cb7f779fd1748be3c363b280cac716b250a66c7d1cc1dd349a4ece
diff --git a/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20210112.6.0.ebuild b/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20210112.6.0.ebuild
index 33dcdcae4869..67ac665aa751 100644
--- a/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20210112.6.0.ebuild
+++ b/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20210112.6.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Data pack for Business::ISBN"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 LICENSE="Artistic-2"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-perl/Business-ISBN-Data/Manifest b/dev-perl/Business-ISBN-Data/Manifest
index 7776cbbb8d00..4c0f6aa9ffd3 100644
--- a/dev-perl/Business-ISBN-Data/Manifest
+++ b/dev-perl/Business-ISBN-Data/Manifest
@@ -1,5 +1,5 @@
 DIST Business-ISBN-Data-20191107.tar.gz 24838 BLAKE2B 660a7aa9ab7848cc74c20bcc8426126dc8054d81b0229c609d808bd3300a967d177a474019b2faf87d44198bdfbb4cab1fc39b3da7352d725a92795edee8f3a7 SHA512 33e6197de8b026484784d33fdd88e1a0d442b633ade4eeeb45812709cca252c235a377e3b03bb3cade35256b5f5d592b70504cfb7cccd1005544af2a1e4a11a2
 DIST Business-ISBN-Data-20210112.006.tar.gz 29035 BLAKE2B e496a689afb12341307d80d16a2044dd39cd350caf86b9010f94a023ac285991486f6c5dc3e34d9efee70506dcb0aedb98abae7e5e7d573d9385bea6c5729ce0 SHA512 36245caf60d0b210dfbbc1f2668e6b8a227e6641be3800d4e62f6a9902b6b95bc2e952bc48ccd2a61ba958c68b142f64592ffeec9da8bc35d7c8bc5d9b625c80
 EBUILD Business-ISBN-Data-20191107.0.0.ebuild 665 BLAKE2B e5be92ad812b9560974fa941f4dfc2b920096cc150ab2e81f0f279bf619621a24c673fa314e194eeb663fc9f65939458bd3d86eff2fb0cbb80d1c74784b42845 SHA512 d68d38ddea6b1f4206bd073b616449edd49ebd7fb29400dfd113c3a721a35707ea028716ea52544975eaa2d2fc3abcd6d4a7a8985f8c27b19ce4e714eca54f2a
-EBUILD Business-ISBN-Data-20210112.6.0.ebuild 669 BLAKE2B 7dd67d701c1bcf27c9dbc12cc952deae55a4cc47cd4aed8375050d1700201b42f90dddb1412f371b65a1fed625675be430bcc58e45f3de97189311193635d907 SHA512 79234781f77367302348156dc325c47b03e7c1b48b5bbf3febf61f561f436ec156f2c536a88fcb4854b3cc1948947a64cd2e92bd803637862ff0b68d126dca5b
+EBUILD Business-ISBN-Data-20210112.6.0.ebuild 668 BLAKE2B 677050ddcfc0d39f3b54becd067cd1b756e3ff60e4e9faeec8f1ffa5617ec1e842bae3e290da2dc8a97163bf26110689001e2e95bdfc3c8e1d396a9531d9f6c7 SHA512 629dba6118c9246a753085a9c730cbcf1af59389914173f5cadb4698f0acd96280f12a0669b82a7003a33adeeb45ceb3f5f50cabad7a4f9ec762274a68cba6fd
 MISC metadata.xml 397 BLAKE2B e4bdbe6bac37eee08b563895b3f115354f8da2eaf188f07dc5fe5622123bcb0b2a6922aaa36225592421ead5112ee4726ebffbdf4cb9d49b9bb9a9fcb8f245d7 SHA512 6b4c787a3c7d17cfba431a75ad690ee825c9cb7729638a3e84d7f226b30a462f5dc15fe2ce6e6d3a6c87ea355225b2c08320dbca5e564d843f94e77dfa820be6
diff --git a/dev-perl/Business-ISMN/Business-ISMN-1.202.0.ebuild b/dev-perl/Business-ISMN/Business-ISMN-1.202.0.ebuild
index 48021b61a784..20bf5fecc9a9 100644
--- a/dev-perl/Business-ISMN/Business-ISMN-1.202.0.ebuild
+++ b/dev-perl/Business-ISMN/Business-ISMN-1.202.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="International Standard Music Numbers"
 LICENSE="Artistic-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Business-ISMN/Manifest b/dev-perl/Business-ISMN/Manifest
index 35fe363ce7e3..e802b21f61c1 100644
--- a/dev-perl/Business-ISMN/Manifest
+++ b/dev-perl/Business-ISMN/Manifest
@@ -2,5 +2,5 @@ AUX Business-ISMN-1.132-no-test-manifest.patch 755 BLAKE2B eaed31d13688d5afd1f17
 DIST Business-ISMN-1.201.tar.gz 14793 BLAKE2B fad3341efd853824e529b5629d501b7c8129724e922868f09cee13209281f15f65e04d7cb2b0d7a5c2c1599effa8367bf71bc503908307ddba00fffc4dc7fd06 SHA512 96f8783d90ddc561a24dff4905127b8983357809df2e31524f3e1f3ec30a56eb07ac9312bc127196602f72d4442b284fa195be22d6d71bb3a6e971dbabe46e22
 DIST Business-ISMN-1.202.tar.gz 14872 BLAKE2B 4101c2ddeec2f285f5d77a8c7fe2f2be325f99b569c759dd521c9078a3b4b479933d4408c839def5c0155cac907b9a8cecbe9a2133b20b31a14004bd5af4488b SHA512 3f3dc2805f15edc92175c60fcf149e7a9558dd91a70173d559b298cedf177b92967f62581f16036a6c4269c3a5bec0d4bcd20a6ff9c13f4e17bec62fdca19ab2
 EBUILD Business-ISMN-1.201.0.ebuild 660 BLAKE2B 20ec4cf8f38fd852aa678b9150dfe92619048fe84505c7d4730aec4eacb69fac907fa1c4dd894fa1f5a8a66d5fea25142fadabed68eef50d7c4a8b9d77b95a92 SHA512 8ec9433d379fcde38bac5e91603ff657607d5534af1e1a931141b2ebcb8b3ee2d0c0b7eab507736ffd735e490446a6a0854732edda28549e59cf98f9f0cb13bd
-EBUILD Business-ISMN-1.202.0.ebuild 664 BLAKE2B f6cd661303353cc732862eb4f18daf19e33a7f854a20bb5ba387e1c69f66dabc4639f4dea791e2c76ec6aa464e7f1f2387de7ce42e8908d961373c49d21ea860 SHA512 4f7a65772d358d394769944d1ac8ceb9f6fa16c0055dfe8d087475bdd2c567753b8814628d4e8c72e19b4f63c79fe440abd90bd7aa40d0a36d289416e91d3ef1
+EBUILD Business-ISMN-1.202.0.ebuild 663 BLAKE2B e6b4003631292e22d5eaa98fd8b596718858cf54909f83108363b68ab37d94af00c6d3cc1fd86af4e0fe8dfb9f79924def1fa125b536e13ba8f1635812972384 SHA512 268a028777ec929a0a7e7a31358b981c50eacabd5e3b2a7c3e1c9be45e30a4c9f8cdd01e0ab15b4ae0b88baf996af2c22498bc27fa35668192233cba23522bb2
 MISC metadata.xml 451 BLAKE2B b8a6f64a351d0c2130eef0af9ae3cb3aa0ec3556ce2c1bb36595def33ffb66fd258764eb1dcc1d971c66db49d83f00e91d2bcab571a6f806677d1418cb471e5a SHA512 863d618148d547d932ae2b2121a7a4acc1b44c0a5b4d41acf5330da36ff149bce1be81e6b1167c82535b0866e4a74a3c0d811e3c990474adad30dbf3b488d508
diff --git a/dev-perl/Business-UPS/Business-UPS-2.20.0.ebuild b/dev-perl/Business-UPS/Business-UPS-2.20.0.ebuild
index dd3943fc1b00..eb0acf7de97d 100644
--- a/dev-perl/Business-UPS/Business-UPS-2.20.0.ebuild
+++ b/dev-perl/Business-UPS/Business-UPS-2.20.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A UPS Interface Module"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-perl/libwww-perl"
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Business-UPS/Manifest b/dev-perl/Business-UPS/Manifest
index 24d8fc5bde51..46b4ef6530a1 100644
--- a/dev-perl/Business-UPS/Manifest
+++ b/dev-perl/Business-UPS/Manifest
@@ -1,5 +1,5 @@
 DIST Business-UPS-2.01.tar.gz 9341 BLAKE2B b3b4e6e80fbd42e9e0626befd49bf6318d31215fdca1707516e1c104249ddb8e40d7c3df3c23a5284102d7a41006bb9b803ba890f9997402cbeda152ee1413b8 SHA512 1c0d60e9a3a513fd0ce2513e4e561eec60de5890bfe497b19d44976a2da9d7f31870bbc1824569b882ac573ddd969ad1d67293a2ac08a7750e2dd881d0f49f16
 DIST Business-UPS-2.02.tar.gz 10189 BLAKE2B b70a1d43a34ef4ba51dc7e0a7add8ddc32e614841e94da6344155cdc18eb7cb1cc88f63db6c95f6b9bc8903bff3b3a35dd0a08992d1327bde740c61cbc1a4c8c SHA512 417245c9197de23bce3a816dad79c212f6aaf26554b7f79fc55b4686b590836bc1febce4e0a6605939ffbb051f8b928f3ec2d113e75c632c1f59acf8b719347d
 EBUILD Business-UPS-2.10.0-r2.ebuild 354 BLAKE2B e767d61a8434627eee88c4b3ec58c84127676bbcf26cf02d4682057b5d83897d5ba2290a0f36c43271a2438519bcc01ca85a31652052090e1a16e6c35b7cba98 SHA512 4ba0cb3d1e44948ade652fc3005fdc1ed4084e84c213f67c5c37b0d240e9e45eb9527e8e9d76ff4eb8a46e77360d98c6d3c4f8933ca87184e493100fcc506c6d
-EBUILD Business-UPS-2.20.0.ebuild 356 BLAKE2B 9932ef04cda5301d4e10f1242a67e81ffd09ceb00180522c3058be988cc4135ed61315d148adb4ce10d52544136e35c3c305f199b7c133a5153eefdb73ccefce SHA512 8605565ee3efb3d74e28f3190c6ca70e613fd2a9b33fafeb35c1caa01004b4bc1f5c82f751123753605ae41f8e0a92ac73e9fc479c24ab29dc8eff3fdcebb787
+EBUILD Business-UPS-2.20.0.ebuild 354 BLAKE2B 4a77f94e19a2188e117a5d23d13f75fefd070ee81fa11b451488b040ba86636c6f4d09a8675aa176330d680d17b9bf0f8a8a10f5bf06f995a67010a151847bdf SHA512 9ae62a61105d53c641faf7c587b01df7c01162a71635f259f6d3000f77c676cf2cb683d2ec8d4d89523cc3a8d5b471225479b0ca01784a0ea595f88172d4a875
 MISC metadata.xml 396 BLAKE2B 754d2a709bc3a6cbc9b87257272db73cca51d147425fa9012454a75f935b273bd5154a6aba9a457f705286dd6ae1aded5b023430e6f47641d57fd02acc6ac60c SHA512 4abb0090cd043da2249a1a04645c17d83ca276916568dcb4ba6ad58df14d9f962fa0efe97ff3d4059d4f20bc67cab198ccf9f62b277a39f8dcba0ebacc9c908b
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.104.200.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.104.200.ebuild
index 0323cfdea7ab..8d29fa060d5a 100644
--- a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.104.200.ebuild
+++ b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.104.200.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Mapping Perl releases on CPAN to the location of the tarballs"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/CPAN-Perl-Releases/Manifest b/dev-perl/CPAN-Perl-Releases/Manifest
index 02d14cb95262..a8728562037e 100644
--- a/dev-perl/CPAN-Perl-Releases/Manifest
+++ b/dev-perl/CPAN-Perl-Releases/Manifest
@@ -2,6 +2,6 @@ DIST CPAN-Perl-Releases-5.20200428.tar.gz 23709 BLAKE2B 0ef30b30e482884d6a18d784
 DIST CPAN-Perl-Releases-5.20210320.tar.gz 23384 BLAKE2B 2f877172251478f43f16a3ad449dafbef890cf50041440fe4d9ae54c5b9704817df508405b27d6589004c2ae7654d9a12d87c232675e2409dcb1400097b1a73e SHA512 2e637949930de9f97648e7e9dd4e4ed90dcf87cb594b8244ad3dfda247f8f093883b10e6b4fa5376b83f980f1b39855788f052e5496a8e54fe50e4880d1c177e
 DIST CPAN-Perl-Releases-5.20210420.tar.gz 23356 BLAKE2B c77610c07e04312087eb8d9cb59a4ded3ffbd2f02301149a42ebe7855ac94755c7116ce13ddf66eecdb818440db3e33479321b89deb31c02b1e0c02934045666 SHA512 14dac283c46b9fc59939095abd5df2ed606f23823df0a23b06f804974e407ecaa6d0d2143664116b7e0a4990f3dfbc6d901acb02b2353b503ffc46b1a8cc41dd
 EBUILD CPAN-Perl-Releases-5.202.103.200.ebuild 528 BLAKE2B 853a5baf8e0c40a72d0af451f80e80aa177a13e6fc6241d1194aa7ac60b2811068cf86b9b64e928ae6191ba72cbf1cef45dabd4d94233e6204dbcee686b194a0 SHA512 497a08309cf9119dfba0899e9f09fa67e7b489d4aa175b07cf4c19f9bda4124c64667361d5a1678492def7cf6d44626d2ab4b42d1760266db0d762ac6772fc22
-EBUILD CPAN-Perl-Releases-5.202.104.200.ebuild 530 BLAKE2B 74eefee62b54db8d1a56a2baaba4ed484130f28801c1c83190adc37fde194166f7c6331dbc6b7c984a86604d925ff56326c094c1a01102089911859c9d9d014a SHA512 ffbb5af78d264919d331119663fa73f5766703540e3dccd2c1c34cc8d64ea3ffacd568d9a21d83a908d22838671dfecad21cc97f968ddeb193aa55b315e07b6b
+EBUILD CPAN-Perl-Releases-5.202.104.200.ebuild 528 BLAKE2B 6bd1de33879a6f385c537ac12b578d2e55b0f1af2541868a3d48c2916cac628a31d1da37d4f54b571136d952360f1016ffc6f6461f246e6f1e53d9d7db5df5c6 SHA512 44ed26e3db518956ef7fef6828c95d0b55494ff3abe92d6194724229d70a423afd69ef12d04db8e9a952e27101e02cc944ae54ca2cfd9f4f5f8f21ed3fd0debb
 EBUILD CPAN-Perl-Releases-5.202.4.280.ebuild 528 BLAKE2B 24eb766a5c697f36442d752871e7c6e01464d2a0febcebdaa36b467d1e29d5ee5f9ef0c5de2d297459876229b86395459ef8abed85dd9973f6228d239bf927df SHA512 95734c8c1306b9e5333ff3209c512d3b2109e28b2d2648d847f80afec49c208a750cc8ba50570ed5432dc592a9ad8ffb03d0a7ccd5eef254958e209dd2551ba2
 MISC metadata.xml 433 BLAKE2B a0b86cd3b77e9a90dffecb2d6b828713c337200098e616d348afcacc7871299a7f11d30b44b1211440f083d60eb81f28b8c6d92f6ed573bffa695b6bfb4bf217 SHA512 b890be772a432a55a6ff50c91180c9684754f167dadaf64ac05f638865e76960a36274207d7e816bcd85a53f6fc5f2b263fcf7adc3bfd609e64551aa23529363
diff --git a/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.130.0.ebuild b/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.130.0.ebuild
index 937d131c23b6..f66b308d9d55 100644
--- a/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.130.0.ebuild
+++ b/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="XS based CSS minifier"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/CSS-Minifier-XS/Manifest b/dev-perl/CSS-Minifier-XS/Manifest
index 405826270a6f..8fa3c01c03ce 100644
--- a/dev-perl/CSS-Minifier-XS/Manifest
+++ b/dev-perl/CSS-Minifier-XS/Manifest
@@ -1,5 +1,5 @@
 DIST CSS-Minifier-XS-0.09.tar.gz 14363 BLAKE2B e7dd8c24ef30c98146ec4bce1c0299fcf83c7c7696b8ffed96100b02654a313d826cdbf87cb9c60f08ac850b7cc5389f8cc38e2ff50d544237084dd84f2ed105 SHA512 520e40fa4a6d70bd7692880f3bc5c813a8648dfe12946426dedf0874e180ccd98e703d67ed8b502a7b00489aa2404edce844d80b1eccc48f94156a0d5c36ad51
 DIST CSS-Minifier-XS-0.13.tar.gz 25935 BLAKE2B 408907b70081963a1e2149ea976822723f510c94917c620df8122642213465f17759c522bd626b161404f2b7ba243ccb112786a026ee3241553a410e89764d49 SHA512 cd924e9d47e52fc96ed41ce4a8e4bbb3f9eea594b47cc6bb388050f1a2c3154d9dc359bc6c7f6c5f2811489eaba21416b9703d152fa403842aee08f44e148ae6
-EBUILD CSS-Minifier-XS-0.130.0.ebuild 288 BLAKE2B 464641483b0ec279ad3e5fc45ef340d22be72948bb03154097c48f88738a49b6a1b6851666add6f13e6a617922f52388d2f35b6708d93c929241a098eef91207 SHA512 374da3dddd3e20b12c73bec36580f3fbfb443639cef66ae5ab15a69ff3f3bd0fe3170bbb59e1171d7bb0559ed4438ddd6ad058bcbc46cf8e10d347c31b09f764
+EBUILD CSS-Minifier-XS-0.130.0.ebuild 287 BLAKE2B 5a6e44173ce6d6e18e4f6519d6254cc6586d7422afaf0059c95c5fa65d2a46be70e2a18ad4879e2f4126b6e7ba24cd51c70a77726569032f392bbb833dbd5010 SHA512 31269e05a53ea3d71b158b9219618145e326a8d46ddf0cc9618390c43094991e2eba8c49d9cc63d7990e91687aeac1dcd5c7ffa31f037459240123576e94e761
 EBUILD CSS-Minifier-XS-0.90.0-r2.ebuild 525 BLAKE2B ce5ac2add8fe5e5494620effc05de9ae3e66b477625833791918eba8be2e3112475c7ed669a42652a14ae8597c8c35112bf37cb853edcfa1731538ec0615143b SHA512 0e5156cd56f2a13837ff79d58ab360df5d33d0e628b156aa213b1759c00feb8abbfdc662dd4855f638633800b52a08d6bbb226033953862e15bdf5ff3b63a7d3
 MISC metadata.xml 403 BLAKE2B 025a38da49301bb4b4512a0be3542eae08c5ca47b6d2546dfae483212c72e49baef55d0988f877e721c2d9f0d4c895949ed727e16ead064d8e040ee16eb9c189 SHA512 23aa349976466bbc6cf6cdb98de641278e96c39af22c4805431b6ff22895e949dd5d526053c7d31071505a89d42b1b276fffa3e7a600d4ec4a3528ef817abf7c
diff --git a/dev-perl/Cairo/Cairo-1.109.0.ebuild b/dev-perl/Cairo/Cairo-1.109.0.ebuild
index d64d62a7d1cf..4428baaa67ca 100644
--- a/dev-perl/Cairo/Cairo-1.109.0.ebuild
+++ b/dev-perl/Cairo/Cairo-1.109.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl interface to the cairo library"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Cairo/Manifest b/dev-perl/Cairo/Manifest
index c0aab1f0529f..c61fe3996e68 100644
--- a/dev-perl/Cairo/Manifest
+++ b/dev-perl/Cairo/Manifest
@@ -2,5 +2,5 @@ AUX Cairo-1.107-fatal-exit.patch 562 BLAKE2B 321c95dcead052af47e6541d0ed7b86a75d
 DIST Cairo-1.107.tar.gz 111203 BLAKE2B 17093ee7058ecf27848042d3f49a841b6d6b4be9327adb959ee0d93a10f03de9caecd172b31775847b3561470aaf0f3c72b458fe0b37d2a451df47833e0df622 SHA512 613ba59ee3bd1adc2f33be60b395148f23d1de793fde888fd417f0b0cb6631a35429ee696172e9292b7d3fecab93de8ca958c96f803b9f5a16747a6d1fc7e9cb
 DIST Cairo-1.109.tar.gz 116924 BLAKE2B 0761066948797b06dcf89adb5f0d962f4ed48ba6bc3aa0c4b99a31c4bea96f71ffe0f378a1ea27e080c099b99cf8e99896abcbd042d91da747786475a3da1bf5 SHA512 b80841bff480acf95f69659cba02ca17c79b67a2dc5c9b9302efb15bbd79bd4bc2f1801c001c220723da11081e86a08a83e07ecc8866810ebf9406e1f6fa1c53
 EBUILD Cairo-1.107.0-r1.ebuild 865 BLAKE2B 0a8c474b7478d36a8ea0091895149df55bbaab7a48f61253c5dec0e4e1f6d9c3827877ba083bf6057b759a1a0885b36bdaa8e51bce5f1b6bd1e1713e4c290739 SHA512 6cd91327600684e41c0e278873d1181af14f72852de0731d2a811f90fb6699028b2c773d13ed051899dd12b4e637ec58b94e7fdba6fc3ba1576261c4ddd4fcb4
-EBUILD Cairo-1.109.0.ebuild 870 BLAKE2B 7d283fefbf06799d6cca1883b385e03d35bb6ddcf6ce5fd339aaeb79099337c55789996b6356a99a046b33f40a84b3df3218166f01799940072aa4f1813c0a6f SHA512 17799f872e4dfc7f8c4999b17253d4b675891638aa4e5599e24bac872dd1fed41832116531359ced63ad57287c54da6d7b84a1fd8032c867560e7a800e0a9d00
+EBUILD Cairo-1.109.0.ebuild 867 BLAKE2B c8127f5f53bd15a2b1f8aff4b3682f90d8d4ee123d5a4e76dee7026ca6e5c4c0772815f08aa1d61705b31bcc7952f8a7bf45293250603b1e0530c4aee6880f48 SHA512 f3f2489a7f7ae7006a8fad57955023e2e38890d98911c55c55305cc394d8346c28e9ddf4b61b089f279c5e3f5ba4ae5d46b420b982be6ac29476fd3f61ef4a5a
 MISC metadata.xml 381 BLAKE2B 45b130cae3088872e69dc6de14bbab04077c7da7138e5fb200ae74995a3ef01089fd93bf6e5fb42d0f72f9c94cc65de484189ff35bd502798e198bcb80314b0d SHA512 49274f7b493bcb6cc09232123b5ff8b1490754559a78e7312add9b1cae4a406567f28dd5738e650e05be757fcdfe8e41624ad2825e565d385c9125249301128c
diff --git a/dev-perl/Calendar-Simple/Calendar-Simple-2.0.1.ebuild b/dev-perl/Calendar-Simple/Calendar-Simple-2.0.1.ebuild
index 2ad63834e06b..e8229fdd518c 100644
--- a/dev-perl/Calendar-Simple/Calendar-Simple-2.0.1.ebuild
+++ b/dev-perl/Calendar-Simple/Calendar-Simple-2.0.1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension to create simple calendars"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Calendar-Simple/Manifest b/dev-perl/Calendar-Simple/Manifest
index 84d8fbf578a9..a6f1fe7a861f 100644
--- a/dev-perl/Calendar-Simple/Manifest
+++ b/dev-perl/Calendar-Simple/Manifest
@@ -1,5 +1,5 @@
 DIST Calendar-Simple-v2.0.0.tar.gz 7024 BLAKE2B b86153bd0d50b14e6910bc0bafe5aa8c7343112c2538001714c62de3a2926a1b98e2cfbc05289e7fac702e638c5ad6090929baf611e33366bb309bfb5ae231ea SHA512 2e9e16a27d254cf68e38be2ee1715e1f8d0d3b224ed8fb1a2a5e56ac172a25f67beec08b7a18bf0bf69a66a3ed7d94d058faad46f3a266a24e2b39fa8e2d3efe
 DIST Calendar-Simple-v2.0.1.tar.gz 7079 BLAKE2B bad35402ec02c0a161d4c7e04ea4f01dff1a5120fb1da79550d4eb073142f05de8b2badf3fdcdb899d202ba307c851dcf7c9ef71364409c264fceb97afe34a87 SHA512 158df4171a712a14190ac539c32dd3afd8cfa9873e14295d19dd6f140b19d853574c9452485ac427e1dd803ee5721b2231e3a404f98c50a0441efbc7e983ac64
 EBUILD Calendar-Simple-2.0.0.ebuild 584 BLAKE2B 6deff2e103647591315f002a160051c73f651e6b147d7fcaec2426577b34c2a3b620b038e6e1fdb129de36381085697410a507130dc4fcd0fe3ea3918f8e8816 SHA512 65f958aa2eb66ad086f5bb6ee0790b0cc292c3f7959f8d47843ff148cddc2a6a19c3a1e9e8edc91b1eb9c35b0323f217174708f45bb7ba2e963ab867aafb47d0
-EBUILD Calendar-Simple-2.0.1.ebuild 555 BLAKE2B 11830b57e618bbcbefe23d93b89309f79c560a4a7ecb5d435199f8f3999e0a67909b5e4549d60b0f265dc7e328b4398ed45c00653491b6f2a2ed6c04c89a206d SHA512 fc6a26586a54d71dd7c5165268962e8e9bef665b64aac2faaf01098e52d7a70b5de4aa25cb198c2500bab3049b0933efb3a5af3f81e10fa8e47804a62a3ec469
+EBUILD Calendar-Simple-2.0.1.ebuild 554 BLAKE2B 1c20eee432f176d89e230853680b91b5a74acbab6f66b0590ca155a0fb6c065676b9ba29aaecbe3bd9abdeffa10fd209c7ac22b26d47305668a66caaf7aeee5c SHA512 27f9e59114b90fb6b547dd073f0745713584a240abb1e553559dc6f3babac1367cb7fbefe94ccf6fa7ba931e497761f649548b7ae005b8575589dd460dabf05e
 MISC metadata.xml 402 BLAKE2B e465130f7fe7cb9d112ee98993aef5e231358cb81da41b3b69f0d32f06be9d7789d92322f8c3d42d6f4da3254b3aaac502aade47bc5c3da28754bf07ae803ab8 SHA512 d35e03eecd4213fc034e86a4d8786aeeadfce4e58bc210cdc50e39b89aad8cd407481ee44cc7bd96e510279087b782d5470eb8fcd4f653236c717bcea01e18cd
diff --git a/dev-perl/Carp-Assert-More/Carp-Assert-More-1.260.0.ebuild b/dev-perl/Carp-Assert-More/Carp-Assert-More-1.260.0.ebuild
index 054413c07e65..04ee6aa23221 100644
--- a/dev-perl/Carp-Assert-More/Carp-Assert-More-1.260.0.ebuild
+++ b/dev-perl/Carp-Assert-More/Carp-Assert-More-1.260.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="convenience wrappers around Carp::Assert"
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Carp-Assert-More/Manifest b/dev-perl/Carp-Assert-More/Manifest
index 1c90a3c25c22..0f8154c493a9 100644
--- a/dev-perl/Carp-Assert-More/Manifest
+++ b/dev-perl/Carp-Assert-More/Manifest
@@ -3,5 +3,5 @@ DIST Carp-Assert-More-1.24.tar.gz 14414 BLAKE2B 0a0a710a9248956cd6a6cf72c200348d
 DIST Carp-Assert-More-1.26.tar.gz 15205 BLAKE2B d64da531e68c59378bf1d42f15f622910dbb5c72078cdc4b37dd82564471e437c73bbfeece6297bed93b25f5e623795cd318db02dc4535a8a2e6d47bf3deeb2d SHA512 ef2a6adc62706dc15f45eb54968eeb216afd2864386f26ffac3a78750290b34e08b52149938b02b7f252252ddd85a676d6a94572d49ca0ca743beace24bc5c36
 EBUILD Carp-Assert-More-1.200.0.ebuild 785 BLAKE2B 4c1b54f408a7c8820f3c1bc34c85f0bc5740694b46c2b374d8a120dea57e5044edc3d5915b2b9dd21316b260c3d6bf32ced0fde51dc0c3409c837d885d7b2243 SHA512 485452a82c8bd8cc179dd61f64efac8841999dcf25328895998a851d16b13950f4dd92f1e3d748343055b44d1055d220217350817bfa664d3489856acffa64d5
 EBUILD Carp-Assert-More-1.240.0.ebuild 805 BLAKE2B 6ff14057fa01a85a55974277b6fbe5eec9da4eec4145f5b63ab8cba7bd6a7b2e931e3c79b3fa24272d46dac1f69d649e95c2693543c6d8a530b24722558be19f SHA512 d8385d3fb04c0237501a8e1fa82d90f1d9d6c3728f2a21206d4a0bb089589d1bdf81ae5868249ba3946831564ffa906946737e2b00e7c675b8de259a1d1fe903
-EBUILD Carp-Assert-More-1.260.0.ebuild 847 BLAKE2B 1dcff36d8b0aa06648b98f1db9d102540ad885527664b4bc9c395f4c37582c2e9523975f7e08f517c7bc2ff7edc19f1b62c6ba87e9012dbe027c36544d166ac9 SHA512 ebdc5d612ed5afa5a920ecde471a4bb1b19423f9ff2db6a93e8946bdf8b4741b2d2a33a48efdfe8c3d8d7f246739bb7e0f72888219bfb72c730a084c953bdf36
+EBUILD Carp-Assert-More-1.260.0.ebuild 844 BLAKE2B e2dce1424277b334d474c539b9990f6170698be1ee77067c365cbdfdf38cd8987ef9552a546b323a853c94f919d098d198212f9cee6a33a186e6ecba85998fbb SHA512 3dc0a27b245ceb534806cac912ad03836a4847c5e56334262ba4400cd4757e957235a9f653ab5bb8cdc5a3c0341f209d7eab81578f675b3abf7eeda55465d08b
 MISC metadata.xml 405 BLAKE2B d8ca44fe4df62b0f030d968ea7835b52f9bd1dd0fe2409c0555fad6f1574c872dd2815a87f6c238ba2d7f4dd2ee3ff7fa712177b919b2d5dee3091a6d2871f42 SHA512 ea517d0eb9c3a7b9100622391d5a6ad41f3da6a019a612ba03ce6d850c229d41a41f53c7c0e59c06b80c145c0fbbdf597d5dbe803fab77271671ca3bed5b4889
diff --git a/dev-perl/Class-C3/Class-C3-0.350.0.ebuild b/dev-perl/Class-C3/Class-C3-0.350.0.ebuild
index 9354afa52766..dca6fe7852ad 100644
--- a/dev-perl/Class-C3/Class-C3-0.350.0.ebuild
+++ b/dev-perl/Class-C3/Class-C3-0.350.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A pragma to use the C3 method resolution order algortihm"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Class-C3/Manifest b/dev-perl/Class-C3/Manifest
index b8df7197d48a..aa2b60201a5a 100644
--- a/dev-perl/Class-C3/Manifest
+++ b/dev-perl/Class-C3/Manifest
@@ -1,5 +1,5 @@
 DIST Class-C3-0.34.tar.gz 24819 BLAKE2B a97dbec6ca02bbbc17e0f2887dc0ee0e36bac7d3ef17606a0d913ba163b07f87019ade080d7f4a70afae0dc16c4ab3af4c6163102cb64631b70d0460fd1643aa SHA512 3400b0f827cceca47fa352f634c1a08f33f880e7899be4c44f7bf2a113f5530a7ac07269ae6a15a3c6cccc7dc6bc106c8888daa68bcf7a41bdce072e32c957f4
 DIST Class-C3-0.35.tar.gz 34534 BLAKE2B 6a75b55f14349094ddcd62aecd736ad5de588a767e90a683bc4ca2731dda5cf97110ac8e336fc060db42c21e9da39674eca34a9fe129e17575e191dbf24b67d5 SHA512 792dda26d6c77652ae0d1ca868284a798c631523d29f338d3b5bc771fd151a8529f6f8692a8fec7a9116ac8e40831b714bcfd205736c04e56e91fa39a4bae9a6
 EBUILD Class-C3-0.340.0.ebuild 645 BLAKE2B 6c827c5b0d6ce21fad4a6bbf1467e1ccc0f7d2d06f39a9aebcef547fac16ce47d638c60e85d0e6b45276a4d700ec749c61c13d70a7b18126a479685d61fb3c4e SHA512 21e1382c5c49620e32d5f7eb3f5d9b6586f1502f1f3949184528519534f718cd074e83194775a136a2bf3fada00a94b4330b5b1ff5f4138d58d12a8c0edbbd2f
-EBUILD Class-C3-0.350.0.ebuild 649 BLAKE2B 5f45b328c538ff9ef09c25d17701f44160cbcbb45a083f7525684cb69ac063d462572a57d2743f151b33537ef2e22a76b2603a73111c1cc6e1f055d761000430 SHA512 d44009141466fb240fc9a5b11d1a14db2033a81a6949b855507ce4a97b5bb1bd23804694b8e86f3f2065f7701698e6acfbef15a3982b071097dd34ca020f7243
+EBUILD Class-C3-0.350.0.ebuild 646 BLAKE2B e0a06f2478486ad98e2b9a6e7c3260f65e4d954625f2571127f5b5cfeafe797fd9d4faa10d168414a4251917a0b86bceec1c1708b090aedeab689a1c40b15e63 SHA512 09bc0e71f50f2fc2b50997dc8652e407900751aae67f92dcba3287962f17cad3e3227b21f3d7c2824b6bc4dac10ff50e7378decaaa78ebb53229120d3e35c7d0
 MISC metadata.xml 388 BLAKE2B 1c59b1518ce173ef5a65e4a3ca2a64e99641e5ac2144145b5bddd1dd7a9777c781f342026403134f94e327800c533ed28e2e682abde3f51f9d795ecc3d01087c SHA512 0db92077a577defa73274a14e149a03e3a27bb1cfa4f06fd595a870e1348c2343d615ca4f250325cd21b912e62ece370a8dc511fd50eff64e185166d3884d33e
diff --git a/dev-perl/Class-Singleton/Class-Singleton-1.600.0.ebuild b/dev-perl/Class-Singleton/Class-Singleton-1.600.0.ebuild
index 24308ad6d9c8..422b02e1dc58 100644
--- a/dev-perl/Class-Singleton/Class-Singleton-1.600.0.ebuild
+++ b/dev-perl/Class-Singleton/Class-Singleton-1.600.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Implementation of a Singleton class"
 
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
diff --git a/dev-perl/Class-Singleton/Manifest b/dev-perl/Class-Singleton/Manifest
index 667acd9173e4..80684df1886e 100644
--- a/dev-perl/Class-Singleton/Manifest
+++ b/dev-perl/Class-Singleton/Manifest
@@ -1,5 +1,5 @@
 DIST Class-Singleton-1.5.tar.gz 7785 BLAKE2B 98bc10c6fda65abe6958360c780826bd76597cc597f8d1910cddf309c04eb3228d4ce8f5f03029a3a99a464eb158de69e167e5e9efc0c0f6d4f3c60938be2444 SHA512 f061a8b92d5f65e4fbcd14ef36ff1216f84443f487de34c98f7d08d6d18148f156c0cbd6249e75ac448c17547d1172dbda8b670a8e7573d3581c9c1196eb4804
 DIST Class-Singleton-1.6.tar.gz 16164 BLAKE2B 6b788f00ee703d1c09b1da54e24fd109f223cc825d9e41e8333758935a161ac9cb00e40cd013d3ebbc2c5ac94e29b2c4db1558784d6a5c870bf813647059582c SHA512 68b637ba57d5da70ac8e7a8a5e1874481681d6a217bb0c58a232d4329c582f32d29b5ac4c60a131bc863c8faf2852c5249bced9d286e87fefe4960e95f35b1ec
 EBUILD Class-Singleton-1.500.0-r1.ebuild 469 BLAKE2B 4fc69fab4175b0d880234b9d830937687f1f8708ac2a1e3300bdd7566b986dc370ef80349fa92bc0a63c4f29c40b3717679e15bce9fd92883743e0bc03ae29e1 SHA512 812e46b5b250ab8d591ed53fd991fecd66613e13e7a4191060b0d59b809425b6e8a91d59e5b96a1f4f1968e9ff577baf009aad2ba699e0beb75fd57c1d05b978
-EBUILD Class-Singleton-1.600.0.ebuild 485 BLAKE2B 17b8dff05af40ea7a62a43fa43b8c979d9b4cae49f1114127531160e0d39070a3fb5a632444eb53ba8a09c7a9190e5a069ae912bf0187ffb426d84f7e9f59c0f SHA512 198090f191bab92db9e07ea5a84a5ee90df79df8cf339e955d438f9aaa890c82e98a1795b6928b27bea31dcab090c45a7b4a9cd40eb8ca9a9bd9e70aaeee7cc1
+EBUILD Class-Singleton-1.600.0.ebuild 481 BLAKE2B 51852cf89d2e0ccf18a86e8a05d9814e746f17a365490e05cde4fb7105825c3f3a9ee3cc46b6905d162077ca7113e6b26f91889d9e930ac0a81772578299aee3 SHA512 2ddb010d21f933c82fd4ef0a9d8d12cc7deb530dac9f06aa3282e899a574f4fb0644b4e727b06081005c7d8f6753548bbe8bbb3b396f232ef737a9117d6b5406
 MISC metadata.xml 402 BLAKE2B 448b53179712f0a6f1ca4eab049c9f531b22f178e8a9ae2d9d9ce94cf7c5dc467b51a71a5f1234f0bd7fdd0d6bc480512d5a9e4291c98f7cd82ae395b4143ff9 SHA512 b2baa8b23ef41d09974517a93429563892d0c9b1fa0295253c936066f5256b9ee3fd4abc8a2458e20a2011c05ede9643899a8c9ae876c679f50ead08db33ac54
diff --git a/dev-perl/Clipboard/Clipboard-0.280.0.ebuild b/dev-perl/Clipboard/Clipboard-0.280.0.ebuild
index ac615a8c0996..c69c1b3a0761 100644
--- a/dev-perl/Clipboard/Clipboard-0.280.0.ebuild
+++ b/dev-perl/Clipboard/Clipboard-0.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module virtualx
 DESCRIPTION="Copy and paste with any OS"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 ~x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Clipboard/Manifest b/dev-perl/Clipboard/Manifest
index fac03afb5b60..e9ee2ac586d5 100644
--- a/dev-perl/Clipboard/Manifest
+++ b/dev-perl/Clipboard/Manifest
@@ -1,5 +1,5 @@
 DIST Clipboard-0.26.tar.gz 25159 BLAKE2B d4bb2c311afabf5e6e751b144d71f269aebdc743cab31b1064e1f77f563e109ee1a196ec0a483aa362d39e1549cc02ebfa01b82172dcd10a3a173278fa64ece3 SHA512 68427934e4c460492f0fca1ea45891070e6aa544b49896d383786918055889ab179bc9d926018f85d6f77e89f7882098750d55b8dc656047bc63ec07d1c515c1
 DIST Clipboard-0.28.tar.gz 26673 BLAKE2B d0fa906f3761407513214cc7fe49b6f14c31d078cb15a58a5f515823c2216a89dfaff02dde58853f4e236302d635a97ecbf4050c2474a6dc33dbc8f5cfd83349 SHA512 154aad47e03cce2609a6fb615fd95ca283d18b7c8f6af2219f662946d13b7554088c585b8160ae35f96137a411236fcd81a89dc4388ab03da4318d0cc7767c32
 EBUILD Clipboard-0.260.0.ebuild 594 BLAKE2B 909c92c47a073addcb0eef6120bcddb325628be58842050b95e33f598cd9bd9a2d1c349a02bcf1102eca04c598ce16554a3dbeae04fc77298e68318c8a399615 SHA512 f577af1316545fd56d36b3bf44021b75c491fc994ca4b80c85c4f36dba8c9eb3e77864964d9fc62f849b052db00c98f02d0ad89e98c499dbdc35d3cd47f3b54c
-EBUILD Clipboard-0.280.0.ebuild 597 BLAKE2B 1546c6ee26c2ef0b85a07716061b16d614793834ac9699c288b2b770e56e507a987428cf2a8d1b636e0a63ad50e4d0c184a5997694b093088e54cfe4bd041593 SHA512 0542f054795a548ef0baaaa5624bcac4e843395f6eeab42777428935459f053b82bc00266e507eec6650844ecdc9f6db52c619c7f2f6a402d86636eb111a32d7
+EBUILD Clipboard-0.280.0.ebuild 594 BLAKE2B c541490059c8745d5a8f4f6a937fd1bc77e385802e2ead18a628fefce958b53fbd6dcfe615c5304097ae59e7dfeab5b6c1ba37a8586d843c9f32d33bf510966f SHA512 e64d066237b1628e3a058198178816418ab97e9bc794378fb596619c477d02199cc4f22880057819bec1306e2f59b7015c20a33476a01cff88acf36086b56f18
 MISC metadata.xml 586 BLAKE2B ad8c037b52375b61b9e290d4da9bb39c6305224e2d7d82422ec27c1140e75d5fc79de7fb2e867880ad813e04fcd8358fa4148aa94df409b94e35036883c997a3 SHA512 358a83681b2632a2c5a8a6e4698fe997ade81de7dcb39d5610170e33a172990ff5079a0ebe6d6fe129576df16ab0fae2f186ea6bc09a5a8745f3398d3c642115
diff --git a/dev-perl/Config-Tiny/Config-Tiny-2.260.0.ebuild b/dev-perl/Config-Tiny/Config-Tiny-2.260.0.ebuild
index 820219de7c2f..2cb17c7d95f8 100644
--- a/dev-perl/Config-Tiny/Config-Tiny-2.260.0.ebuild
+++ b/dev-perl/Config-Tiny/Config-Tiny-2.260.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Read/Write .ini style files with as little code as possible"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Config-Tiny/Manifest b/dev-perl/Config-Tiny/Manifest
index 8de90f306b84..af1a944dde75 100644
--- a/dev-perl/Config-Tiny/Manifest
+++ b/dev-perl/Config-Tiny/Manifest
@@ -3,5 +3,5 @@ DIST Config-Tiny-2.24.tgz 24329 BLAKE2B c02333bf08f7f65187710e2ca333cfd4cb5ffdff
 DIST Config-Tiny-2.26.tgz 22443 BLAKE2B 7b6e24de08559172920ef52968eb1dca1a1ce2b52b0e02fa1cd54c741402ec5eb9c32b46a911850410056ab7c8f04d9b85021e539d9439f6e8b3e4c847b36be0 SHA512 647c48f3c4480bf8bb8ec22b7b9a3a5b813d4bc633760f5aef4e03ea90b4b979a0a1617dfc3dba6c31779d04bc2d8233bf61ee509bceb8b2d32e1df481c3f135
 EBUILD Config-Tiny-2.230.0.ebuild 696 BLAKE2B 2636f72cc162b02d2a7740c24246d0ec7cd2648cd1a54ceb10287fd7eb68a13618de33007f29f0c4e875669ce4c288871018cff47a6166d0993070d6f8957d80 SHA512 0bdfbbb334f6f161d6c1e011b3940a202618fc28a573855373ce3448a840942ebf56a132bb68a7596ee1c9412e7633b7aeaf0f32c6dd0a9f71ae0208afbe1b68
 EBUILD Config-Tiny-2.240.0.ebuild 680 BLAKE2B cf9fcf1823cd95aa4017a1d2eb27b444a8208e43f4d17fb2f766515fed5861c8c0fa1eac2928ef2755bd67bad1a4754afda304be02a326def2ee6b9b4efc0b7e SHA512 06d6886a401c30aaaff4c9541055eb2f14bb89c310e074f15329c392297e88b9e22520e979b6f9b323e892f63378ee3c6ebbd67ac86d92630464ec1d17851bce
-EBUILD Config-Tiny-2.260.0.ebuild 684 BLAKE2B 0d6bc75f3eb3d81efb6e3c89a9546a4be7ea09791ad92be5f14a28039bf7aefb707786ded014b81294740d28ed52329a0b0abd4cca22a526f47f35ca1ad5ab11 SHA512 aebfc6f070d7f02896c113299bdc72f7de15433430aa5e63b71fddbd3bfd33c262e7429bc8904ebf232427979c7969e03197ec854ecbd540c31c79327297cf2d
+EBUILD Config-Tiny-2.260.0.ebuild 680 BLAKE2B 07d2c571347fffc1c850a6600097e56261c98d932538f28ada64bb268cdc2ca9028368a64ed668543f522507e71d1850ebe8b5b4b4747117e64bc04d205e323b SHA512 46abec171a7de5cd565cb5039cb54b45923b5907912dd30182f942936c2a4485dd3fb6bfc34e9fdd2bc6a69c289ff00f8e7d00cfbe87e4af3a5c352087be459b
 MISC metadata.xml 394 BLAKE2B 3dbf4d403e27f06b66f9782f8b72e29a753f65fee08cfc690cf6f5ec3f676b8d6274fdc6cdf05c375202c87858fd7dd2ace53f9c0c3aadd47e2cc3ee62de6a1a SHA512 678f52d06ea7925469aea4b382628a360020324f3ad5b7d1b63c0a31f68635616e2bdc9c7c1aea659db417e845b4464a7c617c524df61b00c72f9fe435fcedc3
diff --git a/dev-perl/Convert-Binary-C/Convert-Binary-C-0.840.0.ebuild b/dev-perl/Convert-Binary-C/Convert-Binary-C-0.840.0.ebuild
index ee8cb2a2a81d..2e8a132c38b7 100644
--- a/dev-perl/Convert-Binary-C/Convert-Binary-C-0.840.0.ebuild
+++ b/dev-perl/Convert-Binary-C/Convert-Binary-C-0.840.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Binary Data Conversion using C Types"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="|| ( GPL-1+ Artistic ) BSD"
 
 # bison >= 1.31?
diff --git a/dev-perl/Convert-Binary-C/Manifest b/dev-perl/Convert-Binary-C/Manifest
index dd6b8d5da353..c15bb8f01ac0 100644
--- a/dev-perl/Convert-Binary-C/Manifest
+++ b/dev-perl/Convert-Binary-C/Manifest
@@ -4,5 +4,5 @@ DIST Convert-Binary-C-0.79.tar.gz 1559047 BLAKE2B 71e509742abc71a444082b524485d4
 DIST Convert-Binary-C-0.84.tar.gz 1348549 BLAKE2B 7271f68d26cd387aa75c2eb966bd8497081e690ed7bd1339c98864fe9349398c723dab26120ecdaf534f28a969e85df95aa9ff7bbde8e4f1146a4a9b79818f1e SHA512 1c5160b39e5b64dc61c5e6bfeb163728352721ebfdc8c5096557e19293136e0aea613bf166e9b539a3980c39bc98466c99691be7d4f7325dac0c05fdd324440d
 EBUILD Convert-Binary-C-0.780.0-r1.ebuild 535 BLAKE2B 819983cb503898300ed93b7f366195fa40e1d7f515891396a907174f9f6bc45df74f979fddba49c5a69efb984c95e97bb38e3151ba258cb299db0b61bf33b476 SHA512 c2f4629fa0806565e48709859d236304f317ab1a3550de6e69cfdfcd621683d6877b1756d9d2d5a8d50754a6a035ead89b238b55f483016dbb6918fe576b13ee
 EBUILD Convert-Binary-C-0.790.0.ebuild 542 BLAKE2B 4110510a112ad3ab1985668d1039eaf43c7e00004a10b275a8371e5fe00fbbb10dd57723553ce9554049c7a411d40ac810bad22d23eee5d2495c0a25591da44e SHA512 16ac2f1067ae9bc6a343d9cb963d5979cc2f0bcab983eb9bc2f569150660223bd358648dfddef33968214785bf77a7e69e98746e3e692d86cbdbc44df834b920
-EBUILD Convert-Binary-C-0.840.0.ebuild 579 BLAKE2B a3353f2b8828c75b6b92c388d9763ab3f099cd97231ee30d7e005f806a68066145bc63130a0336e99850db191915dc3ab362c17dba2b0691eb236c2340107d97 SHA512 508173688a2fbf8b8ec0c1dd366c876c17db7cacc440ea59fcf01dec9c281e762d441d651832d33b493eaecafc58233dbf16fca33bd987b85c0cd2221f70fd9e
+EBUILD Convert-Binary-C-0.840.0.ebuild 577 BLAKE2B 1b04ae98e1ed890edf70feaafebcf592d591c825ca75c7470212edc39080f53f1588516e42e39f819b6740235fa921b5d94e23bdbbf5ea0d5b2da884fcf459ed SHA512 aaadf52ee3eed1f147e421e04f604dde838e18b8b2e54b52306b026034db71c1b929ac7c727e7b1857444baf10336172a5a11da41a8dc53b372c97f5df984f7d
 MISC metadata.xml 478 BLAKE2B 0dab96e21fa8a982057859969e3ff5be89591a8141365a55abab6b12165243c20f81ba724af8fb5f1d0364face2606724567aa4d03cb2975eac7e5a554889f23 SHA512 589fee143714f35bf258db7a23b2d7539dd311b891f1c5132a8018f911296aa38fa45237a72be8fcbe38b890fb401d60bcb380cd1793eccfbc4287c114c0cda5
diff --git a/dev-perl/Convert-UU/Convert-UU-0.520.100.ebuild b/dev-perl/Convert-UU/Convert-UU-0.520.100.ebuild
new file mode 100644
index 000000000000..9c187d2466b3
--- /dev/null
+++ b/dev-perl/Convert-UU/Convert-UU-0.520.100.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ANDK
+DIST_VERSION=0.5201
+inherit perl-module
+
+DESCRIPTION="Perl replacement for uuencode"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-perl/Convert-UU/Manifest b/dev-perl/Convert-UU/Manifest
new file mode 100644
index 000000000000..12e3b6e6bf4f
--- /dev/null
+++ b/dev-perl/Convert-UU/Manifest
@@ -0,0 +1,3 @@
+DIST Convert-UU-0.5201.tar.gz 7048 BLAKE2B 1b762afa8fea704f954151c15722d6465a0b65188193e131184cb0d7c73aab3c5bcd63426ef848872511bc8f9ed3a23ad0148d502f5fb3cce3e38b4c5905f224 SHA512 2f44805dfef3bc0ea3f632c474ddbe8bde12e3b986eb49a21b68a730bb1df7afe8b5a64e57855ff9911a2bfe7f517b14a7ecee9d33b2f3a892871507fe461476
+EBUILD Convert-UU-0.520.100.ebuild 242 BLAKE2B 2d7d93dc809ed8041531543da9bfe56dbd278f7fe6c12a6c23d8e574edb2cc8c2a9912a99575cea98476ede874612049ef70f2b7ff600d8482444b775f83c917 SHA512 931cc88c81fdb708067c0207175a0189b14614389c4117c92645ed7219fe141207c6a3af0dd96fac3c72dbe21d147fc143f8429043338ac783ca84cfb563f0e1
+MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/Convert-UU/metadata.xml b/dev-perl/Convert-UU/metadata.xml
new file mode 100644
index 000000000000..2b9a936fc0a1
--- /dev/null
+++ b/dev-perl/Convert-UU/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-perl/Convert-UUlib/Convert-UUlib-1.800.0.ebuild b/dev-perl/Convert-UUlib/Convert-UUlib-1.800.0.ebuild
index 253ab2bb1372..70817a85c5ad 100644
--- a/dev-perl/Convert-UUlib/Convert-UUlib-1.800.0.ebuild
+++ b/dev-perl/Convert-UUlib/Convert-UUlib-1.800.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="decode uu/xx/b64/mime/yenc/etc-encoded data"
 # https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Convert-UUlib#Licensing
 LICENSE="BSD CC0-1.0 GPL-1 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Convert-UUlib/Manifest b/dev-perl/Convert-UUlib/Manifest
index 896550cc9bfc..ab385d56295d 100644
--- a/dev-perl/Convert-UUlib/Manifest
+++ b/dev-perl/Convert-UUlib/Manifest
@@ -2,5 +2,5 @@ AUX Convert-UUlib-1.71-tc-ar.patch 542 BLAKE2B a31d565d82d1af82a8a4c626046b46487
 DIST Convert-UUlib-1.71.tar.gz 277227 BLAKE2B ea5eab834a1b7c1d2edf19fabdc51bd2e2fac73413b26b7bf8c1d5c4accb342e9c9cfe026182188bd4efa50bafa34f033735109ca356eed7569a569284e823db SHA512 6ca67737a29709903322f506063c4c65e17a15a2cef40959cbf1309ba608867516f554bdec426e217ec610f84e76197d41cb8a2ac7d57fb640728b0e2ae5ef31
 DIST Convert-UUlib-1.8.tar.gz 302763 BLAKE2B 350e7eae80d3bad0b1f7020cbcc3f08113ff48ec9ed1bb3a7bcaefabc9c352382da719349aca92f4b8a533edbd3036e55fcc75f05cc80e4a52bbfa9231de328a SHA512 4ea39cf36e7406c9e8a8e0c50778594f004b91a53f7aa0f90d8e127791d85bad00d8d5586bb35180b2605c5552567d0ae62f048de92fb85b9d99a8f14d9a0a40
 EBUILD Convert-UUlib-1.710.0.ebuild 1015 BLAKE2B 98e4572af30783c9d44a0c648a81e3c8c710ef69367d13bb52ebc86d292c4af24625fb2d157236ca989c8cfd7c20ec975bb9eeb02282b273a32ff25ecde97f76 SHA512 fabf6d01ea9d51ab9431bea7a54893abf2bc7b6f7814fdb6f9ae18c61eacf457f7b7919c7c76a67f4abcf882969f9a323c2ebe644297beb3560c4b50defcd714
-EBUILD Convert-UUlib-1.800.0.ebuild 1024 BLAKE2B a5a2d7837e648e14664c496a53cce6b7fae27794feaa0d22086b791bf945e95817f132429a01d9c3c03efc97824893367cc6622164e9933bf2a1bd336262e605 SHA512 07dfe6ddb192f8afb71eac477dc47d6447a9a37f77a4b491c401bc4f514cc25e753f4edd9bd424d8a0930f2f28bde960be1e8ddaba3e98855b418c49f80803bc
+EBUILD Convert-UUlib-1.800.0.ebuild 1020 BLAKE2B f77486dd6cae1e0f2f3eda407ae1a9983d4cbd740a01538a8649a1b92833be934d3149936fecba4e87e0d840fb34eb8b41f0d59b60e4e089273bf2abd5846ed4 SHA512 09f1d4bc7f2bc6648b30730eac0d48e45241a358c3fc078c48c7f98fe4a2f49878e987b4ea147a4f5038e5710715e79769d2574b3901500bb25202ef0b0e3437
 MISC metadata.xml 398 BLAKE2B d50a33cbeeed58dea53e50d242123118e7185a708cfa125a3aa762512e6d06f4d5f61a47b9d360b9a978477106580ec5095918c26fead9e95cb716e62e907401 SHA512 d90cc6f5830f7d203eee61892b0f73d94954ceed6b20d9aba5bae0000218a34e2b28367e02f09cd6ad1e441a97c23ca510a816c10a3075101dbbce0ff94b69d2
diff --git a/dev-perl/Crypt-CBC/Crypt-CBC-3.30.0.ebuild b/dev-perl/Crypt-CBC/Crypt-CBC-3.30.0.ebuild
index f9ed0f4f30f8..191bda295ae0 100644
--- a/dev-perl/Crypt-CBC/Crypt-CBC-3.30.0.ebuild
+++ b/dev-perl/Crypt-CBC/Crypt-CBC-3.30.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Encrypt Data with Cipher Block Chaining Mode"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~mips ~ppc64 ~sparc"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~mips ~ppc64 ~sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-CBC/Manifest b/dev-perl/Crypt-CBC/Manifest
index e7a3d4a29aaa..09619c18a679 100644
--- a/dev-perl/Crypt-CBC/Manifest
+++ b/dev-perl/Crypt-CBC/Manifest
@@ -2,5 +2,5 @@ DIST Crypt-CBC-2.33.tar.gz 23470 BLAKE2B 476e555df0000fc81c8be9af6133f018bc1daaa
 DIST Crypt-CBC-3.03.tar.gz 40174 BLAKE2B 3a104c630bd355cfd1f4b87836db4460530437dfd21facbe221062c7a7a7142ec7450c79bcc93e797b219251622dc5c4d0c9e7f849fc060f6e197d3a1c66cc54 SHA512 c1c55dd5fae83d45893f47319323f6d0ad8295ec480b8ab034beeb33bb7d16f26bbedaeef6613a3495849f5034e7502b01c88ab75dd4d69234151d3b674929e6
 EBUILD Crypt-CBC-2.330.0-r1.ebuild 656 BLAKE2B 9cb7e3dc011ef7fe45041e375913232c7a7ba1f5e2ac5648217668ade87e943629b241550f9b3ed05f70253f9c6e4ed34a0d40df8cb8d6cccc4a198c9c0fe91f SHA512 d864dddf1e279af769f1688b5228c4f9de8a8343d1c22ec8f1a1ee54f75ebcd656679e3e60de9391ab763ab20a76acbe326e1ae2d6f6cfb8f861cad04d8c9989
 EBUILD Crypt-CBC-2.330.0-r2.ebuild 685 BLAKE2B 686572fa2b5571d8acca686e4a86ca998840ee57d8d3c1ae948f2c8be2af9588421c708162808ab712a209379dda948f54aa7f609f420b4a1e00b991a0e72dbc SHA512 0b0fb6b30341d79feb0087b5186abfe3c91bec0f5aabcfcb4d17f767368b3d9df52f2d704d14b6cf6311484981b9f6a71a740ac3d3cb2b2f92dcbc1777483892
-EBUILD Crypt-CBC-3.30.0.ebuild 670 BLAKE2B 46b265e679fd48105431555cb5c9130a82166c30aa2e7e66aafb2e7907a3c07a8711201aa25ec8cb5925ed7ba2e121a674650150a1f06cf1eddd99d4b72f7599 SHA512 a40d730296e7264e9d0f7bba3dd9a9a362fac99da347cd089f75a654233aef40706cee09a68e5f02ae0b918dd154c0f3a95fff16ea85859e7e9b8d09981d8502
+EBUILD Crypt-CBC-3.30.0.ebuild 669 BLAKE2B d108f247b9080a6e0f6bb694bbaf4155d06df5b9c2e5460f4d12b3d8b25f1ddcc164f9d5f5e1e1ed071ce11c7f1fd8ff622ca80bc36f1fa564ee26c1a94408d4 SHA512 8d9eb63e0347ef494017160a2ed92cf06b89f4e7928976c253a5db1e6e91791c0ae4b2d2ef920b6f63cfe470cdef1f5d5d10a8cbd9852825c8cf4b524e7d25e7
 MISC metadata.xml 390 BLAKE2B 4e0d374b1d7f5f80ea4a219f50f3f34f72b1adb39f8ea3c0cda62c619e16e1bba4e0aaa0f13b880fa0de208e48c1d92f9501be41a326af48e8baad5d6185edf5 SHA512 a8ba735447bc35f4649e69cc31c71baf84606cdc5dcd70f18b98bac80c239ba21cd46334d08c2a3f4f3277dd113996e7996e587a69e482b27393001840688e76
diff --git a/dev-perl/Crypt-OpenSSL-DSA/Crypt-OpenSSL-DSA-0.200.0-r1.ebuild b/dev-perl/Crypt-OpenSSL-DSA/Crypt-OpenSSL-DSA-0.200.0-r1.ebuild
index a966e3d7fefc..44c779fdc853 100644
--- a/dev-perl/Crypt-OpenSSL-DSA/Crypt-OpenSSL-DSA-0.200.0-r1.ebuild
+++ b/dev-perl/Crypt-OpenSSL-DSA/Crypt-OpenSSL-DSA-0.200.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="Digital Signature Algorithm using OpenSSL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-libs/openssl:0=
diff --git a/dev-perl/Crypt-OpenSSL-DSA/Manifest b/dev-perl/Crypt-OpenSSL-DSA/Manifest
index 03ba652188ec..a67758588934 100644
--- a/dev-perl/Crypt-OpenSSL-DSA/Manifest
+++ b/dev-perl/Crypt-OpenSSL-DSA/Manifest
@@ -2,5 +2,5 @@ DIST Crypt-OpenSSL-DSA-0.19.tar.gz 9244 BLAKE2B 6f930b8ce89c275c095f937ee256f9ca
 DIST Crypt-OpenSSL-DSA-0.20.tar.gz 9870 BLAKE2B a4651bb7a2f9ffed9ec90ff13ce69caba7bd8f653507ceb01d2774f1cbecf211922a33452ba0b260ae0ee31b7c1c64ec014e123c887a901ccbb83007f8d71276 SHA512 d9441c63af6eb9c33d040e3734f8b047e27c864c936ddc660323c2794b5cfee76fa37f9f232b3f6c61345bfbc7e5928b2265ecb975189d62af2afa0d07c911e1
 EBUILD Crypt-OpenSSL-DSA-0.190.0-r3.ebuild 431 BLAKE2B 7205de3f90ed1258b0eae3b16bf9c3eb1038a0c59f6f03bedccdca61821f9a74ca4598cba006b32168bd5c79d8b5ce825c4e3ebeb48068ea13076c23c41d1033 SHA512 081fbb569e4f29fe84ed1fa6db548103f06134f463e23d375514bf25113d1d5adb25d543fdac46827cc1534989c314445147303ff6f3f03d1f942c414018f902
 EBUILD Crypt-OpenSSL-DSA-0.190.0-r4.ebuild 531 BLAKE2B d7b49ae05feb3e7d1e2febfcfb9e7c99c58da5971955f5ecaa0b7b596ec01cf3cb8ddbd96e1069341f1b232470964bb6f1ad851ee353a9c7472a96847c90a44d SHA512 ff21a7c7c222f6ea0939621335e814e62f724ea5f9e8a3a1ff0fdc4d2754bdd2f9e86a595f0ec021c30d7ab42ba72efe62f4f4112fb0f3b1ab719b20239c14c6
-EBUILD Crypt-OpenSSL-DSA-0.200.0-r1.ebuild 535 BLAKE2B 44f68f7a16b734f53f5474d20fe0df387f8d9d8c1a182eeacdd9f620804835f635d9ed0c3b42d3084d5166a9412e444c892344574f6c8668437533991f439bd2 SHA512 ca99254454d9f220781c1cd700875e914e96f75ad377e33060f023cbde0c81707781059681d083b281f31e631fa447d541783c49fe9d2c3fabd62b69bb80f262
+EBUILD Crypt-OpenSSL-DSA-0.200.0-r1.ebuild 531 BLAKE2B 19392429cc0caa55888da5cc61a1860ed335a98a4bdde6afbc72ec7ed3d216e2af471d6f6f405a01f18b4fb30d03c94f63a9588b288b9b23c0e688efd9546bf0 SHA512 e01fc3ace6273560c0eed6761e8917123f71f7e6bb901841502b104649e48b79750104859854e86e9e43b5cea7b3908fb2f46f21a95bbdc91fab3a6db4145424
 MISC metadata.xml 395 BLAKE2B 533a15f8ceac7f4e2fe9163335cf4cd47450c27bc98ddaf764221d33d05ba336fcb3657a653cf0d34651be1e42eb5fdf745ca2bfffcc1b8ad1a6d69def33d1b9 SHA512 d1120d7c2642f069bd68f5caaf84a5233ab03d6696adafbd6258ba890a0bcd623750fae6873c3787684e43c315576fcb1a9d7cf31d86a674b832bec418d2e3ec
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.130.0.ebuild b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.130.0.ebuild
index de910aafecf5..4f739bdfca49 100644
--- a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.130.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.130.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Guess OpenSSL include path"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Manifest b/dev-perl/Crypt-OpenSSL-Guess/Manifest
index 108bf7cb9105..175845110ca3 100644
--- a/dev-perl/Crypt-OpenSSL-Guess/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Guess/Manifest
@@ -1,5 +1,5 @@
 DIST Crypt-OpenSSL-Guess-0.11.tar.gz 11346 BLAKE2B f22d09e23e91c36c722dc9800391b67a1f912f8af6a13ec95c9074e65559585c77e72596a6dae17db28e11f8449813777423a60d9af0147819dfcb91ba489152 SHA512 cdae7f20a15d24842cf117bfba4f3bc0ec7d1066251e0480cbadd8f0aa28c9c9573905726fc1333ea9fbbb3769a67dbf28043de8487dcce27dab5d14a0848b09
 DIST Crypt-OpenSSL-Guess-0.13.tar.gz 11832 BLAKE2B 4857fd301eb4348f8afe17b1b7780a404c5c2567323b37c36e1be9e0c545aabc78a27d06e86c4f0c34940a33ff43c78be006ef0365c346488646ced6f4d9939c SHA512 1b3286d536bcb7545be636e33b5ff37bf334fbb7f3a99f4fcb32cf1166b1bc7cc179e9d39af1c7ac537630a75066353a1d7a0ab97816757a444dc0068029da97
 EBUILD Crypt-OpenSSL-Guess-0.110.0.ebuild 598 BLAKE2B 837a5fbffe0409842c232df5223a45c4c5bf433cd4d3f61fecbd2201067930aefd27b4d235d14eebcb9579b542796b5a6f65576224d95d1f30eefe060b595a20 SHA512 0933a865287f63583dd02c2b156730a144fd6db79085fce435058245e198eddff389ae79aee3594e344f5ec26136b546d1a9dbf82e03f3afcddf90fcc3097af9
-EBUILD Crypt-OpenSSL-Guess-0.130.0.ebuild 603 BLAKE2B d8958d892deefb83b9b4060e0a534173994272084a3c73b3959f06b312e39b99e6eecd167cbe93dcac6e6a6743f6cf45fb0225c96d92547d9db1a1a65131e2b6 SHA512 0b91b430e25e1d2b8967d1cf895e844077a76084ef1f1ab391e38f033aa1a097e3dfe3f0fd72bb9a6b07032521c8655bfdb0fd09deda150809c8842abbaf05ae
+EBUILD Crypt-OpenSSL-Guess-0.130.0.ebuild 599 BLAKE2B 4df1cb21e5ff564444abab9e93d9be7721778b9f20b9b89a688455b6ac04b6fa106bb9e33fbd5cdddf492fc92ad59ed6328ec2ac115c845dd7a99759aa759033 SHA512 fc2902521eba6334cb290e42a8fa3a0528d446ff7684ec2f392a76dbd2e7d47d5c9fd0f137a85a08ede90c29cc5f172e36f39cfb9009b30d6b6d01dddc9eaffb
 MISC metadata.xml 411 BLAKE2B 777372daa18fae2658976904b22a5e17c15e1ce863a3ca026a03131be84cd435a8fa582c162500ae76881c6605abc8a2737ce877448d62f46e5101c1a9776b6a SHA512 da55f9571c2cec8cd96e6fbf95f74cab2b89cca8c74d32bfd217680f60ea0454b60b6cd851b0f8f841ea07ca2e23cb83764f0e28340eea38119ba216a31113f0
diff --git a/dev-perl/Crypt-PBKDF2/Crypt-PBKDF2-0.161.520.ebuild b/dev-perl/Crypt-PBKDF2/Crypt-PBKDF2-0.161.520.ebuild
index e24f8374d884..76728dec3c06 100644
--- a/dev-perl/Crypt-PBKDF2/Crypt-PBKDF2-0.161.520.ebuild
+++ b/dev-perl/Crypt-PBKDF2/Crypt-PBKDF2-0.161.520.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The PBKDF2 password hashing algorithm"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-PBKDF2/Manifest b/dev-perl/Crypt-PBKDF2/Manifest
index aff6da611b2b..a7c54311fed1 100644
--- a/dev-perl/Crypt-PBKDF2/Manifest
+++ b/dev-perl/Crypt-PBKDF2/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt-PBKDF2-0.161520.tar.gz 17163 BLAKE2B 0330d6516915acfed6fda4c2a64a067d9d1e2b4d99d1a5e367e9b36f20664c874f7c7f90b0734a5772bd49ca6e7b7ee1739af8be47836619fa3cd4835d962cfc SHA512 0f5dfd6c642fcc3b34bc96f10b6f7344a8f3bac1bda6c610e85099906545bc78953666415240e793deae6db055df6f1007f3a946973ee960921cec4069de3a0a
-EBUILD Crypt-PBKDF2-0.161.520.ebuild 829 BLAKE2B c2b99fe3c59c6960ccb2df8817ca7bd8d41da75f6b92c0feff7aada9d57741ec1ed2ec3b967d72760490c7d2c609739537efeef5386e7c67b624af773606f0fe SHA512 7c033d6cc0cafc57a1f0763003346b996ca5727bd653eec7f63ad1a5d2ed5cf26972f3c71a9be98b469e458752b3ef1b785257e2499722e813d512281bf5eb08
+EBUILD Crypt-PBKDF2-0.161.520.ebuild 828 BLAKE2B 91fc67efba3478f9bd8a88c31a9b16d92c95cb055a45c83abc3770422f3f7e9d1b35888c811661600b6ab3ee5c84ee57a64fdb08391ed3583b9be07c7fa717b4 SHA512 49a367afacd41ee535a0cb0ff02654496b2fe6546b21f1e5ca1c0c5a97f0403ff17a4f45b9d4a2eb3ebc97b0d62f677d91de59fd9500f527f2d2bc9d1fd55716
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.410.0.ebuild b/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.410.0.ebuild
index cf5b23795753..726b65ccb663 100644
--- a/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.410.0.ebuild
+++ b/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.410.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Provides interoperable MD5-based crypt() functions"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-PasswdMD5/Manifest b/dev-perl/Crypt-PasswdMD5/Manifest
index 20e878249944..84b164d1da8e 100644
--- a/dev-perl/Crypt-PasswdMD5/Manifest
+++ b/dev-perl/Crypt-PasswdMD5/Manifest
@@ -2,5 +2,5 @@ DIST Crypt-PasswdMD5-1.40.tgz 6683 BLAKE2B f12458349b2444a944d84a4c4c5df644fcdc0
 DIST Crypt-PasswdMD5-1.41.tgz 14275 BLAKE2B 179982aab63463bb3469d219a5304574f5a59b2a2601c48460c75bcc367043fc007571d3c8a8002f8b3c232f9051aae62f4fe8ae8431d580c6093bc9a9c7ccf1 SHA512 eee16e08f5cdca4d5bc2056e39e18bbbeb5e8bcf403fb44eb632a9a09496fc8b34ede4b2feaffacceafef99be390e44ca49767d98c05a62a2208e1c7e7ff5430
 EBUILD Crypt-PasswdMD5-1.400.0-r1.ebuild 523 BLAKE2B 0b0c60aa26eb8f71450f3d35b8c34f927483845f7f3c6091e313de3bc04223e4f4366621c047f3e3b894a23f57cbc96141701376b1fa3c9d3fbaefc17affc77b SHA512 d61071444b7fed0c68cedcd2f2c966b2d7293982748ed0bbe58c1df80536263efb1b6246df4dcdb973e2ee3dfc71ab022d3123b84795a01cda77b984ab01dd56
 EBUILD Crypt-PasswdMD5-1.400.0.ebuild 375 BLAKE2B 5b018b3917c463822be053ab2eec6e70bc200d44932f4aa59a832595a0400c5d70e50eb5647f503f88cf3b42649105f0805b46e06c42588d0fb268f8b43c708d SHA512 70b195282013ceb83d7217afc371636fc8005d9f28a02020487fcf31eea5a81ef1494f889bd6880e536d4bfc6e2f31c54d5bc72bde427308e5d595d1c7fe45b4
-EBUILD Crypt-PasswdMD5-1.410.0.ebuild 516 BLAKE2B e18e9cc2abc823ab90be46ed4d87c8ff7e9f571dec0733085e877babddb80264a3414d2dfda0546cd2cfa2a99f24363bb69f9d05d5a2b8aeb1f61a7efa542f86 SHA512 2da79c40cdaec08c65c48d37f4536052e8695b50e79c32c36c57cc4865a2c3a59445ff8f86d09cc9ab2d679fbf25a65644c96d3d6e63cc410fbe466f85587805
+EBUILD Crypt-PasswdMD5-1.410.0.ebuild 513 BLAKE2B fd26d80c93c542dacf04d677fc3c8c15c0a4715e5d9213b907a0aa719def14972aa9e5d97bd6871c4f1c41f484aa2fe5f92ba22d14dced7300be1d2b04802ed2 SHA512 1e5b809e7565be0679071be792f7c734e2d17635a27e5b99167a486fdeaa409278522d55114a3048c4348d2b0fd488c7042de55ed74a93eb704d57de1c8daae9
 MISC metadata.xml 402 BLAKE2B 114f8e8784fdb17e75716b970f56c996a00fbc46346c401de767f7838ad13f0c4918ef864b6ceca6a1c9df0df6a5bee9a1419a0ffca5449e6460fb7c0eb64064 SHA512 f9a560e71321e7da9e81c1e944616a89986060ce3c7f4cc4dbcecd55c26e385e244d01fad937076265a305921a2a4dbc8a9a22227fa0a1804a342185fe91ceb9
diff --git a/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.80.0.ebuild b/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.80.0.ebuild
index 9bfea92bc76f..c527ad669b6b 100644
--- a/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.80.0.ebuild
+++ b/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.80.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the RIPEMD-160 Hash function"
 
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-RIPEMD160/Manifest b/dev-perl/Crypt-RIPEMD160/Manifest
index 08598d56effd..81130e880dbc 100644
--- a/dev-perl/Crypt-RIPEMD160/Manifest
+++ b/dev-perl/Crypt-RIPEMD160/Manifest
@@ -2,5 +2,5 @@ DIST Crypt-RIPEMD160-0.06.tar.gz 58766 BLAKE2B 91d59a068be8a37243f21610a0ca490af
 DIST Crypt-RIPEMD160-0.08.tar.gz 60041 BLAKE2B c237fc8ff1ddb88eaa6fb93be6efc7ba4a45366e113651aab9570e836ca514db82d8a1392143d5fb04370fb5a01b6b2cb5ae6762784566ce85eb326167a1d972 SHA512 435e0239c67aebdeaaa328c10bb6d12934b72c436e4eb21f177281ecd77204fdf300c0a7f38ee59bc1ca61b08cf632989ab513c4ee51c78415c722329ab9486c
 EBUILD Crypt-RIPEMD160-0.60.0-r1.ebuild 516 BLAKE2B 2a11acb176df26d7ece6f68fb64b69c2552c268df14b378d1814c07aed2cf9b644180168fd1bcd39c4e01e620aca6d25c65eb68f8198e30ddde5e1dd70b5c235 SHA512 204edec6eb0cb14c107cc7dd5e456d1f4501ab66f399d6ec2945b1f7d56b11946182ca533994e15570661d8ac6f7cc8324c68bd73c5c5691969f7e6ce80abb0e
 EBUILD Crypt-RIPEMD160-0.60.0.ebuild 470 BLAKE2B b500105121e97b23ca7f83f4220b7376d570322f8d761b00878782da9cf7abcdce1dc72f39992f5d16c6264b4a0ee3bcab76d586a83de0aa46245f48c033121f SHA512 876281c2a2ac0ca117dae9d172d6f669e79ec1357ad203b6897dea65db34ddc3ba5a6641f3be6a787b667164be96a5a4152ee0151b79919b9be7757f72d4839f
-EBUILD Crypt-RIPEMD160-0.80.0.ebuild 518 BLAKE2B 05e7c40763b4e12c3fd1980569cd31ace3dedffcf2537d5833b12fdd42d20f365eddd9a64bae50febf7de39523a0ae2c2cb1c731ca94a99c05531af89c5a3d1d SHA512 7c0170a7b9ec9d40695be1be56f2c0e2e28a02cf8b5ab76b4872c713859f2b55545315e55dea737ecf9c4900e030e7b48c38c4fec8c185789d322718478fdf3a
+EBUILD Crypt-RIPEMD160-0.80.0.ebuild 516 BLAKE2B 170aa01e2a8289b2c213ffa82b0514eede254d5139889cca6038800acd32ea650c519e9a8445506fbd24f03441a3167e1cdbf96f7eb5cc4754e689ca38fa6504 SHA512 a6c1ac191153e6f7b0155eb9b1f20466d2f45e13fd0c2449f7d24fa6dfaa2ef0ff8bc82fa9b7c5457d8f5f5f1e6ff796a12259e73ba9cbd0e386947cd70101ec
 MISC metadata.xml 470 BLAKE2B c409ea10ae5e4aa047f677e6a2d7ce31767221a2c726d19fb3be1af4afdfca3c8f00dd5ee3e5605431ef046282951ee2843ff2eec4878dba5552bbf3e17e0d76 SHA512 bb4053c47922fc41a88ca9a9fceb09312a67fa7b99d382b9324564bf922b76fecb9e9a11ad1e555510e5dd97a4b81b72de1bcf6b9c74d37fb3b7579b13bf473a
diff --git a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.160.0.ebuild b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.160.0.ebuild
index cd699f1cabc5..a7f488ae1621 100644
--- a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.160.0.ebuild
+++ b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.160.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Crypt::CBC compliant Rijndael encryption module"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-Rijndael/Manifest b/dev-perl/Crypt-Rijndael/Manifest
index 0dd1558fc541..e33dc60ffaf4 100644
--- a/dev-perl/Crypt-Rijndael/Manifest
+++ b/dev-perl/Crypt-Rijndael/Manifest
@@ -3,5 +3,5 @@ DIST Crypt-Rijndael-1.15.tar.gz 71407 BLAKE2B 8f2ca89b80ea68b9874092941520e566c7
 DIST Crypt-Rijndael-1.16.tar.gz 71818 BLAKE2B 73cf5b0efb7822e1427acfef4b9134f8a693e9e8e9e7efe51a34a48fc202200616534cefce7018ee3c846f8a6f96525d79bad88b3bf2be74ab14ae31f6484d46 SHA512 e33cb691cd62d9b98f26c8f0d1365437f8a77154a4100be4969a88ad094074fb2f855fcb11541dc63743f861ef0c45944831b7f887df9bbb0b4ec36d6e0fd66d
 EBUILD Crypt-Rijndael-1.140.0.ebuild 560 BLAKE2B e6558d06ea812c65eff06a014d575a442b4ed67d46828c89d62c402e5cb7fb413ff24da586954003be20ee4853b665e15e6fc55395dfa4f2091e057b541ecca1 SHA512 498654bd47cdbb8fe350af1c7ca5829a73f12d0e513dfe250cc7d525667ee8ca9cf0ebc1e9817d9594d7590f89c6c2ff43e7fac6d77fcc00a4973721a1ad533e
 EBUILD Crypt-Rijndael-1.150.0.ebuild 639 BLAKE2B 8e32cdb913605061be72f9bace4f84bdf5a8942b897aeb47c4da48ea8a1c6253af6f57f31e9b4d6d5ef9f25dd32cce9da8a6c3497f736a255c9251dc05e3589d SHA512 afab4f713e002f9223e110aefb5ed5e5a82d8bb32a74ee86f7c9a962074f875abf38076770a8a8e1cc07e04fadcfed8128c2ec03c59008f3e836698ea1d59277
-EBUILD Crypt-Rijndael-1.160.0.ebuild 644 BLAKE2B f22d6798f05f234cdd6fdddee9a20433d0e7686f2d5f813ab29839224bd08d42a63ac7209c88378b7747e25f6c782209382ffe73fdb628cbc77bf824c52a6602 SHA512 4ec6e37090ee78dae42a28d41210838d06945926e102767cdd705e6c902cee5b14f19384241530d55a6a8a707dcda17dbbb3c8f583c998c8f93b301172f75cff
+EBUILD Crypt-Rijndael-1.160.0.ebuild 641 BLAKE2B c35fefa1b2e9ba54e455f3617e3787602d0b20aa8d72b421cff6a59986c0952544a6b3a3dc8d0b02fe03b14e51279bbf0c98dcdce9f5247fc6b70aa7cd2097d0 SHA512 8a11a4b6703f6ad29fa24ceb76040ae66f465ae5798526d9aedcda10a1149949023ea7913441a406950f5157c3ebba37b490ce6f83c8b93bd86f8e87ae813e49
 MISC metadata.xml 400 BLAKE2B a907d371bfe4d9c8279994d6354f1f265b08c94e11b498c23777182508c4c029931ffdcafeb74ea43216afcedc600528f15caaadb2cb1791b90a810217097118 SHA512 f14a879a9884a743e0b9df7efa0884fece988ee6b21ec96051cb7a9b80ebf76d8a240a80eb83fe4290cae270105bfeee79c8a7a7beece7c44724bd8e9077c485
diff --git a/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0.ebuild b/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0.ebuild
index 6230a1315560..e45be01e557a 100644
--- a/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0.ebuild
+++ b/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Twofish Encryption Algorithm"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ia64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 src_compile() {
 	mymake=(
diff --git a/dev-perl/Crypt-Twofish/Manifest b/dev-perl/Crypt-Twofish/Manifest
index 0e31d84690ea..fa25f166908d 100644
--- a/dev-perl/Crypt-Twofish/Manifest
+++ b/dev-perl/Crypt-Twofish/Manifest
@@ -2,5 +2,5 @@ AUX no-dot-inc.patch 790 BLAKE2B 71e83b789b58bb0aa3f92db78949f732e45b429b2d4a56b
 DIST Crypt-Twofish-2.17.tar.gz 13851 BLAKE2B 4ab615b6af0996bdc6e3c356f84cc65192cff68ed4f5e00b59efcb20d88374a29b2a44f2cd5c8bce0df6a31f8ec366624e6e429d0d72fdb4cf69bca42732d3aa SHA512 c61d07f2fd3d88bff1e41eaa3008c6717fc21e9acf2e45d45c3a39b15500f71b3bc425a3df988bbbd5b6865085866595240f1574424aa70448d6c8b3f38ee2e2
 DIST Crypt-Twofish-2.18.tar.gz 13904 BLAKE2B a153d4a7292ff11b97f8d53ea84b9c51d09ff1585f6bd5150c5ce047e5d515e14725672a0b637c11d1664b16b87fc950aae709d6be8f0e1f99112d562e8f69ee SHA512 e900b066e73237dbad8a9882c28509fcd8516c16478cdc2703883a1801d9ec387c4e43c38f6e50024c47f9fb2812c44f6096f2a2ce298f9d73303a84833b61a2
 EBUILD Crypt-Twofish-2.170.0-r2.ebuild 433 BLAKE2B 185b72d61d4887c9edc0a936a545bddb58e1589e88743774c604c8f277e2babb867ce119ba4800cd7172ae7b1b86d903632de82151ee0a9b9ef309c173edeac2 SHA512 57e9c9c310681e514e4357ffe36c329c07399468d2082e2f6177f81684b4ebbe1e5d3c4d8045c4309c812dc2b6079efb94aa805b1a554401920903d8288258bf
-EBUILD Crypt-Twofish-2.180.0.ebuild 394 BLAKE2B e3a23361efe2f3ca93339139468015617d9e4026f99a4ddfa036c74d59faedcf71382302c6ac9db017c67e696c5efea4e59f5c13fc8584b60acfb22437d0f102 SHA512 73bb58c8b52f42355c83c6da565397f7b207e0756e777bccbd22b2d5c5d97257d0df3ee5df3cb1b1c2656f00f51a017fb38e5b1cdc475f46d1c75e76dfbe35c8
+EBUILD Crypt-Twofish-2.180.0.ebuild 393 BLAKE2B 93ad1e26110b4481aadc9bb0e59fda14b898aef5b24fbae2666e7977e5512be7c56d3dee189823bf5091f82a6b9603158daec9e9116423d7da78b5e28f00dc3a SHA512 d4db7605f520b2fb29d45ebcdb6631d0de04a4f92b2071c4ca7304bc3b5b03e21ecb4d268b28bf21520dc190dabce4d9b5068b10a52627417ea4affa59cb1c12
 MISC metadata.xml 398 BLAKE2B fe19aec82d7a6c90b4521dea669d0246610fe2f61039abee47b8c76302d08e410cb0a02f4d88e6bc7b98d54f95ce81d4a7fa4fec828fae148baca9d3d4a53052 SHA512 d827c972e409391c7c822d0b8cc4a79f8a37f3d10a1460d90f00ab51aaed10b431cc36becd7750de74241bfc40d9043e1bdee34d41b535bb557efa0464eecba3
diff --git a/dev-perl/Crypt-X509/Crypt-X509-0.540.0.ebuild b/dev-perl/Crypt-X509/Crypt-X509-0.540.0.ebuild
index e03de15da953..3e44e4d08227 100644
--- a/dev-perl/Crypt-X509/Crypt-X509-0.540.0.ebuild
+++ b/dev-perl/Crypt-X509/Crypt-X509-0.540.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Parse a X.509 certificate"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-X509/Manifest b/dev-perl/Crypt-X509/Manifest
index 8a4bf3ced015..b67d728d66d2 100644
--- a/dev-perl/Crypt-X509/Manifest
+++ b/dev-perl/Crypt-X509/Manifest
@@ -1,5 +1,5 @@
 DIST Crypt-X509-0.53.tar.gz 22811 BLAKE2B fb086881291b2b5857f4dec2c3c0f78fc827acabe7a2535980622e9e7944488edf5b2db4a51642ebd145619f5ae97a6bb18054e8abbf06278844741a198f3b40 SHA512 316c6147ddcc2ee1e11f951a8c62a14ce723fc2ca6402f141cd1972828f94a3d5ceab29d57b2bca75925261410ca4cc37ee83ca8e158fa66da2ab0ebd29ced0c
 DIST Crypt-X509-0.54.tar.gz 23235 BLAKE2B f2d5c9317833228ffd63ebb0f63a2bbb2e8255ff02c554d6cd201749aaf2e7965f26c86b76445b3d7ac228cc7e3a5afc7ea0d20952837e34304f0dc89a718996 SHA512 df5b155322432e0a9cae2a9ef2408a2692891f1ccb8ca438d38a4671a16df367c860ed549eb307342a5e74b88ea75a4e78386f86092ee87f5b897c11987ee771
 EBUILD Crypt-X509-0.530.0.ebuild 447 BLAKE2B 17950782b903b389e8aa09700114b534927a1a5f83e3c5050468d8eae987bdd02428a71cb84cdaf0ca520ecec18495c1cc94d276c2bb5661a9e99c272b3d0c58 SHA512 fe476454bf4191152718836b5c50513a55a17626f4b33c13b5b8fe72713b1b22848c3e49aaf287e8a779dfc52e533c4abfbcd90e8ac9378c3a1e9e49aa47ba93
-EBUILD Crypt-X509-0.540.0.ebuild 448 BLAKE2B cd5792501d5e827d8a187c5f57156fadad22ba59342b7118d8e70b18560030e438db24ac88d726d43bb8a4e6566477ba42e632ead6e8c115a53ca46b9d2a42d8 SHA512 0c979d62fda38080833f2cc4512ab172090252c8fe6aa246bb4fa329a8540e6905e999c5be6910ab3f2be656308c53815557405bb45bb4730b2656f26ed7abc8
+EBUILD Crypt-X509-0.540.0.ebuild 447 BLAKE2B b12c28863e30b5424aa889efb5b693073e81fcc34af07854a237a6cc7e9fff5df4f91cc8b26afb5fc345cb7e5d1a996be5051b49590a9351884a9921274d40ef SHA512 e63a9f8fd3482ca812f10dcf82dbfc5a873600283555bebf3cf8e9a1b41c0b94e3f7a4ca32fb21a434923f94a5e942a2ec68ecbdd1216a5fc503f80057d3a3cb
 MISC metadata.xml 548 BLAKE2B 6de45b275d5bf33b3235174deda1d95d13a6a5507f46e4f561d84700c6dcd1cb2e56146634d302c2cc2d8600aaa3b121b30020b7556897a6f929f449ba427e3a SHA512 8d3205436cb03d3415944fd3a6f8289d0c35f1eee115c1809fc12d58a33c230d1f4c68ea3b8d6ccfaea3863c01c0f0079ccc2154cda038b9b24269546c11b969
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild
index 91aa69720e7c..cd817006b163 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="PostgreSQL database driver for the DBI module"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DBD-Pg/Manifest b/dev-perl/DBD-Pg/Manifest
index b33789024d6b..8c0b9dfd25f2 100644
--- a/dev-perl/DBD-Pg/Manifest
+++ b/dev-perl/DBD-Pg/Manifest
@@ -3,5 +3,5 @@ DIST DBD-Pg-3.14.2.tar.gz 282024 BLAKE2B a8121a2c97b1e095576c40b9b305f0ac21b3a80
 DIST DBD-Pg-3.15.0.tar.gz 284379 BLAKE2B e3d8d5a2e3339c88f92dc24cca47296b8b2e597dcb81f2645180dd90b27873f209728dc0ac320e493b573c73efb54292e89370a628fc304bf319e237e04b1912 SHA512 67912da5cda42d198cdffa3f5c93267ed9da681c837fd8a9b8c6a13873a461b1123ce0a8e1f4f4398264f57ead35950b4945018e6cead14c903a809a298aecb9
 EBUILD DBD-Pg-3.10.0.ebuild 2717 BLAKE2B 0dc600cd44185a34fe87846101ead421ce894315590bb1503be18c109266d5437976d16164662c06528e137b842c5ee5d3938794d61acb843e385efe109398c4 SHA512 56ab20907456ba3b05ee47cd7d0ea69a00752507cd2aaf21360a535d951f2b473e8b7d8a0c3cafb6f67465e1719fcdbbfc2668d3449e57578b8e69f5d848d35f
 EBUILD DBD-Pg-3.14.2.ebuild 2821 BLAKE2B 4c878c064a58c0ffaf54a76918ffcad6826d127264aa0c8d1a7624ace311e7f85b3e657b0593be4e19112a60a59a8b6bc9c04e076f87694941c1a44d0847050f SHA512 a26cc4c6076efccfa930e54877ee801566e3ff522c15b39248f19f967d161eba68f30c35cf9112c24c0a13c993693f9ab3c3f2abb4434238498b70c1da7cb3d4
-EBUILD DBD-Pg-3.15.0.ebuild 2828 BLAKE2B 49fb0658cc408f258c02691b0d00b2aa3c6dc369d88a065889d8367fb384ecfe1d634f0585af61fc9fed58a66498849afbabb50dd4ff27a3bef7490a75f9362b SHA512 f5a546b249ff9e7ec3a21724d06540e678f5f1dc9f5ae7c290949e284d5830d6fa1ad0486a5fcd80ececc0bf63fc2f1a3ead6abf48f1dc9c1a7bc7f55ca03aad
+EBUILD DBD-Pg-3.15.0.ebuild 2825 BLAKE2B d176eec9ba611c8cbb004f398a32a962b07722881d8177201034cd3ba4790fef3746d6ad5143508412f7de296737467ad60ca6eb13a036c2c152a3c046303d90 SHA512 3b828eed64b64dc57b9ce2d5c52310e6bd1a89c7a312111f5be59d6a9f00be52c14bf890b130a43e1310209fe31e0f01efb23092dad075e0364151169f7bbf89
 MISC metadata.xml 446 BLAKE2B 428b5b91a84ab6026f482e2e3404f7b43a1557d16f42340453d927b4ea676caa3ab422705ea99439fd6369a43af9f2dcd0d7d3ec6a42f82b9e8df17cd2642a1a SHA512 23e05469a61761595bc52b6798d152dfc82b42a4ce1ed8010cd17b6343557ef92433cd31c00102098ed698ed0fd0260e3d165c926b9ce3de91f52112c9b40684
diff --git a/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.210.0.ebuild b/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.210.0.ebuild
index 660219c6c123..ff4758a4c1c1 100644
--- a/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.210.0.ebuild
+++ b/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple, transparent data interface, with caching"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Data-ObjectDriver/Manifest b/dev-perl/Data-ObjectDriver/Manifest
index a990a02009d5..d2954b001462 100644
--- a/dev-perl/Data-ObjectDriver/Manifest
+++ b/dev-perl/Data-ObjectDriver/Manifest
@@ -3,5 +3,5 @@ DIST Data-ObjectDriver-0.20.tar.gz 89960 BLAKE2B 778d0a493e93377dc91e96df1954724
 DIST Data-ObjectDriver-0.21.tar.gz 92070 BLAKE2B a26da0f855ad62d384a0c361d84b290cea3a6a298577827e417aa2f280e353f66347032e65f41f65522355b09f8c9e9634444b223e1719cff14ff552edfbdced SHA512 7ad062b5ded11fa61a0dd3ab1fcdf4e57b3f1c6a60b98f736f57a2ba44a1ca84108b46324c090ed8e4da97e57fbe5b6ef495153564f93f665289bd7918fa1182
 EBUILD Data-ObjectDriver-0.150.0.ebuild 654 BLAKE2B d05a3cfc5ae56c8c0d9b720ae18401be02f09e09fa11bac79c6013d602525e2209bb07d435ae1d9bfd0441147086754418997657d33ccbc34367684ac71a945d SHA512 a34d68f3977a9da426c0408d49549ca43b7a6eb2a0517011709c39b94540af9f65779198b6629d33d8b78557016ae6b10ca08a03ba9a9136447ecb39dec0b657
 EBUILD Data-ObjectDriver-0.200.0.ebuild 691 BLAKE2B 3abc142ec46446f60305e54caf834f65ed0bf975376ea09dc59088326e054015f51440ee78035c7c3628d868266cc3fffce67e322468af524be50c87127652bc SHA512 a240d5c624222260822d36a738be93d4fb2266c99c1b9ac5af23baee7e12751e2b687042740cbfb8b1e5cee7299d36df57ba3774b9e34150db04639d475ba002
-EBUILD Data-ObjectDriver-0.210.0.ebuild 656 BLAKE2B 9a0ac6a0a1dcebba082941bdd3676215e254d1bee5089c66810a7be79b544eb4e916771ae5621d5f284ada53527325fd22b90e4562260e318072be7a08c9d6f6 SHA512 8f12b7775451a387c31caef23e7d604e82c43114d6fb92102986feeddc4a37ae11a1f7fd1b938b909770b9a6f5cb474e051f8021405dd1ef21c246f1de25b07a
+EBUILD Data-ObjectDriver-0.210.0.ebuild 654 BLAKE2B cc9549460f29dc00d97d957d9c065306162901664e7abab68581301818b14e3855a5ca35dd741676965cc0e76eeac5b54728ff3b3196ef0deabad5f1df559abf SHA512 d51f6f4dee893ee00e94fe66db06274f31aa18edd648b81bdb335431ff9b6e656d73ca9a00a011d4ff149b15a14e489641951b4ce31b2f2243fcdd69d99ed552
 MISC metadata.xml 2459 BLAKE2B a37a718a8a38583c85b14e40dba7534b5d52e6257d5329a5c47145c4cf68e9fbe2a10a444bedd73e27584d356f5a4e81e4921138c9b3582bb619e07dfcaf3843 SHA512 b5b2a3f247c593a840edae73f766e2dba00b6ebf16aa37d009dd22b675a702ac4b4833ee44d82ea98f1f7387b0e23c611b2c93b8ccc31ba37861c3dc4b120f49
diff --git a/dev-perl/Data-Validate-IP/Data-Validate-IP-0.300.0.ebuild b/dev-perl/Data-Validate-IP/Data-Validate-IP-0.300.0.ebuild
index 7cc3aa1b98c1..b59791a3e2f3 100644
--- a/dev-perl/Data-Validate-IP/Data-Validate-IP-0.300.0.ebuild
+++ b/dev-perl/Data-Validate-IP/Data-Validate-IP-0.300.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="IPv4 and IPv6 validation methods"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Data-Validate-IP/Manifest b/dev-perl/Data-Validate-IP/Manifest
index e47aa97c7a89..701d08eb9057 100644
--- a/dev-perl/Data-Validate-IP/Manifest
+++ b/dev-perl/Data-Validate-IP/Manifest
@@ -1,5 +1,5 @@
 DIST Data-Validate-IP-0.27.tar.gz 38139 BLAKE2B 5fd260fafc3a283bb14bee0b51aad9f829682353e4802cb570fd9f7ecdbfdfaaf2a7bc77ff704dc64c9866c93e054aac4252ed86fff57135c04849b817b06f52 SHA512 5a93f730d53e7adcac4fe5e227b69a44e58cdc94b0081d79978547263095e97c3690c8c6fc6664fc8e4b230ab4c360beda22e6600a3c7abe5e61129ee70553b8
 DIST Data-Validate-IP-0.30.tar.gz 41761 BLAKE2B f80f67fba5086969db4abe7fcc6ac3104135ee37cedb98e12a160b726231e0f8349f373430deece35ab3d5c53046150602767e6d26feb8ea4d72969377deff2c SHA512 ac556445f1eec0440be17263bcffce46d0c3b719d3c64022bcb3fc6d1191ed9de94c0e4d6b2c3c5c1704dc7945b14a5c87abfcf2b7dc43ec4f10a4cc6629b761
 EBUILD Data-Validate-IP-0.270.0.ebuild 618 BLAKE2B 0d01cd5588331ab67fd9d23deb550d2298263b5ffb17e6cd892e54e867884c4a3341a5354dc1348c663308132ad6b50cfafda5f65b84f285c3812f1352996870 SHA512 b2a7c9857f28835ec0b9dfe1f236376110fd2ed7dde2f6c1a94deef9f6eade330e7924a4888f954c9bac25c2e83ba6ecf70759a1869f9b0904c9c63c10e18e58
-EBUILD Data-Validate-IP-0.300.0.ebuild 615 BLAKE2B cb6d71765306764deb82f47522ac3cbe7d8ead2d0e30a5af35b2f622d8fef1dbba51c3b5d68f82b4792d0b9d91f63a47463d95b39a616217c773ca86ff227291 SHA512 740fcb7c2f0d28f6d8f70aff48e95a046ef3ac9ee4d2e89fcebc2625b05faa542174728ef29059c256f6c8fd232b63e139752deb05cf2758cf2ede2d5cfa0998
+EBUILD Data-Validate-IP-0.300.0.ebuild 612 BLAKE2B 3bd216b29a5656bf7f15ac2d963922206434683d2a473092920d615baa16442c82a8a9a0e94430c9dbb10ab34ef76c63eae3d6af38b54705464f8566195204b6 SHA512 de5996030305e295f7c3146736baf97faa4b7e5891eae7c9575f4488e0205623d0975b5079c378a5aaf4cf48f6746ec64df54d53438cdc885bd28ec3879dff3e
 MISC metadata.xml 405 BLAKE2B c3bfd8adc080f8b9326035f8596138e5fb7b6c2f22c33ca87c555d768d820e266e405a1c7853086258409bbf33dfeb149b59acb06b700f06988ec49287ca258c SHA512 5d39792f857258ebf9a8ea82ea7407b0ea4b05de767d562d026f5cfefddd940cd3d413f142b2e861981a3806b0a8559dc94d8db3ed43f4e5e9df79fba0ff6c31
diff --git a/dev-perl/Date-Manip/Date-Manip-6.850.0.ebuild b/dev-perl/Date-Manip/Date-Manip-6.850.0.ebuild
index 156367dd2193..f8498b46aaa3 100644
--- a/dev-perl/Date-Manip/Date-Manip-6.850.0.ebuild
+++ b/dev-perl/Date-Manip/Date-Manip-6.850.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl date manipulation routines"
 
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="elibc_musl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Date-Manip/Manifest b/dev-perl/Date-Manip/Manifest
index 7a588ab6b124..562ef54d69c4 100644
--- a/dev-perl/Date-Manip/Manifest
+++ b/dev-perl/Date-Manip/Manifest
@@ -3,5 +3,5 @@ DIST Date-Manip-6.82.tar.gz 2015204 BLAKE2B 8b5af3a5b813d5c42c4fe444faa299684b57
 DIST Date-Manip-6.85.tar.gz 2022449 BLAKE2B 55dbd9960d1f5e033a8acd7904b74d45149134d72d9bff56275ed266933d98f8194ac1eb1f30a29343d56a66b6d45d4603190e0707a61713b5443e23a781620f SHA512 ac2fd3823d4890677c9231417bd9838c830d16564ba3f5de04f827d30baddb3fc95a7c379c42d00a3f08e60aba0af8b8f5d710f587d4c5908447a707d1104162
 EBUILD Date-Manip-6.600.0.ebuild 867 BLAKE2B 9bb9849a5823f2b4e3ea25540acbd82b885ca0111b5c1625eab03bd8a64cbba5543fadc51eef18089006181255420fdd1889ea928dd6f9f16af8ee76786a4221 SHA512 294e46ff83ac6bed03ac952a236e85d2277344e4c928c2dd13b89b50a2ecf23232333a414444af2a2327c989391232e49b95c5f900cfd65822e6799e08c1e551
 EBUILD Date-Manip-6.820.0.ebuild 897 BLAKE2B 51320b831bbdd464a647f88eff5a4fe723fe2e16c92fc7dd709a35675f2756260d105354691ecfd432605518ff05ae54244db1f3757867bdbffa90697a1d50a8 SHA512 0cf1d2f95a19197f1d2b88815b7d3414638311c6bc8b8a4d3560567e5103202cb3a1af9ee4fe43fec400f2da180d2fea93afb390259b08f1b7da8fda5b67ecfc
-EBUILD Date-Manip-6.850.0.ebuild 860 BLAKE2B 6628c3c8f9bf88c54aaba1eb361aa0f294bb36433c22b09032cbcbd64251cee7fc690b4de5883d9d2a0827654c8c73b9f6fa4ef786ed068b0593bfa3c4f95ece SHA512 80abb735c36e45133cc870bebf70efdc485697215fcd4347fa4e347ac545e4d6e1d648d5b65af8b3afd048dc49a0049bdba6c949eb0f3be2d15b09a524445b0c
+EBUILD Date-Manip-6.850.0.ebuild 857 BLAKE2B c26f352eb71282dd4b9748430ef21b33bdb7dd07ccd02f07e0918f5294ba0942aff8c224f18d252d0a22b005f65a16f040dca28b6471dbc17940a47ca18bcf78 SHA512 889797446be3472a99d8d7470a95cb0249fa3cdcad0b12fb4b81a46d42f7a7e5c6cda61e4501f923d519956eac288e9df21a062783a07ced7dd896565077b5c4
 MISC metadata.xml 71063 BLAKE2B f7ffb9fe1d37153b8d40d8e176292bc17b65f60b26fb34df4ea21ed66d9f052be669e3eb5c3de0f233454cb35d2098d76949902163630b421ad34afe3923d777 SHA512 3e0885876687e6adb60ecbd0f538f3f754716150ad593f9c729b2ae85f98f081eb694bc5d209fe1156aee475ef14a1e42d260cb46224c462ef95e4318c387497
diff --git a/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0-r1.ebuild b/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0-r1.ebuild
index 0639a9fd3073..3b952a8172b3 100644
--- a/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0-r1.ebuild
+++ b/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse and format SQLite dates and times"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86 ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-SQLite/Manifest b/dev-perl/DateTime-Format-SQLite/Manifest
index 102aa8135162..545d6ab8dff8 100644
--- a/dev-perl/DateTime-Format-SQLite/Manifest
+++ b/dev-perl/DateTime-Format-SQLite/Manifest
@@ -1,3 +1,3 @@
 DIST DateTime-Format-SQLite-0.11.tar.gz 13089 BLAKE2B 6922db57ae3a067dd142815dddcfce968c21fd03a4e21cc1db8ae8c484f745d2a673ad67912e643711ce90aa01debe274761e56d41655a4186db22c6bc8ac731 SHA512 061f831c2a8d653706d315c1cff24ad887e3f8c65afdbd2140066735649c097be921f217e6e2761f8f34604066c618f296d40e9c650c3a1bb085cadbdfa7b7b9
-EBUILD DateTime-Format-SQLite-0.110.0-r1.ebuild 546 BLAKE2B 49c597daf111144bbff78f74ea35dccac9a31c5835b6ef18d27c18a2e2befdde60e74344eb034036d2016f328008bad0cc97d60670907551ea9700e8fe79dcf5 SHA512 0ae4c10aec3711164ba834d228b62fd4dacfb4d5588fc9c2c42b5c920a17aff3ca05afb68a6f014607af936c72c7a72dac52480a55de2c3a3fc5833e81ce82de
+EBUILD DateTime-Format-SQLite-0.110.0-r1.ebuild 545 BLAKE2B 351ab1aa3bb16564284c104ae204d4d08c4384809bd5e848adb29ee8fccccad195eb1fa9771642adfd20f398ab577532e99ee26ab2a7e406bf43bc81d4c90b9e SHA512 7d0c0620733a452762651dc161efcb0119996381e7b0c78a4580048e8e33f4b0d3299a4546c10078fefcc70a8d408bafc3710f96d2a9e64d898c2ac1ebebb220
 MISC metadata.xml 417 BLAKE2B 2cd7d6bf3ec6933b1fbb99b1442eacf90b3cb4d2cb30d76eb39271fa69e75f49480a1afd0112784d1a2cdc5d12efe84404105f3d09f21b841b710f6b9e340614 SHA512 6e441e2a22b8333eaf7e71454c0a549c3ca5f68e623dad808ee4cc60cee534224575cdc22a00aef2985c8daaa43d9a5caf151c2c073dec58e1e5bb91e9df1ac8
diff --git a/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0.ebuild b/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0.ebuild
index da683a25f577..1976fb517e63 100644
--- a/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0.ebuild
+++ b/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse and format W3CDTF datetime strings"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-W3CDTF/Manifest b/dev-perl/DateTime-Format-W3CDTF/Manifest
index 5b56f7da3b38..58e029d4532f 100644
--- a/dev-perl/DateTime-Format-W3CDTF/Manifest
+++ b/dev-perl/DateTime-Format-W3CDTF/Manifest
@@ -1,5 +1,5 @@
 DIST DateTime-Format-W3CDTF-0.07.tar.gz 29598 BLAKE2B 11d1281124a59ccc1734bad641b9f0278b3a34d1bcb6ad6dc030fe2e384961fbcdfea7653c62578c9c22d636610a1b0bb4fea327ab0b4674d0a27178fcc81b62 SHA512 f5b8f3437c4e9a7e192900af16e83a567889dbdf1a934d604461c5096c271b497cda9bd4f9359658f536d262232e4521519f92c06bf07712922403baf6429c64
 DIST DateTime-Format-W3CDTF-0.08.tar.gz 32885 BLAKE2B 049c45a757bca3e8bf437665cc1e4383d1efbd283fe613501354c38bf29f728543f1a4496dc30938e9d9cfbfc12118d491292ea0101a701f747ed75c344eddbd SHA512 d7b04870909432a7a98189dc2239ec201f9132e5a5b6db5d3284351a7db31324c1451538880d215073f8fa1e0f909b99a51354e8e87d6c4cf11d90ea184c9b4e
 EBUILD DateTime-Format-W3CDTF-0.70.0.ebuild 623 BLAKE2B 31616f2e6c2348d942b63506660a17933a44ee522c476cde0aaf59c6ef3d8ddff219d1cbe2fd4acc596880596d34bd2b519786a5d6185ebb9499623a31bddd45 SHA512 dcd3be0f60b2bffea3c919bcaaabe1827451a1c8098a6de435072eeef7341fdbd7404ce72cef514ce7b7b33c7a44d37e83684f113a7a3bb54033a8b53757308c
-EBUILD DateTime-Format-W3CDTF-0.80.0.ebuild 633 BLAKE2B 9f2264e875ab910bd13c7d230e971900bb22e0d5ed5b4cdfd96f275db49741dc134f97662125f937b2bb9748fb3380d40617455316c3359e6384770f4b0b86e8 SHA512 5a5a83b413b9acc47f7c83f7ca67130a137c9f2dc7d334d8225752dbb68868d97b71911a4d27b9ebea237bdbd04850eef24cdf042aae874c61b6813e465a3931
+EBUILD DateTime-Format-W3CDTF-0.80.0.ebuild 631 BLAKE2B 642df1d14fb7888b21961b2f3398005bd083e9f82e673f065e8871e1bb60be7f2daa67bbceedb253f32cf9c18aef6bf8fa2cfc54ece9a0839374207f124aadda SHA512 b7dc0f4042d1856c6585378c61f64897179a1824c35d57913280e709a8d9d8f5ad1fe8c3adfd19ca83f8169caf384413cbb5fab6acb4a87167f672f402a149ea
 MISC metadata.xml 417 BLAKE2B 44fa86f9572cfad422ee8f6d33ad91f7930bb405c82bde1c161ff79908c847f8efd908c3c6740033aa11e36fcf552e87c42c7ea7e38750cece3d78d0b8be0e37 SHA512 d7429b4f2d1186d350035ed5a6d7c0f1da3e6ed460cd63e62dfc138744f777e412759e0b8bd7ebdfe851eb207649397d562dc01b92282b29efc8a2d4bdd1b024
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.320.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.320.0.ebuild
index ea802f989b12..76b397fe941d 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.320.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.320.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Localization support for DateTime"
 
 LICENSE="|| ( Artistic GPL-1+ ) unicode"
 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 ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Locale/Manifest b/dev-perl/DateTime-Locale/Manifest
index d84e09621725..375735cb42c1 100644
--- a/dev-perl/DateTime-Locale/Manifest
+++ b/dev-perl/DateTime-Locale/Manifest
@@ -3,5 +3,5 @@ DIST DateTime-Locale-1.28.tar.gz 1391000 BLAKE2B ec19047a6d0e55db0235db480e96d49
 DIST DateTime-Locale-1.32.tar.gz 1463023 BLAKE2B 56dabcb6bddb81536cae8c5f8ad1073d9e1519faa97de4bb5de2ecce01f2425a778705c33ae9557ca44ec82c75d16e2320d5dc390b7cd7b82e7d7549b98cf98e SHA512 8563f7121876272b9815f5af36f77501cc89d720e0fe08a855a7c563dee6b6399a6213162c6a6f1257c7c76c30a0f3741f642947d1499876d981225c1f5a878f
 EBUILD DateTime-Locale-1.160.0.ebuild 1125 BLAKE2B ff49c019efcf4b99f9cbde78960594fc53f9c62399b5a64d72106328c2c7c96f4ada71934cf2b0736dd04f294f2037ede7f3c0b5c25ced431679ae7f5801a5ee SHA512 3921d22f8861b3b6b8a8a2c03731b258cb73d34b5e2ce66eb4b2b3f2fab4dcb18e5e1e99c255c32c88f415f6054c02285a2ed9e8dc2a8d9d6389b0d083d3a763
 EBUILD DateTime-Locale-1.280.0.ebuild 1193 BLAKE2B 962386f4b58d52685a673c0092f804a1d8f9d0137a71d9c4463f1c5a722245ee223b7e8bc55fd69c088399e7234a5731902e54c765eaf617b9bc11aafc292a92 SHA512 4ae0c5fa97060223b050ba7328ac1cb8f6af1c7bebe3bc5250008cbdb0efcbc129a739b23665253ccd5e8fa7cd03e5c30ee9d1cfdd5e343da3e40f8c6f1907c2
-EBUILD DateTime-Locale-1.320.0.ebuild 1193 BLAKE2B 15e0b97a82a51a5a73cd3ef3cded937d9a16c17d5d84d687404b6c499d4ecaf681149c68478ddf15f09f75beb600b21e531e6a7d80b7d1d67386b8c7b6a98f09 SHA512 79796d4352883e7661f5d9fd8dd7604c1da9d15330246d964f0241438887b19237c72efa4cf75859f0ab1c157b425c1a8f62f060e2c8c5cab49c18dc4b473fb4
+EBUILD DateTime-Locale-1.320.0.ebuild 1190 BLAKE2B 43844890a42b594c83f0f18271c65abb14c2713dc4bf13034a51ec9390bba012bb57d12183d3c02c869c0b6254b6258f4183fb64b408781826a79a7b2c119398 SHA512 741d53715049b45ca24489b3124aee4761fec4f87c07bd6b5b9d0506002b25725f45c1e41e0c4f05fe048ecfde0bc313c03d8ed2998d3f7b3c78ccb4065b8a6e
 MISC metadata.xml 825 BLAKE2B e89d502ee3fe1ba2ff7e95050a8cc9d91960a013d91f49bd7cad3f611fd675ed646a71f44da3875f1396d786b0fceb533f35ea9df5c80b64b2c1a3eb236586de SHA512 75e572955930e34ee22c2ec03d03659883d12f64d3c1b2e55112f42bef46cf8ddaacbb92293a3e1a4fe3989bd962c682fb76fa021c8f88f95a1f921a5f8d3de6
diff --git a/dev-perl/DateTime/DateTime-1.540.0.ebuild b/dev-perl/DateTime/DateTime-1.540.0.ebuild
index f6714ed9e6b9..83f090b79fba 100644
--- a/dev-perl/DateTime/DateTime-1.540.0.ebuild
+++ b/dev-perl/DateTime/DateTime-1.540.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A date and time object"
 
 LICENSE="Artistic-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 ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime/Manifest b/dev-perl/DateTime/Manifest
index b8c658922c26..d44271d90869 100644
--- a/dev-perl/DateTime/Manifest
+++ b/dev-perl/DateTime/Manifest
@@ -3,5 +3,5 @@ DIST DateTime-1.52.tar.gz 269535 BLAKE2B b8da6a8ca968fcceafed77465b7b25acf9a3438
 DIST DateTime-1.54.tar.gz 314605 BLAKE2B 50f0b2a022af9a955485e3dba8065f304d47223cd34855545452db8316451daebca4d75b66e6626c562088f08c2df295ace6738ad2b94f7a1cca62ebdb43771c SHA512 b974bf2191d6d9ac5e674edf05da8bca1b506c953dc6280d16358f09c55601bf47c0158de5ee46f79ee8e56e8e358e0168a70480cf7a24270475914e5278b843
 EBUILD DateTime-1.440.0.ebuild 1131 BLAKE2B d77495bba7e1777897a2bffbea74f77d9f00c26381328df2809f875b7af8833481eb23d3fe60f243de07428156431635fadd41381e778a04f7120bb0713df75a SHA512 1acfde8b481f97319bfab5aa6c4a0d85f9522103d7650c20ae3494f3c99782b06910f2da242541e18b913178a933c55c3ee64b251d2bbc4acf434a4577231baa
 EBUILD DateTime-1.520.0.ebuild 1211 BLAKE2B 9a1f0ce8fbf2a71e43522a7f2506ec64a6bf73400a380769faf813afde98b150ea0824e79ba0dab24b88d36cd4a05ad51289c15dd37c0bd71e156f5c236bd8ed SHA512 73d7251adb101ca08c18d01cbe2f29d61f3f5796c7cfbbd349739d1cc216931559a0744e58ddc3deedea563ce5b71fe6e165f8a4562cba96232a9f712e986127
-EBUILD DateTime-1.540.0.ebuild 1258 BLAKE2B ba6d283c47d53d4dcb3dc1bdbda77ffed8f7a3423d203f61d169fb6259d6f02b51cbe63080e95a9e766bee5bc804f11f792d26476c2d0db98ffcfb2e92fc14a1 SHA512 0a49dc61f969839084ef0b045a4be1caf67dcb951db853d3b7e2c83154a24e2207f448f468084371cab3e4e4011403f93dd374525fe7477580ab125ebff8b919
+EBUILD DateTime-1.540.0.ebuild 1255 BLAKE2B a6b87766791752c433f438e87c3ac83e08ca1ef227f8655ef62fd99966400ef5c1374e1987e69dfe8cdfdea9854df2e850531f9ecec21bc801cf2d28f809b993 SHA512 6c246f12b9c2bdbdad0cfa7bf09a09a34c1348c0e0e5ac626c388042bfb3b281e1209000827621a47cfa7f20cecec137773f2ac9db314b6901755cb0d1da00e4
 MISC metadata.xml 977 BLAKE2B c3034e3b60e1d4071537ea4af9734c061b1985440c00386cd12019af29cc47244c7d18db586d18c1c31041469ad7c3345b3619ff0422df086f75442cb91e3fb5 SHA512 03afecbf9a306c2ccde1c7cf682733d27f6eef0266d703cf51bc2fb946e5cc287bb24cffacb43dd1f3ecb2eacd40bf8182b4db7b0ffba3f64b3efb9fee04e58e
diff --git a/dev-perl/Devel-Hide/Devel-Hide-0.1.400.ebuild b/dev-perl/Devel-Hide/Devel-Hide-0.1.400.ebuild
index c7a1dbb61d0d..bfb0a5fcb0dc 100644
--- a/dev-perl/Devel-Hide/Devel-Hide-0.1.400.ebuild
+++ b/dev-perl/Devel-Hide/Devel-Hide-0.1.400.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Forces the unavailability of specified Perl modules (for testing)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Devel-Hide/Manifest b/dev-perl/Devel-Hide/Manifest
index 8771158d1608..060a6c8a23db 100644
--- a/dev-perl/Devel-Hide/Manifest
+++ b/dev-perl/Devel-Hide/Manifest
@@ -3,5 +3,5 @@ DIST Devel-Hide-0.0013.tar.gz 9787 BLAKE2B 2fedd205ea881364127c50dc1d0ab62e38ad6
 DIST Devel-Hide-0.0014.tar.gz 10036 BLAKE2B bf0aa5bd15bf80cd4b26f91843457c72476aa85b9e0a6794b82fa5bf3f05a60a255e773c386eab0aa3ad11d32ca57f94f470f0804f9fb13ed3b17024cfcd2811 SHA512 395d2c9ca4090398f31a50fe4970b6c4349424c11eaac407c5d2860bdf95c7d00844be9333bd62671baa82e668f6589c5bf61e7da7f99a2a03385e2dfc23cd78
 EBUILD Devel-Hide-0.0.900.ebuild 534 BLAKE2B 1b93039c16edad4fef027abe14843927939a61c88b3e1a6920a372a45b0c98c010be4637a4314e39c248959ad45a41bc4f413dae934b7c6d125f552b40623d88 SHA512 2be6c81690ee9715bdcde77323475bd69e42b7b58b606727236251f37d08b6e317587bba85703655876792a20819d3750c69f531925990ed225d4c6bdd4f4bc2
 EBUILD Devel-Hide-0.1.300.ebuild 606 BLAKE2B 3b8dd07d06be6456b30424c24ad300d6894e7f012d1c92875219dadab2a9064baa8de44d50abd0ae7a780ada98bc24bc8c60e5340a72cc24ff8de761eb63b660 SHA512 2f3f0a5a209e1014a91cdf7397038dd40feb1ec0240e653343e1acb292b26664721809f78be5b0488da5a849f1dad2be13e472042813725db608befc574945d1
-EBUILD Devel-Hide-0.1.400.ebuild 625 BLAKE2B 89c306e8b00b3b36eb5ad37813875b3ed54674341637dbb22dea5519d1426346649c66e42dcefef2c655af48453205a98bd1d06811b39087cb0bba53c8c31f33 SHA512 a5c8e7b570da5c69a7560d507544826a298ef3494a90681cc5788ec20f86b198f82ed622a878513b23ad60b35e653a72bc8f6ca8a5579aa8d468f01ea71ca74f
+EBUILD Devel-Hide-0.1.400.ebuild 622 BLAKE2B 35824cebe63e372eca84c650db4210888bf1f583b479c941d796540e0410e6a149fbbce088e28a2dfa8c68fd011b691537453ce24847daa39e5d325b50077be1 SHA512 f5e1e447fb18ee131a6c25cf68c9ff283364385897d91f1795b7d32fda498dde20fbb9ef15b9c87e896e423358b75d248b49268bb532ee54e0a02848a43d43e1
 MISC metadata.xml 380 BLAKE2B 53eb46b6e93d496af735d02389e7f4ce6473e2e853845a3d72d89f5ee9c1baa53014cb47877a7a6cb0e8bb299d00fb229631619fad7875d4447a6611fbaaa550 SHA512 b5a6fc648c60c53705e595cb43719b72611ca5c50dc3f9f1dbd37c6a739c2b0727996b7546cca91e88bf9801ebffffaba6de7fd21a69918d46972d6d5502038b
diff --git a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0.ebuild b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0.ebuild
index ae11acb5db55..d727e0281bec 100644
--- a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0.ebuild
+++ b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Introspect overloaded operators"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Devel-OverloadInfo/Manifest b/dev-perl/Devel-OverloadInfo/Manifest
index 732430f84a5f..772cefb8a03e 100644
--- a/dev-perl/Devel-OverloadInfo/Manifest
+++ b/dev-perl/Devel-OverloadInfo/Manifest
@@ -3,5 +3,5 @@ DIST Devel-OverloadInfo-0.005.tar.gz 12449 BLAKE2B 457eb477931ad489a887bad178aa5
 DIST Devel-OverloadInfo-0.007.tar.gz 16258 BLAKE2B a4af170936ae4e66a452b05582f22b22c4b39fbe922ca46da9516a86d345696f2fb9132ed7b4f85d3210dbf32503e2b8e96b8f8ab043824c53d7946e387153fa SHA512 4db830d6f9edb467626213ab4d45b3e4b8fa9b3c38fad1349233f7b420d08be42833e57daa9a8076f4127cafba92f4cfc177ca33bd19cf2a582b644ac1ae7d72
 EBUILD Devel-OverloadInfo-0.4.0.ebuild 719 BLAKE2B 54b93582ebdd1789234eb2bf76cb8ea09f3c79d79ddc3474151105b861f93eb9b41f18f3bdbf6862cafcf044f04c0f9e7ebec7511cbd569d036c14a80c5bff75 SHA512 ea57d2b5d44b5fd1fc5500cdd8548c4b9eb90e8da6d7690df8678594b868deb04b985c59dd3280df1502cd85ce37734008e2fa4eb4629e234624d56fd9daa5e7
 EBUILD Devel-OverloadInfo-0.5.0.ebuild 783 BLAKE2B 0fdc945a1fd18266377416562b0e34d9cfd4f4f50e1b488c11e6216044b752eb46d33c544bd1030e318eebed6aaaf077962d9d56b83fb22b255a51f5fa102175 SHA512 b03ec00043dcd5d49cdc1e25ac09393dde94fdd2fd79c5f49f783a32645db6581832a16f9465992db245137ec75f4a712381c8555f848ca6a32adf82d30a1ec0
-EBUILD Devel-OverloadInfo-0.7.0.ebuild 767 BLAKE2B c266bd7a1cd82e9d1eb84cc0783ceebd28a4b1285503391a1bf655802adb04047dde0235b566aa7099caf2cf861043774f5ead1179037f0b068f548edead65b5 SHA512 824f09295662b9c33ccec7ad050bb61d4f0c7c2f5caaae9ee0e2de3c0c3e2168c82fadd0d27bd13dbfc2720244685716871fa9619a2a2355cf7051203fcde743
+EBUILD Devel-OverloadInfo-0.7.0.ebuild 764 BLAKE2B 666506b881aa411a0d14e99ecdef43e005d8c6d1a52fa76c2a5f1a3231cb1befcdfa2c9bd82c8df0cdff0b471a41d2552174b19af27d5c0f8bac2b8426641d73 SHA512 68c525a245ad3ac29d8616f74d59832f605f6a25e35f1a26677c7247f6f1e69bc8f79323c3c70f2ed1efca8c6112e95789e13ed5231eb38e178966b159314843
 MISC metadata.xml 408 BLAKE2B 6b167314e2c4dab81885a42c49b68eb1e781f8c45d7c945fdb08257ee37ae5e8535447bf076da1f8c980ae1f50227a909e3d56c1923435c56e92fb1229da34ce SHA512 e562e8c4bb0e9d7bc286d2c65ae2a485ca13ffed205240ed396a3bd612a95ce922521ac64ee9c8e4da0352d434766103218e3225c58b461dd8c4c161f572edfe
diff --git a/dev-perl/Digest-CRC/Digest-CRC-0.230.0.ebuild b/dev-perl/Digest-CRC/Digest-CRC-0.230.0.ebuild
index ac868280cec6..e5708a97d1e9 100644
--- a/dev-perl/Digest-CRC/Digest-CRC-0.230.0.ebuild
+++ b/dev-perl/Digest-CRC/Digest-CRC-0.230.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generic CRC functions"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Digest-CRC/Manifest b/dev-perl/Digest-CRC/Manifest
index 7805c6156897..bd13cada43f9 100644
--- a/dev-perl/Digest-CRC/Manifest
+++ b/dev-perl/Digest-CRC/Manifest
@@ -2,5 +2,5 @@ DIST Digest-CRC-0.22.2.tar.gz 8175 BLAKE2B 6133b26782783d2676016697af75e772aa3aa
 DIST Digest-CRC-0.23.tar.gz 8237 BLAKE2B 18a11f704ca2a21b0b33cec871fc2dab76e2ba4e3df219c1daac91723f30d14fb2b02ffb674285f822ef215c4dee92f6e2365a62c550442606d831568acb3a88 SHA512 b92e40bf717882b0e694c6552a88f13ac92a569e4484eedfdfc57b7fe867e29a81e228d00c29e9e4ba120cb9e0ca4d10db12cad5af185893ebcd89b1be87d2c1
 EBUILD Digest-CRC-0.220.0_p2-r1.ebuild 514 BLAKE2B 9943628390157e6a03745b58249bfc6a4974252dbc4eff3616db8030c35411de231b01b7a8f843559f77146e1715bf1bfcfded451ad48bb0051f052922d4172f SHA512 502d1af934ab049880ea21c413f191c8cd1db7c8974e1e14ef23c3a5cc187de1fadd6437f4de9395d6f6821ef74c8510be49c51b0d30bd6878bc6539cec36489
 EBUILD Digest-CRC-0.220.0_p2.ebuild 463 BLAKE2B 1f743b7f697a5ab0c1551ebb8f72b5c5ac6bd9fcb65ae9d248d6f9f7782d633dd74576c5dcc340208be5eedb4ac8cb633549490969c1098d3689932f91cc7992 SHA512 fe9fc0ac0d62cbcc5ff4c32205b98bcb8ceca6b8c39b2dd6ef2b8a9af4f2d389d71f6ef36af1d21feee6275bcb2c205d8b535f7754663c5d616eb132fc80ec27
-EBUILD Digest-CRC-0.230.0.ebuild 442 BLAKE2B 78f82cc8239bedd8ea3db2bb4ee4de0f1066e8e4006ac7fdbb238c634ee77041f5e0eb8ec597915460ecc5283553b8632f5c5ff557c0a86d3e2deff69dfb88fc SHA512 3475ce0ba24fe12e2fa4937c9d1c3b38df50fbbaf6eaf4d3dee28f23894f1e52046af1d0c3775503ae72de63a46b5d2964fd74a65563386ca8b8ee448ef47951
+EBUILD Digest-CRC-0.230.0.ebuild 439 BLAKE2B 5fef585512ea399c348177fdc3fe1e9b21d5bab741e53b189d1563ef7dea214b4ef131ddc05842398e8ee21e78edd33368f06485a3fb62e9c8d2fa48fd4c0c3c SHA512 e0400bd182239f898f08cd1658463872945e31b61751540b464af83c91e5c3993718c7ce5687bddd0b61d04d16ab2873fb931edd226f2fb875d0636415459606
 MISC metadata.xml 372 BLAKE2B 79470f444e406d18364d0dedd90ade36d09be4714588d92bcbdf17fbcb17e60c846464ba741497fc80c570b793bcdea1f5afdec02f96b5351cec7b4e99addf0c SHA512 8204c8b0f7dca7982125cd9e2367f8bd60f3d77a2ad2e706535d9b47e980769a2bf24c90ec68bff4e7f634b74f81c5d3248d4466a47b6240b6b07e8122e4d8bc
diff --git a/dev-perl/Digest-HMAC/Digest-HMAC-1.40.0.ebuild b/dev-perl/Digest-HMAC/Digest-HMAC-1.40.0.ebuild
index 87167f24863f..9a2a0c2e157a 100644
--- a/dev-perl/Digest-HMAC/Digest-HMAC-1.40.0.ebuild
+++ b/dev-perl/Digest-HMAC/Digest-HMAC-1.40.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Keyed Hashing for Message Authentication"
 
 SLOT="0"
-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"
+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"
 
 RDEPEND="
 	>=virtual/perl-Digest-MD5-2.0.0
diff --git a/dev-perl/Digest-HMAC/Manifest b/dev-perl/Digest-HMAC/Manifest
index ffdb1faaa563..f1b60aa0d594 100644
--- a/dev-perl/Digest-HMAC/Manifest
+++ b/dev-perl/Digest-HMAC/Manifest
@@ -1,5 +1,5 @@
 DIST Digest-HMAC-1.03.tar.gz 7251 BLAKE2B 4dda8519d63befc278277b03ba00fb8738913e3322b136ca751ef9c1bf9644e1fec957d9f757ae06f4f06a64e88c85227666792cea0b59ed772577a1e8128c18 SHA512 9863547f8bccdc08e0e3d565b9f0fc3c64cbcc366d92692715a9594e3c02474f7927cb833b5aa0183e7bb757b0ad4d74ea52e481480527a5b1dbcf560b4e4b5b
 DIST Digest-HMAC-1.04.tar.gz 14279 BLAKE2B 9cd6fe96f9e3da8d4fc9a8240c794a94c3e8c403fd1120a5f5778d33907f692716299fc2c9893ab8d692fa0cabac8dba0eb410ee3eeeea6b8d8a8e3fa0898355 SHA512 d30b62e60bfa9f6c0f0c058e190938f13a08a70a816771a0641226c24045cb6dbd622756f1f88593fd3690442a45636bdcaf35457e9dfea6de5f8a342a538a6d
 EBUILD Digest-HMAC-1.30.0-r2.ebuild 574 BLAKE2B b03d56beca40c3452d5d2bd23dab8142034c80d143060f18f80a83036614cf992fbdb2f6c3546f9648479f3df2730b858183d668f32ad1b245911124389a9a4d SHA512 cce98558bc7de48fc823f7966ac779d68ffe89f251debd30e90a707614602ad7bdb165fc32efd82f8a3413f7912897d23c2f3def071d9503fc0ce6c609c09670
-EBUILD Digest-HMAC-1.40.0.ebuild 586 BLAKE2B e88ee99668a34181a4b7ae31dd265e211322e5f1769dc12592f302c1b3de5f3a855df6e6d570be1d9884bff06739208a1f67fe815ff1baa7b4bb2085fc491cc1 SHA512 9eec629b7e14839cd98d0507c4ddeff92dbdd8681674aeff95b6bec3cd54506c1640219c7b8653015a223d73bf49cfa11e5e04a33d2348c835cdaedf7b9aca89
+EBUILD Digest-HMAC-1.40.0.ebuild 583 BLAKE2B 54d6683f6b590f1a720a4c27378c37838d087375c2726e92869cf0c5afcff020cc5160c285416e47ee5197e6c43597ebab8f76db1f2ce40d5dfd13d043e3cfed SHA512 57ba0d392a174d01e3a5eb78dfff5eaee83744ec9b59c271e095f017a374160ef60f3941299033c61ddb76d5946146ed7cf2d5a5066234c2a6c362b59853981c
 MISC metadata.xml 521 BLAKE2B 0a7fb711bfea19b4ae2406252a738fe48fdd2caded2a099dcedfe88936b71fefdb13d2b6c6742df4cd696051efe66ac5bd91c7dcc845d8c4efc8eb6b2ef664a3 SHA512 83fb601dd12089870ee793f8d7b9554dd53f6600540efd905693e8262fe7e54639f81da09d760ab70f2142855a291a0a0603ab4b62495457692d0726ecf51cdc
diff --git a/dev-perl/Digest-SHA3/Digest-SHA3-1.40.0.ebuild b/dev-perl/Digest-SHA3/Digest-SHA3-1.40.0.ebuild
index fe717f6f72a0..c148dc0be0f0 100644
--- a/dev-perl/Digest-SHA3/Digest-SHA3-1.40.0.ebuild
+++ b/dev-perl/Digest-SHA3/Digest-SHA3-1.40.0.ebuild
@@ -9,4 +9,4 @@ inherit perl-module
 
 DESCRIPTION="Perl extension for SHA-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc"
diff --git a/dev-perl/Digest-SHA3/Manifest b/dev-perl/Digest-SHA3/Manifest
index 497597c62e6b..5e6ac9a8fdd8 100644
--- a/dev-perl/Digest-SHA3/Manifest
+++ b/dev-perl/Digest-SHA3/Manifest
@@ -1,3 +1,3 @@
 DIST Digest-SHA3-1.04.tar.gz 29660 BLAKE2B c4bf5cf4e78ab13c8c21ce54e1889c2a89cc461955f1d7088457cd920b6f4b3e394a6db6afc9dd084537c5ccb704b7f7970f18581e43742af0b8e5d8ca1130ef SHA512 2737780f2ca6c8bef18477fd9311754e69bb4d00831e7e2cd4bbf170f3e312bdf86cb84ed0693efb3f386dfa6c03d56ef48cb4021d6b02fdc44b3fb8e973ac29
-EBUILD Digest-SHA3-1.40.0.ebuild 284 BLAKE2B 4851212101baaaebf92099994c9389553d83521edb6bee98da5ab70edb6ebaf77a00e81dc7edd9b9714d437af7004209fca72485d4a8df900e8ae1d982deb070 SHA512 0affbdbbce0d8fef5fe631a3cfa37f8056563b53b84810d2e2872a9adb47935d4f7ce7b2e328d89606cbac228691629f38b6a9e0a950176620e0bd3c9c0a56b1
+EBUILD Digest-SHA3-1.40.0.ebuild 283 BLAKE2B 8bd722cf8afc25311a787a6a8d24f6719993e90d9dc7d639a370e5b96aafb49be28a55f5e91b0155845ad3d79bebc2eba25f57e6ec3d988a52913d4d1e9ed9a0 SHA512 7b3ab73172e1974744543c91534cae20a46e61f0ee915b0e4d0dc1d00bb9d99d7ed4d5f2a484d26903fd2557097152e43e5aa4bc07931a2c57eb9ca5a040844f
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild b/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
index fbb54f8c7da2..025812e9b8f5 100644
--- a/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
+++ b/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse a MIME Content-Type Header or Content-Disposition Header"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ppc ppc64 ~x86 ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-MIME-ContentType/Manifest b/dev-perl/Email-MIME-ContentType/Manifest
index a5eed087dc17..69afaddfcd30 100644
--- a/dev-perl/Email-MIME-ContentType/Manifest
+++ b/dev-perl/Email-MIME-ContentType/Manifest
@@ -3,5 +3,5 @@ DIST Email-MIME-ContentType-1.024.tar.gz 22946 BLAKE2B f51464835d5af96a30cbff869
 DIST Email-MIME-ContentType-1.026.tar.gz 23063 BLAKE2B 3a07522f5dee0f4cca5f817a06c51078cd71a9ec58794d1ea9e9d939b2fe1b525fcd5fe8a01bf52f42ea514d27b3245199c4e5f14fe02ced05737ca249a3b422 SHA512 8ede8df5baba4f5e89ab3418580e0e6dbbabffbdbf25e1f5f738fceee929ba4b495cd7e6793cba030412bf7bbe2a524136afda962f6410d6ca169b68b1eeb065
 EBUILD Email-MIME-ContentType-1.22.0.ebuild 623 BLAKE2B 0fedcf9f9777d1c5df974708c5be61a1154d374ace06806f603902228a48001c15c81999a6aa4eccf914dbaa4433f1a28b64cef425659237576a5b03d5ae89b5 SHA512 9bc1dfd973740613ae24b515040e6774ecc704ffc4c258ab414095f4df9d9df4f96e2a634875967f8bc1b2dca5266db6a128ed909697427d67194102b08b01a2
 EBUILD Email-MIME-ContentType-1.24.0.ebuild 649 BLAKE2B f7706674431d0a659031a233948da8ebd521333c55c08c441bafdbfbd6d955a47f0e0e5701e127d97b9b2af008b6e2fd77316d531726da78c1892a2771f34d31 SHA512 37125f6b488f9c06f294233bf59d85e782e5a0e9fa04fb9f066e41daa4dbb3649037a62920c44bffa757108e50af4bae4902e5940067c4aaa06e51d01a58b4ae
-EBUILD Email-MIME-ContentType-1.26.0.ebuild 653 BLAKE2B 271bd93879e05e9321d2be952d3299f7b4fa25fa321504d2b960c6ca48a8a1ab7d867c595c7caf793aefbca646f5fd5bd00f9451875b7dc080e40f40a2a6f5e1 SHA512 2ca6f350b650739387fc656ff87effc869cba189e463a7d7001b4b577e346cfab5130bd1fa26c2807cec45cd7fc826550423aae577db983822a28be4fb5df29b
+EBUILD Email-MIME-ContentType-1.26.0.ebuild 651 BLAKE2B 8245a73324387f6ed85c6c28e1fc7aee45700ae74e3df7b6ddaa6322089e906ae92cf4b200f63d9a6ee28a3255449ec77780267e4808ddb38f4111c778c4c8ad SHA512 04c47670ca46bbc88326104ea230fee25a2e4c06eb7315162c15e1e10d5e4bcf8671277323a63f2021fc84e431d8f9c55efed8b08cb703daf78648fcfd924c35
 MISC metadata.xml 417 BLAKE2B c296523a19ca006af2706e760818e854d4dee15c1f26ea975140a60fac4f600ba33a0c2bd92d4c67685de9f816a4f7375d9946e2775c298eb4171ef378163d19 SHA512 04a555c6d56896fa815dac076c9feb6f51b59bfc659957052543c043be002079ee037890583fbd6f543fe0717c56b4d9f100199191681cd0dfc59207985b9bf6
diff --git a/dev-perl/Event/Event-1.280.0.ebuild b/dev-perl/Event/Event-1.280.0.ebuild
index f2336ca8b066..2af602332890 100644
--- a/dev-perl/Event/Event-1.280.0.ebuild
+++ b/dev-perl/Event/Event-1.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Fast, generic event loop"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ppc ppc64 sparc ~x86 ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Event/Manifest b/dev-perl/Event/Manifest
index 08a797d67d71..4dc65c3a0452 100644
--- a/dev-perl/Event/Manifest
+++ b/dev-perl/Event/Manifest
@@ -3,5 +3,5 @@ DIST Event-1.27.tar.gz 256609 BLAKE2B b27eff4243a0a009a6f97331359ec3bd2243c95e64
 DIST Event-1.28.tar.gz 256630 BLAKE2B 488f9f7e6f54d62500aea32689c9c09108d058bf3f16df792bf959a42ebb20e09a2ae112829fd17897cbd5f45862be0f67cc9b8d78789a513951bd3db112e27b SHA512 8c7e676c3f659f85ae53ff3b60142943c72881f101f2c66dfd1a7e47babfade0171b78a2062476b6e061f12370b279b73abbe3ab01b07d7088145fa9508e7d0c
 EBUILD Event-1.260.0.ebuild 465 BLAKE2B 6ea496b5ab0e2e4ed92a26b55f82fe37174463a4d6f52341ebb7da5f1aba33fbf863083e105d39bebe9e7dc5cb093cbe83f85fd5c8641493a99e77ec9d7a4f19 SHA512 421a416ad841ad4c8424eeff07d8e96bd9531d2c434450e68e7f4253382c7157675b6210f0d24b2ad0e9b56d9e5318f5c9a792dc90c54056127ea0cc8aca5cf5
 EBUILD Event-1.270.0.ebuild 555 BLAKE2B 59076dc665d2a7d68104bb14d07b043f99c748ffb002e29caa05a815a4a7e39111ff0960170740851de107316083e8d3f7b2db4ee6c6563a37ab416e5467e2d6 SHA512 87e4be9af795a45270549b3c6fc7aff4c1ebef1c67ce1a91fd81db949d7fa8cf888675a4d7dbc2681b6dc167b9fef741db80a0674ad838c5fd4426d6f19eba52
-EBUILD Event-1.280.0.ebuild 563 BLAKE2B 4980b7baa800599ffae896ef50b214482868062875323f837b3a8c9bdb1c6a76b1ac48a0b7c2060fff5f5ccc6364baee10198792baa688a7c4b719d75aa6d410 SHA512 2a99977e84c07478fa6e5793911382fc1c0763de730a5a2f2a6c83cd99ae51e12a3cb5e9048e30e79dde31b3f62944e84255a45da6f3259bfc389ceddfbf00f9
+EBUILD Event-1.280.0.ebuild 560 BLAKE2B 30e73248d01757bb9d68b6598f7635f3b7be196f5ba41b6aefe1efedcd54081fc8c0c8f54a2e7fcbc8ffa65617b8a8aff030e6deed282c188477fef9023c2699 SHA512 a01d9c59ae38a48c8667b1c9a67af5892443f21c64869a5868772bffaac8d7b7d3bafc5a60ea39cb01cc1a356d9f9493888844d993bbd29d314458a3c454c9e2
 MISC metadata.xml 1240 BLAKE2B 6626da0bc7f415417dd70236a519ce56145bcb2944cf96ecc4faba4504486caddd2dbef83614783d37f1ea74871018e1af09e788716573784cafca04498a35c9 SHA512 f0d7147bad0ab0f1dca51f6c9d31338e4b4cc4a112a4015db7b3098a5840c4e4311168ad0fff3ee1d2ad829e069600fc091ab81d4c4ec87e69ae04a03a203a4e
diff --git a/dev-perl/Exception-Class/Exception-Class-1.450.0.ebuild b/dev-perl/Exception-Class/Exception-Class-1.450.0.ebuild
index 84e7a83740f2..6aa09a2d7fa0 100644
--- a/dev-perl/Exception-Class/Exception-Class-1.450.0.ebuild
+++ b/dev-perl/Exception-Class/Exception-Class-1.450.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A module that allows you to declare real exception classes in Perl"
 
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Exception-Class/Manifest b/dev-perl/Exception-Class/Manifest
index 526078ada95d..b77e6c1ef398 100644
--- a/dev-perl/Exception-Class/Manifest
+++ b/dev-perl/Exception-Class/Manifest
@@ -3,5 +3,5 @@ DIST Exception-Class-1.44.tar.gz 46156 BLAKE2B 569270aab8d8cf21fca6c68d7e8d6ddd9
 DIST Exception-Class-1.45.tar.gz 50933 BLAKE2B cc6df08d97be102542ab23521e3fc8770d9341c93852aa6a886e3799b137eb7541408ef98d163f7b6b91531035e61ee138adb77f9db172b24e5ffbea6a178f74 SHA512 8eff70c85c8f1cc9e1db2c47b5a815ef902fddd4989783b9fb7e84e3ce75776564cafddd3aedd2c86a5a8b9627021c9cfd094b95ec4956a60dd6703bba3eaf4d
 EBUILD Exception-Class-1.430.0.ebuild 772 BLAKE2B fec487d343fb3bf6a7ed16f47fbb1376261fbef2e1d62240d73ab6e2241c73786e2314c783d2a980e5529de8a0d6338780b5e6770f99b4badd7ec86563c293df SHA512 996b6a87e3a61cd13a78dd2fc79687521df24872a4210d6cd3a64e87a903c8afa84068bf73030eef1dfc1dfc9ce65b3c5c368746a9d5aa3215a009c370386a7a
 EBUILD Exception-Class-1.440.0.ebuild 773 BLAKE2B 2ec3f5fa5c6b00149f00c7a9e1133bc8383aad322cc5e9e95474a94a88659cbd906de77e2327e1460ef36893ed12282fc18f3cac0dc069d825ce85d326fadb26 SHA512 16e37a326536fce4baa8c1fd0f43438730d200e81890fab4470b0c4f1ad77f1b8a2ce94877ea6480a1469f83679c8f783922a312150eaaa6d9c7152ee391d69f
-EBUILD Exception-Class-1.450.0.ebuild 781 BLAKE2B 6efc66bbfc2383b040c9aaa8b956b9a18873cc98defbe6ab3f27a80dd8c136e59259caeba5bf7ef73034946fcf2df81099584a6bc52695f475e31fffa6fd3719 SHA512 c951dc8c5915c34343982d3d92da5fabf8bb539e15d8fec321661bec67e65a7cb38c501c24c7b07dcdc2d94cc07c75ff58ce1a09512e138b684b88d6b0f9f47e
+EBUILD Exception-Class-1.450.0.ebuild 778 BLAKE2B c621d7f18bd97d8832b428a30a4d397a6b54ad4db4426333498b817c79916b670acafe12fc82634d625d870ebea8adea08eb3d4514b837e42aace2cff9fe9576 SHA512 1fe1ebf9711941b1314a05786f799bfd9a628bd0d0a2a0c0fd2c7a423da5b5a61100f08d5545c265eb707cfad587ff26875758bb9bb5d9d12c37f8a5b69d0176
 MISC metadata.xml 471 BLAKE2B 97ae454f0c53b8f3b7f051c157a0f6d89943964f35150850916606b09144c675511399136a637014b265981fb37fe176b76bf9e8f307c07228f54c6d3f85cfad SHA512 45f0b6b80305cdc7c1af3c62b9442e6464a02fee42908455f3e33de7c981046a7421d097320ed9be07e63c8d66f891fa6a4273d23ad025ef978e4ed20f0918e6
diff --git a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild
index 3f7a49db70e3..3adb90bc0077 100644
--- a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild
+++ b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easily build XS extensions that depend on XS extensions"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/ExtUtils-Depends/Manifest b/dev-perl/ExtUtils-Depends/Manifest
index 2d83ff932dfe..e098717635f6 100644
--- a/dev-perl/ExtUtils-Depends/Manifest
+++ b/dev-perl/ExtUtils-Depends/Manifest
@@ -3,5 +3,5 @@ DIST ExtUtils-Depends-0.8000.tar.gz 17923 BLAKE2B 836a12f5de3f7fd520d7a5f1db00e8
 DIST ExtUtils-Depends-0.8001.tar.gz 16708 BLAKE2B 59342f8c638b9dfb60bb84a7abe8baca08d00c40f5da62553d1d7337f3c92f473937de1721302d222cb0567a14428b33f475f3304104030c358fa3d025dc13fa SHA512 80141f90fbde7c62b192a55d40d26ce4e442150287ae6fe200388dc84cedba5f5210ee6cd9a40b1a9cda0cc49815b1ba1ab35e75afaa7440de3c3577d01bb733
 EBUILD ExtUtils-Depends-0.405.0.ebuild 641 BLAKE2B 125c3e83ad66aab372076b50dcc1d849b83932d89f3e2bb37c3ca00402b0536a3edef1ad9ed526e04ebe20560616969d588755696bf9c5aea86798cd8962a4e0 SHA512 d0d4a96dddf6bb9bc036be153051c7e796f79ea9492d53fb9bae2575b6cba2342cecb06c8df37324d691c72161f190921e4ca0358ab803edd1305dc160bd0b92
 EBUILD ExtUtils-Depends-0.800.0.ebuild 650 BLAKE2B 1d0f2082fa537790dad6cdb82c9998c956d985807439a4efb48d5412fe380a0d02971fec99a0db5ddd89a349e5503bb3fc5da092abbdf41130984f25b025156e SHA512 7cc005a1bb687913011cc839db65215ab12e9cd4fec1f1534ae3c7b7438fe58460a1f1ac7a78af072fbad961223f3d74b89d0bdcb5dfca592e53f22f44448901
-EBUILD ExtUtils-Depends-0.800.100.ebuild 667 BLAKE2B 5909119e62afa5744d0173bcc6db705389fcb992a720f8703597fa9995451680d0e50a57ac55387e5ae54454300be963bb5289a0c9601cccc3c3c66807cde2e4 SHA512 915db1a9bef2ce9cd3142e67721816b8cd19601b9456844d1aef67062a6acfbf32a51924624f510659ba90ca564fd1440dfa42fdc7b54c71e7d5397a7952df87
+EBUILD ExtUtils-Depends-0.800.100.ebuild 664 BLAKE2B 9f3ea1a7278bd553d7fceb2c9711cbfaadff6da6cb6bed72830fa593b0f10b6cbb5ae14a795985019b1d4ba4090af513dea4f8e9146f91c9bf61168696ebe071 SHA512 c5e798cff1798c4b2786ab73dad644cfcf0166a129a202eba63a2c909674992aaa8c9ccda05478985b9d7aa79075096820d589351efb7c97bd3edbb6563648b1
 MISC metadata.xml 404 BLAKE2B 93cebeb39d2fe8da303c39e4ca965f8d801581aae1f7c7f53341a5a55f2df8cac89c22845f57355ee187b5c527e848cb9ffa8e41bd98bbc47b2f2e8d9851003e SHA512 a39e7e1c1a4173b6fa2c4df6616a91a52e83fca6bd481be52ff49a4e29076eb38866e27fb62c8eee49d39a0b681ca796eeb65243cc6bd35511e54f4a962adcba
diff --git a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0.ebuild b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0.ebuild
index 0d18b7afc223..e72321aa2033 100644
--- a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0.ebuild
+++ b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module toolchain-funcs
 DESCRIPTION="Simple interface to F77 libs"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-perl/File-Which
diff --git a/dev-perl/ExtUtils-F77/Manifest b/dev-perl/ExtUtils-F77/Manifest
index f5899cc0a961..a2a8f108f326 100644
--- a/dev-perl/ExtUtils-F77/Manifest
+++ b/dev-perl/ExtUtils-F77/Manifest
@@ -3,5 +3,5 @@ DIST ExtUtils-F77-1.24.tar.gz 12572 BLAKE2B 86f8099cfdbe8acdfc2db895a9114c866fbf
 DIST ExtUtils-F77-1.26.tar.gz 13141 BLAKE2B 275aa0471efc54d29e27c819c0d8d4717c49987027527f4532bf58d3377733d8b900ccc4a6632b395382909d2b7649f8a6f3383773e6728da4e949b59b1656cc SHA512 ed95922f261f3e4e917c06fc73a4ed2eee3501065d38587414a81a62aba4232a75e9045fd6890a55ece1808a0eb9af51d103ace2478684f3e5e8f017dbb975b0
 EBUILD ExtUtils-F77-1.200.0-r1.ebuild 452 BLAKE2B f8227478e27d8814cec2d5290a5b723448b0e65a75c3de275711e4c0beb271f749ce143e54fb3e5b2899ed409057f346a8df8154265727cef0f2d5fd1d4a0072 SHA512 265b31c8ab212281336f99adbc275d640d636a29f5767b9ac5618f0cc93d8e60ece92179e48f2f8e250dfd3cc3e266161f1cb67d290a494edc92ec96dbed3b3f
 EBUILD ExtUtils-F77-1.240.0.ebuild 789 BLAKE2B 6f8bb44878652d1ee6763a5fb772bf5d5a60463f211a79b0d60595768cb1d1bd8765848052b4ee0d2ebf93b5d3bc270b6ac59ac2a83f19eb313292e2e84994eb SHA512 cafad41756cfa33d4322ef63a1b2eb91c7f05fd32c2956d74f1ad9482c8f0b77fc91083f1afe2a36aea59259684419eda83912f87b40b4692f6e91a062c4fb57
-EBUILD ExtUtils-F77-1.260.0.ebuild 513 BLAKE2B b4a36c9048913861264d2321440674c32777d723b02a2ced594238a2ec264807918d80213ca97fda50119c1e5bcdb992a3afd622fd311e56cf1d836dae1490e6 SHA512 26ae849269362a5430817bf93afc18f45794b98179e15bfa9bd7e8d1c74689753f8380aab9ea95f6cb4a677ecb145b7443dcc867e26ad5d1efe9b88fdc62d749
+EBUILD ExtUtils-F77-1.260.0.ebuild 510 BLAKE2B 137cc9a1ef596e2a3c3a0ce922c6627ed0ede93f9b6d00def24e37d8fbccdd4839fc039cbdb0e99ccb55a0bea028cbd2217912a03859852c9fe6c385e08d733a SHA512 d0b3444d20d60b9945361d5c28ee2610ab5fdd1291dfde795f8736f5221096e98098606025e2d56f94498685c4ba52c1135af9fa941b8b04f540620c4bb4cc7a
 MISC metadata.xml 396 BLAKE2B 5df2c10b2abcbe658257e6ae1e2fcdf1ca572c9ac4832eadedefeb84bcdff057784e041d97f9972e2dbdad2e998887cd7c8d3e48318d1fc463d6c2f6039c3a92 SHA512 1810bdaff85f127dea27d10e7dc7b03424a9cbfff171f0182d877d581c973fb49d833edd337ba5a1d9ca0d756c259700077edfa21b9ae15f9c6f87e712d0c49e
diff --git a/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild b/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
index 236a1a0e9541..a8ab4fe563d8 100644
--- a/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
+++ b/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Check for the presence of a compiler"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~sparc"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/ExtUtils-HasCompiler/Manifest b/dev-perl/ExtUtils-HasCompiler/Manifest
index ab56391ee80f..6c579e519264 100644
--- a/dev-perl/ExtUtils-HasCompiler/Manifest
+++ b/dev-perl/ExtUtils-HasCompiler/Manifest
@@ -1,3 +1,3 @@
 DIST ExtUtils-HasCompiler-0.023.tar.gz 15857 BLAKE2B f999cbc13edc4ff9d4fb1f28fc20dc223e2b504a95e44d6a4871c55766ec3fa0cbe6c5a46add40b694a2513604c486d1d98853c17fcce397b21855d6754fa41e SHA512 352e87249eaefcf1cdaa019522849867c2e3dffe60e07c24957072bc27aea39e6855c082b112f326c5a4f86b2174dbb2e03c487b8f7fb2abfd750847f19e7a6b
-EBUILD ExtUtils-HasCompiler-0.23.0.ebuild 426 BLAKE2B 5cd9c298e02db5127ad6da7f43dec4ece372cdb5b1b788c7e15ad3c37c52fdd6125c3c7a5cae3a2ab520dd736a0c89574a382b3f09e83efd78c43470a05a5eab SHA512 da9253849245ca7f9cadeb7547a3ef49484ef6a83964048bc3a283180a84c5e192cf46a286ff134255633e8606f1f644eb0d737623d82730f0cfe58573c6241e
+EBUILD ExtUtils-HasCompiler-0.23.0.ebuild 432 BLAKE2B 84a6d1d390db99cf887ab54e93d9bfb6a7cf668c80dbbdceb04c90d71d2eb4f50937de7c8ba57f8a1760b48d88cd4a1c81c7b49c3387fa95ef29abee32842657 SHA512 93bd69572d497fb45db1e21fbd27b84e3f55a0938c84c4d00d869f56cbe3d682c5220cbc75eb50f623ee96271924ead1bfd41e5ccb8c7f2354e1fbf4fc705218
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.280.0.ebuild b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.280.0.ebuild
index 6805867d3038..7b6714dff1c1 100644
--- a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.280.0.ebuild
+++ b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Check that a library is available for FFI"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/FFI-CheckLib/Manifest b/dev-perl/FFI-CheckLib/Manifest
index 67af5ab7b3e7..ef73277932ff 100644
--- a/dev-perl/FFI-CheckLib/Manifest
+++ b/dev-perl/FFI-CheckLib/Manifest
@@ -3,5 +3,5 @@ DIST FFI-CheckLib-0.27.tar.gz 29371 BLAKE2B 194ac6102f32d9107e112d20ea85d82ce8b9
 DIST FFI-CheckLib-0.28.tar.gz 32051 BLAKE2B 5e124ecea4959b910c8fad5de17ef5b3bbcffe680e8db090fe8e9d9fd6b128e4e5ea947def214c65b9a35fa4a8c4468424228b020a112ba0e4cd5aaa42888371 SHA512 9ac42e7153902cd178d9ee7d3db7edb96deb30c8b53cdd6c14706cde200598ecd98031c8e17394fcd1fb2c770a0ec776131e2ff93491d6b307a6e595fd788d5a
 EBUILD FFI-CheckLib-0.250.0.ebuild 588 BLAKE2B 36dea3e6f53d4d8f760888ec4e15c8c1da284b4b0d60dbb5f9e4ad979cb7924cce6f3b00b7f27927bce7359b8f13a1185be86eaf78e14c7b4d9678cb7146650a SHA512 6cf7499433acac1ab364fe531ab5b257b4b5b58b910fede1dfc8ac1be733752e91da04107f28b6e9bc10eeacc5e03ab3d400a455b72a9f6e9655d7104848cc19
 EBUILD FFI-CheckLib-0.270.0.ebuild 580 BLAKE2B aea79afdeaec9241782b2c809b355664027b5b47e4df0c5683b0215fec5d5249a40d1893aaf2ba61e780f9dde945bc2b364a50b9f228e3d37d37212fafb55a29 SHA512 a8e791b068dc4c690e3b6be71a66a33f125295761caedb8aabd0eb7f8a2e4fb27d1c0c848287d9f3956cc3dbb359424c72ff9c0146450b7349e1d85e3682a76e
-EBUILD FFI-CheckLib-0.280.0.ebuild 653 BLAKE2B 79385b3ea6265584ce4201752dca94afa55c326900b7d45f21a473bf3b84bde235bd05c92a73851cb7fcfbafc1c65899fc87f911d2682b2cd67d07133f73ac93 SHA512 5800d60dc186e3155d1e75b2e8acd7679ffb96c668cab58f23645e1be7fb8ec770a64760fdcfe05063407d73c48cb5a23e6143c7f6e2094751fb5e9c3d1453fc
+EBUILD FFI-CheckLib-0.280.0.ebuild 650 BLAKE2B 5950bfdcd94a8a083a976e472b3679f58a6b4e6b3cba40bf9132c5ecbe0a9b1653d1c0821eed03d6255bde027e910dc1328b4b2ba57e11f42af98dc47fb05988 SHA512 6325aeb3de8b9ffd627ffb582f7b3af0b1914172d24404ded409772c7e1690de20c661886257f235829084bf2cba9e4f70eb59f0c25743b38471a57674d63a95
 MISC metadata.xml 396 BLAKE2B 3a8692f73d6f2cf8012bfc60fa107ebf582b75409735eb8cfc8ed9a5088fa26aba51230353616a2b4ef26d8a80205b3204f7624782ec543752be173350ad6698 SHA512 d1131f6d33aa0053a0b7fb7a6d3beedf924b19a55034c724e5146faaad810ba2381f74a8f14b3ddf670482a54f39c2c8b17a2a13fee6767a734a28c30eb35c1a
diff --git a/dev-perl/File-Listing/File-Listing-6.140.0.ebuild b/dev-perl/File-Listing/File-Listing-6.140.0.ebuild
index 26566c1a047a..31f0863fbad6 100644
--- a/dev-perl/File-Listing/File-Listing-6.140.0.ebuild
+++ b/dev-perl/File-Listing/File-Listing-6.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse directory listings"
 
 SLOT="0"
-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"
+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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Listing/Manifest b/dev-perl/File-Listing/Manifest
index 07678c8494f7..078f02898d46 100644
--- a/dev-perl/File-Listing/Manifest
+++ b/dev-perl/File-Listing/Manifest
@@ -1,7 +1,7 @@
 DIST File-Listing-6.04.tar.gz 51536 BLAKE2B 78020016dbe7e8e0ccf3f79f878d732ebd5cc278c597cb5e4ee38b6f632ce960f5c37015db868576ab21d81321af18960fb271aae6f4d116ba97571e6cad0c80 SHA512 a84198bc82003daaf88ed23218e34a7a1552dcd2855a9563e9609ce5df167a8295043501534c31614854fc8dd9c04b4af27b4d7320112c613914f94c86c2eeb2
 DIST File-Listing-6.07.tar.gz 61081 BLAKE2B edd4282dfb134ea5f2ecf4f227596aafd1c5f720d5e0158b1168e6ea93c0cd187f26c88992b08c8721894a3cb2b5ea9922124baf77d279a5eb165226390bf61b SHA512 1d525058e64ed3f3115721df63527752c8f3de2e0b000efea93b48054695e6b8143c613cdc1c652db30178f517f5bc106dfa176d30629553150234e7cd50682f
 DIST File-Listing-6.14.tar.gz 80562 BLAKE2B ab5b0974c9e8077195b2e3a5749228b07e0176bba5419aca35f0b1fddc22d1ff3d4c294ffa12d9d091074003518f805c37e5bb19ac6d82ef6ede4f0848f1a1bf SHA512 858339b15a455db570d15b02e801ab0e0afd47da71685002083cbcc1a0f89783fcad4e840e0381f186046ab2f355dc0f593dc8c9c0a2da0fc6f17a35265924ab
-EBUILD File-Listing-6.140.0.ebuild 706 BLAKE2B e639063b79774e2738558312ba9d57659dea9c5ba8eafbfbe3a8ff0b32a01507bf3ebcd8565c6e4e0a1c264b5b6a90e961cd8253c9f89436488ee84c7cffcc55 SHA512 654421da2e01cdda81e6a65899759960a024bc48f1e96a28c1e052c8c09b6c8e8617c9f3021943dbef687146f3a427c80e46e0633163f093b2e99cfd879375f6
+EBUILD File-Listing-6.140.0.ebuild 703 BLAKE2B 9e12ec6c75f161f9a647d2cdd3bd83de3a097f8b0b6424b8afb24976070981f2d3dd9b44721c746ef361849a707e1de8702d01cb920ff49bd94b6a09a271e800 SHA512 3f74cfdb5f61e8ce9861ff9dc299fa57ce9022e7af7f188997fcec1b75ce339afedbeacc0968026094c45e89345295d83863a94e2c02b14e588f53a8f690b798
 EBUILD File-Listing-6.40.0-r1.ebuild 536 BLAKE2B 3f053c0ac63693abeb95677137e00ad633d2c54da5d0bc52b7cc7536cf057332d40cb361538421b5d77d1bfc5caa0fa7960c8741c74306fffa6c4abc3bd1a58c SHA512 2f74dd12a6ab9c363645e081f72f290b6d7b2c5e944517137fe97bd13d02b0076eddb29096984fb295d5e5b7440f5deeadb6bc3403ff93b6c3059ec497d8aa5d
 EBUILD File-Listing-6.70.0.ebuild 650 BLAKE2B 22826744b93f23eba6cd4c99c447e9fd8b7451142ecaa2e485ea383e076e07608e3f1c2c0eecc81587671f11b215123f868d12b4dff255b8e71c4e88465cc981 SHA512 ebb6c8f77659bdf621de89acdcae4cfa7bbd2b4eeda6a8bd479eb69f584ff60144a882413e59e2b1ae1647a4b2a50c1dff17cbf494787e913c3848eb6b19198b
 MISC metadata.xml 710 BLAKE2B 1c457d9433ee8dbfa2736ae85335aecfad189e75bf11b906ddd77970621b51652d8d12ce2e928aaaa49898445206b73c75941e1fba8c7eba29a153d3ada7dcf1 SHA512 8ddb71e18d85c8811f4cd58b8808434cf609edbe989e5d0d8e5a4ab5b9c1c6c260e6f175adafc22453ddf9fec43fe350597553eb6bdf937508300cb8f6c7f83b
diff --git a/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild b/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild
index c1c08e576ed5..4e5e2eef918f 100644
--- a/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild
+++ b/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Read a file backwards by lines"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86 ~x86-solaris"
diff --git a/dev-perl/File-ReadBackwards/Manifest b/dev-perl/File-ReadBackwards/Manifest
index 5995fa27acc7..2a872d4d2b88 100644
--- a/dev-perl/File-ReadBackwards/Manifest
+++ b/dev-perl/File-ReadBackwards/Manifest
@@ -1,5 +1,5 @@
 DIST File-ReadBackwards-1.05.tar.gz 8943 BLAKE2B f1e8703b04cfc94f69f1d953ee0f979e9d887bad97320b0b3d377f338dc074f8b9dbcd425523f6e3ec72c77c436cf7411098717eeca62bfd3230e603356ee623 SHA512 8e1eeeda0acfdc0b9e1f5234cac37348890fb962e5edd395804d6cf9ab2c221217e2714025303493cafde7ce77721e6c09b2b53825dadb978fafe68f6d7b8c20
 DIST File-ReadBackwards-1.06.tar.gz 9739 BLAKE2B c3252c1618e9b1f767da62ddddb073b7a6e0f4b78f6ba119baebefc9890411921470752e1649513ecf068ec3fba3b163db4957261c467678bf01994ccb4874aa SHA512 43b7ebe58728272fbc0518fe6572b31061ba09665443240558b9035573d075c28b52d6230078f24616110d54e51477ad122c985d4fcdb3c3d288cb24e476fe45
 EBUILD File-ReadBackwards-1.50.0-r2.ebuild 385 BLAKE2B f77ab665736ec7912ebfabc7bc439139ca7d5ea3b55fb3cdb7dbb4d4e7597d7c0dce30f1b6b2a25336afd0e603aa5b54c7be94f52bfa811246f30c85e91c3773 SHA512 5360a141f26fe554c15a71deb1b279b309ff01b25abe32deed514e5f625172be4836732f0f50335454b2efbecabface22895ec79493f0cd58d1d9abf813869ec
-EBUILD File-ReadBackwards-1.60.0.ebuild 302 BLAKE2B 77fc3260de4b2b468bf5211483a0c1130c7529a53cdac27906022feae3950bbd93a798167a8e6a2f8c22bc320135b1d0ec4b1906cb2965e1adc09d8cda96d2a5 SHA512 86bbe56af7c3f5b135aa2472db27b3bdf516419322149ba73cdf7fe90e579e9806fdde96ecbac8bbbb31e861e00fa133ed918333ad67b53ed93880a9763fed77
+EBUILD File-ReadBackwards-1.60.0.ebuild 300 BLAKE2B 00f2c01b9acf05be9dc99d375250cadb63dbb405ac3daa1a4be726be2c6683d197b1f7747a642d7ef1c4c7f7d589ef7d6b4c0166f3de6cb52406895d18347c09 SHA512 07d1ecc57090777b2f46cf08e94fb1767beefeb6a492e6dcefbf4381d46f16b508a90a61ca5fe67060afc2270f4d0aaf3a73d1f347956e068c4e8b851bdec095
 MISC metadata.xml 408 BLAKE2B 72b0ef4b0d7eb4df27861a4cd9f16b3e65c5ddfd33cdc451584bc127a1c2e89b9b7e573844e7211fb0da921dabadc45260b97b66037514fb56170ff79dc4b6d7 SHA512 df086b73fd20f77a8f0b220d689a6a6fbc09dfe6fe5a31bf21724e77e8d59c8965fdae89330b7eca0f01d1e1884322e12e2262254b821dbd3f6d3a31b71fdce8
diff --git a/dev-perl/File-Remove/File-Remove-1.600.0.ebuild b/dev-perl/File-Remove/File-Remove-1.600.0.ebuild
index eb2c20851b4a..77181f6879c6 100644
--- a/dev-perl/File-Remove/File-Remove-1.600.0.ebuild
+++ b/dev-perl/File-Remove/File-Remove-1.600.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Remove files and directories"
 LICENSE="|| ( Artistic GPL-1+ ) || ( CC0-1.0 public-domain MIT )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Remove/Manifest b/dev-perl/File-Remove/Manifest
index fb6ed7a22245..ca0dcf99399b 100644
--- a/dev-perl/File-Remove/Manifest
+++ b/dev-perl/File-Remove/Manifest
@@ -3,5 +3,5 @@ DIST File-Remove-1.58.tar.gz 25575 BLAKE2B 20673b6384817cc93378a1bf7a6b0cae52815
 DIST File-Remove-1.60.tar.gz 25997 BLAKE2B ffb98155d757bae6ec0d4f56dabdb78749fc968845e284797d0f0611fe9068722a007c7e0e890179720745d1451c926575949f36642dceef7071468a2863c7c6 SHA512 7781629896f16f0b34574a879803473002249c32cf03001f4c1c290edd379571d96d5b1049874f9f71bdb8d7881c3f30a86dcdd0d4f42b4e78998cd6a96de750
 EBUILD File-Remove-1.570.0.ebuild 696 BLAKE2B 4087300a325e12c6b1bce6159319ca749fd3618ae4c1f52e8fc4e233ceec860f0d22252b3d93c59cc81cc20afa20b39535947c248ba3e7c7ad309ec203995694 SHA512 f68781624ead53acfaf9b983263d3c8bd3a9145944cdc10c68740147baebd8a1a9ed891c294a3367de7091be6c1f1c83c6ccec2c61d11fb7721aeda7ac60b4b1
 EBUILD File-Remove-1.580.0.ebuild 722 BLAKE2B 6ea759b7afdae9a9de30a2ebd0338ed0241ffb0a8b8a6cf085fa2d54a39c2c224f2ed5378930ee523dd859b80ed6cf920864869e7216e03effdd83ce5f4b8969 SHA512 a5cd7ae4b9fdb16ffb11cc49be49a912abcdde2431c21d09fcc34e4738cb0c798b20ad5a76ce48cdbe49d175b2f1e0a8aac5d8678a8272e43c30e0723237736a
-EBUILD File-Remove-1.600.0.ebuild 707 BLAKE2B 19a50f323a7e0d9b7cc82717387df559354b6d843b7c15446a38fed8cfe2538d6bc0663a7657312c192f1232fe66457d7c4a8ac32cf3a35bf546da371048d4f8 SHA512 42384718ac9f51d8995a8bc50a763ade5ff4ab953b5f218b4a51af228077ca1759f72a4ea57cec31a72054ec5077640c471c3b18819275c2c1f36f8d2df14d70
+EBUILD File-Remove-1.600.0.ebuild 704 BLAKE2B 9b7ba7f4e75503485cef3a5f0d4f53a5fa33631fbc245d3e835cd55cd22d64f2a11db01b542b205657fd241f89d734ab609e3691bdb5e8cffc605a3eec6115dd SHA512 e9385b870b75025b15050807ae5037114e01de287dccd8f4c1000492af23ace9c882f2f68aa64dace3bd698183d3c0b86aa4f93a9c3b7a85495ce34439d7c2fe
 MISC metadata.xml 394 BLAKE2B 12f606d262b6dcc55390f4d23a8aa7624ac0c09704ca261e7698404b20d16d4f31cc09ed6fa6516cccee1f20bf7cf895dbc13af15d7e2fd08008541ddb6c932e SHA512 a7ac4d8ecc1b0e4be8268ce717e2ccd67dc652719497f8906665347e8c33d6c85c53e88e340fd34382b9cc41c62b7e098d491b8a999365ec11f6fd02b363723e
diff --git a/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild b/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild
index 70d494cbc177..5efdbcc8df20 100644
--- a/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild
+++ b/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Locate per-dist and per-module shared files"
 
 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 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-ShareDir/Manifest b/dev-perl/File-ShareDir/Manifest
index 685f2403235e..fb76e4b93212 100644
--- a/dev-perl/File-ShareDir/Manifest
+++ b/dev-perl/File-ShareDir/Manifest
@@ -3,5 +3,5 @@ DIST File-ShareDir-1.116.tar.gz 27487 BLAKE2B 88b898ea6d139b21bf9f64f183c808192e
 DIST File-ShareDir-1.118.tar.gz 29631 BLAKE2B bdb2c2d786efda84567d56611fdfbf027665e6d0df21a1e4bcd92824dfa32ac9272cf4b2fb0eb2260317957af150df8a6919027bc664c594ac931ad48cec3f0d SHA512 890f33e96333f7b07707d722e59e7da9a287112062814ef294594ac67f2f7349f905c009e6cd70d3af3a4de85335b074ec5a61194f9b0495f3e793d6ca635853
 EBUILD File-ShareDir-1.104.0.ebuild 720 BLAKE2B 9817613cc6cb6efc67ce96f2c86036ed45640c43ebcca8127134f053d6e9e05a3c7dcf8962f070d5e37c73ca03f2a4895566108b188b526366fcf5538fa1fb54 SHA512 97c1ddc784812006ad4c79c23754fd9943fc919662697c855bf439c21ebdef695208b43db1be614d737f1370dbdf7d6ccdff3f52adbaee7a43e4a19e14426939
 EBUILD File-ShareDir-1.116.0.ebuild 1016 BLAKE2B 2046351f19de04add8335bbe60850210adc5f330a7875b0bfaec0c96505acf7008ad86420ab09105b8c8b1cba74e328d6b81deca7c427a4b7a6bcd53d6eed28f SHA512 0e7e6037fa98abde8263ed86fb384eb535af41fbc2bc64becd03e4168bb6c0066a432207cc37af755ceba508072c7b95295e3c705c3aa4c0536c1a6c12ccb8fd
-EBUILD File-ShareDir-1.118.0.ebuild 826 BLAKE2B 88aa4c4b1cef86202086e29a473607d7cbb90a63e0fb458b033932ba8c9220bc442c0060e2cc1f4ec594a6fc2b53feeabd0c52dd4abd619e086f92d9313a405c SHA512 7d1395e6333f7cf1f639523a11a75a682a389e13b7107ba09d99d3d57b515a71b4d495bc4e850ef17272ba4093295bfe3d7c58709015a046e22b16ae71510e78
+EBUILD File-ShareDir-1.118.0.ebuild 823 BLAKE2B 1a864202992a4c727fcaac519f4e0d9942fe7dd7b3e91d338b4de2fa5bc48ccca437a2fdc640238370df7306a7b1c4624c29785906611c641b550650b07d7993 SHA512 8c669b9fdf5c8f5c718ad1f4a733cbd332e1c17ee5e375786b7faa5c73450616a412d18dd00e321433d2087521f2b97a76a385dd2011e5d46650c3fd30d49222
 MISC metadata.xml 398 BLAKE2B 393f7f6723e23146e3c509b6fe955eaaed1800a4fd5b07bb01e793a4f4fa4045e75bb9e8fa19a7fc3ee424ef4e890465fdfb1d33079fb05771c8ce3b6ea9a185 SHA512 f13082c7aa0e876a02c76e56d91d53fcca5e0bf56b4b32c8219a4f18349287d07ad93f61bd2db22b213a90312534112fbe2d7cf493dbbc91633ef63115bf72f8
diff --git a/dev-perl/File-Which/File-Which-1.270.0.ebuild b/dev-perl/File-Which/File-Which-1.270.0.ebuild
index d84b87b1b9c7..8e84c8577e91 100644
--- a/dev-perl/File-Which/File-Which-1.270.0.ebuild
+++ b/dev-perl/File-Which/File-Which-1.270.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl implementation of the which utility as an API"
 
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test pwhich"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Which/Manifest b/dev-perl/File-Which/Manifest
index b7116362f76d..3f68cef84038 100644
--- a/dev-perl/File-Which/Manifest
+++ b/dev-perl/File-Which/Manifest
@@ -3,5 +3,5 @@ DIST File-Which-1.23.tar.gz 23293 BLAKE2B 8a02bcdb27c052a344297c70cfea6b944ba004
 DIST File-Which-1.27.tar.gz 25146 BLAKE2B 9252da514e45eac03bc415a0c5eede6731f0cd05df0a7894b975edccdac338e711f7793da75a94419e1ae737034c612f595a312d20a59244b2f6572eda2822cb SHA512 8a6164c4af915e93924b1d62864e492b1c5067856e505c50b9a5cce0600d73bdcda5f7e35a9f37134d9e89949b45bbd0a5426cb56121604aea1a3cfe48d55e5c
 EBUILD File-Which-1.220.0.ebuild 723 BLAKE2B d388d476d9634df5edcd8f6a203ef288c3c83eb0abcf1a99ebfc42ced90fad7a10499f308c39bbe12a010d44916323aa8a024fb1b47f4788af19480e93fa53c4 SHA512 33b2d636ef1440b5887d50037682533c432d84a7414b743b76d35a44aba71d364f5241f01f04380ee71306c2d19648cbc03ede5fdf5b967ad41ea278ce210519
 EBUILD File-Which-1.230.0.ebuild 712 BLAKE2B 7996d5834ff47a97cced0d0fb387b595a054b749c06b0c7b28e8c53b71b72f6217f9ffeb7e19df7c4d98158db1ca9d766347e7745f6639fa84a6a48007c7722a SHA512 93160b91169009a6101c345f8e91e155227c649629a027d1968636e4ffa526a910d2ea2c1209e4f666ba1209603131598f40b81d988d7474c131c0673892d3e1
-EBUILD File-Which-1.270.0.ebuild 728 BLAKE2B f46299a6d4765eb1903e717d72d4aa42944885f429488c05d9c3e2ae819d66ea48882ec625c640f276f9ddb1be69b72c0bb33681b153841f720bfb43d0f0736e SHA512 d432ef90c64299c5fc34031b0747f228402539f7f71547ae6c67b3268265d1679eb3a276c260c3cb10aecc8f7acaef71d5f43b8ee3961c698e1cfd47898043cb
+EBUILD File-Which-1.270.0.ebuild 725 BLAKE2B de6609a6ba2339364f6ea42938e822739c83c2cbdf4f11e68885b569b578d52f8f465492d0402fb0f89e16f0e9f0e307e6fa5151d871c17f4a908e2c91b4a76e SHA512 0bab804bccae7372f04c4794e066a79a2305c0d17578e6369bda82f680e6e1743672ef3ea146d07eb3e0cb02884034dab25ff5570819cb3243b4d8d25cbfba55
 MISC metadata.xml 519 BLAKE2B dad66f597916a87de8fdaac5afab5aac9a4f6aeb21e492a2eb61e15bcd354cd3e4d2dd02934b2463553c8f774ca945859103d4d127ee13c843f5cb8752dc0c95 SHA512 2f7f593061c1a254bdc712c25723fadfbbb70f9d680250cfd5d8077608dfe27f8472edc2bcf1ea50c029a1b36ddeb58cc1af900178275d6ea6720e4242a33a49
diff --git a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild
index c975095d9c6b..5cf3c105b8c6 100644
--- a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild
+++ b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Getopt::Long with usage text"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Getopt-Long-Descriptive/Manifest b/dev-perl/Getopt-Long-Descriptive/Manifest
index 759ba40f14ea..635c96936269 100644
--- a/dev-perl/Getopt-Long-Descriptive/Manifest
+++ b/dev-perl/Getopt-Long-Descriptive/Manifest
@@ -1,5 +1,5 @@
 DIST Getopt-Long-Descriptive-0.103.tar.gz 32683 BLAKE2B 9e457690d61e8b2330761ffd09174403d7e485c80af84d2cc61b7443762dcbe9832a15c589b729536103e80c75556f60040d5d1d3637a5eb3226bf1cc1d57ce6 SHA512 9229575bde794fa1213871fbb33a12222737d7979cf4c290200fd85c7da9e3227539809b8380a88a85675429ceb61e505bac8cc4e1408ca63ba92b4e1b33149f
 DIST Getopt-Long-Descriptive-0.109.tar.gz 33959 BLAKE2B c936f820654a5a14dfef706f26514334463b119b161643bbeb831802d9b7403c49f1cccd0414da855ef1bed424d88b78a220f037fb2d723ecce8d7ede54840e9 SHA512 9bd3af84119264c9e7e72b470f54782fe0a9e37e6071052a7b43af9529087841f77f06f81a70e4cab05380558216893b0902aabefcfbc970916f65614666969a
 EBUILD Getopt-Long-Descriptive-0.103.0.ebuild 977 BLAKE2B d787db62716b270cb9d482392c0b24d46c8165dd1b3a1f6edb80635dc009143ab300c84d64e0cd1a8197d602d2d47c2ed72a5ebd2404826d4cb6be4f7c7f8689 SHA512 8d1f30fc8ab4f7ecf381f67bc3737912acbc4873472fa9a8a681b2a1ff7a971d3cc19976e7e8920cdd79f559bb5bfcf7b2c2380c2c388cba12ab1e45ea8c131f
-EBUILD Getopt-Long-Descriptive-0.109.0.ebuild 984 BLAKE2B 6085b004a80182fccbb9851ccd5d10ffe211c743ec8c4a27e07d168bf85ef1c95d6c1e0f46b110ee0942f24426ce8f3fcbc2b4c332039b60ec670c0e447a1445 SHA512 25b56721637e037e5698e3d39f4ad9c316c9d77f35961d7a17b49db0d81dd5fc85eb6b6a1436e8f84b26034ee1d6236ffd1dd3d7d7755ff032be87d146d8ce31
+EBUILD Getopt-Long-Descriptive-0.109.0.ebuild 983 BLAKE2B ff42a6a43d078392cd73b7649269150d9a4d5d3710e0f01ff807619e05349e6df339e68265d5d77e8c7a937cd16194be1101a6fec515f6c6ab2fcf3fe8ce680e SHA512 c466291e8a7f18b803db15445af57256c306544998cd6873e178a467763379fcc0f7e015d4febc8612361396c35c4d5a3b9547149076efc2adeddbd212993b1d
 MISC metadata.xml 576 BLAKE2B 284499ae9040033acd83c3f9ca6f5263c1b0652146333fff6e808587149264f7114d523c116c84f1e133cb558da9095403197da0c90f917777791e869515aef1 SHA512 4a83ea267c2c7d62a81da04c2afd355b6a6d35a1fb6dd8e2fb22b23e59b269b01ce6a91e1a76ca36ae6c621bf33e0fad295c733cc7f84255416c0aa146162bcc
diff --git a/dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0.ebuild b/dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0.ebuild
index 2b1b66685436..911ec25bb09b 100644
--- a/dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0.ebuild
+++ b/dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Bridge between GooCanvas2 and Cairo types"
 
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/GooCanvas2-CairoTypes/Manifest b/dev-perl/GooCanvas2-CairoTypes/Manifest
index 5910a3201105..5c2218a56fa3 100644
--- a/dev-perl/GooCanvas2-CairoTypes/Manifest
+++ b/dev-perl/GooCanvas2-CairoTypes/Manifest
@@ -1,3 +1,3 @@
 DIST GooCanvas2-CairoTypes-0.001.tar.gz 13527 BLAKE2B 492def35e1cb5142f37804c3e7b10ea5fd966c838b44e6f67f26cf19d08f12867e7f28a6901ed3d40798c6fd3498dd1a6149eb8ca9e18be66bb82343aa8dce32 SHA512 00478eda62bfb80393635e0c5eaa86cf43646e74df1ec61f9fac58f4792e8deabeede3f6dbfbaf8844c850f3ca729f3f27090449670f9eeeafcf2ec3ccd316c0
-EBUILD GooCanvas2-CairoTypes-0.1.0.ebuild 552 BLAKE2B 7c3535e01a580fdf2bfbdac1278e745f44cac1fca6faa5c834b671718507cc8da6e85057b81417ee94f6ac342c826ae9de579f9e605cec622ad527146ddd2ac5 SHA512 9571997a1cb5f8875a77a8dc2c732b7fd1b79523e64bfeeab2d1d3b9337d62140352dd7fdb89b8e3ed89fa31d00d5932991e1de4f89443063d053444333631ba
+EBUILD GooCanvas2-CairoTypes-0.1.0.ebuild 551 BLAKE2B 7e4c6e9f7c10395e16006492d4a410aff7b4a5bc024cab335569a099e19646b63cc5336f442955661877a8f4f18aaf4b12fda7bafc8763e484dbeb719554f9b6 SHA512 f63215c190a3349c31150342d8d4044caf3abb5063ad45234fed8de0febe57bd9d902180779197058af9f69c482c712a2fd99047ca78774b02a1d24d62aa14e1
 MISC metadata.xml 666 BLAKE2B 901d6e2a0029c0a9c24fa8bfdd06f1d2913043babbcf21c23a04560606bf53fb94c8d67e25d2a4ca45e933f96920b0e790b31a53b583cdad830ec75918d84125 SHA512 6b6ad6f1b4caef3f750cd2ac1d8069e47d0ad3eefaf18c6bb7059168bf0f7957c9d0ba5ca994a6103772e76c6a93f42cf853bb136796a8ac46f84f287881ac51
diff --git a/dev-perl/Gtk3-ImageView/Gtk3-ImageView-9.0.0.ebuild b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-9.0.0.ebuild
index cc14d5993e54..fb4faf7f784a 100644
--- a/dev-perl/Gtk3-ImageView/Gtk3-ImageView-9.0.0.ebuild
+++ b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-9.0.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module virtualx
 DESCRIPTION="Image viewer widget for Gtk3"
 
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-perl/Cairo
diff --git a/dev-perl/Gtk3-ImageView/Manifest b/dev-perl/Gtk3-ImageView/Manifest
index d60556bc013e..eea2f1652c3a 100644
--- a/dev-perl/Gtk3-ImageView/Manifest
+++ b/dev-perl/Gtk3-ImageView/Manifest
@@ -1,3 +1,3 @@
 DIST Gtk3-ImageView-9.tar.gz 16083 BLAKE2B f64723d2ee468c7ab423292bba8d995a62554877567fdfdd272e527920e037147783fcb9cea99ba1688f09303ee321abaee0e334a67db46bda6b0ed7e1ff9415 SHA512 1a52c53a03b6f9dd6abc69dbb03a8dd80df77e266eb972cb2438bd25d49765b203a70e2dfee1ae3cfdd27b4d987f9573eef3e47968c80550771dd3edbcf831cc
-EBUILD Gtk3-ImageView-9.0.0.ebuild 692 BLAKE2B 7af57f3860c66f616f1313a74784276922fb3d0b5ea594a70c856656caeb740fb06e2261d0ba4a6c4709dba37e8123af774523a910e1c66654ed6eb4539fe79b SHA512 804ae4035aaa6d600d34d6e0c21ba735a116d6687f0a6cd9d3c8c137a580e0de37b273614ff23b0f80ddc7455464b52a779bc9e616520039994e8ef3ecb8c623
+EBUILD Gtk3-ImageView-9.0.0.ebuild 691 BLAKE2B 81ea41684762dddf26d7bb212119a45c9adec9dc30aa8885304117acd1d28bf7d3387351285cadc030b374a3e2786bc9df3ea27e604cf2b99469771c8564631b SHA512 021d0dd86d5125bea046f6bef25bbfbf493e8945691516b38ba963b1af9c0ff9adfb9b04180069114d29e3d1e5a4b7f6dcb0039b7889a05f84ab8b2853449e5c
 MISC metadata.xml 1017 BLAKE2B bebc2e45548a9e410ad22ea557f8d57e302489ed1d1dd823ef9cdee524d273f52043eb595856c0faba5237dea52adaba62b260b8d376ce4b29aff4ff89b02a37 SHA512 f35f6ec768e183b3a60d1a10b2015aec58e865233f9d261e8e3586bcd36fe826000cbb911331b48b84e4c041ee79604f6e4b339eff712cea112646ee8feaff46
diff --git a/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild b/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild
index 5c086e598f0f..fe115e72aca4 100644
--- a/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild
+++ b/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Cleans up HTML code for web browsers, not humans"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 ~s390 sparc ~x86"
 IUSE=""
 
 RDEPEND="!<app-text/html-xml-utils-5.3"
diff --git a/dev-perl/HTML-Clean/Manifest b/dev-perl/HTML-Clean/Manifest
index 95b2bdf8e9e2..023c49e6059f 100644
--- a/dev-perl/HTML-Clean/Manifest
+++ b/dev-perl/HTML-Clean/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-Clean-0.8.tar.gz 48157 BLAKE2B 1618782d270fdb9997bc39617967e0db1bd58191694f098f7fdf43e1090c69e9e52102dce9517eb4cdc4e0bb1beeabde68e4e09a39b15836e719d5fa89fdb9b4 SHA512 5e9fdf49c1fccbb35c769394dac2013972bea070579983c5c2e99105b2f9a4ca6594966ae88770fc6ae1ee6b9388a07d61830d0451d6957197114d35dc5cc1e4
 DIST HTML-Clean-1.4.tar.gz 48598 BLAKE2B eb5001517bf77e24f107aec95244786e7c477330f71ac03d18b26a9f2fe766a832bdbc1a07623b59eaaad3dd84bf82119852841e794d29099d77c947b3dd4800 SHA512 a675b2ae0f7472d4fe44d3402687c4a7d87d33b30894e2c1d9639552fa5f58a89b35b52be17f95058a5ce690a996451c877d1c723b9b6f3919f437da8d458004
 EBUILD HTML-Clean-0.800.0-r2.ebuild 369 BLAKE2B 590adc121b4817690977a5b43518b9d13f5a8f5af9dedd491809a5a7c23768f04094e8309fd45f9fd743e73ee880238d50b0c3185d6faa5c2c626d5a71c52cdd SHA512 d8d278a268f1aaed409b289598bc23b9f8a934916176c996d169713225da4b89182b3649e3561e534902e41f132d361413457ad48f3cc2b6d56f302f3d53aabc
-EBUILD HTML-Clean-1.400.0.ebuild 377 BLAKE2B 6885e6a9218c079a7e0aeedd3cf7531123034e57e01dc59f3db3365a8789fe13b75836604a1f71c9f395e2d287a29f76b01b720b5e1fe7ae0e7a3f2010128123 SHA512 cf43c8bead62474cd8488ff30beabe6256f80eea8cb87363ec267a84816121d4e37616bf5bccf93755b2fe5e541e56e555928f7e18dd46f49d959575e349a08b
+EBUILD HTML-Clean-1.400.0.ebuild 374 BLAKE2B 6d43f39f6658f006aab0e1dbe4954d6285969fb060467f0401a4e5dd87b585cf2812518435f80c5f68f32895dc1bdf6b44ab484400e0eebf7ec4f1cb86a3cdbe SHA512 fcd2fef341f33f9ef9aa64f73493111897474c3a98c9b795e0b8046d6da2cca30e733d7ddd020a80b9886c392fd00e68df6ef06a4d02c5b781ba607bfa050f38
 MISC metadata.xml 392 BLAKE2B c89789fd471d7d9d1a55f9fbeb43ef4feea70b5e17194e01c693bc2611701851c0a9faf0ad0ff8b4af42e6a53a2c526736f5a8612709c8fe2f5e91dd3e67f278 SHA512 38f13304a42607e51a77ea2bd82c238d232c61b4ffe669c879fa71a538aca17d26a77a877269f4130736b2757bafb7cfca6f59298e04d26584ad322f37d626ee
diff --git a/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild b/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild
index 2e3800a1741c..0072cfe9c0a0 100644
--- a/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild
+++ b/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Class that represents an HTML form element"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-Form/Manifest b/dev-perl/HTML-Form/Manifest
index 05e540047a9a..a2d6f8e9e48f 100644
--- a/dev-perl/HTML-Form/Manifest
+++ b/dev-perl/HTML-Form/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-Form-6.03.tar.gz 23522 BLAKE2B 61605abce3af5d685b858191e4bfa5b37626522bd63ab817e5260c15479eaa61d86157c8aff3134136f97ba019104bfa33f2c4ee6c04f01a5854682f81c7b20f SHA512 d93644c9f440f1e0289fa708459e461721910d62c825f382cf913cfc4faa9934fb78ccd929385a4a36605cbc9512e50b56776c6562cb90b31cb1519c1abce7a8
 DIST HTML-Form-6.07.tar.gz 41503 BLAKE2B a0f77744a467dd553bc316e4064b6b334abc405017a9e65c4d5063055a5afad13a40b3fbc71e108661369e5f803e2321bb1240915c9cd6f26f957c21a0f8e4a1 SHA512 32aac4bb85609c2c596e771678bd4d36f3e34deaa3de7333f089c8f887045780db949b5a1573254557eb0247713232cca5e90f89a80e0d53049840660ad3017e
 EBUILD HTML-Form-6.30.0-r2.ebuild 586 BLAKE2B a8e2fdece76fed9ba44b16468148dffb9b7f1434e3e132bccc8654e9dc3259bb5d3e9f515a04b52fe1758b60c7c27aa1f4b406c463c9c855b50510c190b1717b SHA512 63af43dfe0aa80f9decb0cd64f227a700958deec9bbc69b1fb7597955496d5d04267e4e065c4fb99c4f47205e3171ee842d6ef7f88f55cabb162e9269e6a3c49
-EBUILD HTML-Form-6.70.0.ebuild 746 BLAKE2B cbe6ab2f1a1623b3ad789d1ea9ba35dd9fa9d58faa1aa1ea6b9b36634555b6c84cc72a891e5a9aa2724e1770d53afc674cfd3bf1aa6727410e80f7d870537975 SHA512 4cf4947fd274b902a1549252e1b509d9288eb8aff4d5e2891d6fed51c66b366351c02f312cca0d73b6c994b4f0ba90bf3b4ee253d49b3ac36a5397305f779f32
+EBUILD HTML-Form-6.70.0.ebuild 743 BLAKE2B e14b94f1933007dd858f587cff170fd80be8dfb5fda245cb620835badffea12071dd537cff73bc33a426e42a8a069eb733fa5b3f14ae990ea9b58ae8ffdbbeb2 SHA512 b8fa0eaaad685bec6f99a9dac0f07b3560d1cbb12eb3f576acff0b3adc0602a3b09525ca6f83deb043635b2a516b8bbb7d97463677b0e77162b4ac4085165105
 MISC metadata.xml 909 BLAKE2B b9e1be45fe8fb419e2a0ded97f6eac10b8d77899a3aebc4ae2ac5b81d867fe75d8d6ce8c78bfbdd1da8a621ba17b306fe34480c49a6d9e50933fe54471e43b5e SHA512 a8b0ec2f4a5c1951c8b4feb7502bb9dccc2f75bf2f40c29835993e25ca76640d14947237b6fcf5748b97d1c0051aa5cb68491471a0827cde0e3b3287606d4e14
diff --git a/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild b/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild
index 288ea1e184c7..0ea09e67bbe5 100644
--- a/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild
+++ b/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl interface to the htmldoc program for producing PDF-Files from HTML-Content"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-HTMLDoc/Manifest b/dev-perl/HTML-HTMLDoc/Manifest
index 95bf17492f07..c0a115571cdb 100644
--- a/dev-perl/HTML-HTMLDoc/Manifest
+++ b/dev-perl/HTML-HTMLDoc/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-HTMLDoc-0.10.tar.gz 15293 BLAKE2B 6a25b7aa56ac3c72ba70b87f4fea6d9b9838ab15fc3e97f3f11a875a80e877b3e79ba7e5267fbfdd054bb181d652d80f8cdc55a0978b8b8f9844bcaf2769314e SHA512 b401d04025dcd27c2f242d4b05819e28159ae19a9fbe5d8922bb615afec17705cf264a147e11c150d100706086d23775c8dab05025fd7fa35a3da75251fed2e5
 DIST HTML-HTMLDoc-0.21.tar.gz 23483 BLAKE2B eb6721ccce415ec1a217f25f2815daa9777af94bd44874a5fedf4be51b95b3e9809e94eea89b877aac6553bf113dc8dab8ed624dabd8b0f70f8a1a78c004a9ed SHA512 3e7b7ac4f4390242bab4c94439ebb37bf46e2aa2aef8670fbf165795dd0ac138d067411b6adfddd183ff8a7ab6e2e245df422d8b10ca7d9c9f1b49ce3abba131
 EBUILD HTML-HTMLDoc-0.100.0-r1.ebuild 397 BLAKE2B ed5a8af97076f8bb2c53d3b7ba6f19f0ef5266d861c564649a6d584fe41f6b52c410e7f25ed6c30feb4171efd985c673a48f50353923242691d138e71857213e SHA512 6bad3608253f086ad381fa312e6f4c18a24d69c7590e1f6eae413a15352acc689d851881606bd06f981b72dfdcac38454ede939003c38a7cbbc565aa2d1b8f40
-EBUILD HTML-HTMLDoc-0.210.0.ebuild 530 BLAKE2B 0d2e373e020e395402bf7af1ab685ddbd8d962e4d4cf96a0e4de9532c01648e0ae6c8505011c63e61523a40cea07f956de86e9c8b2ae2b05fb8ea6670fef58bb SHA512 98bb7ca77dc5c98dd492c5b528262096bd4d7afc0619b9b848fad18d802bc125470000b0f3ace4f8ea8f0f10a02d5633f84402303c7bf468229650e0b2221dad
+EBUILD HTML-HTMLDoc-0.210.0.ebuild 529 BLAKE2B 65f2b2b0a4bbd6f5df80d7b7de3c8d383d787fcbab02c884e3d7cadc135de9a42d29259086477419ebd73d4deb9544a23c1a6dafd6babdf659877d4128da68ae SHA512 f9c7c70a97d3a10aff24b60990346294e76f29f74b47195c44e84eb2fcbd48391f5f3507a1036aaf5c1b2b91652043aa5d9563179f0360a2c832a01987bc6615
 MISC metadata.xml 461 BLAKE2B 329cddc278b1424d36a9f9ad70dca3c75efa570d173ece0a04f31e4aa4e160252370a5268d57629444f636b4ee2c87b55068a94a3a5c652fc3d721c07c1ef65d SHA512 04ebf2414faafbdf1eb708fede6c8fadc49a4c2af64391d15e78f8971a91c5ecb76d634cca60af4d795d3378e9d86755d56c04e0f53870fba22774665d156d9b
diff --git a/dev-perl/HTML-Object/HTML-Object-2.30.ebuild b/dev-perl/HTML-Object/HTML-Object-2.30.ebuild
index 27aa64c383da..c5729535e9e5 100644
--- a/dev-perl/HTML-Object/HTML-Object-2.30.ebuild
+++ b/dev-perl/HTML-Object/HTML-Object-2.30.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/htmlobject/${MY_P}.tar.gz"
 HOMEPAGE="http://htmlobject.sourceforge.net"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE="examples"
 
 RDEPEND="dev-perl/Data-FormValidator
diff --git a/dev-perl/HTML-Object/Manifest b/dev-perl/HTML-Object/Manifest
index 06289e7d8bfc..552b1ddec27c 100644
--- a/dev-perl/HTML-Object/Manifest
+++ b/dev-perl/HTML-Object/Manifest
@@ -1,5 +1,5 @@
 DIST libhtmlobject-perl-2.29.tar.gz 185373 BLAKE2B ae75158d3425079074a88ee37c316540b278012a45f9f00dc8ca6bd8dabd030fa1092ed94e74e083adfbdd5dd16068d30585366476b7054470021c998ec0831c SHA512 d8028d5f54010732d06afdbae472fb44271af749634d7e5a0e86582f831428d6d902e06a8f20169ea7387f7761ad6abff168086b274b01e5efa1f0bf90583e72
 DIST libhtmlobject-perl-2.30.tar.gz 202607 BLAKE2B b25722e47cab9c3415a5aa086c5c855a51d6c3a0ba2b4d81fd2918c0cce4388ca0697abfd2e7e00c1a6b8f87212b0409ca344f4ab9c86f512ecc0d79d2227ad2 SHA512 c0b1cc93810f8cf31d7c2bd9935893cc0534530715bbad0343f620a9bf24ed79c4d1abe2ce7dd4b524f35db1e4dedec98a3441ca0b045e1492296c73b85e3513
 EBUILD HTML-Object-2.29-r2.ebuild 714 BLAKE2B bfd04c0571235480f04b2fd6208f1eb0942aa192105c4b71bde0d2c83f6c9fc9fa9de1c3a316d833a76513c69c4f7e7577fefbe4789ba563107ff6ddee9f0a03 SHA512 888ed844ade50e47b718c222a1303fa535266d75ef63c9ffec7a1808c4f3df43375f55af5d9d671eb3d16e180a79c1afee96ac3ce178e419eabf4d42af27e4e3
-EBUILD HTML-Object-2.30.ebuild 702 BLAKE2B 999276ca4f1120a15f5813223b7ca36dce868203e52e2a228bea3781bfc0cd8c067e73cad78bd69e8a6d555afabf834a257bb37a290c40185d379bb8d20a57d4 SHA512 fb856db035bec8a1fcc162f9e44107a91f19ef185c2ff47b9a063bc0b2b3bc9680378ba4bd2969807ea1c84558c7a3acc51668eb18805c89a3339e87d3f4706d
+EBUILD HTML-Object-2.30.ebuild 700 BLAKE2B ff12216d6c59f1b0d39e45c0c34736b777bcb8a763791b6f676622fbf588717aa9a28e1b06cf6bdf213b72eefef4ca7882b2da53c2b48cc994342943a971f1dc SHA512 f5e09341c48bf94f1176fc4a361979c858b1c4090d03c4efac2702f8629341b7534159e829007324140f3a212743cab251e85d407e9a9cad32808497a9df4ee4
 MISC metadata.xml 331 BLAKE2B ff36c034460544effca3e9c89494fb79647ff7bda5fc93a2ff016f4c28f81e8600d6c63d26fd228fd79e570168121d6b9844b5d04bc9bc203bf0397532cbda63 SHA512 8452ca93c9bb094be75c9c8abc52ce5e4161ba91de9dc69e85a7807da0a56860d3e908345d5e2f45363255087c22febb8ea97565afe2ff6012ffac51180d5835
diff --git a/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild b/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild
index ebdadde47593..02882d6578b1 100644
--- a/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild
+++ b/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse HTML documents"
 
 SLOT="0"
-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"
+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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-Parser/Manifest b/dev-perl/HTML-Parser/Manifest
index f0fa0902a192..2113ec00d3e7 100644
--- a/dev-perl/HTML-Parser/Manifest
+++ b/dev-perl/HTML-Parser/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-Parser-3.72.tar.gz 90680 BLAKE2B aed1c788b4039f82e9968aa8d2ef0067262c9e986dc24ccc5e570bcaa8dfe46c48fe0f795c84df6747cf3b63f338154c7272eb0dd579d0e2bab833fbc05b88b4 SHA512 9fded69219791af085018ffbe6737e74e370c543af52aa221aec174daf52d1b8d3cdd07f025176c0212ae572a924555262f2eefc73781f82cdb7d9cff58ae716
 DIST HTML-Parser-3.76.tar.gz 120473 BLAKE2B 541aa72674d452a4b9e3d5773abe9b78674560d790071cd8ee19cb90e58cbad48c88f628d9d27056839612f9dc9dcdc7fb2cc719474928e843d344c11bf7bd6f SHA512 50f9dc01997afdef33b58b48bfabd596b09cc11086773dcb4707086b7d7f54d2234d508e11a0b17e5d62849bf6acbc16aa8cd53080329ad3dacdbbe877c2c88b
 EBUILD HTML-Parser-3.720.0.ebuild 718 BLAKE2B 1e2045c4d24d6f113ce6013168104fc1904d830e5f3f1b78d363c26bd39ad6016020bed18dbfb891f1075d5939546fb03cc1308567e281b4a494958bd5451b6b SHA512 ce2ae08b5839c0f3ffee22594d856687be10c0a9ddb49becc8a430e683b0561412b8f3e1f1788754660883dc1843c927a0c8bc0299d1e3c7271c109a9a5faabc
-EBUILD HTML-Parser-3.760.0.ebuild 765 BLAKE2B 95fbd29759e5508b6d6d29d18ffe0e71de9b26e5f70e4c945ee35d6b52a9216d04140a82bdd7a082551139c2dc7f196258ee6a890c3a78b6f2ff5ceff59edef6 SHA512 7b1747401722ef3f031b12c1531b3ea8bc9134062c0602e49f59e5bd9c0a318cf963c794ab9c95e8359d5c2a27ac89db8fccd8ee7913848bebd61bc080c7f37d
+EBUILD HTML-Parser-3.760.0.ebuild 762 BLAKE2B e8e9b74b3ad6e4adfabea92d58eadf610e82b701825a1a3beb90c2be0cdb90d84e4f04a80dd65e418aa87d787b5c12db5598ef4feb7e8e8e95328d4410d450e3 SHA512 36b5633deb899ef14d7a345d75bc19062866bf7d630672f30d59fe2ae2e1e0364c6c18d728bd0365320212f11c56a0e61f6556c51a811ca5a0395d724c102a85
 MISC metadata.xml 765 BLAKE2B 95bb8cf9ddbd12a47914cdd78641d929e66d81f101cc1e8a06ee5227ccd7403d268c779580b612e219b72f22714b04a127b3561d9e420a46a94db3a69d4c45e6 SHA512 e8bc92e65b8d41011856abd50a8f37a0a76c5bcc18272a3dcf480ca33cf07232b5c0296d6048b8ea792703c8ca3d656aab7901da23b5f5e0c3867d16d8bab5ea
diff --git a/dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild b/dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild
index 5ac1ffb9472e..40965b97210f 100644
--- a/dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild
+++ b/dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for scrubbing/sanitizing html"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-Scrubber/Manifest b/dev-perl/HTML-Scrubber/Manifest
index 939a0d2703e6..4ac56f6f413a 100644
--- a/dev-perl/HTML-Scrubber/Manifest
+++ b/dev-perl/HTML-Scrubber/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-Scrubber-0.17.tar.gz 37140 BLAKE2B e7c68b6a93f0efb7f63f431f14c4cdf6de3c0b95b6d95b9e5ee09161ee2e0515d7ab8e148df6293b3b2f1c4644e54e465c96372ef42b8682c4f95fb4b78bc57a SHA512 d6e04374d4da390d22cc4d51bfe2910078effc30d6d2ddc36dbc1b94ada12333c2f9c7acb1f444f777f9e268aed90ba8ea15c4c74a8b5ab955fe97ef04469ba7
 DIST HTML-Scrubber-0.19.tar.gz 36418 BLAKE2B 78ca4b5b6ab6b15a41d7d2e260bdf3ee4823cfff0633527b11843a468a6105a5922fbbd82a524b1c98c6f1c3ccd84dc0c070f5cdb634a8b1fdb2f3cc3f576e92 SHA512 6894c58315f38e81d645b999cca180b1e86a64e8ae913df5891a6293c9c4950d99f1d1c5a03b7d584aff381afc49c16fe2e06541203c8dea881479cc981ee262
 EBUILD HTML-Scrubber-0.170.0.ebuild 464 BLAKE2B c20297e966467c896399823dcaecef255b6c7f2eeffb62f7327e907b2ba7411470ced187fe424318e1be68d146a2ccd5fa99e66559aa9d5dda9ae2c75b011554 SHA512 f0bd8ca21c29d16ae55675a05d5b96c838b4966c0f31101e25631feb8fcdb015662654b054ee6dbf593ecc8d0553ab7b4e82bbc4b58a65178b12a0610c17a91a
-EBUILD HTML-Scrubber-0.190.0.ebuild 612 BLAKE2B b78f4a4fb365d0daea71ad2ab0a2d31cf69ee2101fe616d41bd7605c775a372ce6ae48d9d468ae3f4a13323c030cdb928f20db63eb7ecea5cfe8cd1c0fa412b5 SHA512 60c2bccedbbe7ad7e41172ad7b57ceb472d3028e688f5c7ad26f4c41215dbcfaf6630bc5b2a2231a270cbddceb26a4b4412d6299ff015515b3a26e4de4a0a01c
+EBUILD HTML-Scrubber-0.190.0.ebuild 610 BLAKE2B e345c2ffe1282f61fe1b42515de5972251d8cdf59b9508c9300b4075413d17d0c8d3a341f9629fc1f09ef96a1eae9372eeb58e113775beb1e5850b9cab15fd72 SHA512 118a3e8593eb19c5fefc34b6ef62eeadcb352c503c524fc5d5b256308acdbad259973ad3aa46798f8fd68245cf07d6c22b17b7c3da944333058227651bc4ca8c
 MISC metadata.xml 398 BLAKE2B 5c68bd59c5937621592fefcd0b64d705719f8ffbc04f33b931e0e59b25daa452c1f43396ebb0b3881ffc357936382de2edfaca960b4ede0b2c4e1b604721653a SHA512 02bc1e16dc235554a1a12385ab28521e228e11299e55d2ceb71a9cb91f281d9169e5a977692d174073a27d1e2eb94529e3fcf41d3bbf45159921e2a0f09a4e6d
diff --git a/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild
index 0b45d6706403..a741552f86ff 100644
--- a/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild
+++ b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Determine Web browser, version, and platform from an HTTP user agent string"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~mips ppc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTTP-BrowserDetect/Manifest b/dev-perl/HTTP-BrowserDetect/Manifest
index 04deddbb0532..58b5718a2a53 100644
--- a/dev-perl/HTTP-BrowserDetect/Manifest
+++ b/dev-perl/HTTP-BrowserDetect/Manifest
@@ -1,5 +1,5 @@
 DIST HTTP-BrowserDetect-3.14.tar.gz 95445 BLAKE2B 08a90c6e1154f7a7e1c55af2c056e67ba906d187f3ac8b4e82f1039446462ea9a60f1f875e5f26a2229275436c0deb5acbf090f893aef51f7971ae8e0e547c62 SHA512 cf05af60dbda462df81a9d38d5738826b820534c5fde52f41a290f6d3253783154a2e460042117be32e86dd95f7f1e0e6055b4ca549cb7972cd3c156200c09df
 DIST HTTP-BrowserDetect-3.31.tar.gz 121365 BLAKE2B 454f702905b269cf579bf6d192542cb8e4d63430b7107c78b505db65973c759f79f78053cc45e14b8f7c152f4c53fd18b728f04c0a5d8e86393b1c2bcc4c6b9f SHA512 9ea830b244be7b5d0707118f27a212c520a2117679fab75192881c04d244cc50ae71ee6de2d2be7c456c2a0d5f2bfd0c9bf473893a86ba5b13db89a7d4943e8b
 EBUILD HTTP-BrowserDetect-3.140.0.ebuild 663 BLAKE2B c1ffd7489a32e5da4a38c96b23d4b34cc961e91ef95f15cde0b60b9cd5fe9c443504f35fcda68ab6d87e68aed45065b32e6c1fbc26c19bbbcb18e30dbb2cbd0f SHA512 da3c8f4e87a24d965888dac27736f940b6b85ca72e0fcc1993169c9957b38ec9fe4081109148470b433cdf76998fd98c91949ad3aec9726e42e0942d425d4b9b
-EBUILD HTTP-BrowserDetect-3.310.0.ebuild 667 BLAKE2B ad362a6c784b1bbfec448b378d36396f59e762402833f40950e51b4692efe21c9e5bf5b931e34ba5a451b883f4a580deb65ab9136eab6d769416adfb7da37677 SHA512 f7f120da622b1570ed3ad86dbeb7e2f645fcbfe760406192488bb5fdfc861d22362d9cb1f7ae26f74e821504004c7b22de45755a788491975549309395324093
+EBUILD HTTP-BrowserDetect-3.310.0.ebuild 666 BLAKE2B 931778281e5089cf3974d116e1d9efdfb4115b2206176bc92dfb1703d8cc0db66fe5998f411e025c666a2aa90f963d2a0d1246768052ab269d311ad506a22129 SHA512 575dbbec4d49dde36cea151dab75143651ff1b5be8073b2e64cca20eafd258361e425ff545c45a0e62ea1cbefb5e1bf202d31fc2d3eea1ef2e49a5acbabee2ab
 MISC metadata.xml 408 BLAKE2B eb4647a1dce96723b6208274e3bf32a802fe2965b76b3784a4e1bb414ceedc64b78249d07c347ade36d5ab0c6d3701b26e7430be293b55839e59d10f56556a12 SHA512 39a7d6f17021b4ae4005592694496a84f8320f8d8afd4ba5404d5ccf6ae57e8541443358b109fc703bd22befb2da051cdfd3c1da899ac3b7d9da75940af68900
diff --git a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.100.0.ebuild b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.100.0.ebuild
index 753aad624789..1dcc4494c3e3 100644
--- a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.100.0.ebuild
+++ b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Storage of cookies"
 
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTTP-Cookies/Manifest b/dev-perl/HTTP-Cookies/Manifest
index c478ed6b4c66..be3fedca53eb 100644
--- a/dev-perl/HTTP-Cookies/Manifest
+++ b/dev-perl/HTTP-Cookies/Manifest
@@ -1,5 +1,5 @@
 DIST HTTP-Cookies-6.04.tar.gz 39502 BLAKE2B a6a5de4a992ee246dd0e04594fe47ce635248d7fb004acdd4eb926a84c27a7b69f0b8d5a522460287f1786f3d3f9d8bfd23c933ab7650e8cfaffaf392eecb94e SHA512 e8b24b96e6630f1238e828edfbf7074fb9186a391fd1d129fb65a82748a4cf7d71669fa658c31957560a6faac3e638c8dc7aa3182acaa6fd14f0d56f3968f5e4
 DIST HTTP-Cookies-6.10.tar.gz 42448 BLAKE2B ce261bde7071f34811827099322a0c7282c4f2287ce4baca258d8237dc82ffa5502acbe9ca2a4b76ebe6d8bd0c1facdad5448f1f377390e46c2f4564550bf57e SHA512 c24a986e524ebf5d8b13b4580c3ee6aed018e79c203fd62208bfe970744482832fe9c41bb3195a596af1e11058053ed7615a09a26fbcef4433e270f0f5d38658
-EBUILD HTTP-Cookies-6.100.0.ebuild 727 BLAKE2B 09fb633fd234c1b11a4c5ca02bc3e226be63664150987ad32f492d4765bc4c6bf811a043bd79727d5e5ffcfceb9cd99e24143eaa06f207f78e9b3cb7e1875657 SHA512 68b698f233a8c1f6bd7af854c68d2e2cb6cca76a1bef308891d786f735a072f927c1ea1c413dacaf075c2b41efd38b2cfb0d6a08d180447e2c01116e9b6601b9
+EBUILD HTTP-Cookies-6.100.0.ebuild 724 BLAKE2B c0601613d2918c9edca6649b80b27ba8cbac6273b522bd23b4edb2c137690e75987ec032eb7512996d30763e815befb322665247ea11e51703afe7c215dbef02 SHA512 34c438dec66d842104e42a3be4bf71d096145a403c72c6bb42a7123538805b3b069ccb65a693cb237ff86f1597bf225bde3efe3593b185521621547abd2ab19c
 EBUILD HTTP-Cookies-6.40.0.ebuild 718 BLAKE2B 220362b746587ae543c10a9f97e33f9042e0047a3c7fe65723701b6d4bbbeb6f7c9c68193b57fd2bfe85f2b67fff36e1728cc20bb6bd45601195958cbd062691 SHA512 d116eaec72e5d0e002d63ef52cf1ab09258a98c8be1cfcb32615ebff4c534bf7e180d91fb1a82ee4afe3ff5ccf032204c2803b54ae71dd631de122aa52be0910
 MISC metadata.xml 537 BLAKE2B 661efc3e34bd073871e2a424df5e52a5e13763862c73d9ad2fd6f7335b2d9806eaed338e3849df393d19ce2a4f6bfc7d80cb089037a0dc921d507349d5cb6182 SHA512 8bd8c5bffbca00990043526261a737dac89ed22624d171ff6c95f01a466e9ba6234d7cd64a86a091869f9446c5af8112bb532101b449dfac0c4e799cbae57aaf
diff --git a/dev-perl/HTTP-Date/HTTP-Date-6.50.0.ebuild b/dev-perl/HTTP-Date/HTTP-Date-6.50.0.ebuild
index 3c1348b4c5b0..0de3c4112072 100644
--- a/dev-perl/HTTP-Date/HTTP-Date-6.50.0.ebuild
+++ b/dev-perl/HTTP-Date/HTTP-Date-6.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Date conversion for HTTP date formats"
 
 SLOT="0"
-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"
+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"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/HTTP-Date/Manifest b/dev-perl/HTTP-Date/Manifest
index 01c20edbce0f..15a589791da2 100644
--- a/dev-perl/HTTP-Date/Manifest
+++ b/dev-perl/HTTP-Date/Manifest
@@ -1,5 +1,5 @@
 DIST HTTP-Date-6.02.tar.gz 7319 BLAKE2B c56c349c612d88b90324ec2379beadcd0238e448f83fb2bed7f758dc4fb3d234d4f4cf203c86f3260692ae7db1e1deaf22152c6d7fa9d34a2c835425d0d06d32 SHA512 056d2ff01482922a644757f04cb924d60fa15b86873fdea02e65c78c8af2bbf3f184495852b579eb4fc86bc44f8a5a52f785ab800cc554431ed3e2767e858232
 DIST HTTP-Date-6.05.tar.gz 29673 BLAKE2B 680af1a4ea45160c15a5d086275b5157a091c7816bf5def67c413690c97756946e24d436c50d664e2f8809cd4ac8054e24466d2ef4127b4b09bc681d6b19a404 SHA512 08a427a860161cd0d7a34a4fa3eb6bf6439c2504478a308ff560de0e6620c20df46f004cfcb719e3d19e35fdb650728d6983ffce1423f4d9da06f91d85c7b927
 EBUILD HTTP-Date-6.20.0-r1.ebuild 546 BLAKE2B fa4a1217d43a75679887bbb2071fb3ad04aedc6d02adbaf9ab2f5662f28fdc29379d189d90ea89d49201abe8584faa744db811fbe4ecb3a97a0184dedcdbb705 SHA512 2ad1cc782b4469e711c893b5de98437c3ca3938de445fddbf98e31a2e06f275be13fbc4e61179e11b10e4b9637b33346f85a59bf95b21a51ed4a6db410830803
-EBUILD HTTP-Date-6.50.0.ebuild 619 BLAKE2B b5d93dca7b266e80eb6eac84101fe1c1e80c0d00a2bef50d09d843bc8c0374dab0a91da2b0c5b0f0ff8dcd0f1ab061c658b713e5b1ca31edb9276546b19ba92d SHA512 3157c3851a71e95f2dfbe0a95d42987a576d626c9444f20ce77816d523670883930c492663316a59a4298bb27019140587d3003f23067e6d8486f5e744300b3f
+EBUILD HTTP-Date-6.50.0.ebuild 616 BLAKE2B 8fb96d13dca5b71caa5a258669e8340a52edd0b9805d32aa00cdb1d72ff6641084f0b61e8346fd9b6070deda4c962ea6f889194b9823f661449481ad8c9d4b77 SHA512 e514fc119748afc9c20b64f16f6105257c05e288be78f3872ff566779d329f99b9ab97e8944c08656394d21fcb525b9b79cc2f7f21c5164ca09c539363d1ddc2
 MISC metadata.xml 378 BLAKE2B 190f8f2c438585193871ac2fb41f0d90c9514435c6e5f379d8ed4e9c9bc81b92888fa293dc17c19a1baa47880a869ce8b6e19857905e9e85ffb6d0880f60711a SHA512 396b533e29fbb5e7f482506731f83cb8d019aa6cd63009329ffb7e4c4ccbc6e72585f55e235bdda701a174428c3f1b8d27b765703b2dd7a73da61331b232cfb4
diff --git a/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.250.0-r1.ebuild b/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.250.0-r1.ebuild
index 9fbf08eff0b1..092a03af895c 100644
--- a/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.250.0-r1.ebuild
+++ b/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.250.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="PSGI compliant HTTP Entity Parser"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 sparc ~x86"
 IUSE="+xs"
 
 RDEPEND="
diff --git a/dev-perl/HTTP-Entity-Parser/Manifest b/dev-perl/HTTP-Entity-Parser/Manifest
index 59f73a80e836..e53c4bb43187 100644
--- a/dev-perl/HTTP-Entity-Parser/Manifest
+++ b/dev-perl/HTTP-Entity-Parser/Manifest
@@ -1,5 +1,5 @@
 DIST HTTP-Entity-Parser-0.20.tar.gz 23662 BLAKE2B d003bf695e32084b524a9e56327b5485ef2d8d4f608d55c776b960372165e2139cddd8a8db609c59f40ef84c979eb42c3af010fc36f3bd52945a6a88417396fc SHA512 c80d9058b8682c51a0fe3669249cc219142e674959237d8ae6bd435afafc16c92a38328329e9b09a25af8a79fec5bf01050145d3c63dd81b15ad9d75946fdfc6
 DIST HTTP-Entity-Parser-0.25.tar.gz 24307 BLAKE2B 6c8e7d6dfef9c023ea9e6270d12c0790711a03bfe783ae7be0550b83859d03ad94515981f3b87887d2174ca45b1d3cbbee427064f1377f28e0a7d09c2942de2c SHA512 760bff3ddd818ecb8eeeaee86c2d2bd895820b4011c306135b2d6eb3c2519322b3bd4e20098c9458c2fec7dd944384dcd33bfdd5b2d368a28270ac14e8dab54b
 EBUILD HTTP-Entity-Parser-0.200.0.ebuild 797 BLAKE2B 1b5a485bd48788be00f5649a545dfd5a5c059f256a9bceb330f3335fc10073031e5aed6d3f7b4d9d3881bbeda75f4135add18cb26ef7a4183ca38ea9b8e35b87 SHA512 75e6cd0a2cf322a13ecf3a9ce41536c3361043565fb76a9b55024ab2a875b5a0f2d8ece882eda07d39f93d877e121310f7f26a839224c4c3509952e5acb69599
-EBUILD HTTP-Entity-Parser-0.250.0-r1.ebuild 771 BLAKE2B 15ad6b40ffb13f3dafad021a9823a561ae2dcb9276c60db6628d244a0639eec4b46db884112c9e44c72aa46aca252c21e0f19e6f61792ee21e7743d3bac6015e SHA512 41ea3e36de3b56fe8cb23ff70effc08e5d35f0541a820a756add90ddfd727b83d193a33132dde7f5d2a30e86c681b7f67e7c18871b0653a02802c2706b71acf0
+EBUILD HTTP-Entity-Parser-0.250.0-r1.ebuild 768 BLAKE2B df93d22b81586f61c5485ded7fa1e3bd4bb8ee088fb05d8925130b929953667375674fd80610a7aeceabf6baf9bce99649a8dabe63bff81841b220cc81e7dc03 SHA512 fe9c1a019e6a5225769e6253661f02b16aacee47c07c2d8158332601fdc0631bf7ac54d286d11016ab9a23424a62ba972757ca1f7059e5702d0eda92f159e58c
 MISC metadata.xml 814 BLAKE2B 9d07cd2d82956fdadba2ca2b8590c49a482ef88cc9637246960637b98518e0a453bce7e9292bcf176c1f15d605829b86ca3128b25e52703f14067cee391e16f2 SHA512 769ef47e6cfb110eef1f4e09cf49fc03a43352f48604da2466bf1793ef1a378c69cf25437ba3e26ed0a31c53f489d427504b1d71092cb8b82ab06c6672f7eab5
diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.320.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.320.0.ebuild
index f0e9650efb2c..38c6d72276cf 100644
--- a/dev-perl/HTTP-Message/HTTP-Message-6.320.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.320.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base class for Request/Response"
 
 SLOT="0"
-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"
+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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTTP-Message/Manifest b/dev-perl/HTTP-Message/Manifest
index e2ff853360da..5edf974c229a 100644
--- a/dev-perl/HTTP-Message/Manifest
+++ b/dev-perl/HTTP-Message/Manifest
@@ -3,5 +3,5 @@ DIST HTTP-Message-6.29.tar.gz 88311 BLAKE2B 372373f5a4103c788f8f951c602627f9965e
 DIST HTTP-Message-6.32.tar.gz 88711 BLAKE2B 765d6ee3053c91448cd3023d87cf3bee23f107ebb10f2ccb77f064b7704c92a81f3268612e23266bb3e28a7e2810238be4da9475e93304a04dab4752ef57e789 SHA512 359a0d51e65d721d8167dea05d7aa9853d07eb4a4093735cf5f45814117070400cce93d60b08dcf92cfe0fbc98e7455e7facaecbfcaff44cc0e619fb621b3288
 EBUILD HTTP-Message-6.130.0.ebuild 1045 BLAKE2B 1a01523d9d08e3c9623bdefee63e60d0038512e5e116463d99797be88e5ab0d9df51b884f14021c512386d6e811f9939c3e383a5151155ea2a79138d4d2ed414 SHA512 2753e6e569ae6d59fb5f7d37aff9077bb0466626047a738a6fe711bbd200ea5eaa1b207751de24434a43416fb0f63cf09ec23e1ad8c6386c7e11be46b83b6654
 EBUILD HTTP-Message-6.290.0.ebuild 1057 BLAKE2B 1f1fd0efb62d19970d5ebb3a61bd885d510dc4d9bd528a025d3a356c32ff700080d33266b2cac2317bda2edc3e1d7c06d5111f57cc1981019c8b7612209d7987 SHA512 fc0da5198de83143943ddbdf52ac9dc1e5d18e5fa80e2fdb4568822e0e3664f5393828cbd021c8bf3821ea74e5239b2d00b0ab52bae0d955645185a220dd5aad
-EBUILD HTTP-Message-6.320.0.ebuild 1089 BLAKE2B 75a7f8ab48bd959901659b6c29a849dc4809d9d267896c41d4a06020fd8dfa8c77f98be593c9a3c525bfa854fc13b2cc9fcea2de638ebcd8b1151bc8b95aa196 SHA512 c3e3f0e484996adaf442ceebc7f4c236c22246eb21bbe942cb5c8ddea82a7a02f6bf351e51e6e3d0619d3d53c51cd8af196025ac570fff7e7b7c652472ec9600
+EBUILD HTTP-Message-6.320.0.ebuild 1086 BLAKE2B 36b21f14e544f2b1352bfacad0d232595b1fc7baba26260affbe210f97bfe3975453b453b876a6cfb192a3e6044a674984a0b66979f5c9d11635c058793229d4 SHA512 639d0f48065e88ed263f22ba08dd1bfa8bf79e5695b64ec0d5781206ac1d68548af7afb84523a919d7c80b0bbca7a3581e61674a0b9a21eaba05b3459e26cfc7
 MISC metadata.xml 931 BLAKE2B ba8a44911e5d7ef315af7b6ae5508670ed5a65d4495ccb1eb65eda4eb026923730fe0b3d2b3299a708dab602f8ea0c76201d4b573a5376f0d3acc464911dbd02 SHA512 6e64be79b3ff22d9ac9496bdec50e6d8e6bc93ce47343a0e8d5212288899188177028563beae411c2d1dbfecf8a7c950b8a3f97176c0ca865ea3e94cc1a821c5
diff --git a/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild b/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild
index b44ee37383de..b10a6e24d2e1 100644
--- a/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild
+++ b/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Capture STDOUT and STDERR from Perl code, subprocesses or XS"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/IO-CaptureOutput/Manifest b/dev-perl/IO-CaptureOutput/Manifest
index c85b43e93e0a..ff43b95a0a4a 100644
--- a/dev-perl/IO-CaptureOutput/Manifest
+++ b/dev-perl/IO-CaptureOutput/Manifest
@@ -1,5 +1,5 @@
 DIST IO-CaptureOutput-1.1104.tar.gz 27651 BLAKE2B 998153cb491436e1dbca26f216833898f9c14949b42bd30afdf94c042f35126d8df6db8bb13718ac944de8d252e0be90fbbf3e5f8ea0048bab8d61fc30d0c20a SHA512 5694635c91e4dd11279c33fb9d58e2eb27014f4ea0a976e62c23505524e3d37264aab6d6b1cfe5d925e123d6aa240e574dbc4f489c6c1007da09631368af94f5
 DIST IO-CaptureOutput-1.1105.tar.gz 26657 BLAKE2B ff2f00511fe8e4a038fe29aa86ba70031565b11e800f3dccf712d8a46ab5accc18779add4d3cec1cc2da987304f0627c653997005cbf27095874ec1e087a4e11 SHA512 8ca9485982d6bfae08ec322c28efd8f673f2a6705421ac5d680c228c436e7a5c8e18a16ff9712062631c35a91e6d19d9518263135db469c47083ce30814cf064
 EBUILD IO-CaptureOutput-1.110.400-r1.ebuild 736 BLAKE2B d293b349d57b9b3ed4d322c0dfe2c2a446ce562b4d0bf48136d5420ba483c14a7a1ded6592880ee832b13447705ac593adcbc57599ba4a333d62a61a94008755 SHA512 16ce8c16d63ea0ec5ea10bbfa0e7a9349621d849f7b4eb85009a680260a0cfc8da0cb24452e431356a64a8c1df0892f365ce0a881dfc285bcb490fd0c238dad9
-EBUILD IO-CaptureOutput-1.110.500.ebuild 705 BLAKE2B d08e94f0bf882ecaf839add9c45d9a6b164cde253b48a88e14835635e365113e8e5b569e1d6d3c85888c4c746c3e406e780446e746814976f98f804d344597b6 SHA512 39c2343fb826e69015fec258a0827c40d62cfd8bff19e4f168b9f9cf950536bf01e25468ce7a5be2d87ec9fec4d7e767fac715736911a29895af09a3c5bc4dc6
+EBUILD IO-CaptureOutput-1.110.500.ebuild 702 BLAKE2B 2297ec6d94f8ab0830ead75c1c1921f3a27e6cc923d2f7db4e067b47fc12554e4b5f07d2af9f9a5a23c06964cc692a2f30a7016b39167a576d24a513727ca24d SHA512 d89a8b2d0681924bd21c3b48a3ddf6fb1c33a9e062c6a75a2f7488ff18098bf2d61e16e4f8fb952471ec005ace36fdc693bbf0e13de35b9daadf37020f4dd6c0
 MISC metadata.xml 404 BLAKE2B 06521a15fa1b4e1fba429b7c3f1502de955edf51bf75d143125df13995871aa80b503836bf016dd48d12553a53561ea90fd58253cf203d8e94992dce02f15856 SHA512 8f47e8f2ce312ba5b5dd1a168515f2de2dd4c2a1c44713be9e1f85bd5ff265958c553f35812fd67dc9adebbe42e4254a5b71471a304c0da463303e78435f0677
diff --git a/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild b/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild
index da18846f643e..207cfffc8977 100644
--- a/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild
+++ b/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Open an HTML file with automatic charset detection"
 
 SLOT="0"
-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"
+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"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/IO-HTML/Manifest b/dev-perl/IO-HTML/Manifest
index feb2c29cb0f7..d260122084c9 100644
--- a/dev-perl/IO-HTML/Manifest
+++ b/dev-perl/IO-HTML/Manifest
@@ -1,5 +1,5 @@
 DIST IO-HTML-1.001.tar.gz 19375 BLAKE2B 252a9d0a0df72fb70e050c9742a13d7365cddee1a24c25dc86611a5eb0e473ee95681767f01e88002d8649018d570f1a97234360085bf9b6c902cc92044f4772 SHA512 fd3780c854e2e4003c80d2399987bbde2ebcc8f110915a74326660036d0860f79123f924c3200bcfa163363d74f53ca742bde973549e5a554e63648ed55dac52
 DIST IO-HTML-1.004.tar.gz 20927 BLAKE2B 633abc5d652bc5fddd8ff6d3b82e5048832bab084e3d8e5dfc3b99fc7221501b5147342bc4ead7b03b8c19a5ca2370deaae52fdafb1b860b7845f27873c629f7 SHA512 564fba7cfb50ef1cc78fa9e2b2200a20e305d098b8ceeb6f8478f0275cc48e4fb069386f5c318bc9deb43a5d590a78a995c04100bd440340f5c990eadc76a70f
 EBUILD IO-HTML-1.1.0.ebuild 799 BLAKE2B fa9fc92f7342ad96d91bee8a5e30e84bae28752f08465fcc8aa92c1a5ec77920148670b33043e3ecac4a81a0d31575a414ecfa16cd35714c6094f5d38936b3af SHA512 ce93f6a26e3dbd29291ec433a1b3a18fef078cabb6879172ea03dee22c5e8449fb4850c82a534e85a1ef4f88e9d4d6ad4d05d33f4aa93d5927af7202a1f55cc6
-EBUILD IO-HTML-1.4.0.ebuild 726 BLAKE2B ccdafab375a2c0606583ce5c2e4395f91daaaa40a429c4578e1ef3592a9520d47622d39b52e12338216f7e883744815c691d15fbc56c03edf676192b8858539f SHA512 6cf0b97c7cb1d4de5b54838499bb1c3133250d1fc5f2488dbfc7cb34ad002bcf37de415feec35ffbcaf644cb173ca0feffae1e5739390a7b25f8ccffe2f2f4a1
+EBUILD IO-HTML-1.4.0.ebuild 723 BLAKE2B fa7f0f7ea9e5485e49c505d877ac27152a3ebf901ee7aea3d6e09b2bb3836df595ffc0cfae4a3f8cf9173c0a4b247667bf5fb4d78c56f2bedaec5c83260249d5 SHA512 f410bfac0755e3a6793aaf71c2ec8fed78a0cfa802303efea2267b0c0e91ea3cf74e79bab9307ce23d817f774625103e7b89a805884d7e628ccff767adf27775
 MISC metadata.xml 374 BLAKE2B 003fd7368f4a8ffbc95499710a08eb429361cfe3a3b9031d5285e33a9750bfa2b0e4db20ad24218d0813e3eb89af842cddfe18104b0232b19d473931fb786c72 SHA512 2891190ce95106a568ced3f2d3a39d9ddf337abc296249c1955837165dbaffb2990238e90fb48ca5df39753334d717e1480c8fd1ef6a95ea64a1c259627ee8e9
diff --git a/dev-perl/IO-Interactive/IO-Interactive-1.23.0.ebuild b/dev-perl/IO-Interactive/IO-Interactive-1.23.0.ebuild
index 2d09540615d8..9bf981e7a378 100644
--- a/dev-perl/IO-Interactive/IO-Interactive-1.23.0.ebuild
+++ b/dev-perl/IO-Interactive/IO-Interactive-1.23.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Utilities for interactive I/O"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ppc ~riscv ~x86"
 
 RDEPEND="
 	>=virtual/perl-version-0.780.0
diff --git a/dev-perl/IO-Interactive/Manifest b/dev-perl/IO-Interactive/Manifest
index ba3b23be8451..c3b084e032ce 100644
--- a/dev-perl/IO-Interactive/Manifest
+++ b/dev-perl/IO-Interactive/Manifest
@@ -1,5 +1,5 @@
 DIST IO-Interactive-1.022.tar.gz 11791 BLAKE2B c001a709531a48d4f4756712caab14ec8b9f2f21478f545fd4f858b3619fc625d75ff9bf744e4c3223a4b9ba39f2b97bb0e38b9eab8297d7d76e5aa0d88b7647 SHA512 159bd97912a848e20df3ac9f3f7b3063788c7bbe2eafd35c6cc9b798027c6e7c12d2488385936c87669877928707603729bc34b2d7b8c108534fa8fd42082074
 DIST IO-Interactive-1.023.tar.gz 12352 BLAKE2B ea0e460dab313c8d203f3e9409cbcdaecbfa23bb6bcf4145905fde5b0540fe326f7d2dbc2123217840c141446e77bc73ee6db871ac06d809f589e5736bbbb6aa SHA512 82899c09adaf3699d5640b78bfbd5201972cf4c47ae90f7c6d6da9fc1f4470abc1bc5898b904c501d567537dc19f781febd7f05d0c06e60f1c193cf33abfb47f
 EBUILD IO-Interactive-1.22.0.ebuild 556 BLAKE2B 12287b73f38528bb427b3649c8d3e03b71b512e7482c57ead80bd432bc57e5a83330d188f0466f8cdc49dd8fb2ab51fa706a5d1f8895662877c32429215ca50d SHA512 32272d0ca33dacd21063bd4689e26409a747f4e1ff643d2a7611d4faa7f4f73c13befe5f999868a8546332dca32c69e4eeff08fc6d1603816327f1d5d87685c4
-EBUILD IO-Interactive-1.23.0.ebuild 486 BLAKE2B 4f5f4e0286523bd9a898a08f57933261a78629eaac7aee65890cc344a82ba16d79f225a41209075500e2d77763a35ef7ade1761043676f3c0647152273158fa6 SHA512 0ff55b67618471269f12d641ae57bad27d866ccbad5f96a2969bb26138f94f44150b9afb5e2ba2132a03366fa7508cac5d69ed994fb477c3aa2cdcc10a07b708
+EBUILD IO-Interactive-1.23.0.ebuild 485 BLAKE2B c5eadbae611b57be01c794a1ecfc2609870574403edd4a08566d468e202198f596f5a1c56113bbc8c6a6c9969fa520b586166d5df3c5afefb56172227e54da3e SHA512 b864be97977269f8f9877bc10cd2d315e1597e3d921ee8d5805df7b0852dde1d0696a857e44931b2856b74d8ac9172d18dedb041d9586901207a448d3cdf46dd
 MISC metadata.xml 388 BLAKE2B dc1672a835764e0e69828043196dfa51abde9432114a289c88e38985b112a03e36fe86b6076b8c21ce5799138035326870c166b9eafd382131c422d1014dd4df SHA512 c3bb9b7804e6dd2c6e958f8e0744959a28cdc632068b7e1d9e039602fc0f98a4397457500c3d90abd4522b482b66d758f6e569640d41235a9b16f43fd73c8dfb
diff --git a/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild b/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild
index c6daf9f53843..a36292c36502 100644
--- a/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild
+++ b/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Select a pager, optionally pipe it output if destination is a TTY"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/IO-Pager/Manifest b/dev-perl/IO-Pager/Manifest
index 0b3aad174e9f..74f43f1c111f 100644
--- a/dev-perl/IO-Pager/Manifest
+++ b/dev-perl/IO-Pager/Manifest
@@ -2,5 +2,5 @@ AUX IO-Pager-0.390.0-no-dot-inc.patch 687 BLAKE2B 1de1e8b93eb02734a04fe533904b3d
 DIST IO-Pager-0.39.tgz 17552 BLAKE2B 8f3bf2b82523fd7d2ae5aa555eea8f709d91f50396397eaf04bc5f9476f753e2b68e8e5ce4c46064096218d2d1b7f91d45d21c112dde938879455f61f5618234 SHA512 165e6c5e93cdcd463eda0a0f0f713790959a788220e29bc77bb10ff59f8e1083d1dc01fc059f150f8cfb4de1d16eef04813430072ea33d9dc6f4acbd3287ce67
 DIST IO-Pager-2.10.tgz 43774 BLAKE2B 981fbed47a001dfbc483bb7db849039a5971b9b7be990486a1d03d7f4dee266363eb6cafb410539848e1debb2196cec1f5e30f85fe9eb584010f6e0c3bdb2537 SHA512 10fc6cc8a14e057918f1b21dd3e5983d49e2d0504bbe8057aa87be27a176983a3d552856106e8e35b834f279c82ec2e72944ccf87534cd4f9f8f138f9957ff2c
 EBUILD IO-Pager-0.390.0.ebuild 663 BLAKE2B 2a7e72772f4015b64c45ae30e47f2ae16a1d37a950e1ef1ecdeca5dac3a742b9e7173cada636ac0ed8cbad3df2bb23b409e0a60e6e3283ba4c3d72a35b226231 SHA512 5a9c96b7641b1c9addb8210c3a26cb4d329c78ed187543d969e50d9f43a3e3235be3ac670c5d0441aeb3740889a3aa106bb3522e376c6ea066e64a9907f07038
-EBUILD IO-Pager-2.100.0.ebuild 612 BLAKE2B ed518b6f8006d895fd1ef0f8f3754a57b788bdc973fb73e297c26d6f7dcb5b99b831c532b8ff06e550517c0772eae0293199eb12197e6dc71306e1c63602e96d SHA512 d72a44ba717e6240ddec07c28229f86c7ab2d321462ddae8320fcca1b81bb57ccad3f9134ac78119a0742e0010c6b0d64797f7afabf5f82af7ec84a7e38ad951
+EBUILD IO-Pager-2.100.0.ebuild 611 BLAKE2B 9b7435d633bb15928d090f7137bbe18bfde8edcc163db972fae4dae24d045b64c05b7a99673fa15824bd1193c6e19f6c3de79b88df9484fcf3ddaebba70a5867 SHA512 9e4f9eecb7be2dce37f86c5c607c93ee3190647e7053d3f81ceb65a365e2b29ea539c2615a86dd7065663c12ebaddf57e5af649303686b85a4b230d3fe5c8bf7
 MISC metadata.xml 584 BLAKE2B 46d2c2594874a2def60db412452bb50f0c5a40b5910fba0f6d3686f3a7842b546becae91656bca06dbf49e7ef6c6cec1d879baa64f320d067ec4d7111ced3bae SHA512 06f4420648c0a977c373dc3a8582185153f6690d946b07acba08de0c159f806ccb9682ff94c7c35c9c52e71fbec7f72048737728d62fc729741de11d7f335358
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.71.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.71.0.ebuild
index 749934583a61..10e2bffd0e0b 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.71.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.71.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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="idn"
 
 RDEPEND="
diff --git a/dev-perl/IO-Socket-SSL/Manifest b/dev-perl/IO-Socket-SSL/Manifest
index 80b743152077..a04020981e47 100644
--- a/dev-perl/IO-Socket-SSL/Manifest
+++ b/dev-perl/IO-Socket-SSL/Manifest
@@ -1,5 +1,5 @@
 DIST IO-Socket-SSL-2.066.tar.gz 244730 BLAKE2B 1e197dc7ee4221c7a9bd5bdda54e29d2ea0321ae9a7929e5204917b3c0f3a7e90af5712a0684a6094041d475353777796ba5173fdd48e35abf739b2224fcb590 SHA512 2a15f6d65f276ad4eae33139ae7af4c891d4c9e5f6aa65f45e51bfa02c85e8367a275bd33c73ece1b47b9d18eadc59e65fe1c584f9ccd3c7655948710fb4a57a
 DIST IO-Socket-SSL-2.071.tar.gz 248367 BLAKE2B 4b951d1b0ac14aff4d5c2cd73fa6d6c9ab51a158660e0afa01c9484ce3c7c9cbf6a10f6f75783c38edc7534b0ae2f4696d5720087cf200a13df3adf658ee00fe SHA512 9170df785bbca7519364ec0eedd170661e8ef60028439dc8c836ce8a91d0517d647e43138af74e52a768b6e0374747abb5f41274d76cc38e1319edf82a2e9fdd
 EBUILD IO-Socket-SSL-2.66.0.ebuild 766 BLAKE2B 956f9d6bdfe1ea6c1ea1106a1f459810c5f5d7948292e50973b51c1593d5969f45842c2070fedc4db66178ec496b04e60e3b1d1bfbe7dd2906157577f32ec684 SHA512 d801d503edaf2568b5e539cbaa4c30f8ba994e870756c2caa720404d5033fbe62bcbe725f918cda5bc27344c966604bc63884843b76d54c009ac876a18b8a921
-EBUILD IO-Socket-SSL-2.71.0.ebuild 776 BLAKE2B 9dbb99cdc3fd5d3054ca6d2eccc92d99c037ff2088434083da9dbb337ed4e88e16ec922d00aa6a8a5a23d2b6c7a14d0fba3187b989ee7eed74517685b699b249 SHA512 b5420e25b4297c5a7b3f156f725f92a79ed1fdd2187a19d7fd983077e3dba040e201c1ed7c9d25092c84235325e350e91e814507c2cd6c9727e1c668504e1de3
+EBUILD IO-Socket-SSL-2.71.0.ebuild 773 BLAKE2B 1739ed88030cc35ed6439a223e93d3fb3ed6afb863ae793bc9a6a59b9eaffd89fa76bc3e2c79839e60ceaa13801245c70cff467e369006b64af8c445e5f11372 SHA512 add590cb2c4c82137753daf94e741d0888948a7ee8d51e4c3246508d2cf78647da47652a44c6cdcb28e9f39e1ec0e0b44f0c070f30545cef87fcb5732cbaa3c7
 MISC metadata.xml 994 BLAKE2B 4a4916d4a8b216f0eb6c82056f70732295918bdc80a2c3715be97568ef8e7d1084a42666db47f4b2bad4045e175aa45674fd4ed2c4ef4c6d38873434a2bc4640 SHA512 c861d564131ef33b1949718f73b16df3b14a801465f544e831b969b52d5c03bd0b4906416e99a92331ef08641d283099d1ab0352c29f90b4b835d46819c20c26
diff --git a/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild b/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild
index 8f7c7d021a00..3da7bd756a6d 100644
--- a/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild
+++ b/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild
@@ -9,6 +9,6 @@ inherit perl-module
 
 DESCRIPTION="Change and print terminal line settings"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 PERL_RM_FILES=( t/98-pod-coverage.t t/99-pod.t )
diff --git a/dev-perl/IO-Stty/Manifest b/dev-perl/IO-Stty/Manifest
index e694e12cd4b1..f8618a79dbec 100644
--- a/dev-perl/IO-Stty/Manifest
+++ b/dev-perl/IO-Stty/Manifest
@@ -1,5 +1,5 @@
 DIST IO-Stty-0.03.tar.gz 10251 BLAKE2B ab36a3a523dbb0d71358a89e774364ccd63c06e88b2b0d1ed6f87f9b2ddd37860230e47d2be0fb823cfef1efe2e268798d8ff0013c8f605b47647e38252538c2 SHA512 0670005929f604c8c2103d3f5e5e03e17413f8ff8a2e93911d5a064f64f268f59eb8855126c86a69649f8a350b70ecd812e60b01584c5d042bd64174d9710e4f
 DIST IO-Stty-0.04.tar.gz 9686 BLAKE2B 0e2234f4a9878a0485ef195adf8e45079c4988253caa03d9056979dc692884e8fabcc01ce4827abcb9d79afa263cdf4d6bfd5d6bca39235b14ce56f029fe6a42 SHA512 1a75adef5376612c87bb7c76eed96f6d67bd70eaae51dedf65e25a31b0d1d592a89dbf58fc669e956460a4d3889c3d5273c78bd1c7d926113b42e5f97064d38f
 EBUILD IO-Stty-0.30.0.ebuild 588 BLAKE2B edacfdf7eef75b4f39be8a6cfdcff02530bdad2ad4b0b3f5f575af73544266f3565ef36b660a2f9531db40fae3d7d3ee65a2e05796ecf67c19f491ef3f6d4ac4 SHA512 d731c6413028bb7c86b03e3a4bcb2ddb5f18378fd9dad3cc2938967093809d55ddefd5077a565f82b6097ff7e803bfd80aea7dbf39aac9bec4ea38049bfe1cd5
-EBUILD IO-Stty-0.40.0.ebuild 399 BLAKE2B 953b70caf8005cdab2fd7263cc590d06ecbadd9f153aa04f25fd9c122cf117e9af8609c1fd1fc623952ee7f93adb819655252abcd523dbade86d830494e6aaaf SHA512 9f3e2a1cf16e37ce7ee78eb66d70298bd9ca05de0b9d4cec73590e7949c538db3070996e7339ac6701a9a419a8f19774aed5a6e6b7af1f5c42794db3379732b7
+EBUILD IO-Stty-0.40.0.ebuild 396 BLAKE2B 1d851c0dd3dbc70bdae758c3510b502a25aec2206fbcc1e6f0070feb2e83a6f06188bb4c49e15131b2a261a1eac39b390c3d69f1543f37a4e9d504b4ef67634b SHA512 345a5895ec2afcfdf512ec38e618011da016816d95c77c1fa157ededfa982feea23d00914ef13b0d526405e2046f06b3b86c789f55171d9454d111ff18e08886
 MISC metadata.xml 374 BLAKE2B 7586f7c94183d9f455073dfbe8d052215d2c5a7f89eb2c9903bb34018150995ea5df1c1b8640d6061b57c3c04ffee08b56bf5576ea73f0a3445dc0116ddb2b8e SHA512 5d7b2802654078a1cccb1f402b88d0e1d6f79bef01c54b076f707f4a18657d7ccbee54420f39c60cdd298decd096dc459c81c548abaab0c45dd79b1f6fe726e1
diff --git a/dev-perl/IO-Tee/IO-Tee-0.660.0.ebuild b/dev-perl/IO-Tee/IO-Tee-0.660.0.ebuild
index 3e14a1c09f91..ea63886c8d7b 100644
--- a/dev-perl/IO-Tee/IO-Tee-0.660.0.ebuild
+++ b/dev-perl/IO-Tee/IO-Tee-0.660.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Multiplex output to multiple output handles"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ppc sparc ~x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/IO-Tee/Manifest b/dev-perl/IO-Tee/Manifest
index d51d2df315f2..3f4ceb1270f6 100644
--- a/dev-perl/IO-Tee/Manifest
+++ b/dev-perl/IO-Tee/Manifest
@@ -1,5 +1,5 @@
 DIST IO-Tee-0.65.tar.gz 12842 BLAKE2B 28f48d16281ec761baa06f7db01dce6d36418d1b33ad86cde6f16d5fc8c3f02422a93276157cf976a49b2ad296f11e589bb32fce0bf0dadb098fa68833725c95 SHA512 f0f2f069c9c43098fc8fb343ef3a701e8ea5d6171a7f86b3c296f542435b1305f263085ede07431cfe34ccf02d845c8f3719ddf1eb6fe0d8def0c730f8e97236
 DIST IO-Tee-0.66.tar.gz 12883 BLAKE2B 9b93a5d9266b545d159e7d7de3101f932eb9772a9144e65c081d126bc528822cdc7bde9b26edd749491e725b62a49b00ae71d999be40334c41fd6de7d4f2dd13 SHA512 0f651b043e8a503e5b5933fabbdc00df139bb16b5f4e3f8e135123c53ede78abd2d3df9e824c85e1443f883fc1026fb6ff97a8c511d46076630b890253567c75
 EBUILD IO-Tee-0.650.0.ebuild 400 BLAKE2B 721e852d6fa85422149fe5a842d09ce01a01b5956420976c4ebe64f263369cc61f3ff3d836ca46994c15fad494c27812ac054a1e55cac5e4511fcf7d2cafe4e4 SHA512 515f3fde1b2e19c2dd29c050a30f0ba118a6127dc96ff5588799857ebeef34623d5744a3592c0f5f9eba8e7f2ce3895861d111a845bfba2b404582291c93549b
-EBUILD IO-Tee-0.660.0.ebuild 394 BLAKE2B ed84d7cfcfe822d18f1f537c9206ff26b4d4c8a5891e6b0c7bab9a1e76a3c34247ed0bc0d84d7bac2406cf0510c1a23c5ac2472581d5e5a899f057d96b1b9694 SHA512 0077f89429a436466918c32c26a80d09db173cbc6454c363e7ff50b008428b3fdae6edad90eaad42aa09ff87ca4279cf1112238090ed7c4c787407da79b42788
+EBUILD IO-Tee-0.660.0.ebuild 392 BLAKE2B a2be415b003e41a192546872374935ad7d96772ee070a3cc5a1bcd3835e442d212eab6588c2c0e5e6bacdda05892b557f8aea49cd16b8e22cd54f2ecdb71f4f1 SHA512 b659351053efeca40dc55138efe4f2b495ae8d0d521f96b549b6245b2f71c17569f30c195881d5e59c29f3ea0f75d3dc085f908b3bfd85b0102160faf88ea682
 MISC metadata.xml 384 BLAKE2B 56d5b9e91b0681950c6b40e434e759c86da2ac642f8f12a4ef50de722b2466e493cf7c5112292eda2e38181886599b40bc53c3e465f624fbec366b14e63a7be4 SHA512 8310984e63b763d5e9481ece74c77f84b1a8d9be8540a42820b6d78c2096d410cc88616d042b8e4679a9a9414d4d494d0deb792012b7f98ddb6291f39196f71a
diff --git a/dev-perl/IO-Tty/IO-Tty-1.160.0.ebuild b/dev-perl/IO-Tty/IO-Tty-1.160.0.ebuild
index dc6daca58d97..732fecd4f14a 100644
--- a/dev-perl/IO-Tty/IO-Tty-1.160.0.ebuild
+++ b/dev-perl/IO-Tty/IO-Tty-1.160.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="IO::Tty and IO::Pty modules for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-perl/IO-Tty/Manifest b/dev-perl/IO-Tty/Manifest
index 1397bfafea10..f198d8995569 100644
--- a/dev-perl/IO-Tty/Manifest
+++ b/dev-perl/IO-Tty/Manifest
@@ -1,5 +1,5 @@
 DIST IO-Tty-1.12.tar.gz 24564 BLAKE2B da0b252d938b115e8cb7e46866829fcf76a56754c5c3cde8f64dcddda4c9bde9cb77a1b1a022dc8ff94f785d1e1020f76be3ff805c50f276902128d397039244 SHA512 23733e7832a0de370952420df8a781f85d28ff60eb4cd55be22147337bf5587f4e1ec7fcfc190ae3ad1fd9df0f9697f2d647e00739f4a2927b1ac9c81435454d
 DIST IO-Tty-1.16.tar.gz 26765 BLAKE2B 94de85df09ac717e36b2c9e469e6cbd707cc7c9c92eb1be729373856af944a2664fbc913441151e7b417ae6b5c1d62cbda4416e407e4849c1ac34181460efe11 SHA512 a6f28a8796992645c4b2ddab5b3a76f49e61a891442078ef8249088d077108ea63bb4c8000cf39d15d13801b82e1cfcbe6ea0e6542789ab28385d83e03f6a9de
 EBUILD IO-Tty-1.120.0.ebuild 444 BLAKE2B 8b73d78aeede52755740db81028ad3c222cdebd07c18711243c5b4761fc64e5ea166ed7651b343c4e06ff48e9f9e982bcc3766eb498e7185878e44c8d709caca SHA512 2f2dc60c412bdf9109fc57770a3da9dbbf4a2ec34242ccac46325e52a08619878c5d96461ee5ebd5c800e6e5e3ed6f37dfbcd07e7eda191cca2038666eda51b7
-EBUILD IO-Tty-1.160.0.ebuild 427 BLAKE2B 4f2db154baf1d8be8dcb68f67ba0f190097763bf141461075ba83098824b2c5a909c7e34ce5775a81393375f46d64eaed82ef8b304dbe021e2dad998f0475018 SHA512 4609a30378a98c38a5a391f59cec5b7aa2d3a0ac4e394da10585eda32ac267d2cabd0594a32dcd416d3c3da547e212f16d35552e52ceb42840fd785f4234a73b
+EBUILD IO-Tty-1.160.0.ebuild 424 BLAKE2B 6b9e077532f4e02908fbc24013ac61e567f51ebfde5ff2b563e1ab43fb1003e50dfb6ef63487435d9fe5da58c45fc1adf6c2d2fa1da3f52930895e294ea6b8f6 SHA512 31b7303e28043e5f1e9bd7115c41089811c59a10e169150cb9c9f17ef5b0f78e35161d88e9c3c40a3942e0a8aec27897ded6da1fef0d6114ef651293355c2a39
 MISC metadata.xml 438 BLAKE2B 6008db4a5c8b043e0212175dc9401efa1e5e78c24181076645fc322d653f4deb0fa37439fb23cb0b84eddecabf4b1b1db72115d0431ab114a2dbf673741dc0c7 SHA512 6c1792c3eedaa6d8c766d0a2f030b04cf9a19c9dbc80209f57a206bffdeecaaec0d98bf96762107e0918b2129f1d1974694a5ed61869f91c199a87fa68fdcbeb
diff --git a/dev-perl/IPC-Run/IPC-Run-20200505.0.0.ebuild b/dev-perl/IPC-Run/IPC-Run-20200505.0.0.ebuild
index dbc309ee5240..5435a0b1ccb7 100644
--- a/dev-perl/IPC-Run/IPC-Run-20200505.0.0.ebuild
+++ b/dev-perl/IPC-Run/IPC-Run-20200505.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="system() and background procs w/ piping, redirs, ptys"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-perl/IO-Tty-1.80.0
diff --git a/dev-perl/IPC-Run/Manifest b/dev-perl/IPC-Run/Manifest
index bc3c1d94dc84..4da62a8ae468 100644
--- a/dev-perl/IPC-Run/Manifest
+++ b/dev-perl/IPC-Run/Manifest
@@ -1,5 +1,5 @@
 DIST IPC-Run-0.96.tar.gz 121644 BLAKE2B 83181fc4da8eb2199ac1978e2f593fb4579d2f4b6acff41f36ad2af866e07816c3ddbce8f1fb4e54a905fa00c3398df4ffa25eb10c49f677da23a4e0dc922fc8 SHA512 8a531a2126c15653ab0230813985cc7c83f2c3467c987757fc1f04c3c9952ee0246bcf743dcc4381351c72989f7271ede16962cca24e030404e414ff000c57a8
 DIST IPC-Run-20200505.0.tar.gz 127505 BLAKE2B ed2ab7be9f77a18e6dab7df78e641c77e30d4db27f1129199de14e6a75a412b6154f1a0d2c63edaaf2b5d1316b28d8e66836faaa9823dfe289992b915d421c3a SHA512 6f2e0cdbd66741a5185aa6f79c5d23189f6527e319ead385a033e482abed439a7e7fb1bbb7fa83c91c7b2971b31313a99b2b6510cc6aad3516ae6524a196d57c
 EBUILD IPC-Run-0.960.0.ebuild 722 BLAKE2B c0e476a4401f4561a0ac9c805ae2336b02ba8fa428494658fa4f51ac6adcc1d4cc6a149601ba987ab4cc7b44a486a0c3d0865ba4974f1f14c7519a4296ca76e4 SHA512 72104981c85477069a2baa989104f5a5e076b921415005bf7d53db1b39e78908da9d5c02a3f8705f993fa4fdc676551fd3dd73790958aec734b96ddf5b75a626
-EBUILD IPC-Run-20200505.0.0.ebuild 593 BLAKE2B 59a33a48900baecc27ef3dee2a9d08bef9aa308a4d940023731ab7e0b4500cb6f0a8276c44b6a9b7d6aeb1b118abcdb60f4b5cd37a02a707fb35c0023680063f SHA512 4afee762250021f37f85c50f3212723aa86f8d3e06168c647a144c1948195b50a41a89096bf0a6fdd456c4db7e1dccee268071b5d360c4e78965b76794e8a660
+EBUILD IPC-Run-20200505.0.0.ebuild 590 BLAKE2B cd9c33ee944195b4ad9864dd3848a8712bd376cf86c946225eaa53ac27063e6893501a56cf34d170f9c04eedde46f33660e7381e91f630860b8483a1997e286b SHA512 aa5a85becd811b34fc5b40d555ba64e6cce9d1d3862c3d66519b80f578991f1d3d2d017f4d7e3d777d3f953ee9cb2d5aeebb776a18b3c5ebb33d9d22db837ec1
 MISC metadata.xml 767 BLAKE2B a74f1549a2078c12cccbf9953b34bb77e4dddd5faa234524b7981e00a37feb0d798b3c531dc1dc8d7765b9ebed0eda80c501d1bc4a384681a9c60587002f1e60 SHA512 a07f01e225a9fc724be559d9a268e91c25bab1108f6a960c29fb7ff80d4cab9bb865d3fc646abed08895a1e797a64e8bf5f44da6de62ab59a76fda4d8852dc1a
diff --git a/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild b/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild
index 4fe033b25486..4aa3b8154b01 100644
--- a/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild
+++ b/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Run commands simply, with detailed diagnostics"
 
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/IPC-System-Simple/Manifest b/dev-perl/IPC-System-Simple/Manifest
index 60e887c7a8fc..60c822f4a0d5 100644
--- a/dev-perl/IPC-System-Simple/Manifest
+++ b/dev-perl/IPC-System-Simple/Manifest
@@ -1,5 +1,5 @@
 DIST IPC-System-Simple-1.25.tar.gz 29744 BLAKE2B 9e80c0d72d4857b401bc99a24117c23608af5e2bc468dd9bcf5465e71c3011141393214e07667b7552a0079764f7e489e5e1d417d4b4933dc7a485f7c0db40a4 SHA512 fda275786605eb80acaa6062cc51c32aa0e84f150e7ca7afcfe874f088ce7b8f9a97669e91bec24fdb05426db8b0f05552aa8853e44b08996e625281d1892f72
 DIST IPC-System-Simple-1.30.tar.gz 31902 BLAKE2B 2c75046c773afae5b13099050028146aecf276921322d93ff630b28ac5ac660ddb6bae0317ebdab782a4c4056e3fcfc5af0c78c679b6d2b815a969a6cd02d51e SHA512 82937df80ae38a9c21e43e256a21cdac1482d4a069eae282043d676ece06251a7139b752cd2b379a0f69ea9209ddd075607da86c6cb9b25f19cf90d91c28d72f
 EBUILD IPC-System-Simple-1.250.0.ebuild 699 BLAKE2B f38d9c65a4c796f3167ee8b9a2d428d817de75eb1cd94326f685c3ee872dbbdc62e9825cea71d994dd1cc9e385c3fbcbd3a512670251bc0cb1c64f76126dfb4b SHA512 27c990333a73fe786f07acd0327bb67715b8500741f8bf1dc129eb132a60ef7a753d79ff189a478dfa6670271e81b7741c6e168c87569a793c9a5c6067619ea6
-EBUILD IPC-System-Simple-1.300.0.ebuild 587 BLAKE2B 367815ae8c16e59e779b67f9e95fc2a7db91e7ddfd568cbebfd8edba73b142e88d014cda5e4b375baf1a701c2b7c39a6248d228d63033a869b08a0c8af612dfb SHA512 a694406d694f2d9cf28dd9ca2c40c9e8854f7a2029b81aefe7265e515deda18a84c6bd0d9c0dd2aaa93409fe11f2486c8c9ed98434f843ac050702214263ac8c
+EBUILD IPC-System-Simple-1.300.0.ebuild 584 BLAKE2B e8a8159e5c3891bc61c080ec9eb09e3bf4b12661fde62a47096de81db1fc07eec483d366f0b510ccce2bf9417e91cdfe06b869f34abc872ae2a31a07828c105c SHA512 739ca3c41bd49663c662457f2511e35e8e71351a86bdb52f80a1e4d14328f52d54651d469201f6d1287b09d5795fff0c9d7beb1fce9cc58506ba690f7d9639c8
 MISC metadata.xml 395 BLAKE2B 85e5ac1bea2549603f246cb86958de6be604eb17684095bb6836f0d880d184566dbd5905ff4d10e64c5ad5c7af3f073e583066955a2c0d9aefc30be309012373 SHA512 b7dea887b8f7f9b9911e9deeaa787dd80cabd1840b08432caadbc88ac685b6f7851678b8d5472eff11f66dc2beecc455d54521d086f6fe1fd73dc51e245f054b
diff --git a/dev-perl/Image-Info/Image-Info-1.420.0.ebuild b/dev-perl/Image-Info/Image-Info-1.420.0.ebuild
index d4044e16335a..3c070f841838 100644
--- a/dev-perl/Image-Info/Image-Info-1.420.0.ebuild
+++ b/dev-perl/Image-Info/Image-Info-1.420.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="The Perl Image-Info Module"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ppc ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Image-Info/Manifest b/dev-perl/Image-Info/Manifest
index fe08dbc330c3..9104104d6d77 100644
--- a/dev-perl/Image-Info/Manifest
+++ b/dev-perl/Image-Info/Manifest
@@ -1,5 +1,5 @@
 DIST Image-Info-1.41.tar.gz 265977 BLAKE2B 1b9390567c9d9f4f924dee8a2fd134fde7eee7a730bc8c30250b978287a90c99c97f6b86ad9f94568857d81185f4beb3a3023f0e9ce7215fe156f43781c7ef5b SHA512 7e3cb103efa004ce728b6e594f5b7518fa5be14a814e6f06d4a3e85563d7896fd283855cfe9e091c22b3728f6126501463f7326d704c0188ad696206f9318824
 DIST Image-Info-1.42.tar.gz 321727 BLAKE2B f0d79ea7c4087ab32332a8a6e252e1f358e0ef0d20d73e8fb501724fe51b91d2965dbfd7396ebd8a4c569653efdadb953d77434a73b07686fa82d7b4b5d19070 SHA512 7b17c3510328e062f93f1882c93a4ed24afb6f636d23e9ff1f478e452c9e1cc532c06b639991446442f200696afc63ddde1259afbe4362c3179b515046286133
 EBUILD Image-Info-1.410.0.ebuild 489 BLAKE2B 0791c5480bb2fe14f5c878ea15286ae342130a5b72c289111edf55ab786f5566fc88c88bbcedaff9cb8071d1ebe1da9b04d34c92a7344649ad87d77be0eb3242 SHA512 754ee5e30eaedb4a73fc56613c38267f842d9a17955f6e4bdefe5572d732a8771e979b948e9a4d4a05c8e82e2e3133004a8f9c363d53da82c98b168f3ec58774
-EBUILD Image-Info-1.420.0.ebuild 462 BLAKE2B b7167f75c7b00676c5a2b17e4105ebcf9161adfefffbf128e3fbcc21fb3b608c91dda1c5f02b3a2a1a06cfa88a4c8b41e06174ab09f3b638e2b11b8128cc0258 SHA512 a38b426797185deb3b89b573667a19398ae83ab129a408e94b2e2d2b77a082d9ce32c6dc1b67c650fa491ffd4164e3cc5834bdc75ab8fd4fc0bfc3f34d2d101f
+EBUILD Image-Info-1.420.0.ebuild 459 BLAKE2B 29349b9716f9cf74a21c796edf3b37daba4e1957efd8ce3ee1636a1145c5e63e9eb3486b20d3fc6a5c24822e168b134272e2e3859efbff86e0b7c9d3cc1ae399 SHA512 87f5ca86aefef88a7942314fb3b065505add57f5beb36155b7dd92aa5fe2ab69b6197e11f5a25a63c89eaaf49b859c8d6bd3767146c746fcde4439dbeedd56b4
 MISC metadata.xml 1796 BLAKE2B 990976d0129fcef7a09802c2a592d503b9790f58bf0d9fb692d27ff1e796a8d14f5b73239d1d319c77fba8086ac6cea07119a998e274e16c88ac6d886890066c SHA512 cf6efb0c6da4d922208d0519d387b3b8c18d5abfd5a6389606e036fcc5e6c4c0c7afbb57e52a8ea9cbffc844200af47506104decbf690417499bd576d6207d13
diff --git a/dev-perl/Importer/Importer-0.26.0.ebuild b/dev-perl/Importer/Importer-0.26.0.ebuild
index 28c31ec7fa09..6aae0bbb4668 100644
--- a/dev-perl/Importer/Importer-0.26.0.ebuild
+++ b/dev-perl/Importer/Importer-0.26.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Alternative interface to modules that export symbols"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Importer/Manifest b/dev-perl/Importer/Manifest
index 16072f3b8e37..6959f907bd27 100644
--- a/dev-perl/Importer/Manifest
+++ b/dev-perl/Importer/Manifest
@@ -1,5 +1,5 @@
 DIST Importer-0.024.tar.gz 41264 BLAKE2B 21a839e1e3a3d5757d17be05ea6275ad8b9e248debfccacee9551b47f27df81715961fb63be8a28a423041365717d65d9a9c75c6e090fbf7c69a84d50fef762f SHA512 f368f19a63fd52b88886b1ba6d51716050db8f475628238d16d2962ab7d6c21d6818205a82c86cc7f254736eb1c261dd6abd606dfcb16ca675e84898d03cab32
 DIST Importer-0.026.tar.gz 41607 BLAKE2B 9f125f2a18d5e791ef3cb891e0f59c8fce54ee0f8958f7a2a15cc4c46a0867adf26ac516697bf1f85dfdcec51e4903a9b62750415a299c42d6d3a439f6ab8302 SHA512 f6726b204ee358af00b5c72120bd2131ed575c100a9946b1772552e42b98f78dd38ffcc0119e2cdf721c39e2d83547bc5778adb61c5f84089caf11949c7ef045
 EBUILD Importer-0.24.0.ebuild 587 BLAKE2B 02de82a140bd7eef7bcfb5929fbca2d7b5d659c0fb43ef0d9fb938636841ea7edc64224ef60823e0b13cb2733916b99f237773e21b0bbcbfc5dc5150b52c936f SHA512 f081e17377523e98b8a64c90a2a2f76adfcef9ea6f4c23a64774c765e4ffcced684bf1713b00da5d0ab08febd10e23730b0f3c3ab29ef68e98d1c357d6741f65
-EBUILD Importer-0.26.0.ebuild 596 BLAKE2B 75307375d31c3ec3c1c305b2381f12046c1a3c92f190a5ad2d6523e2b84db8da1fe682da41e4cf07c1ff38dffdc42a60a357954322429fd817cac88040cce13d SHA512 b55c400ac8901b45df1502ef2c18287723c85b1b5c5c5838afcc63316352ffec234d683b9f84080f3c5e45a9e389f6ffffa33bef7952429f584c99e7dee39045
+EBUILD Importer-0.26.0.ebuild 593 BLAKE2B 79f3e34238b23d31c6c3c23004646251096ee13d18057522045ecac139c8003773a0ee52c232c02f95381916a97f6ef9751865d02ba0d24b5355cc78c6b62938 SHA512 c005912bb3deed98889d8f5807077cdec3c235cfcc0f0a0080348dc46638c11a852d862019b0a2d5efe163a173d4258bdb2ad67d71748648f22290215ba31896
 MISC metadata.xml 387 BLAKE2B 097a448901783cc8e799dbb2d9ef53e40656d4f54774fc2bf5c740e394a6be4aae57331a17bac1848fa382c09360d4d416f9da4f5e5204012833e6014e8cdc5f SHA512 6716fc7a7311d4119c708230f4cec828655d122e37f6e70e29d60bf75c370564e72382f474acda87f29ad5660f93413653de31c38908cb19157ec35c5a0670af
diff --git a/dev-perl/Inline-Files/Inline-Files-0.710.0.ebuild b/dev-perl/Inline-Files/Inline-Files-0.710.0.ebuild
index 2f594711d7a5..a230a660e1c0 100644
--- a/dev-perl/Inline-Files/Inline-Files-0.710.0.ebuild
+++ b/dev-perl/Inline-Files/Inline-Files-0.710.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Multiple virtual files in a single file"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ppc ~x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND=""
diff --git a/dev-perl/Inline-Files/Manifest b/dev-perl/Inline-Files/Manifest
index bfeff45789a9..bbd25bf95182 100644
--- a/dev-perl/Inline-Files/Manifest
+++ b/dev-perl/Inline-Files/Manifest
@@ -1,5 +1,5 @@
 DIST Inline-Files-0.69.tar.gz 14804 BLAKE2B 2f2f49b8832ebb8f8e7ac9567c7fdddfe742297c96095061f6daf2098f35e0ad28fd23a8c84b6f1fed7d7cf9337aca2282e8d614e54145c361e2494e828539fd SHA512 87b3d837a6d30eb344e7c80f866297558d3f1f8275d1e9fac0b9a1adfbee83f8452f686dcd39ce7c48bda50f1442b194822ee194da84464d076d2ac629ff289e
 DIST Inline-Files-0.71.tar.gz 15333 BLAKE2B c2bac14a9bac83d3272818b17d92a45372de79983254b42be3ad1c0417b88f2a6ef24c156659362b3c4eccdfd500515290e4cfef5d8e8e7e65c65f0288d96eac SHA512 19497c6f8d56158fa3165edc791ea6e1203be988687ebc068b235e7e71b9a99f15663d4923ef69854b6954141b53fbb524a02f55b66577c29a2c65a23ea15519
 EBUILD Inline-Files-0.690.0.ebuild 427 BLAKE2B f50445f38db3942bf8cb6dd4a2ab0d725abb4c139652f659725c129e735f15e97b8bba00751582bf836f91f14a5ae4fc893604b24df2c30cf45a9a977d157e50 SHA512 230f63cb3bf8b442a1635eb8525b896aa6ac85d5b2e70f6f268cf4ad08d3cc7c61559ea05e3dee82cfa990f9da7399c5e389464fe0f191347bd4b3691d052a5b
-EBUILD Inline-Files-0.710.0.ebuild 391 BLAKE2B 8a3d9efd72db7f79897270973798d28cb5a2f160270a817278ff7fef31845bd70291a7c0c233a26ba00a696a1ae057c58d90c1c872b6f207127c4d8f049c9075 SHA512 7d06dd8d063c2a57783862219441718570af80e8634f9a679a2648870b48a2438e141508e73961085159db4af7b0a664ac388935474c8e826e73c77138979caf
+EBUILD Inline-Files-0.710.0.ebuild 390 BLAKE2B 9b08d897d4d4853f8109847d84adc109a1966d7394dc1d9a41eaf1e8ba815cc3bfd5b23bcbeff31549c1b63deb263a6dfe2b8082ba5cadaca97087eec3d19ecb SHA512 62b300477b395fa00e0c10937c622bf651ffac005364e1e2ffc7c54b24429f13b95c3c5bb65d0dc630daed2c61763ea79bf76d0ea0fb100fbcf162890aaa7af9
 MISC metadata.xml 531 BLAKE2B 7a3d54b631afc760fbf52fe5c8355dacda6eb53ab82b53a448ed357722bd46a9688ae349c92699be41e96abc66a41633f38b591648f6fe6dfcf2de653cd18720 SHA512 69417ac2e4d5ae19b3ac1c22af65a18b5875b6232ce3e492318f746a3787da3611b04f40bf6a1fc6364da59f8da95a9f9b2fa600c7cf768c6f1ce205227369c8
diff --git a/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild b/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild
index 2da3b6d92f0d..0d02a2220ce0 100644
--- a/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild
+++ b/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="JSON::XS - JSON serialising/deserialising, done correctly and fast"
 
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-perl/Types-Serialiser
diff --git a/dev-perl/JSON-XS/Manifest b/dev-perl/JSON-XS/Manifest
index 51a7e83cfd70..54bdd92cd560 100644
--- a/dev-perl/JSON-XS/Manifest
+++ b/dev-perl/JSON-XS/Manifest
@@ -1,5 +1,5 @@
 DIST JSON-XS-3.04.tar.gz 83424 BLAKE2B 031e3b9d4902b7d9ad704655914fc4ee880874aa3073ded7248e5a842287cdaea47fce8be9d6c2999d19bdd3b5026fa2c0fb963c3183d6ac006387a741e0cdd0 SHA512 69c2e199385b5b5e331d905b64805304de80e1a3b393acaf7dce21c45254b1f23f1a83b246dcd3a80c2cfdadaf8ce3634ee587c469629cb69106f0c2239c73db
 DIST JSON-XS-4.03.tar.gz 86749 BLAKE2B 3907dbdb136964612cb6c324cd7e457fc841cb68c7c6d5e5c386847cea6b0a07ab33bfaf0e3a0c8016929e1093c0ab6fdeda88bfa15c1677f6b417cf5647aab9 SHA512 7d2c20302b0f98bd69e692b61d272b58c13a79741f3e2e44ee0530e21dd239526477f8b02e4afbfe41ee83cb69ab1c5247bf0be355f3f09e9cfe31b2ea4a5155
 EBUILD JSON-XS-3.40.0.ebuild 768 BLAKE2B 204a592c780a16b508429cd073027a8ca68e146af5cae9b138911bbdf134ec723cdb3f35c403cae8dbea6bf11baf39a7874ff37ddd0e5308a3f9e58ae4551885 SHA512 e77f05d42cc99706fb3f207c8113d55f02244512d16e4b063d84591e85d8af41905fae32430cfc02d69c341b06436c277296e96465b03be16ed8f2ca3db9ecc7
-EBUILD JSON-XS-4.30.0.ebuild 739 BLAKE2B 74beba3a00f4d41ce42b22206b6c5e6a08d2a1b565e23bb3a1bc4ff6e9ad19f692dd26eb7d01fc8e0fc19f6b3b94276cb65773cdab04a7ed9180a1c70cf57a89 SHA512 ca868153034694b38c157bf81d26afd66fe3315e44031b369537ab497f1d3bd676134993171742df79735e3b4f521de548ce174afba5640deb254fc227495560
+EBUILD JSON-XS-4.30.0.ebuild 736 BLAKE2B 99f2ff7d11470765d8d0743d07bca9d0f5f80bc2f9c6e5f077a12c4023b2ac983727dfb5e3b6504981c5dccd527da99c0275c6f6aea06341a1d4e80a1eeae07b SHA512 4fa1d5fe896a280eb53a6661da460f66f3af0cb7d52894bb5f9e31661b9e4f3325d10371c06053838d7a62f342c305f592dd06dd32eee29a794850e9a7a71347
 MISC metadata.xml 386 BLAKE2B 954784aa8f5cb4d83e745dfbff8010f054d9bd01fbd020c60a186fd34b1410f94a75d9bd073f634e549a8ccaa754e35dd81d16cbcb229288b6f8eb2c58f58967 SHA512 929eec3831d4f9accf2ea3dda8eddf68f49c905d299f433ad01f854e7ee8a537854c84c22581545f3a0a4a2076322c2eeae485a9ed58789b23382055c752fa30
diff --git a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild
index f27d4013ceae..64084e099944 100644
--- a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild
+++ b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Media types and mailcap processing"
 
 SLOT="0"
-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"
+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"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/LWP-MediaTypes/Manifest b/dev-perl/LWP-MediaTypes/Manifest
index d56b88408954..fd11a6e22a7c 100644
--- a/dev-perl/LWP-MediaTypes/Manifest
+++ b/dev-perl/LWP-MediaTypes/Manifest
@@ -1,5 +1,5 @@
 DIST LWP-MediaTypes-6.02.tar.gz 18722 BLAKE2B 08b4c97815867bc233b42f04b61faaae35e9bc63afcf934b17ba243cc12b7782c5ad7c06b0492f5da9bdce3d3f8436640203a3de8b29f34bb46f2f8a50c4b33e SHA512 b2ad33fb2c6dd7afaa9b8dd2ed6a15b2ecc35d13bcdf5297ce1632ea77406def0840a24c5213187707b665f28cc9bbea5774bfd1a4070d1f6192e904f707b94e
 DIST LWP-MediaTypes-6.04.tar.gz 40000 BLAKE2B db96012d5b2668fd669d5c4152675a07a2cc91de0fd99d4516fd754b738aa81df24f59e1100692fd893372fb6401a4ffa3fa008956b3eb6cc5b42a1fff81bddf SHA512 0610627ef3efdfde3c89bad273931c9cbde5c6da0bd782d59ce26dc4445cd538be9041d722f08206d96d69d5e3643b15150ef29b9e92e3968833f2ae1b6dc53f
 EBUILD LWP-MediaTypes-6.20.0-r1.ebuild 518 BLAKE2B ebb5f2cfa84edd29402c5f6a2a3733d3e5d697466cb650dbc77bee1e85cf62242e7921ea380479e4a861ad6e3c9baaedafe32cabd41e4f1ea4e9416c99c94a23 SHA512 9132b8c75cf8d40f00a0ba8e26bfda6ab1e977bde18bddb0aa9678a51b5e85a37a0903bcbe4497cfe5b8337b06da71feae08127adad95b64c1776dad26c5b9ee
-EBUILD LWP-MediaTypes-6.40.0.ebuild 611 BLAKE2B 42ebbef445e50e4ec3e7228e30027af7919d8d5325d338ccd68c314f2cdc995c8c6d28e9230894f52aee839cc64885e1bdd49da4407b2860ebe56cd09f797916 SHA512 8bcaef84d0ef335d438c4ff0631ef94655a4cb8cb08fc848a8ce339d21b7f82cd49dbe0be0f724a8ad2f251a5aa93c59ce404e2f36bc12c187b4f61982b7692d
+EBUILD LWP-MediaTypes-6.40.0.ebuild 608 BLAKE2B 633e57c47507990f02a3b60b3198b49a70c353fea4f0ff70da305a55befb021d5bc8aa48a105ad3a6390f470a85c9eb70a083083994f461dc477dbe33093603b SHA512 f3335da2accb334e11ac06955323f15d3e257b0eb982100ad3e17f2d844c47da9c177b39ab296236af921924aa423b6b6370bb468bdca59517965e36b98f2de2
 MISC metadata.xml 388 BLAKE2B a4766a9481c20bc6fdd83be50ce9f01d19f376433e087668aaaea575871d659c9b83af9a74c547932a2f22df6600c264644cbe73156c255aa81faadfbf1ceba5 SHA512 08865a3de8a05014eaf33262b5ec57c170326f7b68f4682b7ab19f58e7f97f8065a5ac2025bcb2220de2301c83aa8442c6e9c2cc22574b4f20aae0a2d02ae866
diff --git a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.100.0.ebuild b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.100.0.ebuild
index 26f5d5700bf8..0851bccb0ff2 100644
--- a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.100.0.ebuild
+++ b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide https support for LWP::UserAgent"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 RDEPEND="
 	app-misc/ca-certificates
diff --git a/dev-perl/LWP-Protocol-https/Manifest b/dev-perl/LWP-Protocol-https/Manifest
index 5faaa4d8ca39..768cdd1ea76e 100644
--- a/dev-perl/LWP-Protocol-https/Manifest
+++ b/dev-perl/LWP-Protocol-https/Manifest
@@ -2,6 +2,6 @@ AUX LWP-Protocol-https-6.70.0-CVE-2014-3230.patch 1136 BLAKE2B b6a82d284c8a4bcc6
 AUX LWP-Protocol-https-6.70.0-etcsslcerts.patch 1595 BLAKE2B 1a0d41704506f988405a776d96292e12be53487b3d2ab71259f82282ba95741e647925444d4c4090b242ebeeee49c7e2dc83f93d5aca6480bb4731970c410f98 SHA512 977ae51ffaa8d931e55b1aac278980f0a13fc06f0cbed99b81d983cd98068f5f8e65b388ed97befa6c850d92e9cae785ae3b4f84d5115cf730271bc04a40e18d
 DIST LWP-Protocol-https-6.07.tar.gz 9184 BLAKE2B 0104a51ac8b5cedeedc2f19bf6079a2f22f050db5f9e9030a015b473c63c8c01ea1716551a30e9602323dd420fdd50e304840722d214d38e1ae2a0347c91448a SHA512 4a07cd8a1c44e31781069a632a77f3af43747933420e831b4fd4a12faac7dc04f0c6b10ea773c3e14ecb66209a547b3587c0e3f481a55b9929db65f7b10343aa
 DIST LWP-Protocol-https-6.10.tar.gz 33691 BLAKE2B 9436d81e2049b09bc7d0323f89ae41d7a7e0df6f2a01451a5badcbd3c2bb842935c947c543636415e11fcb5972203bb362de448b6888423cb1130fa3f472c4c4 SHA512 4d3c89dab6fadcb574c176977ca6debba177ee3f817e87319d9cd81e0a0b09214e271c2e97edc456dad2f4a1ebf8c6266a4ae52c3a93144880a5b32db97e7a31
-EBUILD LWP-Protocol-https-6.100.0.ebuild 813 BLAKE2B 1db8fe3544aaa89a71ffcf279d88ec0a1da3f66752a7538882e64766c82be8ea86a787d2e7cc090f8fa6a0f8fedce3662eedcc3a468f9d8a3a875d3c621d73e8 SHA512 f65325f28a5df55250e384e34169458ee39be69545a87c5dee6cde177023445753eef09417d51207e07e21b55700f4934a85016de2de5af773e66d8a4e7ca778
+EBUILD LWP-Protocol-https-6.100.0.ebuild 810 BLAKE2B 7f3d1f4581b08a89d252107b789a89ffe273dee1df60a944795b5e88ecc91e6e47fbfa1340948eab3c7a9445e169c600b0171f6bf9bb3884d7348195559d1298 SHA512 10d87af737608043f9565444495119be1a1b5866b33808546242a6d4018e65b302a8b9b13d298d9ac1a0b9d2275f64021378afd3ecfa3fd985b0a0864454c796
 EBUILD LWP-Protocol-https-6.70.0.ebuild 843 BLAKE2B 9efbbc250d99c065c3a6b7e45e7998e6ff7b1348c4d85b32fbd40c1317215ded1af065d0c37519f8868be7262d6322d064398000ecfdb054c01fadedfc6cd2a5 SHA512 74faadfb8cbfeb956014b4c6eb9d3a6f72b16640bf144e73cfd5431295bc5f90f68fb52cf048a1853bfbc94e8735c66c636c5a93eae5f359d4debb9fe8889986
 MISC metadata.xml 470 BLAKE2B 3ca8b3351b051c0c140dfd02e57b98551aa5e3015d008ecd4c609aae9067535e9eec71c5c94b7f8f33931a69d6ad5f4a357cf91d070fc7932c8ccd692fc4471e SHA512 53faefb3533b9b8534d5a41f25eb5c77e0d9a5e765ef0c90a18c6bb1bee62bc9ee88ad4e8eed4c85453ef4cfabb240d5ff1e60e6a6651af0476ce0fa1d269bb8
diff --git a/dev-perl/LaTeX-Driver/LaTeX-Driver-1.2.0.ebuild b/dev-perl/LaTeX-Driver/LaTeX-Driver-1.2.0.ebuild
index 682f49b152dd..b3ac8cc2ee66 100644
--- a/dev-perl/LaTeX-Driver/LaTeX-Driver-1.2.0.ebuild
+++ b/dev-perl/LaTeX-Driver/LaTeX-Driver-1.2.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Perl encapsulation of invoking the Latex programs"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-perl/Capture-Tiny
diff --git a/dev-perl/LaTeX-Driver/Manifest b/dev-perl/LaTeX-Driver/Manifest
index c3c81fd37b0e..74437ac6499d 100644
--- a/dev-perl/LaTeX-Driver/Manifest
+++ b/dev-perl/LaTeX-Driver/Manifest
@@ -1,5 +1,5 @@
 DIST LaTeX-Driver-0.300.2.tar.gz 54084 BLAKE2B ea26e2fd065cbd79304116ca10ac5f1cfe77247aa615c2ca635cf5eaa9701276ee94e66be0efccf2bb560c6271cdfee55f56a0a00f7a77086bf5e641cba1c1ff SHA512 09f485071004d151c2d3ced576ac7b5423fd2d014a3950e0bc8bc2bb1e507b4aa6f041a7d54ad085632a0988d48d69ad726439adcabb8d8a81e10fb613e78271
 DIST LaTeX-Driver-1.2.0.tar.gz 55293 BLAKE2B b997150eca6c563e0901507b2f50cca91fe9c93e5facd0b680576d1b68be3055f318459f2b884fe87830be4ac4222e46d71060dcfae0131e02a6cc38f65ec1ad SHA512 013e64f74dc4d0b833c25c545281d7453a0dbdedc74c0e3af54fd1e4cdf6b4389c6c248d19e338cee3ca7af70344ec0ba1a3920c02bb11aed43d03135a1bdc42
 EBUILD LaTeX-Driver-0.300.2.ebuild 1147 BLAKE2B 755dead8f9d413def1b98c560ebd4a2a0dcc1195e007b6a6593324b0f54ff60b79f0b8d43187afaccc8f8d9f8b1be32d5335888597642865f854ac5596f1760d SHA512 2614de103bf2b2d89bee2a9db21dc0899436aafd4567069d4d92e9bf1d48652c2b2a1924f69b7f831a949b43083a3694908238be57ea81146be3bd3a37f2f520
-EBUILD LaTeX-Driver-1.2.0.ebuild 1142 BLAKE2B 0c056b654f59bb1923e50a08230aad8273f9f1966f93289eed5f33fb67f717e749553d313d101cdaa086485ae63d15fba4040d76d22251783849a11be108fb0c SHA512 ec3e9e3929c5d1d94e36516b92be8f0970a30e534b033ef98b6ee56985ebc8337e211c0e614cdd3d2c4b01a8c650c0682ccb794d69d0de4dd986a7740e717539
+EBUILD LaTeX-Driver-1.2.0.ebuild 1140 BLAKE2B 2143eb296c5f8546d4a80b94e904b7ce5c6a2d812b7c43de1bb6f19a7017daf910e4e953148fa05f0ecd2f0b836dd30a28e436b195461e58e6a58d8ed5b54e81 SHA512 b62e377aec69d1e022f45af73ceaa0b8b99971d029bedd13e5f7cb68f08578d77db81febab55ec38c4f59bb1ab0e55c49f5029c2e9990f02eabd106cc0fffeb8
 MISC metadata.xml 471 BLAKE2B 0e15a8c8c20685d48b85e2c474cd8f646be44850b144712b85f8cf1b36e5510b3980d3335e0a42d937af61556807f0ba739a096126e573382b540ef72cede42a SHA512 f65e222344ca0d16b7254b7d8dd180a12e898a7fa7e041e442f01273dfefc0b38678f690d8b0ae75948ae8443f0b9158150df473dd164f88faa50e210a4654b8
diff --git a/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild b/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild
index 0356c2684689..cd1d68ec7841 100644
--- a/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild
+++ b/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="Perl module to pluralize English words"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-perl/Lingua-EN-Inflect/Manifest b/dev-perl/Lingua-EN-Inflect/Manifest
index 5330f39e4f71..d1f966d768a3 100644
--- a/dev-perl/Lingua-EN-Inflect/Manifest
+++ b/dev-perl/Lingua-EN-Inflect/Manifest
@@ -1,5 +1,5 @@
 DIST Lingua-EN-Inflect-1.902.tar.gz 59582 BLAKE2B c5f3b4a21062ad29551bfcfa9979038bc7be4cdc95aecb51b07912e5b30b83cceb350480e7478940fccd07660a6ae1040cda4ad1cc498baada7a32ac812293db SHA512 8fb64f67312ca09fe763a266b196c47e98e5c5f1b4ff76a41bac0d422be3b0405c155f46bc04dd134adcdc3c38a93e2b0cf69fea3acde6d111dbafac0247c39e
 DIST Lingua-EN-Inflect-1.905.tar.gz 59715 BLAKE2B 752d45125630c5df71b94d92575f9dd9e14a22964f2b63ecb7682edb2e71197dc7a8d121dc386db7d1cf29ac12de8401d46d2c14cdfb6d18f3063f6c8148d97e SHA512 394671c4a645edd426d3f8d7b3980aac10345b68f9c7d2558f46ec3b7ffadad86138c5f27d3afd64e2c193c6d20a537f179ff01aa40a84cd1cee718e4afde42b
 EBUILD Lingua-EN-Inflect-1.902.0.ebuild 530 BLAKE2B 6bd094a238148ffac41bafde123e0125cd2b84cbe9ce30c055ddb74810c8d82bb2f60f425982ae4b1837928dcfb6a031d0463d901629024ac0ff1d4164788d68 SHA512 bc63c89cfddd6c2c06b5e44f135187a65d27940c6111545524a426d65aef72cc4e5c0c5da8589b78f5569bd9ae5e6011d8d1b5c36c90b6d18ad654667f5c8b73
-EBUILD Lingua-EN-Inflect-1.905.0.ebuild 414 BLAKE2B 253e2544f8726804e626738eb6565a0e317ccf7621cc1334b641e456ac03eed6163e983aca7f068129d7dd5f4aaa9457fdceed1493b3d9a4ee9bd0b168961780 SHA512 81f4039a6553780950da3ec0bc78e381ca795e38480e3c0ced1c4f2a0cc371938c2667fc63a8d745f52a8c21ff8cff519f66a650d1b5bb0677ed0b08439556bb
+EBUILD Lingua-EN-Inflect-1.905.0.ebuild 412 BLAKE2B c5d34834444eac76f7f04c5a454da94ffb6043b55590ccfe0434075cc22c815a210048a66ec4fb9780107439baa59de0cde5f8f6fdc6207515be02b85708bc13 SHA512 684b6e80ed58e7bb2c3917e41375f6f232750cd70e3bcb97183f2b4763a6d4fc575ebd9d1759750c3778008b91ffc1b76970ce796228ab19a058aed3d62e2ba0
 MISC metadata.xml 407 BLAKE2B 549eea27c4ea4d3e07b7f36b7a84dc0404996e9db7ed87384aabe7ceedfc9c2a8a8aeb55468f653a99fa8b1fe498004a882a0ed1a8105d573d52cee6ae1b0eaf SHA512 eedf268959838427e300d82c1d39dec340c8ce73e0563ec75a21c1dc2df42595fcb2d615b0b5f256e1d1c83bad16e845a58fa88eb9a5f57a96e3bc028c78eda9
diff --git a/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.380.0.ebuild b/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.380.0.ebuild
index 97e0df316efe..c73657ad9a44 100644
--- a/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.380.0.ebuild
+++ b/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.380.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Routines for manipulating a person's name"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 
 RDEPEND="
 	>=dev-perl/Parse-RecDescent-1
diff --git a/dev-perl/Lingua-EN-NameParse/Manifest b/dev-perl/Lingua-EN-NameParse/Manifest
index af34d1d64e0b..375d40a65050 100644
--- a/dev-perl/Lingua-EN-NameParse/Manifest
+++ b/dev-perl/Lingua-EN-NameParse/Manifest
@@ -1,5 +1,5 @@
 DIST Lingua-EN-NameParse-1.36.tar.gz 35648 BLAKE2B bc75b33b889977f1b14c4b68c79397607b8f6752b02d7f6e3e5d55a8e3a42a333d12b9f0ccfa078af35e5c59a88c780428621f8a57d2d78b4bb233b68376b775 SHA512 d82b6d5a7813dae5dafd36e5ae521792b3477757e918cac9ccff985afd0b3018a390c04cab39bf0d4b0cec9307941901d1aaa35febc650c25f85e8c77b03211e
 DIST Lingua-EN-NameParse-1.38.tar.gz 35857 BLAKE2B c1de7d612a4f5b4c34edebcc0ec46f22947ee9eb9e62a676e99a6ee267b8baa3a0f650394168b05a3b116534bd3cb17ab88e39f41bd269b0f0db64344d0874de SHA512 7c2ca5282f6a57d13e9592395290d8f84b77e51e3c96204a4eb0d533cd30383549bbb0e862b6a1aca97e36a17e2c51e599b2bbe2ed673f705505d871d07a5f55
 EBUILD Lingua-EN-NameParse-1.360.0.ebuild 555 BLAKE2B 1e47263814608c1735de8a2c5754087151c5db6d497c303b19a6ae5e686464613eaca517dee9820e2ee3ed0a08963d2d86f9168e3532936c96c9f4bde7df5f57 SHA512 29ac6feb8a3f5e5770b4d4020c33f4a22d06591d82c95935b76f32ecc01cd1ca81ad12c09dcd6883ddb5c5a161cab35690723ebf27240953cf4686a33f684a13
-EBUILD Lingua-EN-NameParse-1.380.0.ebuild 487 BLAKE2B 9b13c768dad9309f72e2126e3f96d4b61d6b6a17663b5853e1c7bfc0f468a93faf0dc85eb73155b322c0375745905d68ac673e95791fa8ecd5c81c1bf4877923 SHA512 0e91bd72df946e4bc94d154467340bbf2b5e41f1e73f32fa25356dddeaf31cb7143ab3ac54240832e53884b1a9c6a359c11e695e02a7c2672555b8ec67447e0e
+EBUILD Lingua-EN-NameParse-1.380.0.ebuild 486 BLAKE2B 1858acede476ad8bd405f3cf3894d4a636a13c297a2c74cc317cca628ca128a10e3d6d33a9ec9fb3f7852acdc3440a9002cb267fd73a4a61666d65a0cc48ac0b SHA512 3f6eedc4342a1a1b43d120f761b31f31651ee4ead8e335c2ffbc2b0f05edb68fcfb926b451aaba7a2802f3420d229fb90747177f6aefd20332197de8133c53fc
 MISC metadata.xml 488 BLAKE2B 04591281a0616122e6ce9bc337dc2852c3aa3e57699dfc07e3dc97172809fd9b9260b5e11fa0f6179a5205459f99d6f7b9d7f6a39fbcd5e4c08dd85f2d9af563 SHA512 fa69a5c9c46d7b26313868df18d6494765d845b1da4e2b07b47daeb5acad07069ab1902562dffe61fb055bb9c3a32ea41ec78e4320996c2049df982ca15f886d
diff --git a/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.50.0.ebuild b/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.50.0.ebuild
index fd14e58e389a..9ced8cfd0be4 100644
--- a/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.50.0.ebuild
+++ b/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert cardinal numbers(3) to ordinal numbers(3rd)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc sparc ~x86"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest b/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest
index 3315e0f13d4a..56aa388a1d60 100644
--- a/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest
+++ b/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest
@@ -1,5 +1,5 @@
 DIST Lingua-EN-Numbers-Ordinate-1.04.tar.gz 12019 BLAKE2B 9f019c096c165cd1417ffd674b1ba92334cc50bda1b789c47909d437c0ae1b1efd2084d81de10ac9400a63f94d85a9465d14601b1c2ca4133b9f670f570adadb SHA512 f8f5cbfc9ae1d7b4e5e134c8fb089f6ec4ecfd90e0168ece874b007ae8b74936e5aecc38344c036c0845ab7a8c192d07c5a2cdad8f96176c71e89e2e4ae1211e
 DIST Lingua-EN-Numbers-Ordinate-1.05.tar.gz 12093 BLAKE2B 64a86f2f86b8f99b2e473c3780a2735f236c738ce4758c09be1f20f316a138abba7f797805bdd3bda0f03c147b7900506bc06ede061cfe1cf680a0ca84ddde30 SHA512 ff9d2b49e933c3975ce4598a2ac4719c52a2c3e07e3ff6bc82cdb43ec05a63e1c2931d49e23e526aee75cb1a3c368e7692459f6d6487f16dc3b6c36ee9a8337e
 EBUILD Lingua-EN-Numbers-Ordinate-1.40.0.ebuild 465 BLAKE2B b04582dc023ca993bb6ce704847670775ac2f9f84e7f17b10a1d3fb168fedc46e75f201bd7b82756d15130c9db1d46b9b357a45199767bad4aef9c1bb582a2f0 SHA512 6e319778a6b33ff5826811321ea07b0349c9dd320e0b31e7e299014ce26c338bd0c47ac0e64f8989d14cc492a4e892797cf1a3f75c5b205557f2fbbc72dbe3c3
-EBUILD Lingua-EN-Numbers-Ordinate-1.50.0.ebuild 431 BLAKE2B 7a8d7560b991c6a72c61983369732bbca503804c6dbfbd588c674f86eedd6e371a12cfbc3f92fdc4f8a012d1db1935d9b1c0c82ed755f0b720c366b35e8c96a6 SHA512 dc4efc4eae60bf026756bcccbf5efbc19d7911bae45e80f78cf893d6a3510144e1ba2bd31372eb0b46455e002d4134a1b837154e098930e6aab4dca82369af73
+EBUILD Lingua-EN-Numbers-Ordinate-1.50.0.ebuild 429 BLAKE2B 6ec46f641a470e0703564e83dfecf58a4eeac6e53d8cec7f5bc9ef26c982c546859d4238679da584f25e85edc3dc13e8ebd969e1506fbf57e1f716275c696364 SHA512 5f65e20c6a600a1d3f7b49922ddec84f64bff87eb1c16587f52fd6b081857c68e6cc3b5a346b9568e266d000b4853dab050ba67a431f4e5d9733e8a3d6b1837b
 MISC metadata.xml 426 BLAKE2B 85a23876c0b7e66b7ff01b00dc0dc983e80a199d34dcfa39b3478d2bef1be4f55e2eb1c0700aa3d00cb367fdc1b161e2ecf8e6294e3811e0f308255715887fd3 SHA512 7cd45e34cf1844c2aebbe3677bd591691edff0770b466b8119a9772b5722ee7c9d6d1f4881dc998eccbf0079a972c61bb020bd715562e2a33f8c79a5542a3ac1
diff --git a/dev-perl/List-AllUtils/List-AllUtils-0.190.0.ebuild b/dev-perl/List-AllUtils/List-AllUtils-0.190.0.ebuild
index 2a9d94d45195..3ad63294fbc9 100644
--- a/dev-perl/List-AllUtils/List-AllUtils-0.190.0.ebuild
+++ b/dev-perl/List-AllUtils/List-AllUtils-0.190.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Combines many List::* utility modules in one bite-sized package"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 LICENSE="Artistic-2"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-perl/List-AllUtils/Manifest b/dev-perl/List-AllUtils/Manifest
index c43e5a6f08c6..bb876802babf 100644
--- a/dev-perl/List-AllUtils/Manifest
+++ b/dev-perl/List-AllUtils/Manifest
@@ -1,5 +1,5 @@
 DIST List-AllUtils-0.14.tar.gz 44358 BLAKE2B ab04a1aee2d2340d9a2a55f911216774d22a762160d008d2c19e63e084d7b212ef27abb3d72a4ca1b9dd96eba66a2c06434be34414d16e1ecb5cc375f5cf903f SHA512 1a9a292cf92cfe24d8aeb5154fb55e399eebca1063393d001bdd3c5dc19d4672012c1e0ccd84be06c12a6f1fc99021e35806ec943e5477cbf87d143b7fc2c17a
 DIST List-AllUtils-0.19.tar.gz 56605 BLAKE2B 673f34e4ddc45598ed469447d537fe8cf9bac8bd21666e0ccbf1e879afe4a655a9e3321b1f4e132716d6bbb5a02970e5076155e4b94376bdc2b0afe2931c1961 SHA512 3f06165a3f416c75f1dd2364cb111479b053eb0a32e3c6a5823e5e8206f79fd3039599e9521526c0080a009541a86f344d921f6679ba4d7eb930d0c1ca2e25f0
 EBUILD List-AllUtils-0.140.0.ebuild 719 BLAKE2B 3ccb51fd1aa780db7d51a1a353fa75e789f8ba857d7bce5408a90ae575e89160afbc1583cbe81c74e5f98dcf4ef3adce6aff2ade5624d6af04e34234a85fd015 SHA512 1fb52af86ed8a0dbff5391b6c558fec9b0b7bcce54d775631eb47fe821d08ff51674cbc9f4923a8f768718bf506409b616d43eaeec2427f0c8b744fc72452ba8
-EBUILD List-AllUtils-0.190.0.ebuild 726 BLAKE2B f906b3bb9a2e7884e04f0da7b96e5409a5558ef75aa206cc5bb253c9c70d24f9f08b1fc86e7e9f06df6e3926f61e795854ca8af77f64a1d854d70dbdbfe83478 SHA512 10f82eea3d2f336b21b073d68e5fc19f1a2fe2ac3aecbc42b1a6b4c2d4cef6dd6a888d30ddd5f77f791264b5d6e5a68ca61edf9b7bb35a5698d7e454f9b8ba3d
+EBUILD List-AllUtils-0.190.0.ebuild 724 BLAKE2B ecd83c08a24c3b27d7ee1980d5c9a0aab701c0a20e6f06bc5f18b85c6ac73dca6da72135e18d4ab1fda0ba7dedb1270a87d2c5c4780dfa01ac2ec5fc56be2a56 SHA512 1028ba69915709c2d9d1cf83db850614c3d281334d80f45a326e4ac2b7250a406f2f6090fdf84d7473cb09c5e451a8dd7c61c57239a255f68eb7c47861e1a101
 MISC metadata.xml 398 BLAKE2B fa3e1670ce13031ef5b446e2b5e73bc800df3b0f472822f99346c6ddb7efd4d7262bcdbb33ad4a71e77feea10fcc422261f7a39e22d5e108c3cfb4b7c5aadc59 SHA512 fad0151a2b023636c8a18bd17e12b248bf56f2e509edfb5927d1f7d03ebee1ed21a6d2e91bd716aa77e2185bd32b54b573b812d7dfce6966878c0c4983757c9e
diff --git a/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.580.0.ebuild b/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.580.0.ebuild
index 13d40c0ffbc8..1dc4a8f26977 100644
--- a/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.580.0.ebuild
+++ b/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.580.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="XS implementation for List::SomeUtils"
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-XSLoader
diff --git a/dev-perl/List-SomeUtils-XS/Manifest b/dev-perl/List-SomeUtils-XS/Manifest
index 71c2bb0f4c97..e8f53e0b04e3 100644
--- a/dev-perl/List-SomeUtils-XS/Manifest
+++ b/dev-perl/List-SomeUtils-XS/Manifest
@@ -1,5 +1,5 @@
 DIST List-SomeUtils-XS-0.55.tar.gz 95426 BLAKE2B 84c5cf45a646062769ffc3b422e407071b9934a52cfbbb5d6e2b9a6f9640c26c7bc9fe24f0a24d287cb2558a2efeefd3614ea988177cd09c7927bfe424e3cc8e SHA512 44bf99ed3653c6d21fe0d0504dc6e3235ee89079b9c7cb77315f5713c0522057f8f3acbd34001bfba34cce6dfc568684c564b4fcecc700cbc780c57d36591f1f
 DIST List-SomeUtils-XS-0.58.tar.gz 94190 BLAKE2B 8b1fbf4acac0ae219885cc760306f8887de56dbed2e7f5b8e5975f2445d93c676dd231cdfbd12d43c052587b5af5ad96f4112c531268938fbed9cf3c1f32b4ad SHA512 f89f5a35224a69a59c1d512a819bd725b324f0968ea447824a42c741c4ba66ee9522db939bd3e75d190e0f2f75d54100912b83a86d5e7dd1079025a57a245c38
 EBUILD List-SomeUtils-XS-0.550.0.ebuild 800 BLAKE2B 2136e2a8b9c1d26288b30f3f9a214c96c9d98e9dd42f2f6e6f3841a715b33587aeaa20253ebb8ddc4bc733e3ba26901c6cda6453b6e880c3f685d9a84888f921 SHA512 975f54451df347c6419d023c3db6ab6912da244a56e1bd35678fbd62c9aeb26f04676a236ecb18b5941b0738b6f8b93bb4d3cf0134eeea552e45b91587c06808
-EBUILD List-SomeUtils-XS-0.580.0.ebuild 768 BLAKE2B 950d7bff07b70ed741139e9e5e2c5251211569d95df078a8474b052ccc8a45aac19478184b21163c8f135cd743330bd654640a0a150ba7b0a81b7a5dd94e3660 SHA512 097b4702127ba40a163b695888497950f56a65b03a425a5ca0d5c6e664cd7236f1cadef082a0f05523daa482141d1d49ae33867d6f3270cc7c3e57cbc46737ec
+EBUILD List-SomeUtils-XS-0.580.0.ebuild 762 BLAKE2B 20605c86b04740503ea6bb09e9f7206651c256b3975b027a02bf74ee3e27f06fce0ba09a41da6c278f5f45d39e1e262187881c378100799fb399ff008c0a76ee SHA512 8a0e9eeb88adbe96fdfde1baa98832d573413ace0673f514b1d836125d315b7b3ff1b6e07ae4839b1f15447aec24eb6f3ad31d21046938eadfaba18ada72cbd9
 MISC metadata.xml 407 BLAKE2B 50bd471ac48c27726b1b984452826d712a3cbadf2f59958a47b27f1e498c8651fd3c21f8670a8b1af63ecb6a56fb9a5f0a9f1e6dfecae5aad9471c3ac3bbaf7d SHA512 7b7e867350c5c5d70f773da33373eb6ad0f5a40688ff3abd31e6f376c00f5adcd08f5ea76680c5dc8b4aa1cf8abb8d289659d9ddf2540e356ecccbc1208bef09
diff --git a/dev-perl/List-SomeUtils/List-SomeUtils-0.580.0.ebuild b/dev-perl/List-SomeUtils/List-SomeUtils-0.580.0.ebuild
index 12a2721750fc..da29f77fb487 100644
--- a/dev-perl/List-SomeUtils/List-SomeUtils-0.580.0.ebuild
+++ b/dev-perl/List-SomeUtils/List-SomeUtils-0.580.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="A colletion of List utilities missing from List::Util"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/List-SomeUtils/Manifest b/dev-perl/List-SomeUtils/Manifest
index 5cfb57afc062..743409a90419 100644
--- a/dev-perl/List-SomeUtils/Manifest
+++ b/dev-perl/List-SomeUtils/Manifest
@@ -1,5 +1,5 @@
 DIST List-SomeUtils-0.56.tar.gz 63880 BLAKE2B 36ad52a4d01e177c3018882a449424f23a8d0c7bbdeab6b90c6e0a167d6c29800126a1ba67b3fbacc04346a420debdc60dcff7661157e03561ee43326f1a9164 SHA512 b74c2a97811185d21bfd68fe60606afe8e92c266e98a763d51589021c9b3ae5310275005dc80198b8f9d92118fed569b5251d5ad87643f47af75a478db388503
 DIST List-SomeUtils-0.58.tar.gz 67003 BLAKE2B ea492496861eee11008f6eef2f64153f4c7e2c344977d7f51939103a28d3eb46237fba128af4192bf6c2b368af34292230a3a11c403d430040d5abf3afae77df SHA512 e45f05dbd82914bf804cc1ee00c808b6f8b4f2c80f852db55b3efb13cfe1601c34926e4c7966887a75ef49fd0fb2bd43adf48d12c72687464ece4e2b5a697ff4
 EBUILD List-SomeUtils-0.560.0.ebuild 735 BLAKE2B 18c63eb96056d38cce08fa1dea9a2ac39c4d573da09671ee24cba7b6e9a355b746a06a28df483c3e8ff3ca4d6f4a80729447cdae29f3b5d093f7c7159996cdb6 SHA512 cc1fe823a768cdd45ea91115b53988506da868fce43c6ce05460a40c71ca17fb5743550a75f9ecb88695a030ceb8d354ef90657b6c07553c1f601ed5fbd0b960
-EBUILD List-SomeUtils-0.580.0.ebuild 703 BLAKE2B b02f91c155633abf81465c4b671242c7bd22888a0e1176638337fcf9eb6a523dd3fac16a6d01c8604fd8ecf0711a13535d85287164c9bb6b495fd8484aeb6621 SHA512 05bb647830af8534a7083f862ac3aa705d689b0126c92331a532915d42f11ac4ed05696c7c28d57a5ad12dce841120353b27e5648d7bbeb3180b09ccda5e6929
+EBUILD List-SomeUtils-0.580.0.ebuild 697 BLAKE2B 5a3257a7851cfd8e86a6febfb43df148e95d7359e652efeccc24f243f3104313c2b3bc4242e1befc9fdf311b7a260ac54e6b660c545ef330f694e2be8fb4478b SHA512 6a474f965e9db3d948566d1508ff2a2d2c4b6679bd9e0fff1b88e86321fbc8ce92017b724485aa03cfde7d448089e076aeab3384a857e3693b3e612cd70b9232
 MISC metadata.xml 466 BLAKE2B ec13d3d3bbdd6ec3800c2bcd044b8f7c104e9e84a5427d7937f1ca57d366fe9966c8ac6efbe0fe72f60d5d5f0fffc894b12896cfa5b389da1931b7f237dc06a3 SHA512 7fcfff632ce20f39573382b3d287f69fdbb82c3f8fa390b7e1694ebde8a0e165ddb930ae04bedf67957ee7d960d49a149288968810b80686009e6f6335b0a05e
diff --git a/dev-perl/List-UtilsBy/List-UtilsBy-0.110.0.ebuild b/dev-perl/List-UtilsBy/List-UtilsBy-0.110.0.ebuild
index 3001fc115854..a3d2c8e6f125 100644
--- a/dev-perl/List-UtilsBy/List-UtilsBy-0.110.0.ebuild
+++ b/dev-perl/List-UtilsBy/List-UtilsBy-0.110.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Higher-order list utility functions"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/List-UtilsBy/Manifest b/dev-perl/List-UtilsBy/Manifest
index 58c482f26c28..8338f3570a88 100644
--- a/dev-perl/List-UtilsBy/Manifest
+++ b/dev-perl/List-UtilsBy/Manifest
@@ -2,5 +2,5 @@ AUX List-UtilsBy-0.100.0-no-dot-inc.patch 684 BLAKE2B 4956694d2e5dc23ad2e348d276
 DIST List-UtilsBy-0.10.tar.gz 21845 BLAKE2B 5913629369ba2df04871508528194869cc2200fd451e6d42cd298f1acff073f76d7fde0441208eede6cde77122680da85d0b0486cbc6133537b8bab403b91427 SHA512 3e73ca8a99da111ff8869fce9561f52163bd4173589f0ff5c17913afea080279765a1f306af50b11040e26eea0f8ae9d993a93b0f0908ed15fa301e421dc0384
 DIST List-UtilsBy-0.11.tar.gz 22939 BLAKE2B 263a6916aba4325fc780161785ab1cb810a8f44d584c06c6457b8c91ce534147ee15ad08a7126c591af8f25c75e18c6a2f6015eb06c7b8305563919ee7e0ea07 SHA512 7c912b805e1e21d5d683224b63125bc8385d79c7115d88c08ca28fc1778ec8d22ad4aaf366731df438365a5233108926cbffee284c2e2d37346b47984dbbd4c9
 EBUILD List-UtilsBy-0.100.0.ebuild 659 BLAKE2B bb9fcec9f16cc6cddbdcbb25d4a4c92b6304d9834fd7ca6a0a6071565d847c7fda615223c5e1a17f88ccc03bd67d8e9e0e4845391ce765a7630cde6392297c0e SHA512 4c0282818b6d3b74e231eb8986f42b8f2744b559f0092961faf2395abb08bca20323fabc8d1fa07da83622e206891a7f6d182796a5654ef02723260c4f0068db
-EBUILD List-UtilsBy-0.110.0.ebuild 622 BLAKE2B b905e57773fb2fbd7358fb54a946b6ffd82ec4d8782470b07e9d44ca818d5fac082b6091584b7ddc6866ef27e6a40d6153b831b64228a6395766469abba47375 SHA512 4d0920237179211eed2809dc513ef69a9d4ebd31147176a684172f622c6a6601107ed4ea49261898de5c5509ee7eda51b66c09923b367b145f33851bf940c216
+EBUILD List-UtilsBy-0.110.0.ebuild 616 BLAKE2B 23200c6517f9771f7f587237870b90b990b7e015228e7df61466b88eba387b589540058d38cec37432fcc384c9a68c3d29736488fbab5f597a350fc7364ec66f SHA512 1c7743240e3c6ec460639fd7800ceee691761a612d4cd391bfc1063180aed57031d7d0a93298c269ea034f3618bc270089cc17a86d3c3c73fe4600e92fa9af06
 MISC metadata.xml 396 BLAKE2B f81e7136cbce8d244bf5b5f7887bd10bf2d6bc8153c1b4348bd0eab6c7c5e6880546b8447f588ea2274a758988cf70d68a059d4541aca2c156c7f5fb5bc28736 SHA512 e65fd6f63de1f1e62951f5e6782ede697062d76e71fdd612edbe89017d856a874cc015763cd6d54f064cef1285cb83a646c91fa946c0dc8b5f5716809d88aa19
diff --git a/dev-perl/Locale-Codes/Locale-Codes-3.670.0.ebuild b/dev-perl/Locale-Codes/Locale-Codes-3.670.0.ebuild
index 610800e0e89b..73c5e0b09967 100644
--- a/dev-perl/Locale-Codes/Locale-Codes-3.670.0.ebuild
+++ b/dev-perl/Locale-Codes/Locale-Codes-3.670.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A distribution of Perl modules to handle locale codes"
 
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Locale-Codes/Manifest b/dev-perl/Locale-Codes/Manifest
index 7b8bbe339933..b801c571115a 100644
--- a/dev-perl/Locale-Codes/Manifest
+++ b/dev-perl/Locale-Codes/Manifest
@@ -1,5 +1,5 @@
 DIST Locale-Codes-3.62.tar.gz 856983 BLAKE2B df938407ce1177b807a34a743fc96bbebbe7843357fd706fb851f0a7c19c5e6ef08b8378f87b1367bbb444a8e008a153eb87707283af23cc9e69fe0ea55934b1 SHA512 94a45521637a6b2d3f42ccf3f996b40da264af532c4bdef3e6592e09fe21e3f31f3d146decfc94a5caf0b653dcca239ec4c657a82c7702677f69b6806f1d8133
 DIST Locale-Codes-3.67.tar.gz 862619 BLAKE2B e95621a21402ca8f8d48a128b804b299aab8336814a237d09e90de993a22117f74635f3f2921c72639a155db4a8ca856ba49135166148d9bec636d39a968356d SHA512 aa477c07f5e673c6810e8ba33ba699691525c48d2e5311a93c0222a4ee58afc52d23597450101f822c077d3fb6b762df2bb2276aed76f8391ad9ce38f329a7f8
 EBUILD Locale-Codes-3.620.0.ebuild 649 BLAKE2B 95ab03cbb69ea05077e3d5639b49b2301a94d13cffc997447933613fec87f0d535ad2a785c1cedeff6f12e44ec7249e159029d087d97080c54ac71d8bef2f116 SHA512 5cb0a9596b4846e50d29e922cefa530680176010945c086862c1169048a00375e7b0767016367e3a005b86c7dfdfb903d2466debb5ccd7bdd34cf2d74d4ced42
-EBUILD Locale-Codes-3.670.0.ebuild 617 BLAKE2B a9fcc5001b5f937b0d94f6baa8fa08b7f1578a2fb4c1ff84894b1e9e78d3ecefc4538ca7612b67c72a6034b4ad577273fc6106fe5d18d896f7e6bf1678faad64 SHA512 9a02f487c4a43b9a5b4e87b81b7d6dedcb08920941cc9ff82e32dc27aa2a369d045f6f1ec83354e96b78ddf1fadc3ebdad93d820f1c39ea7e3bbb7eaf01a7058
+EBUILD Locale-Codes-3.670.0.ebuild 615 BLAKE2B 463a86286b9d598fda34047182ee1c663b7884c26e8d0393e040c6ee36dcc60a2ad1606cf880ef65a38b6aaac7ce95eea5e3982d7b229c729409211416136789 SHA512 6aef79bd5550a9991edc3d5b43313c159adfba9b7c3f3f492f8be73108850a143b2bfb74217d81506e1c426bcc5821445cd1e65da07197fb12f17a4423d8a6c2
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild b/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild
index 551fa239dc5c..675da2b19089 100644
--- a/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild
+++ b/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A general logging framework"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # errors out when running in parallel
 DIST_TEST=do
diff --git a/dev-perl/Log-Agent/Manifest b/dev-perl/Log-Agent/Manifest
index a50987cfbd74..1b598208381f 100644
--- a/dev-perl/Log-Agent/Manifest
+++ b/dev-perl/Log-Agent/Manifest
@@ -2,5 +2,5 @@ AUX Log-Agent-1.1.0-no-dot-inc.patch 4048 BLAKE2B 8e5f2481524d0526f4469c32b16e23
 DIST Log-Agent-1.001.tar.gz 56215 BLAKE2B a73673f718233dc915f6e3cb4ef6a7a8455ad196190ae378abb20db31eb848a8c41069d069ce69fbf25aad75fb3c6ebb47d80694dee5cd97364e64b778be0545 SHA512 b8d3a15e40129add73bb4967ecc5daf37c0fd8a17eb75ed86fe338a9eb228b37ddd56b9bbf9bdef91f8453eb1b53d7fe303a96f68cbb0834820f2354fa37b5e7
 DIST Log-Agent-1.005.tar.gz 57364 BLAKE2B 1c5eb3fa6da20ceaba7d63bee1a79423bbb233662921fce9956a735a34b2994a903c58099cdfafe811130714fcac50e4c87586e8b8b058f591de5d6e8eed6f13 SHA512 9fb1c2377921b4a3036a24f343ef52ea05f569c27600d289f568a1544aff7d1acd4426dfec60b63879424360a27c6f7bff684e9f7b17aa5d49d3673c35bb65f5
 EBUILD Log-Agent-1.1.0.ebuild 629 BLAKE2B 5c5677d47ef5be87788711c0e4c68f640acbd7f13ac0c09cad1c98fa82cda624a7eb8a85e8564b792c2d9ff86517a88b117d125cc19efb3fdd48c4c28443e344 SHA512 544ac46d9eba1b52ecf406c82fb2ea39675982cc422cfe271250ea556e19a7eccf9eb36a65e2fa054b678c2788f4259e472dac6a23886d18b76a93e5d0919f03
-EBUILD Log-Agent-1.5.0.ebuild 488 BLAKE2B 7df076fd1406ea23a54598c8cd62e15e70cc556395d690d85aff74e68d91c1b8b944017d0827d6e80e8010c8cb0cc4dd79d0a754355f35a6d869365f62a73fdb SHA512 99f4f78fe0e230593a977510be978c6a6b06a5460b5920767318a9f31b0cbf19871ccf56453304491938f2746809fad0cd02c506659bb652c2ccfa10c7ff8c5c
+EBUILD Log-Agent-1.5.0.ebuild 482 BLAKE2B 93f32290b74731fba255cdf953e956106c2260c131abb10b095e7f9690e5edc8a45febc3b27390397064ece5005317f6664d98acaf87c508b8c41f58dbb4843d SHA512 7dbe8c001f910c13ce240537c6d30f1eedbbc6acf63d74c9ef651e49aa4dea774a604cb3575df093483aca8d860fb7ca3c92c133a06f3cb5fc400847429b7cf9
 MISC metadata.xml 2136 BLAKE2B b74238e39f7a213eaadd5db4f41768506e31af780d85a7ce1bd3bcd087c043d8fb674b5fb2da6fc96251583420ad61e62c4d3f4781ecec58b9a8eb21fa725421 SHA512 1a707e2e4710a690bbc44ff37f551b8e03e5b88c270d219dc5da5d5604599c93d5d14880956d3ca3df1b83e434ff8fa5264121880e3319dc78b963cc8f8c82b2
diff --git a/dev-perl/Log-Any/Log-Any-1.709.0.ebuild b/dev-perl/Log-Any/Log-Any-1.709.0.ebuild
index f1f76593877e..e39bcd870462 100644
--- a/dev-perl/Log-Any/Log-Any-1.709.0.ebuild
+++ b/dev-perl/Log-Any/Log-Any-1.709.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Bringing loggers and listeners together"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="minimal"
 
 # Test::Builder needed for Log/Any/Adapter/Test.pm
diff --git a/dev-perl/Log-Any/Manifest b/dev-perl/Log-Any/Manifest
index 5c37aaac84c3..9aa5003aa572 100644
--- a/dev-perl/Log-Any/Manifest
+++ b/dev-perl/Log-Any/Manifest
@@ -1,5 +1,5 @@
 DIST Log-Any-1.701.tar.gz 49026 BLAKE2B ff3b791e41f8eccca380aebd2fd10a82e42669d491c22b4c58a8f35137ab909ee5c7c76398a1f25aa506215e51798e3f11ba250732357bedae3b92f8fb6ab1df SHA512 cb66cf36d0bd15fee8e397f3e9f916875cfff485d2177832be9a36fbdf88fda963c658f3317182acd5fcaa88fa14c46b8d5d05d7bd7572b35f81a6eba10dddf3
 DIST Log-Any-1.709.tar.gz 56325 BLAKE2B 4028b549f7898c60ceeaba293eaa91da7bd7a7d387fba74d1804fd83748fc6bf1eb3a578fdd9ce6f9ea36093a1a239c0b0ba12803ba1a37a9733436286f0a22c SHA512 55beff3b56185e80aa4515d9e924356ffa2430fdbfe035f9d33cb6254bd8a23382055931939d4927befcc577486fb62f86b0362725fad60e571fbf0d669775c4
 EBUILD Log-Any-1.701.0.ebuild 715 BLAKE2B 5098d298d2c49d45716e6fe30040a8976c12139311a6569f24b2f67d5d29f62983adc4cd1b0c539b153f7149aa5b34410c20734b18824c9fb3c0c7a3b2bcfcfa SHA512 73e1680f031b67cdde9f2720191c57fa3f7447cf09b3bdf7e7bc5eb63023a3d3d9c8bb485f59ca173edbc4d1efb88c5f982ecd8c351b14766f59b8c507af57b8
-EBUILD Log-Any-1.709.0.ebuild 700 BLAKE2B 21b33dad988d3f3bd0a07b2d44451a861ab59f10dbf8a9f2e2f50dd6193dda09417f4edb5a76d388fe565e9b140f692ba677f1dc6991233b80f9a4552a7f934e SHA512 ee83a6de47e620835f2e2673d41bac4f3277d3f7ea33482bcdb830a70666430099df3b05e58a09563a06777061675b3867c5c871c86d76008dca012979801a6c
+EBUILD Log-Any-1.709.0.ebuild 695 BLAKE2B 8476a3ffd33640cca520e672b3d4a197782747f793db7353204e4ad6e9859abee39951bee00f8f1fe48ac14dd90f54853cfd7999c3b1b71a47afc4dcc6b9986f SHA512 02ad2aadb122222ea68b5211dccb6ccc3c4a58a82a06788f6804c0dfbdd6520e6ea3a3eec9c90944dc0a121f79224d20f838d2a0a64f65416e462de1489988dc
 MISC metadata.xml 1339 BLAKE2B c9ece725c2ff1e2b2ad8ae389de6db8de54af09aff4022339fc2fc32f4e049e446a69b8db7586a48f4f8506d42e35f5c294c19218d6f7abc1f7f175c4d3d522f SHA512 dd3408d5c17d233d6b7a822ab8a2186604174b376823e7cddcbcde484ef42baa7a838d3efaca25a1bc935cb223bb11884e14761b22ad4d99706076eeec0ad047
diff --git a/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild b/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild
index 17890374bc8a..ab9835130f4a 100644
--- a/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild
+++ b/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Dispatches messages to one or more outputs"
 
 LICENSE="Artistic-2"
 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"
 
 PERL_RM_FILES=( "t/email-exit.t" )
 
diff --git a/dev-perl/Log-Dispatch/Manifest b/dev-perl/Log-Dispatch/Manifest
index 107dbe924214..551498d67f7e 100644
--- a/dev-perl/Log-Dispatch/Manifest
+++ b/dev-perl/Log-Dispatch/Manifest
@@ -1,5 +1,5 @@
 DIST Log-Dispatch-2.67.tar.gz 68022 BLAKE2B 0c2e629dc9cc6ff7e8a4138b4393be95ba85fc20fd57fec9a5fd16f5f69d3a2b448a631780393a1f828f4d26fed48ec1e1fa75d251e09483788a5aeff3b91fcf SHA512 ab03777800fa758a502e69b25669c3e4ae851d9dcf5f2f4d1a21a94cc61aca866ac361d2a5db3d22d19cb4d11da29ecec19935e29fcad40bb831fb27175846d6
 DIST Log-Dispatch-2.70.tar.gz 70808 BLAKE2B 4225f7a9a9d1a200b9b03938f47abc4f4c0f48df70a35042822e7dbe4eb5740194f5f30a59e5229b2bd6eab76c196b8237e888cdc0a888eb7949345fbca4b63b SHA512 c4c8cfb9e74b3176d5f95e3f9fbc86303321caa3e608a7ec318786ecd80d2238fd06a3b74ded65d5d3fab5c3a1297f99c92c62b1136b27d3b5396fd3fca602f6
 EBUILD Log-Dispatch-2.670.0.ebuild 1069 BLAKE2B e6f3eefcab698b3c31cb827d4235b478a696d89aba30a7712aafc08d9c370244e35517105382c78babba970806057dcdda0df0e429fd4b7749cf515d38ae3ab1 SHA512 8d0a883ffe7b12d96f920ca558359747c5c168881d1e5dae2ba26ca0466b7dc6e0d0dd55b5ca1f3dae96349722a97b32b2881eacd4fd4bdc77c04cff55dd5d92
-EBUILD Log-Dispatch-2.700.0.ebuild 1039 BLAKE2B 12ea4922635f04cbcc9f8e9379890c4a6cd07dd4041bb3bdce4e0cfa6007545478f7ceb176ab72fad863c53bf153ea482f80bfb8a7f4023fd41794f2cd0a5ed9 SHA512 571a1ede79cb39d667d76ec80d49cf97346d00e1af9bfcd5564d19b4f4bc8ea9b139c9384121a0fc38d42c5336b7aa73b4e66dea6fcc400344cdca49e2865e94
+EBUILD Log-Dispatch-2.700.0.ebuild 1036 BLAKE2B 981853eeeca5f94d165960fc13bae8a4cc578e8efee9bffacf26ffb35f581583c5ef1c60ecfb58c00a41f259ab12e57db4924e8913a1db21b50870e404bb68e8 SHA512 c098717fb8cc875a6a83aa35504f3854cd58c12a7c5df6e8d9ed8a28080bb043289e6ec83fa9b0b93ceb11ff2aceb4fe2480149858c4eb5ca8cd6310c9329c31
 MISC metadata.xml 1591 BLAKE2B af5c0a45644cb82ce81afa41c011fc9247858c3930a57cbd32abb0e15ea19f8ffe5eb7c12bce87c322b18c2478fd9ee9055970ff8ec36a58e844ef0e46d73249 SHA512 9166ca6cce9d81d72ddb471f5cbfbc4226bd8008c5f6d0d0fa862149aadad9d0531534b80a6389f8b9c2752d2231427b2c0be78d886a2161b77ae26665d1a054
diff --git a/dev-perl/Log-Log4perl/Log-Log4perl-1.540.0.ebuild b/dev-perl/Log-Log4perl/Log-Log4perl-1.540.0.ebuild
index fea6be3f3cb6..fb91eb96c932 100644
--- a/dev-perl/Log-Log4perl/Log-Log4perl-1.540.0.ebuild
+++ b/dev-perl/Log-Log4perl/Log-Log4perl-1.540.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Log4j implementation for Perl"
 HOMEPAGE="http://log4perl.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=virtual/perl-File-Path-2.70.0
diff --git a/dev-perl/Log-Log4perl/Manifest b/dev-perl/Log-Log4perl/Manifest
index f8e6f9ee3f09..b06290ed6e53 100644
--- a/dev-perl/Log-Log4perl/Manifest
+++ b/dev-perl/Log-Log4perl/Manifest
@@ -1,5 +1,5 @@
 DIST Log-Log4perl-1.49.tar.gz 279575 BLAKE2B b9b1fed690db056c40c7b76e420d64fb23b05a05c57a973f8546de6b86684d32f03b87ed3d28580aa4e2e59f6c81d67287bd25ed6910dc2616fd4044c6cb61db SHA512 3ee1104dbede8eb40b3055a606f8f004be0eb74223c4e33bc6f384bec9c34f697708cbee66198e92de053cbedd691e5354aede6874ef6be7e82f8eb95edee58f
 DIST Log-Log4perl-1.54.tar.gz 280001 BLAKE2B 8c48db7a3e37eb51adb9cac9484ac2a8a6d5fbd54caa3509898573bbb5e9d2fc4cf067f9eb37693ceaf6c89b09382c2af5628446f332d142a2904ab831d3bbf8 SHA512 689d389551a99108cbe83dbe56f08cb7d1a53483b9d19401be0c8d1aad050514ddbe02fe7f18f9649a5b113dc9a9c7d8aafc16066d5180cdd114b8293a2f98dc
 EBUILD Log-Log4perl-1.490.0.ebuild 667 BLAKE2B f9a5671b13cb74f60edbacb0309814d87fe391d83cca22c77ca4396ab46f62c97f2df6fc04d3a1b895366dfaee17baa0c6b65bab3cc36a16fce193faa4aa8cb1 SHA512 4e54b7d7552e30573d90c0e1e340db0e47dbdd10aba6f71aa5faff9de73522299ba6a4d7fe6cc7670b2e67d64f7846a2c5972cc27293b365493089f34ee61857
-EBUILD Log-Log4perl-1.540.0.ebuild 602 BLAKE2B f96f6364afb552a9fd638e734cb6746f9b4de05bcd11b7a2f47e1eaeba4276020d3f4833998fbc34803cc5b59b45edc22378247e901332b983c9af5aa1c3792c SHA512 391695367a03fc433cd5969c5aad205e03370d6210172150a014af577e8d73b643a1fe2aacac5905df86e66cff3ac4754762ba3fa4b1229b5c8e14c14d36b161
+EBUILD Log-Log4perl-1.540.0.ebuild 597 BLAKE2B 77609c774eb80757893d5c9b831d4657241926d370e2e6d6fef9a934404ddd3297974cff96788f74effa362c682b20c8afeee8485bdc56f91c878d056cafc1e9 SHA512 89d112109bd9e06819bf1020a6a6ef50cbed83adfb882b02d9c5544eadd43cb1f3796804b3692204c98577666ff03b3f200f504d8c571b9de684d5a1cab7ec07
 MISC metadata.xml 4281 BLAKE2B 0bbee70364ea14928b09d629cf712f6afb8309ae0d86352c0b1c0b74e40d412707aab7c8d779d2569b3c6da475606327554b7fca34c937d0784309c6ee10839a SHA512 6d8aa257d930a5c1682cff581c341ebe12c836b67c26c068599e50012f53f2cca8164b44176789514e489a3322e4ebada6a987a6cb90313028080eaece769e23
diff --git a/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.7.0.ebuild b/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.7.0.ebuild
index 0ccc80902c12..d16db66f2749 100644
--- a/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.7.0.ebuild
+++ b/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.7.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Mail::Box connector via IMAP4"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc64 x86"
 
 RDEPEND="
 	dev-perl/TimeDate
diff --git a/dev-perl/Mail-Box-IMAP4/Manifest b/dev-perl/Mail-Box-IMAP4/Manifest
index 5527813f597c..9bdf8de260a3 100644
--- a/dev-perl/Mail-Box-IMAP4/Manifest
+++ b/dev-perl/Mail-Box-IMAP4/Manifest
@@ -1,5 +1,5 @@
 DIST Mail-Box-IMAP4-3.002.tar.gz 41874 BLAKE2B 86b57eb0558d42e593c9b8ef44454ea805498229d8f2c75638f3dea399697bde62dc539c48870906eebd3bdd98c28a7efef2055c44a43b514b0950154c6800be SHA512 0d5ef070271ad67492209d479acfd056fb7c3e4d21e2a0ed5986535e3a59d3a330831771914c35223e4819b78a47ab02f350788fd8617ae293cae3dd7887896f
 DIST Mail-Box-IMAP4-3.007.tar.gz 44532 BLAKE2B a49c0d98e07e3fe5dfd3fc212f7c1b5937a915a37edec3b146247d916b423fbdbbc9cb146b2bf295780cc45610ba30d3f3feee8c6bb404068869d08b6b278bfb SHA512 f2cdf0063ec5ba66b9e29aa71c827aa5eb7f14cb25d139ff9dcdbcd111ebf5507763f501d7ca80b4269961cee83a91d8b282191e3beb0711536a505453342faf
 EBUILD Mail-Box-IMAP4-3.2.0.ebuild 666 BLAKE2B 1a2593ffd34e19e252c15b19d51acf7662acb7622659323e9e9896da0beab74f9832905118c95a93f97d0d1c5a9b99dd704a49b9e6c5aa6d9a47a52c06d5cf4b SHA512 b78f0e32de908bd95d2bfb14860725d80a76565554cf6d5c0ffdaafb95b61428b3fa278f52dccd2140d5ddb8317ba0558f95632eec706d9c712c02796b3338f4
-EBUILD Mail-Box-IMAP4-3.7.0.ebuild 632 BLAKE2B 96fb7679e491ab934dc19010d08fcdb4218bce159f6cfc17f176341c0d8ba018c0ede91b160c62304f20cdfd89f18d3f44bc1e73392bff3458967825ca6faaf9 SHA512 ccf5e003e4b73269161d81e7d816a653cf00f3091db6190ff8687af9609e496dc27d62db32909085da06a68b43842c6b060a58330bca54e15333d8a6f809e82a
+EBUILD Mail-Box-IMAP4-3.7.0.ebuild 629 BLAKE2B 97d8c7a25d750ffce7b7a68b24551cc897a24b1fe292c1aeb4ed2fa08603001a174a7f8b6202eda6fedda1c48180efaac20791e7ec4b27d3bea1f8c49fdfb6c5 SHA512 81aeb6cd8cbbccb1b148c28d4a0539e9b22422ef0b63a712103ac5a08813ba20c20e976c765612a276da4f5a1a1ca27d204af430dcb73b67fbd75501a17c9422
 MISC metadata.xml 968 BLAKE2B 5b44b8e7508f8a23a69be773848a9c2f563e8a4d67355087b56f03e1535e31c44f6b2108c4a953573ec7b4d120428535b5cf3db6f27282b9d6392dcfdd921e83 SHA512 404c9c94711b4b01c84659183ad18696fb85732df7a15f6be38ffe33f345c361a2821f42ef56c05563e610e5eff1983c5d40995c6d3e2929834b9d6e9d250b4f
diff --git a/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.5.0.ebuild b/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.5.0.ebuild
index fd1d803e026d..16c3f187b8db 100644
--- a/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.5.0.ebuild
+++ b/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.5.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Mail::Box connector via POP3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc64 x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Mail-Box-POP3/Manifest b/dev-perl/Mail-Box-POP3/Manifest
index 75fd00483c69..ca3d4d0ea017 100644
--- a/dev-perl/Mail-Box-POP3/Manifest
+++ b/dev-perl/Mail-Box-POP3/Manifest
@@ -1,5 +1,5 @@
 DIST Mail-Box-POP3-3.003.tar.gz 30500 BLAKE2B cfa99af8777bc590eff77fb776a2e161590809da59148dd986fba7409860244dd99eca431e398aea9f00046b73d172a70762b504e79eeacebf57f4e8ca277688 SHA512 be63f85abbf78e1497eb6d6d3f87e80a3fd6d58fa6469f8732435cc740f72c2ffc6da8f5d98907e2dd4b7d0412c15f94abb994fc9274701ee050f4a3e1f50397
 DIST Mail-Box-POP3-3.005.tar.gz 31804 BLAKE2B e0ef2d6ed0b19de2f51497af0268bcc5fd78ab6c3027bbcd134edaf942728e4494f11eab8066151d088c933104011af7015383ef408ae6a8ae45367df03d8131 SHA512 cbcda3c9df08d8cf5d279e1b8308885213b75b0af56a3be7c0a5fc769ff60a6c9e6f2cd5ab4ab19532e388e14ceb6b4b62042dea4bb512c31384823004137079
 EBUILD Mail-Box-POP3-3.3.0.ebuild 663 BLAKE2B 9dc89b77a5d37efd94538243980766b66059d3692d3c6a4353a297ce4a6f57476531b5da76ada7a7b0301317dde2e0200761318384d5179188c01ec6ac3cd1cf SHA512 fdd693425ff77c0a6f9f6c89eed6ecca231b052c9ff28b695bdcaf735042d69b57623adbd9f4f958d90e954ef8ac1863978a8752a0535fde98d2ec686755d9d1
-EBUILD Mail-Box-POP3-3.5.0.ebuild 630 BLAKE2B 6b72933fd33b43d2dd2bb656928e30fcecd17c41f1ee288e5c0fa69fe77e288680b0cfc44a8c934c42e7ea5d7069b7a4a68c419e41246e2c60b2e603b65f45d3 SHA512 569c708b16588b8fef5c40480bb7b634c0e90dcb7adf4553bc662e30976fbad62b39f8e258b04644b68b133a728483962657e54df1f14cb0bea45eab7e3261d4
+EBUILD Mail-Box-POP3-3.5.0.ebuild 627 BLAKE2B d1225d7f06fdff3bc6cf23db843a8f204c9cbe2bff090aaf2735b7cd777041c4b4f1ed3dc44bbaebd065dad5deb97c90f838e471fb32e0b937b7a81176298739 SHA512 efb41371863fe68149683fba2af8ad6c287d7818a04afcc77ed17b60d820fe34d28a892b8223977b82bda7f7aaef0bc9627eea348e32ff26c66afe35c4d28ab0
 MISC metadata.xml 669 BLAKE2B b903688b65901d93a013292fd794854efb53a707bd403d0719357b9f8b0c531243051027adcea2aae3b28849df373b72392ecbd8e9d8fe716ebda7a5d08fce58 SHA512 0be6b17ee52b22b1e88f530ddfd6fd13ff56964b09dda2486bf121818d6b5d39a0acb660623266dc36a357622cad8a0ec4f307242be7eafc8c68e148bff87746
diff --git a/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.430.0.ebuild b/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.430.0.ebuild
index 838701d57b8f..7441df47d7ff 100644
--- a/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.430.0.ebuild
+++ b/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.430.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="IMAP client module for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test ntlm md5 ssl zlib"
 
 PATCHES=(
diff --git a/dev-perl/Mail-IMAPClient/Manifest b/dev-perl/Mail-IMAPClient/Manifest
index 818eca8712f5..05de04ee2d75 100644
--- a/dev-perl/Mail-IMAPClient/Manifest
+++ b/dev-perl/Mail-IMAPClient/Manifest
@@ -3,5 +3,5 @@ AUX 3.43-makefilepl.patch 2676 BLAKE2B feb527eb527a9d678ce8b14672b5dd1d686221289
 DIST Mail-IMAPClient-3.39.tar.gz 190965 BLAKE2B 43fb640d2282945b21e743ccb8bec037103b7bcff78396f1f72f26d7860d5b5f69bcab837f3e857610426f958c860085f66cef21c8d5115940fc64ae3667f1e3 SHA512 156e5f6682d55f2c112ae5065448f0c502d3e748c4405768152ccccd7d944cf949f7c3fd42f30f40c86337457dea5c037959bf29739e4c413e4b45af2b74c222
 DIST Mail-IMAPClient-3.43.tar.gz 189679 BLAKE2B da28ec4358532dcac59241dca4ffc29c3cf86bc3bba388dd66e27f45ac675c4754d0def00eb7112e4b1ffb1d595b3941b160a3f3e81a8ffccacc8351b4f96a94 SHA512 9e2346238d68ea62c0ad2e5c03ae9a36face8238dbccbbc083bcefd41d82a7f75887e3245c792e4bd2a5999ce66fabdc4e861118904e96cf2781e1ca549a1b09
 EBUILD Mail-IMAPClient-3.390.0.ebuild 1106 BLAKE2B 33c0d3d1b1d942be2e00227ced4c421d404dd6abfc6cb50012683f460ae354837e4163ebda21d38b40389b2ac81213fae39c401839022676075028ba13568813 SHA512 a8e2329509b804fba694ffd3359047314618a7d91d4f0ca245aa3e970ca9735ee5ff3d49604024ee7313773050625637ca7dbecac99e71879cc9892713241c80
-EBUILD Mail-IMAPClient-3.430.0.ebuild 1089 BLAKE2B d855897ac2d2c2136c695101e5a15a42cb6779f0eeab2db572def989d1980422da48e28f8097064754a2512e1b6dcc7ce3544b3c14f57f2ba0a22bf4874a573c SHA512 869e57a09b01ce69e0505dba4dd1d639d96a20889d3234e6a26c492249f86f6f3c984d1d6c8e58a6b53cb1e6fac9a106a52a6f081231fa2bf5d763a221b17505
+EBUILD Mail-IMAPClient-3.430.0.ebuild 1083 BLAKE2B 5b7ff1af0d5563706dee6474476d8fe6fc7706d58600a83ec3d9eea45042cf53f51805d2eb1ab25c1b41987f1e5012265d56b66445e3a384dbe5f47541e8935c SHA512 2604120f74b530af9f83a559e1b59e2169abb08d77650ee6b161840471ed9005b1c686f557d3435a7ebf2847652fa1bb82fde0c7cf92793a3a029892367e36ea
 MISC metadata.xml 1479 BLAKE2B c6dd142a9311a0e0d425ef22933e04327f24d53cb41d8428d14de58806be9a55be319382e1f07bf445c8f35d83842d915ad7cacbfc47621f957a8484985369e1 SHA512 9ab467eb24b4805b0b505cc0a4c950206281d65ea4868d2aa759c94457e1bb8a382ee7ac84627392f3e3416056da7e1aa87f0de810c1d9fc63d39628040ecddf
diff --git a/dev-perl/Mail-Mbox-MessageParser/Mail-Mbox-MessageParser-1.511.100.ebuild b/dev-perl/Mail-Mbox-MessageParser/Mail-Mbox-MessageParser-1.511.100.ebuild
index 3b3a071413e9..1d0caf5e4f3b 100644
--- a/dev-perl/Mail-Mbox-MessageParser/Mail-Mbox-MessageParser-1.511.100.ebuild
+++ b/dev-perl/Mail-Mbox-MessageParser/Mail-Mbox-MessageParser-1.511.100.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A fast and simple mbox folder reader"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	dev-perl/FileHandle-Unget
diff --git a/dev-perl/Mail-Mbox-MessageParser/Manifest b/dev-perl/Mail-Mbox-MessageParser/Manifest
index 247fb2f47a47..42ad52eb2f79 100644
--- a/dev-perl/Mail-Mbox-MessageParser/Manifest
+++ b/dev-perl/Mail-Mbox-MessageParser/Manifest
@@ -1,5 +1,5 @@
 DIST Mail-Mbox-MessageParser-1.5105.tar.gz 292776 BLAKE2B 4ef8cac6c096713f53f68b7e000a03d8d2cd5b6083c1be47a48c8d2b5760d195b2f31e11dfef599a030171ef732fdc537bde365a060982c9233fcbf93fba2d54 SHA512 c7462cdf1542a27120fada815b61279489d77df4842b311277869dbab10caf0989b70567dd05406262b86fa611ecb17e06807c5959085d24d8673284fe1ed014
 DIST Mail-Mbox-MessageParser-1.5111.tar.gz 296872 BLAKE2B d5c4e2974a3336088fcb69233c45972246972eb4f88c17b5d0fd205e300c8773c7e6cc6b401ca895c045f59c86c048f473cd2c5f46ff890f556db10965cc2f8b SHA512 c0b0c4066da3be2d8b669eed1a527309aefbbedf08531cd8eb524db37319532df75719784a557929adc409fc680a384d731f8b06768020a18855e34f392d6d0f
 EBUILD Mail-Mbox-MessageParser-1.510.500.ebuild 724 BLAKE2B 47dcaca9dd2998cbfd4e59bd8ae948d4a4a669ace68f7367ee2db44ee1f1ac96bfe4e80e0cbee494f9bc0fe24155688c610f31a86232d66c043dfd16a8477f65 SHA512 77bff9665df35f124ce18444f494d5ef9259fc5c72a2670ea254ec7c214027c2949f0deffdf04695b38a04037afd5ecf0c40e0a6c93bf0460707ac4665743be3
-EBUILD Mail-Mbox-MessageParser-1.511.100.ebuild 555 BLAKE2B bf3cef70536a7eb72d4609db2c4b7228b01f62d2ff01b26b53b82123f4507a040b2dbbd6f9a9c0e5706ea71ccb4a9e7806327e99c76b084050837d49e9a073a8 SHA512 599cd00cce69bc90c0b02637ee94872ae94ead7afbc609101cc29e43b6b6902764d39de8eb6f6b69c696615aea31a74665252f16a7f9f3ce1a28a267533af14d
+EBUILD Mail-Mbox-MessageParser-1.511.100.ebuild 552 BLAKE2B 4b66e7cce7039970e7b03fb9615aff41ddf262360029b2ca5481262d316976e0d497bf115ae2711055d82bf9abcfec1a5d47f3b43f094c8581965c438fb74c2b SHA512 733d7d109b4b7c4779cfbf135d5d00e2ef185c70338d5cff1af102219d1d88574ffc94b52bd1332db12491b920252790297ba630b9c0c54f1134536dee3df8fd
 MISC metadata.xml 876 BLAKE2B 647620f66b0f073a7623d409f92ecbab981f511876edd2e47bd811fd0b9cb230e8f6b129b0efd6d815904aefee7551a842fbc56dac64dae7272a8ae5b7f0bcd4 SHA512 a2f21e519c0f47d5360453cd4b8e01e3d81d80691ce60e978b6ef790eb88bfdd8d0f655a46ef30a25e73cece8be4f257c9de010661d20d150742db260ba5224d
diff --git a/dev-perl/Mail-Message/Mail-Message-3.10.0.ebuild b/dev-perl/Mail-Message/Mail-Message-3.10.0.ebuild
index 418a46009ed0..dae1f7a719a1 100644
--- a/dev-perl/Mail-Message/Mail-Message-3.10.0.ebuild
+++ b/dev-perl/Mail-Message/Mail-Message-3.10.0.ebuild
@@ -15,6 +15,7 @@ RDEPEND="
 	dev-perl/TimeDate
 	>=virtual/perl-Encode-2.260.0
 	>=virtual/perl-File-Spec-0.700.0
+	dev-perl/IO-stringy
 	virtual/perl-MIME-Base64
 	>=dev-perl/MIME-Types-1.4.0
 	>=dev-perl/MailTools-2.170.0
diff --git a/dev-perl/Mail-Message/Manifest b/dev-perl/Mail-Message/Manifest
index a60d3aaa20bc..fc274de47c6d 100644
--- a/dev-perl/Mail-Message/Manifest
+++ b/dev-perl/Mail-Message/Manifest
@@ -1,5 +1,5 @@
 DIST Mail-Message-3.002.tar.gz 256679 BLAKE2B c73796e993b79d0692cb8abba520ef84c48afd04422a6d1802abee6633e1b49e90a63be63ac3d88c0731ec9a81754f423a03c0724015790f6f7755218e6b9e5b SHA512 06aa8903ab9f4275916981c4a49a63741cef15161411e6b56ed58e08d539d1e3572e8eaa0bb77b7140e55beb60b8bfc2b26381295b5fcd82bb277652bd86c09e
 DIST Mail-Message-3.010.tar.gz 258187 BLAKE2B 0827d25d3a7fb637596aac83d16d2b5297ce4d19a1a7235865018e949f48167698bbcd84a32bdb6303017756c4dfd595428a26021d4b24fb60ee3ac8a85c31a6 SHA512 aa2d38968cfe55a5688a1aaa3442fd87bc7b216ab43db40053f65f5d9bc6b397427a56662062c5a17dd6e62d86aa56c217a6394298e78fc64377feeeeef03771
-EBUILD Mail-Message-3.10.0.ebuild 702 BLAKE2B cb7a5dfa84152624ea35678f9846114b35fe01b9d598cf980170eee3bcc71f954516c3d3612d5f023d29cf913a9c9f842bb9a3fd209870838fbc9525195b7f1f SHA512 4fd599537dd1d0f21d6cdba3517c55bc8f697c5129921b89c9a81f46601d57e494a081bf7e2faeca339cac0abbe7f4812b135362bd9bfef21edbe4997fe923a7
+EBUILD Mail-Message-3.10.0.ebuild 723 BLAKE2B b5ab0c2a964d2c2a42ef2bf2509d64a9d5b48855759aeeb23134703cb77c6fa69c8b3979c70cd1e92091b50f94773a892c347d6f260085a65797f7f8bbc32c1d SHA512 acc18663feaad5aedf0e8756ecaf72fbbb12126f405282cef2d40f5cf41f5162add06ff13fedba6dd9042274fbb3d162d706d495ee1ec6bfbe2ec1c12f2ef8ca
 EBUILD Mail-Message-3.2.0.ebuild 759 BLAKE2B 473a4ad8810ffa32fd3cd73efdaefd229b97491e2fb771abf37f4e5fe0d2ea0e6b3b8b2bb75933a17c2ca872ecb5ccd2e2941be4f48c19c611702d479c6c73d5 SHA512 f9609d3b1a71ebcbc0dbe11760c4300dfc9ad3259068e8b450bbde5bbf46f82a6f69b6dbde6c374cc36939c2694b0bb83058954dbc63b4deae79d209463ce90f
 MISC metadata.xml 4104 BLAKE2B 32c96c4d909d8e304aa5b6441152caf008365c6ace938cac1d4ef06094a98b353a41a3b4e1ba10baae3ccb529f37b69915b9f8b512ee8fc439747106c7147353 SHA512 3efb09e837baf08d42c8835cd015f5791be493c282c9acf41f04a7cb989fe822786535928fbd1b74f9bad069b450e48266762bf56fe5f27d2d44eea49eb8bd01
diff --git a/dev-perl/Mail-Transport/Mail-Transport-3.5.0.ebuild b/dev-perl/Mail-Transport/Mail-Transport-3.5.0.ebuild
index 8d038544d23b..dff0408ba2b3 100644
--- a/dev-perl/Mail-Transport/Mail-Transport-3.5.0.ebuild
+++ b/dev-perl/Mail-Transport/Mail-Transport-3.5.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Base class for Email Message Exchange"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc64 x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Mail-Transport/Manifest b/dev-perl/Mail-Transport/Manifest
index 20c19b441723..ec89e819eccd 100644
--- a/dev-perl/Mail-Transport/Manifest
+++ b/dev-perl/Mail-Transport/Manifest
@@ -1,5 +1,5 @@
 DIST Mail-Transport-3.000.tar.gz 14839 BLAKE2B 5213d2b4ce042dba5358c4d70bb638e1c797d88564c7b4935d75e692215a10b2e8715b75d95499edeb2a0b978f03f97f6901447c1844e72f07c4b6705f031a91 SHA512 6a209aac34fd79141ce8559038a3e523e50338301391ff08e6450afc8494058afbe5c8930ac919a9e0c20227d1a3a5a08d7c6dd1a02641e94951923736772d4a
 DIST Mail-Transport-3.005.tar.gz 16470 BLAKE2B ae631369ebfcd2ff8c2b82b0933d8514509ac25b67eebeebab7e2b5a8379234a939eaf06efb1f8d48f15079f77f82f597825055d10fd1d79307d4fa12357fda3 SHA512 58e5b445207707cc259ce189d506423d66bd455c41c933ef3c5eb8a72645dd7f993276345a1be86658d5bab8fbb207eed48faecba6428b65fb48701c72585ad7
 EBUILD Mail-Transport-3.0.0.ebuild 597 BLAKE2B c834c58691eaa833f0d377a4179991d5693e5ba332037722d29b94c00edddce3deac567709fabc6aa1755c170429f1c5876770547ad14f7461e6d89ccdc470bf SHA512 64a79f5a87cdc45620a46ca588dce4828d6a6a140841ad9bdae72248511392067f55c44d564434802162c54bdc970e9fdb57b1f09e4b4d4d36a7be008cc5421e
-EBUILD Mail-Transport-3.5.0.ebuild 563 BLAKE2B 725d0f54d1828d5464b7bf683ef0e343cda546aedc801308c9e42d6014da0ad1521b4a18742a6a63eb2fe837a34438bd8277cff563a4586a262a7d03c94bcebe SHA512 6445a7a527bf7c1ae75b6be72d92f7caf2684c814cc3a0a29c99b396744bd5b982e2deb3412140055799499ff098e7e703471d6e8c4f87839720087876743d6f
+EBUILD Mail-Transport-3.5.0.ebuild 560 BLAKE2B 5467f44a28dd4e1063726f87d891f7f1a03bb59d1dc62f08aa362599dfa4ab6d4d6844c9f6a6a99cc3ce932c2a79cfd2fb80a07f9f72d1a47d431358c3c1ef6a SHA512 4a23b28b1c2e3e12b4dbab8c66f53700b05dde615b3cce547c676361f149712b7e859313112620d24e2a54b0484fd5266a1ccbd3348532c2d788fa98b26b667a
 MISC metadata.xml 885 BLAKE2B 442e9fa1c9264e5307e061e12156a915f34552bc02f9f989d26b2e6b40a507d03111c969d05787b22538b9540ea8a010810571bcdbb923c78376ea20b1a1b5a5 SHA512 b93e90f114c72ea563182ced57f4240a9b42ca26767453f4577c0c2bc15e25c27374cce9aa9b77841dc88018a3698346cd703447e57823fd7f2bb2980e571404
diff --git a/dev-perl/MailTools/MailTools-2.210.0.ebuild b/dev-perl/MailTools/MailTools-2.210.0.ebuild
index c6aec317a5d9..c300eaa6aedc 100644
--- a/dev-perl/MailTools/MailTools-2.210.0.ebuild
+++ b/dev-perl/MailTools/MailTools-2.210.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Manipulation of electronic mail addresses"
 
 SLOT="0"
-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 ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-perl/TimeDate
diff --git a/dev-perl/MailTools/Manifest b/dev-perl/MailTools/Manifest
index 9b2b899c548d..42f4280901a2 100644
--- a/dev-perl/MailTools/Manifest
+++ b/dev-perl/MailTools/Manifest
@@ -1,5 +1,5 @@
 DIST MailTools-2.19.tar.gz 55887 BLAKE2B fedfb8fcf94935746b3678b34ea52dc90722646ce28138990952325d8f94c26204fe8f0d1ae9ea541663b7a4875330a8006987dfa581457f62763fac64ab5d99 SHA512 a4ecba2acba56f2d41294e1b299c08b138d5e4796880635afcea7628adf60e11d5b138fc56001c331f765048bd91fa94da27bd7fdeedc51ff91e4ef5770a068e
 DIST MailTools-2.21.tar.gz 58013 BLAKE2B b3cc88b793c83099b678d90b79a97919ec6ccdc4ed94bb078ad1c8feb0dd164eebfd854bea4c324fe3fc5e431f3405eae2d6deda150045004daf0201e6094e02 SHA512 70c7e5760691a1fc0a2812c48a632896db9bf719d3cb07a63c3a4456c5a365855c7f71c7436c84e5085374628f26ad31fcf13e74b3b7242911da59b7916065a0
 EBUILD MailTools-2.190.0.ebuild 663 BLAKE2B 2cb9706f936707257d4276d9de0ee7aac8f56e123e947e78b4845de0a1cdafe51583a5fa3c4296f3e5968816abb7dabd1ca5a0786d790f19911030c53c6aa726 SHA512 529e54d7b5696b0d199792125032008a0923d903de3adb26322f24703d253c71b37eb376612f1eae74278e9f58a4f5c927478ea4827608ca6f55c4737abfb047
-EBUILD MailTools-2.210.0.ebuild 633 BLAKE2B 9a856c645f0a358c5f5612e11a8736b17d6cd7c1f86c5a92879ef8e076a96f3e711c07aad9ded0ec780896f6485c3c14221e3f69d2ba22477ce9adb0e94490f3 SHA512 82a535bb7febe35fbe87c5fb73f9cc90638aedd07ff4e78ecfcfc083d82b2beac721cd5f73197ca26528eddee5b17ce8fffcdd475b277f95c6665d710c479151
+EBUILD MailTools-2.210.0.ebuild 630 BLAKE2B 44ad1a023544b36c52aee7f1855d58ad341cbe77ccd4590ed7279728645391b8bb24af27946dbac07cd8fe2cf4ee01cb00e37315559583001ef52212a598440d SHA512 ef5c4c0b8e6f627438a2233a7bb3e7694a77e1e9e42c520792cd591913bbf29b8d824558679bcbd5d4babc441fa354f2bc7bbe094f5b193b01d7f6a0cc879f93
 MISC metadata.xml 1734 BLAKE2B 8f4ec9850270c7af488676002e89bda5cbbeeaa14516f865c2d0603fabacc1b560511a048b109dc823f412a8a84c9b4084a89259879580d881e42d5b9d441e9e SHA512 24fdaa48c4c5a36b7f77ae6d1fce705db6d53cf5e2280136fb10b24acf869f7ac2b006abfa51f8711cfc74b0204c4bfc06d4fd8e4b6cde04dc53e3e018b1cbed
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index c3237456ff0b..0ef4547a8bd6 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Math-Int128/Manifest b/dev-perl/Math-Int128/Manifest
index 540d24e64f9c..3ee8b2a50331 100644
--- a/dev-perl/Math-Int128/Manifest
+++ b/dev-perl/Math-Int128/Manifest
@@ -1,3 +1,3 @@
 DIST Math-Int128-0.22.tar.gz 103698 BLAKE2B 1b23468c07c95681f7d94496edb7d0c26e7e4003b3ba74675bc0da0df1efd327e30ee88071242ffa6fa677de942c61c496eb346d00d59b27c461659a34231b46 SHA512 8384891e6a8e6e1696a7fe1d5da8c27c229e7926c6a16ac1114e812dce3a8a75f64d9d1128d2c63f17753c91c54c72dadbd3837e140624f9f1e47d462dccb74f
-EBUILD Math-Int128-0.220.0.ebuild 823 BLAKE2B 5a49ebcd7871571bbaf1bbafc3afe3e15e023cf98eef6f310ea07acfe69863e7bfb88954d6e29a65f332f721afe2e52af4f6f4c77d08b9848a48e97a679b84d0 SHA512 b6566e47b9f16c1472939e3b8cdddaf1a47d1d70b7bd4b4540d170e2a785386d34f4e7319a86687e76a9503b4adfcf7b7d3a7c57a56953b3fd284443026a0e41
+EBUILD Math-Int128-0.220.0.ebuild 822 BLAKE2B a6edbe78c95bf650c524c502218caa56be4b8ffeae3530800a50a53da3bb5fc512bd510ef9d878212a21f9d7eb158cb4997b8a6941335b88f3f2019d6d6e066e SHA512 b5cec9941efc3e0bb4475d569418da70a679cd6854f312d91f21d79d63586f2a256215575dc503fcf9b0669068fa26312f5a887a8758483dc20178efd36a98b2
 MISC metadata.xml 661 BLAKE2B 94d3c827ba28ab9d754456266a93208e374a8c667acc7cb0e9bb98bf5d26481a12c793878cd44dd581733e37f1aa6cb0eada9e5c0d88bf4a9805568f39b3ece3 SHA512 b6989c91f0649a9990a1f6aa226e73f84bd8bb98f6be08762d3f6c53dc09a2b8796da53a3518af8bf83952638e2dd3efa05af787825a06ac2132a1db6c8e3672
diff --git a/dev-perl/Math-Int128/Math-Int128-0.220.0.ebuild b/dev-perl/Math-Int128/Math-Int128-0.220.0.ebuild
index d686931bdea0..f39b06b1984a 100644
--- a/dev-perl/Math-Int128/Math-Int128-0.220.0.ebuild
+++ b/dev-perl/Math-Int128/Math-Int128-0.220.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Manipulate 128 bits integers in Perl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 -arm ~arm64 ~ia64 ~mips -ppc ~ppc64 ~sparc -x86"
+KEYWORDS="~alpha amd64 -arm ~arm64 ~ia64 ~mips -ppc ~ppc64 ~sparc -x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="
diff --git a/dev-perl/Math-Int64/Manifest b/dev-perl/Math-Int64/Manifest
index 49beeb56ece3..46b9cb26645b 100644
--- a/dev-perl/Math-Int64/Manifest
+++ b/dev-perl/Math-Int64/Manifest
@@ -1,3 +1,3 @@
 DIST Math-Int64-0.54.tar.gz 119664 BLAKE2B cf12dd1f156c92cbbd2f87913737cd1a4b48ef3d879e340506241bea6debcdc2313f8c1503597f54a0d80e6e50f16cbdba5be112e4e6df71e1f2c38575c423c3 SHA512 03677df499ebc3924fabefbc6fb863adc2f765341a9697305b03bb24477b391029e65cc492c831a24e282e26e850082abbd0e52dda198aa041f3f4f41cc4f995
-EBUILD Math-Int64-0.540.0.ebuild 807 BLAKE2B a755055530a07c27852aaa61a8ab2b522ccf20973b35b26285a2c5e7273e15d341914047ae3c2657575f94c54df34a4bfc83e4adcf2bec25283ecdca6cbdee28 SHA512 6b12a59aad730c17f011ba8160046d92d0eedcc43fbfeb35b2e55275a233083aae54aaacc5df3c1460e5d13df3efc42c75fd59bff933e6834b1160d03f2eaef8
+EBUILD Math-Int64-0.540.0.ebuild 806 BLAKE2B a19ee73a0d077299f7453b0f598bcde2f09d72b7e722c027885ae23636d3535e46003fa8f9611f59f6bd5ee43a74426e90cecb3b96d45d64f49559f3a82f0c5a SHA512 843dde783c15fb9a9759e217c444bc0372741fd725185864b8fa27d2dcee87a72b913942c067057d33068989f0f7633d7362c4f0917820b24f79fdc220edd198
 MISC metadata.xml 736 BLAKE2B 3255603a1c5ca9e4a8407465fcb6852a87889b36fd63d5f30345349342b8bfc6a2f3fc972ae337d82840df06821843ba87680240f3cb067c149c1c03967836fd SHA512 c2851a2ab205cce07705c67aeb63dcdedd8a548b33d496764cd8213e6898d6390ed3132ca4c0860a58220513d8936e1cc2e1947e5e9d76b7d4638573ee3910d1
diff --git a/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild b/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild
index cbc52dec1dd9..15da8d3a4772 100644
--- a/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild
+++ b/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Manipulate 64 bits integers in Perl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Net-CIDR-Lite/Manifest b/dev-perl/Net-CIDR-Lite/Manifest
index d76c526db6c6..e06593fd1cb4 100644
--- a/dev-perl/Net-CIDR-Lite/Manifest
+++ b/dev-perl/Net-CIDR-Lite/Manifest
@@ -1,5 +1,3 @@
-DIST Net-CIDR-Lite-0.21.tar.gz 9931 BLAKE2B 50378fc1b032bb19cf8033ef6e884d8d623c91f1a0581763da483a031013b70ed36580304e1d2cabcbca1099d5e3062a7642b8aa2913ad1576cb9bf865f675bc SHA512 c8a5b00a26fb823e637825eac72ca7002f401a1a623d8b77b694848975124f24fba86830df8d41f6bdba4d2e2f0f93b2b155ac1511b607efa67942189614dc7c
 DIST Net-CIDR-Lite-0.22.tar.gz 10823 BLAKE2B cee9074c573f16ebf6568316124afbc496b7d2644bdb0d2d8ff29f57c81c405db072576fb2ab071cbfbb84d8a2b2544fce425e481a1f8853d9e11bcb2423beca SHA512 5d89c0b6d950e5cb4c7eb9639829d76a67373865f5582f61d3e384636b176ac08335a9210d05a53c54105fecfb8ec98ae115cba3d181aed3032370d50f3aec9f
-EBUILD Net-CIDR-Lite-0.210.0-r1.ebuild 538 BLAKE2B e86b0b9cc0383ee22137b579cfc92f5f8e06cd059151df10afb354168abb6f3151bd88c99240170ad953864d42eb3e86e1b802499377ca4283105600f09605b8 SHA512 2132c0327a291ac65dd58589a9beae0b8c7df38f98297bc7580cc1692fd004a82ba957306fe5beb854e4b99892fad7c9dbaffb8c707b1193440fad5d07496986
 EBUILD Net-CIDR-Lite-0.220.0.ebuild 541 BLAKE2B 2acd8b4aab318b59060bf3c41a6bfbe42f2af5999e9050a235e9e51be3b0eb74d2c08f416347d551aac4edb13ef56322c10852fafa085a53c22e61861fae3e1c SHA512 7e57d3d12f7c4cb9e1d1610fa1ae6b44015fde3f4e02f7492a6d8f4e342327957cde544516e2d55818c40eddeafbd5d60d2ed63867e81562cac0e88de969d8be
 MISC metadata.xml 467 BLAKE2B ab893eecc1c077301285d29b33a5007ad21e15a0140f83620041599281c79221c6a00d2eede7f06e1ab9f9d23d38f05eab3e8b4f338afb2e11c597afec873783 SHA512 3ab581f43391e1f501e8c6bcf4b8d0adc640ab109ea7f948b201f2307636219bc781bc4b52ac0db2f012d8ae00789bba4925789120811b2f7a1aab5ff3fed7dd
diff --git a/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.210.0-r1.ebuild b/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.210.0-r1.ebuild
deleted file mode 100644
index 764ac90513e3..000000000000
--- a/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.210.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DOUGW
-DIST_VERSION=0.21
-inherit perl-module
-
-DESCRIPTION="Perl extension for merging IPv4 or IPv6 CIDR addresses"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-PERL_RM_FILES=( "t/podcov.t" "t/pod.t" )
diff --git a/dev-perl/PDL-Graphics-Gnuplot/Manifest b/dev-perl/PDL-Graphics-Gnuplot/Manifest
index f80636034af2..37e0589d9ead 100644
--- a/dev-perl/PDL-Graphics-Gnuplot/Manifest
+++ b/dev-perl/PDL-Graphics-Gnuplot/Manifest
@@ -1,5 +1,3 @@
-DIST PDL-Graphics-Gnuplot-2.016.tar.gz 149882 BLAKE2B 2c2359d65643f72fac1249650be8343786415a72fd074ab426211e1fc933ce6a02ce789b93820c2a41a687d429b264ff743a3aa39e3df12c1a66de47115167f7 SHA512 3e82a8a10b7b48567e0746238c4b718e491f39afb53b965ae72a4e2aa0567914856bf6343ba3d571fdb240d284fc95570c51c4042d9bbc0e5de8aa6f7aaa21f2
 DIST PDL-Graphics-Gnuplot-2.017.tar.gz 150197 BLAKE2B 22903f3d08a4d7268f3c024880ede8650f4e101c2ebab162ab0e2241f3a64b713fa740c212043332f981417686acd5478cd06b1bfdd6c6ac301372bdc8333407 SHA512 41aa5b5c6dcd77b6e6109971173f5c25d69b72fd01ef4d72f7c2d86c248a69ee63bb6f20420e766778b29124a5a0ebd1d964d49c4d802d502b4a0bbb1765b8f9
-EBUILD PDL-Graphics-Gnuplot-2.16.0.ebuild 673 BLAKE2B cbf1c84ebd58dde59768d082898b998193d95534cea96c00d87f1e0da1f3e3f00db035b23555055ee851659661d06bac3a2ead1801d9fb23934cc7a523da74f5 SHA512 ef3449d5ad520a9acfcbae52474d1e1a30a3dd4649da75efeac4b70a99ad2d50f35a02f8a60276c2a5ed6e1902a90aa6080bf74a9d4d765bb6f62a55123faaf0
 EBUILD PDL-Graphics-Gnuplot-2.17.0.ebuild 633 BLAKE2B 6f2d5f0ca32c2363a83feb05d53016ffa8df03c646be346c57b598731200198bcefc2c1edc87d5530b04e2225e26f2a618bea67b4e2c802fcde1ab21bd97d210 SHA512 2270bee4844ffa72b5487747b69a3cb5ae4233a5fd44cf49a36d6201a97af598a7932c4dfb23c58546ea00c960fb57bf88643cf72f4300a917e97e177e39ba12
 MISC metadata.xml 485 BLAKE2B 15f0bef37016030b3116f19f5bb637e9da8c7d86144bb0d1806fc1fc1969a3e5126fb864d8b4193bc64810e5e3385d64b2e3296c5cad56778820709b78197257 SHA512 8ed658238efaa82d1e5b3249bd3368446bd826cafeb362c068291cb8325efeb266d37efb7d76820081f1bd00367491260f373097be4d1639b781bfee9428e3ef
diff --git a/dev-perl/PDL-Graphics-Gnuplot/PDL-Graphics-Gnuplot-2.16.0.ebuild b/dev-perl/PDL-Graphics-Gnuplot/PDL-Graphics-Gnuplot-2.16.0.ebuild
deleted file mode 100644
index f0f84e9eb343..000000000000
--- a/dev-perl/PDL-Graphics-Gnuplot/PDL-Graphics-Gnuplot-2.16.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_VERSION=2.016
-DIST_AUTHOR=ETJ
-inherit perl-module
-
-DESCRIPTION="Gnuplot-based plotting for PDL"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Alien-Gnuplot
-	virtual/perl-IO
-	dev-perl/IPC-Run
-	virtual/perl-Scalar-List-Utils
-	dev-perl/PDL
-	dev-perl/PDL-Transform-Color
-	dev-perl/Safe-Isa
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-	|| ( sci-visualization/gnuplot[X] sci-visualization/gnuplot[qt4(-)] )
-"
-BDEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.480.0
-	test? ( virtual/perl-Test-Simple )
-"
diff --git a/dev-perl/PDL-Transform-Color/Manifest b/dev-perl/PDL-Transform-Color/Manifest
index 29bd22c1463a..f00eac438a23 100644
--- a/dev-perl/PDL-Transform-Color/Manifest
+++ b/dev-perl/PDL-Transform-Color/Manifest
@@ -1,3 +1,5 @@
 DIST PDL-Transform-Color-1.003.tar.gz 51299 BLAKE2B a7a8154d3adfbf73405d1ad779021093a939660cddf884909b0f2c57312a9fd0f5ebc84d2266f813f3c432cdf6986b6239b3d08e9f64eb500c621d89d556c5fe SHA512 ab1c0643013a494584a688aaadd275ff361bf2212b2af6ed7718cbe344f87c5ed887a188729ad8f1a1922f2987b25e3816cca3ba9db78a45cc01630d50213b72
+DIST PDL-Transform-Color-1.005.tar.gz 52452 BLAKE2B aa0fa96a566015c22c5652b9a08e74b9efa631c08dc8bda4c5e24f59f214942f3fb9e41e0d9702603c96f5c5d7f512edad7908a8bca1880449e8365a0c45b442 SHA512 aedca2a02d5512a9f8033dfae2d8b3be14c103e94a687f50c4a20c47db95fd0e5d0fc561ec51aa66e19a55affe909fabb2dd7e5bc2aa57cce32a56bc7b22c239
 EBUILD PDL-Transform-Color-1.3.0.ebuild 368 BLAKE2B d681f6fd1ba0c10d1db949711fca6b731dcf9ee1df4b2de6542723bbbd8ef23a15806d67cf34b992c68c7bd80949b3dedb145f311ff74f1b6e50045740fc4bcc SHA512 83f1c47b57d57f6cec4ecdcfe48625d367212ff3db2a43de157b690c06f14f24dfd26d3f0a3feff2234170f9f1b7af8dc2911efcee895bc738e0172813bd117b
+EBUILD PDL-Transform-Color-1.5.0.ebuild 357 BLAKE2B 410aa2e271077f52a1d1fb96e208407cf2ada7a55bafb2c93e8a6b4946ab9153d533618a6352bc386c0c819d68f7f88e113102adc4eda3e3dc8f6931da76e30f SHA512 c8c042f31401c93703817c634166860fd6a1cc706e777977710ec72e863d68c34cd24856aab3851a4e95ac681414d2ad8bcef015b43f3f62b6a3588a6d3a68ea
 MISC metadata.xml 483 BLAKE2B 970c2fdb655bf3c728b929a71efbb1dc20fda3c98c5ea632742edabff312d7ed22bd1ad08e327285dc5005022a1510ff6ab230696f840b04d978cd834611db16 SHA512 703184169ad21a2e79aa0977af6dbcf0c001efa809d03a4565062013839831d6a93c2f40b0a8b21e4f16263d843c6211fdcf92fcdc1d37610d47d6eb0f76bd2d
diff --git a/dev-perl/PDL-Transform-Color/PDL-Transform-Color-1.5.0.ebuild b/dev-perl/PDL-Transform-Color/PDL-Transform-Color-1.5.0.ebuild
new file mode 100644
index 000000000000..e49d48736edf
--- /dev/null
+++ b/dev-perl/PDL-Transform-Color/PDL-Transform-Color-1.5.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_VERSION=1.005
+DIST_AUTHOR=ETJ
+inherit perl-module
+
+DESCRIPTION="Useful color system conversions for PDL"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/PDL
+	dev-perl/Safe-Isa
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/PDL/Manifest b/dev-perl/PDL/Manifest
index 2dcd14c89998..43eabd2d5a87 100644
--- a/dev-perl/PDL/Manifest
+++ b/dev-perl/PDL/Manifest
@@ -2,7 +2,10 @@ AUX PDL-2.17.0-dot-in-inc.patch 4818 BLAKE2B 66bc0257031727bb964dfe150db14b16da5
 AUX PDL-2.17.0-fortran.patch 654 BLAKE2B 07bf6aa231476b20c400f1e3baf371d8d3228843d89327dc6c1ee9c96ceaaa2d3c63c27dac7bd6fa77c02ee9b8442343d76b90f7fcbd4337a00d9145dc737e31 SHA512 8d8826ac233e6558d1ce115a17b8ad258088ff5333a12ad16cef2985cb3721b8d5f068d5033d1ff462004607c4368507141cf9f7900a1b310f25987f118bd3d4
 AUX PDL-2.17.0-makemakerfix.patch 433 BLAKE2B 6a57d9703d95324ee64bd0c5ca5774f013eb9b9c6ac4bcc59d2c63c9e3ccb5b9a7cc33d7979deea61beec3a0b8f9ea22ca65a9cc1cc825da72cc5eb05fca9114 SHA512 6417ad04928ac2db65177cda1ad23ed699ff03bd4def669017a8fc4274aafa0e28e595f349d219d61104f0642feeb8d40b2cd459121fb2fc70be8ab2137c8d62
 AUX PDL-2.17.0-shared-hdf.patch 1737 BLAKE2B 8123226cc2fae7c8579b9af036f1802f0228efb66fa73b24788c78b9ea5034140b93ecae64fa3ef84153081ceebbbf1ffbf320fd8ccf0309695bf3554f095504 SHA512 bfa39a1742fa6420f03894e04e501c28a434f13cf863880d5f78988c7cfb341de5ca73f877a28bc1fe4b1e5351ced704b44bd4499b047cc51ec2f965acbeb26f
+AUX PDL-2.54.0-fortran.patch 1027 BLAKE2B 9065c11c7e3d77f94e0c88062501aafba37c6b273800312e8a0925e9bb93306dd4c560e584aa14ce8a0fe5c3c95172df21968f44bede9d21baad868305583170 SHA512 7016492544bc84f3cdae2a38ad5d076840b0a881762d8a37e0bfbd41c471d8be4f3664862eba47157da4e8b8cd609cd1df7e9b16c32c9c6e86abe114a17b554a
 AUX perldl.conf 2716 BLAKE2B 7cea3e06e00636c45d3ffaef5df236668aabdf52675a3447ef086cd3820df19fee4d6f1a0bd40a15d0374cebd6126a391647f973dd25803da01995cf58d6fe15 SHA512 ed05b5a5d8014a010093d1c03b90a72bc5629760a71f521988cfeaf70e6b59d9a4bfd8b4533a4dc3bcb46ba6fd3737cd7fb74ec086d3da8aac1b8239fa9ca8e5
 DIST PDL-2.017.tar.gz 2889414 BLAKE2B e49e0ee7e7fc3d95dd27098e8008930673cc4067331f2e4d9eecf8584fe717b15d5b4c7198548ea79a4543d94c1078f5e6eedd731b94d7ce062ab2841c32fc8d SHA512 b1c60b45427153928834619a59ef2213a0845564ae997e22fe202dfee281647edceb68bf3bfa6602ee69a7fd0cc69b7b61ccb74407f490d9fa40230f74599411
+DIST PDL-2.054.tar.gz 2848187 BLAKE2B e96598f88b4b3cabda88785881e9651b2984c2850fd1b161f869bb462386509c4fd659324cd5bdd139152a9d3db4857fe6443ac090c8d4740482972bdab893f5 SHA512 56b7c77961e19747a1117b63f35a3667b4b7ed14c991bf673eb1f4df4970d642f37170a6abd55d219897b0e02fcd42d7475f6b1268b810706c6818595682de2a
 EBUILD PDL-2.17.0-r2.ebuild 3387 BLAKE2B a0590614e7f9f8bfc0e91f9019ffb0ee691b710ad71be75c7b9a3ca94a68c95822e3ac18f8b89ff15fe0a2677d541c50a036879216adab700fddd7ebee6de5b4 SHA512 7e3763da6eb4aa92e4e33f5f094423d91a5d2dd929b23d0ae8fbba9668dd762df6cdccf76331ada86a1b62cd25cc27358255128c0f206d3347e0acc0b79e4bed
+EBUILD PDL-2.54.0.ebuild 3541 BLAKE2B ddb152dafca3ddb9f5f1bfaa09830940c84fae38b410d221ea903c0a4e173d8c5d821ec2082c9f54555c35735188c73db22749ee036a644c8badeaa083c2cda3 SHA512 a0bb47c65404144754ca884554c013ac0c69c75462eade575cd17fb3fad892c52b882311693e9217b323ea57c03874cfd2ae54139fc41c4dd6174660e94dffb6
 MISC metadata.xml 14070 BLAKE2B 2b8815b4829438c60093b78dba17a5a9a8b25d235e74a46ee809fda26b9a147962afefdd4c0b3bf33c529bbc91d647342730685c4870a3532c3bdd8b04271f0f SHA512 1934d0426e3f14ae27f506e7b5b1960753f24514f28bd7d653e41a486694646be81fc39b16f36686f7b5a6c9a1905ec1a26d79790b98dd2c61b8b100d9287aa5
diff --git a/dev-perl/PDL/PDL-2.54.0.ebuild b/dev-perl/PDL/PDL-2.54.0.ebuild
new file mode 100644
index 000000000000..692862730a53
--- /dev/null
+++ b/dev-perl/PDL/PDL-2.54.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ETJ
+DIST_VERSION=2.054
+DIST_EXAMPLES=( "Example/*" )
+
+FORTRAN_NEEDED=fortran
+
+inherit perl-module fortran-2
+
+DESCRIPTION="Perl Data Language for scientific computing"
+
+LICENSE="|| ( Artistic GPL-1+ ) public-domain PerlDL"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+badval doc fortran gd gsl hdf netpbm pdl2 pgplot threads test"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	app-arch/sharutils
+	dev-perl/Astro-FITS-Header
+	dev-perl/Convert-UU
+	>=virtual/perl-Data-Dumper-2.121.0
+	>=dev-perl/File-Map-0.570.0
+	>=virtual/perl-Filter-Simple-0.880.0
+	dev-perl/Filter
+	>=dev-perl/Inline-0.830.0
+	>=dev-perl/Inline-C-0.620.0
+	>=virtual/perl-Scalar-List-Utils-1.330.0
+	dev-perl/Module-Compile
+	>=dev-perl/OpenGL-0.700.0
+	>=dev-perl/TermReadKey-2.340.0
+	|| ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu )
+	>=virtual/perl-Data-Dumper-2.121.0
+	dev-perl/Pod-Parser
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	virtual/perl-Filter-Simple
+	virtual/perl-Storable
+	>=virtual/perl-Text-Balanced-1.890.0
+	fortran? ( >=dev-perl/ExtUtils-F77-1.260.0 )
+	gd? ( media-libs/gd )
+	gsl? ( sci-libs/gsl )
+	hdf? (
+		sci-libs/hdf
+		dev-perl/Alien-HDF4
+	)
+	netpbm? (
+		media-libs/netpbm
+		media-video/ffmpeg
+	)
+	pdl2? (
+		>=dev-perl/Devel-REPL-1.3.11
+		|| ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu )
+	)
+	pgplot? ( dev-perl/PGPLOT )
+"
+
+DEPEND="${RDEPEND}
+"
+
+BDEPEND="${RDEPEND}
+	>=virtual/perl-Carp-1.200.0
+	>=dev-perl/Devel-CheckLib-1.10.0
+	>=dev-perl/ExtUtils-Depends-0.402.0
+	>=virtual/perl-ExtUtils-MakeMaker-7.120.0
+	>=virtual/perl-ExtUtils-ParseXS-3.10.0
+	virtual/perl-File-Path
+	fortran? ( >=dev-perl/ExtUtils-F77-1.130.0 )
+	test? (
+		dev-perl/Test-Exception
+		dev-perl/Test-Warn
+		dev-perl/Test-Deep
+	)
+"
+
+mydoc="BUGS DEPENDENCIES DEVELOPMENT Known_problems MANIFEST* Release_Notes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.54.0-fortran.patch      # respect user choice for fortran compiler+flags, add pic
+)
+
+pkg_setup() {
+	perl_set_version
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	perl-module_src_prepare
+	find . -name Makefile.PL -exec \
+		sed -i -e "s|/usr|${EPREFIX}/usr|g" {} \; || die
+}
+
+src_configure() {
+	sed -i \
+		-e '/USE_POGL/s/=>.*/=> 1,/' \
+		-e "/WITH_3D/s/=>.*/=> 1,/" \
+		-e "/HTML_DOCS/s/=>.*/=> $(use doc && echo 1 || echo 0),/" \
+		-e "/WITH_BADVAL/s/=>.*/=> $(use badval && echo 1|| echo 0),/" \
+		-e "/WITH_DEVEL_REPL/s/=>.*/=> $(use pdl2 && echo 1 || echo 0),/" \
+		-e "/WITH_GSL/s/=>.*/=> $(use gsl && echo 1 || echo 0),/" \
+		-e "/WITH_GD/s/=>.*/=> $(use gd && echo 1 || echo 0),/" \
+		-e "/WITH_HDF/s/=>.*/=> $(use hdf && echo 1 || echo 0),/" \
+		-e "/WITH_MINUIT/s/=>.*/=> $(use fortran && echo 1|| echo 0),/" \
+		-e "/WITH_PGPLOT/s/=>.*/=> $(use pgplot && echo 1 || echo 0),/" \
+		-e "/WITH_POSIX_THREADS/s/=>.*/=> $(use threads && echo 1 || echo 0),/" \
+		-e "/WITH_PROJ/s/=>.*/=> $(echo 0),/" \
+		-e "/WITH_SLATEC/s/=>.*/=> $(use fortran && echo 1|| echo 0),/" \
+		perldl.conf || die
+	perl-module_src_configure
+}
+
+src_test() {
+	MAKEOPTS+=" -j1" perl-module_src_test
+}
+
+src_install() {
+	perl-module_src_install
+	cp Doc/{scantree,mkhtmldoc}.pl "${D}"/${VENDOR_ARCH}/PDL/Doc || die
+}
+
+pkg_postinst() {
+	perl "${VENDOR_ARCH}/PDL/Doc/scantree.pl" || die
+	elog "Building perldl.db done. You can recreate this at any time"
+	elog "by running:"
+	elog "perl ${VENDOR_ARCH}/PDL/Doc/scantree.pl"
+}
+
+pkg_prerm() {
+	rm -rf "${EROOT}"/var/lib/pdl/html
+	rm -f  "${EROOT}"/var/lib/pdl/{pdldoc.db,Index.pod}
+}
diff --git a/dev-perl/PDL/files/PDL-2.54.0-fortran.patch b/dev-perl/PDL/files/PDL-2.54.0-fortran.patch
new file mode 100644
index 000000000000..883d4e4ade65
--- /dev/null
+++ b/dev-perl/PDL/files/PDL-2.54.0-fortran.patch
@@ -0,0 +1,24 @@
+diff -ruN PDL-2.054.orig/Libtmp/Minuit/Makefile.PL PDL-2.054/Libtmp/Minuit/Makefile.PL
+--- PDL-2.054.orig/Libtmp/Minuit/Makefile.PL	2021-06-13 15:28:36.000000000 +0200
++++ PDL-2.054/Libtmp/Minuit/Makefile.PL	2021-07-29 00:34:57.754727357 +0200
+@@ -139,7 +139,7 @@
+ 	    ("
+ 
+ minuitlib/$_\$(OBJ_EXT): minuitlib/$_.f 
+-	$mycompiler -c $hack_64bit -o minuitlib/$_\$(OBJ_EXT) $mycflags minuitlib/$_.f
++	\$(FC) \$(FFLAGS) -fPIC -c -o minuitlib/$_\$(OBJ_EXT) $mycflags minuitlib/$_.f
+ " )} @minuitfiles;
+ 
+ 	if (!defined($PDL::Config{MINUIT_LIB})){
+diff -ruN PDL-2.054.orig/Libtmp/Slatec/Makefile.PL PDL-2.054/Libtmp/Slatec/Makefile.PL
+--- PDL-2.054.orig/Libtmp/Slatec/Makefile.PL	2021-06-13 15:29:15.000000000 +0200
++++ PDL-2.054/Libtmp/Slatec/Makefile.PL	2021-07-29 00:34:57.754727357 +0200
+@@ -103,7 +103,7 @@
+ ("
+ 
+ slatec/$_\$(OBJ_EXT): slatec/$_.f 
+-	$mycompiler -c $hack_64bit -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f
++	\$(FC) \$(FFLAGS) -c -fPIC -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f
+ " )} @slatecfiles;
+  
+ };
diff --git a/dev-perl/PGPLOT/Manifest b/dev-perl/PGPLOT/Manifest
index beaa86dfc4f1..4ca265ca7a56 100644
--- a/dev-perl/PGPLOT/Manifest
+++ b/dev-perl/PGPLOT/Manifest
@@ -1,5 +1,7 @@
 AUX PGPLOT-2.21-no-dot-inc.patch 710 BLAKE2B 64c7f23572a36ece93b888b79137cff860dd9c99fa4a4083c76f0dddd3e8899b828bce52694f73a17e010540d2326b615867c7cc7d5597db0b2ccca79b8f3dad SHA512 d79a07d69df798ea2a9757fcaeeaa1a72eca3a9b4a9008cec9e1d9a55dde57f9e086b2edeb8b5b3ad6cd58a573d1f2b54e8f5c82ee9f586dea374be59c7260e9
 AUX PGPLOT-2.21-null-render.patch 902 BLAKE2B 02d829b8dbf63efc34fad217b79f999c37d2026adb63c4348b862b93c50d3caa9de5aed88749ad117c145b964b58c6b5a71051aaea1b8b7ff4abc10309d72eba SHA512 559942ddfd61af1d78fd4bab4a30f3d9e92a57bd050d9d416a7da223ae6e69035a8f0231f1cd89ccff058ed1bec17353e788211a21f93aa8ed0e1471f77089a6
 DIST PGPLOT-2.21.tar.gz 53431 BLAKE2B 00000dc16a6040540732aadcaa9dc6df051e7d8837f2aba1bbd60844da5053da4ae858a6be9868c5c66bf47458e5c5d25c6dc854c010117ec23dd3ba3df8d80f SHA512 fefabbbf6e0c742f2e049fcb2669ce13ae54f95ccb49403b7a10ed50c36e5793d5b976ae68eafc87ab320a7eadaecead5379bae2e898cff12f0f9ffe10f2337b
+DIST PGPLOT-2.27.tar.gz 56049 BLAKE2B 50ee1f75810def08a48f18585e7da833269f2c6c514a526859551eee9c44e67f02fc01204ef9573f58f20f9a270042d6c93aacd5dfcb6144dc4b8dbe3d0e5930 SHA512 8b45a8b399ee391c44c7fb32a8cd615b459457f20a334f7a09b9c7870de3d0331b443a4c48cad520236aaf964b5576f1b3aa2517a341011cc2db7c6459776649
 EBUILD PGPLOT-2.210.0-r1.ebuild 515 BLAKE2B 3422b75e724bbbdedd1329e84a0e3d49d4beed52d2ff28f9c958edb957a3437c72f0525be2388404b62b47ed97734d8e551d12a536bc8adf17188a91625fca1b SHA512 3ec5c2b6bb4b59958287671fabd3eb2c226623eac9769430131f14da7ac5e604442083b5124d24a5494f895469edacfa30c0dc6f7abfb633ed577cde9ddde994
+EBUILD PGPLOT-2.270.0.ebuild 468 BLAKE2B 467c1eb9e215b8baaf868e418dfa5e2d2429b5ec1e82d42fc83f877370027015e83e81b530cb8aa6feda5ce666fcba327b9cca4055d74b055ba23ba2de996df6 SHA512 d119a14a91889edebec9077b2ed19d1795d3d02544bb3218262e151eca7a9f7847ebc1c0e7fd91c072f24b574d5e4365907caece0663709e9a20b8241998ad74
 MISC metadata.xml 383 BLAKE2B 174c5417e6277c88423fe3ee1f3481f821d0610cc6c4825581a5711598ee4d41a3897c0bdec53db15b34ab8778d2201f0733b22bb4e45ed1893fcc82f4c04655 SHA512 460671b580b324b5bac3be34a4e05aa033af28a9c7a0015763c5bd34fd4a3798a7dfbc7a8267b76a83604446effe70df4298a3947de5c6277f8b7169be647ff9
diff --git a/dev-perl/PGPLOT/PGPLOT-2.270.0.ebuild b/dev-perl/PGPLOT/PGPLOT-2.270.0.ebuild
new file mode 100644
index 000000000000..848276737581
--- /dev/null
+++ b/dev-perl/PGPLOT/PGPLOT-2.270.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ETJ
+DIST_VERSION=2.27
+inherit perl-module
+
+DESCRIPTION="allow subroutines in the PGPLOT graphics library to be called from Perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	sci-libs/pgplot
+"
+DEPEND="${RDEPEND}
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Devel-CheckLib-1.140.0
+	>=dev-perl/ExtUtils-F77-1.130.0
+"
diff --git a/dev-perl/PHP-Serialization/Manifest b/dev-perl/PHP-Serialization/Manifest
index 75f1f21149a4..fe7bf47a9803 100644
--- a/dev-perl/PHP-Serialization/Manifest
+++ b/dev-perl/PHP-Serialization/Manifest
@@ -1,3 +1,3 @@
 DIST PHP-Serialization-0.34.tar.gz 7600 BLAKE2B 8531a1bdc66b8ba4d12f56707cea25322f4a07e518f0f03086da8a8a9b81e58ace323dc4fbe49c7ab20d2b61ccba43d77fe1fc059402c2ffbe02871368ca541c SHA512 72218973f21ab71419751cf818e6bd998235aa74bf8ae60ec4a6080ba169d0d7fcefde4f433ce3f6f30ed3084a651deb8aa3a5dd818fc6ebf3fb6188def4efe7
-EBUILD PHP-Serialization-0.340.0-r1.ebuild 330 BLAKE2B e2c7d9f43232980b50aeed944dddcf6636020fa77be8c8285c8484b3d63ec3d042462f4d02f4b1222c8f8305ef8853d83f0e0620936659132ef453e3328c3f79 SHA512 38a5ed78c8a6d662efce35eeb0e4e7fd9d397dd7636fbd83c54c277f6fb7ec6d06c958c4c5b3b3cbf50aff5ab185db2b64e88408610c9e84d71630fe63e017bb
+EBUILD PHP-Serialization-0.340.0-r2.ebuild 302 BLAKE2B 3b1f88a986867ed23821df93e394743d67da799bcaddc1ff914e93f4529bca11d4ad8af4790edba6c2b146fba4bcac257596a826fe946e10237d548425d789d7 SHA512 9494b27015f7765d6a9d93c99407cadc6d223bba7be3b5f7af448c035fa6b2ea3f397fde7ec35b82904253a4d7d9967f8020b6d4179149d27abd4dfe4505713e
 MISC metadata.xml 479 BLAKE2B d3b4d100e3bb7de439559abb29584ca28889776e2d23f6681fe0af78fbf6ab7e9e94b1170264164a993bc0172ad51c0dd3e5fdb4af61577cd4e205c65f167c7c SHA512 447c4f158902e12d5bc86cf7cd2d9358c6ef05d9472f05b26950d19610b2812ec4975602100e152e96a9be01bc916aaa727f46b38cdd2d330fa73d2b806358a5
diff --git a/dev-perl/PHP-Serialization/PHP-Serialization-0.340.0-r1.ebuild b/dev-perl/PHP-Serialization/PHP-Serialization-0.340.0-r1.ebuild
deleted file mode 100644
index d6da868355b1..000000000000
--- a/dev-perl/PHP-Serialization/PHP-Serialization-0.340.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=BOBTFISH
-MODULE_VERSION=0.34
-inherit perl-module
-
-DESCRIPTION="Convert PHP's serialize() into the equivalent Perl structure, and vice versa"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/PHP-Serialization/PHP-Serialization-0.340.0-r2.ebuild b/dev-perl/PHP-Serialization/PHP-Serialization-0.340.0-r2.ebuild
new file mode 100644
index 000000000000..62191f521d08
--- /dev/null
+++ b/dev-perl/PHP-Serialization/PHP-Serialization-0.340.0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=BOBTFISH
+DIST_VERSION=0.34
+inherit perl-module
+
+DESCRIPTION="Convert PHP's serialize() into the equivalent Perl structure, and vice versa"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/dev-perl/POE-API-Peek/Manifest b/dev-perl/POE-API-Peek/Manifest
index 60ccbf95e189..f1b485638a1a 100644
--- a/dev-perl/POE-API-Peek/Manifest
+++ b/dev-perl/POE-API-Peek/Manifest
@@ -1,3 +1,3 @@
 DIST POE-API-Peek-2.20.tar.gz 16107 BLAKE2B 70a20b4d019d3bdfd88bd83bd1a33e684266c08c4613e85d6fb5b375926c0d95132997e17801fdc933ddba14f1769325de1ed71f1d9c26d24e80b25371f6a02c SHA512 cd1f381d5838de80fa236bc538a1bd69a1ac809dec896a0c03ee7b6f73c7ba0c2da1641d4ba2f689aa730b9e2f538acac65f23e48cc1c534012b6b0e25fdac29
-EBUILD POE-API-Peek-2.200.0-r1.ebuild 420 BLAKE2B e0025b4af49532b63fd9b590c31d1a2cd17dbd3945d41ab7330977f298464f674c02d4fc9d57a67fa0725c78ff09695fe272e446e409eefa9c986d288c6d070a SHA512 da9790aee5e76a2cbfefdd2be1cd7bd72bb66802766afbf1ec2afd43812320d96b5672aadf222937619dad83cd847215e470dda98dfbda798f91734c127cf28e
+EBUILD POE-API-Peek-2.200.0-r2.ebuild 400 BLAKE2B d1712fdc1b2dda61e4181ec46da7f03d89fc5f1df1e39f7a0238331ba9585780a047eef0f506c7a8df95bc6116253ec244970b68b3e3e45d47dde3fdfe0d4bd7 SHA512 e374a424e8dbb820c64eb63256882f73aa8b3d07321ad61738c1b68b07331d018a102ffdf2a1d5086da9abac43f4e7bf5e25cfb2eaa7b470caf5e50d160db00d
 MISC metadata.xml 397 BLAKE2B 37c05ea2d1186c7f9d3982d33043e0881b607f4e2ff96979063738c81397bb315ad46849e0f5d093e80944d2175657cb46a5a774df2f6061ca2a697291450121 SHA512 951945ed0e3beeb178eff9ac665df6d4dfa7d0c2b6efdd452e0a5a5e387c3778d6357f9e594205003ce99906e16943f14878acff55fa2878a53f7cfde0180974
diff --git a/dev-perl/POE-API-Peek/POE-API-Peek-2.200.0-r1.ebuild b/dev-perl/POE-API-Peek/POE-API-Peek-2.200.0-r1.ebuild
deleted file mode 100644
index 9f02382ab738..000000000000
--- a/dev-perl/POE-API-Peek/POE-API-Peek-2.200.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=BINGOS
-MODULE_VERSION=2.20
-inherit perl-module
-
-DESCRIPTION="Peek into the internals of a running POE env"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/Devel-Size
-	>=dev-perl/POE-1.311.0"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.31"
-
-SRC_TEST=do
diff --git a/dev-perl/POE-API-Peek/POE-API-Peek-2.200.0-r2.ebuild b/dev-perl/POE-API-Peek/POE-API-Peek-2.200.0-r2.ebuild
new file mode 100644
index 000000000000..0896252fd30d
--- /dev/null
+++ b/dev-perl/POE-API-Peek/POE-API-Peek-2.200.0-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=BINGOS
+DIST_VERSION=2.20
+inherit perl-module
+
+DESCRIPTION="Peek into the internals of a running POE env"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Devel-Size
+	>=dev-perl/POE-1.311.0
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.310.0
+"
diff --git a/dev-perl/POE-Component-Client-DNS/Manifest b/dev-perl/POE-Component-Client-DNS/Manifest
index 20ba9138d8cb..802a0adb5c51 100644
--- a/dev-perl/POE-Component-Client-DNS/Manifest
+++ b/dev-perl/POE-Component-Client-DNS/Manifest
@@ -1,3 +1,3 @@
 DIST POE-Component-Client-DNS-1.054.tar.gz 28412 BLAKE2B 65d4858efdec5b195b4dbeba541e4150b8abef4fdb4d67d8d537a6c976e8849cf7ac72510016f052ac1d323641e6aef191d3fe65cdc3e1eef35ec0e898cec461 SHA512 8eb4f1412e84f9285d3b519dbbdb6a3536ed6c1f983d331241e6503a69ea16ee46bc4c62c23570f74a630d82382b87f2f1bdc1c7211eb803236ba2f9d52b1353
-EBUILD POE-Component-Client-DNS-1.54.0.ebuild 594 BLAKE2B bb246b240936445100ca878fe43bdc172f38fcd0506ea9ad21c749703340c2715fc5293b4f3ac27a51ae426a145ce03f39836fe7f95c4a5e3632526a2e125e60 SHA512 538c2057703d8898af786f2f9197c349b9e5c35f015e803bbdd11e85512f9f661002c650a6d24dd537cbea3f33a889c0d0aef0b29b3de95dfb49b057a1118fc7
+EBUILD POE-Component-Client-DNS-1.54.0-r1.ebuild 556 BLAKE2B 149f0d7136aebfbeddb3f3043ea354cf29d6a28f2a530e12d37d618a4449c602a39333531262890a7b8960fbc180c2701b1c017c2804372e75e81a1f48935623 SHA512 97a5881e2d662b05b1c4f249327e35f8cd48a459d26f03b19bb938568e45f08865421ab4f08eeb331b767378b19ecbaaa8d5c0b9a6a6ca8e6359e10f794459a1
 MISC metadata.xml 494 BLAKE2B e0f378d5b43f7e9b77ac3bb392c25aa1876fe2b80876ef49df68f37f594f96e421f17ad9b029fc9e8476c2472541b7c125d02b8c8dc2190ab5519ff139e7ab34 SHA512 716061bb73d1889ab27b6d84a2b1ccc7a0e057c5b9883366baf8bd4886120237e3f489d30f20e39edfc28c5144a3489a6de2accc1f92373b838031646eecf2f4
diff --git a/dev-perl/POE-Component-Client-DNS/POE-Component-Client-DNS-1.54.0-r1.ebuild b/dev-perl/POE-Component-Client-DNS/POE-Component-Client-DNS-1.54.0-r1.ebuild
new file mode 100644
index 000000000000..e5f0b78ec41f
--- /dev/null
+++ b/dev-perl/POE-Component-Client-DNS/POE-Component-Client-DNS-1.54.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DIST_AUTHOR=RCAPUTO
+DIST_VERSION=1.054
+inherit perl-module
+
+DESCRIPTION="Non-blocking, parallel DNS client"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Net-DNS-0.650.0
+	>=dev-perl/POE-1.294.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.960.0
+		>=dev-perl/Test-NoWarnings-1.20.0
+	)
+"
+
+src_test() {
+	perl_rm_files t/author-pod-coverage.t t/author-pod-syntax.t
+	perl-module_src_test
+}
diff --git a/dev-perl/POE-Component-Client-DNS/POE-Component-Client-DNS-1.54.0.ebuild b/dev-perl/POE-Component-Client-DNS/POE-Component-Client-DNS-1.54.0.ebuild
deleted file mode 100644
index 7749dc0e9b66..000000000000
--- a/dev-perl/POE-Component-Client-DNS/POE-Component-Client-DNS-1.54.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=RCAPUTO
-DIST_VERSION=1.054
-inherit perl-module
-
-DESCRIPTION="Non-blocking, parallel DNS client"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Net-DNS-0.650.0
-	>=dev-perl/POE-1.294.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.960.0
-		>=dev-perl/Test-NoWarnings-1.20.0
-	)
-"
-
-src_test() {
-	perl_rm_files t/author-pod-coverage.t t/author-pod-syntax.t
-	perl-module_src_test
-}
diff --git a/dev-perl/POE-Component-Client-Keepalive/Manifest b/dev-perl/POE-Component-Client-Keepalive/Manifest
index 2c6aafbff7a3..5d86daf90d4b 100644
--- a/dev-perl/POE-Component-Client-Keepalive/Manifest
+++ b/dev-perl/POE-Component-Client-Keepalive/Manifest
@@ -1,3 +1,3 @@
 DIST POE-Component-Client-Keepalive-0.272.tar.gz 41860 BLAKE2B 6080469192c9f0f62acf173f120092d3a4ffd07461f00ac83e7437b5d0c41922d3f20200ecd2899a8d965bd893692e2ea5e4a4ade0b2c1c6cf8acb5e37f24959 SHA512 c89a607d3801361e2459ec6dbbfa0dbca4e50b4d34c334ddbfedc4945f2cadc3bac6f5a76182f9668a7e9f5f3bbd672045ab27939ba47c1559d85415bd25ebc8
-EBUILD POE-Component-Client-Keepalive-0.272.0.ebuild 462 BLAKE2B 1a5a76e5c246f447e374f320082abcd51c63f43cad81d1b9ec1d6ad5bdd91b28e3048f189713d0a204dfd8428b06382828556b172214b350fd6a614c5b66ecf9 SHA512 3328019d77b4ddbc956afb97499b4db13386008c3b5fdbff92c724042d6814f7b0f291023fa845143fc62f8f5f7282cff404878ca37a920ca04a6bc656448326
+EBUILD POE-Component-Client-Keepalive-0.272.0-r1.ebuild 434 BLAKE2B 21396e1274a94f8a81d78dacae86b973982be3e45d5835a32416ef9bc51947d7cc998ce478c099ac6f1a052ad25612e6bb9530f5d55fb8bb8a567651d62736d6 SHA512 caaabbe82e3260898f4cb3786ff4fcd7f18d2b36ca58f4f4e5bb855ce31cd239ab6fe99dfba3d0a3701e10fb63ea137978868a4db2681d8b16a0a11c21f30959
 MISC metadata.xml 671 BLAKE2B 7b631ede5df4b942a4dc20730618a5758418e4af927827a6dc391cf6ab0e7d55725edce98a584e86e27f043f9e521ff80680e73ccebd9313a975f0359da5d389 SHA512 201999fa48d9d7d9f6bdb0329bb649c42f56ec10412787fdfe4e7c9aec9e8fa4ba7a41c2e34318bf2fd92eb196c2d9aefe489ff3cfa53f9fb3bb4bd1ed51d8eb
diff --git a/dev-perl/POE-Component-Client-Keepalive/POE-Component-Client-Keepalive-0.272.0-r1.ebuild b/dev-perl/POE-Component-Client-Keepalive/POE-Component-Client-Keepalive-0.272.0-r1.ebuild
new file mode 100644
index 000000000000..13cb8a371ed2
--- /dev/null
+++ b/dev-perl/POE-Component-Client-Keepalive/POE-Component-Client-Keepalive-0.272.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RCAPUTO
+DIST_VERSION=0.272
+inherit perl-module
+
+DESCRIPTION='Manage connections, with keep-alive'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Net-IP-Minimal-0.20.0
+	>=dev-perl/POE-1.311.0
+	>=dev-perl/POE-Component-Resolver-0.917.0
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+"
diff --git a/dev-perl/POE-Component-Client-Keepalive/POE-Component-Client-Keepalive-0.272.0.ebuild b/dev-perl/POE-Component-Client-Keepalive/POE-Component-Client-Keepalive-0.272.0.ebuild
deleted file mode 100644
index b4de77b4a213..000000000000
--- a/dev-perl/POE-Component-Client-Keepalive/POE-Component-Client-Keepalive-0.272.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MODULE_AUTHOR=RCAPUTO
-MODULE_VERSION=0.272
-inherit perl-module
-
-DESCRIPTION='Manage connections, with keep-alive'
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/Net-IP-Minimal-0.20.0
-	>=dev-perl/POE-1.311.0
-	>=dev-perl/POE-Component-Resolver-0.917.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/POE-Component-IKC/Manifest b/dev-perl/POE-Component-IKC/Manifest
index f45f8c482f9b..b52d0e1b778e 100644
--- a/dev-perl/POE-Component-IKC/Manifest
+++ b/dev-perl/POE-Component-IKC/Manifest
@@ -1,3 +1,3 @@
 DIST POE-Component-IKC-0.2402.tar.gz 76246 BLAKE2B 7514a0696277c012ac564805cf1bb89248f68e4415afd571984d2d249ac21b8d539ba4639e8a0eba9fb6dd327a567e8e7bb98e4da2337c39033c7f4a79d0c99d SHA512 4d335d91773eca62037036023a56b5b1de2d84a2d22121669457fa79981e6ee844bab657a174bab1ca7912ba50273f6bda98303eee17ff3a39ca98500b877cc0
-EBUILD POE-Component-IKC-0.240.200.ebuild 807 BLAKE2B 8ee20e2307357124962d1c3ad5e85ab809faf9af24f15ef54791f33e610cb512e51c240851833a930308b75f9eb26e10f88237ec62c89880731b7821de748ae7 SHA512 462dd54eadf3386612252c0fa377f7aa275b5536b5200310d4277ac59d3daf9b62abbd62227593ee88473a731d0c684439e5b0ac56fe3415a5d096cd5f524bdd
+EBUILD POE-Component-IKC-0.240.200-r1.ebuild 659 BLAKE2B 7cea6ffe60d332583215643d65dbd108005bb6297b730101f9d361a0ff33dc3210483961b8b137ea0490dc0228211759803f45ee22057a4f34b3e70a28c2e39f SHA512 8d64874559fe422c540dcaff41a884a87a4f0f54bfeb73452f169f692597639acd2bc7dac9394814160f43bc1ebb86d7274d3fda3d265bfb2949c895a28504d2
 MISC metadata.xml 1311 BLAKE2B b214682a75a731b8b292b9aac60ab43ecfc74ba05a7ffeac8a6ba53dcc06e1c75dc48814edadcb235eac633ecff06b6f9fec725660a10a38dedc07cda63fb380 SHA512 d65a1efd7cf691763ebae5ce2378bad02d2dc3f3bd8b2da2ca1081bce1bce856d137edbe99d50d14586c0d621fc92b421b5325022b3790a0b2cdfdbe3808cbc3
diff --git a/dev-perl/POE-Component-IKC/POE-Component-IKC-0.240.200-r1.ebuild b/dev-perl/POE-Component-IKC/POE-Component-IKC-0.240.200-r1.ebuild
new file mode 100644
index 000000000000..6f50bb38fe47
--- /dev/null
+++ b/dev-perl/POE-Component-IKC/POE-Component-IKC-0.240.200-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=GWYN
+DIST_VERSION=0.2402
+DIST_EXAMPLES=( "eg/*" )
+inherit perl-module
+
+DESCRIPTION="Inter-Kernel Communication for POE"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-perl/Data-Dump-1.0.0
+	>=dev-perl/Devel-Size-0.770.0
+	>=dev-perl/POE-1.311.0
+	>=virtual/perl-Scalar-List-Utils-1.0.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (	>=virtual/perl-Test-Simple-0.600.0 )
+"
+
+PERL_RM_FILES=( t/01_pod.t t/02_pod_coverage.t )
+
+src_install() {
+	perl-module_src_install
+	dodoc FUTUR ikc-architecture.txt
+}
diff --git a/dev-perl/POE-Component-IKC/POE-Component-IKC-0.240.200.ebuild b/dev-perl/POE-Component-IKC/POE-Component-IKC-0.240.200.ebuild
deleted file mode 100644
index 64c3743451cf..000000000000
--- a/dev-perl/POE-Component-IKC/POE-Component-IKC-0.240.200.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=GWYN
-DIST_VERSION=0.2402
-inherit perl-module
-
-DESCRIPTION="Inter-Kernel Communication for POE"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test examples"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Data-Dump-1.0.0
-	>=dev-perl/Devel-Size-0.770.0
-	>=dev-perl/POE-1.311.0
-	>=virtual/perl-Scalar-List-Utils-1.0.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (	>=virtual/perl-Test-Simple-0.600.0 )
-"
-
-src_test() {
-	perl_rm_files t/01_pod.t t/02_pod_coverage.t
-	perl-module_src_test
-}
-
-src_install() {
-	perl-module_src_install
-	dodoc FUTUR ikc-architecture.txt
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		docinto examples
-		dodoc -r eg/*
-	fi
-}
diff --git a/dev-perl/POE-Component-PreforkDispatch/Manifest b/dev-perl/POE-Component-PreforkDispatch/Manifest
index 90f9f6fe5b5b..59a128bbf453 100644
--- a/dev-perl/POE-Component-PreforkDispatch/Manifest
+++ b/dev-perl/POE-Component-PreforkDispatch/Manifest
@@ -1,3 +1,3 @@
 DIST POE-Component-PreforkDispatch-0.101.tar.gz 18509 BLAKE2B 59efa8cf5e9bd0786699ee7e261fc014a7f08a39c5afdc2905e8d2288885c76540164acbf5bc9d374db80cf3a233725f037d3037d8aaa3445c3f02ae362ad0cb SHA512 0616338c762298ebd0dcefbc4486b0f9bc74f7de94a523596f4ae7c1fb181e44f4d01782f01baf856f0e760733c58f53a1367618441e5999327d9c53ead90559
-EBUILD POE-Component-PreforkDispatch-0.101.0-r2.ebuild 388 BLAKE2B 9b83da4bc84189907741d2c6f027b6129d67efe8e4b6980dd99eff384798a2514f4a4b1d79ffc37333edf9f38943c7787a6d6958c2bfe6912eb31d17354134a6 SHA512 6d124a21291da3d0262650236fb81fb946c34e09c67fbae74d07b6eaf875a198484baf41070a32b4d8a233e56bd9a7156e90cff55bc6f4612e041b7da104ffed
+EBUILD POE-Component-PreforkDispatch-0.101.0-r3.ebuild 382 BLAKE2B 6da714958001912f248ba81fc8b5df58310367d9882947fbb41d9df341bbc0f75ebe3cc980e5b97758734098f7e8a9b9b57e458b23ac4f3e5bc9149b99753435 SHA512 c186dfd21babca90f19600d572711424f3f101f9c1e8d22297aba2c9fbf75af6d1acdca254bc68ea5f63e465c3bce22f0879980861188c5ae49bb8b99516e0f2
 MISC metadata.xml 431 BLAKE2B 41368a0dc3aa241c6495b9b0e00ba781c8724969a68fca6a8a8f1e66227a6a7c7c47a06f50dee3f3795fa4b1148f427d187b5a5da70dbaf412df9cd9ec69b83f SHA512 8868f3078b34c2bcd5e453ad35418ceb759a35fa17c8abbc6cc0888c0c482706f594a56aca76bc814e66ab16123080321115117c79b7671aa823439365482463
diff --git a/dev-perl/POE-Component-PreforkDispatch/POE-Component-PreforkDispatch-0.101.0-r2.ebuild b/dev-perl/POE-Component-PreforkDispatch/POE-Component-PreforkDispatch-0.101.0-r2.ebuild
deleted file mode 100644
index d55298f51799..000000000000
--- a/dev-perl/POE-Component-PreforkDispatch/POE-Component-PreforkDispatch-0.101.0-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=EWATERS
-DIST_VERSION=0.101
-inherit perl-module
-
-DESCRIPTION="Preforking task dispatcher"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/Error
-	dev-perl/IO-Capture
-	dev-perl/Params-Validate
-	dev-perl/POE"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build"
diff --git a/dev-perl/POE-Component-PreforkDispatch/POE-Component-PreforkDispatch-0.101.0-r3.ebuild b/dev-perl/POE-Component-PreforkDispatch/POE-Component-PreforkDispatch-0.101.0-r3.ebuild
new file mode 100644
index 000000000000..a6835a1b24c4
--- /dev/null
+++ b/dev-perl/POE-Component-PreforkDispatch/POE-Component-PreforkDispatch-0.101.0-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=EWATERS
+DIST_VERSION=0.101
+inherit perl-module
+
+DESCRIPTION="Preforking task dispatcher"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Error
+	dev-perl/IO-Capture
+	dev-perl/Params-Validate
+	dev-perl/POE
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+"
diff --git a/dev-perl/POE-Component-Resolver/Manifest b/dev-perl/POE-Component-Resolver/Manifest
index 23802ddb168c..835c0917e2a8 100644
--- a/dev-perl/POE-Component-Resolver/Manifest
+++ b/dev-perl/POE-Component-Resolver/Manifest
@@ -1,3 +1,3 @@
 DIST POE-Component-Resolver-0.921.tar.gz 28497 BLAKE2B 2af833abd3402f527a1f825c4871660e69345ffa7fd0330b951b1174a5ca010c40eff9568420d863970c74bd39e9b5d0403ee4d09978a40ab7dc98c1a74dc6ac SHA512 dcb8d43489282fa8e05db61292d7b1a884099325da9ec77c0826fa7b4f65a7f10224b13c72ddc6a89f4900cf29a67408995c40b06c8d7c6f8a7272f30a0533c2
-EBUILD POE-Component-Resolver-0.921.0.ebuild 561 BLAKE2B fecf9c54b79649ba3d94d7b05f1436a99a55762c3741dde43d0ce3387b0cb331ce43aaa4f51428f3fdca1bc9e8857b9002af8e038646c6130ca2dd0b4ebbb609 SHA512 f57139db6456c4b3a20507bbf80c24587b8b398cb1a8bd984e595ed02992d760f2fccbb7db06db8f361fd61c6fa49d57ed65da8f3c9d2a0d1dc557826fd3bda2
+EBUILD POE-Component-Resolver-0.921.0-r1.ebuild 533 BLAKE2B 738eba3011d5fcd0c4e4ec199443626c604c4293ba7947779acd44e9f597cb246ec08e8d0f4fc023b6de4355b5e2395767a0f1ced045e68cb30d483220bfc947 SHA512 cb8eee60c544c4f4a5e471b123516b4992ab057e7d5d6b416f1d2cda511a13d3768c2755a27b0751d404258a6fa820e9d7fe35410e42408a1457e8d9c0fc8b20
 MISC metadata.xml 581 BLAKE2B 9fb7d4897a45f7e620b7573f2d843456fc9cc477d2d4c16f83ff1f1f9960a7f3f49532e55b9602ed0ae3b0a320da9b7e1ba6301f7e899a66955089d3f6ea1a99 SHA512 097991792ea9f9f939b0d8f20f934eef258db0995adc59c2d06d338e441f9f8b775648cb6d2340a24c408901b8c6fae859c367a3f3e65801b1e7615023ecc04c
diff --git a/dev-perl/POE-Component-Resolver/POE-Component-Resolver-0.921.0-r1.ebuild b/dev-perl/POE-Component-Resolver/POE-Component-Resolver-0.921.0-r1.ebuild
new file mode 100644
index 000000000000..b02fac1ac7f7
--- /dev/null
+++ b/dev-perl/POE-Component-Resolver/POE-Component-Resolver-0.921.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RCAPUTO
+DIST_VERSION=0.921
+inherit perl-module
+
+DESCRIPTION='A non-blocking getaddrinfo() resolver'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/POE-1.311.0
+	>=virtual/perl-Scalar-List-Utils-1.230.0
+	>=virtual/perl-Socket-2.1.0
+	>=virtual/perl-Storable-2.180.0
+	>=virtual/perl-Test-Simple-0.96
+	>=virtual/perl-Time-HiRes-1.971.100
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+"
diff --git a/dev-perl/POE-Component-Resolver/POE-Component-Resolver-0.921.0.ebuild b/dev-perl/POE-Component-Resolver/POE-Component-Resolver-0.921.0.ebuild
deleted file mode 100644
index 8ec174aaf01c..000000000000
--- a/dev-perl/POE-Component-Resolver/POE-Component-Resolver-0.921.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MODULE_AUTHOR=RCAPUTO
-MODULE_VERSION=0.921
-inherit perl-module
-
-DESCRIPTION='A non-blocking getaddrinfo() resolver'
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/POE-1.311.0
-	>=virtual/perl-Scalar-List-Utils-1.230.0
-	>=virtual/perl-Socket-2.1.0
-	>=virtual/perl-Storable-2.180.0
-	>=virtual/perl-Test-Simple-0.96
-	>=virtual/perl-Time-HiRes-1.971.100
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/POE-Test-Loops/Manifest b/dev-perl/POE-Test-Loops/Manifest
index e67545ca3000..5f1e5f13442d 100644
--- a/dev-perl/POE-Test-Loops/Manifest
+++ b/dev-perl/POE-Test-Loops/Manifest
@@ -1,3 +1,3 @@
 DIST POE-Test-Loops-1.360.tar.gz 72063 BLAKE2B c1d538f3dfabd5630fcbf5378769a55fb81e2c3eb4b2835c6b5de6ad755aac93b12dad7e5f8569822bf5f86027c1aa18f0c4d9a3e1ab3f9312096643f265d461 SHA512 713eb8a7ba304f6aaadbfb7a03c84961e623b87010124aa096d1044fd9922966a02482d7f12095a44bc6933147dad971007743ca9fe05070aa50bc79a398edb6
-EBUILD POE-Test-Loops-1.360.0.ebuild 289 BLAKE2B c38234ecb7e77f05fdf4a04b595a526d822ee4d3a9c83be02b667385324133eecb7bc3aefd4bbc434f14275fbbb3bc13c21a7a926f1860a20882676675fbe9ce SHA512 52057b3cdd28afc1ac7f950bb1f4c4f2a202064465489d928a3449dd7b84bd9ffa0a9daeb815922a16a8ed7a62a54d28f08d7539d88dc79a584f869172cf7a65
+EBUILD POE-Test-Loops-1.360.0-r1.ebuild 259 BLAKE2B cecab1c9e13f0acc3fcea35bbff038ed0cc7ed9bd21e60777cc1f3237c748cc4f470e10d862ba9f6989e55bcd7e542676064568a0f79c28e6fdfd42a631d8eff SHA512 f2eeaf72de4a4a6bd2aad16a8c9eceb2c89933aafc92646a2603b8c1f0e21912e7fb0c03069594ab522a52e5c8c7388c7c13fb608720ae99807350cf4516a0d4
 MISC metadata.xml 1343 BLAKE2B 66d4a17a9b818a8662250c2e4634b7facb705a49a8ccc85b248748fe180dd0dbf92a259830d66105cd1fab7111f793b883a9f8c3afe8d365a60971c2bbf1ad53 SHA512 c5b5221b88a1190318d23c48701cddd1756e8c0fe2dd78cb4612756f1bf2f50e94faa3bcfd5e1d6c5db0c0605f904f9b3790035c2e5a4270e1793cfa868c7eb5
diff --git a/dev-perl/POE-Test-Loops/POE-Test-Loops-1.360.0-r1.ebuild b/dev-perl/POE-Test-Loops/POE-Test-Loops-1.360.0-r1.ebuild
new file mode 100644
index 000000000000..f1e417af181a
--- /dev/null
+++ b/dev-perl/POE-Test-Loops/POE-Test-Loops-1.360.0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RCAPUTO
+DIST_VERSION=1.360
+inherit perl-module
+
+DESCRIPTION="Reusable tests for POE::Loop authors"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
diff --git a/dev-perl/POE-Test-Loops/POE-Test-Loops-1.360.0.ebuild b/dev-perl/POE-Test-Loops/POE-Test-Loops-1.360.0.ebuild
deleted file mode 100644
index 6d6580d3482f..000000000000
--- a/dev-perl/POE-Test-Loops/POE-Test-Loops-1.360.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RCAPUTO
-MODULE_VERSION=1.360
-inherit perl-module
-
-DESCRIPTION="Reusable tests for POE::Loop authors"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/POE-XS-Loop-EPoll/Manifest b/dev-perl/POE-XS-Loop-EPoll/Manifest
index c66951ff32bc..021ca24cccf7 100644
--- a/dev-perl/POE-XS-Loop-EPoll/Manifest
+++ b/dev-perl/POE-XS-Loop-EPoll/Manifest
@@ -1,3 +1,3 @@
 DIST POE-XS-Loop-EPoll-1.003.tar.gz 19068 BLAKE2B 89c9d653a10ef9ab4034b9a058c5e793ecf497f4632fbcda6f20ce7a0af86929f62657fe54a878e8f674ff8959d7e5105e33b06b34efacf6026a2242b0a704f2 SHA512 43329cd0e6a72dc1a8552fd2f54b86e728ecba43f0143f77a848c4ce5e13e71a08ad611fff33a7f19f6266fd84c004e815c777610209f9ce17ff4457d411298f
-EBUILD POE-XS-Loop-EPoll-1.3.0.ebuild 388 BLAKE2B f1adb11b95dbbc1e653d73723b69d54be9648751f1ec2bedc9aed5459104514d7e41b3603b34f825cd191c460ee729d474e3978bae637ac75261c2bdf9062b50 SHA512 d6a429f552ff0d4ec3f0f593112f9c0bd977b95885da11df7c14e05f50415ad9aae882216e503667fa609ccb378d7f5c2e7b4ea39c79ae223005ebaef1810c30
+EBUILD POE-XS-Loop-EPoll-1.3.0-r1.ebuild 367 BLAKE2B 230ed0b38967d7907fc92b49942a9046fe8cb58ca4d1c7afc6e5405908e36ee6b29b04f8eb428c3e271e26b2e56f68c1725dc42ede5ab0f9e44d3249b4292c0b SHA512 e257ab25075514b4f510ad3ade2e4b205841e56c764a0401f37490fb1fe1d9480a96e3beee7ae86ca0c919e42010cabf735e0c2b8e81ec6279b5ed52cb9b6efa
 MISC metadata.xml 408 BLAKE2B ada7efa4ef64b228cbe5b44985cc251fd147a2cd5aad28ca34f362a18155e51b5cb12dbad8f4ec767650f909d7fe4b17c5eb3ab1087462c62ee3e8bd8c3b17f8 SHA512 d1d398a611d317f3574a83281c46f00bd4ea298547eb460db40d9bcc749390c666518dc98778a07533914a4d7deb3d7910a8a1adaf018ccf716d6d65fb31beec
diff --git a/dev-perl/POE-XS-Loop-EPoll/POE-XS-Loop-EPoll-1.3.0-r1.ebuild b/dev-perl/POE-XS-Loop-EPoll/POE-XS-Loop-EPoll-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..d5cb70ab0cf7
--- /dev/null
+++ b/dev-perl/POE-XS-Loop-EPoll/POE-XS-Loop-EPoll-1.3.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TONYC
+DIST_VERSION=1.003
+inherit perl-module
+
+DESCRIPTION="An XS implementation of POE::Loop, using Linux epoll(2)"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/POE-1.287.0
+	>=dev-perl/POE-Test-Loops-1.33.0
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/POE-XS-Loop-EPoll/POE-XS-Loop-EPoll-1.3.0.ebuild b/dev-perl/POE-XS-Loop-EPoll/POE-XS-Loop-EPoll-1.3.0.ebuild
deleted file mode 100644
index a678d9fba2bd..000000000000
--- a/dev-perl/POE-XS-Loop-EPoll/POE-XS-Loop-EPoll-1.3.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=TONYC
-MODULE_VERSION=1.003
-inherit perl-module
-
-DESCRIPTION="An XS implementation of POE::Loop, using Linux epoll(2)"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-perl/POE-1.287
-	>=dev-perl/POE-Test-Loops-1.033"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/POE-XS-Loop-Poll/Manifest b/dev-perl/POE-XS-Loop-Poll/Manifest
index 7e76b527907d..c880e723ae2f 100644
--- a/dev-perl/POE-XS-Loop-Poll/Manifest
+++ b/dev-perl/POE-XS-Loop-Poll/Manifest
@@ -1,3 +1,3 @@
 DIST POE-XS-Loop-Poll-1.000.tar.gz 11952 BLAKE2B b87f79a89b0d5e5484e1f8b9cb541446accc47e6a63d2c98b4509151c2feab8ca111625378244173b2793c621187f999191c3286fea710447c57f411c4da73a2 SHA512 53793a68c07c09c58fe27ec7df3fb19e194781016f95c7b2fff95e7de13375161bc5d7ed79d4eb38870ac84617ddcb23354fdff92295ebf33e52e0d8603ecf14
-EBUILD POE-XS-Loop-Poll-1.0.0-r1.ebuild 381 BLAKE2B 38d745a3afc43d87a817b92c5a88d5fd1a80d589e1d944d44001d4b8dc61ce653780c920bba604524a1295bceb49e2f0c9c5164a84ce2dac7fbb0b5a5de29e7f SHA512 c9f67e929523938ad76a7d3f9c860725a3147890b2cc7ba24c6abbc3d604aed4d8eb42e7c593d1030f48b7f323d0f745db92c559647b8952017ceeb2bf362a50
+EBUILD POE-XS-Loop-Poll-1.0.0-r2.ebuild 360 BLAKE2B ce55885434370835c14c7f03a1ed8bb92e07cc67a7a58d2055d8cae46f134976649856e54f914b02eccbfa1134d6bf7165f1a99bdb06f5e04b9d93e9ecf777ff SHA512 09677a9a8ec0ec97f05d8c5eb08d31efe091d4363e12c4906a55fd84dc654584b3ae42ced7d1f167c86e388ec81c7b1968581b3c307f13b2b7b79c8b7408698e
 MISC metadata.xml 406 BLAKE2B b407601a357f216280fe77f38b466fde43f6dd83f4f5b4c6ed42282e5c3fa257a35f229f2c53f0e4129ba1dc98973a3a4c7bd937ac9bbd793e90b339184a7cc9 SHA512 f81fbc59c66e42d24300b81877ce272a5d9b8ca26100dd164ba99c51a836bb60fe91794d56dbb987c7f60a650aec6ff3d613406f93a351b238b673ae0acdec46
diff --git a/dev-perl/POE-XS-Loop-Poll/POE-XS-Loop-Poll-1.0.0-r1.ebuild b/dev-perl/POE-XS-Loop-Poll/POE-XS-Loop-Poll-1.0.0-r1.ebuild
deleted file mode 100644
index 010c799537fc..000000000000
--- a/dev-perl/POE-XS-Loop-Poll/POE-XS-Loop-Poll-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=TONYC
-MODULE_VERSION=1.000
-inherit perl-module
-
-DESCRIPTION="An XS implementation of POE::Loop, using poll(2)"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-perl/POE-1.287
-	>=dev-perl/POE-Test-Loops-1.033"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/POE-XS-Loop-Poll/POE-XS-Loop-Poll-1.0.0-r2.ebuild b/dev-perl/POE-XS-Loop-Poll/POE-XS-Loop-Poll-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..0e9bbbdaaca7
--- /dev/null
+++ b/dev-perl/POE-XS-Loop-Poll/POE-XS-Loop-Poll-1.0.0-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TONYC
+DIST_VERSION=1.000
+inherit perl-module
+
+DESCRIPTION="An XS implementation of POE::Loop, using poll(2)"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/POE-1.287.0
+	>=dev-perl/POE-Test-Loops-1.33.0
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/POE-XS-Queue-Array/Manifest b/dev-perl/POE-XS-Queue-Array/Manifest
index 9323cb8da486..060044864d10 100644
--- a/dev-perl/POE-XS-Queue-Array/Manifest
+++ b/dev-perl/POE-XS-Queue-Array/Manifest
@@ -1,3 +1,3 @@
 DIST POE-XS-Queue-Array-0.006.tar.gz 17081 BLAKE2B be579286f9e37f8740d3ebbab5f4b0dd8e949266de3b34b1f59d2aec1b778f9f5feb48f9ae0978465540c7b80f9d487b46872b74354de93d9ab76f5499eb071d SHA512 500b293fc11d58beda498f91c31bcea2cb89758ffa08f548354d2ba77e06f307ebbef49aec3e34ccfbd295a2c72b1921a9d6f5ed41e88208df4b66dcb3e71c79
-EBUILD POE-XS-Queue-Array-0.6.0-r1.ebuild 333 BLAKE2B ae71ca20665da4285b470ae0b6dbfa299c370d04cb1a451b6c0c1bde998a99ba5a9eade71e8852da6116dc29a0a6c38d7d570f475f87cc3ab90263bd8b4fb6c0 SHA512 1f2fa0314f38a0bae327fc4d23040f215bd99f68f6212011cf6c041241556c0c515a7869284cea52e98a5f90d205db41ca65101aab8ff80c1b2bab928a679f10
+EBUILD POE-XS-Queue-Array-0.6.0-r2.ebuild 309 BLAKE2B c205409d285ebd945374f307a5040e875e2f150b9b23b70ae8f5884a60fd5247e71dd2999c9440d60153b2b5523643e8a1c3225d60a2a3c64f7704d1e4ae24f7 SHA512 96b70f3917c987aed40fb1340dea88a99ba5a03fc09d1a9b6657aadb70eb118b80c578ba5c0b27c020854a9241601209b446be7d9989d968718f2784cf5470f8
 MISC metadata.xml 410 BLAKE2B 7843d989b761e4b8e886c50c059db7be1d3e793a7517f8bdf01e01fb97ce458253ea13519512282f624f5f702978c61eed25d3125590092b5a50275b6e5a8e01 SHA512 fe48014655278428db9e521009db7b1c49f3fbfe9e23f2e26d9f0e916efb106d72d1c94ce8bc294684102ea686b6ad04c969e5973aed191f877bfb7877c9abc6
diff --git a/dev-perl/POE-XS-Queue-Array/POE-XS-Queue-Array-0.6.0-r1.ebuild b/dev-perl/POE-XS-Queue-Array/POE-XS-Queue-Array-0.6.0-r1.ebuild
deleted file mode 100644
index 0fd1f1326435..000000000000
--- a/dev-perl/POE-XS-Queue-Array/POE-XS-Queue-Array-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=TONYC
-MODULE_VERSION=0.006
-inherit perl-module
-
-DESCRIPTION="An XS implementation of POE::Queue::Array"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-perl/POE"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/POE-XS-Queue-Array/POE-XS-Queue-Array-0.6.0-r2.ebuild b/dev-perl/POE-XS-Queue-Array/POE-XS-Queue-Array-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..feb4821c2c90
--- /dev/null
+++ b/dev-perl/POE-XS-Queue-Array/POE-XS-Queue-Array-0.6.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TONYC
+DIST_VERSION=0.006
+inherit perl-module
+
+DESCRIPTION="An XS implementation of POE::Queue::Array"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/POE
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/POSIX-strftime-Compiler/Manifest b/dev-perl/POSIX-strftime-Compiler/Manifest
index 916afac9ea35..72ed74187842 100644
--- a/dev-perl/POSIX-strftime-Compiler/Manifest
+++ b/dev-perl/POSIX-strftime-Compiler/Manifest
@@ -1,3 +1,5 @@
 DIST POSIX-strftime-Compiler-0.42.tar.gz 17294 BLAKE2B 3c96c8226b4dd06f449a2a6e56785862e98014e8fb8371709fcc6872ec115cff58fc6aa8c98dd5032488917478448b2137749aa3621d7b446a08c923e99de81e SHA512 0c07f1b8589b067533c65a023dd634a29640cb8992aae8047aa1063affe6b30b95930479829982a30a13b87bc7c9ebf82ca4837726bd29658d85d718164e3c76
+DIST POSIX-strftime-Compiler-0.44.tar.gz 17027 BLAKE2B c550c3074def4def71d4c3b22d13464f87080b0e53333f8dae5a7e30df68d1c40bae78021ab83d1324bb8f28a12ae487aa5f220df3bdd413b9d5d62edd02f450 SHA512 34852966a46f55a65e4ee90af3aec6478456d3a7fc8f8b8e8fc4e704a8361f46abfad5fe0f356eb3432fb2e232e65004818b19f298293cc0172d576cfe34c3e1
 EBUILD POSIX-strftime-Compiler-0.420.0.ebuild 678 BLAKE2B bd2756fd5354791feaf65210a3d03ba09607d603f79cbbbaf93b6ee81e0692699be5b5462e7b20fd6e430e5f52bead86155ea22e14a852915fde2e79f8f5f0bb SHA512 61f41175308832084a6f3d7a17b2c041127843eff1f85e804d1874e2c5f6bb9308237e5b477f88db35ed92db9e47351a2374b0c564dfbdc0f360efc9899b152b
+EBUILD POSIX-strftime-Compiler-0.440.0.ebuild 598 BLAKE2B 26b135e7a1efe9c389411bc1eee1230557e2353feacd4b3e3bff9cd1fe661ad36920cd6be917d38e14cbde94b608a269e99d26a7aa958764cbb6458872a8ab5d SHA512 a47afb45ec447afe673f330c5afd4ea179bc542ac068e15b847e09a160bce85e4cd6311ad973401a7cd240f7f82e1960a649e8726d9a9f206a14b494999b429d
 MISC metadata.xml 419 BLAKE2B bb34ee0557b31bbf216b81d98085d7a30f110bf98176dc21eeba20e0d4fd8e4405ce4e6161bb390afa84d51545f73117623fba09f4ad5575d40807ae5de71f7a SHA512 72e34096d5c2304242723e727a974d2379cbdc482b51af2a417c8ab1ecd07bcad640461f70f94a011f3e05a5f7368a37b853c9eb8deb9a094120b87e09d2ba90
diff --git a/dev-perl/POSIX-strftime-Compiler/POSIX-strftime-Compiler-0.440.0.ebuild b/dev-perl/POSIX-strftime-Compiler/POSIX-strftime-Compiler-0.440.0.ebuild
new file mode 100644
index 000000000000..02a83a2a3237
--- /dev/null
+++ b/dev-perl/POSIX-strftime-Compiler/POSIX-strftime-Compiler-0.440.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=KAZEBURO
+DIST_VERSION=0.44
+DIST_EXAMPLES=( "eg/*" )
+inherit perl-module
+
+DESCRIPTION="GNU C library compatible strftime for loggers and servers"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="minimal"
+
+RDEPEND="
+	!minimal? ( dev-perl/Time-TZOffset )
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	virtual/perl-Time-Local
+"
+
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.35.0
+	virtual/perl-CPAN-Meta
+	test? ( >=virtual/perl-Test-Simple-0.980.0 )
+"
diff --git a/dev-perl/PPI-HTML/Manifest b/dev-perl/PPI-HTML/Manifest
index 4b8ad1b72b5a..17f16550b89d 100644
--- a/dev-perl/PPI-HTML/Manifest
+++ b/dev-perl/PPI-HTML/Manifest
@@ -1,3 +1,3 @@
 DIST PPI-HTML-1.08.tar.gz 28720 BLAKE2B 14543d2642bbd5f95c4316837f0f0786570d7aea277a4a0ba578da231c69f166d171fef19d453772d0ab6cde3a1a7d9236208933fedc5aaadb8bd12e61dec378 SHA512 84a873c580173764fb534dc36e0868dec3371ef67663e021b93229e6d142caf81408da3c4dbe205332a0a2deb3378ee82f3d37f77186ae8bd4067f3ad928dc79
-EBUILD PPI-HTML-1.80.0.ebuild 746 BLAKE2B 46ffd87b2b7bd1ba43d515554e4477f3fd4d518c594ecbd8f9d4b630116df063037060a062ba8916ebbd9023591127d945941287989e3f2a48c856aa1cbe711c SHA512 82e4f1ebb6c6de94e8a46c3129c551629e6f5339d813a307298bd5e3a49d9e0b0acb90e6ef4ef3d2fba0079718a4bcd1d64b3432c1ae645b868795f500575215
+EBUILD PPI-HTML-1.80.0-r1.ebuild 708 BLAKE2B e63ccadaf9881223a84b027b1fa56e84b9b9450355ddadce0df3997c2e3b7bf076e32f67648b32571629bef11a0a423a82b342f2907b98e523d16e3fc1bcd3fe SHA512 1f342f4084cfd0d40467e13c81eeb61460d25f434bf6ff631acd69abce2c9001df513364a5edf56372ce5ec4aa16099c784331bc88bfde486361ffd40a5618db
 MISC metadata.xml 440 BLAKE2B afeddbdc1bfe4df4c723d0001a1daaf70b9a3a63bb17078d5ae8a1f92ef10647e445b924e133c07a4f231b8c81614e831c7ac6c2ae92d03298164d2eba6c2aa8 SHA512 c9d685e02aa93b3c23f6894738b93f0ad15b9bb3ade80ffa58e12b11b4c5346a3d8e2e51e9666016f3fb00b86e3f3f83306e25d51eba37d2f47d0fb6e42a10da
diff --git a/dev-perl/PPI-HTML/PPI-HTML-1.80.0-r1.ebuild b/dev-perl/PPI-HTML/PPI-HTML-1.80.0-r1.ebuild
new file mode 100644
index 000000000000..0281d48a3f86
--- /dev/null
+++ b/dev-perl/PPI-HTML/PPI-HTML-1.80.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ADAMK
+DIST_VERSION=1.08
+inherit perl-module
+
+DESCRIPTION="Generate syntax-hightlighted HTML for Perl using PPI"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/CSS-Tiny-1.100.0
+	>=dev-perl/PPI-0.990.0
+	>=dev-perl/Params-Util-0.50.0
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
+	>=virtual/perl-File-Spec-0.800.0
+	test? (
+		>=virtual/perl-Test-Simple-0.470.0
+	)
+"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
diff --git a/dev-perl/PPI-HTML/PPI-HTML-1.80.0.ebuild b/dev-perl/PPI-HTML/PPI-HTML-1.80.0.ebuild
deleted file mode 100644
index 71faa2f073c9..000000000000
--- a/dev-perl/PPI-HTML/PPI-HTML-1.80.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ADAMK
-DIST_VERSION=1.08
-inherit perl-module
-
-DESCRIPTION="Generate syntax-hightlighted HTML for Perl using PPI"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/CSS-Tiny-1.100.0
-	>=dev-perl/PPI-0.990.0
-	>=dev-perl/Params-Util-0.50.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
-	>=virtual/perl-File-Spec-0.800.0
-	test? (
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/PPI-PowerToys/Manifest b/dev-perl/PPI-PowerToys/Manifest
index e22e964fd8b9..8dfeaee90de0 100644
--- a/dev-perl/PPI-PowerToys/Manifest
+++ b/dev-perl/PPI-PowerToys/Manifest
@@ -1,3 +1,3 @@
 DIST PPI-PowerToys-0.14.tar.gz 27358 BLAKE2B 299d22cbed958e6fb0dc59e7642c9463f3bab4ade16d3d84b53c03b228fc9540d7a2073ad0aea9740dbebe044a0fbd081371066c43ffd46e52a811e239f1854a SHA512 98df6d78b912ba9e91825806e2fee98f2d3956df74363ff7e0af4634d8b17909d3b42de194a1d6d768fbd2854a6eabf93fb00a6db22ec6e95feda219ae323f44
-EBUILD PPI-PowerToys-0.140.0.ebuild 670 BLAKE2B 5e57419e0f0a576b7e0899d2aa315a4c5bd488ee1e7fefb7c43df065a8dd2141b87065f1da30863b6e4b3dfe40b5562080e8daf95e86cfb113fa2172ec694443 SHA512 077f3655922cdfaaca6f68d62fecd3cc157cc41ff81cadb1cb3853ad6686e8106d92d6a0a59b9509772813795ea0a0cd263afc6b83fb62283a4d73d5ff50baae
+EBUILD PPI-PowerToys-0.140.0-r1.ebuild 659 BLAKE2B 732e9309d7b4e491661a19fc030421b0610fed9c474556f20fa76d24608f7c3b419ca9e3976bca77676f01e59c51a8cbc7747f1b379d186fda72f14532331fbf SHA512 038e5b452d8e6bb3e07962705076223da4d80eba51a1c22a6c757f51012db19abb012959b55e8867e6bc68b00c8acef69bac0b7e0b7768ffb3b4099914bb3d0d
 MISC metadata.xml 520 BLAKE2B 7294e6b95067fea6447f95a526ffe2c4647fa7c345f3f58e79a1afc9b165bad77aa82a9b16c8bf3039a1736ceddbba344773b167d1557513b50e784e46ebc800 SHA512 7733b43a9af25711238e62d89552ed01dca75a595abb77e828c63df6897508dbce9bbda3c50ecc5132c80a980bfef00d856e98d86085cbe041758fcafdaf4089
diff --git a/dev-perl/PPI-PowerToys/PPI-PowerToys-0.140.0-r1.ebuild b/dev-perl/PPI-PowerToys/PPI-PowerToys-0.140.0-r1.ebuild
new file mode 100644
index 000000000000..77ecd455879b
--- /dev/null
+++ b/dev-perl/PPI-PowerToys/PPI-PowerToys-0.140.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ADAMK
+DIST_VERSION=0.14
+
+inherit perl-module
+
+DESCRIPTION="A handy collection of small PPI-based utilities"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-perl/File-Find-Rule-0.32
+	>=dev-perl/File-Find-Rule-Perl-1.10
+	>=dev-perl/Test-Script-1.70.0
+	>=dev-perl/Probe-Perl-0.01
+	dev-perl/PPI
+	dev-perl/IPC-Run3
+"
+BDEPEND="${RDEPEND}
+"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install::DSL/use lib q[.];\nuse inc::Module::Install::DSL/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
diff --git a/dev-perl/PPI-PowerToys/PPI-PowerToys-0.140.0.ebuild b/dev-perl/PPI-PowerToys/PPI-PowerToys-0.140.0.ebuild
deleted file mode 100644
index 557307d6dff1..000000000000
--- a/dev-perl/PPI-PowerToys/PPI-PowerToys-0.140.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR="ADAMK"
-DIST_VERSION=0.14
-
-inherit perl-module
-
-DESCRIPTION="A handy collection of small PPI-based utilities"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/File-Find-Rule-0.32
-	>=dev-perl/File-Find-Rule-Perl-1.10
-	>=dev-perl/Test-Script-1.70.0
-	>=dev-perl/Probe-Perl-0.01
-	dev-perl/PPI
-	dev-perl/IPC-Run3
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install::DSL/use lib q[.];\nuse inc::Module::Install::DSL/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/PPI/Manifest b/dev-perl/PPI/Manifest
index 9d816d2443b3..6da78e9ffb3e 100644
--- a/dev-perl/PPI/Manifest
+++ b/dev-perl/PPI/Manifest
@@ -1,5 +1,5 @@
 DIST PPI-1.236.tar.gz 257245 BLAKE2B 7f49ba8baa67b6597b774420d379e832412f666995701e5c6ab56d8ecbdb7a2542e7b2bb18ed76e944ccd47ba8bda970d0fd170683d9236f20991902eb401f86 SHA512 93a7f4059b12156bdcba77958c17841ab43d85cb0045d0c58d087d6e637e09e253a559cfe465d9d8699329098582759cb8381978c121b9661a9a755e919dece1
 DIST PPI-1.270.tar.gz 251100 BLAKE2B 8b31c41c5fedd9593466dc2673de6ab8767f04578af09b2008984f6d76c71c404e506ac4b9fe7adcf996f5cd01803203c9cddb84fd6e99f87799804526a533c4 SHA512 d138db281c69fc8bbf53174df720e97633e7fd35bc77a24ceeb164277a69a5aff2629a66e7d898d62db270333c87f998eaac23a9eab7ede76dcfd43d2c546858
 EBUILD PPI-1.236.0.ebuild 960 BLAKE2B a25101bae33b7d6987b8e60fd797b065312d05bab570d98cf42eb499e255715e400d220542a3b13aabe91aaafd130b66ac13948da67165d214be61295838c556 SHA512 ae5ef91594ec4dfa456c71748a47e792620cf3b5f7bc8a4b28efbe6db26e49b7f1c0c637f5fa42160e18a1a3fe651ef935fb5e28a53656094bc7882d0f7e77e6
-EBUILD PPI-1.270.0.ebuild 1023 BLAKE2B ef0e2fe5acaf037acedaf2fefb8b51a73e1125427c9336fb6ed61e833edf3dbe9ccfac368a3e5b6431b22c138326868e025ce88a1d44e3846a1562787bfdc1ef SHA512 dd552fa221e05377c55c79a2198b39269cd08573f0b575f5a98c41457b9668d3336d833d3b70de5f7d297443a4a2f47848e8a9018f4d4b2174e9a848011a7918
+EBUILD PPI-1.270.0-r1.ebuild 983 BLAKE2B 7a881ba2d6f44a7be135b34b3c86ea9661f1333882ddf43ba545e13f12a25e19ac29e94e1d3812131f31463c943b20b874f82ac530cd69665fb66c55b2c67c22 SHA512 2664a76686051955cd44b1a2588d9f4ff5000c42f08d27666fcc0f6275985aa3158ffedbca7c5c62e0f63bc061cc67c45db6e3ca05de3d36c95800b28007b41c
 MISC metadata.xml 6633 BLAKE2B 66b064eed0aab9a099bb6ea9e621e10f4c5c06b052abf393a5edaccdb5ddbf068382ad767a2d9fb6a68e70766234ace27da4ceddbe0b2174167d27e56d705717 SHA512 a6f5d77c3a8a13f3c454185c090d595b400b665a9aa2dc7e7edbc0c643109bc251d6522a330510080c5ce905f84cfd8892ed0783032a6e45dccc710df5569ec2
diff --git a/dev-perl/PPI/PPI-1.270.0-r1.ebuild b/dev-perl/PPI/PPI-1.270.0-r1.ebuild
new file mode 100644
index 000000000000..7c9023d4ce56
--- /dev/null
+++ b/dev-perl/PPI/PPI-1.270.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MITHALDU
+DIST_VERSION=1.270
+inherit perl-module
+
+DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Clone-0.300.0
+	>=virtual/perl-Digest-MD5-2.350.0
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	>=dev-perl/IO-String-1.70.0
+	>=virtual/perl-Scalar-List-Utils-1.330.0
+	>=dev-perl/Params-Util-1.000.0
+	>=virtual/perl-Storable-2.170.0
+	dev-perl/Task-Weaken
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=dev-perl/Class-Inspector-1.220.0
+		virtual/perl-Encode
+		>=dev-perl/File-Remove-1.420.0
+		virtual/perl-File-Temp
+		dev-perl/Test-Deep
+		>=virtual/perl-Test-Simple-0.880.0
+		dev-perl/Test-NoWarnings
+		>=dev-perl/Test-Object-0.70.0
+		>=dev-perl/Test-SubCalls-1.70.0
+	)
+"
diff --git a/dev-perl/PPI/PPI-1.270.0.ebuild b/dev-perl/PPI/PPI-1.270.0.ebuild
deleted file mode 100644
index f7c29a45b49b..000000000000
--- a/dev-perl/PPI/PPI-1.270.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MITHALDU
-DIST_VERSION=1.270
-inherit perl-module
-
-DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=dev-perl/Clone-0.300.0
-	>=virtual/perl-Digest-MD5-2.350.0
-	virtual/perl-Exporter
-	virtual/perl-File-Spec
-	>=dev-perl/IO-String-1.70.0
-	>=virtual/perl-Scalar-List-Utils-1.330.0
-	>=dev-perl/Params-Util-1.000.0
-	>=virtual/perl-Storable-2.170.0
-	dev-perl/Task-Weaken
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=dev-perl/Class-Inspector-1.220.0
-		virtual/perl-Encode
-		>=dev-perl/File-Remove-1.420.0
-		virtual/perl-File-Temp
-		dev-perl/Test-Deep
-		>=virtual/perl-Test-Simple-0.880.0
-		dev-perl/Test-NoWarnings
-		>=dev-perl/Test-Object-0.70.0
-		>=dev-perl/Test-SubCalls-1.70.0
-	)
-"
diff --git a/dev-perl/PPIx-EditorTools/Manifest b/dev-perl/PPIx-EditorTools/Manifest
index dda2318bcb05..2ae5bd1d558b 100644
--- a/dev-perl/PPIx-EditorTools/Manifest
+++ b/dev-perl/PPIx-EditorTools/Manifest
@@ -1,4 +1,6 @@
 AUX PPIx-EditorTools-0.20-fix-pseudo-deps.patch 5895 BLAKE2B bc7e02fec7ced2190b0f2e1a32465851903e0024b89ffe37e1f0fbf5200d5ee87b9dcc41871c749cfb90d828e2f6c602a74c5112aa58a3a24de4e2fd15ebaf3f SHA512 868dd49fa151515da9762d7941cab9db963fe88e9d8f61565944ebd5fe6150bbb7ca387a496f83c50617c3ebcadbdd7c6cd60f60b2660e59eaebfad2ec12d29b
 DIST PPIx-EditorTools-0.20.tar.gz 37102 BLAKE2B 2f77696826c964ff3b31d21e6f0021be921a5b72a0d50dbe239f28bab91e79b4aca30ad189c6a1a28c074e9b2cc919cca37ae79c9cdeb274fa499e84f3bcb18b SHA512 1762e7d8b6a4e95a547932ecfeb029866a3259bc58409ab6d4f55d83f2d83bfe353c82ddc777b41f499d395b1d11ad12d912e541d06e1779fb25a7e17ba6f405
+DIST PPIx-EditorTools-0.21.tar.gz 36742 BLAKE2B 3631793dcc9d2852c27c40f5f3051141dcc95d566f7bf45ccc0afecdac272e17fde6a3c150ad15373067b4f632d5505225796c39d55b97490c5b06191b8d2e05 SHA512 16fd1b4144742debd6dce3f49215d3b24b896688f5f2150492c9e1ae0cb37a14a18f444b39d8cdf42c1895fff8b3123ed181582264df061a3acbb47ae90e5085
 EBUILD PPIx-EditorTools-0.200.0.ebuild 736 BLAKE2B aa1f8c639e6880b5c0728b737a7b5b68d56878340d551e0d0ddebafdcd9d45c92c8f5a968f8e1701b2401eddd1435e77dedc52d11191d6d34c95bcb8bff9f937 SHA512 c86589f6f475528150f3a689398372940affd9efca7fcb552a8c52ba65b78cf4290e5b66a6cbad097fae487c221b6cdf7ec644693be2cdc1cc39a1fc582cffe3
+EBUILD PPIx-EditorTools-0.210.0.ebuild 626 BLAKE2B 642b1b10a58ca4598d6be40e1d2b1537ec50a8d86021798b6c049adab976d15d7dc790320402be37e4a6b02724da23832140b328c8e93b5c5f9e0de9ebb89e50 SHA512 4de44274d0fe9aec08b094b1549699813347eeb3f59feb20f754fc5a43aa91e9c39256100459efbb259aa28d0b36cdbefe50c895e716f529765f642312852510
 MISC metadata.xml 1137 BLAKE2B 00e498e97e5885959c77aaf678e4ffaf7d6109d61a4287ee6ba5dac1ee9c5d7a00031cac8ffd0ba0c77266eeb5664406e6f7f3b5c9d9f7113aa3cea751268ab0 SHA512 9ca46509feb83da6572facbff1e5318a315feeeb0d868e05500b78b83fbfe847a220c0bf05e921855454cf77f086327c9280b6b0509ad8c66b4b34ba8423c00a
diff --git a/dev-perl/PPIx-EditorTools/PPIx-EditorTools-0.210.0.ebuild b/dev-perl/PPIx-EditorTools/PPIx-EditorTools-0.210.0.ebuild
new file mode 100644
index 000000000000..b2edfa5a2bb3
--- /dev/null
+++ b/dev-perl/PPIx-EditorTools/PPIx-EditorTools-0.210.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=YANICK
+DIST_VERSION=0.21
+inherit perl-module
+
+DESCRIPTION="Utility methods and base class for manipulating Perl via PPI"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Class-XSAccessor-1.20.0
+	virtual/perl-File-Spec
+	>=dev-perl/PPI-1.203.0
+	dev-perl/Try-Tiny
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Temp
+		virtual/perl-IO
+		dev-perl/Test-Differences
+		dev-perl/Test-Exception
+		dev-perl/Test-Most
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/PPIx-Regexp/Manifest b/dev-perl/PPIx-Regexp/Manifest
index 386f3ea0ae3e..ddb9a16b65d4 100644
--- a/dev-perl/PPIx-Regexp/Manifest
+++ b/dev-perl/PPIx-Regexp/Manifest
@@ -1,5 +1,5 @@
 DIST PPIx-Regexp-0.053.tar.gz 204221 BLAKE2B 6bea11c9e906bb94db19bd72e75ebeee6d3c2aa64c78e91c3e536d21e494288cfe95067b1a20ddd438ff8829f5f7b23e408c6440a31a5f70fe0680d14e752d81 SHA512 2f9e913347ad415be47240f48536845d9c1f77211534f2d540f2e1583936a11586c224fe909fc2f7f876398cb1c8048386c001279a724a72f1f71015a43840b7
 DIST PPIx-Regexp-0.080.tar.gz 239081 BLAKE2B 4af40b202b755d85d3092f876b16e7790a79fe623a977cee671def42df5c1704e0bcbcc65fcb518dc1a96ebc964eed00d66f55bb3cf77da78955d572876e1cc7 SHA512 6e4f91b1544d4f87079296e7032114dad55505647523ae21638ac157d3f9b47da644829b0813d35383a7d870149ccc58c77f73f3794a004f5634403c891e6254
 EBUILD PPIx-Regexp-0.53.0.ebuild 615 BLAKE2B 876f9f2be0f755f4d7981d0165f1a671ee3f74af9c053c8c0c70f21ea50b64d33e931701ad970fb6fbde05ff49206096cf263a08c2bffe1505208a3cb19ef38f SHA512 e0c86a9d8dd3afbaa8c8fad1a53cc6c2bf6a3335ca6164e15d63dda10bcf53e62d7e775dfb9570b9a8192c19a858b391844d96a9bb0d46b1d5b885b879b6473f
-EBUILD PPIx-Regexp-0.80.0.ebuild 660 BLAKE2B 551c2c013683f23db0c568b589b80b7538331b470b447d086c3dccd268484426b76033925bb9fd5f36a42a101b8a9a211155b9a2626b402eba5dbb9e48532ea5 SHA512 6e9266fbf606b3565dc966d888159f5cd76ca15be7946f5d44669784e791dfccc207ee93c44d6edbf842c808df7fc259d053af6922d6d8718ce3388e5b33b5b2
+EBUILD PPIx-Regexp-0.80.0.ebuild 659 BLAKE2B f6da7342e18c7c84c5da115c62599dede8702d858b7080369d601254168c443f2781a17104adbef19d97ce7de47ced212e56ae12e6f155fbd325566445a254c4 SHA512 7351ad0c1802b36f1a50dcee43088c298fc784b77e7964eca276931635d2e152566500b0ea44d8de6fbb786f0183731cfd9144fe1759b829a983355c4f0791e9
 MISC metadata.xml 5135 BLAKE2B aa9ba72bf7b9457110960e2f70d1bd4c6447187ffe646daa436029895926e82b6b4dded139cdd954a194211e7cc4ff5ae719543b4d75a14777666cac6706aed4 SHA512 b880daf56051178ecf011e80656c00483e5fa5879d1107103916c6c56c4745f36dc902d06ea6827754bc1baba9ecd1c876470fa96d5fd5c076f7438ccbce3c02
diff --git a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild
index f56c25d823c5..f14244ab44a3 100644
--- a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild
+++ b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Represent a regular expression of some sort"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="test examples"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/PPIx-Utilities/Manifest b/dev-perl/PPIx-Utilities/Manifest
index 7abcfd3162af..359bc0b4a840 100644
--- a/dev-perl/PPIx-Utilities/Manifest
+++ b/dev-perl/PPIx-Utilities/Manifest
@@ -1,3 +1,3 @@
 DIST PPIx-Utilities-1.001000.tar.gz 25707 BLAKE2B 74e44b0a53422b9b03170a8d9486f1965f58fbcb5d0d62b601d078aa4ecf2a4cd948bc044336a09b05cd86158e7d8f2a0372f6aa124345ff4d95f01cc3afb9e5 SHA512 46b900b4152e83e7a37b3fb6036051079aed677f0a33affa07f50e33a3a45bc220c899ecb99a1ab259a934aa9801582e804fe3be2980188c6442774de9b0f6de
-EBUILD PPIx-Utilities-1.1.0-r1.ebuild 548 BLAKE2B 59319b3f7ff96dc838f51f880894252e3ee5255f889605655d7f4715121a15aa0abd86575ced39a0e45c105ee99c6f1746272c8d6461793a01ce30cc90f50d76 SHA512 718a78bf5a6306362572744a4f4d4c2d4ae59a3433e18fc63cb317d3be16a8308404b5239be7a0cce699a699429946a7039f729aa1040e6da7b5ab7de6f9b63c
+EBUILD PPIx-Utilities-1.1.0-r2.ebuild 495 BLAKE2B a17cca9fee9da5b181601ac3406426530ef33a21e130c580babe21604dcb9f93b6cee71a527e34c177f8076df21e7c17d078d5106b2be4c1677d858d5b2485da SHA512 feb5e16eef5a30799422b547ba6d3a9a76776cf2a01e0dd68468b0ed766fa9d542c4e50d6115f40a992517862c60e6cc0ec1b3982740cae59d66b2c60d8e077c
 MISC metadata.xml 619 BLAKE2B 02c39c4f0fe19f06071e231fdc9122b02f50ab9026eb754d9fbb4d5a00236c708fad11e4ffafc69afdc845557701231ca12c0c48427d1ebfef39cddf8c7644a9 SHA512 b209d2838761a1f4afc38f75e06795b8b92ee68639a09787a0a989dee8056379b58916d456bb316436a3adb0ed16032fdb5939b960478103244231de1fb3b50c
diff --git a/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r1.ebuild b/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r1.ebuild
deleted file mode 100644
index 1143a9843085..000000000000
--- a/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ELLIOTJS
-MODULE_VERSION=1.001000
-inherit perl-module
-
-DESCRIPTION="Extensions to PPI"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-perl/PPI-1.208
-	dev-perl/Exception-Class
-	dev-perl/Readonly
-	virtual/perl-Scalar-List-Utils"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? ( dev-perl/Test-Deep )"
-
-SRC_TEST="do"
diff --git a/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r2.ebuild b/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..6ebf16453485
--- /dev/null
+++ b/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ELLIOTJS
+DIST_VERSION=1.001000
+inherit perl-module
+
+DESCRIPTION="Extensions to PPI"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+RDEPEND="
+	>=dev-perl/PPI-1.208
+	dev-perl/Exception-Class
+	dev-perl/Readonly
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? ( dev-perl/Test-Deep )
+"
diff --git a/dev-perl/PPIx-Utils/Manifest b/dev-perl/PPIx-Utils/Manifest
new file mode 100644
index 000000000000..94be65f276b8
--- /dev/null
+++ b/dev-perl/PPIx-Utils/Manifest
@@ -0,0 +1,3 @@
+DIST PPIx-Utils-0.003.tar.gz 38028 BLAKE2B d9b26f6df59b5052be6bcf52f0e6948c0647c6e95aeab759c80f2e27ca6a9ef1771bd36a78b9853cf74cdd527dcfbb4fd2057818e82cc187849a0f52dfa27eb0 SHA512 7f56bc2bf2afbf1f6d3c0e5bc0ed21752be809714e32b256feb1ea39125c7671c6ef949e2c122a95a41d3a603f5d5253133886f3700890387ad6cf0732ab87c6
+EBUILD PPIx-Utils-0.3.0.ebuild 518 BLAKE2B 04c0e1256dc3d8c529a409fcb0aac1bdfc2c2c76e4e85f7bad3a927154a08d2fae4d3630d1877a1c20b23ca70c630821d163d8420d76dbb57b17bb71d5e373bb SHA512 8fa57af536f67ffb1582c8708648eade021760c9d8151848e16ea09d66fbfad0db7ad318e8f4cf084d3f6d6046501271a3e1ad49a5fee4c42bc499f6602bc001
+MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/PPIx-Utils/PPIx-Utils-0.3.0.ebuild b/dev-perl/PPIx-Utils/PPIx-Utils-0.3.0.ebuild
new file mode 100644
index 000000000000..e35cdcf705d9
--- /dev/null
+++ b/dev-perl/PPIx-Utils/PPIx-Utils-0.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DBOOK
+DIST_VERSION=0.003
+inherit perl-module
+
+DESCRIPTION="Utility functions for PPI"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-perl/B-Keywords-1.90.0
+	virtual/perl-Exporter
+	>=dev-perl/PPI-1.250.0
+	virtual/perl-Scalar-List-Utils
+"
+
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Data-Dumper
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/PPIx-Utils/metadata.xml b/dev-perl/PPIx-Utils/metadata.xml
new file mode 100644
index 000000000000..2b9a936fc0a1
--- /dev/null
+++ b/dev-perl/PPIx-Utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-perl/Package-Stash/Manifest b/dev-perl/Package-Stash/Manifest
index 69dbfe140aee..101e68da9298 100644
--- a/dev-perl/Package-Stash/Manifest
+++ b/dev-perl/Package-Stash/Manifest
@@ -1,5 +1,5 @@
 DIST Package-Stash-0.37.tar.gz 40309 BLAKE2B 6afb95f87288d1c9081d288c71a77fb5b98dc6ab80ec16db1fbb7a7fcc949afefc249e5a9d33c5835b944ecaa6e9cec771988e2987315bd034764ab977576550 SHA512 d10321903591568d4ac4db91ad9e4dfcffe564ab22a5ecdd8fa103749c9708da082ffb3ca478e98ac120a23e51c0ab0ccf799c0da10fe2be194e9cace1f16b06
 DIST Package-Stash-0.39.tar.gz 55606 BLAKE2B c4e9ff6fe83f2c8a537fba0b8e38456b3b9a9768ee7dc1c8a2b471a42cc4d8b82c5ce74972cc462996718bc84eb7bf4cd651bb21cc870e438481e85d024a32ce SHA512 c5a6cd56c86fb9f6c8585ee7f65d0add8e905c586747763c7841a054f3540b6bc505f57952f44bb90a6bb500d0d60d20ad5df7a40944480abbc9d8d43d64e30f
 EBUILD Package-Stash-0.370.0.ebuild 1040 BLAKE2B 3e7ca230660abbaaba60fec2b677959a826feb6ad8e31eccaf03e683ae472e20adddb0d1649eb4e3a6b9362ab5aac358d58a7f4dcca1717761d40b1a63437f6f SHA512 74ec8cc08c85097d6eadfaac07e209b0cf2859403dbfe873bd92ac6882d6860e729ea4d1cab93cd92f1d706b4e6347319efdc7c4d36e8bada76170b5b96dfa1a
-EBUILD Package-Stash-0.390.0.ebuild 1011 BLAKE2B 2d2e64ca7af2dd494d297b94b33104fa64024fa68a8d2ade4d6011f37a00e19e1c77204b9a0b46fa297bb86204fab2e93af8779f6eed7a7dc60c39af0955d2c5 SHA512 dc667f5bbd882940658cea437525c5055c34a38d46e8cd1159056382691427055a6f1287807c702842e09b54fca02e7b95057a591d064de8c8ed0934fb9d18f2
+EBUILD Package-Stash-0.390.0.ebuild 1017 BLAKE2B d4e33755e6d4417c91d500049f1f5cb7c154974f03e1cd9f7b3105d93b02040855d040e0bbb5fbb0dad7e78d2b3fb66211eb53583f59939a5c6aba234758d715 SHA512 f1f14cfb5f6d88977bb5c2e7a968bb9568b9a5cb52d40348a06e0f56efedd43d38e610760e60c5a7172fdb853603e2a7aa7cf2adf7902d66d80884cad84df375
 MISC metadata.xml 463 BLAKE2B d3b8057579c6439184990d6a8090f76b0800966c0c75bfb9bd0317aefa2f48a1ac375c7b60b3c05c7de7f992f1931ad0606fc44c6e77e4508b71b3987dfa745f SHA512 2b2e4ef2cf309de39aed1422386e2a9737c1b19ba6128e60b21d4faecf2b8f8515036701d3e42f4742d160e745e953b63511e921d206f5643db1ed7c7542a426
diff --git a/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild b/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild
index f05c62988be9..76d9874a5315 100644
--- a/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild
+++ b/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Routines for manipulating stashes"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~sparc"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Pegex/Manifest b/dev-perl/Pegex/Manifest
index 2f782676a986..9b4517feb2ba 100644
--- a/dev-perl/Pegex/Manifest
+++ b/dev-perl/Pegex/Manifest
@@ -1,5 +1,5 @@
 DIST Pegex-0.64.tar.gz 152976 BLAKE2B ae9fa7a75d8d8f8499f696439541c8a0708326ed3f0dd765fa3ba8339c12cf7cf4d72efc3bd58e85dfa30575e9b0d16a8297ff4728f3b2dd7b6ed8b4d4f7b8bd SHA512 e717a762405a77b2670e1d9b3ca2ef760db186b3f62a92cfc6e87049e71f3abd5476b44a285d27c622711557540a0d978b90d5c59afae63692986f510d7458ce
 DIST Pegex-0.75.tar.gz 148676 BLAKE2B 7b23a8c751f6272437d240e99f3e37521d4ebc4d76ea1493cd6830b3e12890b6079571db326844de06fef21051286f07f9a026cd57a15eb10e2909f378bdc9d1 SHA512 ff204b21085bc3ce5cf6dac70636443f206272ae9741055e8972eadb720d52a46e542dee5b6559cc308d9fb597d545bb4d148b02499e2f75fa08a6dc689dc30d
 EBUILD Pegex-0.640.0.ebuild 565 BLAKE2B 23e8d0905b36930b4fbb803b88b1605f5d3029f7defabe8fdef4387faf1ed8e167147ea5ad0def5bf45da5f070e980d1607fcb91b6b197409371b0b7ff173715 SHA512 ddc4382a297c1336fac08715316cab9e070c1390a4984470a20ae2a9df53ef26a14a3953b724354f0de13baeef6197cfec8e26fecb14d443560a1d9fabb25c40
-EBUILD Pegex-0.750.0.ebuild 683 BLAKE2B fbf2fd74ed9d96f9a75993875ca1218684a7b6231ef7952a60433be392dc76e9a1fcaac2a7ef2ffd6f9a7e47cf7e4dcc54372ce90421bfcfe5cdeb1085c21fe0 SHA512 e0fa63c178a77a013983a194c4db9fd2f8cebf0ee885f787aa1b139fb410ecda8974126ff84d307ab666ca7482c9c71e462459747d71aebdfef795816af3c301
+EBUILD Pegex-0.750.0.ebuild 680 BLAKE2B 252cb69bd7196835072ff65dbeb0a5c4f39f04e9dc4eefbb17d317c94e530f42464c5bbf61f3ef29415b1355f875bf3497b84282e9b428000e960cb7eb7821fd SHA512 515a50c15fd4687591da0f157a0395923dbf8301e1322e044a8b011dfb04c9e497cd4533638d4a4b30ffddbf07c7d4c73d95d7eaf61198355f73a9eef808c9aa
 MISC metadata.xml 1440 BLAKE2B ff20746a0706d86325d32ca3b1b64ebdd9fed8955f7fe00c4b58de95d85a3e6ae787e464705bf66439b0ed5b17b297117604be442525efbedea5fd50dd2302ec SHA512 feb5e0cf1c8a13e85b80c013dddeab5a51253dd6e9205815e59c1248e067cd4c0e9000f4ebb729af6800f63af9339e5e88a9c8c269d1f147ad276945fbe01747
diff --git a/dev-perl/Pegex/Pegex-0.750.0.ebuild b/dev-perl/Pegex/Pegex-0.750.0.ebuild
index 769b613ae15a..4af58c23e851 100644
--- a/dev-perl/Pegex/Pegex-0.750.0.ebuild
+++ b/dev-perl/Pegex/Pegex-0.750.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Acmeist PEG Parser Framework"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Perl-Critic-Deprecated/Manifest b/dev-perl/Perl-Critic-Deprecated/Manifest
index 44a8dbdd63ff..a81c3d098f0f 100644
--- a/dev-perl/Perl-Critic-Deprecated/Manifest
+++ b/dev-perl/Perl-Critic-Deprecated/Manifest
@@ -1,3 +1,3 @@
 DIST Perl-Critic-Deprecated-1.119.tar.gz 27706 BLAKE2B 304ace0466455aad7a0ea4885d67190de187e6a06ab9c5e5ed639dd6895267d1d3faadf33c7bc8fdda09863609ae13ce7a8054017e3a6d03402688d87c7aad2a SHA512 314ca325d860a7e5d46514b254bee65371c715688c5c247ac4f64a1c3bf0dd9ecc447ce6f48be9f3797348465ccd8c7baa528a6a9bb269eb8850dd2d34e91b79
-EBUILD Perl-Critic-Deprecated-1.119.0.ebuild 496 BLAKE2B bda1a23f7918f38657f900a5584368b8d268038cb8157dc73a1602e9f0ce69cc7af95148b7cc3c03d3e6c9ba3c2a888541186440e310a647819c82e43b4fa8d6 SHA512 417d078d9e18bdd757a184034103ecb66755a555194b447a3b4f40503798f288852691393be077d54d9d8d01d795a86b762db6591731f2e0f81d65ea0dc45ffb
+EBUILD Perl-Critic-Deprecated-1.119.0-r1.ebuild 458 BLAKE2B d6f58baff06b7e7a7ab38fed9af714832418d7cb74f43339b8bf1118a2fba9567639adeb7e2a338ad36ec3d6f5df240a06c47389da4e29cd5dd1f97a23a941bf SHA512 32681e0a972c7175dcbb92dfc75b96c5b1aeb0703f4f78d4fe2bbb45b11b93cca52e084fc3178aa92dc461b45fee2a274ebe62d2e71c4fd43bb59f3d6ad67cb3
 MISC metadata.xml 792 BLAKE2B e09a92f395f82bd90c586aaa5b80051158d52646081484979a067dea6ad0f817e489cf0b9f6c94935b9a66e296dc80e7e1bce90b6099c26d0f10bede2388f755 SHA512 5a5e19417f14961e0772782d99a3c51ec3e4ca51ed35c3a201d6d2cfd0a77aa40e700b204528a6ff06935d73a07e5d8e6dbbf16fd0d7b75ce5f8c9356dca8b0d
diff --git a/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.119.0-r1.ebuild b/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.119.0-r1.ebuild
new file mode 100644
index 000000000000..5724669b92ff
--- /dev/null
+++ b/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.119.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=THALJEF
+DIST_VERSION=1.119
+inherit perl-module
+
+DESCRIPTION="Perl::Critic policies which have been superseded by others"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Perl-Critic-1.118.0
+	dev-perl/Readonly
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.400.0
+	test? (	virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.119.0.ebuild b/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.119.0.ebuild
deleted file mode 100644
index f0a4935956e8..000000000000
--- a/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.119.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=THALJEF
-DIST_VERSION=1.119
-inherit perl-module
-
-DESCRIPTION="Perl::Critic policies which have been superseded by others"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=dev-perl/Perl-Critic-1.118.0
-	dev-perl/Readonly
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.400.0
-	test? (	virtual/perl-Test-Simple )
-"
diff --git a/dev-perl/Perl-Critic-Dynamic/Manifest b/dev-perl/Perl-Critic-Dynamic/Manifest
index 0a22bdfa3227..5cca915196fa 100644
--- a/dev-perl/Perl-Critic-Dynamic/Manifest
+++ b/dev-perl/Perl-Critic-Dynamic/Manifest
@@ -1,4 +1,4 @@
 AUX Perl-Critic-Dynamic-0.05-test-cgi.patch 1954 BLAKE2B 6c2542c19627efd3ddbe6da87c1a495b6b5a6669ded0ef16a3a75f61be1b545f791dc593e7f277226eb345f4dbe88a8c18febbc60ea2499fed6ae2680c411082 SHA512 651a055c1da2f4403dbcb12aaa679fac4cca8ce5c6782c34e3fe781987babfb8724a5b8b131fcfe6888d5bd8d9ae8e4ef7c721c40119dcf0857df7eb0496bbc1
 DIST Perl-Critic-Dynamic-0.05.tar.gz 18860 BLAKE2B bf6906ebcbae4179dea786f28e9b86e900154e6d5acc92eeaf66428833faeb89f5b986c15c32faff47b9049bba56505b4766a303c04b84a6ede66829eb67b51d SHA512 969090ac930f0adf6eb5c85051ee21ec72e8e10f113519866327632cf7eefe23d8aa1473412bb5f48422e0bf832d912e1d75c00b115e9e908be5798d1ae4c322
-EBUILD Perl-Critic-Dynamic-0.50.0-r3.ebuild 512 BLAKE2B 3d910c6c001982c2ca479968b07dcf89535869a2f6f670fbc31d45ffac27554093b494b91e72729c268804f43556063ee3abf51047d8b255b6ea3d6b07e3ba50 SHA512 54aad02fdcd4f83462da973d6c0491013a2eb88506d892a6761999fd1e4a2cd1bde98e998afad797ea2c63b08d1785bb9d2aa605357ef844086e7130e6751908
+EBUILD Perl-Critic-Dynamic-0.50.0-r4.ebuild 474 BLAKE2B 80b23192f6ac4a8c10131fa4d049a4a1554ded7556f6355d059637cd93d38acb4552a3679c7e1d960a4b6fd6835729fff4c1fbd2419265356a9553ae28c562a7 SHA512 538e0f8f2b3eb34fcaaf2738bb8383c1f05c562c81a610a97c3032e423c4cdbf258f381e12ae1730b6ab766304393da4c45c3e231b42749d8478ce7034d5c03c
 MISC metadata.xml 573 BLAKE2B f431aeff4466c2a7e8114b7ce22d9a24028cb41e1647fd9cdde90f22da590be5eef88d052da78f091861249b4ffba7fde9b7483bd7b7976cb213493ad1964db6 SHA512 1169bf5cb61e22de68a3cc1b8cf064f4cdd0133a76e32a4f14d57eb316f0ef46fb675425967d77f916c8c4c2f5c7672b19286ae1907bed55b1a7267339fffaf1
diff --git a/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r3.ebuild b/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r3.ebuild
deleted file mode 100644
index 2a105a177e22..000000000000
--- a/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=THALJEF
-DIST_VERSION=0.05
-inherit perl-module
-
-DESCRIPTION="Base class for dynamic Policies"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-perl/Perl-Critic
-	>=dev-perl/Devel-Symdump-2.08
-	dev-perl/Readonly"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		dev-perl/CGI
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.05-test-cgi.patch" )
diff --git a/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r4.ebuild b/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r4.ebuild
new file mode 100644
index 000000000000..4b4b0a54cf5e
--- /dev/null
+++ b/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=THALJEF
+DIST_VERSION=0.05
+inherit perl-module
+
+DESCRIPTION="Base class for dynamic Policies"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ~ppc64 x86"
+
+RDEPEND="dev-perl/Perl-Critic
+	>=dev-perl/Devel-Symdump-2.08
+	dev-perl/Readonly"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? (
+		dev-perl/CGI
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.05-test-cgi.patch" )
diff --git a/dev-perl/Perl-Critic-Nits/Manifest b/dev-perl/Perl-Critic-Nits/Manifest
index 38c809108dd4..4d88fc5be8fb 100644
--- a/dev-perl/Perl-Critic-Nits/Manifest
+++ b/dev-perl/Perl-Critic-Nits/Manifest
@@ -1,3 +1,3 @@
 DIST Perl-Critic-Nits-v1.0.0.tar.gz 6891 BLAKE2B 744d8b0cac3c9b78d82f0a071b243ecbaf16a4b3b45c38aba5aeac63aabadb009ee788b3dde49ee3dfde3d06b4dd195ee0fc5d3f87ed3e24a409b34acfebef16 SHA512 727028cd63552e4dcc4bc7b70f01a7caed6aea14c1ea1f4d4a7e2e94c45e92f32b914f6759ce2c5ed024f25d5d684a6ddd63c68b64e9e66e2d369d7450c0ea11
-EBUILD Perl-Critic-Nits-1.0.0-r1.ebuild 551 BLAKE2B 593763f8417b36d2c3a4dcef44993e1562d364fdef1e7fafcfabc58a299bce41a99450ce5891f9e3c51c4e456ab60367daeb1b9320a5a51f78b18b8bb9450642 SHA512 74059a4cc698ee56eb817ce6bf7b08a4679270e0d732f5d8f21c19a455e6c831fbecc47f6e8189d7d179393b5fee9eae02da845ecdf8d2da4bee6b49d389e493
+EBUILD Perl-Critic-Nits-1.0.0-r2.ebuild 344 BLAKE2B 3b835157977b77786d7ee4a803b33149d832f2b8df4d552ea27dd414225cb19d5c0233c2db57feea14fb4d91e7dae389cc758ef6da6ad0af8891d0fc3040fd80 SHA512 e9eee90ea76566d6706990dac1b46e16a05e3adec36b72697f1baee3bae00a9c500c5e484afcdbecf1f60d88b40f31d7c9d2c94a63d04ce0bbb6d8c09d6ae1f8
 MISC metadata.xml 509 BLAKE2B aca78c62aa8c0215ffdf630f2e407a8011c9a8f4353157ca60bdb43114652bf3cefac0aa0a7bab35c8fe204d471afc705b19ffe2e43d7379225326005b5acfe2 SHA512 c2fbc8df1cf4e0737675c4b36ff1038b06e207ca09526c7b9471bba802b26641e6b8f20d93038ab4fa00661fd633e9a2187b819498014e81d6ddac743325a635
diff --git a/dev-perl/Perl-Critic-Nits/Perl-Critic-Nits-1.0.0-r1.ebuild b/dev-perl/Perl-Critic-Nits/Perl-Critic-Nits-1.0.0-r1.ebuild
deleted file mode 100644
index 7b5b986f79f9..000000000000
--- a/dev-perl/Perl-Critic-Nits/Perl-Critic-Nits-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR="KCOWGILL"
-MY_P="${PN}-v${PV}"
-
-inherit perl-module
-
-DESCRIPTION="policies of nits I like to pick"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-perl/Perl-Critic
-		dev-perl/Readonly )"
-RDEPEND="dev-perl/Perl-Critic"
-
-SRC_URI="mirror://cpan/authors/id/K/KC/KCOWGILL/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Perl-Critic-Nits/Perl-Critic-Nits-1.0.0-r2.ebuild b/dev-perl/Perl-Critic-Nits/Perl-Critic-Nits-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..07e5e216380f
--- /dev/null
+++ b/dev-perl/Perl-Critic-Nits/Perl-Critic-Nits-1.0.0-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=KCOWGILL
+DIST_VERSION=v${PV}
+
+inherit perl-module
+
+DESCRIPTION="policies of nits I like to pick"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="dev-perl/Perl-Critic
+"
+BDEPEND="${RDEPEND}
+	test? ( dev-perl/Readonly )
+"
diff --git a/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Manifest b/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Manifest
index 785d9a004dbc..9c5e0ba53438 100644
--- a/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Manifest
+++ b/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Manifest
@@ -1,3 +1,3 @@
 DIST Perl-Critic-Policy-Dynamic-NoIndirect-0.06.tar.gz 6408 BLAKE2B 7c454c1b1f34c0b52464c2f08573da1340b2e4506456ab07255ba3e7b3bbb8ff5df12ea3c58d4de72a3679bef5b7591dfc8aa1a67a8b3ebeb3d335c98aa1ae6a SHA512 6ff10fee680d58f21f03af2056d5d067adbb1c0dd8626f11516e7ddcac9ef0241b2a13097548a40da7c72549300cc2fb0a7b138ec7b2fa5780fe3b9dcc4ddf06
-EBUILD Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1.ebuild 603 BLAKE2B 543c7cc42520b888d49ad91f6024bfa4cb7f9dce185a86e46604de295bed983539c57f869965bff3dcce9c3c3a195c03ed137eb1d180cd9f08d282b76d4c9dbb SHA512 1c1b3bd2bc0cee9f898951e4799d21128b3a1dc04c82fe7b40fad1e7040d5c5b69489a8020900cff6c7f575b478dcbd1b741ffc2fe3ac3457094e2c68eb2c19f
+EBUILD Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r2.ebuild 552 BLAKE2B 680d44b3dfe72a79fa2bd5a4dc1a4eeb10505e203f20724febcdaa18cbc04f2262f3753e7f95124d8debd196643ee45f70469e2e9f5cca9667d3cc8d9b1ba2f1 SHA512 e99c14ad9a63922602aefd99dfbfcd0c2f49c9527dfd9fba7704ae24713cd45f720ea933d21f185eacc283e61e38f86f553b754cebcfded72d0e2ff21f03cc32
 MISC metadata.xml 437 BLAKE2B a2e5675818e4baeade044300c245531f0953d75f9323367df600f39ccf0fdf1ba07466916e3eae6cb97ff45bd2b815fea254adc122da1809018ea689ae11e4d8 SHA512 1cecb7b01f2adb1ffa48167580a6d6aefae7291480295ff4e26e250b0a9d7aadc089afd5047074b1d36a544bdcac6a357ee263e8e5652064802497f250f32c0d
diff --git a/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1.ebuild b/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1.ebuild
deleted file mode 100644
index f3e52714ce0f..000000000000
--- a/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=VPIT
-MODULE_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="Perl::Critic policy against indirect method calls"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-perl/indirect-0.250.0
-	dev-perl/Perl-Critic-Dynamic
-	dev-perl/Perl-Critic"
-DEPEND="${RDEPEND}
-	test? ( virtual/perl-Test-Simple )"
-
-SRC_TEST=do
-
-src_test() {
-	perl_rm_files t/91-pod.t t/99-kwalitee.t t/92-pod-coverage.t \
-		t/95-portability-files.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r2.ebuild b/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r2.ebuild
new file mode 100644
index 000000000000..1de2673a24ae
--- /dev/null
+++ b/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=VPIT
+DIST_VERSION=0.06
+inherit perl-module
+
+DESCRIPTION="Perl::Critic policy against indirect method calls"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=dev-perl/indirect-0.250.0
+	dev-perl/Perl-Critic-Dynamic
+	dev-perl/Perl-Critic
+"
+BDEPEND="${RDEPEND}
+	test? ( virtual/perl-Test-Simple )
+"
+
+src_test() {
+	perl_rm_files t/91-pod.t t/99-kwalitee.t t/92-pod-coverage.t \
+		t/95-portability-files.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Perl-MinimumVersion/Manifest b/dev-perl/Perl-MinimumVersion/Manifest
index 10836a9389a5..c0628ed8dc95 100644
--- a/dev-perl/Perl-MinimumVersion/Manifest
+++ b/dev-perl/Perl-MinimumVersion/Manifest
@@ -1,3 +1,5 @@
 DIST Perl-MinimumVersion-1.38.tar.gz 30629 BLAKE2B add1145b327a2165619d78e4cba9b2417b6650a97b28a6a08e044223e3ee5af6b6f76be877348e50512c6d87661a4bf25e996477a4a225e0cacd2a5c6525d252 SHA512 4a1b5a30c1b2c82ebdd5908b667d012376372890278fb3f1a08ead300b8ce02396f511df5250123689611ad5c0b0ad2b41a4c1ebe76c33109f2226eef95c9d4f
+DIST Perl-MinimumVersion-1.40.tar.gz 37601 BLAKE2B 2186f71418d7279daeb98e76be3adad9dba0d67b204d86ad9538b1a0c30695c3d504ebdc08f06031dd2c9101587798c2825186bb65c7bc5a5e37c6639345bba5 SHA512 9416fbee46008f7745d6d0c8762e1d54e00fb708376a1d0a86c08f375627da3c10feefc0d234f68d422da892f5ac3f5caa9ea1ac6593827e2ff9b262646a6527
 EBUILD Perl-MinimumVersion-1.380.0.ebuild 797 BLAKE2B 0c5d13ad25fa385f6352f4181c9c9505ac8e7ad0801109735320d3427a0941dc531931aa3ab465c840882699f519155e2df9413d440bcfb13851c7b5caa20ed7 SHA512 63c4f326dff6fb2a1501d11a0eb6b99731737f29f92bf520f7928647e9918660c63a59f80ba8b9605b76289488106fab4175ac510fe4a35b334d7cdf88ab43cb
+EBUILD Perl-MinimumVersion-1.400.0.ebuild 744 BLAKE2B e5ac74172e66486e322d1a22a534ed7c81e3318869db5a8e91c04399fc1175e6b6668897c6d16f8b4906c87e919d2ac3940b6d547bb0135608a78f2044ebea54 SHA512 8a12b1fd3429ebf16d998ba57b7431d38d47631fc8e408deb7b367a277afeac05569dc64b491cff26a2ce914eda0c6fee17e755c55513f66453ad0ad0903dc7f
 MISC metadata.xml 539 BLAKE2B db79e26156b764745a480efaa019141f7ea39da01315949a7c5603bda025abc314fcbe14ac43e519081406e8bf7a63bfb51221e883efb29d27d58b47cfbf08de SHA512 c760d4a9f4f012f5e5c340d618ca3c92fe4edefa198868438f866bb00a2891bffb6a87c54bb5119e4fdfdd684a373f3526e892ae601c3bbdd96c0b4aa0409a37
diff --git a/dev-perl/Perl-MinimumVersion/Perl-MinimumVersion-1.400.0.ebuild b/dev-perl/Perl-MinimumVersion/Perl-MinimumVersion-1.400.0.ebuild
new file mode 100644
index 000000000000..0c6a4e4a71f6
--- /dev/null
+++ b/dev-perl/Perl-MinimumVersion/Perl-MinimumVersion-1.400.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DBOOK
+DIST_VERSION=1.40
+inherit perl-module
+
+DESCRIPTION="Find a minimum required version of perl for Perl code"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	dev-perl/File-Find-Rule
+	dev-perl/File-Find-Rule-Perl
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	>=virtual/perl-Scalar-List-Utils-1.200.0
+	>=dev-perl/PPI-1.215.0
+	>=dev-perl/PPIx-Regexp-0.33.0
+	dev-perl/PPIx-Utils
+	>=dev-perl/Params-Util-0.250.0
+	>=dev-perl/Perl-Critic-1.104.0
+	>=virtual/perl-version-0.760.0
+"
+
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.470.0
+	)
+"
diff --git a/dev-perl/Perl-PrereqScanner/Manifest b/dev-perl/Perl-PrereqScanner/Manifest
index 746d4d667615..a63f08b93aea 100644
--- a/dev-perl/Perl-PrereqScanner/Manifest
+++ b/dev-perl/Perl-PrereqScanner/Manifest
@@ -1,3 +1,5 @@
 DIST Perl-PrereqScanner-1.023.tar.gz 28136 BLAKE2B 6ad6052c5efabab782de7191c903f52f4e904687fabe280a7f6980ba9d37c44a0e5d7fc0a1f674704bb7874d5478551e7ba5eca8dc70719348bec752b883fad5 SHA512 9f2b6f7b7f5c7a34405cde8f1a31bedc001a877e04759ecae9529821d00869d2273c35b8c855f12f54ba27cfa99fc4b4ccf464603e2ad1c087f76a9f17856b47
+DIST Perl-PrereqScanner-1.024.tar.gz 28758 BLAKE2B a066e77dd50c96cef6e575ff143798d9ba2dd2807ade12d026522bb990664ea883d24b3bc11c72c8ce3b8086844dfa0562e668025880a223141586a5163be28b SHA512 851cf4a34f3bedc0174a9a34d80cf7de2ead5478a1979356ad43f7cb9bb867c0b8a36ba4bc4341b5e4ecf435e18d04726f1a897232d590e61796b7e34ff14c52
 EBUILD Perl-PrereqScanner-1.23.0.ebuild 1120 BLAKE2B 32c9edfb1998120a5726a2245d158b36e60bce27c0f50bc2a6c7def46c6bcb9b974241739524fcc4dd8e3aa39f8b310b8a10e484bf1603d80c67ebb79eddff45 SHA512 89b86d7f2b27cf05a7dcfaef6c101a0487ad65847faa32548ce428ce0641d06c9bec95c7a9971225f7d2a969e57c694964c69392d4cad4e72433d8c24dc4e03d
+EBUILD Perl-PrereqScanner-1.24.0.ebuild 830 BLAKE2B eab4e55a225781da9217160b3dd6b2786922618f07bc727eb2c5872484bb38193ee7b43945a1da8310d478f29af2ab697699027e0ed8c397be0cbc5b2b2ba5ad SHA512 d0b5f7e618712405c169db9fdc752a945e8b0aa3fda44402a86b896f71567828615afcd38467782ae0d9bea3848c93ccf5bb85e178fda9d1b820bfad933488e8
 MISC metadata.xml 1054 BLAKE2B a82204290999cee2de8f4dacf7a327480cd097e760c010b34dd5adb2fbee741cf25567aaeb44f80d454a0aaedd35b709ef2440bf8d8201e9694d6c85242cc974 SHA512 7ba9f8806b3c87485f25d7ae4bda4443a56d5780f9e110d15a28d58b98f4aa85728d4481b5156e9ae7b8e7a04bbb9205b576eb6507098f0f201b92f1e393fce0
diff --git a/dev-perl/Perl-PrereqScanner/Perl-PrereqScanner-1.24.0.ebuild b/dev-perl/Perl-PrereqScanner/Perl-PrereqScanner-1.24.0.ebuild
new file mode 100644
index 000000000000..d2b0234868a0
--- /dev/null
+++ b/dev-perl/Perl-PrereqScanner/Perl-PrereqScanner-1.24.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=1.024
+
+inherit perl-module
+
+DESCRIPTION="a tool to scan your Perl code for its prerequisites"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+RDEPEND="
+	>=virtual/perl-CPAN-Meta-Requirements-2.124.0
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	dev-perl/Getopt-Long-Descriptive
+	>=virtual/perl-Scalar-List-Utils-1.330.0
+	dev-perl/Module-Path
+	dev-perl/Moose
+	>=dev-perl/PPI-1.215.0
+	dev-perl/Params-Util
+	>=dev-perl/String-RewritePrefix-0.5.0
+	dev-perl/namespace-autoclean
+"
+
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? (
+			>=virtual/perl-CPAN-Meta-2.120.900
+		)
+		virtual/perl-File-Temp
+		>=virtual/perl-Test-Simple-0.960.0
+		dev-perl/Try-Tiny
+	)
+"
diff --git a/dev-perl/Perl-Tags/Manifest b/dev-perl/Perl-Tags/Manifest
index 11cbab61ed56..c28432cb5c9e 100644
--- a/dev-perl/Perl-Tags/Manifest
+++ b/dev-perl/Perl-Tags/Manifest
@@ -2,5 +2,5 @@ AUX Perl-Tags-0.32-no-dot-inc.patch 609 BLAKE2B 35b19f3560c0fbf1b5d0ac553fd8ecae
 AUX Perl-Tags-0.32-no-vim-tests.patch 581 BLAKE2B 0eb01d2790578c940574925338b5f5037c79d029026ecf1c63b45125641370ec16e31c79eeb94990c6bf0d13efda197dede1987dc36c52a037c86e0ff05e46ab SHA512 6a6bbc93824c4fb0ce549586ef01b2d06e501c84cc95d6a0d6a88d8a9c68a8c69e6d647b34e7a2f410be87950534080cbbdfdb505ddb7831777a12d13175dc88
 AUX vim_noplugin.patch 580 BLAKE2B 5c46826f38b05e9cc7fafcc0d3e0f928e093438815bc727be0688cfe163435bc2b0ba4fe62d6d862bd37f1b9465c1f6fb43e49bfee312cea970c94e2c4713dc4 SHA512 686ba2f2b428e51c07f757f421d7086475cc4fb70ad9d3a86e9b3bb49dd86deeaaff05f0d165a36806f4ec17928a51a16ca90b87cabff072f981ad4e33237943
 DIST Perl-Tags-0.32.tar.gz 73099 BLAKE2B 674981a561d25a85d2c62fedfe18f17e64088c9eb0131458315075be0956d8c4b9e31d5c565eba1aa1b0661678b1c83104b61e948aef87d89ea27fa922bad3f6 SHA512 e2042b6c0e54a4c296f182446a1de21d5a1da367bc5f9d0362f4b133e226624b81eed85fd27cdd4bd618349bf447893a1c96a6aede2e22b5db234d67d20fb0fc
-EBUILD Perl-Tags-0.320.0-r1.ebuild 1072 BLAKE2B 9a575050517ae2f555b936d917b996328a26fb1e4712450478dd98f6204da8465495c24ea5c1e2e1ad348f1f0b6e1606522dac406e38ace26ee08364c124ea03 SHA512 fe5696c7483e5d8413264b1d010060fb656b6dbb330e63514babe0c6e7b5f7f2f70029357a84eda0db484e2fedb80f466f09fdd56eaa0982c42e817cd0810408
+EBUILD Perl-Tags-0.320.0-r2.ebuild 1044 BLAKE2B 2fd2494fec1ce55f1a7a49babd082fd45c5335a9da83bdd232755f51c522a537b49781bbb5fd28a6e3c057b6bea01fe3be92e9d3ab5dbc99bfea4a267e0f1e7f SHA512 082862872162b6d22b694313c02f0bf1e5b6dd1024be19436791f61ef02b1933a3ef7307bb565723a86bd7690757cc7c4eddd3210bbb3915c228e37324dab800
 MISC metadata.xml 2288 BLAKE2B fc522b861e95f27156703305722e98a5af54defd529a9229398063b12b88bd369f9d0994c212ce8ea1b884b79f3bac182a7e008442fda560f8ce50dc93b534f0 SHA512 d0c8da0363a01d14f27608d20b3e74265f42873b404087dda7e994e9e77b96a0dc0d792d43a40724a67929ae0d122620065af3e0f903d3d4230ead3b421337aa
diff --git a/dev-perl/Perl-Tags/Perl-Tags-0.320.0-r1.ebuild b/dev-perl/Perl-Tags/Perl-Tags-0.320.0-r1.ebuild
deleted file mode 100644
index a5bf388570aa..000000000000
--- a/dev-perl/Perl-Tags/Perl-Tags-0.320.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=OSFAMERON
-DIST_VERSION=0.32
-inherit perl-module
-
-DESCRIPTION="Generate (possibly exuberant) Ctags style tags for Perl sourcecode"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/vim_noplugin.patch" # https://rt.cpan.org/Ticket/Display.html?id=105899
-	"${FILESDIR}/${PN}-0.32-no-dot-inc.patch"
-	"${FILESDIR}/${PN}-0.32-no-vim-tests.patch"
-)
-PERL_RM_FILES=(
-	"README.pod" # https://rt.cpan.org/Ticket/Display.html?id=113166
-)
-RDEPEND="
-	dev-perl/File-Find-Rule
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	dev-perl/Module-Locate
-	dev-perl/Path-Tiny
-	virtual/perl-parent
-	!minimal? (
-		dev-perl/PPI
-	)
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
-	test? (
-		dev-perl/Capture-Tiny
-		dev-perl/Test-Exception
-		dev-perl/Test-LongString
-		>=virtual/perl-Test-Simple-0.420.0
-		!minimal? (
-			app-editors/vim[perl]
-		)
-	)
-"
diff --git a/dev-perl/Perl-Tags/Perl-Tags-0.320.0-r2.ebuild b/dev-perl/Perl-Tags/Perl-Tags-0.320.0-r2.ebuild
new file mode 100644
index 000000000000..65b69d05b106
--- /dev/null
+++ b/dev-perl/Perl-Tags/Perl-Tags-0.320.0-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=OSFAMERON
+DIST_VERSION=0.32
+inherit perl-module
+
+DESCRIPTION="Generate (possibly exuberant) Ctags style tags for Perl sourcecode"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="minimal"
+
+PATCHES=(
+	"${FILESDIR}/vim_noplugin.patch" # https://rt.cpan.org/Ticket/Display.html?id=105899
+	"${FILESDIR}/${PN}-0.32-no-dot-inc.patch"
+	"${FILESDIR}/${PN}-0.32-no-vim-tests.patch"
+)
+
+PERL_RM_FILES=(
+	"README.pod" # https://rt.cpan.org/Ticket/Display.html?id=113166
+)
+
+RDEPEND="
+	dev-perl/File-Find-Rule
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	dev-perl/Module-Locate
+	dev-perl/Path-Tiny
+	virtual/perl-parent
+	!minimal? (
+		dev-perl/PPI
+	)
+"
+
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
+	test? (
+		dev-perl/Capture-Tiny
+		dev-perl/Test-Exception
+		dev-perl/Test-LongString
+		>=virtual/perl-Test-Simple-0.420.0
+		!minimal? (
+			app-editors/vim[perl]
+		)
+	)
+"
diff --git a/dev-perl/Perl-Tidy/Manifest b/dev-perl/Perl-Tidy/Manifest
index 8047ccc7b06a..5e43ce55846d 100644
--- a/dev-perl/Perl-Tidy/Manifest
+++ b/dev-perl/Perl-Tidy/Manifest
@@ -1,5 +1,5 @@
-DIST Perl-Tidy-20171214.tar.gz 435256 BLAKE2B 03e7ec8e7d76e6de68a54cd474f192b24ec4eaea563dae185b1723f80ac86df7c03bafbfcdcdffc0e3a18d2b57acf3f40321637fc66a64f1d0f72988e19a7e81 SHA512 bc561146f184dd0023de44741cafdcf6882ef553ed2e0c0ec8cd9a234f45b76638b4dc7edde0abfc36e4cc1f84ef908c35dc63f776de65e2abd938d35563cc65
 DIST Perl-Tidy-20190915.tar.gz 599290 BLAKE2B b9a0b1f15e01ed6f6624c804d7833da672fd11a2779baaeb4c4d5f3d7830b2065d01d969fd23514163139bf53831fb3494d2820fe15786244e46cb0efcf722a5 SHA512 553d84bcba8cbe10c0a1e77ef9e31dfdc5957c758efa2bd556ff47a0a354f16eec922842a36c4ccdaed691ffecb6a5dad63dfee2b038f4d2c5882a7e07bad51f
-EBUILD Perl-Tidy-20171214.0.0.ebuild 990 BLAKE2B f2c91f0400c0ed6d6619780eb9a1bd6081ad46fdc4a89f92de8944d0a11b268de8c4a2391f1bfb3a053ee06844e267d1523a6b19ebb4e524d64c91c1e81cabb5 SHA512 2799f1b91e14d3c14907ad4fa1cf2e3c78f4ec8fd8775f8d864d883ec2d0baf58ec6a96e6cd423c2ac0aa8c9f9b3410235c56274538d331abbe3ab55a921a23b
+DIST Perl-Tidy-20210717.tar.gz 814449 BLAKE2B 7fdd3e18e8e6818665e8e75fb6671234840dba15ca7fc20778d97429cac948fb36876cc1d69452bb4a35a1da411e7d440b385efe91c6eb17c5f4939be37e410e SHA512 ccc090cb6ffbd803fbaddde3a99391bd07a97fb47d20515c3f3e58c69a1404824a5bb9aa3cbfea6b2119f7140552fde3bc2361d3ea8904a875973817446578b1
 EBUILD Perl-Tidy-20190915.0.0.ebuild 937 BLAKE2B e27796b166389074c086383e6327f71c2328cc7c79a5819e922b66d8718580a88072dbb8362736bc357c6b5b5fbb04dc1a32492a9ec2e0b7aa36b05f2a5da6c8 SHA512 a2219c15b1482d0915160e721dfb6a734022a78b8252766f3b2f1e84c4d3587e8b45377f1df2799e8b8985ef601dc66fcd1cad2ba22d87ecf973c9998220c663
+EBUILD Perl-Tidy-20210717.0.0.ebuild 939 BLAKE2B 2d58f858be64a8f919b8888fec20e670b4deccd08638938e99b8372fbdef4890cc36c46557d812a3cba7518abf663dab587aa38f2f4f23e9fd9400dfac038050 SHA512 d3c4c285254d89fc62f4c0bf469617b8f281e8ed3d443ca52090c54ed3961734acc77623a101b02fc89b2c48e1006d3fd5353319c90f5a9030da8f52fb82bf49
 MISC metadata.xml 1644 BLAKE2B 0c6fd7d907aa2865cae8f00b485322bd63ce2b950deef2c12db8b85fe6b064f91351a0687053c3800ed4c5332d99478aef04e527615ad4b83e50b0c23c572cf8 SHA512 a423f7ee82d755f703d5367b988153e08b181d62dd9121d4ac407333ddf8211e6e5b4467c9333f5141fbdc1b13e4a0d1ede40abd1136f5aaae70804352b09fc4
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild
deleted file mode 100644
index e3282060eef8..000000000000
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SHANCOCK
-DIST_VERSION=20171214
-DIST_EXAMPLES=( "examples/*" )
-inherit perl-module
-
-DESCRIPTION="Perl script indenter and beautifier"
-HOMEPAGE="http://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Tidy"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-src_install() {
-	perl-module_src_install
-
-	# Compressing pod is bad because perldoc can't decompress
-	# bzip2 automatically, and `less` can't render perldoc
-	docompress -x /usr/share/doc/${PF}/stylekey.pod
-	docompress -x /usr/share/doc/${PF}/tutorial
-
-	docinto ''
-	dodoc docs/stylekey.pod
-
-	docinto tutorial
-	dodoc docs/tutorial.pod docs/testfile.pl
-}
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20210717.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20210717.0.0.ebuild
new file mode 100644
index 000000000000..75a5c85ba9ea
--- /dev/null
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20210717.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SHANCOCK
+DIST_VERSION=20210717
+DIST_EXAMPLES=( "examples/*" )
+
+inherit perl-module
+
+DESCRIPTION="Perl script indenter and beautifier"
+HOMEPAGE="http://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Tidy"
+
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+src_install() {
+	perl-module_src_install
+
+	# Compressing html is bad
+	docompress -x /usr/share/doc/${PF}/stylekey.html
+	docompress -x /usr/share/doc/${PF}/tutorial.html
+	docompress -x /usr/share/doc/${PF}/perltidy.html
+
+	dodoc docs/stylekey.html
+	dodoc docs/tutorial.html
+	dodoc docs/perltidy.html
+}
diff --git a/dev-perl/Perl-Unsafe-Signals/Manifest b/dev-perl/Perl-Unsafe-Signals/Manifest
index 508803f2e758..ef68903fd255 100644
--- a/dev-perl/Perl-Unsafe-Signals/Manifest
+++ b/dev-perl/Perl-Unsafe-Signals/Manifest
@@ -1,3 +1,3 @@
 DIST Perl-Unsafe-Signals-0.03.tar.gz 3157 BLAKE2B f1f3d177bf1011ac86e829757acf3ecd7f7bd0c9d1b2363001e34804a18320bbcc4c86e86a5ff4f87a66dcd6df0ab1d90ac0ba287845c048a7e1d29ada7c2eb7 SHA512 681d1cc8142ff39a4bfcf7066f3143428b9e54ed289f7bfd2adfdea3f5c8a9d77cad4f4c3116f262acf7964a15290e789146bbd747213fc83d8ccbeccb7abe6f
-EBUILD Perl-Unsafe-Signals-0.30.0-r1.ebuild 376 BLAKE2B d799bdf54f1c4bbb167f343f04616b55398393b215733c3f96e378a05a5865f0b37e427f1b088e45e9f3836cff445eb2a7a22aee924ea324e9bae4c24a225ccb SHA512 703e944c36981812e1b6536ca02cb2be193518927f85f0f03ba784b3563512ba33e78e20fe28144ed47def84fc23ce263c54ad180ae1dc783b0d79da11123a9f
+EBUILD Perl-Unsafe-Signals-0.30.0-r2.ebuild 367 BLAKE2B eb5b4f34a46764d47cf652e0048ba264880ed22ca4cf0fc6caf541fade758c5c6129adf0b549c3b9f9efd600545895bfc314ac514c338bf4fb8a708aba94e8ca SHA512 4c7970b5138fec9ef35dd451b70153f8bbbe680afde21a0c12950bc81d2a6e595b5dcaa2bcfacea455e22d8b6fb0475585b928943cc4d256fc07556ebd1a00bc
 MISC metadata.xml 411 BLAKE2B 63a291ae3a84e0bc3825cdde3284713a89654982e298e22d968e5624296b09d8e0c4070d18c7130582038cee82dbd71b9932057ff3b25937222ef77c07c3e684 SHA512 52e16da0162c5132a206c6dd4c75aa4b132d0fcbcb67a1778385434d62ca684185d7727de0bd86bb38c89079b417535fcb64ffa13fe953734047c432b88c2ba6
diff --git a/dev-perl/Perl-Unsafe-Signals/Perl-Unsafe-Signals-0.30.0-r1.ebuild b/dev-perl/Perl-Unsafe-Signals/Perl-Unsafe-Signals-0.30.0-r1.ebuild
deleted file mode 100644
index 05d4adf093f0..000000000000
--- a/dev-perl/Perl-Unsafe-Signals/Perl-Unsafe-Signals-0.30.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RGARCIA
-DIST_VERSION=0.03
-inherit perl-module
-
-DESCRIPTION="Allow unsafe handling of signals in selected blocks"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-PERL_RM_FILES=( "t/pod.t" )
diff --git a/dev-perl/Perl-Unsafe-Signals/Perl-Unsafe-Signals-0.30.0-r2.ebuild b/dev-perl/Perl-Unsafe-Signals/Perl-Unsafe-Signals-0.30.0-r2.ebuild
new file mode 100644
index 000000000000..07c4482cd528
--- /dev/null
+++ b/dev-perl/Perl-Unsafe-Signals/Perl-Unsafe-Signals-0.30.0-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RGARCIA
+DIST_VERSION=0.03
+inherit perl-module
+
+DESCRIPTION="Allow unsafe handling of signals in selected blocks"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+PERL_RM_FILES=( "t/pod.t" )
diff --git a/dev-perl/Perl-Version/Manifest b/dev-perl/Perl-Version/Manifest
index 8ab1f7824c9d..552e12490958 100644
--- a/dev-perl/Perl-Version/Manifest
+++ b/dev-perl/Perl-Version/Manifest
@@ -1,3 +1,3 @@
 DIST Perl-Version-1.013.tar.gz 23012 BLAKE2B 3e75d6fce8af2b418db6fa99c148ebd422ac0ffa4c766499e88f878fb66f355e72046b66cf51ea7daeaccc7f5d91f5e82155b11fd0470a2d4132113a87274432 SHA512 a6740b113c65c9ef4c8c2ce76ea17250ebf582a669086b3bac9df7a68af6765813f03c7e99b55c2a5f3f4c843d426ae3d22df0865d39a25faf6b87b202a3328c
-EBUILD Perl-Version-1.13.0.ebuild 697 BLAKE2B a8e6de7f6c57002675e3694433e884bcb70fe43ca7e67b58dbd4c9a1b49844e15aa46ca0df2adc7a9cf73fa6a210174068f49039c9f68a79621baf14319ce6fc SHA512 29a86a984cbe7152af81841331adfdd70862d13a58bda8341e1492718df7562c6a235f20b55393d6bae1f0e7124381451eb07eb140bf9f7de519c89191341794
+EBUILD Perl-Version-1.13.0-r1.ebuild 597 BLAKE2B 718aaa1e4b456575ad76d87cff42dc0dda003974054f135388c02eda7fdfdf61e63e0f392c621f21eade39196cf521b684910e389ea5da968cc3e0528ec09c0f SHA512 1d7fcec200ab8b889729e532a536a9b6ce21860fe0eafb9668c519163149817a9f6c4f6dd4b1494b1931a744ac39c24eccea367bfd44313c9c7d030b686ea255
 MISC metadata.xml 396 BLAKE2B 360d1ff2ef6e33e0c9a84b109c3e4cc0f1ee0dfff2370d3c33b20fec451e04c8ae436e02c72ca226cb8d386f801608d035df6fea7a3d9ce66392dc171f6be5b3 SHA512 b1be7a20a839e952da50eaab24fb8f837c77116727325f3238323fd89f3459721a69f3c4ea423afa3432c1c0202106d471fa7ede12b3533a8e1cc161735d5ac3
diff --git a/dev-perl/Perl-Version/Perl-Version-1.13.0-r1.ebuild b/dev-perl/Perl-Version/Perl-Version-1.13.0-r1.ebuild
new file mode 100644
index 000000000000..616cca23c80e
--- /dev/null
+++ b/dev-perl/Perl-Version/Perl-Version-1.13.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=BDFOY
+DIST_VERSION=1.013
+inherit perl-module
+
+DESCRIPTION="Parse and manipulate Perl version strings"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	dev-perl/File-Slurp-Tiny
+	>=virtual/perl-Getopt-Long-2.340.0
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+
+src_test() {
+	perl_rm_files t/manifest.t t/pod-coverage.t t/pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Perl-Version/Perl-Version-1.13.0.ebuild b/dev-perl/Perl-Version/Perl-Version-1.13.0.ebuild
deleted file mode 100644
index 7cecfbf121bc..000000000000
--- a/dev-perl/Perl-Version/Perl-Version-1.13.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=BDFOY
-DIST_VERSION=1.013
-inherit perl-module
-
-DESCRIPTION="Parse and manipulate Perl version strings"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# r: Pod::Usage -> perl
-# r: Scalar::Util -> Scalar-List-Utils
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	dev-perl/File-Slurp-Tiny
-	>=virtual/perl-Getopt-Long-2.340.0
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-src_test() {
-	perl_rm_files t/manifest.t t/pod-coverage.t t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Perl6-Junction/Manifest b/dev-perl/Perl6-Junction/Manifest
index 84880ab9e408..5dbc88d8040e 100644
--- a/dev-perl/Perl6-Junction/Manifest
+++ b/dev-perl/Perl6-Junction/Manifest
@@ -1,3 +1,3 @@
 DIST Perl6-Junction-1.60000.tar.gz 7275 BLAKE2B 93d95de63818227a63afa3f5aac910f09f14676d62f647c44149a96756475ef29c76242916fe0d34f99319c68204e4908b12e42ce38c515d633d348183a503cc SHA512 eb6587a446141505561eb03d5af150bff31be3e21c5cde2af6d0b64d5b3793f0de48010d07ad99ca3baea4c9b1531dac6e496eac5e06f16d6cfd1ec6a727bd22
-EBUILD Perl6-Junction-1.600.0.ebuild 314 BLAKE2B b044a60b0b3c3b3e42afe33d28f416753b25e518f37e5b84928f7c26928cb09dfe13aec5438ca7ea5fbec63fa8bf303512271cc79743c518a7bbefe0273f32c8 SHA512 6b73d18849854da406a933ff02dcc8fe6a505071f6653e4d67bc49ba33dfd34016b34dfd138e2dd4aa0a11e2f99fae213925fea377598acfdb572ed785ef98fb
+EBUILD Perl6-Junction-1.600.0-r1.ebuild 289 BLAKE2B 7a8edc7f5b1001a85e87f3efde878b954306bae05f5b65eb4fbf20def2ed8f4d69c893db235cb0484462af62bb5643cfd73de6fc054ab5d7b3e45511ef0b608e SHA512 12e84075f2789fa0abd3dd33c056edf4194a6ed7447856ec7d951caf4fc2964c5d53c15e18dd8f171c5850266de88d38b5ca809c5509b4031efd30f234032844
 MISC metadata.xml 737 BLAKE2B 85bab4d4ab0aab309a776a94f3e2ece787bf8b46dcbf59352a590c0214f54bec2f1586fd3a957c28f303bc26daee1fccefa0fd51a479edada55103099cfe7ed8 SHA512 12f3f8a3522d1f174483250db894208f5667dd0940fefbaa9fb933eff44bad18664a8214f45f902ab5cfce8fd464acdded87daeb2cb78f1f328274c38c62b407
diff --git a/dev-perl/Perl6-Junction/Perl6-Junction-1.600.0-r1.ebuild b/dev-perl/Perl6-Junction/Perl6-Junction-1.600.0-r1.ebuild
new file mode 100644
index 000000000000..7332e26f1222
--- /dev/null
+++ b/dev-perl/Perl6-Junction/Perl6-Junction-1.600.0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CFRANKS
+DIST_VERSION=1.60000
+inherit perl-module
+
+DESCRIPTION="Perl6 style Junction operators in Perl5"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
diff --git a/dev-perl/Perl6-Junction/Perl6-Junction-1.600.0.ebuild b/dev-perl/Perl6-Junction/Perl6-Junction-1.600.0.ebuild
deleted file mode 100644
index b0b2b2dfbdb6..000000000000
--- a/dev-perl/Perl6-Junction/Perl6-Junction-1.600.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=CFRANKS
-MODULE_VERSION=1.60000
-inherit perl-module
-
-DESCRIPTION="Perl6 style Junction operators in Perl5"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/PerlIO-Layers/Manifest b/dev-perl/PerlIO-Layers/Manifest
index 50d72dfc5043..9519367e17dd 100644
--- a/dev-perl/PerlIO-Layers/Manifest
+++ b/dev-perl/PerlIO-Layers/Manifest
@@ -1,3 +1,5 @@
 DIST PerlIO-Layers-0.011.tar.gz 14570 BLAKE2B 11a3f485e1871440a06b274e8a8b0de72414b11f8924ce58942234e4149678f0fb9ee67b4a9f7768a8c6fb60a3d4a596a733aff4efd0ff2f6a7a7cef362723fa SHA512 1c1a7a77c7e52d45c15015ecfee71d679acd98bb067a5d0147d6fe97fb35e40ab0a4dc3ecf1fb1b6ad8c599e9b765448e9dab5345c168552726ef9929d3bed81
+DIST PerlIO-Layers-0.012.tar.gz 63320 BLAKE2B 378a6ac9edc1a0aec1b1f62aee0e9b24596ec8cc609fad699872816ff8001cb3717d171f186ca8e4d806b69000508c4d5e1d2b36414918fd2ec7b74b0668fae9 SHA512 3b8c0103faa49227b68cc6bb835e34c7b3f9731f83421a9b58ad68e469c55795ab977e6983ece8fe6db5b9f0ff4d615affbbea00716cd87a1af28571707dcf6e
 EBUILD PerlIO-Layers-0.11.0-r1.ebuild 894 BLAKE2B 88cd26c5033657b2ce63c8b7c87574ad7f4e402ad9276c33416b0ae8fdf6fcb6c558fc508e095abe934011947dadf27cc9461b8a35d3642bd04b126d390e5a89 SHA512 44bdba8fb1613277c5cc0c45378bda614e54c207d7fcf5a715b102e248ead862104d9cd30a9026a36dd3c9af4e901fa4d7d754e2984bb7ac99ed1e196b73a448
+EBUILD PerlIO-Layers-0.12.0.ebuild 813 BLAKE2B bd99b44fffa336f839f31e9650523dcdb93b708e2e8f5f76d18234f2a2cc3dad63cc96a69212f450a450d4a02d2743fa27b7decf5d6f2f4c7b5c751ce9e618ab SHA512 397300a5449a474421806e4e35a9b27730622d69afd2548f2a1b49e5afdeae2bd1261efbfa328299c0100e9a1acf5875b3d1e16fa44b28a326a7c9a916751a2e
 MISC metadata.xml 494 BLAKE2B fb170a4623a5c09e5f0782e536420e059f2303f5d1062b003c1dc3ff140f5dcc36de5f4f18806ad190a719cc67756af6cdabde9619bb5bd05892c85b869c44ea SHA512 9d483297584596ecaaeb8ae1b982f83a295b66384f7c5283879154a7c18ddee95d38f5ddeb08b5dbbe4e33bf6b8afcad1a3f90b0caae8e3af95d45919dc0b332
diff --git a/dev-perl/PerlIO-Layers/PerlIO-Layers-0.12.0.ebuild b/dev-perl/PerlIO-Layers/PerlIO-Layers-0.12.0.ebuild
new file mode 100644
index 000000000000..9abaf8bfd1d7
--- /dev/null
+++ b/dev-perl/PerlIO-Layers/PerlIO-Layers-0.12.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=LEONT
+DIST_VERSION=0.012
+
+inherit perl-module
+
+DESCRIPTION="Querying your filehandle's capabilities"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=virtual/perl-Exporter-5.570.0
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-XSLoader
+"
+
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.360.100
+	test? (
+		virtual/perl-Data-Dumper
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.820.0
+	)
+"
+
+PERL_RM_FILES=(
+	t/release-pod-coverage.t
+	t/release-pod-syntax.t
+)
+
+src_configure() {
+	unset LD
+	[[ -n "${CCLD}" ]] && export LD="${CCLD}"
+	perl-module_src_configure
+}
+
+src_compile() {
+	./Build --config optimize="${CFLAGS}" build || die
+}
diff --git a/dev-perl/PerlIO-eol/Manifest b/dev-perl/PerlIO-eol/Manifest
index 5c87f9e7c5d2..2ff0b156bf44 100644
--- a/dev-perl/PerlIO-eol/Manifest
+++ b/dev-perl/PerlIO-eol/Manifest
@@ -1,3 +1,5 @@
 DIST PerlIO-eol-0.16.tar.gz 18403 BLAKE2B e1dd73c78bb211d28cd42b168b701f5c58c5ba75d44e16c52e0ecd05c1c7ab981058f36728dafb80e88224d81cbcd17ef35313fd8d9492c7caad065ebf1101a4 SHA512 671d0a362eb7d8650adb95bb555851493299607f72f4f88fd3f3c70326825eee0879f6ac837e99f25498d6c32ef14c57f38c8b82de38f1f66a291ab23d733ead
+DIST PerlIO-eol-0.17.tar.gz 16555 BLAKE2B f50752314d303fa5d5e42f10cc54a4e239242a1a613c3ea64a1453420c7f34e8d1f17d2bcaadb29db1d46fd54d800764479a6af98116f623e11825a393c3d512 SHA512 3be4ced8c173fd0dee327264b6ddd586231fb8c8acc3ee92dce4332db97f8a9649f2af07690e9083767f17c7ac21282a300aef89234048e43851be2b61db9da3
 EBUILD PerlIO-eol-0.160.0.ebuild 736 BLAKE2B d9013e203e7a7e86ff6286a5f0f899dc6348b52a68f51becebabf0b24869c1055248b40eb07f26c76c6cee0a937f70a83c4a4beb72bed767eda9d1a0636f5559 SHA512 11aa9b784776120007f90ecb1ff5b91329c6e8bbed924f0b062a24f3202bc359b4920437fc71d4158c0406ebe76a020c548fb5d6a4d2003d7444964951aaf3f5
+EBUILD PerlIO-eol-0.170.0.ebuild 551 BLAKE2B 3557fed360ac5a38baa8449c018ac3431eaa545ef3c499e83f3c7004df01542d375c61e7ed140e9e6724d74daf27a02543ab973be16da182f0791e02c9a4f645 SHA512 c565a7d40b77eda165618915ea86c9b66f5d93238e1a167a60b5baca7f656fa6afee7a26a75d767e86b6346926cdca18a521def5d1b08af2d874a276219b01c3
 MISC metadata.xml 392 BLAKE2B 0c3240a04404a30973fa4e24f007573d4ced9683ac1f4842309a3763c3546b483951341bde83e29a6424480f42aa74b34359af4a94dc7c527b16f8dfe986d45a SHA512 2fe5b7934930ca0adbca468f8c76a87a013440f57813eeeb6952148b86c1c75c93ba6cca99a4747da18bced10395e7680faa1b84294c7e27ea97d626c0e5c2f4
diff --git a/dev-perl/PerlIO-eol/PerlIO-eol-0.170.0.ebuild b/dev-perl/PerlIO-eol/PerlIO-eol-0.170.0.ebuild
new file mode 100644
index 000000000000..65650e83b8da
--- /dev/null
+++ b/dev-perl/PerlIO-eol/PerlIO-eol-0.170.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SHLOMIF
+DIST_VERSION=0.17
+inherit perl-module
+
+DESCRIPTION="PerlIO layer for normalizing line endings"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+RDEPEND="
+	virtual/perl-Exporter
+	virtual/perl-XSLoader
+"
+
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/PerlIO-gzip/Manifest b/dev-perl/PerlIO-gzip/Manifest
index c6afd3a10680..ce988626c7df 100644
--- a/dev-perl/PerlIO-gzip/Manifest
+++ b/dev-perl/PerlIO-gzip/Manifest
@@ -1,3 +1,3 @@
 DIST PerlIO-gzip-0.20.tar.gz 19076 BLAKE2B e7ff1dd280bbfe80720c113a26626e222695642bc02730f5271345583784ca3e850d1fbd9958acc43a12dd603ef32cefc786acdc8e86263f9d38fd675df9b7e1 SHA512 b24e8fa99cbcbaf07feabfc09cefc55a10c1dce59b495b59343ff5217536f7108c92f462751e70242e6567be32e69a0cc88a2e66325e926174a64042d4b87966
-EBUILD PerlIO-gzip-0.200.0.ebuild 383 BLAKE2B 5fe4faccd1ead61137a08bef19c3cfdd7d192eda5b71a1a8f11d0635304c3bdaa294c591720c5a3979604893a7be44083897c19586f8f521c6f891a3fe24e67f SHA512 0957f5b2553b21f7c059bd64418b266b90088ba71101e62e8358168e9148ccf7c565571a0fb8c9db1f5c55e337955a3f9b541162d2925d0cb87450ba139edcda
+EBUILD PerlIO-gzip-0.200.0-r1.ebuild 397 BLAKE2B a2a12620682506e531e7f6ccbbfad4714b9c20a17957fc74a1d6f0ef48b3f17d55bc11c3fccf04b16913f4cb777ea5e97c6ffe15e37576ecaa8bf18a0a9caf62 SHA512 c718e0a40f4b194d00037140a929d7450fc2768b0a7c1bf399a905d922e01ba70d189fbba447c05b5025ac7c234800005687156a7fba323927efe31a3b2b1198
 MISC metadata.xml 394 BLAKE2B 012d2ebbc40191cec5ea10b27824381fcdf4266f868c774605129074ee7af724978e9af79096a324d508ce5f19f1ca0716936dcdb83f375752804bc5e6857f9d SHA512 88240f01b3ade41e854f34495e5ccc8b1144b187a2284e604ece72edc68c0f0ceec580f4b5128ca5908ff5fb75af6701f751570853903904a3a30cbc4d7c37e3
diff --git a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild
new file mode 100644
index 000000000000..de0173840066
--- /dev/null
+++ b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=NWCLARK
+DIST_VERSION=0.20
+inherit perl-module
+
+DESCRIPTION="PerlIO layer to gzip/gunzip"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+"
+BDEPEND="${DEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0.ebuild b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0.ebuild
deleted file mode 100644
index 028ba27d1d02..000000000000
--- a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=NWCLARK
-DIST_VERSION=0.20
-inherit perl-module
-
-DESCRIPTION="PerlIO layer to gzip/gunzip"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/PerlIO-utf8_strict/Manifest b/dev-perl/PerlIO-utf8_strict/Manifest
index 36305853b783..f396b766eb64 100644
--- a/dev-perl/PerlIO-utf8_strict/Manifest
+++ b/dev-perl/PerlIO-utf8_strict/Manifest
@@ -1,3 +1,5 @@
 DIST PerlIO-utf8_strict-0.007.tar.gz 67922 BLAKE2B 4d13dc6e6b4cdf7a4bf3cd51ca1e054d82cab4094894f4cee7503201cc11f80ab27951417778f7e179aee03b75b4bbb30e839a498c83d5afd3881db64973d324 SHA512 0d39be9bcbab4cea087f59c67dc1af6773b6258c5e836590ff58cc18bf3392ba6e95c55a0c7ce94236e0be7053802b4b1d6010130355e1a973a3698aaf49af0f
+DIST PerlIO-utf8_strict-0.008.tar.gz 95180 BLAKE2B 5e041d619036e589cf3d9272be20f2eaf50066700d5b401e923fec4745ecc2f74107f2a57a9b2c22a4b4ccee908a595b7618a2c5f74000635393ef9fcbeb8507 SHA512 5a54c379925880abca7f85a2b08c19d54e222a03e06490ff366ee38e68018b5f6a4ab0bb8df15f9581b6265eac550090a35f3a4f52c748c008c9c575af41c911
 EBUILD PerlIO-utf8_strict-0.7.0.ebuild 855 BLAKE2B d96be54a4b06e419987b9e0fc14ff5ac9cc45e5e2471b3431fb49d2f91743324751ee565301f321dd74a47a245c7403b89a69d586d3d1a7e7605a2e39efebc44 SHA512 4c3b7a16ab2c37009a57f41d3eed72133b6f7d6ad8c6eb9f38c96ecada3aa3d66e74568dbcbaf7144a7689b9f4bfdb41a7c3a71e7163a7d8fa1d25dab75c507e
+EBUILD PerlIO-utf8_strict-0.8.0.ebuild 670 BLAKE2B 5574ed7c8e6ebd7e62a9393ccdfd0107b30061cd91aa0a858f74b4cffc2d8174c9f3eb895fa7eb3b0f03f1b13b08c0874d42b2212fccf1a039d337df3f660dcc SHA512 9b4ab1e03e23ef2808843f4f0a558a2974609beeccd89a58000632dae05e6d8420e2f007199c9de0a43b17ecb18429a7b153647c213ed14542ee52d1ed0c1b6f
 MISC metadata.xml 408 BLAKE2B 7c975db4716a114a97f21cfaebc54334634ae0d8f6c8d58bd19edc8853a74583c4f16d0f3729f380bf9cf6cb1d0a668f9484ef58418370e977151877a79c5860 SHA512 bc9d04bc551d13a2712b9e57613d9e423a1649e3cda65436178079dc13cbdadf183f4aea41963d023744d60d638900944ddb60752f054a728d6868594d2f4c55
diff --git a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.8.0.ebuild b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.8.0.ebuild
new file mode 100644
index 000000000000..102ba0bf9828
--- /dev/null
+++ b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.8.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DIST_AUTHOR=LEONT
+DIST_VERSION=0.008
+inherit perl-module
+
+DESCRIPTION="Fast and correct UTF-8 IO"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	virtual/perl-XSLoader
+"
+
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Carp
+		virtual/perl-Exporter
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		dev-perl/Test-Exception
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/PerlIO-via-Timeout/Manifest b/dev-perl/PerlIO-via-Timeout/Manifest
index 18527dc0159c..e83b4561521b 100644
--- a/dev-perl/PerlIO-via-Timeout/Manifest
+++ b/dev-perl/PerlIO-via-Timeout/Manifest
@@ -1,3 +1,3 @@
 DIST PerlIO-via-Timeout-0.32.tar.gz 13560 BLAKE2B df75209e32f2f7fbe48ccd1073780ee3ecc2e3d7b400f151845901714fad5568301258211d8aa16128a8bfa91197e3a8a12a96bcc9e8c694a5b4da7a54608008 SHA512 52200c0d19da7a19b9b328473b0e7b57a1a3102fd3ace947af8fef8f670aaebe37811daaa2e2b6cf2f6397855a4cfb2424af053322146a8acefd71e1bb30f681
-EBUILD PerlIO-via-Timeout-0.320.0.ebuild 614 BLAKE2B 70dbbf151e570001fda8a346709110aeaa51d061f16ab0b8d3f9eedf0b8504877f5bb0def1742576e69a1dd6e8bad3337d951255c25cf44e32f6b730d9317fc0 SHA512 21c21f7ebdec60a1704ce692b9eec4523571ca8e33c57e2ece6639a5127b87d855711068872fd9cacb4376db16e83ef088588080439f995c4cdb7b672c62211c
+EBUILD PerlIO-via-Timeout-0.320.0-r1.ebuild 576 BLAKE2B 20df089a445096a6fdd8b4ccc2c78d13d7616b7c1e2d3224fc46b011c5c2e8c7579651598ffd6f91995e76ace5225dab3dc6e998e7ad9f843147c4a91bec42fb SHA512 9f953928e9fe3481bc70b799e42430a9d78dc77f02482319b0c8c053b4861dc6c90e238724319c80d1efb9ef3c7e9e5684544cb09dc813eb9e0cad0e5af90c70
 MISC metadata.xml 409 BLAKE2B 5d06a8584c1329623c1c282fc1c289477e5c85f0034f30ded7618c3b3d8f8a0a08e38db1c6d198dd66961094562d0a6b475ad1f6e17d59b809040016f7d2a45b SHA512 4364e0aab7889ecaec5b980a143a2dcd8ff0f206ca4d7669379d441bd254059465285ffee6450d2974e868f1b38f26a6e88194a812eff9cfbc4dc2d2fac0aec4
diff --git a/dev-perl/PerlIO-via-Timeout/PerlIO-via-Timeout-0.320.0-r1.ebuild b/dev-perl/PerlIO-via-Timeout/PerlIO-via-Timeout-0.320.0-r1.ebuild
new file mode 100644
index 000000000000..12e74efbde47
--- /dev/null
+++ b/dev-perl/PerlIO-via-Timeout/PerlIO-via-Timeout-0.320.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DAMS
+DIST_VERSION=0.32
+inherit perl-module
+
+DESCRIPTION="PerlIO layer that adds read & write timeout to a handle"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86"
+
+RDEPEND="
+	>=virtual/perl-Exporter-5.570.0
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Time-HiRes
+"
+BDEPEND="
+	>=dev-perl/Module-Build-Tiny-0.39.0
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+		dev-perl/Test-TCP
+	)
+"
diff --git a/dev-perl/PerlIO-via-Timeout/PerlIO-via-Timeout-0.320.0.ebuild b/dev-perl/PerlIO-via-Timeout/PerlIO-via-Timeout-0.320.0.ebuild
deleted file mode 100644
index a8a39531bfa8..000000000000
--- a/dev-perl/PerlIO-via-Timeout/PerlIO-via-Timeout-0.320.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DAMS
-DIST_VERSION=0.32
-inherit perl-module
-
-DESCRIPTION="PerlIO layer that adds read & write timeout to a handle"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-Exporter-5.570.0
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Time-HiRes
-"
-DEPEND="
-	>=dev-perl/Module-Build-Tiny-0.39.0
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-IO
-		virtual/perl-Test-Simple
-		dev-perl/Test-TCP
-	)
-"
diff --git a/dev-perl/PerlIO-via-dynamic/Manifest b/dev-perl/PerlIO-via-dynamic/Manifest
index 6e0fd3235cfe..8747d8e16d63 100644
--- a/dev-perl/PerlIO-via-dynamic/Manifest
+++ b/dev-perl/PerlIO-via-dynamic/Manifest
@@ -1,3 +1,3 @@
 DIST PerlIO-via-dynamic-0.14.tar.gz 35085 BLAKE2B bbcf7aecbd20bf2eb39e43a8e241a4476d8abc0f2933f70e8e30aace1e37dbc04abc3b1e70b2e7c178bde39dcd32f6031e5ee7d87a284059f1360164275d8006 SHA512 d42da05a74ce9ca0d72c549a44c9c1ab20259fb28e9e1042ae6dc9e83e52aa85f18d47b52254716724995d1bdf181ce16c51a7ef7705390fe8a9f041f65ed978
-EBUILD PerlIO-via-dynamic-0.140.0-r1.ebuild 566 BLAKE2B eaae5ff0d27f557a1db7a9adbc2b7078cad1b75d519818f10c79df7623e2af94f1db38868b4809203c004b2e4979e72ce2b5683b4cebafd4480dfcedba623e11 SHA512 7d125099ce98ff92a504d37496306ab17d0633103b48e6cbe7a483a0d545544b5a14c7f7b490100bfd84ea7605e8f0ca3485b2f51e880db764aef1bffcfb51ec
+EBUILD PerlIO-via-dynamic-0.140.0-r2.ebuild 563 BLAKE2B 459e4eb5b7583f5f3aec534d8dfcc74c9e78583c088f6dd11676210ddc7db3b8173bbb7fd1ac09c150227bffa7fda2ad450a14938e3e98d4dee6f93b36bf7111 SHA512 9bcd0b30b64c589afe6ede6f9341c68a2a19a30f2650be00736084839e4d84f6bdf37302639a285dc43fdedaa1518af200eae2b1d2042c1e9e73e0685aaa827f
 MISC metadata.xml 409 BLAKE2B fc54fc0f6ffa557098642744f40b2d77f55b26b8addda3bb838341275be5839b48fce2842f68a691452d463d7645dd3c32a0b288a01c8211851b773b481fcbc7 SHA512 1b3ccb96197c77b169f9649275ed144aa15af5db7ff28c7296dab98c8380234d2a560b3df4d17637985bcc3ea3c44a24d4a281efd3c83c935ee9b52747831354
diff --git a/dev-perl/PerlIO-via-dynamic/PerlIO-via-dynamic-0.140.0-r1.ebuild b/dev-perl/PerlIO-via-dynamic/PerlIO-via-dynamic-0.140.0-r1.ebuild
deleted file mode 100644
index 10f8e51c1162..000000000000
--- a/dev-perl/PerlIO-via-dynamic/PerlIO-via-dynamic-0.140.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ALEXMV
-DIST_VERSION=0.14
-inherit perl-module
-
-DESCRIPTION="Dynamic PerlIO layers"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND=">=virtual/perl-File-Temp-0.14"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install/use lib q[.]; use inc::Module::Install/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/PerlIO-via-dynamic/PerlIO-via-dynamic-0.140.0-r2.ebuild b/dev-perl/PerlIO-via-dynamic/PerlIO-via-dynamic-0.140.0-r2.ebuild
new file mode 100644
index 000000000000..c69909faf7fc
--- /dev/null
+++ b/dev-perl/PerlIO-via-dynamic/PerlIO-via-dynamic-0.140.0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ALEXMV
+DIST_VERSION=0.14
+inherit perl-module
+
+DESCRIPTION="Dynamic PerlIO layers"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+RDEPEND="
+	>=virtual/perl-File-Temp-0.14
+"
+BDEPEND="${RDEPEND}
+"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install/use lib q[.]; use inc::Module::Install/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
diff --git a/dev-perl/Perlbal-XS-HTTPHeaders/Manifest b/dev-perl/Perlbal-XS-HTTPHeaders/Manifest
index 1ceff25a1e1d..93e7bd96d05d 100644
--- a/dev-perl/Perlbal-XS-HTTPHeaders/Manifest
+++ b/dev-perl/Perlbal-XS-HTTPHeaders/Manifest
@@ -1,3 +1,3 @@
 DIST Perlbal-XS-HTTPHeaders-0.20.tar.gz 24735 BLAKE2B a105621cf8093cd420f21de1f0283f3ec84a7ae4d10946741ba98e9516c57e01f7e910abebbdd0120a00c0072286c9988c76eaffa3a223d5a85645866e1ce8f7 SHA512 dd9719fbc2297946f8718f174801fe07cb169e846f40e4c49cc88e2aa4e072fb427e5a408a3eae386fc0f8fbe19e0848a1d001927e757b7b299254cd0c6be88c
-EBUILD Perlbal-XS-HTTPHeaders-0.200.0-r1.ebuild 334 BLAKE2B bdd4fdc2d28913ee546a455a891420d02c6c079f784071d6958a777f7593049328330c421e5709c517c633316dfd206eaf7a1a25a478449aa7e675953c74d265 SHA512 7223b5ad90773a34e4e54a28b28998ce7884391f367668b80977d4ce652b358a695286d30c394e7d38b04431e5f03f67b4e44b33bc242ea881835ad5d395c357
+EBUILD Perlbal-XS-HTTPHeaders-0.200.0-r1.ebuild 320 BLAKE2B 7e436bf92a0a2034db3c72ee90412e051b11a916f6a5c5fb8e225962576e0444207cbd1124cb731487179e2a92a10961dfe1d3a63aac40cf185ea5dbff680359 SHA512 d1243fe2be84e06d6e40f90b4eee24b06db6606e1b1a2ed0f5c4501bcd86efd0c8915c894ead76df61f692ecc8b5268b3fd59a288641abcce47cc70b49ea1f19
 MISC metadata.xml 500 BLAKE2B 6cf4bf7c0afdcb6d091676db5215d911d7e9ad1c35958bcffddfb8a22ec68a27741466c1d4a6d128384a559a38cf9bdd16589f04c0d34c1cccc500bb71f50a42 SHA512 75a6c563b62255e6bdf6ec119e4ca8ee012c6edc2439657440c5eaf670d0536807f32245065bc0cf9df31400cfc6923540b4052646573b50e22d187af5d6c8a6
diff --git a/dev-perl/Perlbal-XS-HTTPHeaders/Perlbal-XS-HTTPHeaders-0.200.0-r1.ebuild b/dev-perl/Perlbal-XS-HTTPHeaders/Perlbal-XS-HTTPHeaders-0.200.0-r1.ebuild
index 50b5e2d3718c..e36c58158f90 100644
--- a/dev-perl/Perlbal-XS-HTTPHeaders/Perlbal-XS-HTTPHeaders-0.200.0-r1.ebuild
+++ b/dev-perl/Perlbal-XS-HTTPHeaders/Perlbal-XS-HTTPHeaders-0.200.0-r1.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-MODULE_AUTHOR=DORMANDO
-MODULE_VERSION=0.20
+DIST_AUTHOR=DORMANDO
+DIST_VERSION=0.20
 inherit perl-module
 
 DESCRIPTION="XS acceleration for Perlbal header processing"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 RDEPEND="dev-perl/Perlbal"
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Perlbal/Manifest b/dev-perl/Perlbal/Manifest
index ce3889bfd7b6..65fe6687bdca 100644
--- a/dev-perl/Perlbal/Manifest
+++ b/dev-perl/Perlbal/Manifest
@@ -1,5 +1,5 @@
 AUX Perlbal-1.58-Use-saner-name-in-process-listing.patch 926 BLAKE2B 5774792f165e388831675cc7231f6c8c57ea811b320b8bc52f1c4c3fab4c9a445162b62a3910cbea15c0c33cd21e1bfaaef9ce976e6634d668adb107730409d8 SHA512 58f291d8cff24199ca70908d828518daa5102cbd66171b70a7babdc100b126f3752551e42fcc963c0d155c9d722c1f04c02fbda1e2053d310e2517eb82acf032
 AUX Perlbal-1.80-init-scripts.patch 1302 BLAKE2B 7f57134d74ebb709085076d66150bbc76fe97df3b11531137c3b7a14ffd48e71a05154a0acee7ad6f0e25e484f51864e6455b11c5a4c0ae85396d3d0354c61fd SHA512 567ddf016def6ff31756a7df6410d6b7f525102c4a963bfee2349999d82a39c8df36fad0f45fba8ae93ea98c0c87749507aed257bddc5ac985516a9818f8af61
 DIST Perlbal-1.80.tar.gz 212701 BLAKE2B 63503e3a8df7ea2cfd463ed41b810627c456e406bae239b16e9d50685be21cf706248dbba054b45685e9b7ee4d2e3d0224cc9c73b5fe41c219e4bfcb6929aa95 SHA512 22d9fc9c92a85dce662a3d042fa6a3aa0fc942d935d95b87094a38961a2e72396cbc45eada80112eabb019a89b845b73a8e1d7720f3799bdbbe185e1404442e7
-EBUILD Perlbal-1.800.0-r2.ebuild 1260 BLAKE2B 2d36353ecf52583ce86ba0e9ee423eb38f4f527a4d09ba0f79bef879a53b5de850a6a90505a2a002c5a5a0f6809b7fce14e54486b92e9f7b6568f1fc73dd936b SHA512 022def7b77d20a4badbb6d009fd9ddee856ab646dbc3973127d0643796f1b494efb1c53dce95094ebdec431bfd6adc2a8c7408a4175d4701365a37f3f99af33d
+EBUILD Perlbal-1.800.0-r3.ebuild 1218 BLAKE2B e655ed9f7f96da34faa5157b65bd8ba316faea726ab7036e1d438623cbd74659cb8209d31b554606c8bfc6bfca2c32ff80cdb6b2e8c3a8a370b86c7b529666b6 SHA512 9c66be5b8a16fda2fc7a87df2263bba3a869498d877fc7e6d30a38f4daaa5279e2513b59814828f4f15255ff4e7d393291743ea8514417d0172dc72334d5cd44
 MISC metadata.xml 3980 BLAKE2B 62906cefa278020835332d56da288a37f982b66783421444bf734a235ea8800c500898eb245dde9d5bc6815f68961d9f76b8164d18cdcbc739d79104562710f7 SHA512 55c322461362fe728eee2ffd956a236d651107c9686c09da2da9a516e2983e6e4b75942934ed2d7fd50844a398e3bb25673b0742874026058349543b3703ec38
diff --git a/dev-perl/Perlbal/Perlbal-1.800.0-r2.ebuild b/dev-perl/Perlbal/Perlbal-1.800.0-r2.ebuild
deleted file mode 100644
index 07ce73ed9d0a..000000000000
--- a/dev-perl/Perlbal/Perlbal-1.800.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DORMANDO
-DIST_VERSION=1.80
-inherit perl-module
-
-DESCRIPTION="Reverse-proxy load balancer and webserver"
-HOMEPAGE="http://www.danga.com/perlbal/"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-perl/libwww-perl
-	dev-perl/HTTP-Date
-	dev-perl/Sys-Syscall
-	>=dev-perl/Danga-Socket-1.440.0
-	dev-perl/HTTP-Message
-	dev-perl/BSD-Resource
-	dev-perl/IO-AIO
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.58-Use-saner-name-in-process-listing.patch"
-	"${FILESDIR}/${PN}-1.80-init-scripts.patch"
-)
-
-PERL_RM_FILES=(
-	# These currently fail for unclear reasons
-	"t/20-put.t"
-	"t/31-realworld.t"
-	"t/32-selector.t"
-	"t/35-reproxy.t"
-	"t/40-ranges.t"
-)
-DIST_TEST="do" # parallel testing broken
-
-src_install() {
-	perl-module_src_install || die "perl-module_src_install failed"
-	cd "${S}"
-	dodoc doc/*.txt
-	docinto hacking
-	dodoc doc/hacking/*.txt
-	docinto conf
-	dodoc conf/*.{dat,conf}
-	keepdir /etc/perlbal
-	newinitd "${S}"/gentoo/init.d/perlbal perlbal
-	newconfd "${S}"/gentoo/conf.d/perlbal perlbal
-}
-
-pkg_postinst() {
-	einfo "Please see the example configuration files located"
-	einfo "within /usr/share/doc/${PF}/conf/"
-}
diff --git a/dev-perl/Perlbal/Perlbal-1.800.0-r3.ebuild b/dev-perl/Perlbal/Perlbal-1.800.0-r3.ebuild
new file mode 100644
index 000000000000..8734c215269d
--- /dev/null
+++ b/dev-perl/Perlbal/Perlbal-1.800.0-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DORMANDO
+DIST_VERSION=1.80
+inherit perl-module
+
+DESCRIPTION="Reverse-proxy load balancer and webserver"
+HOMEPAGE="http://www.danga.com/perlbal/"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-perl/libwww-perl
+	dev-perl/HTTP-Date
+	dev-perl/Sys-Syscall
+	>=dev-perl/Danga-Socket-1.440.0
+	dev-perl/HTTP-Message
+	dev-perl/BSD-Resource
+	dev-perl/IO-AIO
+"
+BDEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.58-Use-saner-name-in-process-listing.patch"
+	"${FILESDIR}/${PN}-1.80-init-scripts.patch"
+)
+
+PERL_RM_FILES=(
+	# These currently fail for unclear reasons
+	"t/20-put.t"
+	"t/31-realworld.t"
+	"t/32-selector.t"
+	"t/35-reproxy.t"
+	"t/40-ranges.t"
+)
+
+DIST_TEST="do" # parallel testing broken
+
+src_install() {
+	perl-module_src_install
+	cd "${S}" || die
+	dodoc doc/*.txt
+	docinto hacking
+	dodoc doc/hacking/*.txt
+	docinto conf
+	dodoc conf/*.{dat,conf}
+	keepdir /etc/perlbal
+	newinitd "${S}"/gentoo/init.d/perlbal perlbal
+	newconfd "${S}"/gentoo/conf.d/perlbal perlbal
+}
+
+pkg_postinst() {
+	einfo "Please see the example configuration files located"
+	einfo "within /usr/share/doc/${PF}/conf/"
+}
diff --git a/dev-perl/PlRPC/Manifest b/dev-perl/PlRPC/Manifest
index 14142a15c0b3..8d68a4049f03 100644
--- a/dev-perl/PlRPC/Manifest
+++ b/dev-perl/PlRPC/Manifest
@@ -2,5 +2,5 @@ AUX PlRPC-0.2020-no-dot-inc.patch 1263 BLAKE2B 70e84dc34a3af595fee7ca08af7f4122a
 AUX PlRPC-0.2020-no-perldoc.patch 634 BLAKE2B 69f2667a74b9c8b7c8e3d98ecda5ce293aa9d7f9328f0ae9427e3a30e80a1ed8b482abe8edcf3d3d7d0b79928b63fa5641a80a2fb703fd6e2d206ee7f25f1904 SHA512 8a9a1ed654f99a54bf7ebd248f2f6332df731586117460c75459271f8100864e14bc01e98883b52f3d5ab3de0012bd2a205007e034d799904db221d644a69ddd
 AUX Security-notice-on-Storable-and-reply-attack.patch 3844 BLAKE2B 5e58c7fe2f8e5231f00e4cee037deaecab4ae21ba153db412d14aa021cb7b2ff37f4d3ce560ff2985a5912e852c4920b79ac09745f8628d11cec64c3f3362f13 SHA512 21b3db796b34d994d4d967fc69af680f6d5281001829145aa7765b7ef9324cfd021f277358aabb820ef1496d0b8ffe0611fcfa0bf697709b4defd0843837e398
 DIST PlRPC-0.2020.tar.gz 18229 BLAKE2B 1384a4dfe3483e2eeb8c2cd7805a9f1f550a373ba37e328ac57acc0bf1d581fbfffde111b18f5d025cd8bf56e3d8f2171bdd81246c9f54d0151238f0bc264c43 SHA512 2c79c5c27bce7027561f1968023ae4307778f291caa9291fee779537d047a35bb4bd5928fe2b343a2b09dbdcf6450239d79c6898018ea880619a7c69a1498a86
-EBUILD PlRPC-0.202.0-r3.ebuild 758 BLAKE2B dfa5081ddd3bdff31e2eb8b4334c689e8ca0abf8f4805eac71e81996f673ce2796c6ff5355d29488bcdfe76eff3c6ecb1c4a3929fe322edfc5dbb8ca1352cd53 SHA512 4e1d17e5d2090b58612b5e30764d74cd8bc980dcf02ab968b02000a5988998952f636a41e8f5da06a1f909027360ccf8b9ead9cd03300be829b64436fd95455e
+EBUILD PlRPC-0.202.0-r4.ebuild 752 BLAKE2B 99e2852ca1e09840346c65fd928b1069332741105592d1ffc13dac053d1ddb1f066cdae360421a2f4e25e8d089503ef5533d777d063bc6c94a1e5bd60f1ac5ca SHA512 555aa81cd91060f22735c0eb60a1eb1d920de7bad9f5c057701b740408630401781428774527e6530433a2a1dfc6143b16940fd115b48c6ebfddd59eaa8e7a40
 MISC metadata.xml 775 BLAKE2B 3a9dbf3274b5c5cc57ea399f21ce356f05c0a9be7eb5c98b7251461450768a1d46e1db6e652bbc620d8b5d9acf60ab0fe19deb2fea6f8f87397997413f4abc7f SHA512 bbaa42d69e787c17cb1bd20bd9db9504377a89c426d6173659e2637df7efe8744dcb37641cc0ebe3041199b221beacd049cda5eb2628fdd6196b8a93c462d583
diff --git a/dev-perl/PlRPC/PlRPC-0.202.0-r3.ebuild b/dev-perl/PlRPC/PlRPC-0.202.0-r3.ebuild
deleted file mode 100644
index 9897298905c7..000000000000
--- a/dev-perl/PlRPC/PlRPC-0.202.0-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MNOONING
-DIST_SECTION=${PN}
-DIST_VERSION=0.2020
-inherit perl-module
-
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="The Perl RPC Module"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=virtual/perl-Storable-1.0.7
-	>=dev-perl/Net-Daemon-0.34"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2020-no-perldoc.patch"
-	"${FILESDIR}/Security-notice-on-Storable-and-reply-attack.patch"
-	"${FILESDIR}/${PN}-0.2020-no-dot-inc.patch"
-)
-DIST_TEST="do" # Parallel testing fails
diff --git a/dev-perl/PlRPC/PlRPC-0.202.0-r4.ebuild b/dev-perl/PlRPC/PlRPC-0.202.0-r4.ebuild
new file mode 100644
index 000000000000..be16f6411c1f
--- /dev/null
+++ b/dev-perl/PlRPC/PlRPC-0.202.0-r4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MNOONING
+DIST_SECTION=${PN}
+DIST_VERSION=0.2020
+inherit perl-module
+
+S=${WORKDIR}/${PN}
+
+DESCRIPTION="The Perl RPC Module"
+
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=virtual/perl-Storable-1.0.7
+	>=dev-perl/Net-Daemon-0.34"
+BDEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2020-no-perldoc.patch"
+	"${FILESDIR}/Security-notice-on-Storable-and-reply-attack.patch"
+	"${FILESDIR}/${PN}-0.2020-no-dot-inc.patch"
+)
+
+DIST_TEST="do" # Parallel testing fails
diff --git a/dev-perl/Plack/Manifest b/dev-perl/Plack/Manifest
index d22a5f87a25c..de683298de81 100644
--- a/dev-perl/Plack/Manifest
+++ b/dev-perl/Plack/Manifest
@@ -1,4 +1,6 @@
 AUX Plack-1.3.900-network-testing.patch 6047 BLAKE2B 2293cc7cd0ae0b429b5923dd2e66e40c666f3336952463cbf574e636083139f9a66fc459d37e9f7ad19e8548efa19237e609c5a49e86f8fe4bb19d225ad937cf SHA512 214a2a2141f71875026ed25387d6076d62c0b4d0b912ebf475645b3a2948f41faa7d8826c46620682448a3b9916a53c3178858286551d542073c5b66112b4fce
 DIST Plack-1.0044.tar.gz 178730 BLAKE2B 60f6a900b1ebf05c48295ae679e7cda905441d4322929e9280aa87e6fda51a08e3fbaef37e2398fcfef3b39268f115603dcec2529dd135ddc86b79c9118da0c8 SHA512 a0dae77d507d4b4cf4192931470cf87f68f7027b2057ccdf757680f9e6584534ee0da79c508a44f9ea72426497e1dbbdb7acf6d7dfdf31698f4320f2c1f2ac61
+DIST Plack-1.0048.tar.gz 190445 BLAKE2B e9df8f26e2d7c699581e77d3a67fea9ff98a62cbd73e039700f0f06d7dc6b0a99ddf7301bad95765c4302225c5a5f2cad5088306d44467e587d0356455fadb26 SHA512 52168240deaaf613a86a157bde426d22e1e857e0506605f0e7568aa05b968d236ed42843772d7dc187de8f9ebf0329999ac534c04bda8fa739173da45828a5e0
 EBUILD Plack-1.4.400-r1.ebuild 1768 BLAKE2B dc4ecf966e8f46a8abdb1fe0c441df06e61e58d60cd4b4d006cf7b122b6f12eea906725861c0cd5a4a2d6a01dbd426f3f564b2a377be052c126b16dbf8411c59 SHA512 c908c17bb9523dfd8786c8c7610968362e4500b9c3757b6d680f9f54c84eea228e48f3b35a702d6c0ca00a402159415f6a131307642e235d430fe7c4984fd07b
+EBUILD Plack-1.4.800.ebuild 1764 BLAKE2B 42c0f678f379b50aac90f3164c88e3fafaaf53269c586e30dc3a226d7591b93a9e6f47b49ba57f13eab187519f942dbacad7152d0195c57829cb4306da4ad484 SHA512 1094df1642bc8a8340faa3e1429f146234a3625897a8e6f7ab64d3a4c8f52605f28624f3c2bcdaa1ea3271354b84af05a719a8fa6862f18f157ed343751b219a
 MISC metadata.xml 5553 BLAKE2B 5b02f3ae63335b64b251a5310d3191beea142c599c6d19034096bd6ebbaa9a478ce8f533c3520550f7ee761859908bd327cf8b4d41deeaac73577bbfc2f160ec SHA512 13cbe0cf258311039d50b04983ea67eaa88beaffb9d4e8bb46ff1a985b8846b5e66fa9a284f38615c3aeb697ad9c62177b6bcbc0b9b47969a1e6d942580c4dfc
diff --git a/dev-perl/Plack/Plack-1.4.800.ebuild b/dev-perl/Plack/Plack-1.4.800.ebuild
new file mode 100644
index 000000000000..de2f26e9ed48
--- /dev/null
+++ b/dev-perl/Plack/Plack-1.4.800.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MIYAGAWA
+DIST_VERSION=1.0048
+DIST_EXAMPLES=("eg/dot-psgi/*")
+inherit perl-module
+
+DESCRIPTION="Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="minimal"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.900-network-testing.patch"
+)
+
+RDEPEND="
+	!minimal? (
+		dev-perl/CGI-Compile
+		dev-perl/CGI-Emulate-PSGI
+		dev-perl/FCGI
+		dev-perl/FCGI-ProcManager
+		>=dev-perl/libwww-perl-5.814.0
+		>=dev-perl/Log-Dispatch-2.250.0
+		dev-perl/Log-Log4perl
+		dev-perl/Module-Refresh
+	)
+	>=dev-perl/Apache-LogFormat-Compiler-0.330.0
+	>=dev-perl/Cookie-Baker-0.70.0
+	>=dev-perl/Devel-StackTrace-1.230.0
+	>=dev-perl/Devel-StackTrace-AsHTML-0.110.0
+	>=dev-perl/File-ShareDir-1.0.0
+	dev-perl/Filesys-Notify-Simple
+	>=dev-perl/HTTP-Entity-Parser-0.250.0
+	>=dev-perl/HTTP-Headers-Fast-0.180.0
+	>=dev-perl/HTTP-Message-5.814.0
+	>=virtual/perl-HTTP-Tiny-0.34.0
+	>=dev-perl/Hash-MultiValue-0.50.0
+	>=dev-perl/Pod-Parser-1.360.0
+	>=dev-perl/Stream-Buffered-0.20.0
+	>=dev-perl/Test-TCP-2.150.0
+	dev-perl/Try-Tiny
+	>=dev-perl/URI-1.590.0
+	>=dev-perl/WWW-Form-UrlEncoded-0.230.0
+	virtual/perl-parent
+"
+
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/File-ShareDir-Install-0.60.0
+	test? (
+		!minimal? (
+			dev-perl/Authen-Simple-Passwd
+			dev-perl/HTTP-Request-AsCGI
+			dev-perl/HTTP-Server-Simple-PSGI
+			dev-perl/Log-Dispatch-Array
+			dev-perl/LWP-Protocol-http10
+			dev-perl/MIME-Types
+			>=dev-perl/Test-MockTime-HiRes-0.60.0
+		)
+		dev-perl/Test-Requires
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
+
+src_test() {
+	perl_rm_files "t/author-pod-syntax.t"
+	perl-module_src_test
+}
diff --git a/dev-perl/Plucene/Manifest b/dev-perl/Plucene/Manifest
index a2b5404f37f6..b055178653f8 100644
--- a/dev-perl/Plucene/Manifest
+++ b/dev-perl/Plucene/Manifest
@@ -1,3 +1,3 @@
 DIST Plucene-1.25.tar.gz 335300 BLAKE2B 9a9748bf337411ef67302d10db1e7fe59e88b7438c935b3e8573ffaf60cd1ae91f1b98947ecb2d1a3dd3cabacaef88c05d02a3542b8bb1a9e4f2d550f9dac3f9 SHA512 3e3dad8dd6ac6f7ab6b19c381d4fb2a850a87492d3b991b3622788c00a5af66c87a08b343641ef082d323ef52ede784db6f5bca276baa227673772599a8bf750
-EBUILD Plucene-1.250.0-r2.ebuild 1056 BLAKE2B 0ecdfc362e663fc52232734b1a1f0d39a757a3366ad2689e92d748e52488a43be6f19ee90023b56dc29c43940a2a340a99ca0d4ef1e7b7baba4d98577be1e3b5 SHA512 6607f695e847e78501412340ab2263478ab7d7100946cee08643ad3b53a888abf2bffcb0d08877973e043b2abba66b8f280bbaf2ccce4fdda366439f4e8723a5
+EBUILD Plucene-1.250.0-r3.ebuild 928 BLAKE2B 30f81688f6d6bf7f1b4fe84ad8f1c1009359766aea49069e4132e074e22866583361013857bf18fe83ad03b10b2bfb3ba71bfafeb170e3537ac05ba311b41b90 SHA512 db1429bd024bba3411b1c9a51b98e51c654f9936672e48c78a867b78fa67e1e6dc25ea15a3ac3556b8ed8c19d7254127facfda809fb1de762670d618302ee648
 MISC metadata.xml 6276 BLAKE2B c2415b9b16d1e4382899b972bf82c7028066f3a2ac93b2ea4cbceaa8eaca5a092dc12d40b7d16dc35f15e623f355dff685e9adf4c4c43455a83beb5bfb70a73c SHA512 8c8d199803fc7dd575bc3029c25cf2ff4633c45af07334a968e95beb9549caa4d1b5a882d8cc0cdc4235f38ff77897f1abcf32286e45d429d8d65e91fc8efae0
diff --git a/dev-perl/Plucene/Plucene-1.250.0-r2.ebuild b/dev-perl/Plucene/Plucene-1.250.0-r2.ebuild
deleted file mode 100644
index 73b797d201b1..000000000000
--- a/dev-perl/Plucene/Plucene-1.250.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=TMTM
-MODULE_VERSION=1.25
-inherit perl-module
-
-DESCRIPTION="Plucene - the Perl lucene port"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Bit-Vector-Minimal-1.0.0
-	virtual/perl-Carp
-	>=dev-perl/Class-Accessor-0.180.0
-	>=dev-perl/Class-Virtual-0.30.0
-	virtual/perl-Encode
-	virtual/perl-File-Spec
-	virtual/perl-IO
-	dev-perl/Lingua-Stem
-	>=virtual/perl-Scalar-List-Utils-1.130.0
-	>=virtual/perl-Memoize-1.10.0
-	>=dev-perl/Tie-Array-Sorted-1.100.0
-	virtual/perl-Time-Piece
-	dev-perl/Encode-compat
-	dev-perl/File-Slurp
-	dev-perl/IO-stringy
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.280.0
-	test? ( >=virtual/perl-Test-Harness-2.300.0 )
-"
-
-SRC_TEST="do"
-
-PERL_RM_FILES=( t/99_pod.t )
-
-src_install() {
-	perl-module_src_install
-	rm -rf "${ED}"/usr/bin
-	rm -rf "${ED}"/usr/share/man
-	insinto /usr/share/doc/${PF}/examples
-	doins bin/*
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/dev-perl/Plucene/Plucene-1.250.0-r3.ebuild b/dev-perl/Plucene/Plucene-1.250.0-r3.ebuild
new file mode 100644
index 000000000000..88a603a361c4
--- /dev/null
+++ b/dev-perl/Plucene/Plucene-1.250.0-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TMTM
+DIST_VERSION=1.25
+DIST_EXAMPLES=( "bin/*" )
+inherit perl-module
+
+DESCRIPTION="Plucene - the Perl lucene port"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND="
+	>=dev-perl/Bit-Vector-Minimal-1.0.0
+	virtual/perl-Carp
+	>=dev-perl/Class-Accessor-0.180.0
+	>=dev-perl/Class-Virtual-0.30.0
+	virtual/perl-Encode
+	virtual/perl-File-Spec
+	virtual/perl-IO
+	dev-perl/Lingua-Stem
+	>=virtual/perl-Scalar-List-Utils-1.130.0
+	>=virtual/perl-Memoize-1.10.0
+	>=dev-perl/Tie-Array-Sorted-1.100.0
+	virtual/perl-Time-Piece
+	dev-perl/Encode-compat
+	dev-perl/File-Slurp
+	dev-perl/IO-stringy
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.0
+	test? ( >=virtual/perl-Test-Harness-2.300.0 )
+"
+
+PERL_RM_FILES=( t/99_pod.t )
+
+src_install() {
+	perl-module_src_install
+	rm -rf "${ED}"/usr/bin
+	rm -rf "${ED}"/usr/share/man
+}
diff --git a/dev-perl/Pod-Elemental-PerlMunger/Manifest b/dev-perl/Pod-Elemental-PerlMunger/Manifest
index fd3d492d3129..b6517a7e9a22 100644
--- a/dev-perl/Pod-Elemental-PerlMunger/Manifest
+++ b/dev-perl/Pod-Elemental-PerlMunger/Manifest
@@ -1,3 +1,3 @@
 DIST Pod-Elemental-PerlMunger-0.200006.tar.gz 19944 BLAKE2B d0ed8a60a73ab69321a2469ab63d1ca8acaee9ad384788bced3014eb05ccbac1b960e0f45fcb72d66ee48a65dbb9595ec8fa1cb30a25fdf90db54d130abf9f31 SHA512 3b1bbb60db4c92e3f2d60bd4aaf36dad938a59856e2fcff8325369b12685f6df9d680e2e1222494671f06cbde1aebd19f08f933fc0d66ee39b07e5535d4a84b3
-EBUILD Pod-Elemental-PerlMunger-0.200.6.ebuild 635 BLAKE2B 545d2175b6926be2b0962c7df8326c064fb26ae643164214d63bfb6eae3535e7cbf1085107a7c18ccbc8443ca7961f6ec22f266447cf6de54fdbcdf6672ad2ed SHA512 4b8b7473aa20b01d667d85706a863e85457acdb3968234c06df5e4c8b7b1a6dfa9b1777b2b6f1bd9ecda6ba8f40b413553d51b5a17b20f507a58fb35e57cd218
+EBUILD Pod-Elemental-PerlMunger-0.200.6-r1.ebuild 597 BLAKE2B 2e52ef0c9bd3e956c88ed8ef39d1a08e1bb9f6d07426db69c19b67e4bd7d2bad98dd52c569687f8aa1f172e5cf776ea1bf9f17b73fc4696c9ff1014f5a3a3ca4 SHA512 261eb71b5c7ef78a7f6287853abd9fafaf5fef66b07a95b21788e1c1fb91e032d7a1c7f12bc22da82a5e1e2633a40b710ad79e8819942f372d306f24b1be866f
 MISC metadata.xml 421 BLAKE2B 6d59ada03fd2e9ebf33fbd5e9688e25c931238506e88377808244135bd6025af4cc1d1a81d59fba6aa45c957f9b81bf6cf1b4a50d7f67a2a98b6e2f4e74a9b3d SHA512 98b82fb31e2aa404244f443692284b630af20bae99030dc1aac99310d7de8ca8de5f4c7808421bb462d63727b9ecffac624862c30d71fb9a3695bb7be568c9e9
diff --git a/dev-perl/Pod-Elemental-PerlMunger/Pod-Elemental-PerlMunger-0.200.6-r1.ebuild b/dev-perl/Pod-Elemental-PerlMunger/Pod-Elemental-PerlMunger-0.200.6-r1.ebuild
new file mode 100644
index 000000000000..0dcab0fc8988
--- /dev/null
+++ b/dev-perl/Pod-Elemental-PerlMunger/Pod-Elemental-PerlMunger-0.200.6-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.200006
+inherit perl-module
+
+DESCRIPTION="A thing that takes a string of Perl and rewrites its documentation"
+
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Encode
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Moose
+	dev-perl/PPI
+	dev-perl/Params-Util
+	>=dev-perl/Pod-Elemental-0.103.0
+	dev-perl/namespace-autoclean
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Pod-Elemental-PerlMunger/Pod-Elemental-PerlMunger-0.200.6.ebuild b/dev-perl/Pod-Elemental-PerlMunger/Pod-Elemental-PerlMunger-0.200.6.ebuild
deleted file mode 100644
index 42e536742848..000000000000
--- a/dev-perl/Pod-Elemental-PerlMunger/Pod-Elemental-PerlMunger-0.200.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RJBS
-DIST_VERSION=0.200006
-inherit perl-module
-
-DESCRIPTION="A thing that takes a string of Perl and rewrites its documentation"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Encode
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Moose
-	dev-perl/PPI
-	dev-perl/Params-Util
-	>=dev-perl/Pod-Elemental-0.103.0
-	dev-perl/namespace-autoclean
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
diff --git a/dev-perl/Pod-Elemental/Manifest b/dev-perl/Pod-Elemental/Manifest
index b54108eb4491..0a29a47459cd 100644
--- a/dev-perl/Pod-Elemental/Manifest
+++ b/dev-perl/Pod-Elemental/Manifest
@@ -1,3 +1,5 @@
 DIST Pod-Elemental-0.103004.tar.gz 37215 BLAKE2B d2d8dba34fcc47fbb809674571e6c931dbdd6b30479207f38836b97615b0a76fbbff2b3d78594ba19f9e3c8fbf7c22ebd50d26c28115e53e750ef9814a982491 SHA512 d2cae23f7c4131f74374f72aa52e58840035f2245d290f82594265089400fe669c0c03cf01c5b65688770b1b5eba6f611b60693b245af637711330fe8c617a66
+DIST Pod-Elemental-0.103005.tar.gz 37245 BLAKE2B 2d27f5ded1919584139ac26035380484ac193fddcb3739707ca56e56e1bc352df54ca1b8411329b83a02dbe9f0f656075bdf8dbf71c4abcd2ab9ea657c4613fe SHA512 bd3c6c6d5aef5b0242daddbba7c00b9cabdee4e26111562bb3efcd6032044b581ee8e66877d8ea07baff6b076cd6cccd0f55be210fbb35344a324f93d79ca667
 EBUILD Pod-Elemental-0.103.4.ebuild 820 BLAKE2B 77158c7ca20edce3ce32f905b7f11d995550f6c4355896d87b3f4cd45b2d48f6c15315b20199932c20c7f0f01180cc91461bff4f0f185f133bb6835365714b30 SHA512 970798f16b9e8a3abed1bf68d9d419d3fda98cdccbee60e4fad60a5f2a68c3f95f8c24dbe050b1a93abb50e7227c6380a9fdaf8c3c7156d40744e5a51b954529
+EBUILD Pod-Elemental-0.103.5.ebuild 783 BLAKE2B fff34ca7a0430f0ea3c987fcf68d5c452a951553140b657394858314a160c3bdc7f72a8f12a2417b85ca15281d323e55c2ec5c51517e19465f2d25ba1e282b4f SHA512 32f2690e7734802da692c6cce8e580f57a8830045515617f3906395675cd0116011932f42549c486ee703a2e91daccb43cc773bd4a293ea8e7780a9284ae3dd3
 MISC metadata.xml 2354 BLAKE2B a2c1c3bf5255b87ce1d1683f0de7574b0fbcd7796e304f938f3490572f0e03f49537560bb0f1ea68cc01c0f4bf06311162ae2d614f9c13cedd3a5af04cddece0 SHA512 bebcdd1f47b091bee8d9cd07843c6e7aa0ca9097cb9cbdf33242e6cf95c49fa686cc08d8c10aa43a95fc55a9de43d52f93160e566be1a4eedc20cc653228c5b5
diff --git a/dev-perl/Pod-Elemental/Pod-Elemental-0.103.5.ebuild b/dev-perl/Pod-Elemental/Pod-Elemental-0.103.5.ebuild
new file mode 100644
index 000000000000..297c7ac810d5
--- /dev/null
+++ b/dev-perl/Pod-Elemental/Pod-Elemental-0.103.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.103005
+inherit perl-module
+
+DESCRIPTION="Work with nestable Pod elements"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Class-Load
+	virtual/perl-Encode
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Mixin-Linewise
+	dev-perl/Moose
+	dev-perl/MooseX-Types
+	>=dev-perl/Pod-Eventual-0.4.0
+	dev-perl/String-RewritePrefix
+	dev-perl/String-Truncate
+	dev-perl/Sub-Exporter
+	dev-perl/Sub-Exporter-ForMethods
+	dev-perl/namespace-autoclean
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Data-Dumper
+		virtual/perl-File-Spec
+		dev-perl/Test-Deep
+		dev-perl/Test-Differences
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Pod-Eventual/Manifest b/dev-perl/Pod-Eventual/Manifest
index 0a0c9a959fc2..8bfc4e10ece1 100644
--- a/dev-perl/Pod-Eventual/Manifest
+++ b/dev-perl/Pod-Eventual/Manifest
@@ -1,3 +1,5 @@
 DIST Pod-Eventual-0.094001.tar.gz 16640 BLAKE2B e20422427f26d5b80ff89be8682e92b2542c98feaa0ecbe24fb9505627e6a77595568d6d2c0e23d6da6303ea3c45a24c3dc0f83393fecce5061fc33eff00d487 SHA512 f892653f6895381b3f493b44e8c295d02bf78e70e64c23b9c8602e6692517790524cd5996bb6d84aed7b4e8da60eebe99330a53e5f26f75e4ab017d6e8d317e6
+DIST Pod-Eventual-0.094002.tar.gz 20886 BLAKE2B c59637efc78b5b4360e83608220083e95ae73648e7acfc74a49ec1d66372f33d4540d6063c883405eb8a520284d46c52de21c83c38b59de9d9bd53b629f49389 SHA512 4442a079faaf2f1eeae66639a247a3f1b55eecc1d1bf680dd4429bed6fcfc75824d3ecdf28b32a40780881bab9ebef6712291bcbf955b0f97e82340d407be2a4
 EBUILD Pod-Eventual-0.94.1.ebuild 561 BLAKE2B 6612ba4a6f18829bb038bf021aab4d7d431b72b4d0186bc1da3ad9b7681dfa72e41af6c192d3c34630db9433694fd45c213b254a7915916c5ca7b82ba8bdc30e SHA512 02e535e52bb2d5ff231720c0e3efd89f26b210c531d372d2244808faeaad00a6413f94f059373f7205ee967ff5308f2d2057e8dc1703079fcd4f5aac375b7ff6
+EBUILD Pod-Eventual-0.94.2.ebuild 496 BLAKE2B e3290efa52f712a1d822d0994dc4cff78b6de1c8c41509ef0f6ad0113f91c54bad785a5a6090761a96b48ebf6a07dd3c7d8c8870426bf0f3dd13192b9b6e2233 SHA512 264e53260ddc605709402419f0f6c326c42049e8bdafa932aab1087255a1a8858a3de2b23b321d69a7faa2cb28c75ca6459e26264f7af193ab14345b3858dafb
 MISC metadata.xml 464 BLAKE2B 4b4da463b493c4d26eb7fb53a12ed80eafec3618151d04d0adf4ebdba904c4d66dbbd3901a37feebbe6c997d9d5a4cf1b10d5eb0e4b8cbbc931f8c6b4e77c250 SHA512 4859d735bc42d1a0a443c61947e4178bf10ece3a7387bf9597d661638a814f2e615cb5634456300bc83838ad18e9ff33db8268fc7d064472aa8e4101ad5e1e7a
diff --git a/dev-perl/Pod-Eventual/Pod-Eventual-0.94.2.ebuild b/dev-perl/Pod-Eventual/Pod-Eventual-0.94.2.ebuild
new file mode 100644
index 000000000000..b8126e9afe48
--- /dev/null
+++ b/dev-perl/Pod-Eventual/Pod-Eventual-0.94.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.094002
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="read a POD document as a series of trivial events"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Mixin-Linewise-0.102.0
+"
+BDEPEND="
+	${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		>=virtual/perl-Test-Simple-0.960.0
+		dev-perl/Test-Deep
+	)
+"
diff --git a/dev-perl/Pod-Markdown/Manifest b/dev-perl/Pod-Markdown/Manifest
index 04ae4adc67ff..d70d6e72c680 100644
--- a/dev-perl/Pod-Markdown/Manifest
+++ b/dev-perl/Pod-Markdown/Manifest
@@ -1,3 +1,5 @@
 DIST Pod-Markdown-3.005.tar.gz 57716 BLAKE2B 823826c25b0d333941f08af4fa9c9690e9686cd407e8e5084987e2eb7adc63b9027a414fc30f96bf632e89d147e4a1108510e09386d257d7174c412876102548 SHA512 1fb9879913a5f9229267c84bbe97aee624330f3079827f18aa7db31de0b70e0ef0df55ea2ea01655f4b335c7b2338bdc1e5156f49088d6ce048bfa38713ee2c8
+DIST Pod-Markdown-3.300.tar.gz 59370 BLAKE2B 3f78633253368e692e720876b644e6918df5925a7d24995745c9fcda9ec95cf31ce63623ae720eb0cd1ceae64ad54b6c779414115997d3ddc958e63b9f36d375 SHA512 3c4b0d44a94f5542662c45ba03d5fd0852619c9881edf9ca0b006ae05e8a4611ca1b7495dfa32d02fc036e25847146a96b53a4970ae712b5664d328c8d841e88
+EBUILD Pod-Markdown-3.300.0.ebuild 820 BLAKE2B 0c035dbbfaea8cc7311c2cdc092c67191e9abe83c332a690db42fd8c3deed169268a7b34a3961cb89f781d63e9503fd093fc921a91b6b146461a856d1ab06fe9 SHA512 cd648e05affb5f55517467d5e3dfea2a4dc57a432b04faa0dea18d069b7bee8bb471696107f9f9ef2feed7925b7bc3bfbbc4bd94f9ecd156717c297fb08b6c9a
 EBUILD Pod-Markdown-3.5.0.ebuild 835 BLAKE2B 8d44d6f824a096d1021326b52542005f945436b3f5d0fe1d90cad554522d37f7bbbba65010e0f69508e2cc3551d2bbf5fdd60b0c456fad3f944d2d3656eb9215 SHA512 5cbaa1582f535812a5d899883ff9070e4cff11e76bd29f8993c8af38fb5920e5bbdaeb5a02db7b0715ca48f7dff195b6bc6a4e4f685609386c22d78f9499134c
 MISC metadata.xml 462 BLAKE2B 0c4d31494bb524541d5a0238becc4296637bc226b3b46e96927c054516531054d5c703d7f0b6d1952e1dc796fbc7d34b9a7f194b3d1f4ed59d209ca333d7938b SHA512 679531a25e865d72d03e40f297719c364a70b1988aa3befa86751a10b6e96d15b780653880bfcfe732d2427071575162c8c38bd72af71d1e78ed63c75ea87bdb
diff --git a/dev-perl/Pod-Markdown/Pod-Markdown-3.300.0.ebuild b/dev-perl/Pod-Markdown/Pod-Markdown-3.300.0.ebuild
new file mode 100644
index 000000000000..913f89f4d8db
--- /dev/null
+++ b/dev-perl/Pod-Markdown/Pod-Markdown-3.300.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RWSTAUNER
+DIST_VERSION=3.300
+inherit perl-module
+
+DESCRIPTION="Convert POD to Markdown"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="minimal"
+
+RDEPEND="
+	!minimal? (
+		dev-perl/HTML-Parser
+	)
+	virtual/perl-Encode
+	virtual/perl-Getopt-Long
+	>=virtual/perl-Pod-Simple-3.270.0
+	dev-perl/URI
+	virtual/perl-parent
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? (
+			>=virtual/perl-CPAN-Meta-2.120.900
+		)
+		virtual/perl-Exporter
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-IO
+		dev-perl/Test-Differences
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/Pod-POM-View-Restructured/Manifest b/dev-perl/Pod-POM-View-Restructured/Manifest
index 83b9f306dabf..21411b209bb0 100644
--- a/dev-perl/Pod-POM-View-Restructured/Manifest
+++ b/dev-perl/Pod-POM-View-Restructured/Manifest
@@ -1,3 +1,5 @@
 DIST Pod-POM-View-Restructured-1.000001.tar.gz 18830 BLAKE2B 7b09f1e5324a1f4a109b2b2a004d284e6f1dc60904ee78b22a3952e39b9e69b61e0b1e2e2272c2022f624db74eece3e803b5170e65407d11c6335549d91de549 SHA512 5c2eee8cf20713f0aba80dda01d61b792999086c30a49c48c8168d750d990de7d4f11e55ce84d022c32458e7969631bf73f04404f2780b1a8176670761ab4177
+DIST Pod-POM-View-Restructured-1.000003.tar.gz 19340 BLAKE2B c5bea201da7dbdfb2db90ec605b18745e498d722cfda89dea67224f1a3bcab4fc68f9034838ab33481082f887aafd133f31709ef830095f0e4ab5e8ec0bcd0e6 SHA512 b3578ea86ef1c690bf652a11e2ba866c54b40e5b287d0dffeb7888de587ebc5f856826502940a23a22aeb5c9f943615d8a3f4b66048b691fea347a299b9c395b
 EBUILD Pod-POM-View-Restructured-1.0.1.ebuild 528 BLAKE2B 644d03641cba1640064c2065ae095958635a3c294b091577e08ddebe77332fe78bf4ea775cc1a62a34fd0110267ed961bb7d145ae0b3f584efe0d1db4f25454b SHA512 a5f430beedb5be55538d9a0ff1168938ab2576907fa6ec27dc3cb462311cb4d10bded3987ce369bd3fcbf68c1c0f04f67cfd4f016b90277255fa71cfa241a78c
+EBUILD Pod-POM-View-Restructured-1.0.3.ebuild 490 BLAKE2B 7d7dad7c4e1498370191dff91e95a75d8846acd6769aeed01bb3b13d0b9c9012678594e763612ed49ebe5d393d54cf51d911cb68d6ca3c38d9182c6a5fd0fbad SHA512 65e99c43e214585a41154233b2927734d00b7bb871ee1bba8fa5c588d539bddac86075477a7bf7c2f18b70efd4713c38071cdc862d67cd5fa8e518314f925fbc
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/dev-perl/Pod-POM-View-Restructured/Pod-POM-View-Restructured-1.0.3.ebuild b/dev-perl/Pod-POM-View-Restructured/Pod-POM-View-Restructured-1.0.3.ebuild
new file mode 100644
index 000000000000..687da745dd87
--- /dev/null
+++ b/dev-perl/Pod-POM-View-Restructured/Pod-POM-View-Restructured-1.0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ALEXM
+DIST_VERSION=1.000003
+inherit perl-module
+
+DESCRIPTION="View for Pod::POM that outputs reStructuredText"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Getopt-Long
+	dev-perl/Pod-POM
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Pod-POM/Manifest b/dev-perl/Pod-POM/Manifest
index 58f59d659890..ea6e7179e206 100644
--- a/dev-perl/Pod-POM/Manifest
+++ b/dev-perl/Pod-POM/Manifest
@@ -1,3 +1,3 @@
 DIST Pod-POM-2.01.tar.gz 65443 BLAKE2B 50a0711469515f35cc98a5eaf537b35606bc9d49dac360944c4258516116ad4e9318a1a8d18ca943ebe14b626bd192aa5c6939882587f4ea735b001ee5135ccc SHA512 617b1c15dbaee7dfd53f7b158c08e34c38763b11fbdbe44d3a1c65bfca15b44d6d1b19b6a59360dd62a7d9e703498e76237350fb57040f39837f8190fbdbd7b0
-EBUILD Pod-POM-2.10.0.ebuild 418 BLAKE2B a2a558a4be5ff0e5fe84a02a10f80b736fd23ea3558369c703899ed6db4686c61a25fd8f29cd293500de423fdb5400b6aaca3b2a1f1c5a4ad5fd66de78a9bd5d SHA512 0fa195cb1be0cdfeb4456d25c420b246e160fb8e56fc7048ca2a8554bfd1ccd159a117450a62c2105cc63e367cfed8663ca9c996e2f6e2eb9ef51e64b79802f6
+EBUILD Pod-POM-2.10.0-r1.ebuild 363 BLAKE2B f7752bdacd3ab8992280593d1e6a935b5911e72863fde963e5563be3efa462519848d918cbdfd8e503bd6c0964989bffb43da8e9f506ba911a8c9d5856fd2afb SHA512 97c25750c82132900c5658ee8f0a367122daabbfa68b6e0e01b14b5ddcbfb868658a9c4c3364e463894ed60fade0d42dcd9a6d1ede0408aa3da1c5f980b87938
 MISC metadata.xml 1849 BLAKE2B 14eccd548d85b6b384b70e37222d823333dc200bc39d2ad8466a399d8cda266fa8e3ed1bcb93de3d1272cee8a00df25d38e9a8f8e9de5f93e56843eb323fa19a SHA512 1263be540bedf723bb6e996861d6e97c842d036cd54246d3ec362771ffe48a9391c91708a4255c444d090c211e6f1087e4cf8e4c5ca7de1185cbbf87eacd3aef
diff --git a/dev-perl/Pod-POM/Pod-POM-2.10.0-r1.ebuild b/dev-perl/Pod-POM/Pod-POM-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..a5c552c87830
--- /dev/null
+++ b/dev-perl/Pod-POM/Pod-POM-2.10.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=NEILB
+DIST_VERSION=2.01
+inherit perl-module
+
+DESCRIPTION="POD Object Model"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/perl-parent"
+BDEPEND="
+	test? (
+		>=dev-perl/YAML-0.67
+		dev-perl/File-Slurper
+		dev-perl/Test-Differences
+	)"
diff --git a/dev-perl/Pod-POM/Pod-POM-2.10.0.ebuild b/dev-perl/Pod-POM/Pod-POM-2.10.0.ebuild
deleted file mode 100644
index 2f149310af2d..000000000000
--- a/dev-perl/Pod-POM/Pod-POM-2.10.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=NEILB
-MODULE_VERSION=2.01
-inherit perl-module
-
-DESCRIPTION="POD Object Model"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/perl-parent"
-DEPEND="
-	test? (
-		>=dev-perl/YAML-0.67
-		dev-perl/File-Slurper
-		dev-perl/Test-Differences
-	)"
-
-SRC_TEST=do
diff --git a/dev-perl/Pod-Simple-LaTeX/Manifest b/dev-perl/Pod-Simple-LaTeX/Manifest
index 23ab59220ef0..b2533d780bc4 100644
--- a/dev-perl/Pod-Simple-LaTeX/Manifest
+++ b/dev-perl/Pod-Simple-LaTeX/Manifest
@@ -1,3 +1,3 @@
 DIST Pod-Simple-LaTeX-0.06.tar.gz 4839 BLAKE2B 9ed2271f0f14c69db22fb0db1304e8d0188e8cfa5f15246efaecf5ca1b5033504b7c0ab725c35dec814d726f95b92be55fe98818ef106aa9c56a0616ca5b22e6 SHA512 7f678b1ce40314c59a6dd355bbeabc2f3d8f86282609880bf97946611a1b64b9c724e538488196e8336ed2f3f4067d3a8dc0e518f69e5c1de7bbc185503a3f8b
-EBUILD Pod-Simple-LaTeX-0.60.0.ebuild 451 BLAKE2B 66f5f08472c1996e46953837c6cbb0c8203938a1ec4b538b94a757eaf047e5fc7d9a694ec85373fced25c765156f6861a5b72cd404b7e4bfe6a38ae1ce432938 SHA512 00ac4058c8b16c5709a92d738a2299730802c5a1814a5dfa80b099d30d08362300d4b456c929c58d832c7670cd46bbaa92bea8d7208b34de7a5a3e970e3923df
+EBUILD Pod-Simple-LaTeX-0.60.0-r1.ebuild 414 BLAKE2B 6a015d89953d19abf7eb0ec198c4ea77447a4ddf4166557a1f80c187ae6590eac76a931db3981b12cf48f67b098d3062d0bad7e3c296a427bd42fb98f87dd99e SHA512 72a6f355648633e7a0ae3201a823d4a037d2e9dc9bf2652d3712464194ad75939779b5fb6c34bc78efdc3d895d3168cd620f7dccd56b3c3b08c98434baf2046d
 MISC metadata.xml 405 BLAKE2B 08b5d5759fdbc754eca124c453ee6c2926648479515cdc9e5fbf4cf11789acf9171ebee43f9d2d91a908856b2f8d36e5be2000f2b0e043666e319f07c5de013c SHA512 6d4c1d4b16788ad193fbacde3119bf65638f5b6a3b1a64ed8af57867a7f876ede8f72df3a5781cda90fd53ae730e833a05dee86aff0fabcc022e9b987c1e3653
diff --git a/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0-r1.ebuild b/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0-r1.ebuild
new file mode 100644
index 000000000000..c2fbbf0ffd38
--- /dev/null
+++ b/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=JGOFF
+DIST_VERSION=0.06
+inherit perl-module
+
+DESCRIPTION="format Pod as LaTeX"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=virtual/perl-Pod-Simple-0.10.0
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0.ebuild b/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0.ebuild
deleted file mode 100644
index e4586b172346..000000000000
--- a/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=JGOFF
-DIST_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="format Pod as LaTeX"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-Pod-Simple-0.10.0
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/Pod-Strip/Manifest b/dev-perl/Pod-Strip/Manifest
index c7647cd4bba4..9d3156d92a42 100644
--- a/dev-perl/Pod-Strip/Manifest
+++ b/dev-perl/Pod-Strip/Manifest
@@ -1,3 +1,5 @@
 DIST Pod-Strip-1.02.tar.gz 3110 BLAKE2B 8af2f33d68a7508fb4f2da74fba2e8c95c203dfd91ea4ff7aa886ae5a514b55e7ce681cbcba3fa318d3b5ff72acf172cd711ada8647415d2d6b9c48b84fc783c SHA512 cd328b5cb3ef6fa4ae46f4217b9b30e5a0341607f10d66c9046d5a37ada13947fc9e05431af495e6793e472620d883ff277c02e1f33a5d82e72a16f625447ee9
+DIST Pod-Strip-1.100.tar.gz 11717 BLAKE2B 3e303a3ec65529febdddb47dd0aba402182b419ee5499a526087dc7c7aaea9849b582b6e5abaf2bfcf0cd1eeeb9d12a753ccbd1e16becacf6a5e7a6cb2cc764c SHA512 292606ab93c6a8ab36383c498a42367103442cb398b775db975b1220f15b6f5c3d123caebb93add34a2f259b2acfa1ddecf5c2d24bc51ca0544e49013ab9e87a
+EBUILD Pod-Strip-1.100.0.ebuild 484 BLAKE2B dd69a7e749937409de0e92efdff54d959c3e6d0bdd990ec9fd929433ae411d09da6459ff3e35fde1965c667239f899dffe4caae13a1fb3790eada9284d946028 SHA512 38ebb3c99f4ca5a0dda72a20d493e43a54a270ae6998be85f6f32c74dcee9705ca4141c78b8b6617cf41202d87a1c819bb7a7bfffc72ed20417a1a9bab387622
 EBUILD Pod-Strip-1.20.0-r1.ebuild 493 BLAKE2B 3d84070bbfc4a3b9d81cd106c40ebc0eca96aa5640069fcc689637cec285f8f9b0bcb4da9d1721ee191122eaecfbd1c46ac349fbf44b5d1cc776a44792e41229 SHA512 7723d69237693f5289f565a1ad2a303263a5c8d6071922ed401ed36fea03a52e50b05e4849fe1b429abdd1dd648bd9b7c92c77ac70c249b309f5fbd7e40198d5
 MISC metadata.xml 390 BLAKE2B 39f13a3f8645a7eb8c62658b9ab13a85a4f36087aa913b2f923a8958351d77fcc82b2251c7b6b4d545487eabaf80a0f6f4aae2e7408efe6d9b1bb77dd8ff0c2a SHA512 3db7b071843a23345caefaaa927ba47bc7916652c067946908071ec4a8732cf234e60a9d4f8b0e1cf3c84d7c4085d530b7707e8d321d04b37dd35da72bd3d8f2
diff --git a/dev-perl/Pod-Strip/Pod-Strip-1.100.0.ebuild b/dev-perl/Pod-Strip/Pod-Strip-1.100.0.ebuild
new file mode 100644
index 000000000000..c29c7989a3d9
--- /dev/null
+++ b/dev-perl/Pod-Strip/Pod-Strip-1.100.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DOMM
+DIST_VERSION=1.100
+inherit perl-module
+
+DESCRIPTION="Remove POD from Perl code"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.0
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-Test-Simple
+	)
+"
+
+src_test() {
+	perl_rm_files t/99_pod.t t/99_pod_coverage.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Pod-Tests/Manifest b/dev-perl/Pod-Tests/Manifest
index bbacb2de4650..0ae717a805f8 100644
--- a/dev-perl/Pod-Tests/Manifest
+++ b/dev-perl/Pod-Tests/Manifest
@@ -1,3 +1,5 @@
 DIST Pod-Tests-1.19.tar.gz 30157 BLAKE2B 86bf04b1412d0e7337635d347e98a5817ece62941cab2c8c974f007b42b22946586b82eeb0212a7994b60c85c31aed2e4158116a0a4fb19dcf7438dc79ff1db8 SHA512 fb48e912f33bc36b782eaf71797732358288840148bdf69ce3381038c47de31e2e111d16d47351c75169016a8a45dcfdfa6e290f61acc8d130fd6c4d0c7dfb9c
+DIST Pod-Tests-1.20.tar.gz 31109 BLAKE2B 16bcc5dcdffa342b7f70eec7e2fdcd5f484eba6f86a40be678f6477f10ec2003ad3dd96725a1c6d8c70a78f451d096f843883cf64f8bc6f6d56076033d8f59ff SHA512 2be444cfdce172d9f82f8df5235aca966b1e1af4324f6e3bd02bbbf7c3940a6c2329bcaacf8281b8ae58563b82703fc5c3af333dc2d6bced76b9ddd4c3458bf6
 EBUILD Pod-Tests-1.190.0-r1.ebuild 571 BLAKE2B 95cf5725093abaf5ab2b0b966e05d6e2c4caadb90d516f918ace3dac36b98f76ce26e9d5fde70ee7d5158fe3e4e6098940e70550af4032c69c6689c30f10b3b6 SHA512 05b9e48aac55343fe69b503edbf3c8ba7882b8b6120530f0ae68c2b60974fb5efd5fa2c5db0ba9806c9eff98e5f40e699fd2b460fc7febe17fedca18e7375b9e
+EBUILD Pod-Tests-1.200.0.ebuild 378 BLAKE2B 4b58a1e17f671783956938337358dbb48ddc75e684bce98488b14a6a241f9ecdc8ec342a6970746cce5cca1c0a3f85140c610bf9cf620593ecff38d55df58bea SHA512 bd1322e60162cd234309e7727d52c11c65c1ca3cada4a071b1e92cd018f72b473014d2698220340ca508d672a85f93fedaf7511c5fca21fbd27a4e566c33214c
 MISC metadata.xml 390 BLAKE2B 4c370820d1c01cbb8d587b99eea80ba2e009216333920001a29c1c45152220530960766a54a35b288dc784c27fcade6139baf4a18b32234fb6500d3c0f42d5f9 SHA512 4d386f936053b65ba6717d8d120c70cdf279563db830058875a56c61dcab50c37630aae5689f43b8524a9ed5238411041bfcc159e0b34b2b8b53dba9f4975068
diff --git a/dev-perl/Pod-Tests/Pod-Tests-1.200.0.ebuild b/dev-perl/Pod-Tests/Pod-Tests-1.200.0.ebuild
new file mode 100644
index 000000000000..60bbce92c33d
--- /dev/null
+++ b/dev-perl/Pod-Tests/Pod-Tests-1.200.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=1.20
+inherit perl-module
+
+DESCRIPTION="Extracts embedded tests and code examples from POD"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="virtual/perl-File-Spec
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/Pod-Weaver/Manifest b/dev-perl/Pod-Weaver/Manifest
index 29ab0742ed72..92ede2172807 100644
--- a/dev-perl/Pod-Weaver/Manifest
+++ b/dev-perl/Pod-Weaver/Manifest
@@ -1,3 +1,5 @@
 DIST Pod-Weaver-4.015.tar.gz 40303 BLAKE2B d0f33427a2a01682b7581072ed47ddc5c1cfe33794ce552ad3a70dcd7c73f0a3280a91e28cf5a207cadd4d074600864a389e25eedaa02500d23d46ab45677e17 SHA512 333e29757766b0c2ddd39cde3ef0649a3e79143a611c48c3644807d248c0c7d6a027683ca88158bf59b369b1e329cdd6f3f1c3dda6c3baaa26648f80ecdb4a8d
+DIST Pod-Weaver-4.018.tar.gz 43480 BLAKE2B 8a73914d2de336ce4f1b66665768a9df964e9dc9ff11e412a539395f8aa39fdf9ddf62b85fd06de5a1c076c587b8796e9c8edcb1cb4b0bdb67e93bdadc793bb5 SHA512 fd8d2665866e4fb0606111ddeddfc992077b90419bb21905514590815594b0b918a98ccbfa92fa57a646b52a0a061a02e718926edd3a7dfed52977c00bd18472
 EBUILD Pod-Weaver-4.15.0.ebuild 994 BLAKE2B 6b7e29466d82cbe7dbaa7138af5c2b6b56b549de8c35b9608082e6b472e29d6fdc06e236522684cfa6548b23218acf196ce1a2ec3627025ca285cdc2bb9e5b57 SHA512 05069b048bfcb9420fd2dfabf6f05d851b98c1d00500265194116c1f7134ec8ae0811fd0db556cf02204f9ce87ff62c54e8082e6badc9b924b29039d9e55a78f
+EBUILD Pod-Weaver-4.18.0.ebuild 981 BLAKE2B eee2c3bd32b28e8a02796fb980cd622174f1495dc808d216fbf0d4d90f41c0ceb12c4b32bb39145f153e0bb229b9ab55f6eee0ce820e067b1520a1840d5933ba SHA512 2a4a7a3e3df617dd27f556384865787cc946e5fe490ea8319809cfe9104031b47c3800314097264b1d57917a75108c49a1712a49dd819752601a58448ebc60d7
 MISC metadata.xml 2291 BLAKE2B 932f582837a1e7650aeb9a834bb8cf296d4b6b44268c26a111bbc3615da122c35caae8a2b12099f674d1eb834a0364183d4ee6d874f34ef4d35ac0d1f515af0d SHA512 05514b168a79d2c5798d2580edffb81ed1e961c6fae46f31cf6996b726ffe19538ecdff61b2c58657b5e39588a772be5fcc50f9c3d6b9c1fea7295547cdeefcd
diff --git a/dev-perl/Pod-Weaver/Pod-Weaver-4.18.0.ebuild b/dev-perl/Pod-Weaver/Pod-Weaver-4.18.0.ebuild
new file mode 100644
index 000000000000..b9bed70494d0
--- /dev/null
+++ b/dev-perl/Pod-Weaver/Pod-Weaver-4.18.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=4.018
+inherit perl-module
+
+DESCRIPTION="Weave together a Pod document from an outline"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Config-MVP-2.0.0
+	dev-perl/Config-MVP-Reader-INI
+	dev-perl/DateTime
+	virtual/perl-File-Spec
+	dev-perl/List-MoreUtils
+	>=virtual/perl-Scalar-List-Utils-1.330.0
+	>=dev-perl/Log-Dispatchouli-1.100.710
+	>=dev-perl/Mixin-Linewise-0.103.0
+	dev-perl/Module-Runtime
+	dev-perl/Moose
+	dev-perl/Params-Util
+	>=dev-perl/Pod-Elemental-0.100.220
+	>=dev-perl/String-Flogger-1.0.0
+	>=dev-perl/String-Formatter-0.100.680
+	dev-perl/String-RewritePrefix
+	dev-perl/Text-Template
+	virtual/perl-Text-Tabs+Wrap
+	dev-perl/namespace-autoclean
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/PPI
+		dev-perl/Software-License
+		dev-perl/Test-Differences
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/PostScript-Simple/Manifest b/dev-perl/PostScript-Simple/Manifest
index 92f568137d30..4ae0c8b78a83 100644
--- a/dev-perl/PostScript-Simple/Manifest
+++ b/dev-perl/PostScript-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST PostScript-Simple-0.09.tar.gz 35450 BLAKE2B e642cf9d8b887fee458b2ac085a90ac6198b7e1ed1fd0349fa6b2abc597b16d32ec2b099e4e8db9e009a1341ec5015c24502099213996bae9840bcd3209fb589 SHA512 28026060f91e7bcc2722df7e7097667aa2baaa85b1c558e08558fbee3395b0326e0564142e7729068afd13bdf523da32073fd6dbe56317db3e554445b4a04b18
-EBUILD PostScript-Simple-0.90.0.ebuild 616 BLAKE2B ed93306a8c01e47d88cc437a5f670f3521fb36a75766f6d7cf8000197fb29c30fca36f88f9ca6752d9b08c478dc963cdee964f75faf49b719f063d63fe156883 SHA512 dc50a247131185626076a4e8aa28fa592c0ae9eb398ea88a7de2b8d853315bdff5102ce84f38b3d55c0cc4cdc600ce4afd8f029e6e778ebd962464d0781117a8
+EBUILD PostScript-Simple-0.90.0-r1.ebuild 463 BLAKE2B 5570740351c85343561784982ceb87e0c4eced55f15fb0d71442999d0385f787a309d575f45cd3e05827406792f7a06faeea503eb29052d76705912a6a481e9a SHA512 f38484a36089eeee061d081c92e3bef5dae17cc3b6ef05e291696ffde377570a8bc74e525b92066c3d786b834c5a2c1833050307ca1460dd3612ce4fff412cce
 MISC metadata.xml 476 BLAKE2B 82a6ddb81ff8e8811e957d2f3b88a5d8e0a4af26dc050c73258e8459dd8443bc4e568123234850a8b4b51dde819498d16c39f8d0476beea913fb96fe0e0fb113 SHA512 737aa85b446ecc6ae1519dfe09b8ced51cb637e012dd398108bf7dd1ec76b3e82c147416e7e7f3b33ba65fd7bb7e2a64ddaea2770cfbcc8a40f832e6925887c5
diff --git a/dev-perl/PostScript-Simple/PostScript-Simple-0.90.0-r1.ebuild b/dev-perl/PostScript-Simple/PostScript-Simple-0.90.0-r1.ebuild
new file mode 100644
index 000000000000..1acef5df112c
--- /dev/null
+++ b/dev-perl/PostScript-Simple/PostScript-Simple-0.90.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MCNEWTON
+DIST_VERSION=0.09
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module
+
+DESCRIPTION="Allows you to have a simple method of writing PostScript files from Perl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ia64 ppc sparc x86"
+
+RDEPEND=""
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.180.0 )
+"
diff --git a/dev-perl/PostScript-Simple/PostScript-Simple-0.90.0.ebuild b/dev-perl/PostScript-Simple/PostScript-Simple-0.90.0.ebuild
deleted file mode 100644
index 292515aa8a49..000000000000
--- a/dev-perl/PostScript-Simple/PostScript-Simple-0.90.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MCNEWTON
-DIST_VERSION=0.09
-inherit perl-module
-
-DESCRIPTION="Allows you to have a simple method of writing PostScript files from Perl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc sparc x86"
-IUSE="test examples"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.180.0 )
-"
-
-src_install() {
-	perl-module_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
diff --git a/dev-perl/PostScript/Manifest b/dev-perl/PostScript/Manifest
index d06da7736edc..081065ca1bdb 100644
--- a/dev-perl/PostScript/Manifest
+++ b/dev-perl/PostScript/Manifest
@@ -1,3 +1,3 @@
 DIST PostScript-0.06.tar.gz 19506 BLAKE2B 03f2ad42205cdf87a2e9fffe1cd86cdb1c155369473077af0d37608f7e6b7123409c9664bbc3c580b8a21d1bfd4e215ad213d30342e9f7133d2535bef20c8c5b SHA512 7c9fd8fc9d05e1f131b2002553fb7438ac8628d27322e63f3f1533e4e25222620ce7d9fda35e6ebe5603dd5dfad0c74925d9eb3159359f34be49f7305a65ff8a
-EBUILD PostScript-0.60.0-r1.ebuild 317 BLAKE2B 8be7ffd71211f905194fdb4063ad9e7ab8f5145fa8b9087545f4a77c88434e5ab127a254214892977e2af894efe1929c2ee986c328a46882ef097beb151b7d16 SHA512 08e12a84a2c9b6c4035f6650d0ae87a1a08dc5912f72c84645c73e521bd4790812b24cb6c1dc1a7fb1366303931163e393a508e3bc281ee6e39f2d0def1db757
+EBUILD PostScript-0.60.0-r2.ebuild 287 BLAKE2B ac812c03286cf759d1a8e0ed47182eba0b33486aaa7f33f336b024f7ececd36edd6e448b1c1cf42faaaa4339c6668b36746168aacf048648c36692db30455a5d SHA512 c90cf452ff13c35f0f72f0f0e2b2e9766bb17cbc9f745368b1f0bfbb1d07a88595f3a629e09a36c8a8d45256a371976a263d62e0df9fc82760388c6eeefb1c50
 MISC metadata.xml 722 BLAKE2B 1699165fa82ad6d97a0960bfe4b7b8cc7946b361bd6603d587306c61545f357806c039041c991da735f3c3a0eb4354638f6ec8d34d3de9cb673e798fd94caaf3 SHA512 c73f084c9436b6da0dcc9444bc9301e9eb6b7dd5f10d9cf5ebf8cc0144c9c3de6e0a538aa9bf37a5771e9547e5e0279d848e5cf29deff2462523b9af012cbf8f
diff --git a/dev-perl/PostScript/PostScript-0.60.0-r1.ebuild b/dev-perl/PostScript/PostScript-0.60.0-r1.ebuild
deleted file mode 100644
index 5f8c031c288c..000000000000
--- a/dev-perl/PostScript/PostScript-0.60.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SHAWNPW
-MODULE_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="An object that may be used to construct a block of text in PostScript"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/PostScript/PostScript-0.60.0-r2.ebuild b/dev-perl/PostScript/PostScript-0.60.0-r2.ebuild
new file mode 100644
index 000000000000..af3d1cb63445
--- /dev/null
+++ b/dev-perl/PostScript/PostScript-0.60.0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SHAWNPW
+DIST_VERSION=0.06
+inherit perl-module
+
+DESCRIPTION="An object that may be used to construct a block of text in PostScript"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
diff --git a/dev-perl/Probe-Perl/Manifest b/dev-perl/Probe-Perl/Manifest
index 3e8c6cd07302..14cc4318c654 100644
--- a/dev-perl/Probe-Perl/Manifest
+++ b/dev-perl/Probe-Perl/Manifest
@@ -1,3 +1,3 @@
 DIST Probe-Perl-0.03.tar.gz 13096 BLAKE2B eabee810d4eaa498801fdbdc320d93d08d301bca628899594b0fe8ddd6b27a02c4913f73854b7c46126dfaeba415498331bcf480aa5152163d0bde9ace21c8cc SHA512 739bdb9d1a74eb77ab885a5aca861a1915cadbb1002bb4cb0d21fc6940ae6b3aa64ee52951ac8b2dca41c9e8fe188e17ae5f3c848c4a1caaf66fec5d25bef49c
-EBUILD Probe-Perl-0.30.0.ebuild 674 BLAKE2B 1936f77e5eeba671efe90deae5ea84e6b37604b73e62a87a5395826f951187483c9b96cf8aaab3bd03f9edb909bd8f812c035aac2b1c0b0531779876d152b297 SHA512 e14f58428c0723aacceda7ffed0ffdbc4571edc7f05c1278f4100d7e8ff0cbd5d2536f1d24bde1d9b6d2fd18331753fdb3e7f3623966ad445855c34852a0c9d9
+EBUILD Probe-Perl-0.30.0-r1.ebuild 605 BLAKE2B 09fca1d1f0d0d9ee22f9c9b535912fda88832a718f4aeb8c65ceb433255477cba2b8bae39abe6ff5b42b39eacf5516021eb6afa1470e6aa5b834961ea17e46d5 SHA512 fc9643e0b02cf862cd95d9b03e6fcb04c5d9c5e8785ee83aee041991839b64b58cad5a01362b3bcbc1916c5b29f4ba46b33e6bbc7e037b527cdbb21ca5609f06
 MISC metadata.xml 392 BLAKE2B b12043546e2503cec012599625a1eaa5b7a3a78ab1a1b68b0f913863a7976892ce8d4d51f1f71cfc4c8cc86eebab5d160d0a33d79c71a56df5b3c1638ce547c1 SHA512 17a9624f787b94aa9e570dcae2de67c85f9ecd2b287af0f97dd8abaa68fe1efd9f6c35cd93328ce24abc8a0f2c5b61761010aef6321c5afffd6aabd211e8334f
diff --git a/dev-perl/Probe-Perl/Probe-Perl-0.30.0-r1.ebuild b/dev-perl/Probe-Perl/Probe-Perl-0.30.0-r1.ebuild
new file mode 100644
index 000000000000..13a41f4ad7f2
--- /dev/null
+++ b/dev-perl/Probe-Perl/Probe-Perl-0.30.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=KWILLIAMS
+DIST_VERSION=0.03
+inherit perl-module
+
+DESCRIPTION="Information about the currently running perl"
+
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	virtual/perl-File-Spec
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? ( virtual/perl-Test )
+"
+
+PERL_RM_FILES=( t/author-critic.t )
diff --git a/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild b/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild
deleted file mode 100644
index 942b5d65a979..000000000000
--- a/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=KWILLIAMS
-DIST_VERSION=0.03
-inherit perl-module
-
-DESCRIPTION="Information about the currently running perl"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/perl-File-Spec"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? ( virtual/perl-Test )
-"
-
-src_test() {
-	perl_rm_files t/author-critic.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Proc-Background/Manifest b/dev-perl/Proc-Background/Manifest
index 34d4014c6498..366c6f7f442a 100644
--- a/dev-perl/Proc-Background/Manifest
+++ b/dev-perl/Proc-Background/Manifest
@@ -1,5 +1,5 @@
-DIST Proc-Background-1.10.tar.gz 15113 BLAKE2B f4a35a2617e4d8292ef21748e9b2f75f7ed6a99e0076faadd8719100dfc70e2cad46ff1ddbfdd5b42a6e86f3b8eb050aef63a922117e2ba5277db131e4a0c0df SHA512 233eeb8159b7b0f99f6ce991b30f5a321189d2af9d4c8a6d997d0ff348ab9ba4510b322f58dca0df1b0bee279a442f49386bbd2152a5245921c95e9f0497301e
 DIST Proc-Background-1.21.tar.gz 25960 BLAKE2B b5e8a7538aabc973d46097bc8ad6ee8fc03b5f3c693e31e344b8509784aa515db864c6f046f9db91ae0b0225244a385d8f390b76aa4484037431a3105126cc98 SHA512 2cc5cdf3e6b0614a252f6a5e2f0c35c50504eaefb87d642b8a4f91f6e5e34096f6e30262f0d8496b318301e3359d26a6dceb1658556ad0ac548a26b6a3476432
-EBUILD Proc-Background-1.100.0-r1.ebuild 310 BLAKE2B 0b920db3e21fbcc692bab64f20edfbcf748a15786e780e88e3ef91958b34ebd9c76adc1ffe6a90b6e43598075eeb7a3b34bc8c20a028369510a4e13d342ecc5f SHA512 16d20511f3b6d39ed67d234a11b909bcbcf8e209b97d4adb638f9a8ab04ab969444aa075f565515732e73f431a14978f76ff2882ad3df44578e7825d8cba682c
+DIST Proc-Background-1.22.tar.gz 26247 BLAKE2B 98ed5ee3688511febcee1252ede30231bdd705386467fbddaa873d15531622905f2aa7b1cfc20e9786bdb2679c5479afaf5aa5ce9c4811c98ff6357b8451f96b SHA512 7d48a8642ece331af3aeed7b7f6e4fcbf64e4a8d753f86cca685eee1f4e6c784bbf70eb26823631a98000017ee4b8e67f630a392f3c823fab392874ad747ae05
 EBUILD Proc-Background-1.210.0.ebuild 359 BLAKE2B 762a61523f81bdfb2f13a987352af471fde141ed745a94fcb72e518b484fad852f0eb3d989f2351fcfc37e9b9264536a3c55da01bcabdedfbd586b55e348e075 SHA512 936fbb663da59105bb613f8ad7d4a2a7b7b5f68d0e544dd2e8afc3ff9dc749e50ba055eb22d85ebea7125f5351fb07d23822f919058a1c473d3b97c39ba5900f
+EBUILD Proc-Background-1.220.0.ebuild 351 BLAKE2B d6ae23f3ac7ff9ad0b3755a26c97f1e8c394d00fbe3c911f95fb81bef06be3938962645f39d86515d3ad680f50f1c055bc73877b229ead733fa40594605fae41 SHA512 000a6e7beb1c25a1b677f0bd15482146897c7ee4e7cd0a110c532e5ba37171ff003bc4d2cd18b41d1f9a7f3ce9744ffab3e4c0b1c4f7e9a62ecac7855993271e
 MISC metadata.xml 541 BLAKE2B 35398141851bc78f330dffd7bd47785809d0e2723401d8b1147b90afac60017ed6714c8996431629865a8db39c1f563b512f3760cae529ec21003c09f9d4a0e5 SHA512 d2f68689b9af35ca52976124e39324ac72e5aa2c439a89e4b86e6ddeb7d22c7e056ccc144f57691b5c8b7482ae8ef9fea1952cc6bda3de3f9642455d8a75007c
diff --git a/dev-perl/Proc-Background/Proc-Background-1.100.0-r1.ebuild b/dev-perl/Proc-Background/Proc-Background-1.100.0-r1.ebuild
deleted file mode 100644
index 898cd54beaf6..000000000000
--- a/dev-perl/Proc-Background/Proc-Background-1.100.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=BZAJAC
-MODULE_VERSION=1.10
-inherit perl-module
-
-DESCRIPTION="Generic interface to background process management"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-solaris"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/Proc-Background/Proc-Background-1.220.0.ebuild b/dev-perl/Proc-Background/Proc-Background-1.220.0.ebuild
new file mode 100644
index 000000000000..720a15856b44
--- /dev/null
+++ b/dev-perl/Proc-Background/Proc-Background-1.220.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=NERDVANA
+DIST_VERSION=1.22
+inherit perl-module
+
+DESCRIPTION="Generic interface to background process management"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-solaris"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Proc-Daemon/Manifest b/dev-perl/Proc-Daemon/Manifest
index c6d47ba192e8..aa0f9b32011f 100644
--- a/dev-perl/Proc-Daemon/Manifest
+++ b/dev-perl/Proc-Daemon/Manifest
@@ -1,3 +1,3 @@
 DIST Proc-Daemon-0.23.tar.gz 22782 BLAKE2B 1bcf4ab2cbe9605a00ef8aaeb29a0837404196333b472ef3608feb0c9e29970933257b9e9f7e1263c7936c2ed47577ef3437a0792c0388f54d45f97335066fbc SHA512 078c4b0dc3a16ac0ccf98814a639ef1ea8009cdb3b133182761cdb5ea5e29bac2d8967ef6d2a902e15dc30e21cbd3aeff449a3efe67dfbc4f76a619491782bae
-EBUILD Proc-Daemon-0.230.0.ebuild 397 BLAKE2B 3575beb204b964cf920c922eb8bf44269f9c1be7533675f04667fed5f5e52b5e8e8bf3f3988cf70b85e18aeefbab67efd28d1060077120b3c05a2622deec854a SHA512 82214f2b8a3ecd61fd9b087e7d26fedf60211f47eb28d0f00b69ebb5ddd22408bf3cec3c5a337c9517e79d171e804ed1bed57e77cca7ce30dabad74b7cffca71
+EBUILD Proc-Daemon-0.230.0-r1.ebuild 398 BLAKE2B 2b173187a738d38e769370c4f380cf4ccaa47e9e5e0d8877244910e4be3b6c76ccd74fd83ddcedae9ce038a9e01b8ba1e9cfbba6aad48dc70d7997128376a0f9 SHA512 3733054bcfee4331ce3f039e293fb3e387f87c593a76cf177d5d2aba9f60548bfbba930bda688e79faebb0340b000caa60eb81bc27345841a918bcf89d7957a5
 MISC metadata.xml 394 BLAKE2B d80e10d70d05e4700dee495d2a3fd2318a1228e5c7e98bd533f4c2ed14da9577a438f2f5a6473bea34259826b4ba78d65ece710ebbf42aa5da4ef982fab0b06c SHA512 2a0cb9f313cbe53ba46d8c4433850b80e08ab4d445257df0d0809c9fee974e06f463679abeb47919d6baeea5fa6dc9e624bc7c01420fb252054241f2cfcb9442
diff --git a/dev-perl/Proc-Daemon/Proc-Daemon-0.230.0-r1.ebuild b/dev-perl/Proc-Daemon/Proc-Daemon-0.230.0-r1.ebuild
new file mode 100644
index 000000000000..b9610f62b695
--- /dev/null
+++ b/dev-perl/Proc-Daemon/Proc-Daemon-0.230.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=AKREAL
+DIST_VERSION=0.23
+inherit perl-module
+
+DESCRIPTION="Run Perl program as a daemon process"
+
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="minimal"
+
+RDEPEND="
+	!minimal? ( dev-perl/Proc-ProcessTable )
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+"
diff --git a/dev-perl/Proc-Daemon/Proc-Daemon-0.230.0.ebuild b/dev-perl/Proc-Daemon/Proc-Daemon-0.230.0.ebuild
deleted file mode 100644
index b21c09fe0b25..000000000000
--- a/dev-perl/Proc-Daemon/Proc-Daemon-0.230.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=AKREAL
-DIST_VERSION=0.23
-inherit perl-module
-
-DESCRIPTION="Run Perl program as a daemon process"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="minimal"
-
-RDEPEND="!minimal? ( dev-perl/Proc-ProcessTable )"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-"
diff --git a/dev-perl/Proc-Guard/Manifest b/dev-perl/Proc-Guard/Manifest
index 3b24ffae1b0a..b93af52498e7 100644
--- a/dev-perl/Proc-Guard/Manifest
+++ b/dev-perl/Proc-Guard/Manifest
@@ -1,3 +1,3 @@
 DIST Proc-Guard-0.07.tar.gz 11725 BLAKE2B e707c78ed9ac3a4d9d0ba68fdbe9ca4650ed8597569167d96f60c85e3ac1704649c69fcb85f13961f7dbd4982c122532174790aa8740117dec187446c0998efe SHA512 1f27f7b1ee3116f3136cc4b310751bf0ab5f04a8698ce619cf94341c26e293f8c331126c636c6dd1dcc3b85724b60b22ea553b9c9f85624c59924dc89c2b6ac4
-EBUILD Proc-Guard-0.70.0.ebuild 622 BLAKE2B 35220c5fcf797f9aa7b2e04c2356686c0b40159d1df8746f1270077ba57ad1a544430f6e288da7965a1b568d5c41ab6e3543e4886152cbb0e49ebf58171fae4c SHA512 dee3fe662185061532892856428dabfffe1f28ec229507f89a3617504b2571ea159f95727ba52859028ef9891117397f115eaef11dbd09e54aa24e8c1ef612d1
+EBUILD Proc-Guard-0.70.0-r1.ebuild 584 BLAKE2B 6fab75b730c0e5c4c28d6fb3907b2dff0d1ded535487b75210968204ab57797bbd65d46557e248354850615a3d8f964cd2ab357350324d5973b8be2150e85ac7 SHA512 bb68cc8c08d3e301a728650fef310616b332bc86444f8c1dd08c000b00645cad9aa3fe67d2307ca78c41c9eedb8032e31166eb4bfd5993af47227247cdd3f7db
 MISC metadata.xml 392 BLAKE2B 633773ab680879fc71fcf6bfb19486a024b59bd2f492dcacaa80c021541923246abffaeedd5cf98e3ed05f73023905fb872a1197e652163ae58b2dc9ee3e331d SHA512 73ce8aa476dd3b4058f68d14882dd51049ebc78c9c30b425baec2010119b8535d59f7390a0d66d0c3c3e1abe3ccb0f5759b0a8084648de5db05f961e82f36d5b
diff --git a/dev-perl/Proc-Guard/Proc-Guard-0.70.0-r1.ebuild b/dev-perl/Proc-Guard/Proc-Guard-0.70.0-r1.ebuild
new file mode 100644
index 000000000000..2d5d4446f5da
--- /dev/null
+++ b/dev-perl/Proc-Guard/Proc-Guard-0.70.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TOKUHIROM
+DIST_VERSION=0.07
+inherit perl-module
+
+DESCRIPTION="process runner with RAII pattern"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=dev-perl/Class-Accessor-Lite-0.50.0
+	>=virtual/perl-Exporter-5.630.0
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	>=dev-perl/Module-Build-0.380.0
+	test? (
+		dev-perl/File-Which
+		dev-perl/Test-TCP
+		dev-perl/Test-Requires
+		dev-perl/Test-SharedFork
+		>=virtual/perl-Test-Simple-0.940.0
+	)
+"
diff --git a/dev-perl/Proc-Guard/Proc-Guard-0.70.0.ebuild b/dev-perl/Proc-Guard/Proc-Guard-0.70.0.ebuild
deleted file mode 100644
index 4dd3c23f4735..000000000000
--- a/dev-perl/Proc-Guard/Proc-Guard-0.70.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=TOKUHIROM
-DIST_VERSION=0.07
-inherit perl-module
-
-DESCRIPTION="process runner with RAII pattern"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Class-Accessor-Lite-0.50.0
-	>=virtual/perl-Exporter-5.630.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
-	>=dev-perl/Module-Build-0.380.0
-	test? (
-		dev-perl/File-Which
-		dev-perl/Test-TCP
-		dev-perl/Test-Requires
-		dev-perl/Test-SharedFork
-		>=virtual/perl-Test-Simple-0.940.0
-	)
-"
diff --git a/dev-perl/Proc-ProcessTable/Manifest b/dev-perl/Proc-ProcessTable/Manifest
index fb8ff915b889..c1fa247c1329 100644
--- a/dev-perl/Proc-ProcessTable/Manifest
+++ b/dev-perl/Proc-ProcessTable/Manifest
@@ -1,4 +1,6 @@
 AUX amd64_canonicalize_file_name_definition.patch 396 BLAKE2B a26231fc5009f5763ba905089e7bd871e7144cce071fb8d079da5d541306dc59266b10307cfb360ee0fcdaa15898ede662190d46fa664b7246016fe9e30f4394 SHA512 176033162dbc12d0f5e732950ada138b02c9db252cfad9bb456adc92cf5e399c7c1bb46e7e80c1ffda0944966a2ddb256009fbee6cbacd5c3e461440f2f3e3da
 DIST Proc-ProcessTable-0.53.tar.gz 71060 BLAKE2B 86726879160d12fded9cce8f1fb7aabc87817dd5338ed0ab2babd1c5679714a4ae833630cb5b0d35da538307095cc0b085448d8f9291a76f26a284d407959223 SHA512 9eb11963ac2e86fff63b515537c41297af2f3610862fe18525296e18a9abc68e4a61e95ea824e8a91d9e0a4ff0e5d909fa1252a30657e9bc22df129090edb4e6
+DIST Proc-ProcessTable-0.59.tar.gz 75949 BLAKE2B fedcb0d407164492df551d88c1bd57997c3c55d86cac975ce6dd9f21a61479ef86e1bd5c9731a7519fdac4a4be1a06e1a86f8567f961f691b1a6d0bf6cffd7d4 SHA512 25162732cdbfdc151db69d6b225137c60dcd1dc31671119007814b2bb82dd7d7c50f4ec4ef49e0cdf2eb04d6d7b60f4d6d39804ab9acada5f1b0230b387e352c
 EBUILD Proc-ProcessTable-0.530.0.ebuild 786 BLAKE2B af08ad1240f732fced9ca6064b35ea853e60307b7896b540b963600f8734405bffb32d7c55cdca3bf9e7c32edc9852823865f1f6aad40b8277c0f6cad4455f1c SHA512 16904b38e09d8a927b1f5bdd40d62b2b9cb0bd7971ea5ac447c9f9b267b5ab8b748e9079366ee8562bbdcdb4752033eeda84e4cb2b171b4f03986b09d73a05f3
+EBUILD Proc-ProcessTable-0.590.0.ebuild 514 BLAKE2B 609404ef54f0ef20f0c2372726de0344645f6a6f0d39a04f311f96db15bd275c04a7e3c4b89f5627db485e982e390d7ed9fe51ed830fa836021f1b8da15cc20e SHA512 73af3037e64a7b200cb39060b20d8194f53c40c19fdaca10f2724e39871a0e3d30c7f06cd2055f7c8ce4d1d40468f4a7d6faa5e175244496a3752a7c4a195544
 MISC metadata.xml 600 BLAKE2B 0092c2642925926fa5d00e8ca0fb5adfe3de19fba854c151b47d13e90d163a80b78fdd6f0b694f916b2ec14796d010695e0e6c9da089da48c1074ff810cc8dbd SHA512 7a8acc3f73eb177576b70105a7fc31afed3b47ceb9d15fb2a17b595955c58e3109660ed8de86e0b69248fd7acd01d5cd6a2367e75e05d147172e6daf4c7305bd
diff --git a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.590.0.ebuild b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.590.0.ebuild
new file mode 100644
index 000000000000..5d45277db1ac
--- /dev/null
+++ b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.590.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=JWB
+DIST_VERSION=0.59
+DIST_EXAMPLES=( "contrib/*" )
+inherit perl-module
+
+DESCRIPTION="Unix process table information"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+PATCHES=(
+	"${FILESDIR}/amd64_canonicalize_file_name_definition.patch"
+)
+
+RDEPEND="
+	virtual/perl-Storable
+"
+
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Proc-Simple/Manifest b/dev-perl/Proc-Simple/Manifest
index 12c4acabe702..7cf267780bd5 100644
--- a/dev-perl/Proc-Simple/Manifest
+++ b/dev-perl/Proc-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST Proc-Simple-1.32.tar.gz 15236 BLAKE2B 5d948d1e51c6d866fc3d3266966d6f008c1b706dadc02b100949c8524de28d35a869caaf5e2edae43dee58f03b81d1b72b2ba54f7ad24fd7bf374ceda3c97e02 SHA512 bb054a7ee2ee36abd2e807b24f5a316902008645e940a9ac3248bfbf2d9ef1a7d0797f14143fa96b09481ec6485a340ea2789929e05da07dd487a76780e1502d
-EBUILD Proc-Simple-1.320.0.ebuild 569 BLAKE2B 294a230c678676457c2aa9df7ec1687be96923f8b4da3b1353b9d74a0520695af1b095182997cfe93180710f581fe71dcefd0ef552e3471dcd5c5ffa6e63d012 SHA512 bfcd9f7fdb7eda59add615043b2b2e256d4c362e40bf6f2c87e9e6553617de7678490aa3f19d47116c8f019eba3b48bb56a7c8c602e10bba2feca9524835c1c1
+EBUILD Proc-Simple-1.320.0-r1.ebuild 395 BLAKE2B 73b0a81268861657a1416973e56bf0cd2d20d26131a74b95acf3a3517146334d688d4a03e59095338ac2b8f8b4091fc97086308d87ff5677b8125bc4a26b66c8 SHA512 486158c7ed5f7cfc2c8a48e36d937bd025994f0654fdfb5aeae136f76be982401b058f93d890232cecb92f9ec09671bd068d2bc5d01871ba884a1fde2c3dab82
 MISC metadata.xml 394 BLAKE2B 3ec15bee827636cc4ebed7c5f763363b8e51cc2f60524969f3c6e1906c0e696e73dbee96fcc7790c78ed3ee026b753ff7bed7ac4189aee32dd6f7abc59120b54 SHA512 fd55c7e359191d74f3c5fa70cc73827cb23801dcf07d7640e7ff8cda3cad33a37c2ae267488cababe120fd6ec1f608a1c650441a12afbe97b989b77d8d415508
diff --git a/dev-perl/Proc-Simple/Proc-Simple-1.320.0-r1.ebuild b/dev-perl/Proc-Simple/Proc-Simple-1.320.0-r1.ebuild
new file mode 100644
index 000000000000..107440849a69
--- /dev/null
+++ b/dev-perl/Proc-Simple/Proc-Simple-1.320.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MSCHILLI
+DIST_VERSION=1.32
+DIST_EXAMPLES=( "eg/*" )
+inherit perl-module
+
+DESCRIPTION="Launch and control background processes"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="virtual/perl-IO"
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Proc-Simple/Proc-Simple-1.320.0.ebuild b/dev-perl/Proc-Simple/Proc-Simple-1.320.0.ebuild
deleted file mode 100644
index 4c67f8f4512b..000000000000
--- a/dev-perl/Proc-Simple/Proc-Simple-1.320.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MSCHILLI
-DIST_VERSION=1.32
-inherit perl-module
-
-DESCRIPTION="Launch and control background processes"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="test examples"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/perl-IO"
-DEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-src_install() {
-	perl-module_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		docinto examples
-		dodoc -r eg/*
-	fi
-}
diff --git a/dev-perl/Proc-Wait3/Manifest b/dev-perl/Proc-Wait3/Manifest
index 3fca8cfc9c7a..6d284f3b27dd 100644
--- a/dev-perl/Proc-Wait3/Manifest
+++ b/dev-perl/Proc-Wait3/Manifest
@@ -1,3 +1,3 @@
 DIST Proc-Wait3-0.05.tar.gz 10248 BLAKE2B 9e7ae0a5e2520757ec95ef43bf502aac7daa9a55851e894433a0c41f846d0781dffc8f2b8fde0a8420455b33574a3e57ee5681ca8e0d77c7837d79e63b811fbd SHA512 6af398422cc79fb02f544226b22dcbd3b3b25ae186da4e5e2d9f3d172fa0c59c7813d404397a8f47f426bde04d7936d939241d197085277b5e57981ac7be274d
-EBUILD Proc-Wait3-0.50.0.ebuild 308 BLAKE2B ff05d43885731db7d24a9d1a314cad4e59749e5d28f43f1d3928a8e39b1b96881e4fc24be7c5981348880ba7bdfeb8a8fb9ba6c9b3b1417b711a0f84ade53cd9 SHA512 b5befd93b4cacbcc580771c076e964665706af62b68e0f8b1a093fa3b2b9f4a5382324012a75b5979b949848a9d30ba270b501a5c83366167e18bdc9d60e6f8b
+EBUILD Proc-Wait3-0.50.0-r1.ebuild 255 BLAKE2B bc37b81dd6c0aed09eecb69f2483a4334d6af7c9bec0815398b5e97a229890b84f6d2781cc057e302d77ffe911d0546f4bcdaaa8dd3a029e69bf1f1b3ad1ef3c SHA512 ae5f4f708030e8cb0c0bd5ef74e8809a3efc34d0da393634b2ca248151f98fcac6bdb4d33394956e44d77af87f143e81bd6151d7c0cedd7163df532d2300f0c3
 MISC metadata.xml 392 BLAKE2B 694d9cb6ba75bc45db33f1456e1c3b765e1f668c426b4a8ba49cc6497e4af6bf36957206f7cfff3eedc864e45a84519f320f058a30e866f856ff68738cf5ea43 SHA512 64e0ab79c54449d08dd3d2c5db9d729df106b1bc034d9c82e3e32e97eff9b0de8926dc197fa305c561e0e40535b11b143da7f7cc2b5397e915ab441d0b859a27
diff --git a/dev-perl/Proc-Wait3/Proc-Wait3-0.50.0-r1.ebuild b/dev-perl/Proc-Wait3/Proc-Wait3-0.50.0-r1.ebuild
new file mode 100644
index 000000000000..08447386fa4b
--- /dev/null
+++ b/dev-perl/Proc-Wait3/Proc-Wait3-0.50.0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CTILMES
+DIST_VERSION=0.05
+inherit perl-module
+
+DESCRIPTION="Perl extension for wait3 system call"
+
+SLOT="0"
+KEYWORDS="amd64 ~x86"
diff --git a/dev-perl/Proc-Wait3/Proc-Wait3-0.50.0.ebuild b/dev-perl/Proc-Wait3/Proc-Wait3-0.50.0.ebuild
deleted file mode 100644
index 55fa92ee15b3..000000000000
--- a/dev-perl/Proc-Wait3/Proc-Wait3-0.50.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CTILMES
-DIST_VERSION=0.05
-inherit perl-module
-
-DESCRIPTION="Perl extension for wait3 system call"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Proc-WaitStat/Manifest b/dev-perl/Proc-WaitStat/Manifest
index caa0b9f3ed8c..228a971437e9 100644
--- a/dev-perl/Proc-WaitStat/Manifest
+++ b/dev-perl/Proc-WaitStat/Manifest
@@ -1,3 +1,3 @@
 DIST Proc-WaitStat-1.00.tar.gz 3223 BLAKE2B de75de08c52dc2cceb7efd2ebd4e24e7ac88466c33518ab787dc100e7c13e11ea7cbfb9128ff163bb3fec19aa46ec206de03e57b8bbf0743b29a5fbff2669c61 SHA512 7abc1c3771ec560e6138cc7709ca4527a34c897067e13afd57d096d664d6d11a1d80898a955404d8b583972eae8c80689fd8421adaee9bed2601e47afe9ef235
-EBUILD Proc-WaitStat-1.0.0-r1.ebuild 355 BLAKE2B 7f9b11a2c2189715ff3366e39af1b7b4868bda7452dd9840b296316c8f559f69d35ca0bab07a50aa8b88fdaddb81769103038a7d76a08bdcb55db1cf20e6b7ee SHA512 29b893b473adf7229885e327900a2d4b3f601ac79f530dfbbbecada397dfaa37101ef04a09f856adada8e0c4c405661e0dc0597d73ae65c61b62a55d7a4a973d
+EBUILD Proc-WaitStat-1.0.0-r2.ebuild 330 BLAKE2B d7118edc9a5096cb0167dfe357ec16b5a08e7e1ec2af179d4bce4d35af4009fe66eadd856a6c7121e6296aabd493e93bad3afff586fb36d458e89364e006a2ba SHA512 27c5ed7286a289a77451602b264097a55427d97eab085a57402ad3274e207310e676b91ebdfd780de2ab21c8de95def4e4890932da1648d5d47c849b9815172f
 MISC metadata.xml 398 BLAKE2B d475fa486b5008bf161c446a3ae0f63ff608fa44deec64bc49de896becff0e8a28fcf30cdd7b5a121439ecda65f9a2682657ec153348c3c6a8fe6612a16e60cc SHA512 0b5fea25ddf04a49a7b713321dbd6027fb56163d5968ccddb2efd350b511c4028b8ea9a8dfb77fb57e6aa9c051e5035bf47f59fb453f941a0eff089a1ed38d92
diff --git a/dev-perl/Proc-WaitStat/Proc-WaitStat-1.0.0-r1.ebuild b/dev-perl/Proc-WaitStat/Proc-WaitStat-1.0.0-r1.ebuild
deleted file mode 100644
index d760ff104508..000000000000
--- a/dev-perl/Proc-WaitStat/Proc-WaitStat-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ROSCH
-MODULE_VERSION=1.00
-inherit perl-module
-
-DESCRIPTION="Interpret and act on wait() status values"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="dev-perl/IPC-Signal"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Proc-WaitStat/Proc-WaitStat-1.0.0-r2.ebuild b/dev-perl/Proc-WaitStat/Proc-WaitStat-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..3358a9b5ac1d
--- /dev/null
+++ b/dev-perl/Proc-WaitStat/Proc-WaitStat-1.0.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ROSCH
+DIST_VERSION=1.00
+inherit perl-module
+
+DESCRIPTION="Interpret and act on wait() status values"
+
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
+
+RDEPEND="
+	dev-perl/IPC-Signal
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/Sereal-Decoder/Manifest b/dev-perl/Sereal-Decoder/Manifest
index 4e782ac593ae..f6557c754b98 100644
--- a/dev-perl/Sereal-Decoder/Manifest
+++ b/dev-perl/Sereal-Decoder/Manifest
@@ -1,5 +1,5 @@
 DIST Sereal-Decoder-4.004.tar.gz 494146 BLAKE2B e38312bc6fbf3ab2f17836058dd9dd9df51d8b150e4819c8b44fde2f6072250bf75202017575b4506dc075e43a8f2cc3f06bba3e7cc78c6eb8858b2a39720149 SHA512 46ac57e0b0caf35a42b96f250100fe5fad31f3d5b5486d7662bc0331ec8451cdd1e25a3fcb4a50b0d329b1aeb4ec55b929481c98f420ae4880cee0f92cf0a8e5
 DIST Sereal-Decoder-4.018.tar.gz 692820 BLAKE2B 9bafd14f3dab8c7c2c3c9e5eb8463a1681430ada500e1ad8543c77587f5117c564cad6043cd0e00b55d7c80fef1f62f2223f232b803546ead349439b62f25899 SHA512 18e4d54c1930187fbcfc39a39ef8512c1450ac3e5d22bee419e8333cbda1e08bcb1355bc2abfc388f9d45dfae3b8bcc101a19646b7caa670359bae98fccf87a3
-EBUILD Sereal-Decoder-4.18.0.ebuild 765 BLAKE2B 965137f8986a385197a09d28c36ee5628664ecbb4b449dae354ea023f2fdbe3f14910b9f5378e3b5a5f79f8626473cc1f5c7f6bdc5bef0362d501a56897a16c5 SHA512 dd773161e04100c4ac8adb29e29251fa4baf7e691f2e4cdc667beefe8e5977e912be073c8d1b4693872e78eeaab7bd6f63ebad1411990b6189f32829c55de60d
+EBUILD Sereal-Decoder-4.18.0.ebuild 762 BLAKE2B 419e0afbf56c3b2b4fa781e6b1cedbee2ab347c70227862231d4f0d6b6567d934256db16ae0c4550984077da771710cb2c5366290755fa97b8a7327185e3d63e SHA512 11783c6dad2cf8372b9124dfa6a009e63567bbc1f497cfecf9d41b5ef03491325d708ccf6df6523a030846c8386650f78051523ac96d6fc8a835ec60add75cd7
 EBUILD Sereal-Decoder-4.4.0.ebuild 731 BLAKE2B 11082d4971a1b694af5e3bb7f4255bdfee0b64bcbfcb96b643707c9b6ad7a29ec1904fb58462256ed913965e669793a792535b2cb789795dd9b4b22dcae95c13 SHA512 d2d976511beb2553ad37dcb6c9e6bd4bf0ad74defe482c2e17c31103d88493db39731d0eb9d6028c3e08d94e0522b71fca94e3e397e4fa46f18488b830831c3b
 MISC metadata.xml 539 BLAKE2B 20244df7eb1bcaced8403236d0d4e493070fef5fc75a1e3014ded52368c4cb875a75b489c64493d32f4314fc4c4cd76516af544f87dd96380d8d746ecf6d9794 SHA512 11da63e51e717a8a6074d50533ec666bbc2535574a32881e9bc14a49792aa17bf215ee07d9d8120cfc9cce473fd16fc1c62b514a97190563088bac8b5fa23238
diff --git a/dev-perl/Sereal-Decoder/Sereal-Decoder-4.18.0.ebuild b/dev-perl/Sereal-Decoder/Sereal-Decoder-4.18.0.ebuild
index 0191c9635293..3504f0e24571 100644
--- a/dev-perl/Sereal-Decoder/Sereal-Decoder-4.18.0.ebuild
+++ b/dev-perl/Sereal-Decoder/Sereal-Decoder-4.18.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Fast, compact, powerful binary deserialization"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ppc ppc64 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/String-Format/Manifest b/dev-perl/String-Format/Manifest
index 5479ac7092a7..00fcafea1a0e 100644
--- a/dev-perl/String-Format/Manifest
+++ b/dev-perl/String-Format/Manifest
@@ -1,5 +1,5 @@
 DIST String-Format-1.17.tar.gz 12841 BLAKE2B 3729fdba56eab74ec6da39801aceb7d99e58909a725f2d2a8f66595608ff3efd12d3784a2b65339ce0d588fc5aac0093de202bad567ffc0cf7053a3a50951753 SHA512 9d003483858d1681d6955b8620cbba649fe8b92c318b29c5dd684857d81320cb35fbb50e537545d1dfd1e3abc9f94acf9263b82442759e55fd686bd6e907a9f6
 DIST String-Format-1.18.tar.gz 13676 BLAKE2B 4876364f972d9a6859de661f59cf251f65d6bfacbc294ad40b951ce4ee1a51f8ee1a2f26fe997dab4ba36deb0def9226b9b2f545c1832bbd06782e00d1bac2bc SHA512 34eb3991a9bea931f59ca1683ba72d8b07244ed4c2a9409be0626346526b4eb2ab07acdd5c4eabf44a767867a4991e97d89835eb0e4c3c43b413de75eb3c0d5d
 EBUILD String-Format-1.170.0-r1.ebuild 411 BLAKE2B 3bb86bec25a51c047c63e39f70930e9cdfd3788c9f9a29672326f3179393bc353a0459b15a15901037b2639fc3687652e52239e0427dcb36dff0fc22efdd3171 SHA512 1557fd5a54052941081312b75e07cf34090176b66ef982b1833d61fdbbc4cc4f7f19eb2f8b1ca75abab3015a6b82a32373d3919c6f47043d5653c8c56b764e60
-EBUILD String-Format-1.180.0.ebuild 396 BLAKE2B a8d8b11800203895321bd16a9bcb40c8e5b7a7823ac4435e0061e2be032314d52252e9e68480c93defc9084071dacff5b7f2a93df8f7ca0805fb046910a956a6 SHA512 52d63b8858ba00368e28bdeb3c74b20f89166df7b47dca13a1038656fb256f940e838df3508e2b6b2e8354f281be3e39f17a4ff19a166041a0e09b158adde175
+EBUILD String-Format-1.180.0.ebuild 394 BLAKE2B 65a2b4d084edc6d3d2c98536dd9ac6a6013dbb7f271e6c4d8d9738d67bfac06796317f0716a005dcec3fc38dacd94c9b2b7f0f5d36cfa88386d379c45d6289fe SHA512 413ee25ce6b850c35e9f57aab073798f476de1a1d082462d040ed7dea230e53eea290b23b70d51cb175d134e6251b9d1e15344ff10ea220feae56ba294f119d2
 MISC metadata.xml 398 BLAKE2B 902d1bb5e644940cd2b63104eb4f4981759e4d1ef07d0725285d966e059f21a8977012457e33bece74d062515bf2eb3bccd3581327509fa9a14a119519de6f67 SHA512 96f7460f62f2cbb9cda85fea1044c7ab419c06a3be0615d53baeeb07ab5ae2cc3e353091a4e3da9e9a53e89bc6637aee3da8e5cc1fa21705433f2eb87fde61ef
diff --git a/dev-perl/String-Format/String-Format-1.180.0.ebuild b/dev-perl/String-Format/String-Format-1.180.0.ebuild
index e3664159da66..e7af746e6f98 100644
--- a/dev-perl/String-Format/String-Format-1.180.0.ebuild
+++ b/dev-perl/String-Format/String-Format-1.180.0.ebuild
@@ -11,5 +11,5 @@ DESCRIPTION="sprintf-like string formatting capabilities with arbitrary format d
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
diff --git a/dev-perl/Sub-Quote/Manifest b/dev-perl/Sub-Quote/Manifest
index 442301df8034..6bd99d2b0524 100644
--- a/dev-perl/Sub-Quote/Manifest
+++ b/dev-perl/Sub-Quote/Manifest
@@ -3,5 +3,5 @@ DIST Sub-Quote-2.004000.tar.gz 20363 BLAKE2B 0697f2a0a9aec799161289bee34f991fc86
 DIST Sub-Quote-2.006006.tar.gz 32485 BLAKE2B 517742256d9da1ca839051e6bf75b660740ccdd0ed2809249bf40fc86526b72bc12a338baa34d6f88a0f5411e5331bdd6a769c7a777996bb75775f79a2315d6b SHA512 19cd0504f039f3218d3f47b3b44714f0baed73a13f97c4552eb1816b7b03186b1bbdf48cc70c2cae616eb9ec81721b30217c7f788176d389df694c9b355ead64
 EBUILD Sub-Quote-2.3.1.ebuild 596 BLAKE2B c9d6fd99d2ec09a4bb1258c6cb34d5753ccb3b49d9b7ae76e41645dab76e8e2703fa4a94bb0942447c43fa5ba3fa9296673956bd45821ad57436a75c7ea3c0f4 SHA512 4f0771ca556ec4c7890748e2184a604379b421519a3acf5b67cd0df59245d1a93a770ac655e1e2ab5e992098d4b9bcc7ed099940ce3ecc98be3749e468c10d2c
 EBUILD Sub-Quote-2.4.0.ebuild 735 BLAKE2B b92ff2308882dfa2c3660d791b8a694fb7251be1cd2d73652f7bfbd5c378a6ee05b1a57679315c31648ee0430b2671fc540bbc9f63bc53218c71f65eb3b041c1 SHA512 30e0e2fc6522aecf883a2231828734ebfa39f100f6a8595d219c792d032ab25f1e24f1ecbce6719b6d7b543d9a690a4573ad13f85c4d6b0f321c27862bf3c7a8
-EBUILD Sub-Quote-2.6.6.ebuild 743 BLAKE2B eb4b768b0491ac3d26b1684bda1910d3d2e54434a7bf0d1e1586fe76a2c3f30a5cb6e2a0521d95ee995b7ac71d7e5538df69571961ac3493663c8a72826c9c1c SHA512 7b3bd6a0827c5ba00a9d499f2ac506e7869943a8558101bab2405dcb0061d4a56f6c487dd72d6751665db21e4b73152f76bdf2b6fab00349a2510ccc09c7cfa0
+EBUILD Sub-Quote-2.6.6.ebuild 740 BLAKE2B 4412f61f9a553313ebf5c8a8a5e71f52f0bd314462aeaa24e68982dab67d1b122cbd05c58a1b72984864f337d09438dc768e98b7a58ead0e2062beaf5fa2952f SHA512 0ad5e9ad168f0dab49a792d7f485a039baf9571646d00f7256527fe1773909074123a7e63567c633d79ac78095516986042a116b995b5f3b98191f9b7c08138d
 MISC metadata.xml 447 BLAKE2B b414878a42aceb8390f1de47f02ff23dd6ca3ed337074f06c252824c968d933023dbba655430ceab71406ede17a30fd2b3d8b376a1159425116c2898b316d182 SHA512 b3147fbe7cfbafec109ef47574f27a5d3f49558f55ac6b9d6ee52c56c2701b26114209f0f675e32de3eb253b375719d2faed0ffdd4087ab49b3e6c9d0cd1237a
diff --git a/dev-perl/Sub-Quote/Sub-Quote-2.6.6.ebuild b/dev-perl/Sub-Quote/Sub-Quote-2.6.6.ebuild
index 246dd2c7784f..4f9fffd4f9d7 100644
--- a/dev-perl/Sub-Quote/Sub-Quote-2.6.6.ebuild
+++ b/dev-perl/Sub-Quote/Sub-Quote-2.6.6.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Efficient generation of subroutines via string eval"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Term-ReadLine-Gnu/Manifest b/dev-perl/Term-ReadLine-Gnu/Manifest
index 2b17bbde59f5..be97a35c6738 100644
--- a/dev-perl/Term-ReadLine-Gnu/Manifest
+++ b/dev-perl/Term-ReadLine-Gnu/Manifest
@@ -1,5 +1,5 @@
 DIST Term-ReadLine-Gnu-1.36.tar.gz 128336 BLAKE2B 03791d1e486bec605c65b88a4549a023b2ca51c8fa96f36dd05d573516a7c776e6a827446a2b0d3907120262cec3dbbba4a770a3e0bd5e3ee27091ae70fb4778 SHA512 be576c45808744b9e6ae703ba170fc19f8cc4a63e6c8d74486159ff44c6763815bded11c7a414a491553e82041da2e4c5f197785e91a461118b4efa7fde240e9
 DIST Term-ReadLine-Gnu-1.42.tar.gz 197745 BLAKE2B 9b824310d81257f097ea9fd7848bf1f49cacb1e5d903d953771704a0ea5882da6a0fd0a293046345b8dd64ccc3d132cbd1db572912e593015b9e2d9f2f740115 SHA512 8f62cb14432f9364b1a3cea708d3d648bc7df2bb7fed2b3ec7af389fa183bfbe1bec3020b184b19a267217d47a3547f52a20d75f17c13ba89684759084f24471
 EBUILD Term-ReadLine-Gnu-1.360.0-r1.ebuild 467 BLAKE2B 371245e5e6139e641ddfa37ec446e0785b6e8e5895ffa41713d0e7bcfd28d7631387d305cb3031e1ffe1fb8e96ff9cbd66e6971f868746a8c40d0da243496862 SHA512 7b37ac9fcf5a4e9d4728adf7bd4b0c3f232170ed0898247035bbde0367d3252d2a8bceb2e9424187b4e6d92ab8ada43262c5c2ad9a44f63106d8ba8bc1bcc6fe
-EBUILD Term-ReadLine-Gnu-1.420.0-r1.ebuild 784 BLAKE2B b6c9e5f47d2e7dbd8c99bfd147c0b1c1a845b4e58a25bc11e29c92d638c5c266f0234589337f29c3c03428350f8141573e677c93960f147d607f5eaff9c62a22 SHA512 04f006a2db1c73dc2b5006e02e4b6abdfe34c3a9873a8557e8d1b222aa5b11043e4543b7ce8a621255ea606a22f9d89a51c1ea0681e14ccbf714030f0f9fc023
+EBUILD Term-ReadLine-Gnu-1.420.0-r1.ebuild 782 BLAKE2B 5a3092bb202b00a00552999a0f095a3643736dd402b017a994c784cd4773e4bbd7ae829d39b98559e918ac915bff144cde74fe25305f513d4e68ea7967ef800c SHA512 4dc3580a1929210cfb03fd0ecb573f6cdb087b5ad3f8f60113d3d18e23afb49bb62d230a8eca6e649a09392c1e94b60c59b6b98cfce905b0afaea0d39c67daed
 MISC metadata.xml 618 BLAKE2B 1869201a091b8ca507f4c5f14172bec36d6a1afce36a8fb2c40fbfcefb22e5b30dabd389b7197876f4ac4f4149e360e7a2ff6d338ff462f7f23dac3bed617cb5 SHA512 e55aac406591e036f205537227ab63093284c062fbb7b2f82904dbdc592a4329bdbd98ff0de17bb1c3e2a18593246acd8bfc55a9480396a46e2d1335bb9445dc
diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild
index e2e3785ea442..ba9d55f636fb 100644
--- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild
+++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the GNU Readline/History Library"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Term-Table/Manifest b/dev-perl/Term-Table/Manifest
index 86d2cfa1028e..ea410807d85c 100644
--- a/dev-perl/Term-Table/Manifest
+++ b/dev-perl/Term-Table/Manifest
@@ -1,5 +1,5 @@
 DIST Term-Table-0.008.tar.gz 24084 BLAKE2B 96c188b2b5ba76815631ee14348baa48c89a71d14c49f473e5d47f174ec9d3bb2ebf76704bd3d97c4ddf37de121b8872653756c0c64c9e3fec48bab5db7f0ebf SHA512 d741313933c8925ca3451056d05172c440ab4a46f5a4cbaeae3c6d4b82d29314e69643e8c3e60dced42768f2102277461b2d2dc4bf945d982df9265f49339d06
 DIST Term-Table-0.015.tar.gz 28737 BLAKE2B 4cdbb839467989d15e3ee3033efc7eb7081999d24ef7df05dcfce4fe18b03fab644af30cc5b6a28e5a4e8895a95a00f10b547ba98c4570da57ab9531ea04697c SHA512 2f5cbc28d0d0f76a6269892055871c103a65d9fd9836d3a0b7c7320cf1439d27cba596453f1d94bd324bd4d4dffdd0eb672801aa23f9a8609310a28eca15dd87
-EBUILD Term-Table-0.15.0.ebuild 945 BLAKE2B 7caeadd6c16e01e8d0fced96081688e909025a7f70b171e6dba0ffadf523dc95aabef6a2e5e83d829f4f761a3b4d3f65b3498c08f9e2327f8d261efcfcf18b0e SHA512 c08fcca6658b9f56ff905db33216fbdea7fc0405aab24355bfcb85768e0018498d093128d41862a8f4378d91a115e55ade1f7f941d8ae305c7b1c4224a6abc7e
+EBUILD Term-Table-0.15.0.ebuild 944 BLAKE2B 9c79bce80f02cad5f52b83d9f1dc142e805115072d55f0e9487294fcd19a1c744f065ab7cd379c570ba69c3bf5518e7e6aa25f386f084d10b5c3269afc208e1a SHA512 b702906e2c3d6c46e1522e24f4b161cef6688119fe6ae146acfa7befc8ea9d81f130f827041ec0acd62929197aac08abc41c11ceb30dae81b0324b27516a4283
 EBUILD Term-Table-0.8.0.ebuild 941 BLAKE2B 7b2f30c9323d04a37bf0343dd063f16cf2a8a95559979b86015cc942bd1adf08354a305142e276b7f55ccc493cd209b4978166953e2043ba16e5b43834847e79 SHA512 6caa63708160fb01cdfffdebb4511a8ccf62b0aafafd2c0f6b408ba521c60d54905eb982d8a8b26a6a7933678ea98cc8197b568f4e085724dc2a0674203c7157
 MISC metadata.xml 792 BLAKE2B 410a60a67ce675c88998dc5f40d4afda2a44d2e7481265b6c65a13e64f9a2c32dbb580f65642b0f476ee411840e9d79f86872bb734f5848a01c070f28b9a7f5d SHA512 0f55103bb7dfb35ba7913152c3307fc145539ae184e16a72628737caf670da2a3ab85bcf4a9c9d601d09115c6414ab392bcdf5a9a9b5a043366721f0d6e4191e
diff --git a/dev-perl/Term-Table/Term-Table-0.15.0.ebuild b/dev-perl/Term-Table/Term-Table-0.15.0.ebuild
index be17eb8f4533..0e1dcfa3722c 100644
--- a/dev-perl/Term-Table/Term-Table-0.15.0.ebuild
+++ b/dev-perl/Term-Table/Term-Table-0.15.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module optfeature
 
 DESCRIPTION="Format a header and rows into a table"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Test-Needs/Manifest b/dev-perl/Test-Needs/Manifest
index 4bd7e9c6ae1c..2e45ea244e14 100644
--- a/dev-perl/Test-Needs/Manifest
+++ b/dev-perl/Test-Needs/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Needs-0.002005.tar.gz 8505 BLAKE2B 783130e726a469e850541d1569ffff614ab38defb2a41df564f41a573e641986b9825963c22b8e7979db4fabc6f547adfe95741f83546afb46bce6e5249c2fc8 SHA512 b3023067d1f8726b0ae2162d0b3722193a3b56d12d5c207cf9558f1552ae8ab554773b843d00f1c481857c259fa869b8fdaf5a4838ab0768f38726ddec4130c6
 DIST Test-Needs-0.002009.tar.gz 17052 BLAKE2B e8c51a23b1febe592ee25b0c83741695d07777adfbc2f0e4fa58a81284d0da5d7601b312cc7b33ead19680b728ba481efceb8b4fe042823212f4523f1028a009 SHA512 758f22ca9b024f7d3252ff575ae84453e64f4ef4e18d3233cdaa3b81d9212cf48e41fde529047e7355678d5e53345bd51210a45dd9545c3bf8ffe16f96a9500d
 EBUILD Test-Needs-0.2.5.ebuild 592 BLAKE2B fd6fb90ad4ae03c70ed82c056f7c6b14fbdffe15a588b94503230fcb4918a27de3a17b9f544f9d9baff2f0a9c2ccbbfc872e3ddec7d381fcd87c40d9f6a1c126 SHA512 eb9b2ad5cc8f1a45eb0c1adde92dec1c215b833ec8ffc7c83cc8c29ead8aef925a4c441d52d460798c44f1a721581e1764b6c10a5fa26a1441b05cf07b455f67
-EBUILD Test-Needs-0.2.9.ebuild 516 BLAKE2B 5e4a3f972d6edaec6566871ea256e55ca16cb0f7383a3ccbf4302bfd02d34632dc8e9433abff5d75e8c2e0fdeb9a44f1e26d3b98c38bbe44aa76ebcfadd9dc02 SHA512 2d94362c87890f6c84e3b50274a999d64887f5f29aade9a49aa16758dfa611c6318db7035d9e0e5f2e6876466730d432a55949dd17d1cbb6e1c29f2493301f5f
+EBUILD Test-Needs-0.2.9.ebuild 513 BLAKE2B 35d2d43c9049edf12826f4e36e21d172c851c5c3d257d4d722cbb346d1f7979db6f34a19cd0a5edf123740ef96137fc8bc5008be9e15b51b86985f677250e8a2 SHA512 1924f0e4611a43849c9959e3351945a5811363ad26ba2d6f29854ecf7301bd4827bfdfbadd6338df42a8f3cd7df1d2613a1294829170fa7cb97853f55a7412d7
 MISC metadata.xml 392 BLAKE2B ad442022b213e365a4894d39b8b49e9487e426e09f8ff1614bc17d8231932aa12077cf523305394836a36ffb0f1b1546f14e1c3d1084b8f3a2f1644a97f7dee2 SHA512 e958e6bb79542efe25d44fc5f87610d15342fc397e3be4829d137a6e6fbcbab06c558dc4034ba4de6c7a96b4f10137a57906a0278ecdcd782f60faaa6e3b4fd7
diff --git a/dev-perl/Test-Needs/Test-Needs-0.2.9.ebuild b/dev-perl/Test-Needs/Test-Needs-0.2.9.ebuild
index 4ea245657017..324c7281e116 100644
--- a/dev-perl/Test-Needs/Test-Needs-0.2.9.ebuild
+++ b/dev-perl/Test-Needs/Test-Needs-0.2.9.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Skip tests when modules not available"
 SLOT="0"
-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"
+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"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Test2-Suite/Manifest b/dev-perl/Test2-Suite/Manifest
index 94373775cc4e..557547559afb 100644
--- a/dev-perl/Test2-Suite/Manifest
+++ b/dev-perl/Test2-Suite/Manifest
@@ -1,5 +1,5 @@
 DIST Test2-Suite-0.000077.tar.gz 144835 BLAKE2B 5a3db61f48f479f8bd00639a538fada5a917ea054abb8dc22b92b5fb2a73ad2da33776f264b1fe7ec53f1a3786af286bdaada7d611772e56a9f883d91139507e SHA512 e9337fee244f572c5b0af54c78a1be47bf590caf905ef6a40928c6e914a183d3fbc5fa3312a0903f697ef5e44341c5425873ade50aeabb63de3f795902bb0f71
 DIST Test2-Suite-0.000140.tar.gz 227561 BLAKE2B 05d3467b65e0669a5cdef590baa21fecf24af0042cb24f70d380a08fc832963674a11abe3f965273592b1b8789066c77b9b561c8c23f0f5403e20ddf5f5f7e9d SHA512 26abec9f0aad7d29f6499d27a107bee915c57632b53147f602f5e3732536aabf6c6f903da989a7ebb7113e5c5c0d22a393ed9dc0438d284c09035b76dee91a91
-EBUILD Test2-Suite-0.0.140.ebuild 862 BLAKE2B 9734f90667c74d23e03bf2f4b46b63d62e1a4e0e1b17bfd0b46b59957067f61e0c64c11897772a7e5a9340595737fd904203692fa5db97e709e21b12467739d0 SHA512 85fb73b05445b46b07fba2e5b4eb3854c08657c9754e29cd358acf7f486831004aad09f19092ff5186d78e24ed04a13046014d57f3b6af6b3aaf83cc9a354191
+EBUILD Test2-Suite-0.0.140.ebuild 861 BLAKE2B b95de06d36a691fd0f72ac7952079cdef0c3eebe494fb3adfdf46dc5b5dff2d83313ff1f495ab227d9b8a05db32e4f2fe2ae0ab9f35c76e5f4661585dc62f6bc SHA512 17989b5b2de4d45059fd3f6ee73276640b58369df1907aa41fae49499b4ed4cec040cd7c805881664dcc2adafb6cdc319c7c01b668da986a3fac740d4312052f
 EBUILD Test2-Suite-0.0.77.ebuild 722 BLAKE2B 6ecc3353b8d36fea7858c67af56ea835301d97f9dabaa81ed05252cf86ac5643f3f7370086225beea8983d032575b48c2e4cccddc86d369d5432915b60d73ea1 SHA512 d66fff90895f5b2eb2332ce675f040e5ac7949ab563bd12c02357a3127c4929a080742c4c6c569504e0684c9cc8326fbca6efb2c1e9e86389706bccd20acd9e4
 MISC metadata.xml 5303 BLAKE2B 7bdfd9b31a45fedd69595fc5da50f93d52865d600c2bf7f480d507f7fece8ebadd02114cd6b000388e2bee479bcd0c243d1a176bb6bf6c911d2499737da9134f SHA512 acc269672170b9427444854bd73769c31e45a5e87ccac7441024b8db93dd1a02b09a9700b6c38f15379981cd34c490a6937cf780c544a245239ac7c1c323de16
diff --git a/dev-perl/Test2-Suite/Test2-Suite-0.0.140.ebuild b/dev-perl/Test2-Suite/Test2-Suite-0.0.140.ebuild
index b82709657a0b..7755176082b0 100644
--- a/dev-perl/Test2-Suite/Test2-Suite-0.0.140.ebuild
+++ b/dev-perl/Test2-Suite/Test2-Suite-0.0.140.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="A rich set of tools built upon the Test2 framework"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Tk-CursorControl/Manifest b/dev-perl/Tk-CursorControl/Manifest
index 6aad0f56ba04..8d80ccddf9a1 100644
--- a/dev-perl/Tk-CursorControl/Manifest
+++ b/dev-perl/Tk-CursorControl/Manifest
@@ -1,5 +1,5 @@
 AUX 0.4-demo.patch 397 BLAKE2B 485f3e167d8a8161151ab123149f14b7d13a40a192db8143e4040f68e7ec35db2419edd810cae4e71b7a18b38f8575fba69dd39ad0382b6b39df4c03f3b0aa21 SHA512 da2fb2d67e91476ccbc9fe1807bf85f5bf0aeecb35f363e3067a4b4bf33c559cccebfc05cf862095637217b9034935b8c103a08fab3f51d77128887cfe897f9b
 DIST Tk-CursorControl-0.4.tar.gz 12847 BLAKE2B 819cc96d1a2e3665cf83622959639cc78e9f4c497a87c79608addbbb3c500a9f44a3d632aecfd566c13ee7350fb66f9a22b4339e139c875fe3eb102467353e35 SHA512 9e4f052173211360f9239759259576c4928d8ffff3476005680ef1b0e90056465fe2a20ea4c6f3b949588c4162c2a4a03cf36ef6aef4bbe9ea5a6461248ced5b
 EBUILD Tk-CursorControl-0.400.0-r1.ebuild 479 BLAKE2B c9aeb4d1ec688fb149545e03493f757c94a12bff0f43e778dd05b4a177853f6e8687eb6d50fd3f26c164ae36db1889a2c701eae7a67a7440985c48137a772271 SHA512 1759f934fbd57c908ae336da47e6e4ac879671bc30b6a9ae1d899620b0d2817c64724cab2ef62020e20866d58d849ca049f42bb2be4b3bd47bc99eacff0de88d
-EBUILD Tk-CursorControl-0.400.0-r3.ebuild 531 BLAKE2B b3f2c4d16abc9c8fbb7fb41ec6b3799fef5526a5f27a42cb952f4886bbb5aecee7139f5d17a360b81cce83a77e8f777aa0ac950c6602d19b58cefe569b998d80 SHA512 2b5d4249620c9b0c912e72704937391773ba966add122f13882558cfaf702b0b472f9107e369576ea9cf3e3f6092f20e11f957675af8632789efdc188b49b2f5
+EBUILD Tk-CursorControl-0.400.0-r3.ebuild 529 BLAKE2B 94226a798f5a8738b3a9aa89a04f62fbb648f2b1f1978fce07d4992a9ae598da5d971a6b2a349ce6ca1989bf45be0a204ea5a29b6c3c12cb51f22185be1b399e SHA512 36931e4aaebf55cfb420ab4447af24041e9f89f66b932784ce62d1799dc70a8a38531f8709a0855de4861c954a12546fa48daa92379db818b80bdd50dca0376a
 MISC metadata.xml 404 BLAKE2B cb9bd81588e661f7082515627a058d7a571eac8cfbf6c4c78d846a59325c59cb2359dc4fe89b7a7db25eecd3ecd4bd2e1f2b4dc40efd3562bae54c56d79b7bf4 SHA512 75c185ea0c9570372a845bc3c46fe2675a33defc87d908db3a554aa7a603666c314bb7b6c83d593ef79e4544b8b50da73b86ec1d25ac3e24d241f08f9d26a56f
diff --git a/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r3.ebuild b/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r3.ebuild
index 8d445b80bb17..c6219c141179 100644
--- a/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r3.ebuild
+++ b/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r3.ebuild
@@ -11,7 +11,7 @@ inherit edos2unix perl-module virtualx
 DESCRIPTION="Manipulate the mouse cursor programmatically"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-perl/Tk"
diff --git a/dev-perl/User-Identity/Manifest b/dev-perl/User-Identity/Manifest
index 268931972f5b..42dd7061e17d 100644
--- a/dev-perl/User-Identity/Manifest
+++ b/dev-perl/User-Identity/Manifest
@@ -1,5 +1,5 @@
 DIST User-Identity-0.99.tar.gz 28657 BLAKE2B 7374c2ae8be5d81c52bf57d94adbc881c2b07f5d8b11c7dd86d301b95deb93f77a75714831155cfb47fdf085cb271d014203bb3ed917d683faaa7cf0acf0701f SHA512 b0706cb5aed372b384229459c5b1a9e46968cd8d58f713754cd1a65a7caad0931839bf9d1540ce7a849f94a3d37f580120940364eb29684d3a84a009fb702cbb
 DIST User-Identity-1.00.tar.gz 28871 BLAKE2B fda44088fcb156352c79a7092bd41a4c0a86fb00486a9feeda4e7f74d398ac4d3000859b0e9fe4d5b758b60047c29f4b425337896ca6343fc81268e85dc1d31e SHA512 b39315050aed9064f606d6fb167e42fb55bd411f1573215b544c9f2833c0d39f12700a4fec701317e31d614c55825f250b0b5ce7b3355fb63bc953d07d8fc744
 EBUILD User-Identity-0.990.0.ebuild 512 BLAKE2B f12119f999aba372b9252716b4c25482b51a0732a10fa274a69452d514000898448c643bbd40e815fa6ee5088a147f1dafaf9967f3f9fc6576873f15cb4c4f4d SHA512 44075eec3aa83616bd1d0a8921e73122d8352a5054a47e294b664d09efa9f138bfb8c52f47bff782448cab133ac0022600a7b49e1375e65372e2f7d71212dba3
-EBUILD User-Identity-1.0.0.ebuild 478 BLAKE2B 22d3728814b671139f19a7e485cf5ce7286363e35835eae399563612ac5bfaef28d48d384a04258a36cdee950bb2849eef28a515a5ea4fa777d98fe181feb814 SHA512 7240356d6d46ee4a36c91d1fb797727be1fc8a762d06fff7f6820336a9de77c6d89a6c01c5389d1fb72c7c0ad0cc1a4596484c72b7ea7b6a3a3d3030da35c814
+EBUILD User-Identity-1.0.0.ebuild 476 BLAKE2B 0f83e641591acb126145370756f9c5012049a3ea45c11b9b049d8d8b24f2e2ba49a2fb4ade7cb599a27252f0a5ea0ccdc68dd9fe6e574965cfafce07127551e7 SHA512 ec1c5cca97f8b875b0d239e6843515bc58238ac473d17528f56827b7512b4bdedcfe14c2fdaf612e03a31c0fbd1d81624356306a564d63f378e36de50939f489
 MISC metadata.xml 1213 BLAKE2B c39c59b289f194355ffbd9f2f9bd611f69e390a87915ce9d733c5df77b07299b71e168ddd0072f03c67d2b061d1972612d3a01b631be0653cec35317c2618da6 SHA512 2701abcdf1efb1925990b6ee9e943b6f781737469890211b09f3d865fe71891b4842412805e784c19dcb6e6917b4df651a78442b49baacd1017d7bac235a5dd2
diff --git a/dev-perl/User-Identity/User-Identity-1.0.0.ebuild b/dev-perl/User-Identity/User-Identity-1.0.0.ebuild
index bbab0b50632f..efc7c17ba9be 100644
--- a/dev-perl/User-Identity/User-Identity-1.0.0.ebuild
+++ b/dev-perl/User-Identity/User-Identity-1.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Maintains info about a physical person"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc64 ~x86"
 
 RDEPEND="
 	!<dev-perl/Geography-Countries-1.400.0
diff --git a/dev-perl/WWW-Mechanize/Manifest b/dev-perl/WWW-Mechanize/Manifest
index e19f1cca10be..f5744fc9842f 100644
--- a/dev-perl/WWW-Mechanize/Manifest
+++ b/dev-perl/WWW-Mechanize/Manifest
@@ -1,5 +1,5 @@
 DIST WWW-Mechanize-1.87.tar.gz 169289 BLAKE2B e7d34dffc54a9a2ebd6b5a02cd21588fe06d7f66f210b80aa16db6d161635107cc5af7c355a9e7867ef6a902fce7ff9b7b3518106fe9c49155e3bfa0a4297f80 SHA512 4ec0e62402a9236b80b12edc4ee3755fbb7f85f99f83f8f7a5dfdef2212bbac7dde2b9e3e5f02793d7443ee0c193986887203aa5a9929413e945de024321fa72
 DIST WWW-Mechanize-1.91.tar.gz 178877 BLAKE2B a0fe65fdb0a7d6854c97081f7ae3ae3522f89d660045f180d3fefcfbb7faa870af2e9f258d2b6c31be504fab33722cd535387eac6ef92119501b6b73984a8014 SHA512 f051f3f91f7b70cd7c8e6c624e9c359b9a041c4da8bce38b9a1cbd7b4b48d6e6b1d3e60f901a6b0c9b876119a2fae86c32be7ee40216d56754779076b0f4a879
 EBUILD WWW-Mechanize-1.870.0.ebuild 929 BLAKE2B 842cc6619f8a4806590b6da9e3a00336d2008028a50f3cefce2c365c9a384fc1640896a0227764a3ad20f46c0498015b3710ec63d2c2815550c9467873178b22 SHA512 258ee1ae1403bec6881650a6fd9ba365bf228d4a0127922a5e9a917662a47c24e8b27614d40ef3a9b13f8d72b261102ab4b0b2f44f7ed61247a9b1d3e8f2af9b
-EBUILD WWW-Mechanize-1.910.0.ebuild 978 BLAKE2B 9aa4583254dadb59ac37753a6c364cc37922a6f2d543f13c106e290924078e07f63bf81d1ad6de8272858f54d6ce95032e96474db2be9f806ec623236b0edfdc SHA512 416b9ac9e866d2341c17d5658c5c012d8308e4897d8a6e555e3cc63e75bf8ccee815e3f05eb44b696cfd4f13ad52d5fd76fc6bab91633db78c8833f45ccd0a0f
+EBUILD WWW-Mechanize-1.910.0.ebuild 977 BLAKE2B 2f2213de56c5cf33392561f4a7a000e94cdf33fe93374204d9ac5c4e5481d974d068b3c0ce5072b6a9b959f023559dfb194c32612f42ed8b606e0547bfeb3b5f SHA512 9c2749d407f8dc47b4d7e3b6184312761ebe615bc753bca8cc36cc21af002be9d9b50db862d46f4fd26305b2bc3e870c936c1b65147e8c25602d5e46d1c64b9b
 MISC metadata.xml 533 BLAKE2B afa2243f9fcdcbfe6510e0de2bc396f6d69606fd151bb8570c5d20066983f00809409af4edc18c34df52cdc65ca74d2063442988acf74a4cefcfb8318f2bc31f SHA512 8a59c91ad7528008afe4c023d5a65cfd4c4b14e6994f2e24083f3ab1575024f06eda4639e0bb756cf8254699b4b4f3834fe710d29191afb315e7df80c0117fa7
diff --git a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.910.0.ebuild b/dev-perl/WWW-Mechanize/WWW-Mechanize-1.910.0.ebuild
index 43eadb0d03d3..b8507fb3e473 100644
--- a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.910.0.ebuild
+++ b/dev-perl/WWW-Mechanize/WWW-Mechanize-1.910.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Handy web browsing in a Perl object"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XML-Parser/Manifest b/dev-perl/XML-Parser/Manifest
index 3af04ced5aa9..cc945006799d 100644
--- a/dev-perl/XML-Parser/Manifest
+++ b/dev-perl/XML-Parser/Manifest
@@ -1,5 +1,5 @@
 DIST XML-Parser-2.44.tar.gz 237377 BLAKE2B 3d45053b98ef6944122fc4e61a8dd9bf25b3313d635c043ac065387befe2222b52c9963d1f9c5bceb45d7e288f13a6a83a39ccbed8ab2806867d379565199ecf SHA512 4790d20d89478880b18255679727e5b2fb2860bb4de67d5032c805fd44c9f90697a240a612aba51255325192253aa578b346d658b29f631a4e92ad96e7d65b61
 DIST XML-Parser-2.46.tar.gz 254763 BLAKE2B a815c8f517adb609a1690e6127660eb339649eacffb21d77664b4f9ea071fbaeb432f50bc6469cb36a6b9b4b4e037f778dd2289bed6d87f497713d1d8cab9d0e SHA512 c4609495cc5ca34952f61876a690ef76d42eee6689d1bedb8036c9eab918525ec5213f1639c7178c029ee0f8765a2ca5eb0197f6e39b8be6d5dbc3f3c1d0b389
 EBUILD XML-Parser-2.440.0.ebuild 690 BLAKE2B d9c7932ed8564e95209cb8aa822415503ce7a222b3ea9536c33aa82e924fdcf6d3f6962dbfda9fbe658f283c78ad66b5c93527c5171d792a462b6bab31fba95f SHA512 a1a2d52cd8e46b8d7c2ccf75b65562cd6d0a47a290d545d31980c5a17117cb9cc8968408d30cb6c25ffba90eba0b4a05b6de2b1a395404af589b1f74eaa7e1f4
-EBUILD XML-Parser-2.460.0.ebuild 705 BLAKE2B cf48619d7eb11b7faa0f95d8e2c74b261ac0928487825f18d35801f32664941db6bc3df19f592f4ba52cebf3702e58172de98b18b63f4227214f2c07e5cf5b3f SHA512 a2a675a019ddfd345c31e15db3cb5ac57e074cb137567759603afa73c00520acd9f900091f4a0b10f6e8e85c6c0c258759aafe15cc71a42d473c6dc79a4f3dae
+EBUILD XML-Parser-2.460.0.ebuild 699 BLAKE2B 05797caac050b12b6e386678905e57968ac513ec026045203bd97aa8fbf2c2b60877be9bb30c6c83a3dd0f3d7553d09d7eaa7d9f9dfcdb3a1d8d61069b8bce1b SHA512 0d8e40dcf42774018b9f9fba171948c8384cd69d7501b6dad736acf936b957d7692b00768d60d310253cb929f04ac1e8fe6e057f386a2addfb4cef3f5b9fca4b
 MISC metadata.xml 818 BLAKE2B 39f93a2618f148aaf9fb894469d74ec03f41be5c36d36e18e5db3cd98ebf9054eba84d9bd6f201e6d13dcc52b9518a40b50636e80b4e3d0410df8b53b6d018db SHA512 867640878bc02e9ba3b1c85691d7da8d64adafde700342b97886b98c2057c65d8f484c69597ad7ab53d5970117c5d5120634b83b27c6233cfed8d608ecd47d14
diff --git a/dev-perl/XML-Parser/XML-Parser-2.460.0.ebuild b/dev-perl/XML-Parser/XML-Parser-2.460.0.ebuild
index 92ce25b67bdb..8e6fd516c914 100644
--- a/dev-perl/XML-Parser/XML-Parser-2.460.0.ebuild
+++ b/dev-perl/XML-Parser/XML-Parser-2.460.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module multilib
 DESCRIPTION="A perl module for parsing XML documents"
 
 SLOT="0"
-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"
+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"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/XXX/Manifest b/dev-perl/XXX/Manifest
index 151273656395..a8e59dbf173a 100644
--- a/dev-perl/XXX/Manifest
+++ b/dev-perl/XXX/Manifest
@@ -1,3 +1,3 @@
 DIST XXX-0.37.tar.gz 14440 BLAKE2B 1392c3fbcf2c0871845594d0ca7c48102693c186a319e684b7ccc0444fc22afcf1f05f91c83088b29c6df5419a8dc4982c020ca5496bc13b0793445d378406c4 SHA512 5f84c2b0c87152e9a60b224a7e7dea2819b9ebf77ce003e162c06c456029d5629c1401d90f258da078058c59ed0ff32dbe51abaeb6ebde3a403805e458dbabfc
-EBUILD XXX-0.370.0.ebuild 386 BLAKE2B 35f5534c740e7ab8581acf70b37db423b2eb663699bcc32d1a27ac36a245c90b4d5f4a749aa5bc51dc4957fc17d9b2b4ec4e45c3f6dfc912dc8aed687b90ca2d SHA512 645989b850222271a2902a52841d4508539bf0f8f252e712fbd4daf747af0862be5edea34bf469b422770183f18fc780ebecf0fdc6f70f0605f2e6a7789f64cc
+EBUILD XXX-0.370.0.ebuild 383 BLAKE2B 5aa428ecfcbc71fe6e38b488e7dad7af3103f03f8d85667f6322fe6bd3e61764a64ccd4a044e639b94ac6813e7f1a3106dd0337ebc7ead6732bece82b010eb1b SHA512 c0838948721d9eae313676196d5c4ee0bcc65679141f7bd9a335fa40242842978a92ce0e4d5168999993317b80c801f56a8702d065d2982d2a9710b9b99b74d2
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/XXX/XXX-0.370.0.ebuild b/dev-perl/XXX/XXX-0.370.0.ebuild
index 4bcba7f78cb9..a2c2dfcd7282 100644
--- a/dev-perl/XXX/XXX-0.370.0.ebuild
+++ b/dev-perl/XXX/XXX-0.370.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="See Your Data in the Nude"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-perl/YAML-PP-0.18.0
diff --git a/dev-perl/YAML-PP/Manifest b/dev-perl/YAML-PP/Manifest
index eb1295b11c09..6bb948081aec 100644
--- a/dev-perl/YAML-PP/Manifest
+++ b/dev-perl/YAML-PP/Manifest
@@ -1,5 +1,5 @@
 DIST YAML-PP-0.018.tar.gz 160231 BLAKE2B 65d332a2f02ed0801f927caeb0b65b0b7a43ac23ab5eac58f2f7fca02fb5e465ef36f35c0cd78cfeaed4ca2b02d6eaf2d923940bdc22cf5f16cc5cc33d371f95 SHA512 08f31f5de1f8846ba16908932cc83362047a53eef175ea3d197e49c0af0b2972ab8166dc28ccb1bf94a3da7ff00f6cf3bf2dfd164d59cbf1aa42f66f9a1db103
 DIST YAML-PP-0.027.tar.gz 191350 BLAKE2B 2978c99c0dcc1dd9ae0da73b3f16b52baceb49fd05361ef586f9b87009436abff31da547972e4171e15c4190a43fc369269ddb3d90386d452d5b0edda11129a2 SHA512 4362fa2079fe253b11242e68d7071800b49dad141255b0c6ca627f710bd8685ed0ba163c7ada3e1be1720eef4be65ff481f02517bbf899f3110355ceddd216aa
 EBUILD YAML-PP-0.18.0-r1.ebuild 842 BLAKE2B 1b2cc4b6ad6d859ef2626ea572886ac0454d326eaf41f601fdc554baa0b43d4a7241bac74f8f736ff2cfb81a35db9e65e41b775c9da235b0acdc425d05accc63 SHA512 d2dca336ac5420c8cf74eeb6cc479514a356a7c878c3b673183cfb50854cd17ee4689a3ab9daa8de688ae95b5b033a9f14368c08356facae8c7a4d0dedd9539f
-EBUILD YAML-PP-0.27.0.ebuild 854 BLAKE2B 3d3434280d2a99793806d29ddbd59cf5bc98916501db9bd7a08b09f10ff8014c599bedabb3028c4f13dcdb991000b1a47906868d8dc9e30510fb463f8b4572d2 SHA512 f5342366e7f07e2ed642035798f831abe1f8259e28bb22e58a04f0397f16f7cb937cb05abda53d161a5187edbb50f94bc27db0e68a33a1991bba820e73ebef03
+EBUILD YAML-PP-0.27.0.ebuild 851 BLAKE2B 1724754f35f998a91321cdce7688eb8686b79625516a13b53eebb1dde970ee745522654b45a717f165a9b3553993876bf820f2ef393eaf091570eb8ab5105e6d SHA512 eed00a5e8738e5cd94f8d3a3bd2cc3f70394ecd40407fadf07c152a029391bbee64627ca5c8c25153371db32ed95eca265811cdf7f3fd35141d9d3b0fbba73ad
 MISC metadata.xml 501 BLAKE2B f674e0ceafae234e97ad01bd59c7a240dcda26cf3a1caf0ff5fc42bba5ccdf1b3318dacf398baeef444c49d8dbbecfdd4f2aab959c35ad53fa19c605615341f8 SHA512 10d8933733ce84fdd6836178e3dfa1fba6d96ba53e7c19b7ffff656057c83446978a59af3b0fb4fbd23da233df51b4f226501014fcaa4ad35d9e902bf1c0ef52
diff --git a/dev-perl/YAML-PP/YAML-PP-0.27.0.ebuild b/dev-perl/YAML-PP/YAML-PP-0.27.0.ebuild
index 6daf2736bb09..c8b380c57379 100644
--- a/dev-perl/YAML-PP/YAML-PP-0.27.0.ebuild
+++ b/dev-perl/YAML-PP/YAML-PP-0.27.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="YAML 1.2 processor in perl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE='test'
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/pcsc-perl/Manifest b/dev-perl/pcsc-perl/Manifest
index 779d27afbd6f..9deb919274cd 100644
--- a/dev-perl/pcsc-perl/Manifest
+++ b/dev-perl/pcsc-perl/Manifest
@@ -1,3 +1,3 @@
 DIST pcsc-perl-1.4.14.tar.bz2 36563 BLAKE2B af87917779f7dcefe02cdc6b984213ae308d602e5ab4ff81a0170502278ea6ccaad5159fce3ead457891233929adac9ac83377c6868a2a7e929d7281c7f0ce79 SHA512 202aca1c122c8b91340411a4930f6d0d6f3d439d1783b7ad5e2a727bb015704045d66b5b5ba51f567672a6256606ad26e8390b9f243e329d6ccd05146edc229c
-EBUILD pcsc-perl-1.4.14.ebuild 506 BLAKE2B 6b480ca1b6e27952069d7b468c6f85dff604547a29e312d3ba3e111c70b1b6bad98a5468e1d6fc413358dd5c729a5b8d514633b239c3eab86619c6321af45688 SHA512 5f581c35281ef4a8c23b249aaafce059ec22a9bd70ba9ca9feb22f0b671596d72c75b2e57e713bc2bebf83e11d3fd4b357df9bbd17d486af8d26e7bae392fa33
+EBUILD pcsc-perl-1.4.14-r1.ebuild 502 BLAKE2B 3788b5eec80108465b17342f96d3b7f678173f9f7423dc76b1e72c635ce1272939a9fa518ef97f793032fb26531bea860fa045f1fef23c7dd02d026f2496290d SHA512 4233e05ce3e98f27b4226ac90bdcb2c202a27ef78e2793b7b92ec02615af4aea1a822820a573da38433f20990ae92a753cfe52e649185b31f5229e6a217f817c
 MISC metadata.xml 216 BLAKE2B 79aad80df84f42f52b821a6d956a0d16b7ba896d4d7bedf9d1b7405c6cfe106d1eeb228122538d8831debd1af73690663991e798686829b340ae98fff1ec842b SHA512 0281377e6fa2e3a6b09bf9992dd263a41493dea5aa13c9a2692b9140219dd450979c9a7b39de5cbc6f32fe5e8fe7691caa3f1b704fd87b010de3f3b30dd19fdf
diff --git a/dev-perl/pcsc-perl/pcsc-perl-1.4.14-r1.ebuild b/dev-perl/pcsc-perl/pcsc-perl-1.4.14-r1.ebuild
new file mode 100644
index 000000000000..df7b3182fb74
--- /dev/null
+++ b/dev-perl/pcsc-perl/pcsc-perl-1.4.14-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+DESCRIPTION="A Perl Module for PC/SC SmartCard access"
+HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"
+SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+
+RESTRICT="test" # actually accesses the pcsc-lite daemon
+
+DEPEND="
+	>=sys-apps/pcsc-lite-1.6.0
+"
diff --git a/dev-perl/pcsc-perl/pcsc-perl-1.4.14.ebuild b/dev-perl/pcsc-perl/pcsc-perl-1.4.14.ebuild
deleted file mode 100644
index 81536843688b..000000000000
--- a/dev-perl/pcsc-perl/pcsc-perl-1.4.14.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-module
-
-DESCRIPTION="A Perl Module for PC/SC SmartCard access"
-HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"
-SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-RESTRICT="test" # actually accesses the pcsc-lite daemon
-
-DEPEND=">=sys-apps/pcsc-lite-1.6.0"
diff --git a/dev-perl/perl-headers/Manifest b/dev-perl/perl-headers/Manifest
index f6c48c3cafa7..923bce582c1d 100644
--- a/dev-perl/perl-headers/Manifest
+++ b/dev-perl/perl-headers/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 1175 BLAKE2B e498f2e1d6412f8c0454081395fcdaf995b9f79e373ab3dae7ed3183622b2db8bc18ea46e29f07a55cae92b0a0c468a24065c66f350292cab1d7b7747a079e35 SHA512 572e519c4f8ff15865c9e42f1df6941ea5c20b86d75e9a5baf9ac5fe42e1e769c3a440c310170c9cdafcdd113d4eeb079e605c22be2bc46bae98d84b5c9caf0f
 DIST perl-headers-0.0.1.tar.gz 2141 BLAKE2B 48f32c486427c30d7eba06d103a9e72d19f817dfb2a55db6aca1e28670cf03d4180dbe6e5b3031133bd517045b827bb76d085dfd786a1263dc1773fdcabb210c SHA512 a9a44a957d863c6d99c0facb324a32e3fee55ec50e34481dbe37c09f6afe103b0cae234ca83d4d591a01d1e620d262b0e9beae53001db1fdde885f9a57234c7f
-EBUILD perl-headers-0.0.1.ebuild 908 BLAKE2B 360544115a74e155c1072b0d46748e4d12a2d1dd471bb4d993db43749ce523923f3de34e123537d7399afa854911bce30198869387872d1d90dd60c3c40c545b SHA512 e9b66765d931e3f938f11ffafeeff126a1653a26efffc91ea988a96888850cbf807311c3748124648699b91391248f4ab4361a7b9ae61ec3c8ef4b3d944873e8
+EBUILD perl-headers-0.0.1-r1.ebuild 909 BLAKE2B 48dbb05f501e086c0054f1d99fc18b0b8b42cd3fbb118514d9a969e6ac79f8370db24e10cbeb19e7bbe05d445d1b8368a52fd0c3ade00dad6942d23c1ed51d8c SHA512 48daa1ca846de96f3653d80f333ac34eb57e89bfea1cb79d327fce494eae000fb353eae5bb8c161eec1170c13c38497f0df957182cf6676ae22748699afb04e5
 MISC metadata.xml 601 BLAKE2B f1cbd690fec0a75b3573ca5cae108cc9775f8319606d6b1c291659711a51df985cfcc886a5ba00c3688dd7f102d0ba4efccaae399e9ddc50145c3407c91b56ff SHA512 1001afaff236f51b89ad096fd13cc66205484f80c0c2e2a08745db951179fe62f0a975c89e90f6887511bf4d65bb9c8bf801f82decc02ca2a53bde6cd4ebd371
diff --git a/dev-perl/perl-headers/perl-headers-0.0.1-r1.ebuild b/dev-perl/perl-headers/perl-headers-0.0.1-r1.ebuild
new file mode 100644
index 000000000000..82dc37389170
--- /dev/null
+++ b/dev-perl/perl-headers/perl-headers-0.0.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-functions flag-o-matic readme.gentoo-r1
+
+MY_GITV="${PV}"
+
+DESCRIPTION="Generated .ph equivalents of system headers"
+HOMEPAGE="https://github.com/gentoo-perl/perl-headers"
+SRC_URI="https://github.com/gentoo-perl/${PN}/archive/${MY_GITV}.tar.gz -> ${PN}-${MY_GITV}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+debug +sizeof-warning"
+
+RDEPEND="dev-lang/perl:="
+BDEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+"
+
+S="${WORKDIR}/${PN}-${MY_GITV}"
+
+src_compile() {
+	use sizeof-warning && append-cppflags "-DSIZEOF_WARNING=1"
+	emake H2PHARGS="$(usex debug " -h" "")"
+}
+
+src_install() {
+	readme.gentoo_create_doc
+	perl_set_version
+	insinto "${ARCH_LIB}"
+	doins -r "${S}/headers/"*
+	doins -r "${S}/appended/"*
+
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-perl/perl-headers/perl-headers-0.0.1.ebuild b/dev-perl/perl-headers/perl-headers-0.0.1.ebuild
deleted file mode 100644
index 7915d5201d7c..000000000000
--- a/dev-perl/perl-headers/perl-headers-0.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-functions flag-o-matic readme.gentoo-r1
-
-MY_GITV="${PV}"
-
-DESCRIPTION="Generated .ph equivalents of system headers"
-HOMEPAGE="https://github.com/gentoo-perl/perl-headers"
-SRC_URI="https://github.com/gentoo-perl/${PN}/archive/${MY_GITV}.tar.gz -> ${PN}-${MY_GITV}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+debug +sizeof-warning"
-
-RDEPEND="dev-lang/perl:="
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-"
-
-S="${WORKDIR}/${PN}-${MY_GITV}"
-
-src_compile() {
-	use sizeof-warning && append-cppflags "-DSIZEOF_WARNING=1"
-	emake H2PHARGS="$(usex debug " -h" "")"
-}
-
-src_install() {
-	readme.gentoo_create_doc
-	perl_set_version
-	insinto "${ARCH_LIB}"
-	doins -r "${S}/headers/"*
-	doins -r "${S}/appended/"*
-
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 1f8e38680e00..a1a510d2000b 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index a841b7c01ae4..9ba86279b93a 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -2,11 +2,11 @@ DIST igbinary-3.1.5.tar.gz 216569 BLAKE2B 3aa453fc0669c331202f38d41a80fa34332033
 DIST igbinary-3.1.6.tar.gz 220415 BLAKE2B 62bc77d5b3ecbccb9e928e30f33a598630d3ee9f394f4e78c0978b316d4dbc29656f98773e9ff6bd6b9cd4961f4e00c6c760b1a07234849736d4e0d9e3199d5b SHA512 55f7fd1a6e2a422cf04e944c4c15126167c4aab6d4f5f1e6af8be6c345ec6ff0c25d7ea8c023062bdd4882484cede155ea7a598666e4616985873a32a0a272d1
 DIST igbinary-3.2.1.tar.gz 227265 BLAKE2B 4eda60b49a2f1e3e822a0fbff8f23cd546517a51193f0f4f2d4646f99888552aad1877f80a67f0d655e0a51771c539efe5b0d8b5c8ce7d88c8403305dc7570df SHA512 fdab404eb6ab8e64c0d3b92c1c12e796a182a90084acc78a31a31dece62075d310d298c545d149d10b188f0467108a0429ee750747e073fa7fba752162b64eb4
 DIST igbinary-3.2.2.tar.gz 242955 BLAKE2B 479f1b79c84b3979659a1d596f78345e6c75e9444971b547e8f1a3fe9b4aec3ba321d7a325b734f069fb1d4cb0b5c4ea5ae6586d5e50026698dc6aaa2e972bbd SHA512 d9fd460e6d62c8ca86de0e99681714ae45b2f7c66ff76279cd376582f9e8e932e8fa0ee37c25fde82390643a543fefc3ba5cbf181d5ffa31a3ab8301c092e0ff
-DIST igbinary-3.2.3.tar.gz 244497 BLAKE2B d3a19d6c6fd55d7baca9e5aa819f4a96ffe16a22c2db7e76e2b2b99946fa7e451ab1677dbc364fbdf223df25bc2069669d0f4b1f07fa89f0842d7dadad2682da SHA512 13bafdb15ee2f9b3b5fea5ca27fef6207466243b42676abc35cc2877935846cc97633725c50665f799627a1bfd31980881da3261acf91d4503a30a5ab99e72cf
+DIST igbinary-3.2.4.tar.gz 245458 BLAKE2B f52f01ace2c24b9bc0c64b3421609ff390e10c1825e09b2bc7a294e902975988e4e9c658e87404f496d63701fc98c7aa2626ce3bb88871f429d7cda6b96092b9 SHA512 0f1d482f4615f8ec9b269d74e48f6b74b0e276b237a190e40ffc643afd6129d9e01be3375864e6e0be1b9666a75ca0e2a6a2dbf571384bfdffe497316168da78
 EBUILD igbinary-3.1.5.ebuild 597 BLAKE2B 8f09f317dfc74612c30bdf35905411ad3c26077c02579b8fafedf2cd79d0aaf95ef275e0396dace13d0ae733d7cdf5b29cd9f5c419845c942ee49df44e9a2470 SHA512 b352c8647cf6faa2c7fc223d5b78514225bf04c308cf4e802f6c6305fe4b4470db33af634a34fbc3c67849ba933aad9b4ac77113eac940e4a7eff40e55ce7225
 EBUILD igbinary-3.1.6-r1.ebuild 599 BLAKE2B 7052c71b8fb7bafc0e694c75104487c988f73cc30ecd5dbf9f0c72354a11239b4c66927522a01b2e726aa722f4892c91fbd63ca854f0452fb9d47bb896a8cca6 SHA512 d181b6f2524d497af0216da5c26b58fa2af4c6c057eeab8f9a4820d18db21b6596820fab7cf405dfd6008e4d3ee15c591f934a2f6bf92dacb0dbb1df362a317e
 EBUILD igbinary-3.1.6.ebuild 595 BLAKE2B 5cd27a7fec301252289616350fb56f599fa9f1d5e660fb8cf140be2e3c737b1151bb66f857fa7e47c942742441f65cc3e63a4a76f0d5061e29da3592f9e207a8 SHA512 4c1636cd05f1d1eb86a136cf044138029e7c3124c67ab8089b388bd07aca1ea801d4b7cb4914d61fe17b3ad2fe0c03f5574c2d588f1a8a8b1edad2de1ef45e4a
 EBUILD igbinary-3.2.1.ebuild 559 BLAKE2B bb66e2fb19636f4cd24c24643a629968af03f77b2444543997cef0c3576438ac2538e5880617a24ff0e57bb611a92fb797d305441877ebde4753ba144740e1de SHA512 65ae0c5964423f647d9b31515bf6377187352c6a77490eda0937a97771023d76cad304544dc7898003040bec6322484004f52a2c1ef20f85ef533c6144218df2
 EBUILD igbinary-3.2.2.ebuild 559 BLAKE2B 4c897036852ccc6c0b1528044f8a753ca2a25f5c637d593caea0c8312e4de75b36e5839445ff4bb9da111aa3292fcefe449648eaf6e5ac33250107094f080f41 SHA512 db78195cf2749499f0f6f38bc578175b7fc4a0612e99e331db7f0ac575804515b1a9ee067a04e8bfcd05cd844efaf76c7a7b11a0d7fa211861cfa4cd5a6a0aad
-EBUILD igbinary-3.2.3.ebuild 559 BLAKE2B 4c897036852ccc6c0b1528044f8a753ca2a25f5c637d593caea0c8312e4de75b36e5839445ff4bb9da111aa3292fcefe449648eaf6e5ac33250107094f080f41 SHA512 db78195cf2749499f0f6f38bc578175b7fc4a0612e99e331db7f0ac575804515b1a9ee067a04e8bfcd05cd844efaf76c7a7b11a0d7fa211861cfa4cd5a6a0aad
+EBUILD igbinary-3.2.4.ebuild 559 BLAKE2B 4c897036852ccc6c0b1528044f8a753ca2a25f5c637d593caea0c8312e4de75b36e5839445ff4bb9da111aa3292fcefe449648eaf6e5ac33250107094f080f41 SHA512 db78195cf2749499f0f6f38bc578175b7fc4a0612e99e331db7f0ac575804515b1a9ee067a04e8bfcd05cd844efaf76c7a7b11a0d7fa211861cfa4cd5a6a0aad
 MISC metadata.xml 331 BLAKE2B 4187300236aa128879679c7cb4a8ddfa19dfd512a76466e835224c30323f2fafd55189228bdced507ababd5b90f561f6bb44c1554392eb0682b6ba5c7a20b681 SHA512 86f467f549b36915940e45a4e151742f2925293106dd3da2958e6153aaa8fed378b2eb563bf69da0d38101409858a4abe308f608bd94de6b4517daf9da092405
diff --git a/dev-php/igbinary/igbinary-3.2.3.ebuild b/dev-php/igbinary/igbinary-3.2.4.ebuild
index a4b536d340b9..a4b536d340b9 100644
--- a/dev-php/igbinary/igbinary-3.2.3.ebuild
+++ b/dev-php/igbinary/igbinary-3.2.4.ebuild
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 89ad1334f75c..edca4b98f48d 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 9484e44f2abb..812230a01eac 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,5 +1,7 @@
 DIST aesara-rel-2.0.12.tar.gz 8154749 BLAKE2B 0e39102e985e9f9ed49f65c76389d76702b5d8fbe8c3e1130c61dce7c43eb70f5c73fd3557ff9aeaa1d186b33bb5803a04a4a5b0ce41076af7e923d05ce3353d SHA512 e68f5ce0c64a678219421a0bfc957d1594dc34c887af6f6373c00888387e5da83dec44b68b9309146ae2fd60c0677039980a87ee87ecc0ad3db2fbc80213cc34
 DIST aesara-rel-2.1.2.tar.gz 8167162 BLAKE2B 727bdf6fb9765c8b60da585595ed7203071490c1dfc0895428ae3efe4a1e74a14bbdf2a76128a6840dedeabdfc997fd297dec23ff517247452433cbdc9449b9a SHA512 22ebd1290a0727f2cf1e106770c872d5f1d785c6946b8e4debcc29a34fddceccb11f0ec81850fd93dbff556aa300bf2ec1bd6eef1297d93e194ff832b442c453
+DIST aesara-rel-2.1.3.tar.gz 8170822 BLAKE2B dbbc4a453c5d7f9cd4ab2c925dd9293e835db23100686a8d7ab2c47182b1bc05f883eeb60d6f47f8f34e4187f3ac07b632cde43fe82a99e2145a2f699a2b3582 SHA512 52d1724eb7b3c9bae4bdbf1735db9ef96cdfa94f3e2281b255201d0baba260fe31f78c00719a53ce3c59ea9c66ff218d8acd7bc012b386942f29806c07ffc466
 EBUILD aesara-2.0.12.ebuild 2101 BLAKE2B 7915fe29cb13d9c8dcaa0706ecd3ebc4dee7f8935d42af424cc33e1beee829de6fe05a92f0f700859d8923c6d76560b57299fff452ad177337e484819a7f16e6 SHA512 3916aba60e456a40dadad9afe223e125c6ef945d966d4c270627144603a74e2596819acb3e38086c7a38bc1c30232b5d0e45431d87b032064eae1f7b6b2e2715
 EBUILD aesara-2.1.2.ebuild 2113 BLAKE2B 280d980e33e61684f389e943c945877d440b23718da623db4b4ddba48232e41e1e8ba06501fa0d4ca8325fa261fb80a0976f775c363f9754c0ae6e85fc6de2b9 SHA512 231cee60373079e993267910bfdd210da6db3c3b45f0367aa6ff1d5c4f248f6631d9e8122b6d86e9e44672b33356c0a01eff219dcd5d08c4d622618a5e7e27ea
+EBUILD aesara-2.1.3.ebuild 2113 BLAKE2B 280d980e33e61684f389e943c945877d440b23718da623db4b4ddba48232e41e1e8ba06501fa0d4ca8325fa261fb80a0976f775c363f9754c0ae6e85fc6de2b9 SHA512 231cee60373079e993267910bfdd210da6db3c3b45f0367aa6ff1d5c4f248f6631d9e8122b6d86e9e44672b33356c0a01eff219dcd5d08c4d622618a5e7e27ea
 MISC metadata.xml 404 BLAKE2B 5f15a3e7f8771f0d8b95097374c87fb6793089f1a0e000c433a8f644be3cb7d945128d0b164b608405070b976c932c77738ed930bf4734129ba37f4feda667b3 SHA512 f7afb5e2c8053cbf8ace61197d234869ed86a06bf066652eac3ad800c7251d18113dfd2e3115281c10f016c56e845d9d34915e2eddbeac4e3a2f414a8e858148
diff --git a/dev-python/aesara/aesara-2.1.3.ebuild b/dev-python/aesara/aesara-2.1.3.ebuild
new file mode 100644
index 000000000000..efa88e842a94
--- /dev/null
+++ b/dev-python/aesara/aesara-2.1.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/aesara-devs/aesara"
+SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+
+	distutils_install_for_testing
+	# we do not package numba
+	epytest ${exclude[@]/#/--deselect } \
+		--ignore tests/link/test_numba.py \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/aiohttp-jinja2/Manifest b/dev-python/aiohttp-jinja2/Manifest
index dbc6e8b0546b..effb57668575 100644
--- a/dev-python/aiohttp-jinja2/Manifest
+++ b/dev-python/aiohttp-jinja2/Manifest
@@ -1,5 +1,5 @@
 DIST aiohttp-jinja2-0.15.0.tar.gz 51183 BLAKE2B e19ca813f36ac746a84812ec278a3de43e6e24eaafcf949fd18a32c99f460ded03f4dc97171fe1493174a8e2c51543b8c1afcdec51c4688f4fb0b7781287cc03 SHA512 084714cd2376b93f32cdcebc1971d4aaa704a177524b00f322e0347c15ab8085960a68a3760be056e391410f01b6b637eb59db54fccf54d09ba53a9ea03a01db
 DIST aiohttp-jinja2-1.4.2.tar.gz 54328 BLAKE2B 3d6aaeb03bbb89516a92fa877ee95a2fd27ab83666a03ca12e78f1744b82797faf2547bf55118618cbd979d80779a9571dfcfe9036bc84142563ede55cfbc1a1 SHA512 7bdaee97efe90a0009cd78a4e46dc80cfeb661c2d5561fdb1b1a1ff098abba8667260bb908e3227edd6601c2412812d0311461942568a8aabf07a164ea2f290e
 EBUILD aiohttp-jinja2-0.15.0.ebuild 1080 BLAKE2B 79c5f9ac7a6d1b25fc494a3574c9127f42de3046433c5a3c07bfb1ebbd0b5764d73e30eb87dae1486be98a8cde8e299ba2e28913d832f980fe7327520055e4bf SHA512 dadd8b7326252f151b00440d2bcde8eed37493c9c44283bfaa860a8dd308d9581f8e66a14d181916826ebcdbad1ab87fed70d5fe14b0765ceb99966183ead5a8
-EBUILD aiohttp-jinja2-1.4.2.ebuild 1105 BLAKE2B bfbd47bcfc80dc082c0be7fb5f3bf2f18c16b462f36665ba769a7198f5bb7a7b916cc748fdc3f498537c2d413752201a932ae4940f5b32ca1b5b777c9215d8cb SHA512 dbd0621b0fd5da4baf69d67d5d764174ec99f9c88331557dcbe0a592a26a6ee0ac33f50f2f7810e2e23c7d4ee020fe6bcf2156034e8265f4bf9062de81902d6b
+EBUILD aiohttp-jinja2-1.4.2.ebuild 835 BLAKE2B 94a5a9a23474bf9d8b170df4295f7c9529b6ed93b6365c91621616af028f814b402d166bcca0512eec21f165432c20a0bd773300efecffc0d3df39a89be5911e SHA512 ec7546c1cea7828a28369cdffea06d1084c59eb34fd962508aa1cba73b2f56db9283f2090ac826e9af944cf8958ce1e29a4d109467062b57bc345dba8ede3fe0
 MISC metadata.xml 408 BLAKE2B df678e57a82a1c6a818983506af4a0397469497ec15da8a70aa021b77b60b4b4d14f8c37d821c655fb1c92dc75da69bd37ac487d9937d87c14d6338de8bad803 SHA512 bd5b6da5b67af78a148ec4a95378caa391dee95591b6888028d5427000d38411931559332bf0508c201691e04b8b417acbc5dc026858c546e6843d6779607e22
diff --git a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
index 47be01d04239..6afda9ed0652 100644
--- a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
+++ b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -14,25 +14,19 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/aiohttp-2.3.9[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
 "
-DEPEND="
-	${RDEPEND}
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
+BDEPEND="
 	test? ( >=dev-python/pytest-aiohttp-0.3.0[${PYTHON_USEDEP}] )
 "
 
 DOCS=( README.rst )
 
 distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/alabaster
 
 src_prepare() {
 	default
@@ -43,13 +37,3 @@ src_prepare() {
 
 	distutils-r1_src_prepare
 }
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 2dd0ca3e7a7e..44dc0bf4edbc 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,4 +1,5 @@
 AUX aiohttp-3.7.4-brotli.patch 3537 BLAKE2B dfb410aabbd24f16bb1cf5fe999e9730417ccaf7ea59cb48d0445abcfe757e0b9d165ea723152df8f54ff039ac092a0a6cc6d6bddfebcad44d8d63f4eb5c3c79 SHA512 6bf8969c57fc649f84dae9eacd79d5f13558bc970e8755dbf22dcc08789d2377d1f04a745becd3c533f3a6ceb459ddb6bab5eb39e1098468650b312c2ecd51c3
+AUX aiohttp-3.7.4-fix-py3.10.patch 2285 BLAKE2B 4d0841adb3e0038b1b361449812975e4f908e0813576dd3adf1f6d841e93adb514803629bb186304d44c92680d0b1529e3a2ca5a861766f856d32cc69edb18d4 SHA512 3cb863431c8175da625d429a6e275a6a3f932f162f9dc9c477f7038af302486698ee0665c3ab69111d277b9bd080d90e7b3e4f7a2c0a797e554c0cdac3f5cef2
 DIST aiohttp-3.7.4.tar.gz 1114533 BLAKE2B dcae3e66e13df8264d731a3ca65b4718feca8d0e6e1baeb6608dcb9bfb4bd4baaed6bd34297ed5ece78d01189bf9a0b9860845cae4e2b93cc2ba463cc35cfb77 SHA512 66fcc837b388020dc998cbaa2db31e48ecec75bcfaa8af9108e2ea265588dafa5684ca96a8fe3ad6759b22e09a4ae6d4efd8653fb76126eccdc826c15cbbe2e6
-EBUILD aiohttp-3.7.4-r1.ebuild 3165 BLAKE2B 251953a98d2342392985e53c878a59177b75b032b9e443757c0c1195688b6a5bb2dd19fa0c66d4aaf2b583a8a460419eb6699f2dd2232f9d7e6f4de039b3c31d SHA512 c20675a6e456b7fb1ea0125e2c51fe7399ac466759c9f1b91e10364a667784605a8ae6e50a61c42f541030f6162c7397468513acdf163ac8d5ddf26ca284f946
+EBUILD aiohttp-3.7.4-r1.ebuild 3212 BLAKE2B 662c712aa1811f1d7e603e175ad958d2d87a8075e0fabcf0d157c1efaff634e8a3b7b6f56b2990447072127d2d843af82e44cba711b1fe00160c8ae5849baa1e SHA512 76fdadad383bdd3cb061da3314eda61c9ab325e157990f4469808526a350ee9ac319326237b26f635f565ab6a3ad0c44eba2108ccbdeeee4282a537dde0a750c
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild
index 3871075876e4..4c0cea0a0d1e 100644
--- a/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 multiprocessing
 
@@ -42,6 +42,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/aiohttp-3.7.4-brotli.patch
+	"${FILESDIR}"/aiohttp-3.7.4-fix-py3.10.patch
 )
 
 DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
diff --git a/dev-python/aiohttp/files/aiohttp-3.7.4-fix-py3.10.patch b/dev-python/aiohttp/files/aiohttp-3.7.4-fix-py3.10.patch
new file mode 100644
index 000000000000..3c7593584b76
--- /dev/null
+++ b/dev-python/aiohttp/files/aiohttp-3.7.4-fix-py3.10.patch
@@ -0,0 +1,73 @@
+commit ec87d9f2b6541599dd7fc8aaebf0fdfbb812ade7
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date:   Tue Jul 20 23:37:27 2021 +0200
+
+    Remove deprecated loop argument from asyncio.sleep/gather calls
+
+diff --git a/aiohttp/web.py b/aiohttp/web.py
+index 557e3c3b..52dfdf93 100644
+--- a/aiohttp/web.py
++++ b/aiohttp/web.py
+@@ -441,7 +441,7 @@ def _cancel_tasks(
+         task.cancel()
+ 
+     loop.run_until_complete(
+-        asyncio.gather(*to_cancel, loop=loop, return_exceptions=True)
++        asyncio.gather(*to_cancel, return_exceptions=True)
+     )
+ 
+     for task in to_cancel:
+diff --git a/tests/test_locks.py b/tests/test_locks.py
+index 55fd2330..5f434eac 100644
+--- a/tests/test_locks.py
++++ b/tests/test_locks.py
+@@ -18,7 +18,7 @@ class TestEventResultOrError:
+             return 1
+ 
+         t = loop.create_task(c())
+-        await asyncio.sleep(0, loop=loop)
++        await asyncio.sleep(0)
+         e = Exception()
+         ev.set(exc=e)
+         assert (await t) == e
+@@ -31,7 +31,7 @@ class TestEventResultOrError:
+             return 1
+ 
+         t = loop.create_task(c())
+-        await asyncio.sleep(0, loop=loop)
++        await asyncio.sleep(0)
+         ev.set()
+         assert (await t) == 1
+ 
+@@ -43,7 +43,7 @@ class TestEventResultOrError:
+ 
+         t1 = loop.create_task(c())
+         t2 = loop.create_task(c())
+-        await asyncio.sleep(0, loop=loop)
++        await asyncio.sleep(0)
+         ev.cancel()
+         ev.set()
+ 
+diff --git a/tests/test_proxy_functional.py b/tests/test_proxy_functional.py
+index 68763cd4..65c773a1 100644
+--- a/tests/test_proxy_functional.py
++++ b/tests/test_proxy_functional.py
+@@ -238,7 +238,7 @@ async def test_proxy_http_multi_conn_limit(proxy_test_server, loop) -> None:
+         resp = await sess.get(url, proxy=proxy.url)
+ 
+         current_pid = pid
+-        await asyncio.sleep(0.2, loop=loop)
++        await asyncio.sleep(0.2)
+         assert current_pid == pid
+ 
+         await resp.release()
+@@ -443,7 +443,7 @@ async def xtest_proxy_https_multi_conn_limit(proxy_test_server, loop):
+         resp = await sess.get(url, proxy=proxy.url)
+ 
+         current_pid = pid
+-        await asyncio.sleep(0.2, loop=loop)
++        await asyncio.sleep(0.2)
+         assert current_pid == pid
+ 
+         await resp.release()
+
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index da3216f39a84..6898e34bf9f8 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -4,10 +4,12 @@ DIST apispec-4.5.0.tar.gz 65423 BLAKE2B ce6cc6f466d274db6aa5f8b27c3a9340daff7934
 DIST apispec-4.6.0.tar.gz 66147 BLAKE2B 98127cb2bf938cc1928e13e1169804eea174351a0f4eeaabc801da711d0861bc35a9761e9f1bc478a44d6a85989a1aba1840b3e472599064240a880fda8e45b4 SHA512 b030e5400a9abce06576406f83befb298814617e06729f29c2ee70517cf456901b67e60880b3b4baec096717a91341e8268bcd8e01fd566b7c6e03709afd7c3b
 DIST apispec-4.7.0.tar.gz 66274 BLAKE2B dbb14dd831eddeb9f086643b6182ccc3e529e22ad7e31d1d4dd2dce54edf76c6cf01a74438383df5ccec18cf863334d5cdbd45214791c01632d7f7efa63f7aa3 SHA512 53c0a1e6db81439a7c3f8e933cac28003dd84444e65986a29aef8a6ec761999c84417902448288d69c5873d12dded2156e79bedc5bd4bd0fd472ea014e65a6c7
 DIST apispec-4.7.1.tar.gz 66356 BLAKE2B f78ab7f10c7a10f3d62b4d02e5a33cc1972aea0b33af1c485a11c2c415b2913a4d8151a9aa44de9876fa1ec6ebe02d448fb50dcc573e6a4779265ee07bda0329 SHA512 e5ead9a867d9dd18f2fb7509b6ef4afd9ec04cc102f55684a66e8f5ebe1b8e3e4129c62b7fd50f0a337547336375cee612e1bec620fa957f8f90d11968538c8e
+DIST apispec-5.0.0.gh.tar.gz 68795 BLAKE2B 42b4ea7d825fc94c6ca904df56a900b52ecd3fda78b3079103370c6cb362cea6338251d344c970c0ad0380d8b39931f6fc38f3e71dc4c31ace0763c6e9721f73 SHA512 1e3d4c06713081d90d5d8650e7aeedd12248ef9a43ced6681be4e9dbf4563b7390cabf3423ea2c1bfda6900cd193efa4e2cacdac77350fcf2e83cfc30580c98e
 EBUILD apispec-4.4.1.ebuild 996 BLAKE2B 010b68129d1ecf076356a1f6c7b7c27d3bb14ad634a88d7f77667be5819f787cb66ad06f808ebbefcd0702ecb5c023efbb52db6e87714129e6b42de1f56fc5a4 SHA512 7dee2b1f9a4efa951b1e84a378fa7538f9543d0e4ad84c931e6b458c793df606f554b83e71a014058c2992774f15cb5dd63402a4ee07bb02ce0b5176a7912a55
 EBUILD apispec-4.4.2.ebuild 996 BLAKE2B 010b68129d1ecf076356a1f6c7b7c27d3bb14ad634a88d7f77667be5819f787cb66ad06f808ebbefcd0702ecb5c023efbb52db6e87714129e6b42de1f56fc5a4 SHA512 7dee2b1f9a4efa951b1e84a378fa7538f9543d0e4ad84c931e6b458c793df606f554b83e71a014058c2992774f15cb5dd63402a4ee07bb02ce0b5176a7912a55
 EBUILD apispec-4.5.0.ebuild 996 BLAKE2B ffada6a65aa0e45e63d4314e366e3c90f213da21f8768f44eb6c133568b0e672b68f9ce0c6c8bf62b1b033666c5d61d5ea1d67b7f292643ec054ebcbf3bc65e5 SHA512 70f06d77e4cff13e20988a70a31d2b5c3dba7bde83988388ca7b81e68e1177b12a99b803fa9392354e4c5949286a7bd6b3c46a0ba8411d6c74a93696d714b26d
 EBUILD apispec-4.6.0.ebuild 996 BLAKE2B ffada6a65aa0e45e63d4314e366e3c90f213da21f8768f44eb6c133568b0e672b68f9ce0c6c8bf62b1b033666c5d61d5ea1d67b7f292643ec054ebcbf3bc65e5 SHA512 70f06d77e4cff13e20988a70a31d2b5c3dba7bde83988388ca7b81e68e1177b12a99b803fa9392354e4c5949286a7bd6b3c46a0ba8411d6c74a93696d714b26d
 EBUILD apispec-4.7.0.ebuild 996 BLAKE2B f35028913e1ba896a4cd0047275b1c2a639f1c6339b6d44c3ef1584e20b653da5a63de8e8a3b3da7f2d0698f7588cc5092febe49f0273ef4a84a90fca0ca8d25 SHA512 b74e4a525fb9ea2ef1cf55cb180593e837833e8de81e480ba0bd4dddac08798b77d01befdc3abd1d6e8b4471c79c0bc97ff1fb1d1527681b16d72db9d94ec04e
 EBUILD apispec-4.7.1.ebuild 995 BLAKE2B d4317c8d7e04455f0755d2dbc1ec18f92eb708d072b13c34b956102fad5f4c212c29520d9af88503fdbbe344d7ab9529d470f0538b7bd5acc0956815d8ee132f SHA512 28f4b6701769f20a43eab803af1481d06108d3cc25c9e03cbcdef254168cbc39290e28a4ce92d866cc5b8ade49e286f0332db36f5e7bf82095394b7a4bf985b8
+EBUILD apispec-5.0.0.ebuild 1013 BLAKE2B 9428582a7bb9828da380e83a67fc10c16dfa96991bd9a665dc06cc753456794ee2b2d19ba7a09b2162199f430ebe3f466065839c4a4a67317c249a4f7e0cdd56 SHA512 6edc487cad0b66acb56b7eeffe6869a66de26cfb2f8b29512e4cbfc59bb4cbb6f74dec93d35ea5a3de43297faeea200cb70e4653512a849a8f2478c8a4f058bd
 MISC metadata.xml 503 BLAKE2B 2004c77c7f9cf9dc1e3cedc5f2acdfaf7df4c7b7cca45c7cf6644955a042d0a2919560acc6ef838c40568e6cb69bbf5340cbeb1211ce725b005bf652873b396e SHA512 edd05204d0174abc0737f18704d805a701dc4ccc6dd50f7b8da2a8ffb2aff2f4fc993a348e2c549c01d33ae255ec6ad089ff57ba5c3efd608aa6eb2391b2c2a8
diff --git a/dev-python/apispec/apispec-5.0.0.ebuild b/dev-python/apispec/apispec-5.0.0.ebuild
new file mode 100644
index 000000000000..9965d2dcdf04
--- /dev/null
+++ b/dev-python/apispec/apispec-5.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A pluggable API specification generator."
+HOMEPAGE="https://github.com/marshmallow-code/apispec/"
+SRC_URI="
+	https://github.com/marshmallow-code/apispec/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/marshmallow-3.13.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/sphinx_rtd_theme
+
+python_test() {
+	local deselect=(
+		# requires unpackaged prance
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 034e1a92f16a..96f682b5867b 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,8 +1,3 @@
-AUX asgiref-3.3.4-py310-warnings.patch 8869 BLAKE2B 9690124277e49c87fe5d72965407f50b3826d5e26e9f81c4a5f25b88872f2d133f656d5e63dbe7b6503e9242912d7d0ed1d19d9b38640dcced8b709edadd5309 SHA512 53de4ba34d212ff4e750764a790d8e5ed9fae5fb78f4e278820680bc8fa7028e6f2658d16cf9826790b49d185ffbf360f8fe539f3ed5d03907eab114cc258174
-DIST asgiref-3.3.4.tar.gz 30780 BLAKE2B f14a5ae3cc3d0c67a827b4b8d002c9d92388285f7388b7ac439b11fbe2e72b6dee5a9c38637e6b5189e3a3625d24a806b5aeff1ffc41861fd4947d7b7c4621ba SHA512 e224ce82f9156e3efde316f3e209a9fbb9494cb9347d6652e19ed130921143de8d3e2a45f50352bf13fcdf229c291e68a0348fff31de144e58cd1a53b4eb0c31
-DIST asgiref-3.4.0.tar.gz 32396 BLAKE2B bbf80c4f5bfc7eaf2f27896913a59f522643de35a5eac45807b88f0b2deef6acef408a6d3abb939c4653554415028b5eea68e99ee45247e384848c554ab61c7c SHA512 259dd6fafcd4db73554a4bd26f6000b33c61e8e4d42294bc22826bc95e89959bcc3f9f97d8f0b5dc7e0cf8420890ea8ab368232b4046254e8c91ad010f6509c0
 DIST asgiref-3.4.1.tar.gz 32529 BLAKE2B 4b5f3b33e165468d71711cf28a5a6161866cd7495140cb67ff028aba5a2586414783d2fa7ce744e99e269714d9d64a019a67c852fd4546ba1f71625473010b9f SHA512 af266fc3eac58c21f2ab3f66e522067388f9cf232b17344fb5afbc408c034e61a1cce02362ec5dc494985beef099800f75cf7de28dc057c45e4bcb973b0a6dbe
-EBUILD asgiref-3.3.4.ebuild 813 BLAKE2B d3734b2e613038bc04c49562c75695a1affb024cb3db63a7632e615b2942bb4698f6d25616df76489c4163bc8088396731229895c37601c741ece1490a883174 SHA512 e394d35e7ca25e84395fc20c6a7b998d076e3268319991cbe9116b059d9bd969c220fbd2fa107d0846b7a4935b36082964105482912746ea4d6b0c3d118eb3bf
-EBUILD asgiref-3.4.0.ebuild 698 BLAKE2B f04dd652264530179490857aef42e3af9a8d4f14a7976602c77f8e99af47d84ceb3a57981db64aa29a519e85beae4535aea99e475a4b82124b98d35457998fbd SHA512 3d11e79046a7ea4e9ff0ff4cd4816d19634cfafb6fc4b18a7305ae9befb672fab0d996da1905e6c721d5c0bd570669d7759df36041fc77c9c50cdabedd2e00b8
-EBUILD asgiref-3.4.1.ebuild 698 BLAKE2B 1a4ef749ea4481e64d8c87eb8f5cb51fb2e875fd8f5108f02472c1bf344385011073a22bb4f5175069b48546562b5a6a19a798045d5341062a98fef08d98ebed SHA512 48a91d936af1299747d53535ba24406c9c5d42865d45fc30a71d82e1d863c5add0e5d1e21e42a3994a827351caf72d55ebaf40b6be1d896bd098b4ffdd367aff
+EBUILD asgiref-3.4.1.ebuild 691 BLAKE2B 760dfe213ac9e17eaa8878640350414e140d368007a7ca4b12ad5eb321bb21ccf92cf9d2db1e4e300d9cf9a1ef66a3bae40f95763b688a551379f7aea76b7b60 SHA512 23639dccacd3fd63e5c519e180b09ab8eb02117b5653efb5da9893eb5f40e2add7780c80bd55abbeff0f751512e12c246bf07636e75557d275c34122bc4e8212
 MISC metadata.xml 388 BLAKE2B eb8c329aa8d5220d66dd380ad7c4bb4fe539b3fb5b854e9a6b4912d2212b6ffa74d7f9331c5ec575bfd53407d016b464efb06c3f94c4088dd729f646b5d528ab SHA512 45d74c331619ea754ed36e7a2e9eee1687be49cf698ed7d9e89c8cb006b40001be93a8fc753830dbbba12a5ca61d3407aaa364aff3354708ae79cbb72cba6a20
diff --git a/dev-python/asgiref/asgiref-3.3.4.ebuild b/dev-python/asgiref/asgiref-3.3.4.ebuild
deleted file mode 100644
index 30ca06005aa0..000000000000
--- a/dev-python/asgiref/asgiref-3.3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7 pypy3)"
-BDEPEND="
-	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	# Provided to upstream: https://github.com/django/asgiref/pull/262
-	"${FILESDIR}/${P}-py310-warnings.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.4.0.ebuild b/dev-python/asgiref/asgiref-3.4.0.ebuild
deleted file mode 100644
index d0582cfb5185..000000000000
--- a/dev-python/asgiref/asgiref-3.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7 pypy3)"
-BDEPEND="
-	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.4.1.ebuild b/dev-python/asgiref/asgiref-3.4.1.ebuild
index 29fe309588a5..7b6c812c573a 100644
--- a/dev-python/asgiref/asgiref-3.4.1.ebuild
+++ b/dev-python/asgiref/asgiref-3.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/asgiref/files/asgiref-3.3.4-py310-warnings.patch b/dev-python/asgiref/files/asgiref-3.3.4-py310-warnings.patch
deleted file mode 100644
index 1cd017ddfbde..000000000000
--- a/dev-python/asgiref/files/asgiref-3.3.4-py310-warnings.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-From 0c9e989f18b99ea24a1fb3ea2c8a66fd295c2178 Mon Sep 17 00:00:00 2001
-From: Ekaterina Vaartis <vaartis@kotobank.ch>
-Date: Thu, 20 May 2021 19:44:15 +0300
-Subject: [PATCH] Fix deprecation warnings for python 3.10
-
-asyncio.get_event_loop was marked as deprecated, the documnetation
-now refers to asyncio.get_running_loop([1])
-
-asyncio.ensure_future issues a deprecation warning if there is no
-running event loop([2]), so use asyncio.run which creates and destroys the
-loop itself
-
-asyncio.gather issues a warning if run outside of event
-loop (i.e. there is no running event loop)([3]), so wrap it into an
-async def
-
-explicit passing of coroutine objects to asyncio.wait is deprecated
-since 3.8([4]), so wrap them in asyncio.create_task
-
-plus, add 3.10 to tox.ini
-
-[1]: https://docs.python.org/3.10/library/asyncio-eventloop.html#asyncio.get_event_loop
-[2]: https://docs.python.org/3.10/library/asyncio-future.html#asyncio.ensure_future
-[3]: https://docs.python.org/3.10/library/asyncio-task.html#asyncio.gather
-[4]: https://docs.python.org/3.10/library/asyncio-task.html#asyncio.wait
----
- asgiref/compatibility.py       | 14 ++++++++++++++
- asgiref/server.py              |  8 ++++----
- asgiref/sync.py                | 15 ++++++++++-----
- tests/test_sync.py             | 19 ++++++++++++++-----
- tests/test_sync_contextvars.py |  3 ++-
- tox.ini                        |  2 +-
- 6 files changed, 45 insertions(+), 16 deletions(-)
-
-diff --git a/asgiref/compatibility.py b/asgiref/compatibility.py
-index eccaee0..614b2e6 100644
---- a/asgiref/compatibility.py
-+++ b/asgiref/compatibility.py
-@@ -1,5 +1,6 @@
- import asyncio
- import inspect
-+import sys
- 
- 
- def is_double_callable(application):
-@@ -45,3 +46,16 @@ def guarantee_single_callable(application):
-     if is_double_callable(application):
-         application = double_to_single_callable(application)
-     return application
-+
-+
-+if sys.version_info >= (3, 7):
-+    # these were introduced in 3.7
-+    get_running_loop = asyncio.get_running_loop
-+    run_future = asyncio.run
-+    create_task = asyncio.create_task
-+else:
-+    # marked as deprecated in 3.10, did not exist before 3.7
-+    get_running_loop = asyncio.get_event_loop
-+    run_future = asyncio.ensure_future
-+    # does nothing, this is fine for <3.7
-+    create_task = lambda task: task
-diff --git a/asgiref/server.py b/asgiref/server.py
-index f975f78..fb1c394 100644
---- a/asgiref/server.py
-+++ b/asgiref/server.py
-@@ -3,7 +3,7 @@ import logging
- import time
- import traceback
- 
--from .compatibility import guarantee_single_callable
-+from .compatibility import get_running_loop, guarantee_single_callable, run_future
- 
- logger = logging.getLogger(__name__)
- 
-@@ -56,7 +56,7 @@ class StatelessServer:
-         """
-         Runs the asyncio event loop with our handler loop.
-         """
--        event_loop = asyncio.get_event_loop()
-+        event_loop = get_running_loop()
-         asyncio.ensure_future(self.application_checker())
-         try:
-             event_loop.run_until_complete(self.handle())
-@@ -88,12 +88,12 @@ class StatelessServer:
-         input_queue = asyncio.Queue()
-         application_instance = guarantee_single_callable(self.application)
-         # Run it, and stash the future for later checking
--        future = asyncio.ensure_future(
-+        future = run_future(
-             application_instance(
-                 scope=scope,
-                 receive=input_queue.get,
-                 send=lambda message: self.application_send(scope, message),
--            )
-+            ),
-         )
-         self.application_instances[scope_id] = {
-             "input_queue": input_queue,
-diff --git a/asgiref/sync.py b/asgiref/sync.py
-index 6b87c7e..9476e66 100644
---- a/asgiref/sync.py
-+++ b/asgiref/sync.py
-@@ -9,6 +9,7 @@ import weakref
- from concurrent.futures import Future, ThreadPoolExecutor
- from typing import Any, Callable, Dict, Optional, Union
- 
-+from .compatibility import get_running_loop
- from .current_thread_executor import CurrentThreadExecutor
- from .local import Local
- 
-@@ -132,7 +133,7 @@ class AsyncToSync:
-             self.main_event_loop = None
-         else:
-             try:
--                self.main_event_loop = asyncio.get_event_loop()
-+                self.main_event_loop = get_running_loop()
-             except RuntimeError:
-                 # There's no event loop in this thread. Look for the threadlocal if
-                 # we're inside SyncToAsync
-@@ -151,7 +152,7 @@ class AsyncToSync:
-     def __call__(self, *args, **kwargs):
-         # You can't call AsyncToSync from a thread with a running event loop
-         try:
--            event_loop = asyncio.get_event_loop()
-+            event_loop = get_running_loop()
-         except RuntimeError:
-             pass
-         else:
-@@ -238,7 +239,11 @@ class AsyncToSync:
-                     tasks = asyncio.Task.all_tasks(loop)
-                 for task in tasks:
-                     task.cancel()
--                loop.run_until_complete(asyncio.gather(*tasks, return_exceptions=True))
-+
-+                async def gather():
-+                    await asyncio.gather(*tasks, return_exceptions=True)
-+
-+                loop.run_until_complete(gather())
-                 for task in tasks:
-                     if task.cancelled():
-                         continue
-@@ -320,7 +325,7 @@ class SyncToAsync:
- 
-     # If they've set ASGI_THREADS, update the default asyncio executor for now
-     if "ASGI_THREADS" in os.environ:
--        loop = asyncio.get_event_loop()
-+        loop = get_running_loop()
-         loop.set_default_executor(
-             ThreadPoolExecutor(max_workers=int(os.environ["ASGI_THREADS"]))
-         )
-@@ -370,7 +375,7 @@ class SyncToAsync:
-             pass
- 
-     async def __call__(self, *args, **kwargs):
--        loop = asyncio.get_event_loop()
-+        loop = get_running_loop()
- 
-         # Work out what thread to run the code in
-         if self._thread_sensitive:
-diff --git a/tests/test_sync.py b/tests/test_sync.py
-index cf0e0c5..8ed76a7 100644
---- a/tests/test_sync.py
-+++ b/tests/test_sync.py
-@@ -9,6 +9,7 @@ from unittest import TestCase
- 
- import pytest
- 
-+from asgiref.compatibility import create_task, get_running_loop
- from asgiref.sync import ThreadSensitiveContext, async_to_sync, sync_to_async
- 
- 
-@@ -33,12 +34,17 @@ async def test_sync_to_async():
-     assert result == 42
-     assert end - start >= 1
-     # Set workers to 1, call it twice and make sure that works right
--    loop = asyncio.get_event_loop()
--    old_executor = loop._default_executor
-+    loop = get_running_loop()
-+    old_executor = loop._default_executor or ThreadPoolExecutor()
-     loop.set_default_executor(ThreadPoolExecutor(max_workers=1))
-     try:
-         start = time.monotonic()
--        await asyncio.wait([async_function(), async_function()])
-+        await asyncio.wait(
-+            [
-+                create_task(async_function()),
-+                create_task(async_function()),
-+            ]
-+        )
-         end = time.monotonic()
-         # It should take at least 2 seconds as there's only one worker.
-         assert end - start >= 2
-@@ -428,7 +434,7 @@ async def test_thread_sensitive_outside_async():
-         result["thread"] = threading.current_thread()
- 
-     # Run it (in supposed parallel!)
--    await asyncio.wait([outer(result_1), inner(result_2)])
-+    await asyncio.wait([create_task(outer(result_1)), create_task(inner(result_2))])
- 
-     # They should not have run in the main thread, but in the same thread
-     assert result_1["thread"] != threading.current_thread()
-@@ -449,7 +455,10 @@ async def test_thread_sensitive_with_context_matches():
-         async with ThreadSensitiveContext():
-             # Run it (in supposed parallel!)
-             await asyncio.wait(
--                [store_thread_async(result_1), store_thread_async(result_2)]
-+                [
-+                    create_task(store_thread_async(result_1)),
-+                    create_task(store_thread_async(result_2)),
-+                ]
-             )
- 
-     await fn()
-diff --git a/tests/test_sync_contextvars.py b/tests/test_sync_contextvars.py
-index b1027aa..9665bf9 100644
---- a/tests/test_sync_contextvars.py
-+++ b/tests/test_sync_contextvars.py
-@@ -4,6 +4,7 @@ import time
- 
- import pytest
- 
-+from asgiref.compatibility import create_task
- from asgiref.sync import ThreadSensitiveContext, async_to_sync, sync_to_async
- 
- contextvars = pytest.importorskip("contextvars")
-@@ -25,7 +26,7 @@ async def test_thread_sensitive_with_context_different():
-             await store_thread(result)
- 
-     # Run it (in true parallel!)
--    await asyncio.wait([fn(result_1), fn(result_2)])
-+    await asyncio.wait([create_task(fn(result_1)), create_task(fn(result_2))])
- 
-     # They should not have run in the main thread, and on different threads
-     assert result_1["thread"] != threading.current_thread()
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 3953256e0210..89add28027ca 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,9 +1,5 @@
-DIST astroid-2.5.8.tar.gz 354281 BLAKE2B 70ee47c26b765ba9f9bd40cf120a9ce13709043738e20a08d201cdb899789c6c6bdc604aaab49c78b2888503b46321a1728cce656f39d70ce6877ac088cb9567 SHA512 ab2f413e399810e98bd61c837ac90674e7c6d8e2f4d32f3141b21bf1360c785831fc4afd347e755c97627a04cb482aa4e455897e1c02eec8c5fcd28c54c1e9fc
 DIST astroid-2.6.2.tar.gz 360787 BLAKE2B a2744b9ada601b731989f17ec75aa94d88825693a4ccf349374b8795b0db3879aa5bffe838df68759ff3296cd8af9cd45524e7d894a363f54055f3f1fa01e92e SHA512 776f8f9a12d425b7f048318b632dedb8894b6a3051a0607d1079437084aab4e9593e39cf9c7e01c2dd722364d2396cf13d7d26cc2acf33482d75584c458d4b89
-DIST astroid-2.6.4.tar.gz 364123 BLAKE2B 742d2bbe4a4056406b14a61d6aecb37d7add577b6f97b0649f22f7133a5ec0af30b0a7e195817681d014ae25fb69684d776a45948709cb6c2e349352da8960d4 SHA512 d81aee724804438565ab8d49b5df132e528989a3f746f9855ac841c98f06a85c72a7749492ed2856657895e948548f7f9293e4347f4247219065592d2eebf642
 DIST astroid-2.6.5.tar.gz 364383 BLAKE2B 22da12e30bbb27ad93516ef18ebe64839fc1f7057a46fe82444c189bada942b32e00c314fe47eaecaf7cb2e7e047206152e1df98b4f46a40010bef9392721b9c SHA512 28c6fe2953f10f99c31af611644137d566489188459c9249e5621c4dc1c5fecb59c1ba3cc0bbab95c2609203388d1df299f0cb87a1fc3b3bb8b4ad3ad6b010a4
-EBUILD astroid-2.5.8.ebuild 1189 BLAKE2B f519059d0c45508e587e62b79df37ce94385e97bd71c4e91d2e4b3845c55104b21ca3a689873782a0e1ced58d3c2d67df31cdfc9e4294d81e91023c264e0f461 SHA512 f63e523a3f82497443b1a7e72da6298ef8284d72074b7f87209497334795a47ec2a9cc09c7b960d77754f99adad94e36d80dc62fb25518d90e42f0f0e5c63424
-EBUILD astroid-2.6.2.ebuild 1203 BLAKE2B 76c0402208fe16f0efb7083e0dddbba8a45ada958eee01b9386f202e98596e14a3c85bd7d9543b54dc7fe15fcb3a4f7719145f0676e1157154b134bf32651b22 SHA512 e56dba9ea2058590585d088140ef844f65ad450fb1dedbcaf56eb82f2e4b1756bd34ed6e4c5749f1f61476ea89dc28d46b1b7e91b38e8a82406e39a5fa7d5f48
-EBUILD astroid-2.6.4.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
+EBUILD astroid-2.6.2.ebuild 1196 BLAKE2B 53bbb6e068191e80ffa6d8b71d540e7c56d2d7e9ddb5413392dd3f5a543d3c1c1516e7aac55ea83ca23d17f2a33fda8e2b2045bd598986527b8013185c93a6d1 SHA512 e6aa109be4acba3ded8e4b2096b1248498c5cd224b4da42aa7d5c019c7968c4f68c3c523a71c33a662db57f1d438856c40b6a6ebe2aafb06d2d2087602f6ab98
 EBUILD astroid-2.6.5.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.5.8.ebuild b/dev-python/astroid/astroid-2.5.8.ebuild
deleted file mode 100644
index d0ea2a31d654..000000000000
--- a/dev-python/astroid/astroid-2.5.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/astroid/astroid-2.6.2.ebuild b/dev-python/astroid/astroid-2.6.2.ebuild
index 3dc8174c1c62..cef4de93bb0c 100644
--- a/dev-python/astroid/astroid-2.6.2.ebuild
+++ b/dev-python/astroid/astroid-2.6.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
diff --git a/dev-python/astroid/astroid-2.6.4.ebuild b/dev-python/astroid/astroid-2.6.4.ebuild
deleted file mode 100644
index cda705df7b1d..000000000000
--- a/dev-python/astroid/astroid-2.6.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 4d930d9dd053..99f09c149359 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,3 +1,4 @@
+AUX async_timeout-3.0.1-fix-py3.10.patch 11203 BLAKE2B dab3b3e09832ed11a9c684aaa3c21f2294f0066a740ebda047ae8b550c72caa1624b30520870989ec2cebedb72a8e556a92aeea0652411afc16ffab1ca2d825a SHA512 80249589c7f2f2f7c914bef7bf6fb3f03bc9a7d8dfd3376307baf85df28f3240381ca3a580091d1aa1aa9fa4f360ae5d92a5e1b46c308ac0c7e0d857b9d6648d
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-EBUILD async_timeout-3.0.1.ebuild 871 BLAKE2B bda191eddd234253a261c84e960c30ab3e46e6fb7aacf58c0999342b9689acf390241753fd62404643bdf30825baca66cdb6f9a8ec7254018d54ea8f23a807eb SHA512 f25e0b023d609c69764e0f5dff99ce709183261398eb2f4e3c067763fd5a03661de8e4fc406a920dc0b9de72bf0b2f8bbe94b402ffa2e9fdfc134ad9c85ca247
+EBUILD async_timeout-3.0.1.ebuild 968 BLAKE2B 1796e2c00b629edd090b88a3b6cff4e3a20190351d1ae105c0cb16581f0a353e388f3274d6693612cf2df95bf95ab495dd7cfb55088594827fa300cf56c778e0 SHA512 16aa8169ceb211ef74631b180083cc9d900b13016f0a90c363aec91832b00051c25712e610b2aabad7fcc443e4ed566b53a8c663e13b963b856ae6e3e5387b2f
 MISC metadata.xml 459 BLAKE2B aa3214d8a14324f68b5743f51371cf1902962a5b14bb7065a04944684d33f9639edbc9a899f5cd02ca19068506c5e403db149742d0b1cedf8e35a5927a837901 SHA512 fb0488558b0e1d7b9e0721a7d299bf2d105d66c67f51ea1bdb1b8dc529bb3a964c89d4410ee8640d0b094d1e364e5d59d8a9b7bafb0cdd9f3dde6443c0d46a15
diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
index f4022958304b..33755ac4a219 100644
--- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -20,8 +21,11 @@ BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=( "${FILESDIR}/${P}-fix-py3.10.patch" )
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/async_timeout/files/async_timeout-3.0.1-fix-py3.10.patch b/dev-python/async_timeout/files/async_timeout-3.0.1-fix-py3.10.patch
new file mode 100644
index 000000000000..5bfdcf2e6dab
--- /dev/null
+++ b/dev-python/async_timeout/files/async_timeout-3.0.1-fix-py3.10.patch
@@ -0,0 +1,387 @@
+diff --git a/tests/test_py35.py b/tests/test_py35.py
+index 00bb7f0..7d88d99 100644
+--- a/tests/test_py35.py
++++ b/tests/test_py35.py
+@@ -4,30 +4,32 @@ import pytest
+ 
+ from async_timeout import timeout
+ 
+-pytestmark = pytest.mark.asyncio
+ 
+-
+-async def test_async_timeout(loop):
++@pytest.mark.asyncio
++async def test_async_timeout():
+     with pytest.raises(asyncio.TimeoutError):
+-        async with timeout(0.01, loop=loop) as cm:
+-            await asyncio.sleep(10, loop=loop)
++        async with timeout(0.01) as cm:
++            await asyncio.sleep(10)
+     assert cm.expired
+ 
+ 
+-async def test_async_no_timeout(loop):
+-    async with timeout(1, loop=loop) as cm:
+-        await asyncio.sleep(0, loop=loop)
++@pytest.mark.asyncio
++async def test_async_no_timeout():
++    async with timeout(1) as cm:
++        await asyncio.sleep(0)
+     assert not cm.expired
+ 
+ 
+-async def test_async_zero(loop):
++@pytest.mark.asyncio
++async def test_async_zero():
+     with pytest.raises(asyncio.TimeoutError):
+-        async with timeout(0, loop=loop) as cm:
+-            await asyncio.sleep(10, loop=loop)
++        async with timeout(0) as cm:
++            await asyncio.sleep(10)
+     assert cm.expired
+ 
+ 
+-async def test_async_zero_coro_not_started(loop):
++@pytest.mark.asyncio
++async def test_async_zero_coro_not_started():
+     coro_started = False
+ 
+     async def coro():
+@@ -35,8 +37,8 @@ async def test_async_zero_coro_not_started(loop):
+         coro_started = True
+ 
+     with pytest.raises(asyncio.TimeoutError):
+-        async with timeout(0, loop=loop) as cm:
+-            await asyncio.sleep(0, loop=loop)
++        async with timeout(0) as cm:
++            await asyncio.sleep(0)
+             await coro()
+ 
+     assert cm.expired
+diff --git a/tests/test_timeout.py b/tests/test_timeout.py
+index 8915546..b1cb3c7 100644
+--- a/tests/test_timeout.py
++++ b/tests/test_timeout.py
+@@ -6,89 +6,69 @@ import pytest
+ 
+ from async_timeout import timeout
+ 
+-from asyncio import ensure_future
+-
+-
+-def create_future(loop):
+-    """Compatibility wrapper for the loop.create_future() call introduced in
+-    3.5.2."""
+-    if hasattr(loop, 'create_future'):
+-        return loop.create_future()
+-    else:
+-        return asyncio.Future(loop=loop)
+-
+ 
+ @pytest.mark.asyncio
+-async def test_timeout(loop):
++async def test_timeout():
+     canceled_raised = False
+ 
+     async def long_running_task():
+         try:
+-            await asyncio.sleep(10, loop=loop)
++            await asyncio.sleep(10)
+         except asyncio.CancelledError:
+             nonlocal canceled_raised
+             canceled_raised = True
+             raise
+ 
+     with pytest.raises(asyncio.TimeoutError):
+-        with timeout(0.01, loop=loop) as t:
++        with timeout(0.01) as t:
+             await long_running_task()
+-            assert t._loop is loop
++            assert t._loop is asyncio.get_event_loop()
+     assert canceled_raised, 'CancelledError was not raised'
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_finish_in_time(loop):
++async def test_timeout_finish_in_time():
+     async def long_running_task():
+-        await asyncio.sleep(0.01, loop=loop)
++        await asyncio.sleep(0.01)
+         return 'done'
+ 
+-    with timeout(0.1, loop=loop):
++    with timeout(0.1):
+         resp = await long_running_task()
+     assert resp == 'done'
+ 
+ 
+-def test_timeout_global_loop(loop):
+-    asyncio.set_event_loop(loop)
+-
+-    async def run():
+-        with timeout(10) as t:
+-            await asyncio.sleep(0.01)
+-            assert t._loop is loop
+-
+-    loop.run_until_complete(run())
+-
+-
+ @pytest.mark.asyncio
+-async def test_timeout_disable(loop):
++async def test_timeout_disable():
+     async def long_running_task():
+-        await asyncio.sleep(0.1, loop=loop)
++        await asyncio.sleep(0.1)
+         return 'done'
+ 
++    loop = asyncio.get_event_loop()
+     t0 = loop.time()
+-    with timeout(None, loop=loop):
++    with timeout(None):
+         resp = await long_running_task()
+     assert resp == 'done'
+     dt = loop.time() - t0
+     assert 0.09 < dt < 0.13, dt
+ 
+ 
+-def test_timeout_is_none_no_task(loop):
++def test_timeout_is_none_no_task():
++    loop = asyncio.get_event_loop()
+     with timeout(None, loop=loop) as cm:
+         assert cm._task is None
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_enable_zero(loop):
++async def test_timeout_enable_zero():
+     with pytest.raises(asyncio.TimeoutError):
+-        with timeout(0, loop=loop) as cm:
+-            await asyncio.sleep(0.1, loop=loop)
++        with timeout(0) as cm:
++            await asyncio.sleep(0.1)
+ 
+     assert cm.expired
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_enable_zero_coro_not_started(loop):
++async def test_timeout_enable_zero_coro_not_started():
+     coro_started = False
+ 
+     async def coro():
+@@ -96,8 +76,8 @@ async def test_timeout_enable_zero_coro_not_started(loop):
+         coro_started = True
+ 
+     with pytest.raises(asyncio.TimeoutError):
+-        with timeout(0, loop=loop) as cm:
+-            await asyncio.sleep(0, loop=loop)
++        with timeout(0) as cm:
++            await asyncio.sleep(0)
+             await coro()
+ 
+     assert cm.expired
+@@ -105,51 +85,52 @@ async def test_timeout_enable_zero_coro_not_started(loop):
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_not_relevant_exception(loop):
+-    await asyncio.sleep(0, loop=loop)
++async def test_timeout_not_relevant_exception():
++    await asyncio.sleep(0)
+     with pytest.raises(KeyError):
+-        with timeout(0.1, loop=loop):
++        with timeout(0.1):
+             raise KeyError
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_canceled_error_is_not_converted_to_timeout(loop):
+-    await asyncio.sleep(0, loop=loop)
++async def test_timeout_canceled_error_is_not_converted_to_timeout():
++    await asyncio.sleep(0)
+     with pytest.raises(asyncio.CancelledError):
+-        with timeout(0.001, loop=loop):
++        with timeout(0.001):
+             raise asyncio.CancelledError
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_blocking_loop(loop):
++async def test_timeout_blocking_loop():
+     async def long_running_task():
+         time.sleep(0.1)
+         return 'done'
+ 
+-    with timeout(0.01, loop=loop):
++    with timeout(0.01):
+         result = await long_running_task()
+     assert result == 'done'
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_for_race_conditions(loop):
+-    fut = create_future(loop)
++async def test_for_race_conditions():
++    loop = asyncio.get_event_loop()
++    fut = loop.create_future()
+     loop.call_later(0.1, fut.set_result('done'))
+-    with timeout(0.2, loop=loop):
++    with timeout(0.2):
+         resp = await fut
+     assert resp == 'done'
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_time(loop):
++async def test_timeout_time():
+     foo_running = None
+-
++    loop = asyncio.get_event_loop()
+     start = loop.time()
+     with pytest.raises(asyncio.TimeoutError):
+-        with timeout(0.1, loop=loop):
++        with timeout(0.1):
+             foo_running = True
+             try:
+-                await asyncio.sleep(0.2, loop=loop)
++                await asyncio.sleep(0.2)
+             finally:
+                 foo_running = False
+ 
+@@ -160,26 +141,26 @@ async def test_timeout_time(loop):
+     assert not foo_running
+ 
+ 
+-def test_raise_runtimeerror_if_no_task(loop):
++def test_raise_runtimeerror_if_no_task():
+     with pytest.raises(RuntimeError):
+-        with timeout(0.1, loop=loop):
++        with timeout(0.1):
+             pass
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_outer_coro_is_not_cancelled(loop):
++async def test_outer_coro_is_not_cancelled():
+ 
+     has_timeout = False
+ 
+     async def outer():
+         nonlocal has_timeout
+         try:
+-            with timeout(0.001, loop=loop):
+-                await asyncio.sleep(1, loop=loop)
++            with timeout(0.001):
++                await asyncio.sleep(1)
+         except asyncio.TimeoutError:
+             has_timeout = True
+ 
+-    task = ensure_future(outer(), loop=loop)
++    task = asyncio.ensure_future(outer())
+     await task
+     assert has_timeout
+     assert not task.cancelled()
+@@ -187,14 +168,15 @@ async def test_outer_coro_is_not_cancelled(loop):
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_cancel_outer_coro(loop):
+-    fut = create_future(loop)
++async def test_cancel_outer_coro():
++    loop = asyncio.get_event_loop()
++    fut = loop.create_future()
+ 
+     async def outer():
+         fut.set_result(None)
+-        await asyncio.sleep(1, loop=loop)
++        await asyncio.sleep(1)
+ 
+-    task = ensure_future(outer(), loop=loop)
++    task = asyncio.ensure_future(outer())
+     await fut
+     task.cancel()
+     with pytest.raises(asyncio.CancelledError):
+@@ -204,57 +186,64 @@ async def test_cancel_outer_coro(loop):
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_suppress_exception_chain(loop):
++async def test_timeout_suppress_exception_chain():
+     with pytest.raises(asyncio.TimeoutError) as ctx:
+-        with timeout(0.01, loop=loop):
+-            await asyncio.sleep(10, loop=loop)
++        with timeout(0.01):
++            await asyncio.sleep(10)
+     assert not ctx.value.__suppress_context__
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_expired(loop):
++async def test_timeout_expired():
+     with pytest.raises(asyncio.TimeoutError):
+-        with timeout(0.01, loop=loop) as cm:
+-            await asyncio.sleep(10, loop=loop)
++        with timeout(0.01) as cm:
++            await asyncio.sleep(10)
+     assert cm.expired
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_inner_timeout_error(loop):
++async def test_timeout_inner_timeout_error():
+     with pytest.raises(asyncio.TimeoutError):
+-        with timeout(0.01, loop=loop) as cm:
++        with timeout(0.01) as cm:
+             raise asyncio.TimeoutError
+     assert not cm.expired
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_inner_other_error(loop):
++async def test_timeout_inner_other_error():
+     with pytest.raises(RuntimeError):
+-        with timeout(0.01, loop=loop) as cm:
++        with timeout(0.01) as cm:
+             raise RuntimeError
+     assert not cm.expired
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_remaining(loop):
+-    with timeout(None, loop=loop) as cm:
++async def test_timeout_remaining():
++    with timeout(None) as cm:
+         assert cm.remaining is None
++    assert cm.remaining is None
++
++    t = timeout(None)
++    assert t.remaining is None
+ 
+-    t = timeout(1.0, loop=loop)
++    t = timeout(1.0)
+     assert t.remaining is None
+ 
+-    with timeout(1.0, loop=loop) as cm:
+-        await asyncio.sleep(0.1, loop=loop)
++    with timeout(1.0) as cm:
++        await asyncio.sleep(0.1)
+         assert cm.remaining < 1.0
++    r = cm.remaining
++    time.sleep(0.1)
++    assert abs(r - cm.remaining) < 1.0
+ 
+     with pytest.raises(asyncio.TimeoutError):
+-        with timeout(0.1, loop=loop) as cm:
+-            await asyncio.sleep(0.5, loop=loop)
++        with timeout(0.1) as cm:
++            await asyncio.sleep(0.5)
+ 
+     assert cm.remaining == 0.0
+ 
+ 
+-def test_cancel_without_starting(loop):
+-    tm = timeout(1, loop=loop)
++def test_cancel_without_starting():
++    tm = timeout(1)
+     tm._cancel_task()
+     tm._cancel_task()  # double call should success
diff --git a/dev-python/backports-entry_points_selectable/Manifest b/dev-python/backports-entry_points_selectable/Manifest
index 20e9d615d9c7..5bd10ef5d57b 100644
--- a/dev-python/backports-entry_points_selectable/Manifest
+++ b/dev-python/backports-entry_points_selectable/Manifest
@@ -1,3 +1,3 @@
 DIST backports.entry_points_selectable-1.1.0.gh.tar.gz 7689 BLAKE2B e7fb4372838b47e65e50d91acb034afaf326947bd76bbdf14b57834b94c72fb62afa6526931a96cc1e10b43eca9d95dce7fde431c24a4e15a4b2569ddf42faeb SHA512 abf8f5d228b52281160cedfd017f1a4273b8fce01ed29e9f0417f750125abacaf97a3cc6f363849702d1dc6f3c40602461f79bfcc2a36a3dfb962af1112046d2
-EBUILD backports-entry_points_selectable-1.1.0.ebuild 750 BLAKE2B e24e432dba1d3254f338d45bbce0eb6d106675b3a5e00a54965067aa4df49c1c44107b468efd2021778cce828f4e08823f503c1b10f656586638c5116c2635a7 SHA512 be61a61bc5b187118bd9aae390d67e7585335146346a7ad917b38b0ecebac2e76af27c337e9a5ba1f06b07816d61b1d57a7e19b2ca0f793dd8fbb5c0cfa6a7d7
+EBUILD backports-entry_points_selectable-1.1.0.ebuild 770 BLAKE2B 81d433d898d2a035416bfeb88da464eaccb31fdadb89e787fb0e0f989230189637ca16603b26ecc90fa8d7facb3f05a4e184d818bd80c05d91303d4935fe69dd SHA512 7cd8df37f6fca99d09f35d49a12bf5b3ac0793a8bf84265c5cc160f301d79532a47303e286018798653773aaa07577fb7bc8939d97198cce47a9c43ce0e85013
 MISC metadata.xml 394 BLAKE2B a52263e74cb9051e6c7dc696d1f39e87ded29b3894f58a455b25dc469f084dc4e71dc00fa309a5ab7b1ad7c9fd87e6fd2b95e28be17304aee03bc29a6139b4c0 SHA512 79f57eb7cb48175fb0fbe2d6269c1c7fcc7b48dffede2b77d770333b9ed37bd2957e3531d4638ce3dc83f4bdce83d06477a032a683766a664399bcf5afa68949
diff --git a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
index a2e941fbf6e6..c2e9776a97cd 100644
--- a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
+++ b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index cc87a0494cc1..def327d5886c 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -1,3 +1,3 @@
 DIST beautifulsoup4-4.9.3.tar.gz 376031 BLAKE2B fbe2139f288eee978c3f665c7640f66c6c51b857a186f6a8ace02b36effa1552f1cbea9e3744e0a46a65a06e6cdbd9203832e0ecd86b61406b933f9bd83d37b8 SHA512 e3cb6258bd7c51f12128fa8ee5948fb3566163ae233fac2dda21bab7772ab8dbb384d920b0ea138ef9921307b48f89cee3a9bf6111dfc8903d917ee7af365f34
-EBUILD beautifulsoup-4.9.3.ebuild 853 BLAKE2B f667ada00b70314f502e9747e499d176959ae5345ff26c26f6ce82675731cd8a821d19377e933734edf3c41b2f5b8eed618e9e498d64d68e90b5932e4999727b SHA512 f93f5f6dc35799f1690130c9ee3bb0b3f4a7256a976a82af939f534ea9dfa8cd6fa2122db55c01064fe2fb536123cc754561667bf5a1b40734d6826ca937742b
+EBUILD beautifulsoup-4.9.3.ebuild 860 BLAKE2B 3fde7fd3f82113b262225854d63561a2394f8718726beae1cd13b37375887253de93ca612326fe49fc0aafab41bea7331cd9ecc581bea758f5f26d26ed166ef0 SHA512 fae3924c39e781d390855b2deadf587898d721ffaa3642cdfc54490225cf60b450d3f96e1f4f3158fdd432281432230eb5730a1c4ba3b1750d3c252b8f384e9e
 MISC metadata.xml 744 BLAKE2B 93987e4adb8dc5dea9b897940cae80d431b29d693bd1fea9d242de75174b1fd86afaecc6a5fb5e4ad06576caa559a918d09da28d253147f2683703d911435f76 SHA512 f56ab7ff03d21187e38f292b24396eccfd53622c84f5f489bd1e515393dbf85b75bbdfe26a6875352b16dcbf16f89cd9a051dfe44dbca8786efecd7db914f789
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
index 84b1144eddd9..bf90d32d6c56 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/soupsieve[${PYTHON_USEDEP}]
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index 5dee06148706..1ac8c5de28d9 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,4 +1,4 @@
 AUX betamax-0.8.1-tests.patch 867 BLAKE2B d161db0b79eff7591bf87cf256a50357e1d82f7eeb0fdf39c27be287c97bf6a536a4e62defd173305ba598f388f2b49d22545443c6fcb589f66988930ae29a55 SHA512 001b26d84e4a02b242ee90b36df0a30c9c4890623191655a8eae5a87e106679197fa8090354b52a72ad07da97666190ebb3a7dcb9b4ffba7b9bea9c18bfed115
 DIST betamax-0.8.1.tar.gz 77526 BLAKE2B 2ce88326c5ef80082908912c4b14f149793c4457c47446ebcabaaffaa6b0ee64528096acc6bdd868fce0fad3d10ad66697cad5dc422c15b324e1cc9ae20eafa6 SHA512 89bfb56cf4004a70ec8c1f2342cfa0e02f850b8ed80b67f8b2b02c1a2093e8ac1cf1b9980354551e9d3a21fadde0d77d717f1559487024941973cd80bd451734
-EBUILD betamax-0.8.1.ebuild 1077 BLAKE2B 9d3700f10cb6bee2cd50007782070d502c5a5e66e6d15d1dfc667564ea5973e5950cd6e3a8958426ca893d50a47c1df62b1fcf573e733bcb1a08ee97c5e89512 SHA512 bf29128575e2fdea9ba81e253bae9c822c5d04b7ffe3ff5ebed9c2c24f3af36a0e674790a49d182f295af2b73d8c2b42b86a7dd31edf39c80c9c64fa5f3ac9f2
+EBUILD betamax-0.8.1.ebuild 1084 BLAKE2B 1ca411a6676cb84a817e6e80949e8f0cb99455bd5b397eb4781444344449c90af5a85fc00cecb4cc305b541c50c1a77242bb3415e4e97fc4181f2af7c8b5fb95 SHA512 31ef2377ebf77fb53c2d6f05589c857fa805df955b89bc2f4643b62e94d73073659053920c8ce867ca28ad789650223b45010fb921f4cfe35aa90fb1291c9e89
 MISC metadata.xml 312 BLAKE2B b6adeaea6a20f135ab0396ea0be72118164a917c935162c1904f07e9190cb0e692d604e7ca15f39504025990d1cbcd88ad088502202b82dde90a56862fd845ab SHA512 5c87d7dcbbd90c53df52d98b97cd54c5940cd6f3fd552fb692dbc856761cb125542a88e415ae01fdc1fff2643fdbcf7f521c2ea9f6c67d3fd9b14a01ef530e3c
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index bc633613470b..6471ec7d2232 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="python-requests HTTP exchanges recorder"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 417971e3f198..eea6519ba836 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -2,8 +2,10 @@ DIST bitarray-2.1.3.tar.gz 72556 BLAKE2B 737ba1e1586269d279198bd966c84abc95b7417
 DIST bitarray-2.2.1.tar.gz 77371 BLAKE2B f6f699594a28fa680eaaa2ad260da00f9827090e770b22226e7a4bfd72c54759a80370f6842cb473dade6761b744175e4630af5e7b3fdd09768b7199e1a08e74 SHA512 7eb25359d405e0be63ca7faab50fd7ab652d8f838f09587b4faa94adc78952582e7c7c0b605820e5feafd18d35edf050f70f65bce1123b883ad47bd1e54244d3
 DIST bitarray-2.2.2.tar.gz 78273 BLAKE2B 1c9b9c4011b1b11481209aba6958aa3c58dc2c1f5188a97f8b6c15a8a77ed0338bfc64bfcf6da3667c317631e5d271408f443a33e214c8f123f2c764cc93d6b0 SHA512 98b02ecc39befa619c816117fdfc3d69efb931203bb509e92bdf800f5c64e8633a986751d1650cb33dd0c6c0df0653f70c97fe73d4334198b81f39aafec4e019
 DIST bitarray-2.2.3.tar.gz 79709 BLAKE2B 75bb085914fa5f7b926ede947d69f7a8de1dcd8e61917d1e154049102c539e78a7d0a4bab181a8bf8a19338d0d73124d9aec5f746f25d12a8f5a0c188f309009 SHA512 ed8641bd12a87e440642535baab62b132ce4499b8525a699eb82926b098d7f9ce6f66ea07846bfacabcf45cdc1d30c12c104a0b1af638efa8ad809329914a186
+DIST bitarray-2.2.4.tar.gz 82471 BLAKE2B 0b2bd1afd17df2756e3e6ecfe78f84ee4ec84121c9eb59eaaa57042c67702004c25b0286474b1abea82a10ed682b8e0e221001e770238d144452049019300ae3 SHA512 ad5d96c8232d239e51c40782e7a487fd898732774e39228c996dd32f0697898b65f2a26479a0af03e07a347a404174924c8299590433b41a6bf6189447f4194f
 EBUILD bitarray-2.1.3.ebuild 555 BLAKE2B 2b3a6ec7d61f8aab17773e44b70fa98a2ecc24384b22561fd83396bfc350ff7d9addf3228ae1580d0d9dc2dd6a2a6d094232b2e52568e06f6eb77540567bbdf6 SHA512 b7c65e4bffe459f8fef3c3af19be16f4fa1c948121ae044a8abcbf6f65ce7400d50641b3c794d698286b89b46b42479decdf8211c44aafc36c9c38acb619b2d5
 EBUILD bitarray-2.2.1.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 EBUILD bitarray-2.2.2.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 EBUILD bitarray-2.2.3.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
+EBUILD bitarray-2.2.4.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-2.2.4.ebuild b/dev-python/bitarray/bitarray-2.2.4.ebuild
new file mode 100644
index 000000000000..2db993517908
--- /dev/null
+++ b/dev-python/bitarray/bitarray-2.2.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="Efficient arrays of booleans -- C extension"
+HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
+SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index e10b90052936..bd02d319e3f2 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -2,5 +2,5 @@ AUX bleach-3.2.1-py39.patch 1637 BLAKE2B eeb66b15ad738d07db70bbf4599ef393678ca73
 DIST bleach-3.3.0.tar.gz 181274 BLAKE2B 32883ef9a77bf1d0cd208217930474285e55f158dc8d7b9c4049ca896cdc5cfb873674aa5f5181c31d46345be29f954badd29969bf156b1cc10eb200214de367 SHA512 8e408289c5175234a383658552e48379da9f570866e4c248a4e5c0b7bdaa9a2e6be545943dd32968cdb425929d51de282cca0678fdc6dd06b6fc2c2f41b58097
 DIST bleach-3.3.1.tar.gz 183687 BLAKE2B 9ca70ff84919b6b893afdbf7914098efe7dc3c9f0c86a729a92754ba6dacc95752abc44cea96db282483cf53413d6a98421c95f102941d23adf89af00b2a5afd SHA512 bb68275f91a4c724c14594d008f58d31ab0a97b08fd45b6cbe8237a31a1bbfd24a19cea1a835efffb979739ce17a3c065099e677019e498e78d9a4222ff2d66c
 EBUILD bleach-3.3.0.ebuild 977 BLAKE2B e2b92647dd8040bcbda4d045e9decd1253e527c6d4850f5fc6de0608b7f21b65f063561dc59cadb4970487d9b7939c936e026a3eec3e88fbb02abd94d9b4077e SHA512 aa9378ec21b658cbb780fc69f547582d1c20cbe8018c5e13439512793164e7f98dc85d4d4e78dbc3e55ce4560260e6bc901372130d5a70b332bb798a0ea8816d
-EBUILD bleach-3.3.1.ebuild 989 BLAKE2B e8e9874d7a6147aa3bcbe782ef809f3f34d726f90ce8f812e2cca46ae6d22c93665334a001ea53406026aaaed2a12458eb2e8e6c5aa676c773ff9ef105282ed6 SHA512 beb43388c19a2fd8b9ec2200bd91b8feb3cfa591e2c40f572ff4df2c833eedf7a7ab86b9d8f6860baa7168701c065e783a816f8acce25f2e6291f72197f164dd
+EBUILD bleach-3.3.1.ebuild 996 BLAKE2B b371d730c001b943647b70bf6cf8282baacc8bd39cbba1c0b7d8221f71bc8edbcb74b396ef1f8a337c361aecffb681c560dd4616c379fd6cfc39cb10b3dcf044 SHA512 dbf86e3442d46c503571bf6169b542bda8a2cfce28b9a1745a26c9b97f6a97e32a3e21058ff4f1388dc2cfc56a94c1c96bfc932e308329e9f5c0842dd8201b46
 MISC metadata.xml 400 BLAKE2B 931735ca08509e3a1f8803181a1eca6be10b654fe37244772eb43b918dcac641c1733e535f2504bfc311644e52506712857ea24bf4784cebcb8b6063194d1388 SHA512 b73e3cd77b2378668b4086395f9a268105d94992f7b9d23ca8cfb834d015cc3ca0ed995acadba9060a5e96d29bae128b850a803a11c4b3d993f518180d9b4b5a
diff --git a/dev-python/bleach/bleach-3.3.1.ebuild b/dev-python/bleach/bleach-3.3.1.ebuild
index 0310e25c43fd..7a2b9a2de701 100644
--- a/dev-python/bleach/bleach-3.3.1.ebuild
+++ b/dev-python/bleach/bleach-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index ada293f21a13..f293eb9b3bc6 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,4 +1,4 @@
 AUX blosc-1.10.0-unbundle.patch 1461 BLAKE2B 05c54929638e7a9a645fdf872c26969720fabfd8a8526742def207b92ec0ddf96ad6002cf9d45d1f5b44521d44c369081b368ab98605a5789b1b949bf6a5f5d2 SHA512 b8139ae0d091be459071cab4779f4264e0bbef119e8641913167f809a4d0b3682e1918443e10f83aa9c34c76f0ddda440ac27cb9d1c10cc355e0a7f05dbc7179
 DIST blosc-1.10.4.tar.gz 858123 BLAKE2B 01c9bd9486a27944caae1bc92b591c8b6f821bb5a6a0b44bc19f6c1778f2a2573a25783631c2140daa4d701569e584c93f8d5da76a92b73fb35ae5880ad2ea34 SHA512 bb41b83ff5198603e3721150976f95ffcbfe7b91bd5b11e1aa5e440dee1af7a9a6f5033e5aa4858117432e1522052ec074e9f14b5be52545e3752bc818637703
-EBUILD blosc-1.10.4.ebuild 952 BLAKE2B d40e3a595205b109e72ab4b710e5d973f6bc4a415fe979a528d3a9c80376dcc485a5524187595281d9201536f855feafc7e0b23c4e7e94619910d5ced54484dc SHA512 8cad13fc1d0c33181b11b6281197d3e348ee6afb0280e867a622b56617318a7492217a32a39d01d496607a00f1645a351f70c150cb0eba4d7d471ba5f14bbf33
+EBUILD blosc-1.10.4.ebuild 959 BLAKE2B f4ee80d6730cdf7e33f9409ff9330b002014543af59c73d35dafb7c2f89542bf8ae02304fa544460f076b4b7a615ca8f7660a8c0d87e3144f1b102437899f901 SHA512 37001ca3f420b51138999636f70d92a5ef9513d6a1347e079e869a4c100ff39d4238286bb6f98221fb5b223e965d5afffc9e99e0170d27997a5dcce40356e1be
 MISC metadata.xml 998 BLAKE2B 3630fcaea0c8e2e9062aa9f42c60b17b407fd5febb70d5d41b0a0c46f202f06afc79fc25072c1403c917caedfd6205e7133431fcfd40e74f8480852aee7e2299 SHA512 22ffa2acb28f4f6f9af18398681db0ddb5b19c7b125386c0eb24265f11ccba24f90977710f74af57a2de6e497c668fb17398da89a2b2ecc5ef552b201960450e
diff --git a/dev-python/blosc/blosc-1.10.4.ebuild b/dev-python/blosc/blosc-1.10.4.ebuild
index d0100a8b57ba..e8e500f87412 100644
--- a/dev-python/blosc/blosc-1.10.4.ebuild
+++ b/dev-python/blosc/blosc-1.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 469ac4807456..40bb7af24211 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,6 +2,8 @@ DIST boto3-1.17.104.tar.gz 387800 BLAKE2B 928824ab0a0c091fec430c5d86b0c5663f2a98
 DIST boto3-1.17.112.tar.gz 391748 BLAKE2B 071eddfe134face48b86985ccd0171e0d8994fc65cd75e26945dfcab29566f42aa965c82b736cc7dd821a920e6903e4c45917af1759214606c2448b46c528cff SHA512 dcee3f4e2dfaf8feeeecc82ca938a72d654ced7a44f32e3dab43a225d8dcf0b3d20f0699770cfcd8ede840f792d37e124597d096322b88ce54c2e27e109da6e7
 DIST boto3-1.18.0.tar.gz 392345 BLAKE2B 8d464e038892cd77d7b171c27f41eee31c630ebcadce6677f76ccc270f3f8471d7a8443d174ce1b6ea5cdcfe98973faa42ddda4123ec21d225464515bdcd862d SHA512 ba5af17ae6705bfdea4a9d6bccb18d3f1593980d594be4dbb3049123089ba7d8ecaaed685d8a3181ae50e95b537e7a50fed3be694b4f61d3ba250693ae249f4d
 DIST boto3-1.18.1.tar.gz 392759 BLAKE2B bfa0bcfba9a413fbb13b2698f3ef2461cac99a9fddea0fe16d790a0ddab60fcd46b13ac4026536b9f89fb65ff703d61a4f01499423aa54289f17fc0f035ea2d6 SHA512 1aca424ff105fe2049c94aeaff306a683dd4eb9ac9b88303ff4857f53ddb4d3f267ef69119f8cbdb8463ab12331b2d89149fd0b10ccd23c4fde9485e63ba0005
+DIST boto3-1.18.10.tar.gz 398199 BLAKE2B 950b40afd867a8df9f8154e35572f3302c03c686d3299aac100ffd18a82c9e9a6657a4910f89f385dfb742c32e315110fc61bf00d2dc14892c4051eef5c642c8 SHA512 0391faf993faf8f4cc28e309f3267acc1beb38229f633f4c409820d45e968b1a93a7c74798ee84aebcd29b4547c9f301decd451e89b65a34297f796e1f839826
+DIST boto3-1.18.11.tar.gz 398542 BLAKE2B cecccf462510a6deb55308ea4156ae081d2357480e5d8c160797032c62554ac708f37b38e1cbe26a18e2087a268b392a145d0733400a86e4fca19a5416700ad8 SHA512 63cbea62fcd71fee1c53219f6016fe38bd08afdef0c27d918bd078d04803d14ddd4782c0182e304542314df4bcf081d802d1f581b25ccae3327c4df80e40dabe
 DIST boto3-1.18.2.tar.gz 393528 BLAKE2B 20424f9a8ff013d1d9724f741ad6754747de504fb961688f433eba74ce1d6df7e95d68c45be1e87df1532f99b2fa4d7e8b00671a8ae9a378a4df74764924cdaa SHA512 287a1f24f62fa83fd944632799540257b2f8d6cf3b5d6add57be60e4f49dafd685bb4fcceef37fe907edba00a7f2285d92bd8d381b03e45ac794b22fdcfe8783
 DIST boto3-1.18.3.tar.gz 393645 BLAKE2B 4967ac751e9ff5a86f6f571961df31d82f6012ade28aa19a038399077bf5a1b968dfa1172995423890b79a2ede54e2c6f6c1937e8ccf21010f17a4d96928df62 SHA512 f9c42257f0925fffaeb1a36e4731dc54fee1836c249617444292991d043dbb9b58472f73a806981c9763b569cc7402b378f6e1e0102fe0f995a7754807f19b38
 DIST boto3-1.18.4.tar.gz 394442 BLAKE2B e82726143b353b843e915ea78ea2e033077ee495b1d416866f5c231f8bd864372496736d266b2b848ed8afd3134bd865c507291fd2fbdd5cae00a92ce3c5e76d SHA512 b3ba1328476a1c642c6b813afc3879e904bc14da69e062156df0405b3da6d2a15a4a40602f24d0a067a83cc441ce5a5e353dacb84869b0fe24e9984c0dec719f
@@ -9,10 +11,13 @@ DIST boto3-1.18.5.tar.gz 394930 BLAKE2B a7f58699a4a27c85f00f47eb34d861509446d159
 DIST boto3-1.18.6.tar.gz 394941 BLAKE2B c7ef6f85fea5a12c248afd03cbe5cca2475c32de0d5b90e8390837e4e1980390e07bc99b6dd1e1831c34135503fe5859e0a837e0aff88f7af2bd8ddcad804a1d SHA512 01cdc6e71b8cd04da7e6f2bf9268625824c12b53fc7322343ae635d5fdd6ed30170fb698d7c4a788b4095fbfc186ef72a11fb6f785a1006fe7861d2db6108da9
 DIST boto3-1.18.7.tar.gz 395640 BLAKE2B 6a9fa1dd55644806fe93271805f35fbe0c4cb65d1de08dded2d2f57fcefa96e32c4ebe7b60743c52c0898222bc06d33dbd03d304bbef327b88022450a7943e2c SHA512 20e7fedab7d061ab02f391e9baf36cb554e7f194f38d24d5a75f76715b2acf1b51b6adce5d8cf5a2a0d29df73566db00b8813a219d45a194d9a8eb93d0dab570
 DIST boto3-1.18.8.tar.gz 397295 BLAKE2B 34e4e9dbaf53d7e9917b26f62385a012663147bcebe3a3989f3e306ed1bad8fc90c47ecd0901e127ad024f67d6891e3eb2b2f59e179ca45fe88b5cca6968bbef SHA512 59ea0cb50058fde12f748b394b9ba7053755c642d6124343a6fe00d8c7918f123b508441006c5a9ebc6319d4318f7f95c481cca47d692349c4591958c38d53c7
+DIST boto3-1.18.9.tar.gz 397452 BLAKE2B 1a600eb067baebb59141f1e8cb15442d7fa338430534099df84b8b71f6fd90a56aa5ead0c38ba317018897861f996ce38cf995233778ad57e3be82e82870173b SHA512 12d2b8a1baa9993be322b770a13a8895718bd25c6d4a51bdef39413368c9ba62fdc93e4f517d3556e5d6a26e860b21f1bdd1ee6b0f49c83082973ee716d3017c
 EBUILD boto3-1.17.104.ebuild 1336 BLAKE2B cd492f68d066b954200ac23e330958382b0ed6d5dd6389b24824282197579442a7ea9b70db065259f436aebabb898fe9e9556f5be525fb7bf47960fd61903782 SHA512 32ecfbc280efd39c19295d6d38f3df12ef199263e741b13c35a0a927a609d90b250ba2a5a1324f045c493db7249d5889627d772767cf5de74946a35e5d17e9bc
 EBUILD boto3-1.17.112.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
 EBUILD boto3-1.18.0.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.1.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.10.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.11.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.2.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.3.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.4.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
@@ -20,5 +25,6 @@ EBUILD boto3-1.18.5.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f0
 EBUILD boto3-1.18.6.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.7.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.8.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.9.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 605 BLAKE2B cb7041ecfae68d44cc4c533600c9527f901b3b57b4ac6b7877b489f849e1257f3ea157c901bb67dd44ef06296f02564b6b9e341bfd1d102b68512f7a40b48ede SHA512 2f9630e0d4396ae6f3a7a0aa328440fba250d330d4cb5e4a9cc68caaf0ffc133960294ca4fdd0bae150a212555ebdff07208e909c6f7207857a3b7774178dfc8
diff --git a/dev-python/boto3/boto3-1.18.10.ebuild b/dev-python/boto3/boto3-1.18.10.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.10.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.18.11.ebuild b/dev-python/boto3/boto3-1.18.11.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.11.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.18.9.ebuild b/dev-python/boto3/boto3-1.18.9.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index b4f657ef9c3d..95d181af9509 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,6 +3,8 @@ DIST botocore-1.20.104.tar.gz 7883624 BLAKE2B 4fb4c6abff5a2c3d3e19b11576e723f15a
 DIST botocore-1.20.112.tar.gz 7917776 BLAKE2B 6a5ebf3d32c505ec2c1fc4cd3d97aa94c76b6206dda6ba28a946dfdc9973073019389c05d1cf09a0eced701fe86a9b8a292835415c0b1ceea75959a3186f65c6 SHA512 4b36367ffdd011aeb7654fd5c52c38e95bae4c55e5af85e38b0764140539ad1f8b9d75b0c7fd1009fda8d005ef4b17673b06f85a76b52fcebf05925297b6bbbf
 DIST botocore-1.21.0.tar.gz 7955550 BLAKE2B 7e68375d07d858dc2071538c2382d8693df23fea5326938491c492abe55c060d0cdf98698cef9b06dac996a59c907ed780e5baadabbb7c10d5e41efa84c4750c SHA512 e56eea7f3c4f39f51ef1d53dfb42fd5d601167cca7c868b1cf2f291732a8cf90aaa874760f262085439df5726c6b610369a325e863533b593aa708fd901398a1
 DIST botocore-1.21.1.tar.gz 7954248 BLAKE2B d6e7a71d6dd90ed0fcf0dbab3182dcdfa4072e65a1f344d44ac30abc829ac6c546a0ebcdee51f61ae65008550acf65052b49530ae3b3a62d81af222e6e8a0929 SHA512 86d4b4159a96426e7ab853b06564604fd9729011199ba691f6204a7e5f52d9927b93511b73cfc03b65bce706563c6d50b577d85d0de0e50fb5d877472d8326dc
+DIST botocore-1.21.10.tar.gz 8001298 BLAKE2B bbc762302462d9eb5e223245c8dd2430e6f190b643502d3a124e3831f531f014e49bb54bde768fc2dc7313e5b6ca7c78076a74511d724396370d1f699366ab44 SHA512 8e3c90d24ce5c6ae76376649c1ec191bdca162adfa8ab1b33903cffa9ccf2d7b306efe36b9d81f53f579170516c91c7c3f47a00d3033f5b691f2495b0ac97b88
+DIST botocore-1.21.11.tar.gz 8003282 BLAKE2B a7ada604bef2d5130169b0905acfb1ed51fbbafbb9df29d2ed3e3cbf89b44ded59b0de1baffe46b27b10e854b190517d95a26022cc22145fbeb42c46cdb780ae SHA512 45f66cdbbc66dc74c5aac003eb67569533088486fbd3443077be7d6ecb4fe9b8ba9a9de04b94b44fe02167f7261fc9675b7cfb8973de95510d4401a237416713
 DIST botocore-1.21.2.tar.gz 7960118 BLAKE2B 11d2845e1846c03591625a95b21ff6fe1acb1448414a5f09de1d427614e927d974fafe5dd5d4f195aeb2f3b86d60822a8c73f1bc532bb45c85be8421f92eedc3 SHA512 501f059518026bef10fe933d20a3348b4140cff9ef1af38e17552aea8698179135f5271604e988f53c215e3a13158d7784a49a6b56c0d4db591f99dac9c57ca8
 DIST botocore-1.21.3.tar.gz 7959023 BLAKE2B aab15319b9f36c25ee88f2bf0b2efcb6bbffeac1b4e38dcbdfde3a947f702016e77b66c4b125ca2b63614223109fd793da68f9ce1b1d14476cdd6a3fcb10dfce SHA512 5a8ce8f612fd0e1c68a75223dda95673f72159b02a040d1a71920b7e75b3aa9d14589c33a52970182970a353308954e8cd6d5f97d374e0e2ee2cd40e0dce786e
 DIST botocore-1.21.4.tar.gz 7964960 BLAKE2B 71d55b47633aa658a9dc921375c77230a6ebb89460d9de5a9982d730e03247972476400dbcf292da0a885789860117c1abc9bf803c79547049b242feb8755d15 SHA512 4a36e5870d9996973e2258f2e6afeb7381ac94d14075eaa9885f6f89afb87fa5b4461b02ab234b4ecc8e24630434dbb839e8ad30f622de6ffa5402f872f84a97
@@ -10,10 +12,13 @@ DIST botocore-1.21.5.tar.gz 7968981 BLAKE2B cea2c648e5f8d6f99bd1f11f430511abdc41
 DIST botocore-1.21.6.tar.gz 7974218 BLAKE2B f3391b620a21d04712e1254c4e8ffc090956bc1e0a41278be2c0e02a659ada639af2cc4e94bf607492164a8425988c16e8b899726fe645871b1cf6d1f98ef04d SHA512 1a74f2450a1c57a61c704550c0f08fd518b8d4fc463acdd8622ca8bf7fa51293c52c54999e1a1d563815cb0fd35585072753d623739a6738367b0bae94f655b7
 DIST botocore-1.21.7.tar.gz 7977343 BLAKE2B 19c5bf5de40ab131585e30bb85486fcffc3428808811b312b33578174ce31a691f4f4d955462120f05d2aad2cd5e5772789704eee641760fb67099aa3cddc9b5 SHA512 db1bb36faa6857a1cc717e5d591954415bb948178ee2be90ab9c32c11b1fb45c5b5aff87dfacd907c2f11bc7cdd2cd4de2ee9c847fa8cda4e5f0814a828b1019
 DIST botocore-1.21.8.tar.gz 7996323 BLAKE2B a0c21ec64fd97f011d2e986806b0a47f5f5941f13b7a17fe84f4886a98e91629c641b9e39c2040105ebe4102d8a9c84ebaffbb6a0bf9ef8c48be80804863d441 SHA512 178914d04d1abfaed5fc7e5225e3da54706608d8075298e3b1d7ca4ef09fdef11ee4eb4b7e2f5eb60ab1527b2dcd0c46bbd6b987903be8959ea16e775ca9b548
+DIST botocore-1.21.9.tar.gz 7999524 BLAKE2B 23852915e20610691bc95a24023b2a06002215bfec1a74bdddaf11f0490ef58dccaad70428126c19928e437b1694a0146145257a6aa500ab690e10490a6e857e SHA512 2053d208e9b41139781fb4a8296c169ddea525998480a2dc524a615d9f7119909ad640acbd2d14ce02e2e3218d3faa954b3b92985f34a6fcb46ad6cdba787277
 EBUILD botocore-1.20.104.ebuild 1509 BLAKE2B 216976965e11900e4463d04fee34937d1da17543d2d8e8c79bd929fb96b81fd4e9ffcad094b5a7f3ce2c6e3924a26979247a20e9d5e5b7ff87b4dcb22290d4a9 SHA512 9f67abdc284f20ffaee6d7552b71da64b5e0dd3237fb52e938f99e9e248351f78affd8ebeee2798663965d25bf34adb444790903f04131fa46285f51aafc5acb
 EBUILD botocore-1.20.112.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.0.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.1.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.10.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.11.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.2.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.3.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.4.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
@@ -21,5 +26,6 @@ EBUILD botocore-1.21.5.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a8
 EBUILD botocore-1.21.6.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.7.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.8.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.9.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-9999.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
 MISC metadata.xml 611 BLAKE2B 03764517dd63550373d7be154fef3a5e3a7e55abebc6ad58011b707d1e331c362dc6e13f6f1a6831827f8bf68dae027870abea885d8c5b3d8a64fcca4ae61fd0 SHA512 3532135859fe085e3fec2c04e0f5ab0eacb40345730178729736553f025037ffe77033d63407b4097f65cb31d1f300dd56b777d139630abe2f2f8f9991e0bd76
diff --git a/dev-python/botocore/botocore-1.21.10.ebuild b/dev-python/botocore/botocore-1.21.10.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.10.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.11.ebuild b/dev-python/botocore/botocore-1.21.11.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.11.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.9.ebuild b/dev-python/botocore/botocore-1.21.9.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index e35390cd6ee8..6ee545a37e28 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,3 +1,3 @@
 DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
-EBUILD charset_normalizer-2.0.3.ebuild 634 BLAKE2B 3f6739ea98b87f7e0eee01071cfce5d3d767bd046e77e73738ac18d575b3179adc943807e413158a20b78f0671ff6b8a93be53cc6a5cefa6d0b271f0e2280124 SHA512 144d7391f6262631b6088cfeb2e04a23ab4200e6124bc7e02d45ba3379ced65ea31b113d735a27a35a566596fb62eb7031b186095b24c8c5490a1caca6e3f084
+EBUILD charset_normalizer-2.0.3.ebuild 640 BLAKE2B 3f1b34c36268cc935c4899d905d2e412a780285d39e803e6909afa9444354d5adcfc00d8b70a9aaa89fd3b15997aab16ab867de41bc4bd96e189a9d092aa754d SHA512 5025b53c31549ed1936afd7b48c0be04bcea91333156d341be769e590fb242f623632ae961e2705554de48a9fe625ac7cabd81134745b6dd92bb744743b2834a
 MISC metadata.xml 364 BLAKE2B be46c29b2fa986a53e4abf38f4f68a9882e3a01c0d3c524a0935a51a04d3e71d98548401ae96e84155c943dc2baf127f28e0f24d764d9e4cea466e2ba010f432 SHA512 bca4661b93af7b085ba8c71ba91188a984336c30467d4e38a7856c2522f83ae6dee122e3061a9b434a218bcb11e18583fc02b85c7629dca5cfbeb6aecc63bfeb
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
index e1fa87993f46..89687b00b3cd 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index e29c7feea184..451d41e69c3a 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -7,4 +7,5 @@ EBUILD clang-python-11.1.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a9
 EBUILD clang-python-12.0.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-12.0.1.ebuild 927 BLAKE2B 1e0d88215cd7bd7a7968fb00e5c91e10b894750a4ec77a4413d5af19bb93e422b59204e2f62b90ceb628846fede7ed534424640974fe9a3e2d881aec0ccca02e SHA512 11d64eab9433584271e4c97f7af0a9e2762126c3eefffe0f19e74ffdfadef6852aea59337c2fb604daad3c8b3495a3ee2e1a015c20e14eef673e2dacc8304fdf
 EBUILD clang-python-13.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
+EBUILD clang-python-14.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-14.0.0.9999.ebuild b/dev-python/clang-python/clang-python-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..921f7735340a
--- /dev/null
+++ b/dev-python/clang-python/clang-python-14.0.0.9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/cppy/Manifest b/dev-python/cppy/Manifest
index f33162935492..14725fcc6b92 100644
--- a/dev-python/cppy/Manifest
+++ b/dev-python/cppy/Manifest
@@ -1,3 +1,3 @@
 DIST cppy-1.1.0.tar.gz 11777 BLAKE2B 3bdeba7ee9bb478b51090a52077abc44ee74f72439c3cf2bca898bfc84bd97993bf4dd20d641a1952e2738e3f6b89434f7435fe0a5a8302f91ebef9d02729686 SHA512 9ef4db580c963219a111ab10bc263cdf2c4386e27fce8ffe5c785fc7e8f6c6b60cb23ce918959c6f17194fd6977cc65fa64d167a0b62e6cff0cf662154bc734c
-EBUILD cppy-1.1.0.ebuild 464 BLAKE2B 68d3de294544293a5b388fa7a6f00965c457fd5a3835e5684abb4a344400162831eb668f976d9532722a51cdd3cdb2fd0858fc3944322092b5d9b0030fb4806c SHA512 9bf7a15fc75cf75d590fa14e30e92aa4f282810aadd02317c3176dc5993f327b037fe458b3601c39f093630158e5db6e4007ca5a39d3f7747cb08096ded3b625
+EBUILD cppy-1.1.0.ebuild 470 BLAKE2B 5390ddd7a96d65c63304da3b2d3ba9dea929bde8ab252d0320fa172dcf90232e7da3c69f850ba86d3872d5bf8a38a8db1ebf5efe405a1b4f00b3ad8fa1384176 SHA512 80d0a7c64f6af7545eadb34bbea74c6ee6f77db4b80231e408dd6b08bbe72cc64cfc61b70f8b7ca3fa506e1fb1fe213fb441973dbe4e678f840d73ad6f269979
 MISC metadata.xml 601 BLAKE2B ea350b20df37a65fb695429ebfe7a7de8fe2c2611b20aed100aee0b84693363d1c3f4d16eec0fc3df0de63dfd79a4d4b89afb175698888fe64c847962575d6f1 SHA512 a8e798ad3e49b58041127be01d4256d62400aaedbdd006a1294df67afc4624abb8c55a847c7f9e75434b1b193a882902685d53ae183b415cd3bfe54dd4b6945b
diff --git a/dev-python/cppy/cppy-1.1.0.ebuild b/dev-python/cppy/cppy-1.1.0.ebuild
index aa26f2a21d07..f3b11ee5913d 100644
--- a/dev-python/cppy/cppy-1.1.0.ebuild
+++ b/dev-python/cppy/cppy-1.1.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cycler/Manifest b/dev-python/cycler/Manifest
index 95aa36137cf1..28a1031083b8 100644
--- a/dev-python/cycler/Manifest
+++ b/dev-python/cycler/Manifest
@@ -1,3 +1,3 @@
 DIST cycler-0.10.0.gh.tar.gz 21672 BLAKE2B 68b48e8359210845e35e4fe2cd1f48b48ac2c1ce67196fd9fa1e3a83a3bf15d6889a727bf62a65097d0975e93e660550084ef66a0c3a3de98ba04d439d29965b SHA512 685231d455dfdde70eb71415dfe561e07c34579d7b31ef7197f4c1441301635b387fec903d610b35406b619264f4c0cc616562de8f02b8192414c29274b63c01
-EBUILD cycler-0.10.0-r1.ebuild 631 BLAKE2B 668c8865bc8b7340ddefc00e5f33d1770e66be0f93fa554ea90f3ec0039277f62e6c8b30ba37a3729b1b5d08e69bd0f0bf8311cc949194edcf5381e930bac46a SHA512 07998a5cb1a38bdd6dbbd6c555ebf07f4ec351d88c4fd044ee4f901963ce23910d45882c37b6d6265d81723eafdfe8c0e584f173bd6c5ba2e5557e534a3b74f8
+EBUILD cycler-0.10.0-r1.ebuild 637 BLAKE2B 64fbe0475ec182a49c0be04761b3ee0624899805df471f58e0ece86a529b3220de411112d736a319f770745a078d34729c369939b07691ab48342b52f32f9a36 SHA512 857109330cf5acaa9c1206206e528033b99d5c8ecfa36641f27760fc66c94c1829fdd92d04631db2183a63a2311a45893f9a148eb6a595de7827ee473ecae31e
 MISC metadata.xml 366 BLAKE2B 67803b534c2f9bc0266a5178178da1e400cfb9721c63d8d7103b6ee12b7b76808a570d1748d12ef55685df108d7dfdb7ff632e63152c4cc0e65ccfa442ae8efd SHA512 43c46a3af153f4b58f305632cac2a699eccc74417ea468b1f85810ea90e843979a9c360231d6762acfb1402270ff27491dd0927f762143e354925637dc24df5f
diff --git a/dev-python/cycler/cycler-0.10.0-r1.ebuild b/dev-python/cycler/cycler-0.10.0-r1.ebuild
index 1b7aa639d8b6..aa0edad5f9bb 100644
--- a/dev-python/cycler/cycler-0.10.0-r1.ebuild
+++ b/dev-python/cycler/cycler-0.10.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cython-test-exception-raiser/Manifest b/dev-python/cython-test-exception-raiser/Manifest
index 0925b4effc26..d5e6ff414609 100644
--- a/dev-python/cython-test-exception-raiser/Manifest
+++ b/dev-python/cython-test-exception-raiser/Manifest
@@ -1,3 +1,3 @@
 DIST cython-test-exception-raiser-1.0.0.gh.tar.gz 4273 BLAKE2B 028c3ded07b137a186055b4fa8f9d7306585942ad7ee022a37b3df065dae5d2110d6ddcd874f3dc2c687f10da1122329194b817b1a78a76ff8de557997ca2a19 SHA512 4e1c5dd65a7c493cf43213badfcaaeb0df9c4774cc6f90cfd437612126893e7831d218c707599adb97dbee7ebaaa2372c796c634d75738bd06328735eb8f1189
-EBUILD cython-test-exception-raiser-1.0.0.ebuild 628 BLAKE2B b98ab43e36fe4ba5e5859f35a30210a05659d9a00a880892c96520fd6d9027be6b139398ec7c52fca4cbf6a1265e7579c9ad100a30c8f12a91ae3ce04b3d44a3 SHA512 6eb5feda97615b134551a3191a4c31c7a2df633f93563bdf572fa3543ea6d2a7ccb34447cd95c4831c43e3e10c0367e94ef75914f889c2c5747ab564d82854b7
+EBUILD cython-test-exception-raiser-1.0.0.ebuild 627 BLAKE2B 49c9ebab82db4fa3b37addc9188b960e4bf4ac883b052e59922266d13f3c299baf7657a7893b0a0ff0f94a93b1eb2580ad6bc16877e8b3bfbf7c0fb710cbe888 SHA512 edea9eebca886422f75f7c3f2f639cf9845190f626cf6401bbbb012391601cf7172b1d337a86ceb0581fa76bfce4901ab88e61636fe37a14232ae7b1727d50a2
 MISC metadata.xml 385 BLAKE2B a99aacc4e3a21f41dd413b185fec8ac393e1c1c2f3897fd7173d717a72b056acb8362a0b5c9b6028021365678f828549fc0b711e9697620f50f9d66ff83952d9 SHA512 1b978c0d50c3b60bdcba9bf93d6da041d83cc9614d4fc6b9837ce9797b0c251d2ed08777f7bc0877d98a9c76b8f8ec744f7f171cbb663aa36e55e2e6a7429fd2
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
index 7b917c4f775f..ad11c7efe254 100644
--- a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
@@ -16,6 +16,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 98d5e0b8d3a6..1798375125f1 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,7 +1,9 @@
 DIST dask-2021.6.2.tar.gz 3725731 BLAKE2B 957cf70c328462c87eb52bb2fe3d471705ab6bbc233badb8d5ba93ade4b7caa05e47399f26f37b69213df16e76fdf8f042a082a0d2d96797bca836311349a6b3 SHA512 2949a0a028d08794936faaeeea3b36c97ac1492288519efa0fd1e6bbb9b5b52b730657b8b342a47ca0183d98e9179836423847670fc12c14be0890daa4b773b4
 DIST dask-2021.7.0.tar.gz 3730549 BLAKE2B 8f76648614adbef8ca1feb01f5b39d4ad217eb5178c4b7ace72d3764062b172d83b74e9fad5eeff0a745025e0cb2bf47bdb14beb03b1520130332ece00c3e318 SHA512 3dbeefe08af6536f19a03ead69372dfa7a26eff66d768fa8e238341822136a2314fca0291694ad22bdfe3618a4ed6785d836ceb5cc4231f361d97f0cbba0edbf
 DIST dask-2021.7.1.tar.gz 3734645 BLAKE2B 4dfd98c72a54712dc4bee97305811bf411bceb5e5ad60d6a82e94b785be51ea8e2ea6ae853b85f45a9765f0220f4c35b526582f1587932178d53884df1d697d7 SHA512 0b5ab5e08503468ca26ee2b0e195979055c9fa439e62f1c47e73521856f7ddb2fa608457cd1e4a0edcd3162254d404ae4995319b73b142bf6bd804c6b63b3f22
+DIST dask-2021.7.2.tar.gz 3739041 BLAKE2B e32389a5d6a47a9c0f741a33d2f9aeb8887c951d4a53ad7e2bdc5d7007e2e7b8db9b639b95725bb70cfdf1f3568aa2541c7f46c5c87cbb50b5433866b7f0e870 SHA512 029832ea2db342cc63dcfc4e5a563e6e92f5d26298ca19d7815548acceb8098e94b53acb5df1a6923172e7014b6235ddb34921f2855701921556db83a9411afa
 EBUILD dask-2021.6.2.ebuild 1128 BLAKE2B 2302fd9867ee06d58d1707bcb06658a23e633041974b604563859c5a67b084514e6fba886182dd3f721991f33d9ac9010a2b114b90e7f91fa192af88507fbeed SHA512 b378c693d991fc814d31d2c93541513d18bd79fb7220acbad444e6aea44295962e33f4249d84f7db25b66bb22a6b554abc76428a20e8680fbe87ae84f3c272f6
 EBUILD dask-2021.7.0.ebuild 1199 BLAKE2B 52cfc495d9df0fb9d3c6477baac98f8e8eddda366c79d1f83cf0c3c828418e436bd10b1aacb449d9a76f329b63b8ae882840105fb65e3429e3e6f0ef41657bc7 SHA512 0e9047e376151ddf90bcc6de0d46863d703472f67889e50c6869795be40fd163e7b728d24c870ca4d466e0e7a6dcda65beb6f7cb07caca88f951683a55896594
 EBUILD dask-2021.7.1.ebuild 1246 BLAKE2B 98fdc9b9785d6fe9c0348c9cdfb1235e7981e0711c105da79e2a073cb393c8ed84847ec3ad9d0524ccdd9d841499e1f36867e3c6b08bb0c729653d1484b8f206 SHA512 c9e1b73ce128af0f63faaeb04ea8b74e9b6000713ce977aa4ae6f3eaf55342f1a986d2d01e6ba413b1dc47762b601aaf8422b318866709aed75e06f1f4820422
+EBUILD dask-2021.7.2.ebuild 1246 BLAKE2B 98fdc9b9785d6fe9c0348c9cdfb1235e7981e0711c105da79e2a073cb393c8ed84847ec3ad9d0524ccdd9d841499e1f36867e3c6b08bb0c729653d1484b8f206 SHA512 c9e1b73ce128af0f63faaeb04ea8b74e9b6000713ce977aa4ae6f3eaf55342f1a986d2d01e6ba413b1dc47762b601aaf8422b318866709aed75e06f1f4820422
 MISC metadata.xml 670 BLAKE2B 1a15001a3836bd70c8d539b34283c9e3b19e3a37031de32f82e8b44a09de2031e572104b1dcc5a690c80c55981f0c510325ba700e4e859a15dcd0a3b06a6abd1 SHA512 41e31ef86be6c90bf9846bb9a753d6f6ed3119d0bca3f0b205c9f814045fccf99702ff901b7e5fb1d785fb5cdd5230ba7520dd6e6ae604761af1442e8ec81538
diff --git a/dev-python/dask/dask-2021.7.2.ebuild b/dev-python/dask/dask-2021.7.2.ebuild
new file mode 100644
index 000000000000..a7f474643d23
--- /dev/null
+++ b/dev-python/dask/dask-2021.7.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# require old sqlalchemy
+		dask/dataframe/io/tests/test_sql.py
+	)
+
+	epytest -p no:flaky -m "not network" ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index 18c87f4de46c..075f59eea52d 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,3 +1,5 @@
 DIST distro-1.5.0.tar.gz 54340 BLAKE2B 2a5bf45cdf41b9772a2e164aebe96a4e9952893b7462935938fa4939704c8dca67acc3e0a52e53d8722aa4405abdc7ad2c8d600dd397d1243bcceda4d5ceeb75 SHA512 14831fe1355e9ef4f58f273ce4a548a3fe438e95466b4b4f596b8110da51305d66ed77c2e40c3dbfbcbd1a66c74e23a4d4244c8bfdebc4b49b3e7ddcbff55b8f
+DIST distro-1.6.0.tar.gz 53518 BLAKE2B d60555488ed12658a3129747eed891487dfdf7f16b530b84c44cd976c6dcfadbeb9e20130e5c2eee9c71b0fd0c86c82d258a76498171f4e553c087840903e3b8 SHA512 d30334ed1137c54ddc70e041b75be905b7e13398483d0d92117eca0407d2a7b60424d96fd7af885a2e3ea3676b1aef620e91598a53309ae0da12a360d57ac013
 EBUILD distro-1.5.0-r1.ebuild 502 BLAKE2B 8e805a6733b05cca24d756491f8adc6d0304b0f33861bb98c214dd58e91834b98ab8a1a48c2ce4a6e7acb80f2e652d8eaabff882bfe5207d83ef77ba4bf75a97 SHA512 602a2387b5341f58ecd63c42b86c8b08b3ea6031b3fde5ed57e2d8204f83653c61b82ac16f94bc1ca1ef8a30894a32f5bbeacc4efe685dd9a5e29a7487f03212
+EBUILD distro-1.6.0.ebuild 508 BLAKE2B 1c85441cd2b3ae658a42caf9bdc05eb30d7a1021d40c190cd1f134d751d667a3fce7e3a91c102fbfd41640811ae347be691bb5f23b645a0f0f2cf2d4dba26695 SHA512 0d30def42cdb8c901e558260c810ee39222632c5eb3106101baebf47c4960d0aedf74bcedda0616df6b819038498433234e26b14394d3e4acbd21c28203b4e70
 MISC metadata.xml 838 BLAKE2B 899bf57efe9358f0f33df59ef8802cdb0e9d26c05ac99289b7d3765ddf2a5cb65452874aaca7db3774c76564c4761c4f71ee139bad080cc1e62472794de29b8e SHA512 55cab917a2b67bab65c1fda28693020efde74e905c09d077dd2562c2e78171ab33a2a4190b458deb5bfbeb3b9ed3fd66c61e69cbe569f1640d135c46a66477e5
diff --git a/dev-python/distro/distro-1.6.0.ebuild b/dev-python/distro/distro-1.6.0.ebuild
new file mode 100644
index 000000000000..331acc2c9903
--- /dev/null
+++ b/dev-python/distro/distro-1.6.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
+HOMEPAGE="https://distro.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index 883a1ea9fc11..bc473dc988e7 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,5 +1,7 @@
 DIST emoji-0.5.4.tar.gz 43402 BLAKE2B a7d94af22d09159e23b160300f70372c08c095fae3be45e204e5be73a907cd4ffcbad00aeed4c85ec0048ae1a5fdedce52105bcfc1557217d3b53002e1770267 SHA512 20e592247f8bc9bc0a030181904d806b50768b444b728d074afa58896e258ca664b4983de5c51b7624b585edcd93e05a34b8df722f4d0eefb625ce11fbb63d0d
 DIST emoji-1.2.1.tar.gz 158090 BLAKE2B c16ff949611f9453c3c073d466ddde75f31029fb4ec2160ba003dc94d1857c3d6f1de060220869f76fd94ab11539e7ea4bcff81211b7354c1f0e6bedc131e178 SHA512 b654494aab90c3ca4ec17331ba6504e2f16b46226170e170971f5f86553e025027e23d2e02020c899d5251e50bd8b78d4db3ea1a017b4eb371562595e4a9a5a7
+DIST emoji-1.4.2.tar.gz 222120 BLAKE2B 8771c7289a41fc741c54b3096df4ba6099dfdc3bcdc72282c93c565376e8fdb2e5939949a206cb01bfb1f2d663f840cd958e4d762f9da45639c49e52f3410947 SHA512 abf7fcaa922963c990330ebb6fd26c1613ffbdcbd6cabdf44e977b54df4b9c80c30e70e0ed0a9d9311c2fb95423df052e4e9c22d95510eab10eb3754084622ed
 EBUILD emoji-0.5.4.ebuild 373 BLAKE2B 3e20b341efe60379e92339acdd0eabf663b4fa2fe47112a05f53819e97ee81f124f58e44edc31504514667f66b6a4c61a8179d4b9fa168a1cb9dedde22c9feed SHA512 17287f2e2a65e0967a9dbe636c7edda177b8719d462a8fb632f238e9b5e845092b491e198dbda18c11ea2d6aee09419835afc7b8ebcfc1c4ca93cee439bfb167
 EBUILD emoji-1.2.1.ebuild 454 BLAKE2B e5a63d5a5ad79aa68574560dece498bd3d2d2aab19e00d4e46d691c6550eb478d0bdad7c78d72b967aa1de96573b626a8d5bdaa94690d8f0d8323c64123b3356 SHA512 6bd279ae8a9581894a72e4781dc4d8843d5a41dd9899e21dc0fa1d7576f90395913bb026ef18387727ce0fec61a8a1b007777f774bdbe03a877f538e29497c6a
+EBUILD emoji-1.4.2.ebuild 454 BLAKE2B 8783d79b1d000539bd907857843064e1704919ae9b8bbfb3a4d0de5a0bf738170bd86a3c637def670ed22485c6e313dbf2ba0b8176859fbd07da550743198e18 SHA512 f770e6c666137c5fb52040f329d9156670e442c1760c4f49fccf454703361bf1cc9a3f98f73e0d39d0c2a67eb5d6721610d19ae756616a665b7a25e81f3d0083
 MISC metadata.xml 395 BLAKE2B 993d498b8834fcb8d9bc9532a7b4083fefece581175a026ba8a291d4aa95d540ea96fd40e069d11ea1ec35affc9cbe028892d1a2727eb25c1b201c754e6d5276 SHA512 5225011a919d564e2e9f5d3202fc67abaec62c7bc01e8367f6b1595f14eab2f39849e41d407efbf0a31ab8470df46fa71d56816c7a2fee207750fde09c89a70a
diff --git a/dev-python/emoji/emoji-1.4.2.ebuild b/dev-python/emoji/emoji-1.4.2.ebuild
new file mode 100644
index 000000000000..b814c446ac82
--- /dev/null
+++ b/dev-python/emoji/emoji-1.4.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Emoji for Python"
+HOMEPAGE="https://github.com/carpedm20/emoji/"
+SRC_URI="https://github.com/carpedm20/emoji/archive/refs/tags/v.${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-v.${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
index f75407b0b79c..6aeb2e9266e1 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,3 +1,3 @@
 DIST et_xmlfile-1.1.tar.gz 12566 BLAKE2B f8f1c95a523433698032c79442b8bdf725717b647d3f65017926be3c12b78890528d5cde99c13e219d99f20e45ee5db872a772f88e451974435d565bebb56923 SHA512 0978cfa08c56b6dd8b3bed020a9f48c286c5bbcef5ac46f0cbf37bea0c1fcc79c6688f9853da68cbd9df4c6268e780fd99a172907cf900bcb3faf2f6252157f8
-EBUILD et_xmlfile-1.1.0.ebuild 675 BLAKE2B 340454cb74a8d7b068f2133695cbdb2879766b0877d39c47413b03d2dafae7759a977aac881cb6798fe2ebf5fa8f769f520bf6774000614789de16c453f53575 SHA512 adae9647a8e4ff24259ed7689cb300c7ab0135cf9a3cc949c03e223efa2e916bc1fc069b33eec7746cb62a2e91ef3b14ea9685b13999e356a06b0a75876d19dd
+EBUILD et_xmlfile-1.1.0.ebuild 682 BLAKE2B b7ad844d7b5ae6a6732f67d5861868c78b733ead5058e681f6863a60de077961b02d3af2b9f8a090cd46e7067d1ece6a01b98686aa73ed8778c4e50a051a8174 SHA512 cf299c5fb9e644319fc95a45e275553bfba3e92b31f9ef38a45026fde501a23b1475b071b09682789cac07de130c7d4ca0b85957246af3e6d70f6b618aabf573
 MISC metadata.xml 348 BLAKE2B 888c03fe50adba6f74323c04eb0055b6399303a1d13f73f1faf432522936ab416796e94acca3ba59422bda48e277829680921875fbb663347a34aaf2ee02ff2f SHA512 59f01b675ab4d621f215e72b8e642bf4e2931f78679d9721d96851f5c0a1ea7da4ec579e61aa2757e398c7789e747324696371f1e912bac64f1b9e0cfc0aa823
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
index 375cb36404e5..fac52c11bac9 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index 214482d24e4c..46a93816f6ca 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,5 +1,7 @@
 DIST executing-0.6.0.gh.tar.gz 330731 BLAKE2B f6a86072907c5140aefb45beb46bcc8c6e3e242e2e821046e59f0eafe1d5c16efe3c08dd1b19b1ce85388fd9cc4757bfe586b95fb490a594cfee4f5e69b5a0af SHA512 5d2f621ff4cbfd55ac43b555f771b129ade5d20f882f4e5d6a060a1a099abad73cc4128c9e6bd32fccc40c4c85c51c28b3be40ab16f163e1ceaaad07f1936ab7
 DIST executing-0.7.0.gh.tar.gz 452550 BLAKE2B 9b3bdb49b3b00ca17952db747d3f0f3995e8dffbc170bcb2260e7c34ce9e6b0c8e1620be2e2776445a6114add4e2437eaeae8a308391e2c121b6484b5bc6056c SHA512 08ee347f0bcaf04ca2c6010762a6d2d5b054b3590029c55d18d6efae5a5db7c6c5a0948cce9d9684e4bfbfd9ea19326e4ac2c96be40535c0500c28c28ce81e07
+DIST executing-0.8.0.gh.tar.gz 494306 BLAKE2B 37ce7c743380dcac85e6843e8ee708c8d876c5de883e49786da67d94dc9a7bf983bb36278a823ddb2bc9291e7219125cf870fac8c0c28979a4b49e951410d5e5 SHA512 6f88052f61479c5fe4aba1925e90f3daea3852f636c5c17d94a08dfa4de909fb3187650ff07c1dc66b4b3bec4a04cfdaf4cfe0c37903f67b2d716691d07a93d8
 EBUILD executing-0.6.0.ebuild 967 BLAKE2B f3d4b98de91121ccb7a3f3c0117aef17c0d78bbe398953001dc67a950b3024c9dba6598d4affaa66b75cf1579101c3ddd3c2e00ff4be40f10234d6590bf0c043 SHA512 5e3f463c6be4d518e075e60d563ff1ae13f73616e67060f47015ff156edda5235bd394d428767963f156780fab4f6d7a19370645a760ad8f7e18f79064c49f7d
 EBUILD executing-0.7.0.ebuild 930 BLAKE2B 1d103318ce536b06e88050d4af7f692809a474d6bd39fca706b822496f1de9a1a2a4bc64fc7385dca836d36851d2c9a045ce0cf48c90b14b6f62f9c2701f5699 SHA512 6b210a9c78b7b01a3fcbe34f63183de9818537575f05d19cee2560e2486d3ec948d4fd52a016fba055913992e37a767cb3ab3a74d959d0008f8141013f813e35
+EBUILD executing-0.8.0.ebuild 931 BLAKE2B 62c54b8256b1420dfce5bcec57365fc8250639bff76e69132b5a2156d5d0297809d97ce39ec9d1eef137591dd10edb04a4b051437866451298161a397c3b9503 SHA512 7d5bceced13d74a7341d3e61319687d8f25e4a65bd890fd2305fc4a00477c72e5e9e18fe7b95c056332a25130b2b0c70ba9f704133eddbbdda391fef3c72f8f4
 MISC metadata.xml 350 BLAKE2B d128d36a837974853f5e51c64b03ca8eb749eaba54e5049033153e1c3671eef5a91490855820a47ce718f28e2aa45dd9d26df75e81fd923d7f119d546b6d9b61 SHA512 ff4ae4abcc417476ba024f7e9ff8f8de8c57d70f34c36bd2a4adae498c01489c16bf315ff174616ac9d65de3431983c35da66edae60668c9e526ada2a026555a
diff --git a/dev-python/executing/executing-0.8.0.ebuild b/dev-python/executing/executing-0.8.0.ebuild
new file mode 100644
index 000000000000..e01cf6c3100d
--- /dev/null
+++ b/dev-python/executing/executing-0.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Get information about what a Python frame is currently doing"
+HOMEPAGE="
+	https://github.com/alexmojaki/executing/
+	https://pypi.org/project/executing/"
+SRC_URI="
+	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+# asttokens is optional runtime dep
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	# this test explodes when collected by pytest
+	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
+	epytest tests/test_pytest.py
+}
diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index e949b068feb0..8665a8007893 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -2,6 +2,8 @@ AUX flit-2.1.0-tests.patch 287 BLAKE2B e2deed39a206096f1c4be29678a93fbfc7dabd7cb
 AUX flit-3.2.0-tests.patch 445 BLAKE2B 313f975352b67a1dbc5c582ac854dea1625f1819fb1ae147d3fed254dddf69e416d79fb4d787f9deb48d2992d4deea8bfaad681c8a506959a142b8e065a73adb SHA512 737d97e8d9b2c1d1c9a5ef6d6ddd719245a3550092034097899c1917f99604dcd2c5b183f51a7cce8f70c98df9c679adbf3d29068782687018cf085e3cdf931a
 DIST flit-2.1.0.tar.gz 106459 BLAKE2B db51d8cc119ae8aa5f8d0ac1655cd29390065567391cbdf06ca7dbb98a79e96a6d8f318273c2f9a58aaf549090a903360701a844ac071d15304a21ea54052a91 SHA512 0fcbfaa1e5e83216a5c98cc87b0a8f2aa17e2c184ec3f09c7dd0dd5e695311be62344ac4f101cb71f87390513496f8c1152a2cd8d7363202f7696ee002f07a55
 DIST flit-3.2.0.tar.gz 115192 BLAKE2B dda4b9f5b56b9868d737516841d7fc49c0e97ef8a71f9f0628112f68c3dadae89a87aef56cebfe8ec3762af5970d206fe462add146d52b3893fb8852fd7f9625 SHA512 1db7c4118fe1d70d1e318db3bc282747d6cc3f3b626ad68420fa056e585caad9ff0a3f230e17c919ea260ddeb6330effc4bbed8b30d11ed7b27e78d9d7af0445
+DIST flit-3.3.0.tar.gz 117809 BLAKE2B 8ad74f70406e41b35b44886b145b52d83fc30d0a1395bf711807da2ae3974ae8606113e4bcd556694854c48c8c01c3c03b4a1021c7cc3e33cce0e99a5abbb9ea SHA512 904889298aab581640e8323fd68c83d753ea97af0ed1b8f438f192d84d09ced83718440a03d23864885fcf966de9665c3046f0f3a1b1d4170b2decf8430ff006
 EBUILD flit-2.1.0.ebuild 1417 BLAKE2B 070718c185f263ebd450cee23d6ea7cb08a9c7c35638e07f2725b66f54cb201836ee2c288153baa9b0723c129fb82daa469f0035731e0cb870f897dc449d8a48 SHA512 61ca338e64c5537a25a1fd326acf55d31eb376c61d16af2403e8a77a7709951f4fb77bc63c9264a8ccaa3a68f8a6bc7be470d126994ee0da06c9c79eac6a1b0b
 EBUILD flit-3.2.0.ebuild 1209 BLAKE2B 651d171f9c9b79aaee9b42486fd4840a78a47b04a1e9059eda2523c59cbe24f3e9870438d68cfbc640f3e5d2e4db3415d4d952eb2d68780f150b4a0254028c41 SHA512 1ec0cfaf96533b12d77e76b9a8486699c7ef03e7f936fad09e1e3062a269bd57f070f9c92bc8d0abace09cdb0732bc2d7a6c2efe6d8dbc8df77ee66f747f7be3
-MISC metadata.xml 382 BLAKE2B fc966604e8ce9f4f1d09745dfcebf3f5ca4ef00471079c13aa04c52b31d2cc84512a9509151a7c96a216dd80368c5d00e2802ba0c8bcbbbf386c2bbde3ee82b0 SHA512 de756a5fab204417b2a52b90ca02e9b38cb4a261ee4133e2e986d5cab06fb82172e2f8d2bf8d177841a4dfb24af45e3ec39ebdef7075fd9c6daa436d1c481f1d
+EBUILD flit-3.3.0.ebuild 1004 BLAKE2B eae1dbaa853c8d38357fdf49c1a8ae24b07f92dc56b018af0cbf890a9c3d8b854e05938b4228b0321432d58d72db1245ccd33a45e2e9087868fb2f44e3b0ce9a SHA512 ccc12f091880645c53c0deee4f40b95a6acfe5ea3bd94d09b099fb5107077d1d4386da1a20b6e8cc6129c39b828e6e8218fa3f0bafa180d2ccbec3d34d5d020b
+MISC metadata.xml 471 BLAKE2B f1df27e29e20cea6b8a8ada63b3cd6eab978061069a6ef9aa3857ddaa77d3f0cab683cd94523f280656cd953fc2c29cbddc06117d464fca0dabf177c2bb95471 SHA512 e758a665a2252c3865ef4dda41238d47bf631568a7536a86fbaae6f65e347afa6aca1e6e638720d3ca0fad46118cd605d4e813b2ade56744952ff13d98c91fbe
diff --git a/dev-python/flit/flit-3.3.0.ebuild b/dev-python/flit/flit-3.3.0.ebuild
new file mode 100644
index 000000000000..cb64bcc56a9b
--- /dev/null
+++ b/dev-python/flit/flit-3.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Simplified packaging of Python modules"
+HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
+	dev-python/intreehooks[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests_download[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	sys-apps/grep
+	sys-apps/findutils
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/flit-3.2.0-tests.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/pygments-github-lexers \
diff --git a/dev-python/flit/metadata.xml b/dev-python/flit/metadata.xml
index 277c51bf2044..6a3a26427a66 100644
--- a/dev-python/flit/metadata.xml
+++ b/dev-python/flit/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">flit</remote-id>
-    <remote-id type="github">takluyver/flit</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flit</remote-id>
+		<remote-id type="github">takluyver/flit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
index 320c6ef2e362..7c548477d7ac 100644
--- a/dev-python/flit_core/Manifest
+++ b/dev-python/flit_core/Manifest
@@ -1,5 +1,7 @@
 DIST flit_core-2.1.0.tar.gz 22978 BLAKE2B 87cb5ced56666eb9ae4963628864b66c77758c823b34712770a61a52cb7916196c0d6f51e7b2ad9804b853f27a257966aabef7dd9c95155af8e76f5100b1c9fa SHA512 dfc11cdd62af367b56773e5e0b28763554cd27a272a040a5dd35c8fae4f1e6695b2e2b15b6e63f6aa52df9854874eccc31f6eaf5b349ed85aa33cc5e1d2e1acd
 DIST flit_core-3.2.0.tar.gz 27417 BLAKE2B 8fe53ee47ce9b850b9200f2c1c4c88e3f7e29257fb1c488e3eefe79121634ef4f272db7e96d9621962de2e576da5b684c64653475ebb702bee313564b7fb41cd SHA512 660b787f0a4fc85d8d893087369b378ba5583e1dad82feb8ca3737e70c8c0a5ab5d95a38b7d3e9edff481d5207e946f6e6c7e60f22f96a1de0d2daeef6f16c2b
+DIST flit_core-3.3.0.tar.gz 26424 BLAKE2B a7237b51f16ed4158d5f09cbe92ccee7cbb3b19e67937028e86f4e1c9d58c9fe9244ea6337bc7c7c5bb29e204d011ee95a6d3fbe596d728ce66f1e00a830fb0c SHA512 5d7b1a43a9d9a7c0cf30b1f73d208963ae51247aec2b9a91aad6412afe781ee927ddd82ecea6057d36ec18af917938500f518845206ec150dd6b604905a1f2f4
 EBUILD flit_core-2.1.0.ebuild 991 BLAKE2B 6802c78f7dc4442fc6ce5fcf7a063c298d45f9355ecf3b682723310535304dd45efcfa72eef7e08a790ac661281312363915ebd193ad7c4416bebc1634dc84ff SHA512 28f8a1dce1600ea80de621ba227d5f1ac434a4c96aded435ccec703537b9584465a9af6bec8ee3991c9ac74552efebd2b82f0b3ba3bf6d5b97a5fad5ba3ff3d1
 EBUILD flit_core-3.2.0.ebuild 673 BLAKE2B 3c799620fe55ed46b8b19bf00201e00eab3cba5b0397d69d046f5682a4c0981a13f2af1668c004af0eec880fda9d113762a9112eb1bc9385ce9611c4ef59d95e SHA512 648bfac710570cc6ae09156999db5ceb71dae0701ba38ec529fe62334b8e1f589a2d747c6c89d3ed6c01eee454a6bafc5b038ad63ba16421156fa8b9aedb6eab
+EBUILD flit_core-3.3.0.ebuild 663 BLAKE2B e24dd502b2f08cee31d9cdab16f94ae2036920d5f6d68dcb3d65e3e840b402ccc86b9f500f01c4142710b5e5ed8755dd93c2d2cf55039ad3869951d881b446dc SHA512 a6387142fb8af6a19ab59e24270b2b4785a4833e7d920b47ae72ee10e68766b4dc00d428ac0f734aff001629cc435dc0ded41ca85357c6ab0a4433a43f998da4
 MISC metadata.xml 494 BLAKE2B 45cafc5e7fbac4425836c2af8bf464438ee852077e82512ef8964af26957337530744a1e65d54904a6c9469c2d9f501e15309daa468bd3bc474de91bab0fe5e0 SHA512 9d48e122ac8238876796333b91c422ec0f4f35b58970ea4d0e806758ca8e47670dc03a266b0f6e6ede0961d1aa88efd7ab6ae9cb90e02004ef2f4017912dacca
diff --git a/dev-python/flit_core/flit_core-3.3.0.ebuild b/dev-python/flit_core/flit_core-3.3.0.ebuild
new file mode 100644
index 000000000000..444e5c0b4fd4
--- /dev/null
+++ b/dev-python/flit_core/flit_core-3.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Simplified packaging of Python modules (core module)"
+HOMEPAGE="https://pypi.org/project/flit-core/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/intreehooks[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pyproject2setuppy-11[${PYTHON_USEDEP}]
+	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index e3a9f87a1243..e8dcbee9c61d 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,8 +1,6 @@
 AUX fsspec-2021.06.1-ujson.patch 1304 BLAKE2B 9a7a7580b7df2967c4d61b7334cb4561cc4a1ce056b9dab3d16bca132545edf6651291c6b69742421208c679b336017b0e92d7584ec24bf32eb26335a451b917 SHA512 5574a57ba32b678a35967c9560831feb993b5462ff986e2b4c9a3a93dfa497ceee206bed88a72cc41456dc255cf8aab4240f6c3fd624822cbe594c6839758324
-DIST filesystem_spec-2021.05.0.tar.gz 292796 BLAKE2B 5d56d860ced1a72c27d2031b7d257a4bcbd52f6b2fed5275fbcbf7088375fde26652f0a003e919ebd3948d5e9833d802304234282ca858a7a2a19bfa11f66aa8 SHA512 7c27a1ad4e21efdcc0f31f91a9929e4c09db7b9421e7bf8d2f485e961f6887a4a5c083f38f8d7b09005a4cf11f55c93cce4617e3dc6c2b241ed20f7847ad711e
 DIST filesystem_spec-2021.06.1.tar.gz 297254 BLAKE2B e360c0780df2ace31a2a7e15f7269f23140ddbc6bd6a1f657cfddbab2b1f285d79a0c88f8d63e406d4a53fd3737f77012eb9837479707a778ab043503ade9d18 SHA512 1d59c2c53b1a4a604ff3762eca8484d7ed60fba98548cc77d7ed014ddf1513cef046ceeec41911cdecd414bdbb4e3c669a3a3f65da08dabf5a70cc2985d06b73
 DIST filesystem_spec-2021.07.0.tar.gz 301517 BLAKE2B 84b189e636eaeb4d3724e1afc44795e83b3ac576ab8640b4fee916bb7cf341c5cd6b1b475616225927693d13f204a1750f913f2e6d35b541fb8ff26ee1019400 SHA512 bea483734e6c9773d93ee93b526c8074a28f0671fbee17b39858dc7a75fd71553ca6d8d5c4e2204446bca3e7c23f6d4c8e94b62ff920e546a2b71786d0dcb388
-EBUILD fsspec-2021.05.0.ebuild 1194 BLAKE2B 0fafb3ea6563b4cab99f604ebe85a5515556a1018f850f0c154feb87f7e3aa7e65a304b4c4d9c244feb36563051706280a09de761a9782f1bfb9db3f2a150b43 SHA512 8b7cfc0266f9ff8a2f60b7853b356b357d98714e43f7074940ff57d2abf7d1e2636bf6498bb33a6ca2b59b9a2d3162471033ef97b9a05f9d5f390c94cd095fef
 EBUILD fsspec-2021.06.1.ebuild 1239 BLAKE2B 10d15d90196fa59f567185337c9d7330d981caff400180c0d0b40e01efe7896b80ddd0161d4460a8cda60d58d91e7407f560a176af89d54098f7733078c73b17 SHA512 b8c7232cb4b0937344908f13b4c5033b84cfc0c72f1c946bd5a34ba31389f41da9fe42cb321b85073ed7f89a7132472e64ff969efdb9a6610242b0b40b6292e8
 EBUILD fsspec-2021.07.0.ebuild 1196 BLAKE2B 6264230bccd83e7b2c525e622fd542d327f3cb7f1592033305748635ae528ca1ea319caf4cf6f369c211bd63df7452b9168ec72d0ecedaf924eb02c7e61d1afa SHA512 7908bd8aa040f87ca4b912894ef1195fbb7c1a2a4f203101def93c762363fc021884e92594c648b1e48fcaf692829bd91bdda946e0c096426a3939fb22f257d8
 MISC metadata.xml 373 BLAKE2B 8932a3ec06759eeef7bb91a181e07ceeef606995e944a6396d21ee6f9b26a7958e9c40f9f54ae27ebdfb9c7974b1ad79963213bb7a5b9bbb282cf35967a1ffe9 SHA512 42e44963570b3b003550ef6f60d1557866a72f362a3d98ca2a7900377422921134e4c8b7bcb6af3ea8bc061b433e4aba96de4fa5643a1f424cc64665a7efd654
diff --git a/dev-python/fsspec/fsspec-2021.05.0.ebuild b/dev-python/fsspec/fsspec-2021.05.0.ebuild
deleted file mode 100644
index 102b4d61d8dd..000000000000
--- a/dev-python/fsspec/fsspec-2021.05.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_P=filesystem_spec-${PV}
-
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="https://github.com/intake/filesystem_spec/
-	https://pypi.org/project/fsspec/"
-SRC_URI="
-	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	# sftp and smb require server started via docker
-	epytest \
-		--deselect fsspec/tests/test_spec.py::test_find \
-		--ignore fsspec/implementations/tests/test_dbfs.py \
-		--ignore fsspec/implementations/tests/test_sftp.py \
-		--ignore fsspec/implementations/tests/test_smb.py
-}
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index 4ff00d63f9cf..16f56e0d4b73 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,7 +1,9 @@
 DIST google-auth-library-python-oauthlib-0.4.3.gh.tar.gz 48020 BLAKE2B bc5e575f3eb7b8b876deb13aaff0d1b900555bcbc609259dc72c9f01f595283feffea6aaaf91acf835b313629fe4c4c76dee8ea877b6ae37c3c01633c63909e4 SHA512 f6fa0e525b0aef6f4359954cb2c8020ee86544862318721d439d153cae3e75527b0e0a312572dc936fab7702da8c6af42ce9242d1e73f48c0a822973e470a4a9
 DIST google-auth-library-python-oauthlib-0.4.4.gh.tar.gz 48322 BLAKE2B f812b43e1e867090aa3ae4fbda7523324a182f6e1eae39fd865d23279b04cde08ee2263b83d1c2eb3555a8db3a9b01869d8148c0e603ba8fe9698dc8d052fc11 SHA512 5b17ceccca24216a0354513ae2a1b14f2aab9760e0ff0f87840a64de85a730a4115f5e44b359093f4ab0a9ec8fea41bfffb7b5aeca833574419ea6021a382240
+DIST google-auth-library-python-oauthlib-0.4.5.gh.tar.gz 50487 BLAKE2B 1ace58a7b3d3aa0c28606c8345ee71550ea6522a07356e6debbdf6097743425c334a1a5bfae5ff60789f8de71b46ecc9ed973737aacca2c025fb7b2d7efbc539 SHA512 0a4bfab32133c3a8ad79ab9b46d087614bf49d4db54a403792396bdc55c378c5df5d31166354925bca6948d409e8a17328c593f892b73430ea7be6bcd8ef1d4c
 DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
 EBUILD google-auth-oauthlib-0.4.1-r1.ebuild 763 BLAKE2B 9831129d76dbb7e468426c9497146d13b2af4b98eb7f18775aaf355b7f478476f60aac5b8daf71003658df719d2068fbc2a2a9c29925d877e6e09b174bdbfca4 SHA512 64f0879d1219a780fdabf99cb7f862eb0466c1a4c0518885d77ad689f23b0d222140867ab41e15fd07f607c1b40a9f3665a8dc3ba043176a216b1a2d5cf6728c
 EBUILD google-auth-oauthlib-0.4.3.ebuild 897 BLAKE2B d27f90b749025c63ee0ccd2e986dc021b21ce0280a2e7779dbbd754a3b68a7d779627459e20f485cd2bb5a41970863e24a84b3e108a216d3185d1806e079e4b6 SHA512 af995c0a3cd0d1ea53895af11fff39bdfd9e10c7b3cc430007332a196b823ba092a73afb210130cfe0523e0d3e42d1bb42800f0e12ade6ccc385f8057ee97b6d
 EBUILD google-auth-oauthlib-0.4.4.ebuild 897 BLAKE2B d27f90b749025c63ee0ccd2e986dc021b21ce0280a2e7779dbbd754a3b68a7d779627459e20f485cd2bb5a41970863e24a84b3e108a216d3185d1806e079e4b6 SHA512 af995c0a3cd0d1ea53895af11fff39bdfd9e10c7b3cc430007332a196b823ba092a73afb210130cfe0523e0d3e42d1bb42800f0e12ade6ccc385f8057ee97b6d
+EBUILD google-auth-oauthlib-0.4.5.ebuild 864 BLAKE2B 10b7813d88167227979f33417164a7b1dec78cc3f239a4ed5975d5057b2d39b94204d897ccd17eed81ee25656468ba5790dce531533d4099d7337b1e02dc59c5 SHA512 96e06c8be123e55b2dd9a0e26b70ea8edc9ecfb73b8e0550b209d1f46e819b06b4df4327ddd6a4b3d3f59441547bf88ce19cb5fcf6dfeb2b455df8c2f625c902
 MISC metadata.xml 409 BLAKE2B 4b38459e52530c4fd9b3a6c3bd632a8844401d09be81207ae05a01ca1c7c8982493ea16b62a1377c0368001a5c9e08fb1ef8a34a7b29e6b4c09c9b206f7ab73d SHA512 62191a46281e5e7f0f361c9b7705b8d84b9ac215508092b3b23dc92fadb31f7cc71c0ddd76fc6ba366e86cf4a1644d14c91de32f89060beaa8a0f7988ea5d83d
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.5.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.5.ebuild
new file mode 100644
index 000000000000..93b3e546254e
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+MY_P=google-auth-library-python-oauthlib-${PV}
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://pypi.org/project/google-auth-oauthlib/
+	https://github.com/googleapis/google-auth-library-python-oauthlib"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+DOCS=( LICENSE README.rst )
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 142a593211da..62c5e9d8ecde 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,5 +1,5 @@
 DIST httpx-0.18.1.tar.gz 1663996 BLAKE2B dcbfcb4a452b47b643d5114a535005f7f92170392202dedc6c152546430231d20fd8b94b7ecc1d2abacbc9d76acb14cbfdc268109b171cc40812504e696dcaab SHA512 954b020d117dd1064262f3ac2d3137d01bba344b1a061e5713c3889283334d9ca92d9ed3d23f6ce79d684e31bae2d83fca6993178ef55e5a91353b812ad489e3
 DIST httpx-0.18.2.tar.gz 1666756 BLAKE2B 3d1e25d503ae5306150c157bc83afdac9a475110d042e041b58de448a0dcfd75de3f4c15836b838dc799cd5f8b7e0d646e43bbe107ffad87d51ff016afe585cd SHA512 727974e5d5924fdd653987dd4f528d27bb2653085b01ef5efcdac39dc92ef2ed586f872c202349aa31105ad970cff914de4315c2d79338a6aa18bebb8126f392
 EBUILD httpx-0.18.1.ebuild 1355 BLAKE2B 94a851f649d0dc4f8455fd08544f1a22f3f960df4d880368d63ae0ecb59384df465930c71b7078b7493d0e7dada421230dfb4303b6bc577330076e72418520ae SHA512 903129f1d0120d980981e60a0a185ceded491d6e00cfb457b02a069ef709c513a5c764817a1450ce3406c2f3fd0ef93960eaff1b8e412bcc56f3f2e9f309d036
-EBUILD httpx-0.18.2.ebuild 1594 BLAKE2B 1e93a56d73d4c11feb0e0ea9d3c17df7796749dcac00c1880b83cd963677b3de7be2abd5cd0cfad272733c8f81508a2cf47689d630d81860c50880aace7a6393 SHA512 6fe94fd6e63d6bf2168eca01eca9aabb2fe0e7d470ceddb0440e0ed8a652f0bb2a91bfd47b4904587707a24b292ab2ba01ddfe56c7071ac3dc63a99f9398ab9e
+EBUILD httpx-0.18.2.ebuild 1593 BLAKE2B 674286b88f5d85114101b08a735a7e5a8c6a6f82b4c98c7ddf6dfa67632b6849573fcdd22e5e785b30b76d826297bbb05c0815d96937f8576eb94d2116acbaa1 SHA512 44960d18587f5444ce07650a233d388c5fe8dba07b49d941bd09f742ff18f0ee398887129efb607685dbfffe983f835f688101612808a7749ef31884fa4d6644
 MISC metadata.xml 444 BLAKE2B 62369fdf937f8caf46980620f2da0b16512ef94cbea9fecf0c336029a709e0975332d0d4e53ff4f3eeddeb9d231a5003dff9bbdf999846152bf578772b47d9a9 SHA512 bbbc7e622f0aae3b63e19765626ee13adf027d5ed98ca97fe04592b1f0a8da0cd0302b31f9cda90eaacf2bf5dad9c6472ddd795db75f0992ba4f084e4135ea3d
diff --git a/dev-python/httpx/httpx-0.18.2.ebuild b/dev-python/httpx/httpx-0.18.2.ebuild
index 32a16e124e37..dc1258768a98 100644
--- a/dev-python/httpx/httpx-0.18.2.ebuild
+++ b/dev-python/httpx/httpx-0.18.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 3bd7b74e3445..1e4f602ffe13 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,9 @@
 DIST importlib_metadata-4.5.0.tar.gz 39595 BLAKE2B 22ef03a47637f523b583cb8c442f7351e0b94633772978fea47dab9be583f35daa32691997b4110b832709658568b6eb79a006f109b969c6f25a638dcfcd4702 SHA512 62b9cefa502d751d36b5f43606ea86c46574fea159941b68319e5dd9aa53d6d990e630c36d72830c54eb2bba2f2be53201be2482974f833cc1da8869eb2a8dc2
 DIST importlib_metadata-4.6.1.tar.gz 39801 BLAKE2B 89a792eee17f31a86c27820a0b3972cd8f6a06314763930ccdf0cfce31435f8074e6f8f27050d1618713ee6d517f0cd8dfba6a86b1e8917af2769ae22ac40cf5 SHA512 2a0bcef3d49de00a1013eac48f1ce020cb89ab895f5e4a1673b46a1ad8f84515148eff33608847331de8ee05d7e10040e128b2c887065d3ca16d0bd338c761c0
+DIST importlib_metadata-4.6.2.tar.gz 39837 BLAKE2B c41ad332e7d54a8483928347c95bbae020e8fb1833667cd1864ee372d815a2b2e310ade7ff4d6df41c0e0bb9203e4714b4139e87f26ce81bc2c7810580425552 SHA512 01e0398e02bd04293c4135dac8eae9412bed119773d830895d34383afb9a7f883291a6b9943d654cfba4abe9a56f3e0d3625f1e6e83fbf85d6ee6c6613b2bd9e
+DIST importlib_metadata-4.6.3.tar.gz 39852 BLAKE2B a6ab735a8471cddbdd1cefcbbabb29664a8dc96c4163a361422066081f00ffb627612a4b7522cd636de9cb030d0add61dcbb38d085dc759f810239017bb5f681 SHA512 b34b3384bfa1043a1b366505c43fb8a8f0a3a055637cd745009095026dc8a1424c1065fbff5a9170523a3b9b0a48951b615dc64b7bf096bbc2c40261fa200e60
 EBUILD importlib_metadata-4.5.0.ebuild 1262 BLAKE2B 764a8124c532810fb8f76ea3fbc1a2ce68a94f352f4ec27595f99d42a9fdee037eebff73492f047bb68b44c5640877fccd715a19b5ec0e33d543216f144639ad SHA512 bae53e2a534148b86edcfc8feb5da606f298a4b8060a0ce26de93feedf9a9224b8c52f66421171d998504143821cc7fa6fb8e96bfc05ccc1415b50d09c03dd10
 EBUILD importlib_metadata-4.6.1.ebuild 1270 BLAKE2B 273dc528fa21051dc99668aa93696c69cb6523aeddb64ab9aec0cd3f509326d0a4cac362dc0396ad72fb761623dd155226aa6cf9f5d12550e4c2bd60f6b1680c SHA512 aadbad54c21abd11bb0c372b6f1478cf9f7e6144414e23bf9338537f07fdb3231dc1359c0ab8a2360f9c8f9d31c912ef29afadf82c893ef3d503126a699c6c58
+EBUILD importlib_metadata-4.6.2.ebuild 1270 BLAKE2B 273dc528fa21051dc99668aa93696c69cb6523aeddb64ab9aec0cd3f509326d0a4cac362dc0396ad72fb761623dd155226aa6cf9f5d12550e4c2bd60f6b1680c SHA512 aadbad54c21abd11bb0c372b6f1478cf9f7e6144414e23bf9338537f07fdb3231dc1359c0ab8a2360f9c8f9d31c912ef29afadf82c893ef3d503126a699c6c58
+EBUILD importlib_metadata-4.6.3.ebuild 1270 BLAKE2B 273dc528fa21051dc99668aa93696c69cb6523aeddb64ab9aec0cd3f509326d0a4cac362dc0396ad72fb761623dd155226aa6cf9f5d12550e4c2bd60f6b1680c SHA512 aadbad54c21abd11bb0c372b6f1478cf9f7e6144414e23bf9338537f07fdb3231dc1359c0ab8a2360f9c8f9d31c912ef29afadf82c893ef3d503126a699c6c58
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.6.2.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.6.2.ebuild
new file mode 100644
index 000000000000..2c120eefe434
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-4.6.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3)
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' pypy3 python3_8)
+	)
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Skip a test that requires pep517 which is not in the tree
+	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.6.3.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.6.3.ebuild
new file mode 100644
index 000000000000..2c120eefe434
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-4.6.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3)
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' pypy3 python3_8)
+	)
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Skip a test that requires pep517 which is not in the tree
+	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 7cce1308bcc1..b752479553ed 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,5 +1,9 @@
 DIST importlib_resources-5.1.4.tar.gz 28783 BLAKE2B e88cbe34dfd9b251fc78f2aba173f3eb657462777cb66454fbc1735575c6cac6a868f5e40206fb8925aa8c7f708d72624693cd772f2335231bc5da4f417d622e SHA512 ede757b0ee4a246a3446a165f4c8e56edf326f90464f01d853b6c04042371ff1edc4e41f388c6ea6973302a183cf1c04ee21335342886747c991ba0b38c7aec3
 DIST importlib_resources-5.2.0.tar.gz 29655 BLAKE2B 570e92750351a72c95653302baee56dadc28a328a8e42af9d3346be9a256c2d43322d75622f78d87b5642ed9503c9b7f1df0b0223414847619efb2ebd5e27f5f SHA512 248de71aec8aae93f14b0c48381e7de4425f1eb0c014a4f4a49859db50e8b0a94c2e1c0a664086c74ac7fe19e526b8e3f4fc82d19d3d722df6625dc0dc708c90
+DIST importlib_resources-5.2.1.tar.gz 29622 BLAKE2B 3ac095355534c1ea35e65d685e36ea715555dbda686e1312851b0ea5ce079053429812da5ba57b00bf02981786037de2c5e91a4bc0eedf03c8463f184180c10b SHA512 e0534c6e0e1cfe8621710e58f43b0ec3e5a6fd9e1eafa58ffa09f9120e05a416b69b45639f3028f7d4d02831429bc5de3cbfa97e141474d268d6c32a5f14c1bd
+DIST importlib_resources-5.2.2.tar.gz 29651 BLAKE2B dde545a3f104c799432d7a2b6dbea6f071b82d0b6e3660384e2e0ab3c36eee8942b9f248a6139c708020c617bf0e0dce7fbbd5e06cb0bd192a0296fac6350b51 SHA512 7af9aceece4dd25ad827310fde100a4b0b5e0aee03dfeba8789db060e4decafc543784046c2e9eee95d8cab61845c50e4bb0543bb20ae7e1e480aaa80c88fa27
 EBUILD importlib_resources-5.1.4.ebuild 830 BLAKE2B 70ae32481116b16bf0abbd7d78571dd465a11f271479231e20d2e63dea8d9736a22e82874b7cb33227bb12287438816b5995528c5b79af6ce2e86db11d6a3014 SHA512 44cb6fb5648ae86d152219043c3bb595fd1410eb93662428dcbe74e4a86b52fa4018a2690bc640e9aa7898494f6c32a6811e64dfbf1a0ff54a995ff6a35833a4
 EBUILD importlib_resources-5.2.0.ebuild 834 BLAKE2B c2e04f2127b99d26a90d8eef22f6f21558f1aea0e340eb08663d17666acc73386fa8ad48af88a3b42d4a2b645342f767dbbfc7e9d1bf3db19bdd280116512e11 SHA512 e1212a34a31d74c9ae5ca56a966dda10508947147830df6dd548510e5b06d77ffb3ec1e1d5b08d355a59e636bad5f752578cb494292755697314786e2a72dc20
+EBUILD importlib_resources-5.2.1.ebuild 823 BLAKE2B cb588b06d1ec26e6820539b5270b94908a56391b3f3a0b90ba08a2fcfc649cac67c464e2d780c41230c2ef0a883b25e064abac8f2684dc397ec36039ffaf5343 SHA512 491a6f4960b9e844bc7bed6ed14d61874f3bed3851a80be06fdd97aecf92f6c72c5c42bdcda4c30ef2f40d9b46827d60ccadd6daafd5eb3f4661a9b30b4ccf0b
+EBUILD importlib_resources-5.2.2.ebuild 823 BLAKE2B cb588b06d1ec26e6820539b5270b94908a56391b3f3a0b90ba08a2fcfc649cac67c464e2d780c41230c2ef0a883b25e064abac8f2684dc397ec36039ffaf5343 SHA512 491a6f4960b9e844bc7bed6ed14d61874f3bed3851a80be06fdd97aecf92f6c72c5c42bdcda4c30ef2f40d9b46827d60ccadd6daafd5eb3f4661a9b30b4ccf0b
 MISC metadata.xml 944 BLAKE2B 7a5aa1dfb947b0115f3e22f9550471b452204daedb386e78374c5dc19b408ec52bf5887d3e645c41be9ebd16f3bd003a2ac1bb3bac539e603d44decd86b92458 SHA512 f17b2ad2e3eedd75db96765537c30d68aa28c60137b12bac3bb47307347431a19ca064a94c8e41e4a3947ab2669605d7183b5b62e55def66631d20ab903e1ea9
diff --git a/dev-python/importlib_resources/importlib_resources-5.2.1.ebuild b/dev-python/importlib_resources/importlib_resources-5.2.1.ebuild
new file mode 100644
index 000000000000..e844671db232
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild b/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild
new file mode 100644
index 000000000000..e844671db232
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 3ebc57b4be9b..7e9ac227c771 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,7 +1,9 @@
 DIST isort-5.8.0.tar.gz 167927 BLAKE2B 59b9ee4e63e231026e25833ef8bc4a782ad7b30622d1f6b61fe177fbf0f8663ca953f68cf168abb407d3cb90fe98e29540ec3a8933a5df2ca7ba3e938ba4282f SHA512 ffeee045b5328fa410673464b2ca22d9cd1ba8dd34eff9a430b93e9ce72033100e32e3373308438bcb82b8eb7deea1f2087091e111b1204e35791958ca6944c4
 DIST isort-5.9.1.gh.tar.gz 727733 BLAKE2B dc207ac24b586eb5c4c2bd546c0f2ab336c901563e3f2c92d917cf81bc94634c23a20dfe787e65c41fd3aec835d3fdc96721ed579c282b4cb0719afa7f50f9a3 SHA512 e48e08835a71271ab01e52e2c44ecef475aa270ab7242aff4f9ce82bcd5bc8354e2d8a717ccf995172102809198f6dfc9786d8c64e33afc9ae9a4e981ac51feb
 DIST isort-5.9.2.gh.tar.gz 728644 BLAKE2B 37fa16884e987569bceabf71d5d51b5dcf3c26a28df22b07eb5adb8f571901f5f2d0b258c09dfe720a0579836e90ffa46b1d087c536532841ff48848dd71f9b0 SHA512 286536ae5e7328085618ba37d8809b6cd46595b269755c20da0e8f5f866b810663909ed557f16d76c3d5e89b85393264aad7b1d7093cbdb33e808118a3fc7d96
+DIST isort-5.9.3.gh.tar.gz 729342 BLAKE2B f40f046c5706ea4fd6daf7dc8eaccaca35e7de3e77bc17fa73681d12c42f7d2a3b19a909384e6b2e2486679a9f9895c2fa944faace4bbc3d0cfd0ec7aff85edd SHA512 96aa9c8bb58c95a41f562d3f0e1cf6e9c0c4158486bca24dfe2293fc86c7c6b74e3e6a84ed755d965b692b1f06d98cdc8ed69080775f8acd9186ac3ae6401570
 EBUILD isort-5.8.0.ebuild 1609 BLAKE2B c248dd41fd9e90985afedf5ef572abfa0fa46775af0162881518aeb1f9b999334063aeab7f2364eabe10108169833e1037bb25e084c61006c3fb866f664d3d3e SHA512 3cce76276c44cf58ad9a6301618fe43f5765df0fb3961634841171ca09764fc4066a1462b2dd46dbab8d54f77ff43cbf893980755a43894ac149175c92e52a40
 EBUILD isort-5.9.1.ebuild 1357 BLAKE2B bd08b427294a1bb15ed5171345b7310ae5570605664733a31c37e8c75922885e910b43432ad254e851934d8e9bb3dc8ffc43108540736c256101d65d4af34904 SHA512 52fc6da287e78bfbc6e952b7a853f753706935b1ba9ddc9cd31724abd8d1146d94d641edafb0c45c2c250217acfb5cc2a487b7f50185f968ff67e8c2751e3e7b
 EBUILD isort-5.9.2.ebuild 1357 BLAKE2B 053b4a6ebbfb850249dc9598f47f11bcc947f61f26a14d234b9d0e3b5b22c53adc9e440ba0eef9974621ed850e1d7d48ac3cbd4b7d9bd201f52414aba26e2e4d SHA512 6bccec33f9b891a2125df3bc6144664581e20da7b5a7353a07c5347b3803d80c7b43ef700fb2608923e47fb37a40f70dbe34ba57605902500e951a42d8191d9e
+EBUILD isort-5.9.3.ebuild 1363 BLAKE2B b5c7ff70356755c517a7870c8a4b195db2d757560a1dd345c209e4b26cea9b2d662a4e7fba5fc7e1d813d90f3cb57df0595f8728697cd6193064d969b0e502e3 SHA512 e0389431685638814eb54c7366d1cd1cfac8ff6764a3e82466dc51271988fd31933c7e69dcd8bd0971021a7e5392f198851a8dc5dc33f386177383954b14f3ed
 MISC metadata.xml 573 BLAKE2B 2c70619aaf4f917f377e17b73d59656d6e0254bb0aa6c4a01159bd46b5e2e24e22b8ca04ab88ad71c9d4979ea3b484f5efec05e6ce3b40093e010108ef2a80d8 SHA512 4c06a138d3d06e1f9dbf570e6c59819de182d8453c46a5dbdabcfed424501aeba89fed659d19a6e329c33c0307790ef5c1b81d2ee5d7475c102c2bd689255259
diff --git a/dev-python/isort/isort-5.9.3.ebuild b/dev-python/isort/isort-5.9.3.ebuild
new file mode 100644
index 000000000000..d0eb4aea1628
--- /dev/null
+++ b/dev-python/isort/isort-5.9.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="A python utility/library to sort imports"
+HOMEPAGE="https://pypi.org/project/isort/"
+SRC_URI="
+	https://github.com/PyCQA/isort/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/black[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/natsort[${PYTHON_USEDEP}]
+		dev-python/pylama[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unbundle toml
+	sed -i -e 's:from ._vendored ::' isort/settings.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Some tests run the "isort" command
+	distutils_install_for_testing
+	# Install necessary plugins
+	local p
+	for p in example*/; do
+		pushd "${p}" >/dev/null || die
+		distutils_install_for_testing
+		popd >/dev/null || die
+	done
+
+	local deselect=(
+		# Excluded from upstream's test script
+		tests/unit/test_deprecated_finders.py
+	)
+	epytest tests/unit ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 0079bc1d3e92..b3803d9ec39a 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.classes-3.2.1.tar.gz 12286 BLAKE2B c96162ecda1ca3e546b58ab147ea5b080f03e3570d6d59fe7372aeff290c683b68abad6560d7ebf57662009e4d9d8d9a6c1d768ba86e4bd24568794fdedf0534 SHA512 4c85cfdd1da88de01596867365147be6cadd7e1d230798683236fdfde579747e3309aac95ae4f3ef86c91bb4493f3096c4ecc14e3db764ef308aab41ead88e23
-EBUILD jaraco-classes-3.2.1.ebuild 714 BLAKE2B f77cb00ec23bc2146cfb1a8deca6066017a53b37b7ae4166b2791a552bb9fc798fabca7d45e294be35d760f700c9fb064638cd57a88ebc9eac0574f5c096cb0c SHA512 4e9f0bd28f371dfef0a5304f9feb726fce5102f9c945b9d12081a8e2fd9a351fa20c88f13279f3ac8f17c1ec607c1565ffcdab68ca7b444f25910447f83fec84
+EBUILD jaraco-classes-3.2.1.ebuild 721 BLAKE2B 5021f291aecc9a3c4625ea768384d695fe1ab328d170d23b7bb4801073ca65543a949833530353e47e0cdd354a758a5afb0e9b186f872f56dd520a4c033ea68f SHA512 c6ed6d81a452657491613739f9a8413fc5c7b62842438ab0983d8e2c6c7e998fc5c766f840d8b39c8a359c6ba9bebe68d9c428a269a8350468004938c5c9cddc
 MISC metadata.xml 577 BLAKE2B 5daf4529f9a92c285bd3ae07a6e75f2ea5ebd4466721c65d529b51bf9b32b72d17181e5f89410182138b2e94f6b22eb6f1164744f5871585d38004cf6ee1ee3f SHA512 259deaabde7595f7978dfe12b2b90327263edec17aca918675f14fe87fc8ce041cc337632af1b6cfc55041338087c060d5e88b5b018bf2c1c2c21781f179c601
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
index fa2d7774aac8..f0a801338196 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index a03fb425550d..bd8c1b0c1963 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.envs-2.1.1.tar.gz 10190 BLAKE2B 3b191549fe8a5cee1a964559f7ecba8305ac22cc1980191c7fd967a8fb5eac7c81cd8a2752566e2d0e820a9d089422d11fc5529f56d4266cae411ce13e304bb8 SHA512 c71aab9748cfa31c27bb7899117e15d2836851a47a76b638177facc89e894dfa2c4168da2d5b1873b1eeed0d785d23137e56e198f92fb83deb26aab38e342ad2
-EBUILD jaraco-envs-2.1.1.ebuild 811 BLAKE2B 396b64b9fc5059ae31d8e65065f485fbf10e10494670563faf3a650991955cc283b0261ff32db937bd732890526ddf7bfc38c8371687f37e54c09df77dd453e6 SHA512 634519f69729675f1256ef0322beabba5b7f2ce1a214265e45c6d9bba4c25595c6703f61bfa8e1b41aae05dcd6b59328474759170e4cde4a029f66ade98b2a5d
+EBUILD jaraco-envs-2.1.1.ebuild 818 BLAKE2B c36d742ece3586caa9b455ef4daabb5c449ac57063a15b90ba2420c80fc6d703149dcff1b843daf924e9387dfc99bc88e6c456816e65ba1405a72c3b3c93b0ae SHA512 3c6fd907445fd20577a2f4696ba48c3c6802145318450fbce9f250f5787dad4d058e62aaf98e535c189b050bbe1035c0adc240d5bca81a6cbd89c14803c8411f
 MISC metadata.xml 396 BLAKE2B e6dc26e54f94142429135696cc42201a0ccc3331a3e87cb3294bdae386b84a0f804bb91410294dd076badeae53d93b5da2158e8114aefdefbb91bd93ebb14ba6 SHA512 1456e135ae43a738ce79411b5040513a24acfadc4ea040cb93adcde5f61e6eed7c0798f42b32ce473d4bdc6563c755f5f4387f5e3cce350d557cc00a6efa899a
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.1.1.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.1.1.ebuild
index ed0113b1859e..3e93904a5a03 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.1.1.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 MY_P=${P/-/.}
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 0aceec283b5a..0e988d4f949a 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.functools-3.3.0.tar.gz 17116 BLAKE2B 3e1bf63f72d67e55fdf5cfd8d2e12899b7862ebe6cf426be94154f479cf01a69f01b1af152a574c4fb93766b324b6050748464a17a26a27591396d59ed79cb38 SHA512 fc7c5a11a3411692066f4437d76ace7e8a00af2152256ea9f730254b577e74163342298d5b33d472c744cbad5dd316b56345d05aa93ef6f82bc92d6aadb2f2ec
-EBUILD jaraco-functools-3.3.0.ebuild 861 BLAKE2B c4915d6e00760bae4d4bf2ea51cef7a16aa28809eec055f49bbc8413c49e02de7885d2e09a960b3467496bbfe64ae735694c140445e4bccd2aa6c2069f52cc4e SHA512 813ce976727adbb4ee4ba4ed7739dd4eaa0383bea3dcf7da95a7f3cbf0711e610fef27132291b68d215f2e1203f03fdddc18f97b60a1645eeb0816a575e3bcdc
+EBUILD jaraco-functools-3.3.0.ebuild 868 BLAKE2B 3945c3e9047f5bd53feb5096e7af043b26fb1ba256fc94dd8a6d4866e3bc89c7cb2baeedc4808497c33a4b06084b66bd6a16ed91df84c6cbfc51f095b7362444 SHA512 88af4b971ccbf636519c6bcf6ae75908bfb0031217ff2678cc520886f421d429f50d0eaa9f6db585f001905ae4b30afd38b150ae6890502ba3c5e001bf27bcbc
 MISC metadata.xml 675 BLAKE2B 64f36f8fd58d397d3efe5f8a5026eba903a37a6db1a1b2cc33fc893b3cc5c3b9c191adbe814f508bb1798b0e7e5ea6cfba61257982495eb536aa1d244dd86ed8 SHA512 abc84c4f12b89d334309821d54b4d59b2f1b490e83656bd375ed932835aca4dd9fd3299fd496fd33a34a5ef0991af115211b28ff83179632a13963b68ef9156a
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.3.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.3.0.ebuild
index 7acead6b7a6d..1b260b53ea78 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.3.0.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/more-itertools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-path/Manifest b/dev-python/jaraco-path/Manifest
index 4c3e74b792ab..ec47f62a34e9 100644
--- a/dev-python/jaraco-path/Manifest
+++ b/dev-python/jaraco-path/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.path-3.3.1.tar.gz 13287 BLAKE2B 8a803269fc02cc85391b4b1e1f2ee2a94c039d433b505aeb4aa0fcbb23731b802f236cd2de80dbb8b9e59297312892a085632f41234d3e1bb7d4bd04f62e00ba SHA512 00dac02fdc6df469f8661d552b16a8ee6150d86a7df9459264377a03e96fd94608f9782ad4cc2b2df67c64a10f8af26ed650b0bac0b1e59607d429abdbe64309
-EBUILD jaraco-path-3.3.1.ebuild 970 BLAKE2B 7822158fa5d58bb9bb984aafbcc7ac6c0ee6099f52897c43ba122eef126a73d284e32e155ca888884b496fb7db4ba5bd7dd7007ba63d3ab8f119a1e863bd9570 SHA512 ec48c05476d0624bae844347555607958795d240cf5349e1094f9ef3bccaa72e8a5d99211791d01166dbe457593d11fbbfc332e3141e05647947d34375904e2b
+EBUILD jaraco-path-3.3.1.ebuild 977 BLAKE2B 86601c24d4056dc189154234e91a02442987ec2c27847613619a2ae85ef41e5126285ba6af7dff6ab2d3c395472b2c005390c275423c80c06021f7efde22e42b SHA512 c153d824dd76dee1afbd1ad27102af74be51e3a2727688270dab195c4d126fc9ba9181fa3cc4dfe604f9f08534baa77229bc1c6d005b18c2dbb13d6100f2c886
 MISC metadata.xml 396 BLAKE2B 3ecf8b1f6392c3d14122458f7b5fc3c08e5693570685a6ad0f29da64e9f38e4e93c83b180fe01803471342343b0420769af6a01086cd71cc3031b2efaaf3b54c SHA512 eb3cdebd2a8d524c88b519d8e4bb6020e63da5cf69cb4f81eb7a7867bc6d880c313afcd8aa7dd6bd82b661e1aabc60c6ea0c4319ad2b2589e1825d8e3ea65de3
diff --git a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
index 7223348aa819..b24d6c4b0671 100644
--- a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 62f858fcd395..b69280ded239 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -10,11 +10,11 @@ DIST libvirt-python-7.4.0.tar.gz 217038 BLAKE2B a8cec1ab8652b2579daea23b746d01c5
 DIST libvirt-python-7.4.0.tar.gz.asc 833 BLAKE2B c092743b62ed256267c129d253332322ffd1ee46b054938eb99404db81379cb8c6422e045f1855076f6420ce08e4482ab77db71e2ef6d38bc35136e95858684c SHA512 bca8a981517782e204f51eba465cf101aa0bcbf60e0e26a655c5fa2faaf1585b17988e627bd26b98bef2b95536ae852590773806365cff94860845acf2534d54
 DIST libvirt-python-7.5.0.tar.gz 217284 BLAKE2B 65bae31bc484da061e116c5fe0da68df07ec42160db852c9fb83a5c6f91762d762638fec918ea6164400622178e4cacc416ff343fd2df1bd94a62f1b1a6b93a7 SHA512 ae111e4b7db5662af5315642232e2308ebc349bf80a3f9fd372b0fa0ebcde8e25690368187c86d425faef397550caad3366e7b6a3e6a0c4b56fa58df5e8bc276
 DIST libvirt-python-7.5.0.tar.gz.asc 833 BLAKE2B a6963fe069985a3c4f24007f45dc04b26517dff38ff5f14b00816a65651d83ca5e68cc6e168a318240152da5e20d75176ece9108e50f1e1d3d074dc5d4942f5e SHA512 029ada81b25445df8107651b11299a9ad259c6f990ad5d1aad617e65af49493fe824989fd9ade2703c927c59f1a15ea50c4af2d90ddf3da41aabeccdd399730f
-EBUILD libvirt-python-7.0.0.ebuild 1191 BLAKE2B c1030acd572cf307d85b13e1bf5ed2bfaa165da32ce231d2d74254359eae67d80733349677a63532ea2e282303cbd9e9954f13a2d401a8db04cf289acd770d61 SHA512 7a60511c786ff65894121a094e905f76d018fe8163d3ea526bf788fc8beea81adc067658d82edf469615989b52e0216a469d7826855c481efd2b4ffb60c43496
-EBUILD libvirt-python-7.1.0.ebuild 1193 BLAKE2B b04c09ff8cc3b352528082c62a96a92d8f9e78dcf2ee0e70ae14f58fb7872c758733dcbef5e4dbb794e5400739f88f756a154da0193c696238332864d051a5d4 SHA512 f025d4ca62f193a0243784c0343ffd198b1e5c36374d25dcb84bfd1821317f6dfcc34f01360768296c61b08f7b533b6961e5899ed70aa6b3d7448e9b96b09199
-EBUILD libvirt-python-7.2.0.ebuild 1193 BLAKE2B b04c09ff8cc3b352528082c62a96a92d8f9e78dcf2ee0e70ae14f58fb7872c758733dcbef5e4dbb794e5400739f88f756a154da0193c696238332864d051a5d4 SHA512 f025d4ca62f193a0243784c0343ffd198b1e5c36374d25dcb84bfd1821317f6dfcc34f01360768296c61b08f7b533b6961e5899ed70aa6b3d7448e9b96b09199
-EBUILD libvirt-python-7.3.0.ebuild 1193 BLAKE2B 559037c19b568e34e157606b2264b933ae7a9e454b1717aa173799904ed56150c747b085ec4bd148cfcc496bbe0ceccc68ffa1f865a719026352237b1fe35ffb SHA512 d7e6b0457402a4e831e2f4286648c4cee086f7f66925d25ad4bbd4ee050123a3d953879edd094ce429fb97b1853e783e62c0be582a2e6664d8820912b9d44d6c
-EBUILD libvirt-python-7.4.0.ebuild 1195 BLAKE2B b85532af007a7d3bb7b86d14686a15545c626d717129f266ba1a0ba430e606bd3020b0637a23d9ee631a87e127db6915736b4b8caf47cecc878925c03acce67b SHA512 542154cf8a0e6a927bf78acd3c397930758a627344982aa454b7fdcfbe8e58bb4904a88b9e986d6f6e93ef2bf52f9f7e87eb1c06fb2b52434f2d4f89d4065b42
-EBUILD libvirt-python-7.5.0.ebuild 1195 BLAKE2B b85532af007a7d3bb7b86d14686a15545c626d717129f266ba1a0ba430e606bd3020b0637a23d9ee631a87e127db6915736b4b8caf47cecc878925c03acce67b SHA512 542154cf8a0e6a927bf78acd3c397930758a627344982aa454b7fdcfbe8e58bb4904a88b9e986d6f6e93ef2bf52f9f7e87eb1c06fb2b52434f2d4f89d4065b42
-EBUILD libvirt-python-9999.ebuild 1195 BLAKE2B b85532af007a7d3bb7b86d14686a15545c626d717129f266ba1a0ba430e606bd3020b0637a23d9ee631a87e127db6915736b4b8caf47cecc878925c03acce67b SHA512 542154cf8a0e6a927bf78acd3c397930758a627344982aa454b7fdcfbe8e58bb4904a88b9e986d6f6e93ef2bf52f9f7e87eb1c06fb2b52434f2d4f89d4065b42
+EBUILD libvirt-python-7.0.0.ebuild 1199 BLAKE2B 90e6b26a3a82df9a254faf850171fe9a6c8d308b4e998fba2ed9b82f7c24225efed10d7384e303dfa2e0ad94840cfff66747726980f4fbb2949edfb34833a96b SHA512 40c1542f86cf96bd93d2b3942c9b120b3631abc8ffa97aad5126dfac3a8e5c36c868cae683e1a1e52b6db2d332cda5ef2ab6bbbb0b98709a25132a6288bf775a
+EBUILD libvirt-python-7.1.0.ebuild 1201 BLAKE2B 9607203cb4853e529b4c18f34e7dab261982ed563c54db8c1cd4d084cf5c8f3508580b3dce5a7e6657ae5c8ac9578204e0ce3bfa35f070c9348c4a6eb7b92ad2 SHA512 0a0d6be15d8d0b27ba4eb028c69440f25221d3f1c2572b8f7719c20be60d3eb09f5f944bc28c0accece01b31affa14d7ba102a862e043becf3ab01760da1b40c
+EBUILD libvirt-python-7.2.0.ebuild 1201 BLAKE2B 9607203cb4853e529b4c18f34e7dab261982ed563c54db8c1cd4d084cf5c8f3508580b3dce5a7e6657ae5c8ac9578204e0ce3bfa35f070c9348c4a6eb7b92ad2 SHA512 0a0d6be15d8d0b27ba4eb028c69440f25221d3f1c2572b8f7719c20be60d3eb09f5f944bc28c0accece01b31affa14d7ba102a862e043becf3ab01760da1b40c
+EBUILD libvirt-python-7.3.0.ebuild 1201 BLAKE2B fcf10a3aa000bf307cd5cab33e9e71621488bb7d543ed07a3ccc272258fcd954f860a5130ba7c90b1b0712360b9500fb40936f69294de51e8286cd7b2a685a76 SHA512 344e96d551cef54f0715d5d24edc20644a5f368a22f056790230f7308221a7f275e29be99c9ef9063a49c0ed2f8b298139214a4ec898df99232d342e6a239d8a
+EBUILD libvirt-python-7.4.0.ebuild 1203 BLAKE2B 610e72a4d79c6babd1ebc17ba78e6acb59b91373c589ac34584afb4cc4d38871f56f864f201596a875c6e763adee8696a5321ca4392c653f3a5e9619c9699883 SHA512 cfc23cc7c939d2fb8b566cbbf0d06fdeda87a1f767a501299bf93095212a3dd072186336e7509e6b7e5666c6b4a614a432b13ee251983b1a7141c10cd91031a1
+EBUILD libvirt-python-7.5.0.ebuild 1203 BLAKE2B 610e72a4d79c6babd1ebc17ba78e6acb59b91373c589ac34584afb4cc4d38871f56f864f201596a875c6e763adee8696a5321ca4392c653f3a5e9619c9699883 SHA512 cfc23cc7c939d2fb8b566cbbf0d06fdeda87a1f767a501299bf93095212a3dd072186336e7509e6b7e5666c6b4a614a432b13ee251983b1a7141c10cd91031a1
+EBUILD libvirt-python-9999.ebuild 1203 BLAKE2B 610e72a4d79c6babd1ebc17ba78e6acb59b91373c589ac34584afb4cc4d38871f56f864f201596a875c6e763adee8696a5321ca4392c653f3a5e9619c9699883 SHA512 cfc23cc7c939d2fb8b566cbbf0d06fdeda87a1f767a501299bf93095212a3dd072186336e7509e6b7e5666c6b4a614a432b13ee251983b1a7141c10cd91031a1
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
index 7111641af837..91125795db71 100644
--- a/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
index eb8b2abcbc09..eccf3f9c9cc7 100644
--- a/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/libvirt-python/libvirt-python-7.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.2.0.ebuild
index eb8b2abcbc09..eccf3f9c9cc7 100644
--- a/dev-python/libvirt-python/libvirt-python-7.2.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.2.0.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
index 6bd5a5eb5cb9..9342f7c04eed 100644
--- a/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/libvirt-python/libvirt-python-7.4.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.4.0.ebuild
index f4d733c9c871..16ff1e5b125e 100644
--- a/dev-python/libvirt-python/libvirt-python-7.4.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.4.0.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild
index f4d733c9c871..16ff1e5b125e 100644
--- a/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/libvirt-python/libvirt-python-9999.ebuild b/dev-python/libvirt-python/libvirt-python-9999.ebuild
index f4d733c9c871..16ff1e5b125e 100644
--- a/dev-python/libvirt-python/libvirt-python-9999.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-9999.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 2fea0b59ad65..ddea8a0c5fa5 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -7,4 +7,5 @@ EBUILD lit-11.1.0.ebuild 901 BLAKE2B 03656b1026178d703dc2274b8c8e64504d9f84f9946
 EBUILD lit-12.0.0.ebuild 875 BLAKE2B c7eb151f6ea8accdfee67f26f9b65c41a65d61019295681572055c1771556a365f234bea7058491d2e739313b0d77063c3e9028a8f895fe5987604f0f45ab516 SHA512 772d7644cb8d84f53a5275992f2096dc3bb7ea298056da296572deb53cd3bda52c6f523d9484c48e07067dd79f6cd0ab752116b504f60ffc963431b02a4c7d98
 EBUILD lit-12.0.1.ebuild 879 BLAKE2B e1ae6897065f200b1fdbaf5534505138068fde33376ca9414b0929e4dfb0a659b2bcf32e51441dac01752f0036ed8c8276f270ae08274bed9a9e0fa477193342 SHA512 1f0e3b356004ce9b0bf151b6c01e0724e4100cf5c905aa8ba463388dbb308ccda8316190292dfd9db4d601cd144decd7b06154565716d4fba66f6f6a540e0e23
 EBUILD lit-13.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
+EBUILD lit-14.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 MISC metadata.xml 282 BLAKE2B 36e6403814edc8e79eca456ef9648a7b261f79d4823082a8dce876127b11bf89182dabb02e58b2a42dec3cf9e21fe2f5c474ee4a8416213901f82cfc481ffcda SHA512 fa292059e410ff5e751980c5f5b0145c579b373d77970b797850c3d92641bbcf27b2c18a33d665e76e59553ba7dcc124ae09ec34fcaab4b2caed74248ace0e57
diff --git a/dev-python/lit/lit-14.0.0.9999.ebuild b/dev-python/lit/lit-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..37168fbde9bd
--- /dev/null
+++ b/dev-python/lit/lit-14.0.0.9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 23e4d9511b9c..5b8f1bdf6b49 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,5 +1,7 @@
 DIST mkdocs-material-7.1.1.tar.gz 6080208 BLAKE2B a67742ce923dc7bbefbb5638156f5a2f703bd54af96e59b1c580264ae3096d0a823df6cd88151f2c446a97b578bc4a620d694323f5a81cc33836181dad203214 SHA512 ab6b9b4b08268c15b42cf9d5d26ea0bc91151efb1b478602b495f603335792fcd1f9058ecc52767cb861969ab1db7aff2681653db35cb739173b56f7f32f9c65
 DIST mkdocs-material-7.1.9.tar.gz 6492415 BLAKE2B 67a86251289126320088dde4611ea1c1e75543e7edcb2f737dfcf21844f53a3457544716cded44f0954c2658cb107e5cae589efa2c71ee07151a39ed0f28401f SHA512 1a4296ff692842e61406b24ac50b1c02550a2581040611c263aa744c98031a54c6f380e6f655aa477f98d7507d2e8649434fc981928e9d27f09df71cccd22ecd
+DIST mkdocs-material-7.2.1.tar.gz 6773988 BLAKE2B 8b57a58b11ecdf9fb9668a766d10869040c8f6e2d2045cae01e4e32243503540ef955c81bdf0b2066886a309c46e724586a912631ffb78a6383ee1736f1b13d1 SHA512 9ce1cd733205ab87e865c8b90e9b78b133b5172acc042f8ee954073885c8380d06607ead2fc80352311502638c02439798515acfe8521c06b9fee707173e7d63
 EBUILD mkdocs-material-7.1.1.ebuild 816 BLAKE2B 6e872ef6c7186551647d37f7a80142f591b393fcea6cb132040809478f92aa1abbada00f92530b12e23cd7712944ac8b0a82db414d0a39c1be1cf28f4189ae5d SHA512 871fc55ae207e78a3c9ef1f50b887ced596d2ba7cd4a4606549f9877f1d4f660857d3f62aeb23d4eabc4d75f7a79406cf78c45d80b645cd145baf45efbd8eb5a
 EBUILD mkdocs-material-7.1.9.ebuild 817 BLAKE2B 7700357d46cf7298e980eaebd60a96823a0c6e31800fd35c260cc00ac4f73757fe7f13adc1003476e4ff4076cc00f59934fd8a11bff95d10cce32d2c75beeafa SHA512 e32d3869be7418b2453432021fd67930c58c6886fff89b805438d71b4b4567a7c3091e96a0201dbad4da7522525d07634eb7f1ceb6fb66e52ca82d62b3b93184
+EBUILD mkdocs-material-7.2.1.ebuild 817 BLAKE2B 924aa54ed7c0c1ecc16497b25b07c7bccffd7dbca5369595d981ace8d2db7e2f118948af863309d69e2a4ff522be107ce7ccc1ebda5e6839c69fb27bee9c72ea SHA512 65a70738804a58fd256516ecbd22ca10f51fe6831a17234e813ebf30da8d34f2e2335f804d2b326bf458743075416e1678784ad8a5cddab8393e5fc2cf7696c0
 MISC metadata.xml 1036 BLAKE2B d9f342d8f3da5a5b1ce9ee0e68938b0c8f7235ff84e39c59d9da18cec1b4553193aaa7eff85157c92fd014e971f2ac947bd252caad791605b0867cf2d7622ce4 SHA512 31db1dbe3433dbbcb6036ece9803d22913980644f014f8e8db80bb00899e0b98602016a08e887f7fdd5d99627d411ea8cb18fbb091faae0a03f8804e3497b52f
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.2.1.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.2.1.ebuild
new file mode 100644
index 000000000000..2190898a4626
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-7.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material
+	https://pypi.org/project/mkdocs-material
+"
+SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index 93949e9e075b..3cfdede1a952 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,4 +1,4 @@
 AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce9816363f824d1e5361bdb08a762812c0c9286b4c4210f17c67f3ae1c7cdbe56343d3206c47c31c96756d4c139dd26e SHA512 d7e896112db30357a279433b6d6a334ec0495fb1a4d40cedefd3e0e1eabdbfaff09d484472a72d88eb2bbab72142261e9e6f1ad134cede92fdb4f68feb7eb27c
 DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
-EBUILD munch-2.5.0-r1.ebuild 738 BLAKE2B 6122fc202a3b1040615846093677a232127358f622e13a1bef2f52f060f3c5ad85e6b222a394519b19305e9f717a0dca452ff70c648b81712661fcc79afe8bfd SHA512 f0665681004b12f72787fd7d2e87b8e2a86a9b36ccb1d36f4b1774b332ff98223939633a8ae727ca4e8f14a9b4083bf31013eba6b711813297d69323131938a9
+EBUILD munch-2.5.0-r1.ebuild 745 BLAKE2B e60294ecd0262bae203e5af8506bed3f0a7c7d32690ebab1cddd44aeef5bc492d464cd9827d69a16d7b73d1ed111ad0364babdc743f8a847cc452364f9195d7b SHA512 c7a9052380c9afc50410f021f8bda3754ee091ed975c571a95a68c7db77d5dbaa50a0614e6a290f54cfe9422e6208e21d01fea83f83f2e6a2ecfba7016045b3d
 MISC metadata.xml 400 BLAKE2B de9c3fed4f655c60785a7552b740d801b4a435114e2c5716158280288814b241ef5e7b59ee468a7a16d9aa6bc177c958561459e8ac57fb88c566553c79e25fa9 SHA512 e5f2ae1e485e5a1cbf1b4e7ab94f0c46042345751332f0c5d714b571299621447862ad5402ec7b3b770d1f528fbc5a07fd35e7e9466e8f3a1ba7e3245d09f9d3
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r1.ebuild
index 2631cbbc637a..3d587eeae6e5 100644
--- a/dev-python/munch/munch-2.5.0-r1.ebuild
+++ b/dev-python/munch/munch-2.5.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/Infinidat/munch"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest
index d0cc54bb5b67..b0051a7b6e4b 100644
--- a/dev-python/namespace-paste/Manifest
+++ b/dev-python/namespace-paste/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-paste-1-r1.ebuild 821 BLAKE2B 1ac0bb153d9f6b63f2125d225bcbc51de498a330cbbea7cd00cd64a4725b0a3df7a74404909ae0b3fb6a65500ba0f6d9da47769d795477418e88fe4bfc73917b SHA512 69127cd0ba43221b7d12ed499a1811e2bb0fd54022fed8623393a82e1f47a1d49d57f61b72f80aef4936faf9a63b373093309bf210ea704ad73b0a1cbd190ae5
+EBUILD namespace-paste-1-r1.ebuild 828 BLAKE2B 3e8c99433ce125ef9d1dc76ba599e50a49d3edc40e2300dbfb1312c5a8f1b69fe06228673a892d2f434d6ea357f0e2c3604b74c8268e3c502f26349926f59698 SHA512 a900d06339e45767a9cebe82f152750b664b1af546688f172def152f0bdb14c9f366f6b4bf10a4c2a8f97f77a8c3034e2d4cdb77d8dbc676100e355c9d4776f5
 MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
index e149c6442c23..8cd006f2de4a 100644
--- a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
+++ b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for paste"
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index a684b419d5d5..8b4c2550f349 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,3 +1,3 @@
 DIST numexpr-2.7.3.tar.gz 114113 BLAKE2B 95dca4fbd3148bbf198f82827a63fac3e9de29f677457f2ad45040e24a38bb05e4e09738efa0cac793970e18bdcd252e2744da96062217fd35b4054b10112989 SHA512 8234a65ce96ea0a2f20cce7dce3de652362a9edc86af2e7a333cdd8ecd87866f75970859ff39b04d529acc062b806cc8c64f262c318edd2897200d7e54b429e7
-EBUILD numexpr-2.7.3.ebuild 1222 BLAKE2B 58f76b44daf9078b0423700621ca00dbb71541b146d9b49ef8026ab953517b0f54c8489317ff601d3f4df062f420d7d65bbda3f543a3abfa4f4d691e8470ac83 SHA512 86cb336d75545cc5ce02f30fe2709e8920c899a35e635192634f61d1e45d252a593264b806db3c9a799ffc41436efbc3238b779f9871a649846ffe0fe9674dea
+EBUILD numexpr-2.7.3.ebuild 1229 BLAKE2B c303852d9c98b2e7cd2e214c81522af0430b333e9878ad94d3f992c258759df58c63ba833a32283d9cfc5da04eb73b49308404498cd7cec861b4129c372bc0c8 SHA512 e315be3550dd96e1bd6efcbe19ecfb4be365d549b6b8034f768ee8b66d87d6794172d03b8cfcb4f717d578f2c45af62421492cef174784aca6a9cc13b1edbfbe
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.7.3.ebuild b/dev-python/numexpr/numexpr-2.7.3.ebuild
index 75e1887417af..7efd00d6985d 100644
--- a/dev-python/numexpr/numexpr-2.7.3.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index f111be60a1a2..5ba135f13c6b 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -22,5 +22,5 @@ DIST numpy-user-1.21.1.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b175800
 EBUILD numpy-1.20.2-r1.ebuild 3789 BLAKE2B 04b13cd33ea2805716faf5c2d286e3f0928eeda592c0c6217501a1adbea30e614d940732041cb4236a89966db1cebae33b437ab55a309ff6be62e81bb6be5010 SHA512 9a2bb8e998e317e540b7a0fa70979a872db8b0a99cc1e6f72d1fa0ab1c11f26551be22eff1a84b2c25e9d39934246b955ea54fc72c25b2d89badc430bf048f38
 EBUILD numpy-1.20.3-r1.ebuild 3724 BLAKE2B 3d3c2ade82decb593116388cbd00e6c688e0b308b2a4bccb122fa716e7e8826f83f0d9f2fb6edeb43578325007b97c228899be055c5ae90b2740bc5a5dcfc7c4 SHA512 496058416f50bcc39632458bac10017071df0231bb564be2b496c65f693f0bb12c6a01a50df72f70a7f98f872f8258c8030db766fbde2f89a5c8327b1a786dca
 EBUILD numpy-1.21.0.ebuild 3567 BLAKE2B 8bfccf3046fa52a171d97bfe22385688d37a383a772310833fd59ead145d8ef7e1c45567ab664f3462e99595bac7411faddba01863143d553db30017f88f1225 SHA512 77e8d721c372f06aaab330c69d21eaf699cd0b04f91a1466878f9e2e89169a14979f7ec834c906ca0905ce909215f74c0b9c77f0e08b39dbbe34d07f275a83e9
-EBUILD numpy-1.21.1.ebuild 3684 BLAKE2B bec6b2a8cab14cd5348563c635f20918b43fd26e079b10e5bb42bcf0e360b1600111793f64695c0317b06d2bda5efc2a6fa131782b1cd65819598d995551bddf SHA512 06adc056c295c6113f7d69a1cd31330c7dae9460e59e7e7f53dd153392940d6549f5dc3d173a539cee26ae9c7738cde34a9d9e5e96e62992fa4550cf6604fe8a
+EBUILD numpy-1.21.1.ebuild 3682 BLAKE2B 753c9e53177bae352f3aec669b07c6367a86b89c0c97e46b43ce3ddaa322f01ad141b5303c98567d8397259c6fbbd78ea953bdbd7e32b66fa2cde2430003e3e1 SHA512 9309099f1e9869cdaf8a3ebf6682075abd6d41decf123fc25e342202e8250dd55a310d220b0f48b8d71da6e8353ca21e36f996c593a9d44731ef6141e436d5fc
 MISC metadata.xml 934 BLAKE2B 948b9a948cddc46d20d672992bf73ddb1e59ba18f470acf805c78f561249e7bce2cec1cb1affe63aad447f2f0ad627147cf05ca04ac3c321781255357de92d63 SHA512 404bc31423a1093c19dd535aa3cd5a6b925f4ef1699f9991ae19b46495c46ac4ab3b0b1995f62ea8bc5de15889b975dfcdc416360978508b837d4d5d518dfeeb
diff --git a/dev-python/numpy/numpy-1.21.1.ebuild b/dev-python/numpy/numpy-1.21.1.ebuild
index 32f6ce2b232c..3353915bf361 100644
--- a/dev-python/numpy/numpy-1.21.1.ebuild
+++ b/dev-python/numpy/numpy-1.21.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
index 7ede9ca62c78..238f2417296a 100644
--- a/dev-python/opt-einsum/Manifest
+++ b/dev-python/opt-einsum/Manifest
@@ -1,3 +1,3 @@
 DIST opt_einsum-3.3.0.tar.gz 73951 BLAKE2B c8e39c9589bb6b89150fd5699fafd77c5ac6022f66d1b778a55dd61e606067be4b6df85972dd4078df084e34a39463f5e59d69426b0ed9152e93f93798417eea SHA512 f34c58bd3aa4a15794cfc604167c0e3175b9826da2a2449bb48ea5c3095f8215e3f990daec51e77e505a03204201694df1a09360ee51b8a4a793b9844d9c2d5e
-EBUILD opt-einsum-3.3.0.ebuild 463 BLAKE2B afa86b8b7b6dedac3a885e5eda7edd6505c8494f1e5bbad702a7940ee6dd46ceed9ce4451d5d1db52df19fbcdf887a99124e234c845d78790401dcda779a3026 SHA512 30ff016f7459a69b3127852f20a6378a5a4ec8df9a5fee50820c32f5950beef66aa72872d17cc4f54238c5fe7ee5993051ab48aefadf838bdebab6bd1fe2217f
+EBUILD opt-einsum-3.3.0.ebuild 465 BLAKE2B 16d3c745892adb8eb7da21d41d44fc54ddd090bc318e6060b767efd6909d43aecf9e472f48d821d42fbd3b58dc119178d9046405eda84e20a4fe7862c04423e4 SHA512 68a19c5000287d7bf522a2f380572151bff3a40855c370c7392ab9200a1a146094d167c81323e7415ee72e92485a0324434e219a59f33e3d09c7381ed38b9118
 MISC metadata.xml 470 BLAKE2B 7dd0dfa92800286393d304a888994092cd7b3b673f84f2a542edd166e02c65f91f3248248f05f6cb5b4ac0bc34b557c55db50d4c1fbfdd1483c49b7b1c5db011 SHA512 090fd5fd8157e7118c60700974c6fc94736a23d529572de49ee57679d2dfe5091358e940e5ed34846d5bc6dd236363ec07800d7d12813342c388ce726cda7d58
diff --git a/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild b/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
index 284c0cea3774..cbe9bf30b1bc 100644
--- a/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
+++ b/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Optimized Einsum: A tensor contraction order optimizer"
diff --git a/dev-python/osrf_pycommon/Manifest b/dev-python/osrf_pycommon/Manifest
index 2bf280cfffb2..9e8dab3f5b5d 100644
--- a/dev-python/osrf_pycommon/Manifest
+++ b/dev-python/osrf_pycommon/Manifest
@@ -1,6 +1,8 @@
 AUX str.patch 1041 BLAKE2B 35abd358988af1cf45975094758d56648d56cdc302dc507a3e5077e90142d31076d89592a06d1d9eae1dcfdfbc434efbb176990af955c06ce414603cdf7efa62 SHA512 94a8f4d42c3929ca7aa077142c4e5ec91ef2848b6f402b0a9a7beedd96865178ccf431aa8a68cf332927e783e56fdcdf4b8321679c0bdcea4e76564dc7f72d7b
 DIST osrf_pycommon-0.1.10.tar.gz 46303 BLAKE2B 3f18b8683a6363e1f15addfe75b8dee31f64fff7c286379d18355dc1f3467063c2cf1a9eb7978c5f9de5d64cb23d18a3922a416fe24fafa618f50f0ba89cddfe SHA512 5d53ea0c3c410a99964330dc22dcbcb3cd8892a359fee2061acc15ddb46e334ff757e8aa5b776fef381246c58e9834003ac818624da4b8e95552f214f3d9e6bb
 DIST osrf_pycommon-0.2.1.tar.gz 46633 BLAKE2B ba89f8d783446d52a328d126bcdfac721dba0a811007a55e48ebd3626e58b732d4f03cc2a042d517698d6708bc72e0ffede99ba82604d1f4204ef3c1da36601a SHA512 d05e6bcbb8e7b5506ea953d37c895dbca59765e9a26081aff2c4d213c02365a4254580843dd7624fe4a046afdb2d5b8935c1fcd4d60b6b1d71c4d22789d26371
+DIST osrf_pycommon-1.0.0.tar.gz 45084 BLAKE2B 83bfd5393575a5032e72ae93c9c3eec87d2907ce3fbd3e9fe14a94e5470d61594ab75bca394ec4b7960bbdb16c3ec060966bd6bf47f9a4037d530501c7ce947f SHA512 ff7204116c94eef972b7071f8d6c68fd7cdb1a518fd6c77cd47f54e5390815ff4b6a7d265ef3ed0093c1baa20eb332d69e92926e856da0e34b7186100b688d83
 EBUILD osrf_pycommon-0.1.10-r1.ebuild 707 BLAKE2B 97b2fd2436b770dbc707b49e7fd1912d0144a9924c69ae5e97d8cf240bba8bcae3efc6692746200185edaa069a435c3af35bba898ccee46f955c68f387dbd57d SHA512 567c9814646ea221b6792ee4887bb6f3339dafed17984542c7c16bbf2e2575ffefe4cc7a285857a55721a133e252e8a11b3083c829c7c9279fa61fbd78fb70a8
 EBUILD osrf_pycommon-0.2.1.ebuild 730 BLAKE2B aa06c126d0c6371aae091c8f8c8650be796714b6e1b1f8a9d758924787467e0b838e1e47b848f5eae8f151d422a92edff80f12ab1ffe39ef9fbdfb083801fad6 SHA512 691ce22cf7a777a07369890de6a255ff57eb66938ce422be5917b482defdafd0d7945d5e0e3b951f1c4c1227278d0af9fc8cfb6fcf1f50950b91d1e88af63a8d
+EBUILD osrf_pycommon-1.0.0.ebuild 730 BLAKE2B aa06c126d0c6371aae091c8f8c8650be796714b6e1b1f8a9d758924787467e0b838e1e47b848f5eae8f151d422a92edff80f12ab1ffe39ef9fbdfb083801fad6 SHA512 691ce22cf7a777a07369890de6a255ff57eb66938ce422be5917b482defdafd0d7945d5e0e3b951f1c4c1227278d0af9fc8cfb6fcf1f50950b91d1e88af63a8d
 MISC metadata.xml 484 BLAKE2B 27b6c586f3d70f474606704d9bfcbd85b0e1bffa67401763948e4cd2b4b4712daf44eeeac8942b3f9705a00a0ec7b43a5674b36a8ebbe32823a626e2f145b199 SHA512 153575d6dba847d766ec346e71b57acd4f7b6355f6207ec71dcd7047736848d9d10ff6b3e2f23f935bf092cca72033aa5e0f428ac6c21a347477df88f12c66f0
diff --git a/dev-python/osrf_pycommon/osrf_pycommon-1.0.0.ebuild b/dev-python/osrf_pycommon/osrf_pycommon-1.0.0.ebuild
new file mode 100644
index 000000000000..76c71e1f7c8c
--- /dev/null
+++ b/dev-python/osrf_pycommon/osrf_pycommon-1.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019-2021 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="Commonly needed Python modules used by Python software developed at OSRF"
+HOMEPAGE="https://github.com/osrf/osrf_pycommon"
+SRC_URI="https://github.com/osrf/osrf_pycommon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# linting is something upstreams do
+	# for us, it either means unneeded deps or breakage due to changes
+	epytest --ignore tests/test_code_format.py
+}
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 6db706c41105..f5fdc90124ea 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,3 +1,3 @@
 DIST Paste-3.5.0.tar.gz 638021 BLAKE2B 6c8d856733245a7eef5782f8d6c1fe35093f5247cc76e86ab308f2d98a99ebaaef5309a9c402f1334707e042b52e52d7801723e9404ad0ae454b756b9df31dfb SHA512 a9f596d6fcd95f915990c16830caeb9c9a03412447597258c67a003fd485e2efd27798f2eb2de9978ac529292af4b55136de554bfb501e90f6185f55a6b0531b
-EBUILD paste-3.5.0.ebuild 1080 BLAKE2B f1794decc841119d3a57460e0b45ba6c17a0bf5545a4df72e5d9ab94c866d4fe6561ca8862863ae70104760f0700d301492ce997f453f32e568c6572cbf18c26 SHA512 1ecfc847cdf0c89dc3659dcce7100641b3efa694bc6492335a97ea9ce8bb5d783dc9f901fabe96385ba6bb2886f237f8313b109d6192c91b00ae577d3cfb81f5
+EBUILD paste-3.5.0.ebuild 1087 BLAKE2B 5442735272dcd193c3c2161b0eb9b5d02b1a2e44c0ee82307321907c6e391fcc6744b5d25c36eb771a4de8f7d04bffb7e27327100f59e0f105057c50202a5a7d SHA512 8179d789a0a6f1d2b00e843fb3044d3ebdecdfebc420519049ebb710be6e5bcf9446353d40cccb8e39a147b40015e2381736fcd5039db9e95ba4c6811bf5fc3d
 MISC metadata.xml 627 BLAKE2B 544d8a892fba33e583c08d31ff232d71c71397981b5d51f721545e9d1dae4342b68741d656d8eba8988f57eb9a6990adc2827c4f2f4a7b9262fa2be9bd9740be SHA512 a49e8e5ce28d107c97b02b00e7c0b3c260c780fc4ac7d80ea3e8163cd5a8fb44756470ad2603b0d9db312e5cd36b0039eae61dddc0339618ef0c6ee675f1ef58
diff --git a/dev-python/paste/paste-3.5.0.ebuild b/dev-python/paste/paste-3.5.0.ebuild
index 541b33f53a13..ca4614a321c6 100644
--- a/dev-python/paste/paste-3.5.0.ebuild
+++ b/dev-python/paste/paste-3.5.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index 363d538cd030..461371cd3f3a 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,3 +1,3 @@
 DIST pastedeploy-2.1.1.tar.gz 32339 BLAKE2B d11affa480e5c9b7be53d0431090e4ec9d66f8862b1aadf6a993a09f9c952380d7698eaa7442614936a8316e2ac50404a096bf64bb3ef31f55cbee35b5982166 SHA512 0109e30cb5ae9bdd7f06a79f6236c90f96c3bcfe507258572b1329796a1821486d9762d954673ccbac76ee63c6a69e64fe5e2cae5402fecf4a5affe88cf46930
-EBUILD pastedeploy-2.1.1.ebuild 990 BLAKE2B bf4c59805cd8d791c03e697dfa44733a55f3d57bf4fdd61cd0bf6920b83b1b19bc3c85f8a2e1cb22a15130483c095a60c1a963689874af9aa73bc1acc18e41a4 SHA512 7fb8de59ad1fde7f19941a23a6e1798d22f7ec860b79c7fd6875d49980e54719f9ffbc15634ae02542038df70fc579fda1ea4d0c2ab6e9fc0a73460fd927b851
+EBUILD pastedeploy-2.1.1.ebuild 997 BLAKE2B 3cc07f90334c56d7696015595bf167e0bdc178081adadcbfa5d7af5950a159a881743cb065eaa101dfde326193894c80dc14cc68b721937198878f9490f18f43 SHA512 16b9567cbf25d4bdc18b97e7d073006c2579bb4c7d48890742414ccb17e11e70bca5d5f3525bdd06f685f865a41037546e58bb649cbfe85b83a10be8e333402b
 MISC metadata.xml 830 BLAKE2B 646965e3c4e9247a8299b8e3d441e3a80a899107e14489cb1e7f5c85bef9b4c710536caf7cf6f695e9a87f0412cc47b7099312e7e7772691a275c3c2151215c9 SHA512 dde9cd21ca86242148ab89a2e77c88c4f7ec30c1615831a2cb00b20f0051dd23c40537ce1abea7ebeb39da4a8233275f0d3dc91a8f3947307d7acd571f56dd29
diff --git a/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
index a1f5d48ca816..48502600d35f 100644
--- a/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz ->  ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 181bb6788999..b352c587af04 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,15 +1,12 @@
 AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
 AUX pip-21.1-no-coverage.patch 1905 BLAKE2B d09ebb459bd3f0d7d1f5194c635489aa162d5ed4f3fb75e1352eb80f96a49aef51e7d5e72859321f1558b6a6df9bd0000acdf653dd301a839891078e4a26dd16 SHA512 46afc9f5f290e3547bc18f104fae515a06163f622fd43f7b1e49ae47c720e4aa4fd01c97f171cab24305eddd71f5083ba1d3109a67f2f84e46e5320f4ab7f0bf
-AUX virtualenv-16.7.10-py310.patch 2829 BLAKE2B 3fe4387bd4a9bb4182e002643339692e63e98d0613c3cbec6b633699b2a1688652e00d6f31ec82eb399c7c87e0e80e8f8ff48dc0dbe38f84a7c6f74124e76950 SHA512 46074b0705048de5c7e0be2c6a3fb88f15553dbf44bf92d6e0f23fd18510f4d6a2689277299d748bfc3f44a6ba7eb9a32a5554052b391fe69714ce6ffc217ae9
-DIST pip-21.1.2.tar.gz 8772481 BLAKE2B 23dbcc5dd7e7f66934282b9c93958267eb367d418b6c814032b7b89e0d94c73c143626781b8df081394019d2e575030b7a2fd61bb5221992ce2060cf069e8b04 SHA512 54a2b6074fcb2640868dedcabb5087b79a53a8ad57ec4ab5acf2862b8037403d8f156c2853ab60c2f10c6af999a0a90774f0bc3eca2978a82590935d37af167f
 DIST pip-21.1.3.tar.gz 8772944 BLAKE2B 4c50fcb7c05e05d11b137d08547d9d55f19687442b8d44caf05d19917b200bcf860032cb28745e41d51afda80a7ac09d60afb8d619ade5b965ed87bac1133006 SHA512 21bdc78f24751981ae49c9fda0430fc92b8d33eb7a546bc344e8cea4aa85dcd42191ef8eb3fdfb4f3d1cb5921698f819d73e6e190d8745cf7ddfa52732d95999
 DIST pip-21.2.1.tar.gz 8781474 BLAKE2B 6a6a4972de31cea2f9ee2d70df00acec65efe344fa13e56ecf9b2f55125baa2effb30bf25c7649f5f30b2ecf9b5ebb7d32dc0f2dfa101444510c8573bd0c60be SHA512 2fff39703eb387ded66552ee62c2b3e4d18da6e8a904399919a5c51f65ddf1695ad410408fe5370877a1ce9992e7c07e091a1852dfb136ce5580e31fc1c03b81
-DIST setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4
+DIST pip-21.2.2.tar.gz 8785943 BLAKE2B 3e99a4e6e01b6239ff5a45097bbae8ba3459a16d0e78f8da4fc1be0ef5986962d30ea8e376705cd7b88198e324e700d04ee25fc6d1d9faa9bb6a76ae89efd38f SHA512 81ec1819481fa2378404c580a4c60fc48b03ae9bd5c945a3def4af331c530efb19949ab45dcb4be5835673b65299e0245c28c6653f9f60eaf86be472fd31faa1
 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
-DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
-EBUILD pip-21.1.2-r1.ebuild 4397 BLAKE2B d428deb02df63f482f4951bde9d121217177fa7d4e7372ba78f328e4bf6acd32d54ec9fd9128a81856d093ec1a56c99ea390e6ff5d05f4ad82331babf1fcb301 SHA512 45b0da89df88d7801ed0700ed52d69e1782997e55aa30968e7985a786d8c6077b4e61fab4db96425749be338049f03b437dcc979dc8b3be507298087d9b1bb82
-EBUILD pip-21.1.3.ebuild 4261 BLAKE2B ad1a47d683701fac59513dd59960694087ba9a76d387b5c43f42af95ffacc8a294b6e05c8d5207bc23751cd590ed3ac7f267f1489c0810c78c3c05b690ab8ce6 SHA512 4830c646aa22920250d6be4cdfb99cee15c833a6838655e83ec48d1d39198c47b304097d0458c5481c5ae400a58fa72c98257c5dc97784cfaea32aabbb8079fd
+EBUILD pip-21.1.3.ebuild 4253 BLAKE2B 145e72c1fc1cf5eec5d656819f82d6807ff7123cbe01d6fef4f2de5ef3bfba1dcb639d2f494bc8f145a9f5fae092c781d2fd4bc51688c19a9e6ee4a37ff24dc3 SHA512 4b9fe3a4204b914f617ef59cffbf9ac5b224d861c3043d23f91124cd69d837e3f4aa6dbcf605ea7ee0fafbd1b5f85568a88ea86b12c917cc0057289f3cd46e88
 EBUILD pip-21.2.1.ebuild 4261 BLAKE2B ad1a47d683701fac59513dd59960694087ba9a76d387b5c43f42af95ffacc8a294b6e05c8d5207bc23751cd590ed3ac7f267f1489c0810c78c3c05b690ab8ce6 SHA512 4830c646aa22920250d6be4cdfb99cee15c833a6838655e83ec48d1d39198c47b304097d0458c5481c5ae400a58fa72c98257c5dc97784cfaea32aabbb8079fd
+EBUILD pip-21.2.2.ebuild 4261 BLAKE2B ad1a47d683701fac59513dd59960694087ba9a76d387b5c43f42af95ffacc8a294b6e05c8d5207bc23751cd590ed3ac7f267f1489c0810c78c3c05b690ab8ce6 SHA512 4830c646aa22920250d6be4cdfb99cee15c833a6838655e83ec48d1d39198c47b304097d0458c5481c5ae400a58fa72c98257c5dc97784cfaea32aabbb8079fd
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/files/virtualenv-16.7.10-py310.patch b/dev-python/pip/files/virtualenv-16.7.10-py310.patch
deleted file mode 100644
index 27c17a07445f..000000000000
--- a/dev-python/pip/files/virtualenv-16.7.10-py310.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From b4aef0a53ba63c34e45413754705af4e438ef5df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Wed, 5 May 2021 10:59:02 +0200
-Subject: [PATCH] Legacy: Use sysconfig.get_default_scheme() where available
- (#2109)
-
----
- .pre-commit-config.yaml      | 43 ------------------------------------
- docs/changelog/2109.misc.rst |  1 +
- virtualenv.py                |  3 ++-
- 3 files changed, 3 insertions(+), 44 deletions(-)
- delete mode 100644 .pre-commit-config.yaml
- create mode 100644 docs/changelog/2109.misc.rst
-
-diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
-deleted file mode 100644
-index 0b8234b7d..000000000
---- a/.pre-commit-config.yaml
-+++ /dev/null
-@@ -1,43 +0,0 @@
--repos:
---   repo: https://github.com/ambv/black
--    rev: 19.10b0
--    hooks:
--    -   id: black
--        args: [--safe]
--        language_version: python3.8
---   repo: https://github.com/asottile/blacken-docs
--    rev: v1.3.0
--    hooks:
--    -   id: blacken-docs
--        additional_dependencies: [black==19.3b0]
--        language_version: python3.8
---   repo: https://github.com/asottile/seed-isort-config
--    rev: v1.9.3
--    hooks:
--    -   id: seed-isort-config
--        args: [--application-directories, '.']
---   repo: https://github.com/pre-commit/mirrors-isort
--    rev: v4.3.21
--    hooks:
--    -   id: isort
---   repo: https://github.com/pre-commit/pre-commit-hooks
--    rev: v2.4.0
--    hooks:
--    -   id: trailing-whitespace
--    -   id: end-of-file-fixer
--    -   id: check-yaml
--    -   id: debug-statements
--    -   id: check-merge-conflict
--    -   id: trailing-whitespace
--    -   id: check-docstring-first
--    -   id: flake8
--        additional_dependencies: ["flake8-bugbear == 19.8.0"]
--        language_version: python3.8
---   repo: https://github.com/asottile/pyupgrade
--    rev: v1.25.1
--    hooks:
--    -   id: pyupgrade
---   repo: https://github.com/pre-commit/pygrep-hooks
--    rev: v1.4.2
--    hooks:
--    -   id: rst-backticks
-diff --git a/docs/changelog/2109.misc.rst b/docs/changelog/2109.misc.rst
-new file mode 100644
-index 000000000..985f955df
---- /dev/null
-+++ b/docs/changelog/2109.misc.rst
-@@ -0,0 +1 @@
-+Preserve compatibility with Python 3.10 - by ``hroncok``
-diff --git a/virtualenv.py b/virtualenv.py
-index 3085d1d18..86aa65674 100755
---- a/virtualenv.py
-+++ b/virtualenv.py
-@@ -1809,7 +1809,8 @@ def fix_local_scheme(home_dir, symlink=True):
-         pass
-     else:
-         # noinspection PyProtectedMember
--        if sysconfig._get_default_scheme() == "posix_local":
-+        get_scheme = getattr(sysconfig, "get_default_scheme", None) or sysconfig._get_default_scheme
-+        if get_scheme() == "posix_local":
-             local_path = os.path.join(home_dir, "local")
-             if not os.path.exists(local_path):
-                 os.mkdir(local_path)
diff --git a/dev-python/pip/pip-21.1.2-r1.ebuild b/dev-python/pip/pip-21.1.2-r1.ebuild
deleted file mode 100644
index b1ccca2fad05..000000000000
--- a/dev-python/pip/pip-21.1.2-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-56.0.0-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.10
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.tar.gz
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-SLOT="0"
-IUSE="test vanilla"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-21.1-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-
-		pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
-		eapply "${FILESDIR}/virtualenv-${VENV_PV}-py310.patch"
-		popd >/dev/null || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local deselect=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
-		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-	)
-
-	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
-		tests/lib/test_lib.py::test_correct_pip_version
-		# uses vendored packaging that uses deprecated distutils
-		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
-	)
-
-	distutils_install_for_testing
-	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-	epytest ${deselect[@]/#/--deselect } -m "not network"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; from pip._internal.cli.main import main; sys.exit(main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-21.1.3.ebuild b/dev-python/pip/pip-21.1.3.ebuild
index dfecccec8ab1..8487817e8b18 100644
--- a/dev-python/pip/pip-21.1.3.ebuild
+++ b/dev-python/pip/pip-21.1.3.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/pip-21.2.2.ebuild b/dev-python/pip/pip-21.2.2.ebuild
new file mode 100644
index 000000000000..dfecccec8ab1
--- /dev/null
+++ b/dev-python/pip/pip-21.2.2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1
+
+# setuptools & wheel .whl files are required for testing,
+# the exact version is not very important.
+SETUPTOOLS_WHL="setuptools-57.4.0-py3-none-any.whl"
+WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
+# upstream still requires virtualenv-16 for testing, we are now fetching
+# it directly to avoid blockers with virtualenv-20
+VENV_PV=16.7.11
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="
+	https://pip.pypa.io/en/stable/
+	https://pypi.org/project/pip/
+	https://github.com/pypa/pip/"
+SRC_URI="
+	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
+		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
+		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
+			-> virtualenv-${VENV_PV}.tar.gz
+	)
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="test vanilla"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/scripttest[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-21.1-no-coverage.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
+	fi
+
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir tests/data/common_wheels/ || die
+		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
+			tests/data/common_wheels/ || die
+	fi
+}
+
+python_test() {
+	if [[ ${EPYTHON} == pypy* ]]; then
+		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
+		return 0
+	fi
+
+	local deselect=(
+		tests/functional/test_install.py::test_double_install_fail
+		tests/functional/test_list.py::test_multiple_exclude_and_normalization
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
+		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
+		# Internet
+		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
+	)
+
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		tests/lib/test_lib.py::test_correct_pip_version
+		# uses vendored packaging that uses deprecated distutils
+		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
+	)
+
+	distutils_install_for_testing
+	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	local -x GENTOO_PIP_TESTING=1 \
+		PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
+	epytest ${deselect[@]/#/--deselect } -m "not network"
+}
+
+python_install_all() {
+	# Prevent dbus auto-launch
+	# https://bugs.gentoo.org/692178
+	export DBUS_SESSION_BUS_ADDRESS="disabled:"
+
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; from pip._internal.cli.main import main; sys.exit(main())'
+
+	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
+	insinto /usr/share/zsh/site-functions
+	newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 1425b22ab048..49072a747278 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,3 +1,3 @@
 DIST platformdirs-2.0.2.gh.tar.gz 11365 BLAKE2B 53257c69f26dde3a0031c991cd6b5c72b361084342617f5c0590007a11a1d7d6e3c925dd6a8d73d3553cf1cc1d2b9fdf74fd0553d6b8891ef6b21d64bc0e256f SHA512 7cdfbcb4e37f2b4b551f3d685a40780518f9ba9c333cef0664965abaca320a10f6e944f967c0b0ba2d00e80df04b0e1e03426e6d1291e28d8f64128f50ebc1fc
-EBUILD platformdirs-2.0.2.ebuild 600 BLAKE2B 498e9ea8874b8ccff398599dd4df4a78240fd0c53292924352f8dafa5c07c530bdaefa16a98cbeec6fed55da7d48344c8077811e288b7186aa998af0ca4a36e0 SHA512 0253ac42806a5e34b1e0bb2c8e3d4be0ece79364665a64f96ac499f097144fd40829092c9398542f073c5dccf52d0fdb1bbf68536148ecc52982cec814ff7862
+EBUILD platformdirs-2.0.2.ebuild 620 BLAKE2B 835319eb3a94ab6adc765332197cb95ce33af57488016606dccbacc4b196c65200ddf4729e7759fdfd42aa0fa9f1a2719a2bd0df69dc58cc69dac5ff9d48ed5a SHA512 14af1e4e2f56da676be18c7289ad8ab39752ab610ff3d233366dcee5aa0c9452a01cb020c25c14ab6a4f0c95acc1a275bdc229f75556d8bbbb196440ffef94d3
 MISC metadata.xml 358 BLAKE2B 59aae3db7ff7375600e504797a7fe4dbd4c0119d5b3fa31ef523854d8a8cd54ee60131f9bac4f608dbb5740a1e9dcf27d47cca75c7c83de4850600eb02aae2fd SHA512 09d5618647fdc5104705ac94e3af0a3bac586e27105f95d14c827b10265355a53deaa66483c12567596c2c4e8285c1cc0520f5475a1404aca3b1d677792d7654
diff --git a/dev-python/platformdirs/platformdirs-2.0.2.ebuild b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
index 71db9d69770e..3aa5e9a22459 100644
--- a/dev-python/platformdirs/platformdirs-2.0.2.ebuild
+++ b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
 
 BDEPEND="
 	test? ( dev-python/appdirs[${PYTHON_USEDEP}] )"
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index d4d6c16ec07a..9a1a1445a254 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,3 +1,3 @@
 DIST portend-2.7.1.tar.gz 13538 BLAKE2B 56e9b7ae4fb9371322cbecf12d9367fc48f0138cf9fa8cb25cf7f0b7977d83852f328d89e93ee2e266e77b393bbabe75d091ce85f688e1ee146edf64e470aa60 SHA512 079bfc286491753e980b5000ee716031225439523a8d9a79c2571359adee74ee024dd680c41adb966487dc39eea3d0dbeb928c5c72fa21ab897283310ef21906
-EBUILD portend-2.7.1.ebuild 619 BLAKE2B 743aa383062ff970ee96202a7d93a5f912628abc817a6f8134a787719809719da112075769963fdc9a6adda2a82a4cd37e91c8e899c90436ece88feac6386559 SHA512 a43fb581be71325573f03e881afc417c0f2a4d984fa7e9c2ef489aa3c70b8c6ea992abd7fdc7e5bd9719619acee06c09efdefb0f9ce847785c2347d1a47ff3e9
+EBUILD portend-2.7.1.ebuild 626 BLAKE2B 69f1a66ca0d3493e177a4702e6dce50a299cc9d06684b46153a7ba896c459f00d90c35a2bca10f366c97ff7b3a77e4ffd29f92cd640982ae330c0cfcf37e3b31 SHA512 9812832570a8c36fee8c651768fef3ac61e14efd6d7406f495174817fba669064a0e42110601f8c9308cbebb696e650cc1134373edd517991cc5c9cd68ff99a5
 MISC metadata.xml 493 BLAKE2B bc4d9e79f1ff9387da6705744d7fce19c8b6cbccfc62878ba79b14312b3612598c6042c5f2842f663af254fb8977a60c34d373624604b69ccb2f861a2f5aeb56 SHA512 7db9144b99d487353a90f70e85d8800418eb92aab0678e934ffe92498c7b0e4c0f574dcf109f1a3ec2c7478174a26346152f15d57f15c9edb89f5d9dae2c788c
diff --git a/dev-python/portend/portend-2.7.1.ebuild b/dev-python/portend/portend-2.7.1.ebuild
index 22abe633fd7a..4618c5c00210 100644
--- a/dev-python/portend/portend-2.7.1.ebuild
+++ b/dev-python/portend/portend-2.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index faf9250e2d5e..f55c4a4336ec 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -2,5 +2,5 @@ AUX priority-1.3.0-test-timeout.patch 716 BLAKE2B b48691b508a4116c9656acaa3a3187
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
 DIST priority-2.0.0.tar.gz 24792 BLAKE2B c230f74aba3153edafba4bf85965a726ac3d3f5e2293d7c496b65fda260722cc44e4582666eee9d715e0d0686695434f8e0cbbd089c105bb45b777bf6eb4d72c SHA512 f90648a3ff1ee4131f30e99ecd8c36110abf484733f507edefcede8fdcb9ec3a618b9278e85724855709f41facee438061e4c5cae201b6e916c22f4a451db575
 EBUILD priority-1.3.0.ebuild 699 BLAKE2B 1c7cceec979ef8c857192b266b7470a5f60eede6da8cc232f6243e21ffb8387a3628f7eaa28fda944239458a59eccc92c8b4bfd9e3edf32f41717a353f7ac423 SHA512 d124b956e3f493146ceaab4b5c80ebaf83d19e94a24b3577bd90cb31fcdbc0e4519f579d8002e5eba21d48326272380f88f3e457bd5a1883cd395960b0f08906
-EBUILD priority-2.0.0.ebuild 645 BLAKE2B 40ed94bb8d68685f84f739b3e8bb49cabd3a7fe441a52d3105131c341393ddcab10340e028f8588317aabeec543958786bde6a41e85eadd09513a44acedaed5f SHA512 cb1db5a3be022caabb92fe8bca84c7a7edeab87fcd6ecbf6cc9679a055bba743de43ca1a296fb558b3eca839bd9c8919f90255d09c82efbf246cfadb1fc16a9f
+EBUILD priority-2.0.0.ebuild 641 BLAKE2B f4ea289acc3991e4d3bc8ce6d536da4ffdcdc678f8c56fea1d723c4c6c44c465c3c6c3324131bd74d4e05a780f17f4475e955ae6b829f301c05ce3453ab10e7e SHA512 ac6bb364b934773ccdcfc1f9a8a94bfbe8c1c126cc96efa7cb2042cfa2e6d6dafc5ad651a85f8d4d83e7767a39239cb597706c9008e25a5a6f0631d60fd551b3
 MISC metadata.xml 839 BLAKE2B 2a922ade07ccabbde2eaaeaac310e1c89206f7a6194ea14cd83f53182270edfd2cca4b1d13072d8a4c81c96563ba3b81251626eb777ced188bc9a22a37dcbffb SHA512 fbd62fe6b97e29566a18a29d155b8b08124d5c1561a21ad7aef7daac1a68b75b48b82d3edc612a27888da0d24ecde73b808cb90dfb7fe78ee97adc5fb507b003
diff --git a/dev-python/priority/priority-2.0.0.ebuild b/dev-python/priority/priority-2.0.0.ebuild
index ddf8d8fde3dd..21fab37fbf14 100644
--- a/dev-python/priority/priority-2.0.0.ebuild
+++ b/dev-python/priority/priority-2.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 BDEPEND="
 	test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/progress/Manifest b/dev-python/progress/Manifest
index 06ef0525b70c..d355dee6587f 100644
--- a/dev-python/progress/Manifest
+++ b/dev-python/progress/Manifest
@@ -1,3 +1,5 @@
 DIST progress-1.5.tar.gz 5842 BLAKE2B 235f02edf0f010b4460d36b868be2df0cf4685f360de491f1649f14defffd3f1789c6c036c05b91007efac49cacbed3de5cb38fda3e21d0fd633279b2066c4f9 SHA512 a9bee3498746233f874da2d6509d052882d9592df69c223637279a1fae40174a4dc279b56a7558e95ed173b0d357ae07752501c577a3cb9c79e0f87095838896
+DIST progress-1.6.tar.gz 7842 BLAKE2B 102f1ac481b5d5007d72b02f5451ad4bf7ef986be35034f68fc94108025ea274494d3d9fe56b9473c8ea6ca4abc2cfc458b453550d180fcf567f8a5c5feeafe6 SHA512 58a614bba5a7273a42ba5e9607b3a965fec17f26a4f24563d4c13679ea32b23dda7509c5da81a2a34bebeeedd91154d0457ab8dac95cc7a092add2567249cc94
 EBUILD progress-1.5.ebuild 569 BLAKE2B ae275a2cada0499ab37ff2780582cd357f7cf0a91814f4542613eab98fceb168dd43932623f0915c4103638dc11f253b6c04cf45fb024fe3c9fc3771ca56eb5a SHA512 8258297119cd24bc656813ea0b653d9028e6684e3981e19711039994d828d45ec415484fa33bb15a47eeed5b565f0517921634e19cc5dd1b7d801222c5255dd7
+EBUILD progress-1.6.ebuild 575 BLAKE2B 97d69f6b303f141dda4868fecee44670c48c8159b5b9ff97c2cf3b8a1380b9d7b1f90bc63b9afc96d0cbf07feb7764960e921341a50818426ebfdb67ba09fd4b SHA512 caf2b9f95cff30ae82d4ba95ebeca8d83fbcd710b7a59d09f12da0556b27716cc9e7cc5d090e614e34390390ec2cf8dc59faffba34b5ea20cbb5597a719f023e
 MISC metadata.xml 391 BLAKE2B 8c43d18b83bbba693a62930ea28e8b47f6cd4594e03aed277ba0744d94558e8f32a68ead65b311d1ffda228be6334cf88ce7a1171250ceaef59028785e95361a SHA512 641f3a01855cda8109b87dd9c845ab7bfbe0c8ca406cd8de947e817659b97e7ad0d902ab682620b63fd8eac749d89308d54cd1f666b6ab72687a897bf41c567c
diff --git a/dev-python/progress/progress-1.6.ebuild b/dev-python/progress/progress-1.6.ebuild
new file mode 100644
index 000000000000..4670e5bd5833
--- /dev/null
+++ b/dev-python/progress/progress-1.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Easy to use progress bars"
+HOMEPAGE="https://pypi.org/project/progress/ https://github.com/verigak/progress/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="ISC"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" test_progress.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pybtex-docutils/Manifest b/dev-python/pybtex-docutils/Manifest
index 2499b38417d3..b1c99ff7e2e2 100644
--- a/dev-python/pybtex-docutils/Manifest
+++ b/dev-python/pybtex-docutils/Manifest
@@ -1,3 +1,5 @@
 DIST pybtex-docutils-1.0.0.tar.gz 13627 BLAKE2B 5a18c29fb64f9b19deb4699017de17b1d4a112e0739d84066c4eb0df9d51005fe3b0132a7d1e46e3dad5b9b8e41340cf1a4da094ab20dd140cc83a3a53d82ca8 SHA512 d0054c5ed27a8c57b85963c5f3443d53fe8edab8ce2cf924eeac73240d662a6ac3cf74b2e38601d708809ddbf0984b3c7f24f177c67f77039bc236360474fa38
+DIST pybtex-docutils-1.0.1.tar.gz 14234 BLAKE2B 3c3946309ad19acb19703c0ecd7fce048808580df27ba39ce7acadbc0db154bee1f1e31d448015a8ebbbe034812e2f76fbed6f47a687c035750fc2908ca940c2 SHA512 8f84a822287e78a09b935a0f358b48e8a02be21303907fdce352515a844fe22dadb44646ca1abc44c8a8e7523c4f7074f3673fd6d565b178c862589cf58e9a48
 EBUILD pybtex-docutils-1.0.0.ebuild 520 BLAKE2B 35d03debc750b593faeef4fe364db5d62c7904d07047e0ea276419b20916a327227fb6c2cfa4ae1c01a0f6e003f981cd6e451704b52137fee4f4c775f53ad04d SHA512 1cf47850d12c4f4804b5f884650162219305ca68d49833791955c4353e8c2938c9c75216390642bd5b8701cae1ffb5ac89a149fb60ed6ea7588b10aa8c672eb3
+EBUILD pybtex-docutils-1.0.1.ebuild 529 BLAKE2B cf6bdac0501820a591e2fa424e9fc29d69ea2e3a0e09fc667a3e3c59fa43d77fc5f8e50efa0109511d9b5a1538805ce0f0004880b41beb7052997981d99ec7d3 SHA512 7ad018471351e33e13c2e6c388634686d82dfb1537ac6fe325a371864e9919a053b3ef7409ddbb87a4c06c3e86a7bbfe3d6f3fdec40f7d90bac4b8c1d8e9cf89
 MISC metadata.xml 427 BLAKE2B 4240ad89f3274e6c809181cf1cc798e2aa0eda209aef78f99f15a25de02277d33b430e1566dc849ba8a1e2eb65101ee8e908171c2f96f3c6a34fc72ee3bdc5ae SHA512 b7d4797d2e06dfe73609a4925c9796ced3f9efecb4c8faac4a0e2bcd7449f3e82804a8bd6debe1e898a869d7119a5d7b0de2e56b46ab1fc5672f4b4af76909f8
diff --git a/dev-python/pybtex-docutils/pybtex-docutils-1.0.1.ebuild b/dev-python/pybtex-docutils/pybtex-docutils-1.0.1.ebuild
new file mode 100644
index 000000000000..95945ba0ed3f
--- /dev/null
+++ b/dev-python/pybtex-docutils/pybtex-docutils-1.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A docutils backend for pybtex"
+HOMEPAGE="https://github.com/mcmtroffaes/pybtex-docutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pybtex[${PYTHON_USEDEP}]
+
+"
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx doc
diff --git a/dev-python/pycdio/Manifest b/dev-python/pycdio/Manifest
index ec818c08d644..ca8eb9901db0 100644
--- a/dev-python/pycdio/Manifest
+++ b/dev-python/pycdio/Manifest
@@ -1,3 +1,5 @@
 DIST pycdio-2.1.0.tar.gz 241434 BLAKE2B eb981fdf52b205e14c6dd353ac4aca9a9e82dba6967a53b9059f8a265ef80832fe7236d68b2af7a6e408665fce0f5ed3541289e0b7d282834c4feb8e6b428fc4 SHA512 dc18fbd212f7040b8b06efaf263b17568e9c2d089cff7dfc4dda50a7225059e44c9c86e2d81ade92cf09c823f7189b5723fb601cb12f0884dc04e9f5418c5927
+DIST pycdio-2.1.1.tar.gz 246562 BLAKE2B 7dbbf384f9d70aade922172c6dd070229c1ffc65a76a491c45f91ec176bced9af0dc0e08f50f8ad78828273de14166eae886b402f282a10bdad3f8302276ef01 SHA512 4c756b1c2f39332add86e01af129ccb608178306be42c9719c163b6bad0ba4de3916ac477c6866450890e094b14a2689a24e7d19bcf13846330555c2bb1feaa7
 EBUILD pycdio-2.1.0.ebuild 1089 BLAKE2B d50db41fa7d845782e0f22972c7888362bb7fd52192445685499ec131b0d7c35e109ae2fe061a67fdb0be1019d15d0478fbdfd4f1eec37209b6902e1650a744a SHA512 8725ca8e1de99a411a78b88a0a58f23af4c8da843f79c0c0d39312326d0190c88a7925c8badbd2d2ae3c5f332b0fd79a8b596223690bd8b7f93b3761bf15870d
+EBUILD pycdio-2.1.1.ebuild 948 BLAKE2B 8649bda8abe1d245b80abd9a4058d36fd0ce40fc7187768f16a86527b22b1ed8b7faee778cb4ab33644a9eff0d1ea7f5179eb31637d13ee454ee93eb320e5695 SHA512 6cf9dcd99dcc0a5dfa48b916f75bc01daaf1081a523e0961db38c7d2aa9e41933e65ce0f3edb71a92121985e148eb650f93ce56bd33c979766bb631603a8fc5f
 MISC metadata.xml 603 BLAKE2B cb7f62b66b44c9e5a0f761b69c44d94a8d55c178b65499c1ed5cf6854a2ef4ff774aa35ef047d84b03450ed9bad349f5591c13294e2676fde1e5a36b6643236d SHA512 6a259fc05469d51ca3ae442570ac2d1170bebae2c01466dd626579a83f9e7adc615c9eecfd2cba1542728cfdbc3e5a4f41671038c4a6584504b96a4be01fa979
diff --git a/dev-python/pycdio/pycdio-2.1.1.ebuild b/dev-python/pycdio/pycdio-2.1.1.ebuild
new file mode 100644
index 000000000000..635e1a54c837
--- /dev/null
+++ b/dev-python/pycdio/pycdio-2.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python OO interface to libcdio (CD Input and Control library)"
+HOMEPAGE="https://savannah.gnu.org/projects/libcdio/ https://pypi.org/project/pycdio/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="dev-lang/swig"
+DEPEND=">=dev-libs/libcdio-2.0.0"
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# Remove obsolete sys.path and adjust 'data' paths in examples.
+	sed -i \
+		-e "s:^sys.path.insert.*::" \
+		-e "s:\.\./data:./data:g" \
+		example/*.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/pydyf/Manifest b/dev-python/pydyf/Manifest
new file mode 100644
index 000000000000..e20804bfa80a
--- /dev/null
+++ b/dev-python/pydyf/Manifest
@@ -0,0 +1,3 @@
+DIST pydyf-0.0.3.gh.tar.gz 25610 BLAKE2B c236896e56163bb64267e28106a2058f0c6e85e918bd441537df9a494bd7b75c39dda247a0c4b99a918bb439f88a412763975d2d64ab4d8d7cfd0dab2d142f8e SHA512 bc72d5bf93bd4aff653b6496a07278c5ef8b22629f137f9a3dc8713dce4851d2772d4b1ae13d59fa0203c962405f93842e7d5159be1b276632419d6642add149
+EBUILD pydyf-0.0.3.ebuild 681 BLAKE2B b4d4cf0189e83502b333ee80d819255b5bcff3c29db9cda7050bc3ca395f2c1f453a9a57962b748e323fe656674b67a77ad09d5e35b3f79fed9ddfa6c0a0528e SHA512 27f34e058ccb48b64974ab898e37a1df85f3cdb1f8e48e47d19597a5023b4d2162eced02a1c239c3c5facf74e7b80bbdc7dc480062e7065fc9f6f8e19ef716a5
+MISC metadata.xml 345 BLAKE2B 84502c87aee0578bcc579a95ba2715afdf414125a7f7ed3497fb8929a701fe3c3fa3944b472c9778a4ea617f9cf94b893e546227add9b704e4245f814c5ab21a SHA512 c4d615019768b6ef5b2ff4f7d8736f1061fab264d05df4793f839bdc8e96c31bc12a43c8a78b5875976b8efc065c170642058fdd63a30103437600197efd1fd6
diff --git a/dev-python/pydyf/metadata.xml b/dev-python/pydyf/metadata.xml
new file mode 100644
index 000000000000..94f13647c9e1
--- /dev/null
+++ b/dev-python/pydyf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">CourtBouillon/pydyf</remote-id>
+		<remote-id type="pypi">pydyf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pydyf/pydyf-0.0.3.ebuild b/dev-python/pydyf/pydyf-0.0.3.ebuild
new file mode 100644
index 000000000000..0ecfdfd4412d
--- /dev/null
+++ b/dev-python/pydyf/pydyf-0.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A low-level PDF generator"
+HOMEPAGE="
+	https://pypi.org/project/pydyf/
+	https://github.com/CourtBouillon/pydyf/"
+SRC_URI="
+	https://github.com/CourtBouillon/pydyf/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		app-text/ghostscript-gpl
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 35ad4aed6ff7..e538eea11372 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,5 +1,5 @@
 DIST pyenchant-3.2.0.gh.tar.gz 75395 BLAKE2B bff9d4d5038252473fd7673758ecf1304f74f96514d984f5b6cd052042d0b2cf6fe2e149e3675777899107794c9d2fe1c630e87b031f38512ed2499ee1053f34 SHA512 63ca44aea9e7af3fecf554dc6156513c42d278a92170bd6b88b71a737def2e9fe7f7d2ecafd5fea2b860b4d5de55c9e8a6e4b30a58d6f28533bba71cc407850c
 DIST pyenchant-3.2.1.gh.tar.gz 75501 BLAKE2B b70a47484a7f242ff42aa0018f495544f9e7bdab904f835bd52533c93bc28b06ab155132158d2551b9c32eadee83418b6bcb70becee769653196a9bb0d13f130 SHA512 3d1229307b070fa83bd8a287a787b40edfba31e748ca37a94f71caa4b355a9de829f3133db9772a57f0aa922fbd4f32c67c986e86c8905633b3940dd20be32ed
 EBUILD pyenchant-3.2.0.ebuild 632 BLAKE2B 87b17e54a5a4993a3607c153b015b64b081eb4d512f12d0fae660a8b806188c3ca372762f42c71fbcb9d2379e0c84ec67f5aa9f55e1db54e25f1e0d2169d5093 SHA512 8c7a4d1c799f2b7af00cb65e9edf831fd8a4b4a202746113e6325d03a0e76a1f65c9764511d825888846e5807e0478fc581aa885a129e9b77cebe98d474d1d50
-EBUILD pyenchant-3.2.1.ebuild 639 BLAKE2B 955a8bb7660a7dab3ba2b6e0813d50bddc54cf66a3ff1aeebf32f903b255e6fe68dc2a922cf39795b38c600a8b7528333d996b6654801e48dd554d242518c2f7 SHA512 3424b2de308142d1fc2a673eee77532bb28ca4f84d238c6192f3a1e8fa0d6e2a1951101ac5784d8efd7ec715568d080d7cd8d4637d60f20c43ebea1eca3a4a76
+EBUILD pyenchant-3.2.1.ebuild 636 BLAKE2B 4a90ba0d1a547a0877eeecbed4417683a47d0bf52230d5f5fbe92c56678e76636660ff6cf88a0590dedf9cc73d59b6718087f4a071294d5f25af707314b69fc6 SHA512 77eccbcd8775979d47796fcfa8519022aa6f55f8a6f29ba0fa1ad369b17cca4a0ffbfcfa59ab6b716c1759bfbdfb83112d1245b7cfad7918030a66f8f1c2537f
 MISC metadata.xml 876 BLAKE2B 4b2b615496f92b395ca4449e8caba7860223101e142d45f3eb703e829d34b27a0e7b3965f7362739ffc16a61d4e5f495754415047b41473303982eb2bf35e528 SHA512 7e69e0da10236e15c70526eb35b2ae8d862109e3aaa81a2613f5a97ba08816eb71e76a845a0656dbe2a6bc92b45a79ab018386110aa7fa0687b3faba18c63129
diff --git a/dev-python/pyenchant/pyenchant-3.2.1.ebuild b/dev-python/pyenchant/pyenchant-3.2.1.ebuild
index d8534c8b1067..2b5bd2833aa1 100644
--- a/dev-python/pyenchant/pyenchant-3.2.1.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 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"
 
 RDEPEND="app-text/enchant:*"
 BDEPEND="
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 566a83fed958..d45e8ba27630 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,14 +1,6 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
-DIST pylint-2.8.2.gh.tar.gz 734667 BLAKE2B 1525273298f39163de4db7946a749768cb9bcf7e11f89791944ccb5fb8d0918eedfc80d5e559d33934d468dd5781d4cb4921b9407daf2842613a8e3ba7d134e0 SHA512 7023603668f540ecc0b35f3289377855c4c0df01e04a9af255f5c8031f568f6b76508bb3a7f0aba8e76a86b63eae423908c30f47258d6dee46bb23320c952701
-DIST pylint-2.9.0.gh.tar.gz 768301 BLAKE2B a86ccb83d3155acee0165dc7b0095f5b7741c62e7b1f127349eef643cd1d0513ed2f5aaa89d78728806f03b08645ed1579aafb073d649e928d4c415e50dc8a49 SHA512 b524a3d3241702c1fc34ca9ee38815d02e7f4572d8ff3c132141ac7d9c7ff59f88995b92ccfcf18fd57e04be8f24571ef0ab99e6b4ce615f0f6957022d1d1467
-DIST pylint-2.9.1.gh.tar.gz 769124 BLAKE2B feabb520c22722df73471e87e05f22f0fb937113c9d02e39bf4e2554479c58a5044afe565c107e9478d868284b8875fec65b976633dddb4bc9d7748b35640218 SHA512 7aea388c6e62fd53e6775a4732da87269f3df22f995241621eb9b8d72c8573b6a4fa9545b1553db91f09eee013bd695e075d69c35436b05623576f13f1317cb6
 DIST pylint-2.9.3.gh.tar.gz 770364 BLAKE2B 3892286ffbd79b417c6decba44bce97f45192299ac8e2ec0e24770b2dd6cf1c28bac790626a478d47a6124ec0470ea9fc0d4230c5a1e807532852844445bb95a SHA512 45c037b970b66254b54a4810a5609dc098b5493d409826333e6a75f9ff0fc02921162711d88c45fd2f437e6521f639c33b25b714830a977c501612ee497501bb
-DIST pylint-2.9.4.gh.tar.gz 777252 BLAKE2B 84bc535b3c471be5d01a02ee67494d993cc257f0938e1bb0e35b1d64415d256c4f0dabd45cdc3319716c67e5e71ea935b63633f56b97013bd8616296343709d5 SHA512 9b5db20cf2d858e662c309b11cf28bf247b7c5f90de4f747733a0288ff4acced02e0e6b83145e7d940772eb9debf297b9ee6976e0f3ffbd73aaacaa3f4cb51e6
-DIST pylint-2.9.5.gh.tar.gz 778090 BLAKE2B cbcf5427665f56cc37afd08fb537fcc3f17697ca7cdbd7da97bad4093f344c9b961a156f5d141e070fa84c7e07293175a70585a8c996c9cffb7cef80717752af SHA512 84695bae88704391752f4b0944e39f5b44933fee8d88a8839729845b93bbe59876da08ab98645217c4ff2a98fd793a92063123b25a595fb332ce0a3943bcf7e7
-EBUILD pylint-2.8.2.ebuild 1747 BLAKE2B a3bb2622c8b0c0efc01f6a768b1810f4c2e5abced9f64d74bfde68262ec499bb2b27f92ca54d53e90c56ddb285e1aa557cde18a1aeece020d6635a601847dfe8 SHA512 7dcc3c7ee9bbfef1251fd49e94e8ec4298c000fa3765fd63ed8737acaf33a59ea36ea655367685c2031eb2ac39e1a604db3d865ec5a2aa54a2b8f368a5e458b0
-EBUILD pylint-2.9.0.ebuild 1614 BLAKE2B e80781de4e7f7659a3ed4eb7b97babc20016788f817f8f46ccada5fc51125523b025b86328b3dae86db97bca1f04ea571318deb691db8ff9740608ce5413c7b8 SHA512 d268f97c235d15eb981eb9c68d3f21837ff3df5b87f7f9a1a7febffda82d1bc99c6a3a9e8fdd470ae523ece06ca351ec232eecd3adac8db3ba098fb320f490c3
-EBUILD pylint-2.9.1.ebuild 1417 BLAKE2B 5bc256a51f5f1789798601c125f28ca97f91de685cc955d687ebfecbb4acd3034f23c722356d2f8e8ba0e5b1aa1c2f7c396a06c5f9458d2ebfc2217cc870b406 SHA512 8508781be857a114574609adf5cf483e199ba21d5fb95a1e553ebf3c9a2a84d683852646498bf9d794d5a0e719206f5dc854e72cbebf402e41f4bb90ec28f367
-EBUILD pylint-2.9.3.ebuild 1424 BLAKE2B 52fa7d9843bba9a2a65c6fff4c724be00f92971707aee9ce9ce601bc8b4beb8ef29366b3be202e773b4f8fcfde58f14afb36061d6a8c7a6d41ebd9cdbfbc725d SHA512 d9721d86a998d9c5f0942a005718d5f71178747916d96b8fc8d170d52fd39b41f7dc6032751d901cdf9f737a41b3c8d4781b9481eb24438aa3543b270c1e2613
-EBUILD pylint-2.9.4.ebuild 1424 BLAKE2B b2275bca805d7f1228f2efa04885e523340ff1977617657e6f69612d532aaa93536d06bef8b920fd31f695698877797596d24fbe11997df3900b6edca10cccaf SHA512 283cd629c2075238db8e2de55308b980d5c8325fc2ebe8e4e0b8996a5990ce7567a99b792e9fed855f10f587d54badc99beb9555385be78a9695b04c97cbe3c3
-EBUILD pylint-2.9.5.ebuild 1424 BLAKE2B a8e024e6460e91525470f51b6010e436384a0a8b44c86af88553aa2a60d7b36c16851566f1a90d6c7cbafed48fd839c6def04e871790c525e672caf6bebff244 SHA512 901678329e3c7a09be3d0d359d3b692ba5663d6f361a84db07c583a3f58525a73d43f044f12f675f937b06b00ce443125f1f26500f51b9af06625b975daf30f7
+DIST pylint-2.9.6.gh.tar.gz 779390 BLAKE2B b1d8794e1e7ccdde87919eb943f83287c0a7b85b67f3722cbbe68887f2c61ab30b354548e25b70c661234647e35f79beb6aaad5f6be6bfde8c2475cf03676922 SHA512 a23ff089853398df2e4232767ca87c21e4ab4fc6805de80db796c78c56e0da1ade9b0586f5c14a98524bf607e0d240c354cf63287eec7dfdce263188eb19ddce
+EBUILD pylint-2.9.3.ebuild 1417 BLAKE2B 27113579fba476d9e389e1186e39016c40975478f61f6a8ad08a01cf7a1a121d3361b78a968419f92cdf075df8e89a3aed6bc48cf40066c7d2650ae5b2ead861 SHA512 79761e88e4234e352575ea1d26afaf52310ac33e08ed6bbd47d82e7fea4046337cfe00189a0f11747e40e19c09e9121be33526d88bce7c74ffe5bf2cb878dd21
+EBUILD pylint-2.9.6.ebuild 1424 BLAKE2B a8e024e6460e91525470f51b6010e436384a0a8b44c86af88553aa2a60d7b36c16851566f1a90d6c7cbafed48fd839c6def04e871790c525e672caf6bebff244 SHA512 901678329e3c7a09be3d0d359d3b692ba5663d6f361a84db07c583a3f58525a73d43f044f12f675f937b06b00ce443125f1f26500f51b9af06625b975daf30f7
 MISC metadata.xml 1099 BLAKE2B 11aa1f9ede89bc8c27e520c8fe9a8219aeff70c1f456dedcc816217fcff1ec67ecc41a528c93365cef316ec863466b706d4709dcc1237a3aae4edb792e2be7b5 SHA512 d2b4e51b129d7c83727310da44ca9385e81fdaeb350f63560a6a328308bcdcb939ec4e570b02e255fe6c8f68cabeb0d651994058b385598380edb42932785ad5
diff --git a/dev-python/pylint/pylint-2.8.2.ebuild b/dev-python/pylint/pylint-2.8.2.ebuild
deleted file mode 100644
index 9397b75c7271..000000000000
--- a/dev-python/pylint/pylint-2.8.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.5.6[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local skipped_tests=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-		# Fails when graphviz is installed (?!)
-		tests/test_import_graph.py::test_missing_graphviz
-		# TODO
-		'tests/lint/unittest_expand_modules.py::test_expand_modules[files_or_modules1-expected1]'
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.9.0.ebuild b/dev-python/pylint/pylint-2.9.0.ebuild
deleted file mode 100644
index b874f1067834..000000000000
--- a/dev-python/pylint/pylint-2.9.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-		# Fails when graphviz is installed (?!)
-#		tests/test_import_graph.py::test_missing_graphviz
-		# TODO
-#		'tests/lint/unittest_expand_modules.py::test_expand_modules[files_or_modules1-expected1]'
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.9.1.ebuild b/dev-python/pylint/pylint-2.9.1.ebuild
deleted file mode 100644
index 72070de692f4..000000000000
--- a/dev-python/pylint/pylint-2.9.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.6.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.9.3.ebuild b/dev-python/pylint/pylint-2.9.3.ebuild
index e32124a3c572..bdecb18a46f8 100644
--- a/dev-python/pylint/pylint-2.9.3.ebuild
+++ b/dev-python/pylint/pylint-2.9.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pylint/pylint-2.9.4.ebuild b/dev-python/pylint/pylint-2.9.4.ebuild
deleted file mode 100644
index 5c1fdf9d9f08..000000000000
--- a/dev-python/pylint/pylint-2.9.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.6.4[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.9.5.ebuild b/dev-python/pylint/pylint-2.9.6.ebuild
index 75d26e73965e..75d26e73965e 100644
--- a/dev-python/pylint/pylint-2.9.5.ebuild
+++ b/dev-python/pylint/pylint-2.9.6.ebuild
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index 65ff1e99c27b..f2293099d821 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,3 +1,3 @@
 DIST pymysql-1.0.2.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638
-EBUILD pymysql-1.0.2.ebuild 4160 BLAKE2B 3c7812f5774df3a45f5acc10cbeaa1cdf9207c2755d50767bdc1b1b92ee7d66ebd9602df586238be5d13989d807f80859acc7562d270ae7f244a2dd6d3f7a37e SHA512 9ce8fd728b4daf8e2501506bd025bedb119dea7559493157ddc66e4e4faaf4e7c69284f69968263a7c145ce1c21a9a857cde4465a904ea11aaa3d6237a73ac7b
+EBUILD pymysql-1.0.2.ebuild 4167 BLAKE2B 81a641b265451273fdccd52089ae2982b447f719b47e65882454431363a0817d17f0a961cf54a0a6554f4bf078a1de8c6cdc99c218ea0466cdf96f752d8ad85a SHA512 b0a796d130ab03de9869e89ac8f6f70a38746dc6d85641b3fe427bb26a08a8abfd220bb6b3bb5409c3a7ab520baaeedf760ece125a8f5689f38566dab6e5c490
 MISC metadata.xml 493 BLAKE2B df91299acd855c04a29b3c0cf33b450de6a9687b3c45a0c59cc55a69c544d561f107da1d90a1b52dffaa13fe218cef978edb4b7036eb62651da7de39568fdc00 SHA512 ae8cbe0ea29c8457dbbfd4cc21169fce54b868f93045f5ebbd9c8909b052c7efa2cedacc1ba5ec13d1ab9476b39cc595a52ee9ceb489b6aec3f824f2027fc4c6
diff --git a/dev-python/pymysql/pymysql-1.0.2.ebuild b/dev-python/pymysql/pymysql-1.0.2.ebuild
index edfdfad33fb7..16e67d735237 100644
--- a/dev-python/pymysql/pymysql-1.0.2.ebuild
+++ b/dev-python/pymysql/pymysql-1.0.2.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
 
 # TODO: support other mysql variants
 BDEPEND="
diff --git a/dev-python/pyotherside/Manifest b/dev-python/pyotherside/Manifest
index 1ad3949b8edf..794bb1ba9e82 100644
--- a/dev-python/pyotherside/Manifest
+++ b/dev-python/pyotherside/Manifest
@@ -1,3 +1,3 @@
 DIST pyotherside-1.5.9.tar.gz 185230 BLAKE2B 7130f17f29ed07cefc641d77631db46d08f3bd836c8517427e38fb454cbf34c2e875bb46798b3d785aa68064c24f154ed166617cde263f722e77eac6d0903980 SHA512 62c171b273b921d8e0220c7b73f0ff95a0a911eb3785cc37f3dab2ec624e54301ac5fbccfb57cac6a4bee967728624d4738b03aff0c5762452b99674cdff6ab2
-EBUILD pyotherside-1.5.9.ebuild 803 BLAKE2B b86f230984f73339fe89344d87782b22886af45181b19a98f4e14451fd3e19a118a5450581f11fbca9cd952ed559ee31df742c475d96c285cb7cd1cbf96044f6 SHA512 e34ab147d78f016d81f15d44bf453fa7e12f64433229500f70d7738fc0b544ef37928f0f41ce63f59be7492587eaddbf87197f4e7c114246a91f061da6ac6976
+EBUILD pyotherside-1.5.9.ebuild 803 BLAKE2B 37b499118ea6679ff3a4a361682cc5662e3095443204818999467223335a7ea9477844672dbcf6b18c193e76cbe1645fe7ed34c49aa60b9b150f546ad5462818 SHA512 e92085ae7cc0f10884bf67134e314584bb4c95f79c8a82e5fb96ddb101637e158cd9639848d146bc73f3528b8c7af44c4a2e55935f96ca9d4e0a0bc4038acfc1
 MISC metadata.xml 257 BLAKE2B fd7fdb57fdce3a565a08cedc4d99216724e4013515d77ea89cb41a5c01e8f5479cab25fe53d44a705e3a71164cdc3c93e658e61deae654a13e5c2471dd83c57c SHA512 35e59430f93d3bb2e7e3042a2464b84f8e6cdf1e1624c1e7674bfc5147f9b9694da6b39ac081ed5fc22f1623aea889b743cfee11007911f3c8c17cf61443675b
diff --git a/dev-python/pyotherside/pyotherside-1.5.9.ebuild b/dev-python/pyotherside/pyotherside-1.5.9.ebuild
index b461490aaff0..d049997d34b9 100644
--- a/dev-python/pyotherside/pyotherside-1.5.9.ebuild
+++ b/dev-python/pyotherside/pyotherside-1.5.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit qmake-utils python-single-r1
 
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index cb7c12215809..a506cfe8425a 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,5 +1,5 @@
 DIST Pyphen-0.10.0.tar.gz 1894118 BLAKE2B c33283d6eb3dd7affb52b91826fa0f8fab8ec8f858158e905e8487dc2ad8c77a88e4b25699ed6272d246bcf8a926560e18ec224f59703452ea1ad5c921e4fb4b SHA512 b6d789ca6eb010c1c79b28a9a0e68620ea5600adc43111bed5dbda3cb8b3a4c8c05caa3fb44ea60b0ef4a20272f17cf5e6fe61f0d1e48038395407ff53da7a92
 DIST Pyphen-0.11.0.tar.gz 1967507 BLAKE2B 0bea108e78894082f59693a4ffa6c7f9f6aaec5fc10d0ecf4dc9b6c12fbcfde2cdd835e813b1041797cbc30d5e6e33f5626a517e8cc0535a7a001c8ac779fa4c SHA512 cdb4ee065698e27a4662984b76ee5c494c0d8e7d6b377667399f40d0dffc2b1d730956f3fa1fe73a08c17601152c99321b6fd5dd4d48361c54e9a6b635f02f0d
 EBUILD pyphen-0.10.0.ebuild 515 BLAKE2B 0a1542e49d1116483571bbc7f6fd921f86646f1dbdf9741a5b5224a46796678d4442b9166818ac50ae8d6664d66962da3515539ee34d1b0fbdb96e567e9de494 SHA512 e68b9996049d39c91d52842b2180017f2a066808b75f24c59ed1fe46abb81b6acff6cc72878272fc64290cddd29d5d4bf4e458546555adf289649a079c5c21c5
-EBUILD pyphen-0.11.0.ebuild 708 BLAKE2B 4eac85ae38801013595b822e119b9dde4c0b05ebe3cf9b5a056a2d62b8be1465e4a39318c8474243de8ddac8db83b2859055cbf545641811e4b5a0cf19db13df SHA512 d12540e3e33b823d1d1b2b0c2fb2d3d0904a084903406dfdda686c3de9cc8a2a35c8a53c8f01b9f87dbde4f93a289e6166d1ee069ea44e3d27e77375c1008399
-MISC metadata.xml 409 BLAKE2B 3ec65099621f94904aea69465bdc2163554677e4312d51f925df9d792deb790aa1511b0c9e8fa86a4416f083b1f8b0072a71b88480c46e46ebe30165f560a63f SHA512 4462817e8689c52a47fc71cf2f73204c8a0963bffed85fd803993236aa2d36924c92a232d0bee5b3153a6dbad85c5808c2cf42df5ab8b6bd585d5045650802a8
+EBUILD pyphen-0.11.0-r1.ebuild 708 BLAKE2B 32e73adf13df43c0be9171b95a05c2524db44edbfed1585f384b617e77d284df4babf9dcc7d372c65fe07072ef67055f3829c20f2b90576c6db566c702234595 SHA512 b9e3c6dbd30105a317f4674212cd5ab3a9b8f0cb16e10c3f1fa25786401b0e5f61c5cb55fa668abb2fe8a1dadd44274c333d668c70a68ad34d647b26adff2c9f
+MISC metadata.xml 497 BLAKE2B 9b11a388645cedd25ed7735fb9e383391020c34b7a8d2d1518f14da7a470a1909fbf847dde332b6744dc4c9bc0fa6d024eb1f4ded55a9b85a2d522ea771384b9 SHA512 10bfc4fac128f5c2fc932bc9ea6d507df066e6d29153cd319ad1bed1c41d0bb839414c21e9ff1dedbde232e5d791cee754986e7ed934d4df7e9a3a64622ddb71
diff --git a/dev-python/pyphen/metadata.xml b/dev-python/pyphen/metadata.xml
index 280fbeed7d1d..c71a7cb4d0aa 100644
--- a/dev-python/pyphen/metadata.xml
+++ b/dev-python/pyphen/metadata.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>whissi@gentoo.org</email>
-    <name>Thomas Deutschmann</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">Pyphen</remote-id>
-    <remote-id type="github">Kozea/Pyphen</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">Pyphen</remote-id>
+		<remote-id type="github">Kozea/Pyphen</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyphen/pyphen-0.11.0-r1.ebuild b/dev-python/pyphen/pyphen-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..6483d12818a0
--- /dev/null
+++ b/dev-python/pyphen/pyphen-0.11.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
+HOMEPAGE="https://github.com/Kozea/Pyphen"
+SRC_URI="https://github.com/Kozea/Pyphen/archive/${PV}.tar.gz -> ${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	>=dev-python/pyproject2setuppy-18[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# avoid dep on extra plugins
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyphen/pyphen-0.11.0.ebuild b/dev-python/pyphen/pyphen-0.11.0.ebuild
deleted file mode 100644
index 9fd945456c9a..000000000000
--- a/dev-python/pyphen/pyphen-0.11.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
-HOMEPAGE="https://github.com/Kozea/Pyphen"
-SRC_URI="https://github.com/Kozea/Pyphen/archive/${PV}.tar.gz -> ${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	>=dev-python/pyproject2setuppy-17[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# avoid dep on extra plugins
-	sed -i -e '/addopts/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index ad2ae308508b..0c47e24dd3ea 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,3 +1,5 @@
 DIST pyproject2setuppy-17.tar.gz 12191 BLAKE2B 5be19c9e70abf37d776649237581b1cb281331585c6ffa312f63e50bd2fd8104972861b38958272d5eced086b2a60ed370437807d1eeb382e4ad0cde5f03b0db SHA512 0291f9ad1c3059a4ccd366d8f1078ffd57de89cc128e996126f62a92ac4dded9c7da25be1325ca9f660062ba3a65fd01d62d4ffb22084cec7f4aba79e552ae2f
+DIST pyproject2setuppy-18.tar.gz 12566 BLAKE2B 424aac4c89f498cca61b18bc1e8da3dd72324014d04b2a1e0b7d9aad48b445ddf95117902f6f2d80f9c0e1f3ac808d22dc62b31a2bc41f59820765e49de56a48 SHA512 f29f262ea59cccb698e82de630c8de40fae5a758e71b741c5c5e26639813bc45de13d1479b92a92aaee24edc71ea6f66b0484bba765c4d66eb10e0487bdef080
 EBUILD pyproject2setuppy-17.ebuild 781 BLAKE2B 7777a59955f823ae46991f592da9815467690ea129b0c68449e217700f8e5af25de53407c486245367ecb104a1e8ba570237881de37f9e569a7090ebd5e78386 SHA512 35d001fa3ba56ca4ce3748741dcc1c0761385f1416bef7f8d246d62ded57b94b38c5b2c12343d1635198d9dd1114286952f26e93e3a0bf947487750a84cc8f94
+EBUILD pyproject2setuppy-18.ebuild 789 BLAKE2B fe0e00600f65bd19118748c645d47c6bdc820037a301c847ea5070e7d6d73e469130fd9fbabc01facf39bc93dfe3edc7ebcc5c2c9511bda969eed68d03d228e5 SHA512 2e839ed0a1bd1e69ef9d505c0e2ff0236e093d76bb1018908f08207cb9830bb018c2d1ed8f511e6ac78f9525b533c1a86708b74f2e69bb0dcf3f2277a41a9293
 MISC metadata.xml 430 BLAKE2B 934e5a791bb16f3717ace5fa869aab4998938109ee14ca1ae0c9c378d67366060b705ff4430f3d267d33c04cf23ffa0b4c1b2654b2a95d586fc22ab4fb43f8f9 SHA512 f52d07edc973dc7665be77367cfdc37d92f27adc730a327c57374b54b60f77802b79ca5f2ebfce2c687090763224e5939274dcf4fa2555834c580cb06c32419d
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-18.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-18.ebuild
new file mode 100644
index 000000000000..bc478cc41369
--- /dev/null
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-18.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
+HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
+SRC_URI="
+	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index a6244514294b..dcbf76f4a52a 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,4 +1,7 @@
 DIST pypy-exe-7.3.4-1.amd64.xpak 13659131 BLAKE2B f8dc0875bec1027fd86499d13e435f97bd015882260b449de279ef41f8b8e9b89fc6e9f197539314ada54e2435a2cb7e7baf3da6e47b872d6717c847c3b7ddcf SHA512 e14312457c1fed4d815c7dee0487b5d77e781b3139381a142156e6fc524df7e7f4f613799a570716d89c95fd704ecad3c095f839296d7c1e63bd675aaac2c92e
 DIST pypy-exe-7.3.4-1.x86.xpak 10291603 BLAKE2B 62e83aa57b176a02a64a1826515763c24d008a02733ef32040ba2c908dffaca371cda3f55eddecfe93f45c1ba52aa7d0ccb898d84f0dbf8ab004f8a79a3814bb SHA512 73c6481530f4c4305a16d12995b11860023f7516737f892df7911d1effd01142c22f2318fb3b392e2483b976fa2609dbff37b61ad8847e395cbaaccbac0301dd
-EBUILD pypy-exe-bin-7.3.4.ebuild 1089 BLAKE2B e5ae34937ba2774e660e91fd3ca1a1a4e11d505c0ad7783bf7ff24d61bed3138965bc769d01c3fcf6413664f92f4819747fb96badb6c489c730217718a5e4685 SHA512 b85514d575478a4f14dfc19dc389a563d96e91e57b38219b5d65c6a75dfebd353bc19a806d3701e23e79a9d83b038fdde5cd09960c655834ba7a7bae15e944e0
+DIST pypy-exe-7.3.5-1.amd64.xpak 13646862 BLAKE2B ac2aecdb15d5b73cbd27b8a295ef5f11895ed7f897cda93cdff96c72ad727ab7998332231a1166100126ec2252b7c5b69e6b5bbfcb3e7fcb7738f5967809f5d8 SHA512 346f7b47d0e48799edd0e00b6bf683053ccaf20e6663ddd01e5753703082035cb4079a3539981813fc54abd7f83456353c38bd733dacf782e59a6548f861d1a7
+DIST pypy-exe-7.3.5-1.x86.xpak 10297092 BLAKE2B 149672f5714959deeb790b575e7980c1281b1cf37c0853e3ddf8c150104b2da0b8d32736eacc31f67d4d522902599e64bec7427727e560d8d54bbe7c5bd9a06e SHA512 48e4858489e928d44dd8570b783623eb33ce7a1fb62b2a054cd2841ca2be8ab7dd3bbd00c3aff770c1f8dc42ef52f52da3d18c5c27ebd08d19e78bdf56081e96
+EBUILD pypy-exe-bin-7.3.4-r1.ebuild 1126 BLAKE2B bd04e885a90a599f9e64d86460ec8f74abf622d83cd8eefccfcde349ed06f67ecc956770133af99fb48533fd2b8235e54bcef2a719fcab696759213a009c950e SHA512 eb58e00a86ede3626a7c8410ea2e6edcd7bd074f6095d44ad3cac985f9fd94ebc575606fbf31aba375cbeede04f2f8adc2d0aabb3019bae74ec362fa0d26f0b6
+EBUILD pypy-exe-bin-7.3.5.ebuild 1128 BLAKE2B 0507740d1a55e866814928a0d02f62293870caf4bdd0e6dc2639ffed421698f7277521bef8cf67ddef37864574e082d13198396b338d7b67cf8bab32cb988f70 SHA512 98a8fabf20ec50ddd8213eba6d1d5f0015a2543657dc330ec9d62e3fbb806ffd76d07ece7eccc5cea01b495bed6a9fcf05481151c33ccbfc793ef02502ec9c5e
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4-r1.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4-r1.ebuild
new file mode 100644
index 000000000000..fbee1716b1b9
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy-exe-${PV}-1
+DESCRIPTION="PyPy executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	|| (
+		dev-libs/libffi-compat:7
+		dev-libs/libffi:0/7
+	)
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${SLOT}"
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
+}
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4.ebuild
deleted file mode 100644
index 3d0b3fd13699..000000000000
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils
-
-MY_P=pypy-exe-${PV}-1
-DESCRIPTION="PyPy executable (pre-built version)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
-	virtual/libintl:0/0
-	dev-libs/expat:0/0
-	app-arch/bzip2:0/1
-	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${SLOT}"
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c-${SLOT}"
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
-	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
-}
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.5.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.5.ebuild
new file mode 100644
index 000000000000..9b5d5b8367c4
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy-exe-${PV}-1
+DESCRIPTION="PyPy executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	|| (
+		dev-libs/libffi-compat:7
+		dev-libs/libffi:0/7
+	)
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${SLOT}"
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
+}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 454a70fe1850..639b6263909a 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,7 +1,10 @@
 DIST pypy2.7-gentoo-patches-7.3.4.tar.xz 7844 BLAKE2B d06694fa085667e40ef8805c29f7ccf95b49f9de4e99e3ebfa3d69c4202a0ddcebb54c524d7d9f9ec67573a8d2ebe38fb7023d4d3ecef67afc907ecef5c16c02 SHA512 aa8ffefb5d30070ae86c1c14c55c277e39d3da66aea3a0951319158fb65e716e7fa7864e8bf5d26314d4b2a8030c766b63cad6a3663822d2875cd8cc1f3f2de5
+DIST pypy2.7-gentoo-patches-7.3.5.tar.xz 6928 BLAKE2B 41aff14411882e60102866a41de6a2c13983d5489c9ed928e2823714883b5cca289c093426fdec35b6df8d17de7a96528d799e10412a0f2f02563e152acf24ea SHA512 f12c1a414cf40e86e9d2a7d1cdfaaacc1045f8043da479b5270ef983ffcf01418a70bbd21ae740abf544091cdc5026bffe467d631242d5e9e0863a64fa8d026b
 DIST pypy2.7-gentoo-patches-7.3.5rc3.tar.xz 5796 BLAKE2B b1c0fb0a8d86d117a9d4102777605eedd026b614f4b66272b3fc5da246bbe5edf516e95a40471117b61078c18b9fc615e55e0992a5d0a1be7caf9026ee26b6be SHA512 8699813837dfa4560a6e73b96f770c5d5999ce008e17cf62a856a454cb0b63146787a54934874162c79345488959e0936b3bd03823bc9f8e276f80df1122f7a8
 DIST pypy2.7-v7.3.4-src.tar.bz2 21571561 BLAKE2B d0ac56fadec63fe7e65728c36c2aaf96fc5f54919dddbca9571a24c42a9e3e21f672f84555a18a384c4715f0489bd7aef009c0a47b635de88c472a93e2ae8d71 SHA512 4c18c2dbfbf0cc1034bea773828204df77aec7ef82119fb94e5cb762ce1783e00ad70e99d1432b4948dc132e726bdc6015f4a5bf10a5b10415bcfe99da2ecd17
+DIST pypy2.7-v7.3.5-src.tar.bz2 21572184 BLAKE2B 388b8623c2c5de839dea0e60acc5e11a6a774b4a6cdc051691053a97fe13ec12c6735a4be64015653ef420c0d8af2c79d8faa90a7dfc3042e29f35f4e1ded6c3 SHA512 a30c666c29eec7cca7e2e52f26480958b5885cd59c6b2e3d3c0d8c1cc55c298e878fc95f88e38a4297bb3d7d1cc1f77470de958e5acfd317e1fc8bdd5d013dcb
 DIST pypy2.7-v7.3.5rc3-src.tar.bz2 21563312 BLAKE2B e343dcd617026ea5f951f3d24deeb59736c9a6ecc91d1b9c1bd980b6f3c239a5bf0edb9b72a0847a6aeeaead8aca9ecf537af81c9fcf0a2f6647c99edc0d1735 SHA512 e080771ea10a30820f8844b3f512a7681f2e619e8a37fa8ac60198f3c8c3780a8e08aa63749be375c00cd547994f428df44e2cd9f61b272b215ded433374e0a1
 EBUILD pypy-exe-7.3.4.ebuild 4300 BLAKE2B 0b02d3c04a0921c1a0de139ce1ea6990c923931641567e57a5827e40f87d8538ca2d0f500ef062260b43ded984f8ec6063d72ded50600b3a8b643224b5d67a7d SHA512 d3b388afb00117df5c739fdf6a27e9dfe1e8b892b0e248e8ad915bc4661ad24da3119340e5a32fa4c09b9800329461760b0a17b3eb37f6fc294912ec06b9fb08
+EBUILD pypy-exe-7.3.5.ebuild 4257 BLAKE2B 0c273f183edf602621563fc02647daa8de8414783915e2562703395120e457bdd33a655b338b5b3957717448a9fd3341570a4f24279145a9cc144de52722827a SHA512 4beeb8723fd9c4a9956eb5ac93b6d8d836d73c6e6b4808a25f255661f883a24d103de063bf5c50feff2c49dbb473e37f421ceff4022d386c3cb32ddc18b51109
 EBUILD pypy-exe-7.3.5_rc3.ebuild 4257 BLAKE2B 0c273f183edf602621563fc02647daa8de8414783915e2562703395120e457bdd33a655b338b5b3957717448a9fd3341570a4f24279145a9cc144de52722827a SHA512 4beeb8723fd9c4a9956eb5ac93b6d8d836d73c6e6b4808a25f255661f883a24d103de063bf5c50feff2c49dbb473e37f421ceff4022d386c3cb32ddc18b51109
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.5.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.5.ebuild
new file mode 100644
index 000000000000..8678327f1313
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.5.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS=""
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy-exe-bin:${PYPY_PV}"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
+DEPEND="${RDEPEND}"
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		if ! has_version -b dev-python/pypy &&
+				! has_version -b dev-python/pypy-bin
+		then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using already-installed PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please unset"
+			einfo "the EPYTHON variable."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 5e7f6e260a26..c3f7ffa4183c 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,11 +1,14 @@
 DIST pypy2.7-gentoo-patches-7.3.4.tar.xz 7844 BLAKE2B d06694fa085667e40ef8805c29f7ccf95b49f9de4e99e3ebfa3d69c4202a0ddcebb54c524d7d9f9ec67573a8d2ebe38fb7023d4d3ecef67afc907ecef5c16c02 SHA512 aa8ffefb5d30070ae86c1c14c55c277e39d3da66aea3a0951319158fb65e716e7fa7864e8bf5d26314d4b2a8030c766b63cad6a3663822d2875cd8cc1f3f2de5
 DIST pypy2.7-gentoo-patches-7.3.4_p1.tar.xz 8880 BLAKE2B dbf76e26b38187aafc5d60ee6189148d6211624689d5c6151d9c77ea5d744774db1bdf7230f97da16623045525449eeefc9d6ead168d8fdb166593c203918601 SHA512 78ed998ec6b8f2ac4bdd381496477d5e337841b1d7da0e77bd39a4748d3dd1a08ac6353561ca618d4cade24d26756ff4c221459162bc532e6597b8e9c7cd8d62
+DIST pypy2.7-gentoo-patches-7.3.5.tar.xz 6928 BLAKE2B 41aff14411882e60102866a41de6a2c13983d5489c9ed928e2823714883b5cca289c093426fdec35b6df8d17de7a96528d799e10412a0f2f02563e152acf24ea SHA512 f12c1a414cf40e86e9d2a7d1cdfaaacc1045f8043da479b5270ef983ffcf01418a70bbd21ae740abf544091cdc5026bffe467d631242d5e9e0863a64fa8d026b
 DIST pypy2.7-gentoo-patches-7.3.5rc3.tar.xz 5796 BLAKE2B b1c0fb0a8d86d117a9d4102777605eedd026b614f4b66272b3fc5da246bbe5edf516e95a40471117b61078c18b9fc615e55e0992a5d0a1be7caf9026ee26b6be SHA512 8699813837dfa4560a6e73b96f770c5d5999ce008e17cf62a856a454cb0b63146787a54934874162c79345488959e0936b3bd03823bc9f8e276f80df1122f7a8
 DIST pypy2.7-gentoo-patches-7.3.5rc3_p1.tar.xz 6932 BLAKE2B 730c52170dc5b6e893dc8c500b0cfd6bbf84830a4813e808a6a091fcd521bf58496fbe66c93b3bfc19a9032be2fb14ed182542d0831a5fd7e862c3fcdb4f5faa SHA512 088dad634acfb052992d0c4a3c54ba0e7f227c86848c88a94e94d84a9f7447a552aafd5566f39af0918b6b4c9dd279da3c698d0d8c9d362bd5ba13aa3f4a4d27
 DIST pypy2.7-v7.3.4-src.tar.bz2 21571561 BLAKE2B d0ac56fadec63fe7e65728c36c2aaf96fc5f54919dddbca9571a24c42a9e3e21f672f84555a18a384c4715f0489bd7aef009c0a47b635de88c472a93e2ae8d71 SHA512 4c18c2dbfbf0cc1034bea773828204df77aec7ef82119fb94e5cb762ce1783e00ad70e99d1432b4948dc132e726bdc6015f4a5bf10a5b10415bcfe99da2ecd17
+DIST pypy2.7-v7.3.5-src.tar.bz2 21572184 BLAKE2B 388b8623c2c5de839dea0e60acc5e11a6a774b4a6cdc051691053a97fe13ec12c6735a4be64015653ef420c0d8af2c79d8faa90a7dfc3042e29f35f4e1ded6c3 SHA512 a30c666c29eec7cca7e2e52f26480958b5885cd59c6b2e3d3c0d8c1cc55c298e878fc95f88e38a4297bb3d7d1cc1f77470de958e5acfd317e1fc8bdd5d013dcb
 DIST pypy2.7-v7.3.5rc3-src.tar.bz2 21563312 BLAKE2B e343dcd617026ea5f951f3d24deeb59736c9a6ecc91d1b9c1bd980b6f3c239a5bf0edb9b72a0847a6aeeaead8aca9ecf537af81c9fcf0a2f6647c99edc0d1735 SHA512 e080771ea10a30820f8844b3f512a7681f2e619e8a37fa8ac60198f3c8c3780a8e08aa63749be375c00cd547994f428df44e2cd9f61b272b215ded433374e0a1
 EBUILD pypy-7.3.4.ebuild 4820 BLAKE2B efb4bb8f194568c909365e06d2f3c1593145bff3c3fdbfab867bd15368df13cef642029b41739b4547256819f322f4dbe251c64cfac1d8c525391ebca4e8aef0 SHA512 82809ab39edfb0cd54a377740ce223baee9ae9abeb348ee2ae2fd2e1dd203900a1def1ee4c276f748d3823cab04dce8da25e12f3c477cad4fe560252bbd714c4
 EBUILD pypy-7.3.4_p1.ebuild 4830 BLAKE2B e71ef5eaf761e2b805b3130c5f008573c088dfbff05ad135bce23e62549f5c1f3570c2c98486d2fe8e852e662574e27e089db25c14543994c31a5bdddb7915f1 SHA512 9c53907ede4770731868c4343923bc929824c63482bc090bde040874544a056aacb45df1a6b2b098febf658ba050facc3ee650275cd62b91dc8044e875612b23
+EBUILD pypy-7.3.5.ebuild 4787 BLAKE2B 1fe07cb6231ea4d2a584fb0e37d4a105f44b4d252f27b88088fa53c74b00bf8c257706afbdcea41b60e57b514aab3fb227f96b8c2534efaf54ae5c267fe58b30 SHA512 e949d2683425f7548326bf2a06ee1eb19b8736df88ab580a784ccff5655ade6804f1a86983103c7d9c45258a55fe80e8272e29fd285ca14ab1b4ef0fa8d541af
 EBUILD pypy-7.3.5_rc3.ebuild 4777 BLAKE2B 7893108718dc64d1514fddbd491db3157b0ae067e4a6eeca980ddc5ed09eec88d8524a733816ad5124ac80c3e716dda1a8b1567f3d15a4e98588db0fbc24891d SHA512 19b23d8467aed4ceacae09b9f06d25ce111578e592a8414217101a8cd9b4a928e9da6e897133e23925ea812365e2fa52a9e1c44b657a2094e0a7ace13c7c4fa5
 EBUILD pypy-7.3.5_rc3_p1.ebuild 4787 BLAKE2B 1fe07cb6231ea4d2a584fb0e37d4a105f44b4d252f27b88088fa53c74b00bf8c257706afbdcea41b60e57b514aab3fb227f96b8c2534efaf54ae5c267fe58b30 SHA512 e949d2683425f7548326bf2a06ee1eb19b8736df88ab580a784ccff5655ade6804f1a86983103c7d9c45258a55fe80e8272e29fd285ca14ab1b4ef0fa8d541af
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy/pypy-7.3.5.ebuild b/dev-python/pypy/pypy-7.3.5.ebuild
new file mode 100644
index 000000000000..47c2d5b35300
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.5.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils python-utils-r1
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy-bin-7.3.0:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( ssl audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy2.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 3930799b3d58..5d7755a68bf1 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,4 +1,7 @@
 DIST pypy3-exe-7.3.4-1.amd64.xpak 12038379 BLAKE2B 6f51ec285cedef0703a9e145e5ac0ada1d19585be97997a8156a3964949490fd0c874b8c355433d3cd04df4df5c11be7f5badefe2e9c69129052fe51de627a72 SHA512 f1badabde936f5dc5700fda01941be249f4a056f1d61a685bb8c168a5cca6eac4c7e6cd660a5a5d2695307a3b7f4ef1941e5ea63a57816b669d54f497a1a5b91
 DIST pypy3-exe-7.3.4-1.x86.xpak 9159557 BLAKE2B 754fd401084c480a5a2a20c6e9a533fa5f691cbca06b0516d3d44fdf9529541c43f84fccdfdd70422231ddb887a9f5a9e38789b6fc3dce81d9f0fafade587bec SHA512 ff05c3ae252b0a5eeb403a18782707ea8884126763a83bcebe1e60934ad7cd6070db24ebeeffb15397b6c02fc68766011438b2064b484ae6d24991311e2a012a
-EBUILD pypy3-exe-bin-7.3.4.ebuild 1125 BLAKE2B c73b6673f3fba074df41979e3ce6f8f01ed51f3fbd7e95141e3fcb9340a1f434adda98465276d19c235d8dd94aa1422aaac5ef7fb33b4e6853f7c08eef9f48f1 SHA512 b7a4c2074b7b15a91aa546c40c61d24b0c1259ae677260182d6b7eb625c795fc23b9b469b44ee151b45b545431305b53f7379a6fc32f0b93d5fb6571fd741313
+DIST pypy3-exe-7.3.5-1.amd64.xpak 12030139 BLAKE2B f9a76a2304b3a29985209910b2082aeb07f08a22fce771aa7d548af6e662b88563f61b66582fe0ded21a00463725d4b21cb943c6dedba090cdcfcbf2754433f6 SHA512 d223095cc28f5fceb10196a172ddc2e363dd7e0c5e55b79c959d2ff3f84cb96c652e44bf8c2f7b4555d90289fa0768b18cc26a9212264ab397dd7308a14a93df
+DIST pypy3-exe-7.3.5-1.x86.xpak 9156096 BLAKE2B c3a3a329c2f8bd843fc4c882bbddc1ad124dc797d4915818769e79663e53e787b991b04b8006e8b8548249e4e76d8b68545b9d7470d8cf41bece2cd8e085066c SHA512 b58d48e1fde3ec12b497a30035b719a64a16de1292fb34df6a8e3ecddc277a477641d7781a3440ef2b73dfb1b50ca34cbdca702f27d6a5e00ad25e88bd8ebf34
+EBUILD pypy3-exe-bin-7.3.4-r1.ebuild 1162 BLAKE2B 5b49c04df2ba2eed082c45fc9976bb7a02ff9b5fcedb41b25806b012afabd5150ea69e864126193d072dc248540940078a6fedbb9cab1287cf4fb3a95297650c SHA512 272007a6ed553f258a4c12cf7860363620b19b3acc0f74a21b12008bc7efbcbb387f97fe52d690b2d7efe911b9a3e2fee5cfc9afe0edbcfae61c2011093b4ff4
+EBUILD pypy3-exe-bin-7.3.5.ebuild 1164 BLAKE2B 9ccd73f47c4fcfdf77a27b103fc916da17934b7f54a163de93f8f45d20ecab9396222784d76a079c05ad12a82a29d8bfaa55129528d8973753e90b71c6160067 SHA512 7ac8143d68fcfe6ce126ae6ee97d6c1807c47a6dbc07f6b21babdd00ee488835adb6d0205c5dc41aae423362cfe7fc79f870433cb444a554d82a292015005292
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.4-r1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.4-r1.ebuild
new file mode 100644
index 000000000000..64af9ea94084
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.4-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV}-1
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	|| (
+		dev-libs/libffi-compat:7
+		dev-libs/libffi:0/7
+	)
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${SLOT}"
+
+PYPY_PV=${SLOT%_p*}
+QA_PREBUILT="
+	usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.4.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.4.ebuild
deleted file mode 100644
index 277fe587ef6d..000000000000
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils
-
-MY_P=pypy3-exe-${PV}-1
-DESCRIPTION="PyPy3 executable (pre-built version)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
-	virtual/libintl:0/0
-	dev-libs/expat:0/0
-	app-arch/bzip2:0/1
-	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${SLOT}"
-
-PYPY_PV=${SLOT%_p*}
-QA_PREBUILT="
-	usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
-	pax-mark m "${ED}/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.5.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.5.ebuild
new file mode 100644
index 000000000000..b8309912e695
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV}-1
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	|| (
+		dev-libs/libffi-compat:7
+		dev-libs/libffi:0/7
+	)
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${SLOT}"
+
+PYPY_PV=${SLOT%_p*}
+QA_PREBUILT="
+	usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index dcbd73ef7017..a70cc017d7b1 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,7 +1,10 @@
 DIST pypy3.7-gentoo-patches-7.3.4.tar.xz 8464 BLAKE2B 6d458a41e87eabeb2920b28752fe5cc49bbfc9c5f03d2fc1321362fbd02e9dfb3b41c99cb765b7f2644b9c49c5c60f879ad1c60a66bc991462edb50215b1802d SHA512 1282cf2fa9054209ceb5a91e0b4adcd86de33a326230fabe154b572d5e798d81e93d136e815f1c2816fbfdd5071fcfc175585d4fa5ae93145938bb4cf1d2baa7
+DIST pypy3.7-gentoo-patches-7.3.5.tar.xz 8164 BLAKE2B 0f8707fda16c0358c1d3a2a60d83046bc5c6186906e07d0e2441d26da4c5d2e7978aa9013be211daf0a1bfddbb10f96745ba4be84b61903e177f4d906045ed67 SHA512 95d3acb11c811e4342ba3a56e925433614c5affb6a1fc873ecd2f2cfd55459424088b928f46bcb9a6f0e467fb77905af387ad04bad45a37b928fe0ea320ac33e
 DIST pypy3.7-gentoo-patches-7.3.5rc3.tar.xz 4872 BLAKE2B 15970c21eb209407af5234719755dd5ddfce95f5b7dd5d525126045d71a00f22d56f26e54a85b94e54dd286334a39cb08abf681e56d466547be206322cf319ac SHA512 4a946560daaba8214f3f5cf828128293bc9aa0eec7d0000e184b3791165f255a7169ee63f9a569a1faed9e8095f593ac7982d49a07f93e085b41be50b275ce3f
 DIST pypy3.7-v7.3.4-src.tar.bz2 25344083 BLAKE2B e88dd0cfcc6123dbf894f603162ebe43675c96b992d15c29e14a611a166b8da8d1d2f3298e65e5794b295215440cb88f31d252fcdaef1a0dab52777c24212a49 SHA512 c570d34f284f41dcd8dd909216c69831dd83b8501423c7635a4fe506fb16fd3705cf87975a664735e52d0b805a0432267d611a993437d17aac3defe4b9ea4401
+DIST pypy3.7-v7.3.5-src.tar.bz2 25350766 BLAKE2B 34d5c83284271b184f71492dbd65b8760cc0fcdec71e41ef48b9561280dd67ef4c37fdd70759d0b95114d127446fc0ea5d04feb99022c1a725233862b2028834 SHA512 253d2efc81d55fb392ab810741e3a633f664e1908b2c26db7a8830c971655cca6be1b8d34581d13aa2d738a4a4c8ba23c2c90333b6e03d4608372e8013ea723b
 DIST pypy3.7-v7.3.5rc3-src.tar.bz2 25255084 BLAKE2B 10a7c6c9879b2956726e9457e6939cf7597136dcc54bd8d6c20311468ed622697c151fb6209d49fda21e0710d0c3d18f702f43b01720341b7967663b007b1f09 SHA512 6ec569cf80741a540f39687e3cc1c4bf18c4cd038ed1b0782a333ab03e5f85ca221e3af4549d2332c78fcab5a430bd59a5ab14f9fa333624f6f1b9441049b5c3
 EBUILD pypy3-exe-7.3.4.ebuild 3875 BLAKE2B aed7bde6ddbefa3a5abeeae05cf4c5fec25f6e83141d998a2b6f95fae214fc4d986f01293ea50dfff07f85cbd39fc28c87b8f45810ac552ad97d2b1d1ae16be9 SHA512 026a3a4b44f4d1916c9e8c520ac4021035bc08aeb98b8bc676bab0a2b04e34656b8a5885930b3ba6dad82d0eff788bee14bc10598d7d8a17e4b398c013efb3bb
+EBUILD pypy3-exe-7.3.5.ebuild 3824 BLAKE2B 0b6a08dfbb51402cb56e237197d19a529ac9a6f796f42a0218df8c1eee1335eb59cc7ef222098aad834c62440435391875705b4a323d523bef529a482ea9fe12 SHA512 814805ea1503c05063c0de5bf81674d85cb01dae33903914cc4e9a2a12e9880680065fd04de602fec8afb72fe2540fe81b6ed17551fbbdc937cc28951783b5aa
 EBUILD pypy3-exe-7.3.5_rc3.ebuild 3824 BLAKE2B 0b6a08dfbb51402cb56e237197d19a529ac9a6f796f42a0218df8c1eee1335eb59cc7ef222098aad834c62440435391875705b4a323d523bef529a482ea9fe12 SHA512 814805ea1503c05063c0de5bf81674d85cb01dae33903914cc4e9a2a12e9880680065fd04de602fec8afb72fe2540fe81b6ed17551fbbdc937cc28951783b5aa
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild
new file mode 100644
index 000000000000..70dd2bacbc82
--- /dev/null
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.7-v${PYPY_PV/_}
+PATCHSET="pypy3.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS=""
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${PYPY_PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	low-memory? ( dev-python/pypy )
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index ea71e7cc9fa9..fc9ccb62ee0a 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,7 +1,10 @@
 DIST pypy3.7-gentoo-patches-7.3.4_p2.tar.xz 13268 BLAKE2B 175d6bd4ed8345f3e0c2e35b3904e9180b32262482ef530c213505b3b4a0db1912fb8367db6b48786a9ec16f82298fee09683254b86b6c5e97d5c96ec250bfb3 SHA512 e00b0b909a8e7aae33e5fdad4b23072f1d720236c3dfd2dc4273339205af6d575610aa41b779e894db48f48621a0c5544d9054e1a104d5fedc3de9c3df01e1c2
+DIST pypy3.7-gentoo-patches-7.3.5.tar.xz 8164 BLAKE2B 0f8707fda16c0358c1d3a2a60d83046bc5c6186906e07d0e2441d26da4c5d2e7978aa9013be211daf0a1bfddbb10f96745ba4be84b61903e177f4d906045ed67 SHA512 95d3acb11c811e4342ba3a56e925433614c5affb6a1fc873ecd2f2cfd55459424088b928f46bcb9a6f0e467fb77905af387ad04bad45a37b928fe0ea320ac33e
 DIST pypy3.7-gentoo-patches-7.3.5rc3_p1.tar.xz 8168 BLAKE2B d7da84e1b0e8dae1dfd712b5cda98ca021048be40df89a94607819712c6370fd22dafdd25fa2955c240ac7662cf75a76f0fb5c0309db727ce28b0978d7fe9fa7 SHA512 642b831754431b3a4441494dbb434b8d66fa48e67c23fb9fe94b15851a087e663397c39762e80c72f22fd1973c99304d5ca48d9222b4352d5dda55142e899f2d
 DIST pypy3.7-v7.3.4-src.tar.bz2 25344083 BLAKE2B e88dd0cfcc6123dbf894f603162ebe43675c96b992d15c29e14a611a166b8da8d1d2f3298e65e5794b295215440cb88f31d252fcdaef1a0dab52777c24212a49 SHA512 c570d34f284f41dcd8dd909216c69831dd83b8501423c7635a4fe506fb16fd3705cf87975a664735e52d0b805a0432267d611a993437d17aac3defe4b9ea4401
+DIST pypy3.7-v7.3.5-src.tar.bz2 25350766 BLAKE2B 34d5c83284271b184f71492dbd65b8760cc0fcdec71e41ef48b9561280dd67ef4c37fdd70759d0b95114d127446fc0ea5d04feb99022c1a725233862b2028834 SHA512 253d2efc81d55fb392ab810741e3a633f664e1908b2c26db7a8830c971655cca6be1b8d34581d13aa2d738a4a4c8ba23c2c90333b6e03d4608372e8013ea723b
 DIST pypy3.7-v7.3.5rc3-src.tar.bz2 25255084 BLAKE2B 10a7c6c9879b2956726e9457e6939cf7597136dcc54bd8d6c20311468ed622697c151fb6209d49fda21e0710d0c3d18f702f43b01720341b7967663b007b1f09 SHA512 6ec569cf80741a540f39687e3cc1c4bf18c4cd038ed1b0782a333ab03e5f85ca221e3af4549d2332c78fcab5a430bd59a5ab14f9fa333624f6f1b9441049b5c3
 EBUILD pypy3-7.3.4_p2.ebuild 5274 BLAKE2B 45a63059149ff71d2265bfef4def2a21d8ec28a540da920db28632f89aed621f8e08962ef42af4a2c0fa0575cae31f1e202aec38ab588bfcf035209efb6d584e SHA512 6691ef7c48642f8c08cac7d4bcf23f31231c631f9a0437131ed1e92245ef1b16885639920e3f2074c9eb52ba0e5eea681eb97c040a186fe055240c38b7db1923
+EBUILD pypy3-7.3.5.ebuild 5228 BLAKE2B d30e872fb4622052ff0b47fd776c27bd35cf591b34e6602ec8d07daa482db19b3141b2fd37a3dbdca0dd4a86cf7e99cd98d6247eaa2cde15457d30e98c58c082 SHA512 f4106c094e7a51f268d8e8b166aed79ffd1ac2c4580e8acea9f780c3713acfc47805ce8f484e7b5d0ea195a7df6939ebc3290eab84bec610fe2aa6da811a277d
 EBUILD pypy3-7.3.5_rc3_p1.ebuild 5228 BLAKE2B d30e872fb4622052ff0b47fd776c27bd35cf591b34e6602ec8d07daa482db19b3141b2fd37a3dbdca0dd4a86cf7e99cd98d6247eaa2cde15457d30e98c58c082 SHA512 f4106c094e7a51f268d8e8b166aed79ffd1ac2c4580e8acea9f780c3713acfc47805ce8f484e7b5d0ea195a7df6939ebc3290eab84bec610fe2aa6da811a277d
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3/pypy3-7.3.5.ebuild b/dev-python/pypy3/pypy3-7.3.5.ebuild
new file mode 100644
index 000000000000..d75647a2e567
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.5.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.7-v${PYPY_PV/_}
+PATCHSET="pypy3.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy37-pp73"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
+# pypy3.7 is in alpha state and a lot of tests are failing
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy3-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy3-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy3-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_blake2": "_blake2/_blake2_build.py",
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "_sha3": "_sha3/_sha3_build.py",
+	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma decimal )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	# (--deselect for failing doctests)
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.7
+	einfo "Installing PyPy ..."
+	dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3* \
+			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy3.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index 4348f8a4fcff..a2358ed25347 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -2,6 +2,8 @@ AUX pysvn-1.9.11-respect-flags.patch 5627 BLAKE2B 6a3b4b26581ed05251380eb13b6e77
 AUX pysvn-1.9.13-respect-flags.patch 5843 BLAKE2B 0759be0ccdcdd96fb2d33591772ac399baf46b37186835ecc1f13cf51cbff85d552270afc30240299a1c27cca5df99e9d97a578b0b70c18f9227bec8fbfb245a SHA512 23c7f16f3e1fa9d1ae99360903736232d09ad66591e6c49ae342d33dbd0d27f5a85584d2a4652023425963480773a3b9c0d604905d91192f399c573b06f67fa0
 DIST pysvn-1.9.11.tar.gz 624408 BLAKE2B 2ca13388717cc82b68509843e3b1780bceb5c088c41fadc81206c909eb185ec7c73d0a7453fc4e0c1a78a5186e21d382c79af0fb666edce7f5e72c0cf63e25db SHA512 078dc0e19a1f29d40571de002734943415594bcbe132a4d0e6bf8e8781175345ca1b3a4967a183a15efb1462871a40d8e3879a22c913a649555ca593fb99db89
 DIST pysvn-1.9.13.tar.gz 666722 BLAKE2B 4ada83f474026976309b8fc7876dd860fb68eb73dd0a4db0dd0c2838cc029976d5886462705c8b6aa85c5a6f8081f94df61bcbc1698879537fbeb3125154c1a0 SHA512 26ce9af363efb1aee25f8ed73e5bab56208523cb3e7cbe657a5f1145bc3500b2f370b4dfebf4eaace9f566f5676b053c41acb4d01458e4d6b79bd852ac260aa7
+DIST pysvn-1.9.15.tar.gz 667161 BLAKE2B 35e9e0967d5c0b4cebf546e40df17b66c66406d0f8100c32e6e840220f60b0083c0ed3f3af5f54e2264d06905ea90970d6b7cbfad2bab872a14d5d4aea5900df SHA512 0809507134fd31f6bcc90217e7840eb166e2eb2ed56316010a549dd70f6f855599f596942574343cdefd5997947b12c847df2cd145669f50aa93f603e46a5ee0
 EBUILD pysvn-1.9.11.ebuild 1324 BLAKE2B a4ba06214b0f6343ff0c8af7c86857cd9565c10dcf24a70445bd7c1627828b4abf0afa015e58df190b74b6b7aae48b9fd06278b3e657988d5a7f4abeb0a1ec41 SHA512 66fcd0af0e02c94a7338db96a4fe6a29f955be2ce23f7eb580996e695d727f32985b96db1e35a318be54fce628b931e2387ba9d48de8a3155a13a1d236e0f432
 EBUILD pysvn-1.9.13.ebuild 1750 BLAKE2B 13751eb3b69b91a47b3939eb8d793c412955a5d5db88e9fde574cce071583a04b5f8b0fc6b77fd17dbade1039f2afbf59bb5a5c829f6a9d5417783effd7f11f3 SHA512 9a75ae9734ac1028e80ee6f0627b42f44d7551cc1cac15815f0bf0cd70ab2bfc2941427294e17455e3972dad54a874482398908aec822e5c60e3e055a1abe12b
+EBUILD pysvn-1.9.15.ebuild 1332 BLAKE2B 93b4683afa60b180d7a308fb3adfe9e48c8fa69e368a2327a2faded8b60c43436834c9f7f0e504049e7afef0e969b51c576661629680556bd7c7326b2ab0cab3 SHA512 5fef4ee3806cea84f084fdbee01f265202e6d6097970a7967da29abcdd4637a27c4e2015a3921aebf85b19fd6503335a9b36d0ec2964086d905f719350078828
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/pysvn/pysvn-1.9.15.ebuild b/dev-python/pysvn/pysvn-1.9.15.ebuild
new file mode 100644
index 000000000000..9e8fecfbe0e4
--- /dev/null
+++ b/dev-python/pysvn/pysvn-1.9.15.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_IN_SOURCE_BUILD=true
+DISTUTILS_USE_SETUPTOOLS=bdepend  # see setup.py
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Object-oriented python bindings for subversion"
+HOMEPAGE="https://pysvn.sourceforge.io/"
+SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc examples"
+
+DEPEND="
+	>=dev-python/pycxx-7.0.2[${PYTHON_USEDEP}]
+	>=dev-vcs/subversion-1.9"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	# Don't use internal copy of dev-python/pycxx.
+	rm -r Import || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	cd Source || die
+	# all config options from 1.7.6 are all already set
+	esetup.py configure
+}
+
+python_compile() {
+	cd Source || die
+	emake \
+		CC="$(tc-getCC)" \
+		CCC="$(tc-getCXX)"
+}
+
+python_test() {
+	cd Tests || die
+	emake
+}
+
+python_install() {
+	cd Source || die
+	python_domodule pysvn
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Docs/. )
+	if use examples; then
+		docinto examples
+		dodoc -r Examples/Client/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index 78f9985b818c..be67ee3d7c4b 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
-EBUILD pytest-aiohttp-0.3.0-r1.ebuild 548 BLAKE2B bc41bb7754063ca40c08714f2ca32b05eea3bb6f9500afea6e6fe8813f5aaf6b4b889bf608fabde9116586904f4f3994f93c01d0af3a1a3bd4f76ab44e084f3e SHA512 ee4b30294605a806617b01eb06ec1ca4c21a3c534775b1b0231dae3530604cfa968af803a28c2ac7be6e05bf6c9970d7d4d9c30998faf58539704a6002cb7731
+EBUILD pytest-aiohttp-0.3.0-r1.ebuild 549 BLAKE2B dc17c2758b294b805084eed6b5b980aad1fee4ea74093aa72ab13b7ebd8e20dec93daa260159a32a2a68cf38129a8a057468d5ddbc9b1c7a334218903160f49e SHA512 72d4833faf068c58e1ecbf0bf619c8436bc4a3e6b35b6a7a5052881a875616c0494a3d0fc62cdda99f26bb596b0274d3fd7f374bc84bfaf207dc03dc47f73756
 MISC metadata.xml 382 BLAKE2B cd3cf0ec70a8506a0a36c6be50dd70b68c1397c9bac788f15e012d10a4b35d5912c53f4de68bc7cfb3b4c03e84efe053d18b6a16bebff26fbcf935ad6d282645 SHA512 ae3b23c6b0741388a625d45f65e5b51e6ba9596eae3cd26378cca840656cfbe61f580705c82766b8a39dd7c603263bb66299c11d4890ed24b2aa6804bf008791
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
index f1ed8d58d2dd..122c4ebbdb2b 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
index b4d785aab374..dbe815df9587 100644
--- a/dev-python/pytest-fixture-config/Manifest
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-fixture-config-1.7.0.tar.gz 9884 BLAKE2B d844b07a8b7d59f6761ee71147a0945225a3f30bdd9b0751972bf6149b444ad95c49f3d5001d6414c535c1a230ed1e47ceb90b26c50324ec21165430e633cc21 SHA512 c861bbbb91efff338255734ddb4a8b615880c32a12c981160e9e7575d38adff8c5febad46bb9b4208634e39d4cfa73dec342265ccc1951168c1b12fd334cd746
-EBUILD pytest-fixture-config-1.7.0-r1.ebuild 850 BLAKE2B 9d0e9c558ab658ecc3b79ae8371a124d5a3a9fc21655d2b168b0463cb3fcb6781f7f37a0d4d106a8a237809f8086b473a5dcb84a39dc7152d03beed370d52eec SHA512 df00f72236bcefdb1f6c64ba30b68eff6e5d7d03d0f289a046037c274b04b3ab8d177e5e056ded4df3e87e3cb962e255bff79062f85181107a8cc5178558ba5c
+EBUILD pytest-fixture-config-1.7.0-r1.ebuild 857 BLAKE2B 6450ce80fc4f686583fbff5af09d0b03f8104876d2a7e1a1d2fc0ce0a30a8dc04f3947194954be8b9b78f966d350784366017805f73ac81423bb9eac8fa497db SHA512 7694ab17f056140928a52cfa754d6a23137d243615a30d68c7636148988b567e05a9cf478250b9af41987a5394f3a7eb1dbbf31beda1abc6a834fe168c5a3d94
 MISC metadata.xml 678 BLAKE2B 9d7e4416bbdafc423e3621840c698db8c0ccacba79340d9c0174301d73bee373dc7aff0e299b0cd787a2813dab517b0bde5f669e5d973eeb2d34a9d6df25d532 SHA512 e65a58f40b53106d63faa1aff2e0ff97e3a184a59294df19346b2c025085395965853794fa90fc7e1d1e8ffcb4b6ea63cdb9fa1f54089adc27158e60eb258416
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
index f410e635d27c..a3d6240ccd60 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 32ecdd3b35d0..fe4210e27de2 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
-EBUILD pytest-shutil-1.7.0-r2.ebuild 1179 BLAKE2B 75e06f8b8b53fc6b6f7be0e27b47457bcca74348bfb950c969e5e1d2fadd1e277d69c0276dde85318006498944aaa8a101c56fcd2b895379f44c4e4577b00c4f SHA512 a0e9544a2652c5bfdbceb6e3c3987ae93356ac734c3d6b10db1111031d273e52c106c498cbdadfb7207ce8b88edbf4045dd55569d7a29dd6acd1eaee479c4748
+EBUILD pytest-shutil-1.7.0-r2.ebuild 1186 BLAKE2B 6fc59754e5a991be4259e0da7bb0355aa1e3cc38c35ad6a999269e0235276e4bf679454578a2322389519857950e69f6f2df814a9002234f9dbedb7ef4c6ddf1 SHA512 1086d7c458b36f133a5e741f8165da51909e4923ada9f1916aeef0fefe96296a38903bec2616f778751f29f4940a5b414feeb098131c097d4a7136e804e0c717
 MISC metadata.xml 732 BLAKE2B afaff2db22c6de29920621f7684dd9cf3a6a070e7d40c2a6ed56fef507fb6dd1ca1b1ac51f106a49c38a556f2c0be244df5c8bae90e71d3ab7d7e1556725d87d SHA512 27c9d4196ec0cad1aa20d3d04c47cc791c9ff19189fd7facf844067c2f81a9c1e00aeeafe2fc65e231fd7039c41eea16c67f6d0f0dcf06386f402ebde03e03ef
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
index 8ee1fa7aea61..8fa378acb84e 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index bec5996d7c49..afb3553307d8 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-virtualenv-1.7.0.tar.gz 15767 BLAKE2B 5ee65aff72c50c8facef682827f58a8053d658aa072f3a69d50d13335dda2da37ffc29af009b52a50349647a4a38e149ba1b9847115fc4b4c4f54f063198b14f SHA512 0463ebf44ae18ee50a60e421a22aaaf0e34f827ec8f21c8f0dc79cbdc253748f9d1e5b33e4f418b52f0d8fd45990e162bb6410686ebe9fdc02650c286901d474
-EBUILD pytest-virtualenv-1.7.0-r1.ebuild 808 BLAKE2B 5fb1b8fe129a8de6ee7ac477b2700740f4a942339da455f10c13dd3867228c14357380fdadec9b084b52ff6d7d9e31b0ccdb22c297c3aa6977d74f9144eb2d14 SHA512 43484a452caf25c2f4dd7a6593f718ba6e666e16b70dd5d69f1bf3681c403b69597ab6dcd1465d63dc6306ad82dee6e18fa237353b64f437530506559747b3af
+EBUILD pytest-virtualenv-1.7.0-r1.ebuild 815 BLAKE2B dde44ca4860214a34a5fcfb96d1290651480915ac79a007342b6b450bc8e35f8222b6fe66e4c90e60311906bcd9adcb0c28d94512c06291ec880381746a2b6c5 SHA512 8cfa7d630ed6ec50c5472650e338b5aa5132722d90db54961899c53a7dad4c7b8e4c3fd3d4077a04c4d6512611c1a34a2bf206bd84c3ba1e6c7388fc6f74cf05
 MISC metadata.xml 706 BLAKE2B 42b81fd5a175fcf7bc0a2e1898cd49c1f2d259b9939d5e82dc0255a222362d51506c48cc8e92265bfeb22d4b6417cd445d052d411a364437cd97d48c5547ed99 SHA512 261bac2994facb6a7dfd0e07c59cdd69f3e01d2a8ee1ee5d023493e01709cfb95ffe9b6f9d7cf1c64c6e27d158a1a12a4f52b1597c714e1e7ea267e0364a10ba
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
index 408d56d8e879..2da5a1df5d80 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index b3d3bb694b23..25f542cb8096 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-xprocess-0.17.1.tar.gz 19758 BLAKE2B 1db4ba7e606caff4591a752cd2a7e368a910ab9b7a28151b1e9c8bdc0f8184a1fa66b23ceb898f1cd7dfbca05b19aeca9a557ab5d3069b8c32ddd9f6f6e75cf6 SHA512 68ee3c8e958f7121d72aca81c32edb7598eb99c3cf6c38fb9c8577ac4860e8241e1da16a44e825204977d6ffa4459fe2742b2ef3b906071a64cd0fcc14920be1
+DIST pytest-xprocess-0.18.1.tar.gz 26976 BLAKE2B 9772fff488414406f487add01fba9ee2e10e12965d5b289b8c17cffb5a6566aaea0653ca1b390e6b4c70d79ce3698b0ce8122ed919f9778cb8cf3f7488cffc8d SHA512 f19cba9954e4b2363db13b7dba373f5e50cfca6f43d6455f271bff4d01dcc2a3b15c13a47076dbeed34feffee856a8271df4837edab413e964a848cbb6228e7e
 EBUILD pytest-xprocess-0.17.1.ebuild 634 BLAKE2B 34b0df6d67136b0852e8205592aae284fbc9aab3ca78d19fee451463c9edf7c515d9b9747db1a8e1f80026dcac21d8edb0b65c3c4703ec0f7cafefaa8a13f1f8 SHA512 12b7d0ed336f6bc98878cfec2fbf685058036c0f6bd9a015abdd17f4ebf19aa9b78c418775b8197cedad7d0da62cbc9a2c209860f6914c77d98e07bfd6a6c6db
+EBUILD pytest-xprocess-0.18.1.ebuild 641 BLAKE2B 9082025ea077b9f05ffa3e717fbd61076ae4d08d27645a15bb81a55bbfe4e9517e8ba815b69a0e73a0844d11cc7236156edc571a1d634e330326782724890cdf SHA512 cd7fad109b0f9ced1373986ef716da8c2887b1cbb07840a829af74b62c23637e3e1e1ee237f004ab38d648e48a6ea440dd0e716de2893381934170c11724824f
 MISC metadata.xml 421 BLAKE2B 616045f871631311e9310ebda14f2bcd936b7a721196f9312b6270bbf8713789329b56ba058cb412d31e68e91957666ce9f44043527efbd0842dece87ebb5f5b SHA512 4d5b9f41b7aaebcb87c8718a98b1dbb3df0f199a5f6940bd12e3504ff5080a0ed112b315c89e2af1a5a3220829879afa0cdf931828359ff98732311200b76b9d
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild
new file mode 100644
index 000000000000..f2ada45a465d
--- /dev/null
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Manage external processes across test runs"
+HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 8327f7ab65a2..3e8f720ded59 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,6 +1,4 @@
 AUX 0.1.39-disable-apt-pkg.patch 6815 BLAKE2B 443dfc1c0c60d47709f31f1d3f0196c703490a9491e8de61ea9a093a80e5d87fdf17e1b1ebd5b885a1e2c0104c243aef2dee4a8f1902b9b5f747ec1b797c93a9 SHA512 ffb0659feaaa1538bc7a40b896e6bfc53f51032aadf0c0642a3609d10a13a043c2bbea97e43fddd315fe5aa174a94c9fb3fbb9832bfebdf2acebd7a30cea3717
-DIST python-debian_0.1.39.tar.xz 319020 BLAKE2B de38ddc6e4878404f9685a264e1198e513cb57f7bfea064e4512ee00049d007b6007ee7fea42e18bd2f12dc8132582fbea2235694b5f908c9ae5cbc830cfe98a SHA512 de29ef224a17b149dde8cf6bb4b9fe77aa1fdfc040463163fb97f7e4ed283f16af43422e26c352183fd74e9e0ff6b41a91ee18c63b5534d5c9de2ef663c8f4df
 DIST python-debian_0.1.40.tar.xz 319952 BLAKE2B 4d5c2d3202ef09fc8eba4e0c4f9a5861d0662f288768cb9026e1ab43309a57fb21c0b8e87734c9310f39646e071947b31b17bd48b71510e7d783af9f337c3ed1 SHA512 73ed735a3c7bb43208aa26ea9fd64fc658e111dc201ae8c1947a4e5835ebd675e37b78d2895d72bd5ed2b6afa491e77b50bd5f10d62ea8299fbdda6c0b9e5095
-EBUILD python-debian-0.1.39.ebuild 766 BLAKE2B 8c0fe936e3786037eccfcf50080d232fafb2141800ed726e05ff52f09279ed653b723702b044a57d7f1a49462c0b81e81bd0260cf7155fd18d0fbbd035a4ccd5 SHA512 b6e3e18338d5f5891cfe104654932d551aec3fd1207d776e329562d18068b3ca72f1f9c239c82efbcd0e6769f7cab8b1adf5ebf74889926835d30c4e07b17f7f
-EBUILD python-debian-0.1.40.ebuild 769 BLAKE2B 2f0c3a60abc67fd6a30f9431009d68dcbda49cce0d435af31fddd1c57f89bb2dec3bfbffbaf059c19421a2806a91586e58087b37a7315e66e2097c12b43d8ca6 SHA512 6ee0e983933495de3d8f413229c21f7b48b6188a4d7c94cf02b48d0c74ee34bf55b0efadae4f7225dd55c8836df1a9bb7865a94414e1908bdf035ceb4baf4472
+EBUILD python-debian-0.1.40.ebuild 766 BLAKE2B 8fea06408430f15b62504d839772ca7ad173dacca896c02cf58690f345fdf9cca791ed1c9f359e7e1ddfb235e23ce309612c87e3a0e1694d3980612081121c13 SHA512 de70852ff43ba2cc9d1e4773d6ff1abc46b7b29f51a1ceb8d3fcd9fcb41380f407763cab6cc27585c9454b298bba3387122129e397e389403ba29940d3b9d1fb
 MISC metadata.xml 447 BLAKE2B 3a50201209da0fe9153963a3c84fbfcd72eb2a9065c6ef2dc6d21436d12269d6188e7b5c3bf88688e91bdde0e8f33a1adf9d11e084cca4ef796435655ec32765 SHA512 54c833fe01cfe54156de60c39d5cab5f9324074ddb2efd0c8294cc55d3ef599c0c65e911855c93bbb4f42cdec489dc5b337b0a0a53113816110321ea291538e1
diff --git a/dev-python/python-debian/python-debian-0.1.39.ebuild b/dev-python/python-debian/python-debian-0.1.39.ebuild
deleted file mode 100644
index 63a9d4c02307..000000000000
--- a/dev-python/python-debian/python-debian-0.1.39.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python modules to work with Debian-related data formats"
-HOMEPAGE="https://salsa.debian.org/python-debian-team/python-debian"
-SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( app-arch/dpkg )
-"
-
-distutils_enable_tests unittest
-
-PATCHES=( "${FILESDIR}/0.1.39-disable-apt-pkg.patch" )
-
-python_compile_all() {
-	${EPYTHON} lib/debian/doc-debtags > README.debtags || die
-}
-
-python_test() {
-	eunittest lib
-}
diff --git a/dev-python/python-debian/python-debian-0.1.40.ebuild b/dev-python/python-debian/python-debian-0.1.40.ebuild
index dfab437931aa..093dbb450db3 100644
--- a/dev-python/python-debian/python-debian-0.1.40.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.40.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 2a24fa6e09de..71c7bd4931a5 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -9,11 +9,11 @@ DIST python-3.9.5-docs-html.tar.bz2 6839136 BLAKE2B e05d327c858cb674463b8bbbed53
 DIST python-3.9.6-docs-html.tar.bz2 6848664 BLAKE2B d5e84fc69928e304898120b172629cd724043fff26237908f2adfb13c9ffa11701a87bcd7091eeeee4ef5b2ade12c29781ea26554a7f4fc13fd28efe765b48cf SHA512 b9aa734e9616253278febc5f668ecb6f1d43bc824f84c92e3c13007441388d21e27edd4cb30c463739a271ffcbd8581d6d4573cfe693dca78623762bcdd5bf20
 EBUILD python-docs-2.7.18.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
 EBUILD python-docs-3.6.13.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.6.14.ebuild 629 BLAKE2B 05225eb9e9bb9d334c8b712bd5c15c400c43a85ad3d220378d7d1e4c2783947a60029c81ac518de45c2536acbe47fe40876b4d9f05710206055c88d294adc8d4 SHA512 a69af3959cca52c4a51272445343873911d47fcb83c8edc66f2ceec0dee7b67f518e69cabf4193525103270d240a269c3fcaa64617c6e60cc05d981c005bd64c
+EBUILD python-docs-3.6.14.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
 EBUILD python-docs-3.7.10.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.7.11.ebuild 629 BLAKE2B 4b0fdf8cd90278f72e3a4a0a885c43c165c3082e0637470511061b670387b63d4eb0db594cbd6e4d179342e2eb3fcd39c9c14cd83751f116e526122b4d956065 SHA512 2a89633a30c32f73f7ddcddef64e322865539e0d347c00cb8a30721b8ed8f1a7457ef295b2ba95f585006d352b802c37c9a54852947bb5ce27b4221ecf05db4e
+EBUILD python-docs-3.7.11.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
 EBUILD python-docs-3.8.10.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.8.11.ebuild 630 BLAKE2B 1aa6674e4fcab8c4b5a11b040602cb58d52005f177aee6dd73a882df3c1554d6ad6247e3918b53a28dcb969344162ed20d9316b537af4a2c53319e36af7f4510 SHA512 6669a6ffab0376095e9d53a464d4662ed903f8702a19655f20986059a128d82fae4068dac75dc0865354db186a6355691f466b56edb9842fb88dd676dc206e69
+EBUILD python-docs-3.8.11.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
 EBUILD python-docs-3.9.5.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
 EBUILD python-docs-3.9.6.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-3.6.14.ebuild b/dev-python/python-docs/python-docs-3.6.14.ebuild
index eb85be6819d8..a957c58aad3d 100644
--- a/dev-python/python-docs/python-docs-3.6.14.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.14.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.7.11.ebuild b/dev-python/python-docs/python-docs-3.7.11.ebuild
index db542dd885de..a957c58aad3d 100644
--- a/dev-python/python-docs/python-docs-3.7.11.ebuild
+++ b/dev-python/python-docs/python-docs-3.7.11.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.8.11.ebuild b/dev-python/python-docs/python-docs-3.8.11.ebuild
index d5d2529bb54e..a957c58aad3d 100644
--- a/dev-python/python-docs/python-docs-3.8.11.ebuild
+++ b/dev-python/python-docs/python-docs-3.8.11.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index b5d5d6123685..89a859edf624 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -3,7 +3,7 @@ DIST python-dotenv-0.17.1.tar.gz 31608 BLAKE2B fdddfa1c39282ceec03fc1569d9a7d038
 DIST python-dotenv-0.18.0.tar.gz 32242 BLAKE2B 6cbef7ea7278a3114b3eaea2ede0c68e2c6dcc3868f655dbcad9596ea6e1ec0b9f5d183a73fda32e53d348ae23c11ca3f9d2e8eadd974eea4dd13903b9f9c845 SHA512 4b120ee45602ce703ee360fb5af07a8854bcb1ecd9084057e00324b152cf230fa6f065b374b6eebbfb7069b32762624ea61dd5d2fa6ac62cb7e3a2bb6ddfc1ed
 DIST python-dotenv-0.19.0.tar.gz 32016 BLAKE2B c9f499abf99b3af8aafe7285347e08e61e770b1a5ca9d9b0cdf9dc306367c3f0492dae814835b637c9fd3c25d81006f78cbcf8d2de18bf7dc917e1bcdb0cb544 SHA512 6207f30e79ce13ccacc00ab1a95a1613317c2cc6bd735060ddca558b498c9d5c1c46ba76d97cdbb282c0f2695aed9346159ecbe08aa8a7c4f143a65708182806
 EBUILD python-dotenv-0.17.1.ebuild 699 BLAKE2B 30991868d0fe6e918e73ac6a627cb310221caf566dc6675086674fae634e0206c883ced4f34e89c8abc19518461ee41ffe880e9a18220f9a7e00a6c1c4171639 SHA512 4bbbfa7542acee21adf7f946904dcd56026186aa8737a5877b15c0d2af47efae1228b1956696fae57ca83c2b6a1fe2d35030ebe58c04164cde781bd824686c61
-EBUILD python-dotenv-0.18.0-r1.ebuild 849 BLAKE2B 6821b07f026003ddb1097a6d42f2da445cac967c67d57b3ed3bb964bae46ed2b673efc4214304fe3d3aff8c855882d27c5492de6d4badfdb5e94e9308b9c1286 SHA512 01007cf2b806e7a99498bd5a8c0e5ff8ef5455b8e0944c95535d143f79d5a161b2da30f40838f407075870d819e747f0f4e683d6f2f1c8fd78c844cb36a9d0ce
+EBUILD python-dotenv-0.18.0-r1.ebuild 848 BLAKE2B 3557a336eff3d9c640c3212673f1946ffb833f68e12494a791b241193a248ec2ac5bb2185c1f013677018d63c5d78e55b9045cd66d911077b2a409c555b205cb SHA512 2cc5e8277d3ee49d0b9fed4fa9234882f7b7045d646c069648f961bd52bd0642784c016cb64ff9ef9f33a782e1f14b3bf02f12c2e5e12d0d783b9096af3dcee2
 EBUILD python-dotenv-0.18.0.ebuild 667 BLAKE2B afa1384333768d7c865ee8c1410e7b2d54899c185fda2940d4dd05a184c78ef334be98db6c05cf093bfdcaf64293d1b4ae2123e036a78124d2f27d4a69013ac8 SHA512 5409f429cbb14e907cd20df27fffd4fc1b8c9ad7ac3a26fcc5ff6c99160baf5486f89a443ea96c0d062547ef4a8b49c92f86ae015a273b2e15cca581b7ae41de
 EBUILD python-dotenv-0.19.0.ebuild 850 BLAKE2B fc149c8425197954deac6bbaf32d30f146a5c932a22e7c9cbe90dc3f9e78cc05400a32ae449c5eadf83b8649b82063d585147997bca9027723b40f080fdf88b5 SHA512 01d909a7670238234c76f026dcb65ffedf5a5ed47b605aa9f683b48897fd14116c1ee6a007b8685514316de1aad6d50eec65e29c336dbf086b31b3174c22ddb6
 MISC metadata.xml 465 BLAKE2B 9b67c317b80cf8956d86e3482f9bd4b8824013c758e13c53865c4c8b428127a39188b23776176e038b4e58f8eb4e28b6ff7030df75a300bb647f969ef979a551 SHA512 f4bbf11566f50c90aeb7684755651f9112d3ce12dbfc425aa209eeff7c5a2636688a9236bd5227961cc334c07c82f49da0f4f27c3189bb7a0a8f76b517e9036f
diff --git a/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
index a462def98ddf..6e5625da2f43 100644
--- a/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index dbf7f1462d70..9a411f7e9e40 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,5 @@
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
 EBUILD qscintilla-python-2.11.5.ebuild 1776 BLAKE2B 5fb12707469657cdc578331fecfe6d249ac7a0931c7317ffa0fa21db6a2ed8ce10be77f0be52dea9b90e22a6f2f161c56e44b2042de9c4e7ebe150f612eb4b6a SHA512 1b50ec0477ebfbdc8d646cace0faa2c965de30f2f67cb22d02a2900d0a19dd4d4fd3ab5230bc7f3ed1c601998338a876fa0d391cbfb603abd230037ae36744c0
-EBUILD qscintilla-python-2.11.6.ebuild 1777 BLAKE2B aa252d12003b8f970524ddbd3d687345ef37d020b6eb8476232d3b856f27aa2769080c7a1a3fd20abc3dd7e5a6ae348a0128bc49a0e197ae3ee6d63dc644178e SHA512 8f2cea8087db45bed1b62a2205b8af68b16bb92d82cff19d72780bf9b71b79e577e531bf6dc2526fd005b0232e68840ee1a984639358749260273950c8338779
+EBUILD qscintilla-python-2.11.6.ebuild 1775 BLAKE2B 66678db25f96256fc2180b0202a2bfdc497871b38ac16a4404e5c41ad9ab76108441d1c30372dfe2f63954c7625fe5bef8e16320a9e9b357874cb763aaf47539 SHA512 a0dbf64b283f52c03c3ed1fa0ea176eb65560fc65adbe06985ac8d4d91ab9b01ba785e39a4e502b911f9194c65e6287128ffb84a0568fff236e13ff42e7510aa
 MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
index 98e3f4c326f7..0a5d085b95f0 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/qstylizer/Manifest b/dev-python/qstylizer/Manifest
index 2f5b333c6fad..19b93c0eb638 100644
--- a/dev-python/qstylizer/Manifest
+++ b/dev-python/qstylizer/Manifest
@@ -1,5 +1,7 @@
 DIST qstylizer-0.1.10.tar.gz 20683 BLAKE2B aa12addac6cbe1ebf043d70189683feda87db3a8c2aa3604a04a969f638647ba32eaf7d156559b8af151136aaca784f26025746d9f3e574ad6eb777801bcf44a SHA512 1a747c2a0d5ce0acd220f528bc54c84c723f50bf39fc8d818f6a5475105319f46700d2f00bc5c0f14de8f0caaee0ab8904a379a3e697ca68d00ef62ec3408b2b
 DIST qstylizer-0.2.0.tar.gz 20710 BLAKE2B 1d751efd74e36e665823b64cfd51760bea489ac3916b7ab206d9c9f1fe9adbc0df2dfd9666a79e20c805dabcaa6f3cf4d11074943e0a54b7a6aa93a815c796cf SHA512 094d9c9c14d2000c2c2f2b428cd82a57424507c6df83aa21af3ab7b90e9006761ed131262a2e70a1c4aa4dcea87ac6d07f9137bc224967139467b3f4796ab158
+DIST qstylizer-0.2.1.tar.gz 20687 BLAKE2B ad158ac0f88c4a0a7c6d9fe9adc611f69cb946c28be8c414dbb40532901b53faee281e7c0a798c9f680d8e5cd8a04179b16df796041133a8dd65d117964e9905 SHA512 c5e4a4194b4282a6d2782c0636ed74e9885409570466765c6e2aee0a176175bb688854244828c56ffbd00e76d297a33de211dedae8d984021c816522ea2b6085
 EBUILD qstylizer-0.1.10.ebuild 1533 BLAKE2B 19a49fb724a3db8d99b89c19c8746f661b96ca424443f11e0b32fa8832298f5b037dd2709aac75f0da11f3a398d76417d8fe1a8ecf314d9bd6bb4dfbd1deeee9 SHA512 a0df706d4da862a15cb23f5d8250464421df6e018dfc8808941f493efe5ade7ccc455e96dc033de44fecae34bb9aff7ea602a1c83936660f97105fe3b278f690
 EBUILD qstylizer-0.2.0.ebuild 1538 BLAKE2B 665a15cce089ecb2f79a9bfff29d55007fd4caaa82babef57c915695d557a5e40483d64233697f85cc70205fa6b20fd45fa40df31670e1c1941dba57b492c6ca SHA512 ddda558e5299d7c21ef33b2c4117b1f50bab2552c4640c6a211ef433443c70d64e18fbd779e6ba7047936fd1ad5251e31190c5d379e8ac5a70ef6e36d83e9435
+EBUILD qstylizer-0.2.1.ebuild 1538 BLAKE2B 28e0c24e1d3423098180b33d83eadb428ba79bf20a65563cd1e1fbc670c95a955d4dba45c0ccad31fe74283ce39de98d558bb79e443c38634b7b8a45437e8490 SHA512 5b81b311255aa5aedfe2c42d4d945a7481fab161aceb63ee7fa7a1164b9073cd47fd1d6e7b0c6b24d33bced9952cf01ed7e25878d3557660e2a2f881a0a35521
 MISC metadata.xml 354 BLAKE2B ea116209c46e48581be418ec1035f3459b375c4fb4623a2af488f98dbde6ddec42eb65f11844477ebe4573366bcb66558c58bc25c50eead585ca70060c0d1195 SHA512 38ac9ffbc6a2ea404f70afd4f0fc3aa8663832116a6182cb05f48736c9f44c4b9211e77c93053e24b1310f0b621784f90ed8261982abba7c6121332593ded18d
diff --git a/dev-python/qstylizer/qstylizer-0.2.1.ebuild b/dev-python/qstylizer/qstylizer-0.2.1.ebuild
new file mode 100644
index 000000000000..3790a3be9a2d
--- /dev/null
+++ b/dev-python/qstylizer/qstylizer-0.2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Stylesheet Generator for PyQt5/PySide2"
+HOMEPAGE="https://github.com/blambright/qstylizer"
+SRC_URI="https://github.com/blambright/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
+	<dev-python/tinycss2-2[${PYTHON_USEDEP}]
+	>=dev-python/inflection-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/inflection-1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-vcs/git
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-autoprogram
+
+python_prepare_all() {
+	# Exception: Versioning for this project requires either an sdist tarball, or access to an
+	# upstream git repository. It's also possible that there is a mismatch between the package
+	# name in setup.cfg and the argument given to pbr.version.VersionInfo. Project name qstylizer
+	# was given, but was not able to be found.
+	#
+	# There are no tarballs on PyPI, so we do this as a workaround
+	git init -q || die
+	git config user.email "larry@gentoo.org" || die
+	git config user.name "Larry the Cow" || die
+	git add . || die
+	git commit -m "init" || die
+	git tag -a "${PV}" -m "${PV}" || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index d600e5d43a5a..9ff527c27e81 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,3 +1,3 @@
 DIST readme_renderer-29.0.tar.gz 27169 BLAKE2B e500e2a426045104a6cb5bf0eb13036811d569223dbe96d5d37298c1f344dfeb8d1c3d5af55feb822ba7616ae072ad913c0f7c69bd6a9767a5a2d1db2eb61a5c SHA512 b5f462c3ee077f5711c18a4c0243b084730a705bf5476355265d18ce4bfd696edd30a28aaa8f3aaf96b531a2cbf32bd9ed143431bfbbf08cd7ac7234a2d57a7c
-EBUILD readme_renderer-29.0.ebuild 799 BLAKE2B 87e678b85d9873d6b120cc2fb64b1f35db822e3e3b31063a70490ac4659eb7335fbb50dc2c65d8c49f0aedf700f24715c694dd1d2e5d5d9795eed61bf7f1a68f SHA512 50daf1ccce0a7bc136ed24720f88d94ebcd63d953d8efca3644aab948eec172864a0615510515f1acbeb2fcc04ff2f6dd2e0f45a934f16ae555faee8fead8775
+EBUILD readme_renderer-29.0.ebuild 806 BLAKE2B aa480a9e0e52213dd141e5bfd858ca525358635dc69609ee17404588f3f9357bba7b5fe9ac0aa2a5584297ae287a2d37ae24e17a190535597212f32d379630db SHA512 bbd02c0d027c0095c4505929b7e96f620520d7a5f5a854081d9be7f0133da8c8b42184c436f9f2503fbc918beeec08d8d21542480b0c585039ca7322f24bb02d
 MISC metadata.xml 415 BLAKE2B e5cc550becf1313c5ffe212ee846529669e2f321c9e2a1cf66ccd5b93f2c94d71a9506300223fdec685b406c2eb9aa216fc4bcbc5335560062158466b3e465cf SHA512 5e2c1323f0f5005984e3b8ec5cfb978552a45b343fc79f39534206e8ef7c08656c5797df42e3e1522ec27c6dbf3f91432fc68082abcdc07625c25b6e8c67d69d
diff --git a/dev-python/readme_renderer/readme_renderer-29.0.ebuild b/dev-python/readme_renderer/readme_renderer-29.0.ebuild
index 55944251e568..57c165645ed2 100644
--- a/dev-python/readme_renderer/readme_renderer-29.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-29.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index 67862558cf36..3eae86ff7a23 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -4,5 +4,5 @@ AUX requests-toolbelt-0.9.1-tests-internet.patch 1225 BLAKE2B 54af195690d8ac4754
 AUX requests-toolbelt-0.9.1-tests-py2.patch 3100 BLAKE2B 39ecfd8f0bbf2a4d0731c485ada404f405413117e7451d36eefbc4f05b0073f86310e66ad4320e8ce648175aa072306acab551a50a4a516470b0beb4b981124a SHA512 540813a2d69c84d37a4a6ec5b98d2b71693ba34bbf661bb44be69c646d164134702e9fadd341d07085205b476239260167c858983978488553a07bdbf205ba24
 AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.9.1.ebuild 1232 BLAKE2B 2698f8d78b4d6b095e1bbebd716d25b5298f841a241350ba84093ffa652df44a734acc8d0e1274d8d3b0ec1f9425f46f3d828fb63990f3c3191fb67432cec309 SHA512 e95e0cf138dbe803bd203bed85dbc137ec67108267610f545b2a600219772da850c6d5988cf243ce9661480f266188458ce1befffd2479350c4b6ac941df2721
+EBUILD requests-toolbelt-0.9.1.ebuild 1239 BLAKE2B 72709945d82f999c0818fb96cf27a5b01cfd6aeb868d7a31e9fe6f26b4e88bd2ae9150da6e9486a792de1e8ead3fd7e4ebfd6c5dcbfb050a480813b9ba5c3937 SHA512 37b8d55cfec583b71e2b31a89214ec753d8b7f0918f28154247317e17009455ebe0a6f5db534390c1aa93b0bfac1320f2fb42d0d8c5e8e6470a0c64f95b2ae86
 MISC metadata.xml 422 BLAKE2B 534e8a61bde6a16b268927910d9621c524477410a0dd30bc28928cf80296383845f594da0cddb896d83b1dd0e3c20d4bfa768054e19281b50b98c837e59bb69b SHA512 952ddfb8afd26d322f64fcfb561a8cb724cb0240c7ccd83a6b102025b04d56711f3283f03a49c3de820e13b4220eee6f3a72d629ff2d0122b347b417b4446769
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index afbd3421e3a3..c3c2c1f2eca4 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 33e3d6bf86c4..23c69ae0f153 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,5 +1,6 @@
+AUX requests-2.26.0-test.patch 1328 BLAKE2B 4f9e66505a4acfe7b4bd62c6c95c28fc01eb9fd7d09e151aef7da27fb105d5038ddc99c3d838c7a166d769223ff18ed0517e961ffa345459b4350ccdfa21b50d SHA512 89a4cf8d03f2bf8308cba1a6ed97b4f2340a2b9512636f2244f5f9cb6bae00300e73b58bbe53fad1d9c9e4e2e8e3298fa6741190869cfd4799e3be9bc56b0bc0
 DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
 DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
 EBUILD requests-2.25.1-r2.ebuild 1674 BLAKE2B 6efa6716415cf24e9bfc2b001bf2aab3ef7c10032921fb5e43fde6824a6202856eb5282b6dbda13206e1b19a7ec22e542b0721abb2688671f2a475dff6d33882 SHA512 3632026495ee62d4e17596d18d8f7ab78dcf1cb21646f1c04e2baaaaafc3925515c4018581ef47b86abac87e63ab74277fa43557f15446f12f06d6c79cc988a6
-EBUILD requests-2.26.0.ebuild 1473 BLAKE2B f5aa4569a4580e69a26c6b11c3217ee7ad0f9cccd8dfba3471c3ea6cba0674aa02df37aaec20cbc0c195bec12cd8c931164ec10650a196367f78343008c6f312 SHA512 3b3cf0cd224cc62849b224b27dd7786fa4de56351942fa3174f62af2b301ea1d676b769b6b32d4e7b02f83d6b22cba8194220f2386ff080365a8e69ba20943c3
+EBUILD requests-2.26.0.ebuild 1523 BLAKE2B 1b2150526f391c64487ae75b331bf782abc62e61f64610889af526ca42f08a43dc093c1d24a3ac8d077706b511e40ab93061cffa1c12df3c90464bc292acd974 SHA512 e65e67180500105b8e63c4eacf1403594f30c42e29550643f4f5ebebf7a4c14a569878307d7ae512cdca4bd3c247d8d7ecfb104becc049696d334f3ee337649c
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/files/requests-2.26.0-test.patch b/dev-python/requests/files/requests-2.26.0-test.patch
new file mode 100644
index 000000000000..6bbf78871713
--- /dev/null
+++ b/dev-python/requests/files/requests-2.26.0-test.patch
@@ -0,0 +1,30 @@
+From 6552e5374c335d62ba960a74b5b978897c823376 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 28 Jul 2021 10:33:22 +0200
+Subject: [PATCH] Fix creating non-listening sockets in tests on some platforms
+
+Fix the listen() invocation for the test server not to pass a backlog
+value of zero.  The value of zero means no backlog which effectively
+means that the socket can not accept any connections.  This does not
+matter for the majority of platforms since the value is only advisory
+and the platform tends to go with a bigger backlog anyway.  However,
+a few platforms (e.g. alpha or riscv Linux) do take the value literally,
+and therefore the tests fail since they are unable to connect to
+the server.  Let Python use a 'default reasonable value' instead.
+---
+ tests/testserver/server.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/testserver/server.py b/tests/testserver/server.py
+index 132221f7c4..92dcb6cb1a 100644
+--- a/tests/testserver/server.py
++++ b/tests/testserver/server.py
+@@ -78,7 +78,7 @@ def run(self):
+     def _create_socket_and_bind(self):
+         sock = socket.socket()
+         sock.bind((self.host, self.port))
+-        sock.listen(0)
++        sock.listen()
+         return sock
+ 
+     def _close_server_sock_ignore_errors(self):
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 24926975d014..88f1f9b8a52d 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86"
 IUSE="socks5"
 
 RDEPEND="
@@ -36,6 +36,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+)
+
 python_test() {
 	local deselect=(
 		# Internet
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index d7082d1aa605..c6ab186299a1 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3986-1.5.0.tar.gz 49378 BLAKE2B f5ef923626fdcbe4d13729a5599012a8a93d234eef7f9ac9dc61620320062a69646f810a8f0ea04f371b9c423850982685e68201f08ba96ad9ead3ab11a9b40d SHA512 b291b88b6890f8c9fcfc353e05d1b8c0435be62f22768568ecf714af083b3c51d7a9b301fc9196d37ad4e6eeb8c6a237ba40914098e755b4ccdf36b7df7906c2
-EBUILD rfc3986-1.5.0.ebuild 677 BLAKE2B 6f8c27f60bbcd7a147221d969690bb1f67558a6799f4245d0ba340e62b2cb1a9ae646c6bc62ff56a4ddcbbaf4246dbc142af0c6c4ca65936fa4e64ce1132cffa SHA512 c524b8f6e8d0564ed14cbc7a4cb951d476e484f0b9bd625789d75fcc5aec234960dbc4992ffaa466df20145c6daabb35884ad46c08d44869a1ac945cb1f18d88
+EBUILD rfc3986-1.5.0.ebuild 684 BLAKE2B 4c9643c65709e7be8d0532bcfe9302b6ef3f5cf1709ef9e490589e213dc7a4d70bcbff21d01554aa716d839cff8b9c46a2bd9d3d7d26f733b36fd6ee879148b2 SHA512 57b8d28250ce0cde9d437f2d42d32b49714a1f0da6d0a82d8d438edded99d07921d6dc6666992da61148bc52c81e22a95f1613951bd4f6db2d4619906c989bdf
 MISC metadata.xml 740 BLAKE2B ad52fb6e822fe4ab8e910af9f4896079209f0704c649d240464eb283c9796f5bead9303b7bb02f5db5049b9afa430bd190871c1bc391a21647eceb0d353c02c0 SHA512 3b74fb8b21300169b3d9da6c8a14bcd950d277c56ea242a73fc56637d853cba64de931567b19c0cd8b9acd6f7b8e486fb9e1ce0716b1c291669e6588caf6611c
diff --git a/dev-python/rfc3986/rfc3986-1.5.0.ebuild b/dev-python/rfc3986/rfc3986-1.5.0.ebuild
index 9a5d1047575c..29e91f6479e2 100644
--- a/dev-python/rfc3986/rfc3986-1.5.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="idna"
 
 RDEPEND="
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index f5a82024fd1b..b2676c3e1c8f 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -4,5 +4,5 @@ DIST ruamel.yaml.clib-0.2.4.tar.gz 180667 BLAKE2B 01341ac42ecea437faebbc9b30ebe2
 DIST ruamel.yaml.clib-0.2.6.tar.gz 180695 BLAKE2B 54d0e00544c1716971022257bece3a6c8f83c9188b52e15a136381f5fdf00a519fc5b74792c614a2908ffe68f20fb165732cb814458dadb8498660f28ea67939 SHA512 12307a3c3bae09cf65d9672894c9a869a7ed5483ca3afb9ee39d8bcbf1948b012a0dbf570e315cc8b9a8b55184de9e10324953ec4819d214379e01522ee13b20
 EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 712 BLAKE2B 21715932317dbc77cf8ff974a08d5deb490df557dc696596cf712f5d7d0cf174b37984aaf704a2adf8a166243b6eb4f7497d73ab098107a80590f200fca2bf44 SHA512 1d10a165392ef789b683dd3f726eb39f5b79d57429f20056c1cb4e2f1c8b3830ed7eaadbd25ed36ef64f2fb83cf50cff21f2205d21ced9ca4edf7db476d00793
 EBUILD ruamel-yaml-clib-0.2.4.ebuild 657 BLAKE2B 5225bbfd6231d6fe97068f0db8cdee17f81c64f20f4299fe516c7188105ecfea1ab822859aa27f8c170cbe445cde3428d127d57bd6ea154210f3620d9f9e9eb5 SHA512 b6e66aaf6dc00caf379ccd1dee8a9ffbf3f13623d18066e5592bd26f04d5197354e4d5aac239eca00bc567b881bcfecd45ca361d115c6223ab80945eeac2a5e6
-EBUILD ruamel-yaml-clib-0.2.6.ebuild 657 BLAKE2B 58b1721a76de3ab26136eb97971efb21d657f7e8c65501e9af64e3cdad4b7572caf7f87ad83267a6c7542d168b113f411da4e5242b07ae1205fb8462d10cb7e9 SHA512 1262d96f46b03a8b693a0e9d7fbb5b6949744cb592b01962b6f579838b487166e60945380f289ab380e3f9f11ce2fd85c025688169b5735dcb6eea496f74f2a3
+EBUILD ruamel-yaml-clib-0.2.6.ebuild 654 BLAKE2B 8e2c3860252e933656fbd8428c08cefffcaca1c75f8fb2cc979bdc6839683b43aa5ee0f58d34e3dd285045f4bbab7fd38c3ba1b300a6d70ee600bfd3009ff4f5 SHA512 736497ed7d2c1d2f2053541bc378b5413c4482d14e8c16bedf02175d56d0e08442b79b6f05c356ef10d583786b6dce4a525369aa22b9d4af959d02ddb14ab77d
 MISC metadata.xml 1183 BLAKE2B 5e9198838214711c9fbb5beb4179300c5465079646c3f4268145a3c893f1913ac9a14811b39afe637aadd183e4351a54c2ed160951e995bc4ce3f869b28bd6e9 SHA512 d6e5a8de5f9fe3e71a91a26be44cd87162863b1fede14301694e0a38135fc2ffb5c3ee25a4aef40d7cdb73812d0b6af72aa6b67ad782004648f54ac5e86cc662
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
index ccfa6dccc704..381abd6f3384 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86"
 
 python_install() {
 	distutils-r1_python_install --single-version-externally-managed
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index e489e0bd1c10..d5be2675286c 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,5 +1,3 @@
 DIST ruamel-yaml-0.17.10.tar.xz 183116 BLAKE2B 2795f470a3f7da609780109dfac502a5b47184f465c68420f467209275c8857418a4ec7424e130df2e7acef614d93f91551910eceb06cd9e49b365bb23d2a015 SHA512 3cd2598fa37564c44c74720e72babcd2252b2dbcdde626bdcf771b591da5d2852d90bb1f22428e28cd7ec38304be2a437aa0569ffbd3ebb526b2b79a955bc88d
-DIST ruamel-yaml-0.17.9.tar.xz 183112 BLAKE2B 3dc33257435aa164724f8023c3bcd2f693c5dfbb4ac52467c821902819183e119f46e7dbcdab50216c019aa38a3d8fb94eb382c85edc0a08a278492ef53b2597 SHA512 dabc5540f68454d8abb46434bc91161ceb7bc613593c6aad79a4148c4526248d6053e356eb745e4cec7816885c1352f62d3c0a61d3d8a40315fd3ffb0e2f57ef
-EBUILD ruamel-yaml-0.17.10.ebuild 1320 BLAKE2B 5a4c4f01e172a4a54a025b64fbe6229ef3e96dbfe97b627da9cc37c22668481f05ac68d37eab8b81539fecda88588d63cf9b49e1b2c1cad2e83ca008e5489bc0 SHA512 5db02addeffbac54190032c5c2d66ef4791dd404b3e7990e0a38d58512671581e606c3493347a0c1ffa241fc5133899dd8f0b129acbdb3b8493e49413aea7a81
-EBUILD ruamel-yaml-0.17.9.ebuild 1313 BLAKE2B 545d26daa4b7210c4a0bfab97c8959534dec58e3877906eaea653001f294ee9207123da79df59bea7056ad698c3c2f01398299c1240b19dc95f3739c1d33322d SHA512 ed3019c17273eb7e3e8fa358a7db08cc5c0e21039d18af7b0090ded4ce86ccc5d8cbbe6e0a2f7fc5262ed54dda7dcd218fee02122435ed1bd1b39a90b9c1bf83
+EBUILD ruamel-yaml-0.17.10.ebuild 1313 BLAKE2B 545d26daa4b7210c4a0bfab97c8959534dec58e3877906eaea653001f294ee9207123da79df59bea7056ad698c3c2f01398299c1240b19dc95f3739c1d33322d SHA512 ed3019c17273eb7e3e8fa358a7db08cc5c0e21039d18af7b0090ded4ce86ccc5d8cbbe6e0a2f7fc5262ed54dda7dcd218fee02122435ed1bd1b39a90b9c1bf83
 MISC metadata.xml 870 BLAKE2B 2cecd06b655552acecc4946c417b1737c120ff9ac0c84dde9ab0dd8f1e6ce7499e9568f7be4ebd9ae4835787739f9acf0e3a0a5475fdbef9327257dbb8529e8f SHA512 7162e297ad95daf7ef9345faa2e698576f440baa5dab43816be924327eadcf04925e02076735ec50f764f13dbfe054640c72d723742af76890f517de95ab3457
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.10.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.10.ebuild
index 9cf177b48a8b..86fa6a9be480 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.10.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.10.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild
deleted file mode 100644
index 86fa6a9be480..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/p/ruamel-yaml/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
-	local deselect=()
-
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-
-	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
-}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index ad461ca20d66..4a0b2e30331e 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,5 +1,5 @@
 AUX scikit-build-0.10.0-docs.patch 773 BLAKE2B 27303cb8ff439dbf9e44454ed58cffc2cbba53fd639b830e03707fce7aca0749018caac72891c3efa0b66b3830001634ca9e2cd34c769f625d2f735f5c1d4dcd SHA512 d6920e22ec20feec99768d09b3a01244eb6bf079b4d68c0eda1a17d04c640c7b5df6685c883812e7c9bf5455d6c5a8248a503f466db23da82d45b5ba53188252
 AUX scikit-build-0.11.1-py310.patch 915 BLAKE2B 8ae5eb217482f0dfbcf966bbee65e9e2e2d7e74bff1970b6417789ca5c93881958640213ffe6c496a4a7f6578101fb51976528474cb3c8147302ec9221d9d1be SHA512 98bac74f6715320666be75455515efe35b208bc26209323453589cfb0c83ece5acefcaa5d17f625dd9ebb5970c06a3ba69334d140525d6b944066e50efdce22e
 DIST scikit-build-0.11.1.tar.gz 132025 BLAKE2B 0f818d8da896695ee0d6b046249e74cbd4ea643bec0515d6ac6ff4276d92430a1dbf81abb3b7c10890538c373225a45cc21b0906de891f1a5390226be914dacd SHA512 030c6cc727d39cbafd2865722de9c45ba2f13461461cf75019b9caf6afd0a776b4f598fa2ce102b5adbc770140ab1de2c33e2bbd3ef03c958ae8849e5fc26cb4
-EBUILD scikit-build-0.11.1.ebuild 1404 BLAKE2B e5f2fbef3a71a1bca0960e6bf122888b7f650ada67cc2f2b151b14579a58a7613c7569767627e59b62ba7d31e70d7728b1238cc830aa46782086fc4278636825 SHA512 3c60c320085ff46096af8ba4cf27d7d20c2f41e1d1a26e1a12e6cc8f7fc30e194183b73f69b754129a80785333171c058c4f436f13d62925cbde96567c045780
+EBUILD scikit-build-0.11.1.ebuild 1411 BLAKE2B b3ecb92aba76b74d590f63a4b4c075a655482e4eff387a0c1408b94839a9fc3d8b457e6c5de390ae1ff792a1ca1ee7fd88cb4fdfdbd6bf5647bff63fd2ef67e2 SHA512 c0c50342ffd267009bc592e7e8b3e460bb261e55eded793a58236cc9fa69b5f45c58ebedb2cf2fa9108b2175252c8359884f8aa3f7cbda9bcb638257a7e010c0
 MISC metadata.xml 407 BLAKE2B 91cafd558c8797a07a57e8581fe68b3353d6f70a00dbfda9ce1615fc5302f9cce23a806fc31f4359f670546a39a97ddd7958d0fd77ab6d18841f3888bdbda0c2 SHA512 2a06667260d774bf4e49553c709110b14e798cbe4641352c745c5af6e400bf027d1064997b5347e4ffadc27310dfe0bd02a58a891defd6d7cd96f1b2ed3909e0
diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
index 398a1f1c646a..562f7551dde2 100644
--- a/dev-python/scikit-build/scikit-build-0.11.1.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index f4afcfe58a8a..4020d847f341 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,5 +1,5 @@
 AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd97061df85c41783a1b5d760d9d45386b8b4e3f88e25e3f98cbdbce44796e5803614d5474444e554d305089d098fab2cb07075cf71 SHA512 6adc7fd1e2a9f52804272bba1d83eddd6db82b4b67569fc75d169794a19c505d51fd53c949eaabdeb775119a5e3929902c2bbf3883ed299b2de0e4faad597835
 AUX sh-1.14.0-skip-unreliable-test.patch 237 BLAKE2B 55b600d9426f127704cb698bb4df90b103b0ee08d29165f4d45e3fa56f1c0e20d3ab63b404cfa8d2bc372549a77474a2396903081c606516837ff295990eb47d SHA512 632f195df6a85cd65890d093400f4fed099c2344fe4e7f9d46f3decd817405ea587a18b271da3449088cc23519b5f16b30a2030a81d3bfcee30d4d55c591d5fe
 DIST sh-1.14.2.tar.gz 63779 BLAKE2B adc9004334a53f3704e22c318df6b4f60fd9ca2d31f5a9601f84abfaf0fe2ded06938b165e10b1a977ed38fcad7d0fa08799f2f552fc2c6b9b4c2a6476477115 SHA512 b7917504ae85606e1986b681274077777ad3011639bfe933d4133c3ed16f930842e03b572caa396ca4d58f41fd5594bef776cc16c4b0fbd1242e57c6aad19e62
-EBUILD sh-1.14.2.ebuild 606 BLAKE2B 3f2f26d294141052d75d2d621fa6ea1d8bb1ce2386bc50cec0abb5c63366ca4f067b7c462eff8eb6df80e7223c2e6c7ed7eea2ba1cdd01f08617605ea7f06dec SHA512 20014771b53334a05ade781415d824ff083f185e501a2d881716cea3541ada5fdc657a865fbef7f57a3668716f157b19285b33680613fdbd56f0ef6651873982
+EBUILD sh-1.14.2.ebuild 605 BLAKE2B 4041fa9627104d037ded2a42866c02474caf6cbf69d8cd8a12f53309667d569b2678192aa1e491493d27395595a70ca6ff3472dbece06c4e4ef03a04c3508a02 SHA512 b3db3f248ebba97f23f5b64476688d1c497a7927d25a9204114bfb61ee8669dd23ab0000c3f5152b926f30b57b7eb238113d4fe9be18dd5e47a06e2c00ef0af4
 MISC metadata.xml 700 BLAKE2B b28a6dcf657471c09605d90f1dd4ebe20d793939d3fe4efbec1365d8ad9deb93b93fb7d2686c77e05f03421f5914d44694f8828d54cb72d48f15f50c35b92aba SHA512 64fa8aad2743f7ebdb43475c3528a214ec2d2fc27a9147ec33fda61c97d5a08efb8d9d0786a34d16a0a5da34005654c75475dee62c46db9932b73ac4747c18cd
diff --git a/dev-python/sh/sh-1.14.2.ebuild b/dev-python/sh/sh-1.14.2.ebuild
index bc36e16c3855..ccb7226d54e3 100644
--- a/dev-python/sh/sh-1.14.2.ebuild
+++ b/dev-python/sh/sh-1.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index d82a7ea84655..9044de4f0557 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,3 +1,3 @@
 DIST soupsieve-2.2.1.tar.gz 99298 BLAKE2B 94532421f3b8e49d6ab75a54a60ac861a78eee9f6792ded096e39a8a43d46d195cff9b7d8feab918b0f2debc8a6dd35226ab714384fa7f4d795176e269b6c4cb SHA512 c1339cfca237af7f8915b6d644b8271f769f9a37aa68f8acf536236551baaf9bb44a2f2a736f9168a7649cde14d37b8c24614c9491acbf81e3f4fdaea96b4928
-EBUILD soupsieve-2.2.1.ebuild 719 BLAKE2B fef1a146867fa97d78d4bfb6c9f361ef12181a677b2c55d807d77b3a1d03404daaa5f44cea91c6708af86769469e708d817fba8b638d664784e0a70f40967f81 SHA512 ea0aaff2aaea415e6ec4841fc88f7db4ad4962a5ce30d86e12bdb3bca6ad5878f3127c78659181562fef35b0211a2fef698848dede53effd1417b3f086e99c1a
+EBUILD soupsieve-2.2.1.ebuild 726 BLAKE2B 193d11912b7203acdaa8153fe022351de33704b921b645a1534de34e8d47119778a43865dc57189e37b576a2a725bb3588b2f928189e6c0f50e5f981e4702b22 SHA512 bb6aaa874e6d5777fbacbff2efb232871ee7626d9f7f162ffe9c9e6b1bb367332db393e7e495e8bf8ff36ac50c31d4392258d304f8aeb7f7a0552a869b1b2c98
 MISC metadata.xml 398 BLAKE2B 0aea8c93259062872f7899179236d9ee52a85d4055e3a5eee8e3643127611686b989c0985ed571d491734e80e45598dd1ad9e4fc25f56ba5e657b28a8a9eaf37 SHA512 36a527cf2a4572c0149f7cd344c3247309b89ef461d65347dfe30129ade1742bc54ffcc6d1483971a2adbe5e4de3a15ef73f6e8ba631f4dabba8d32a3bb2c288
diff --git a/dev-python/soupsieve/soupsieve-2.2.1.ebuild b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
index 670fe35d2978..a484c1b991b6 100644
--- a/dev-python/soupsieve/soupsieve-2.2.1.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index e3c0ecd58132..b870aa21c090 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,3 +1,3 @@
 DIST tempora-4.1.1.tar.gz 19208 BLAKE2B 77901d1f4b19f2c88d4492788f8b351c70ffdb474769597bc2eefc85b4dd503e57876b687b600b49a381dd24133ae30ac547961e7cf8d7005e4cce5dc5049012 SHA512 a272980be5d4448bbd97d9e48d8a992c07cd1e970924f301fd3444834fe112453d5714ff8f3e7af6a5775d931b825601d7f1abf3cd9319b08d148a2a07d40d07
-EBUILD tempora-4.1.1.ebuild 923 BLAKE2B a8ade4642882cd8379218de8f63997a61a190b8f0226409d4b60dfe3bf7b8e767ef7a221822c2eea441db7df2cda512b3d315dc1ac91fbf3c0389aa6c383b594 SHA512 9146ddaf66a8cd1ede4eae7399386da7ab98f1f1fbe8508f3f84fcdfbfa3ea9f0e67ffbb1347379aceb18420e2d7fdcf4bec3735b3e2eaca5708f33e0fd1b448
+EBUILD tempora-4.1.1.ebuild 930 BLAKE2B f04652dbc13b57396172c0035fb0ed58a5d9702e396f35d913447563c51835a3ed84f865cc890bcc14b46ce9af83671e0768b043f0b5f4531972d862c45094ae SHA512 178af61237ffd54f19cd0474bd4de8c8b6a086f2b5f447b9d0c63ee351b3e1e9474a7d34af2264faa52aa5b306f9729522ab15867873b04e160bfd10871df98d
 MISC metadata.xml 639 BLAKE2B 0d9a50a66ac1bcad2bb56a48e3749b50f3b0ed4163d5d1ca75f097f0f67a1dd3104720075c2e2e484e8e9c119f18f62b9217c413dccf62ec19d7558c6b5c65c9 SHA512 a5faad13de686702dae7b796a6a2bf7f0195cd8d1a4154fe006435140cc4d789a9c42251c072c21dc099569b65b67d4bfe02f115c3d4c5a25d76f28532188e9b
diff --git a/dev-python/tempora/tempora-4.1.1.ebuild b/dev-python/tempora/tempora-4.1.1.ebuild
index 35aa7d998cbb..1597a8277be0 100644
--- a/dev-python/tempora/tempora-4.1.1.ebuild
+++ b/dev-python/tempora/tempora-4.1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index 192004367aaf..515b32b65a1f 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,3 +1,3 @@
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
-EBUILD termcolor-1.1.0-r2.ebuild 524 BLAKE2B d6adf2b0f496bb5ec430462e8fdc710bcc539092cdc246e3d030f09a8d57958930f1188610bd54942db54ba978c90cf47ca69cce9f3885f58247a430062b9efc SHA512 8e3c4d24d72022f6e1f41ccfa28ac827ca3ffe8a055f8f7fd6869d12884611d39ec6d3025a5e48d878e276955be13a3d6250dd526eebbe02474e268dcf56ca39
+EBUILD termcolor-1.1.0-r2.ebuild 531 BLAKE2B d6b16b2143fd793828fa4ab9d379f6a42225f46a8d23320a8a73b25957b66d7c28e2d4503f5b47b4c2cacebc2cfdd7d15fc3cf60ac84de47bd7464118a182e4f SHA512 682537d6c259de31973f3e07750f3456a915f750f3ef245e8bd51accc990804332f054f859df7316055a69163851cead3d829e7b92230ee51447a9a67ab43faf
 MISC metadata.xml 468 BLAKE2B 661dac009a69d3e67a38195747df19e59eeeffe99cf88e0f225526a89b75ecce42708106d21e5902b9e091f7cf3e1a0462c4ba4b521e120cae56effa81d95d20 SHA512 b08572c63375e0f15530faa189263c72d6f9f954d33a36a97df6a427cfa05fe74a650be3f34cb4af4409f9b6748adae5db3268116bd47d25b2752391e2612a0a
diff --git a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
index fe2c8a672d51..c0f732a7d380 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 # no tests...
 RESTRICT="test"
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 49c94a2921fb..2a2246f89dbb 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,4 +1,4 @@
 AUX toolz-0.11.1-py310.patch 720 BLAKE2B e1612b5230fa0f11251957709d8841e423e7f3916506cf55416407689b5d23ae9ef8f9dafe81c68dff1d8bf1c287c7681416c6cfa59bc8062086de8a17e9f565 SHA512 26a4b641f74659c825dc89ed5b3390a09503d92f2e906f2eab167871e9b322d6db1f54c988633a79a36d2c0edb1a5de368031bafe786781a8e7d5b6de710a588
 DIST toolz-0.11.1.tar.gz 64428 BLAKE2B 934f122bbf9e762e72f502f8b9ba8b5aa946b6e2b758e9501c2bc58fefa3443cda4b3e2c423be221643f51b2a12de0961be835ae3a23e97525fa203c969edff4 SHA512 8bea2b75b74d9da988c777577f3ad574192659dcc4bea54ac6d1400a81bef07818c49c8da40028a8c42905f9ab5b5111c50c239fb56f34c315865f90413af68b
-EBUILD toolz-0.11.1.ebuild 535 BLAKE2B 9db4f987213c9f8b835209a959baff6b4f492755463a7fa68a9bd84382825f95e27d7ae35c079adde011e200208fff6d6047b2334038949719a0b89b54abcac2 SHA512 49289239e2fb5bc9cf3d3c56fe8eaeddca6d4eb252361d2143976de331409c53a623e388138ecbf8d9b5731cd5303421138a0c76558a2e236c93729c307c8b80
+EBUILD toolz-0.11.1.ebuild 542 BLAKE2B 85115eb1ca87c5204ca4dce9f8dd3399042e7dddc32c322ea5b4140150c0afb57b9f8556d21130ead3bad93aea7054b5158ffd4e75301f5a4f16f188b70e8d3f SHA512 18fb7732c686d1fe68e0831ebbd1db5caafe6d83e9babb0fc2f50aed9eddeb062371b0c23afe08e35f76fba64aff838942e5c0d26727ff8b8ab3c70d57f5942d
 MISC metadata.xml 332 BLAKE2B 36407eae22ccceadca8dd6127b7b6e1d04d65722e2ac88fd8f875807ec6f08f5a62d3570970c7cc85f6fd9bd6998c38b06100712569baa086dffcee98ef0aae2 SHA512 f32abff7501f0aec08df19ecc6f3b3aece597c396d73c7c025cb6e6f6127c9aa498719f02f55c51bfaf6e0d0dd51a150dab04baecdd9586245a2f8a0fbcb19b9
diff --git a/dev-python/toolz/toolz-0.11.1.ebuild b/dev-python/toolz/toolz-0.11.1.ebuild
index 5ba2982613f8..99a04a7c94be 100644
--- a/dev-python/toolz/toolz-0.11.1.ebuild
+++ b/dev-python/toolz/toolz-0.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]"
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 74775d93d184..d024051b59bf 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,5 +1,7 @@
 DIST tox-3.23.1.tar.gz 303896 BLAKE2B d59160035a6412a69f9434bfb5b2b27aa9a2ebd5344b4898b677dac15dc91ab94feca67b8edde4c0ba68c8a6a12fa885091d82a088439257e9393a99e77ade88 SHA512 ec5daf106287b265d1abec8465df8ad053ecf59876038a7cb419a57e22373809e50f8131736762dc485f559363b1878abb49d909e7b6952b2e49eea77c193281
 DIST tox-3.24.0.tar.gz 304960 BLAKE2B 5f6256d27d75651929f2d4d511f6137f20c71ab44c57e5b908c0ba92d5d7998ad5df69bd937a963bdf27625eefb222b9be2c7dffbf44684092ef345f4e33d0ba SHA512 94879cb65c1d41cfca02b23c7d540b93f5d3667ce72135969c584f09e00e3a246d80851f7cefad1e199f0a56c526e4ffa31c2938428b6632a38ad72388925dcd
+DIST tox-3.24.1.tar.gz 305886 BLAKE2B fcedf8054a19a79045b2edead599fb11b7942986fa4bbc184140603e3bc6700eada452e661f4a576d029804ab2a9282df0cf9198eee9b483c2c6c68b086ee156 SHA512 e4bfb3dab15887ce6432a91b88a7387179cbf2a5ab5fa608b3f1f7349be4122d76ce01d396ae9b1515c211f2905d110a8414e254cc72bcf8a74542db98ea52de
 EBUILD tox-3.23.1.ebuild 2143 BLAKE2B fa09dc3153a5270f787129456d0b5e392867aefe171e6419d0653e8d695ae21594f1dbe4e035e58b4b82b5b7307b001c2642bd07c7e87e35edf0ae7745e3ca5b SHA512 7fa17af47c1f9290fbfcce71dd3907ed4d11a636699acd3c2c0fb7b346ea96525616f26c15ad18cdda158469f9c20f0214f4cf921b1a2a7a2f9b6aebd61a017d
 EBUILD tox-3.24.0.ebuild 2135 BLAKE2B f78d5fe7f3a27431a673c4175b93454d60d315c15b7ad0d7175b68827358319c5325b2de26a304f6a26a98885d69ed7db600f6388f68d7adae95c0ad4ac692fe SHA512 ebf3832e9b2b5c9814a53b134f95f8b0c6fda3b1ac3bb234577c2b22e39839c120ce978df29a9c43d2ec4313fb2d2207c23ce15aa73e885888319a7278bdb2ca
+EBUILD tox-3.24.1.ebuild 2135 BLAKE2B 211ba555220f655051a8cb9cecf1003daa26fa2760c2d393a3ec1099f13a5a0cbb913ba42faf76c3be9490b13f35b25c81442463f69dab7cb4da6681675291ab SHA512 933864001f395a128792c32efc2fb797e04dace82d74c0edb1ca8eddf5e0e63c447b1de8784d06d128a2b7ec5ff26c7bf5d01a5f61fd2fb5afe6fe20575e11cf
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.24.1.ebuild b/dev-python/tox/tox-3.24.1.ebuild
new file mode 100644
index 000000000000..fb84528454f2
--- /dev/null
+++ b/dev-python/tox/tox-3.24.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		# broken without Internet
+		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
+		tests/integration/test_provision_int.py::test_provision_interrupt_child
+
+		# expects python2 to exist
+		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
+	)
+
+	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
+		# TODO?
+		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
+
+		# broken without tox installed first
+		# TODO: why it can't import itself?
+		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest --no-network ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 18b37ab0fbd1..3953d9c7c1c3 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,6 +1,8 @@
 AUX tqdm-4.61.1-py310.patch 1030 BLAKE2B 7505087ca6b5db8523a91c831d48f2dcbe34912d6eba34f80f48044bf5ff8a3c0166c02f5b4e2a693dbe49bc8a7db2682813ed495440f3f8f9fc0e69d93d31a3 SHA512 1de7036c469c078028fe0a9044ecb0ad1dc16d3642d65d13a7c61e6fccac9bea652da0dd385a238ed68a423d481b5bbaa09b2deb9a859a07d64d2eee617c53e8
 DIST tqdm-4.61.1.tar.gz 169637 BLAKE2B 8b89f320e13119b24a9e121747bce0b5c6625c31feb8c427a97e71da52797d9de764ce5e5c41c07d5954a1e5e4e21913335a4691837bc243db473821b2dad1ac SHA512 6092a30389380a511abc8bee7e6144556d6dc1a993ba4a2685707afa2838a12f472aa216ac5e55d144da74f9be1d398d4c6f5352986a200557e4aba67831a505
 DIST tqdm-4.61.2.tar.gz 169665 BLAKE2B f5dff67eb549cab0dd667815c25f6e885a2e0cefc2ad68e97fdc09599eb41b13589f7a88d5a445813973454a5e5f835b3139651ec2e09b717db0fd6dc705890e SHA512 bc33e8fe00244f90f61ab51d0c7c0b98d5580efebd9758284d9dbe2a699eabeb0d92871eedc2f95f377e29dd0f7ea4b5247b96cb4cc1687dcfea3a9ed1152ab7
+DIST tqdm-4.62.0.tar.gz 169668 BLAKE2B 64a3df2f00a4fcba6bb67ae15e04f392a73b54cf7284f3c013ad31d00317e9d84ac2e1feed302137aeb7ea9e3c9d1d730623cbd96e8c76c46df6382435146efa SHA512 dd60d5522b68086410ec5f02574477dcc33a887ef509cc1d1735921dd906f951180d6115680517b3abbd2cf6c4ee1c60b9c950654ea9b7642d52d28052326088
 EBUILD tqdm-4.61.1.ebuild 1200 BLAKE2B 0a796c10c2f1d1da67c2790fbdea9192b2ab613427468c73c6e3ba395c10a0aeb7d9db0621a8aba0bba23cd72176f8b7c442069f7c7b12cf46200a685b726945 SHA512 486fffe2e60ef08a9924ecb81588c4a4dace8d1aa5576ed8a2018e1485dab2381c4c176c92fd0cfd75a901433bbe5adf808d9643c4124c330dadf1441ddc60e3
-EBUILD tqdm-4.61.2.ebuild 1163 BLAKE2B 3498857b43003f27f533ea645e815e37e9462d1ea786028c11454b2fe0244e9036d34075c03648253defa0d8404359d4799cf47822478f4a2fe3f6dc1bb43887 SHA512 0e4b11197bbcd9f2b291ddad36afc2a6e442671afd0fc08687ade7c6612287f725d4711aee2c77e160bf6ba44f6696e03cd22b8c227a38bebd276a07cd88eced
+EBUILD tqdm-4.61.2.ebuild 1170 BLAKE2B 2409955943a44f519894be995f246cb779fed309aa1a6be85c4a73fe1c5bd622d92ff3debd3da955804c83ec269a3d01fa6ef8bd1248f25bbdc950e37c4129d2 SHA512 aa59e6ebbef2545054fb3cd3606e55b3c9267af575302b1975d956d15ec2457b7cd46f3657e8e46f63e5f0c6bdfacbb3f5e02122a42c66c5781133eab0678046
+EBUILD tqdm-4.62.0.ebuild 1170 BLAKE2B 2409955943a44f519894be995f246cb779fed309aa1a6be85c4a73fe1c5bd622d92ff3debd3da955804c83ec269a3d01fa6ef8bd1248f25bbdc950e37c4129d2 SHA512 aa59e6ebbef2545054fb3cd3606e55b3c9267af575302b1975d956d15ec2457b7cd46f3657e8e46f63e5f0c6bdfacbb3f5e02122a42c66c5781133eab0678046
 MISC metadata.xml 604 BLAKE2B 574eef287a9260a1c115d2e8751c417962cbc09fdd18c68b189898974c8396bc7fab56fcb71a067477e0701916cc9e4dd6701d19e86e62027fd8a34e630b3f17 SHA512 d12b1ccb6601676fcb18122a94d0f397ed1d411a8f8a40d32e595bf36faa08d5a9aeada278c471f063ea75605d7657f6697c2ed45ccc658b9e7f57a0114e7982
diff --git a/dev-python/tqdm/tqdm-4.61.2.ebuild b/dev-python/tqdm/tqdm-4.61.2.ebuild
index 376ba7ad0389..be993f734871 100644
--- a/dev-python/tqdm/tqdm-4.61.2.ebuild
+++ b/dev-python/tqdm/tqdm-4.61.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/tqdm/tqdm-4.62.0.ebuild b/dev-python/tqdm/tqdm-4.62.0.ebuild
new file mode 100644
index 000000000000..be993f734871
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.62.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Skip unpredictable performance tests
+	epytest --ignore 'tests/tests_perf.py'
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 16b6cc1655da..710dec89e6b7 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,3 +1,3 @@
 DIST trustme-0.8.0.tar.gz 29046 BLAKE2B 5f2dd542974466dd8e61fa0ba5cd78e824afd243dd3b27ca21aec4ba4905daaa0c46db8f4edb30dcb483acf44758d7ad8de4db9c3e07a05d4d3d084565722def SHA512 93b1007319f7d625410eddf92910607c8190533f9bb02a71ecc4c424e44ecea70749f6bceb917297241e179b0d50ce1ed330c208cf3de77d4d3a619f5436af9d
-EBUILD trustme-0.8.0.ebuild 810 BLAKE2B d5dce7362c72101be2512db8bcf8f28eab7da67f4fee249df7bdf799ffc55a4cc30ffa4b97abc65496bd5cf7f405f19919e2d3bac4bd254b963e708d55a213f3 SHA512 c6f5129605a6f4e8cff554014627298a0c2d17d19bb396fd949cc3add5b13e125be80dae3608480f7b1f0bf1b1ec1294daeb0baa7fd62b4815d1046367638178
+EBUILD trustme-0.8.0.ebuild 816 BLAKE2B b98441c0bf208482ad89506e5f47df5b171f816b539f2b40c004c4aab9a13e68933fe3f3dadb43adda96cdaf5cc680f52f4f21d06667c9b70d928592708f9203 SHA512 91a209bd08a2d1fb97e4bd1d40de82dd5258e793e85ab7e49e4967a0e784f2da23e3991fda497ea10faa661b364a31be43d3f112b92173fed1394d32937b3ffc
 MISC metadata.xml 443 BLAKE2B 8f591132e3a9478741063502a0da9709ba07974432fd9b008c59aee122f234b11b44c29b78b7f69600d7b385701c4c909b98472a7eb3d1a6cf5908acb436727f SHA512 38a7f228253d556064d94478e0e10ccf526368cff06f7201b82911f404e5e6d83a54b2658f6f241b8a8d1d600899dda9588023cb38fda828d94c6983add0f7f2
diff --git a/dev-python/trustme/trustme-0.8.0.ebuild b/dev-python/trustme/trustme-0.8.0.ebuild
index b56cc1f32e33..98d886c57307 100644
--- a/dev-python/trustme/trustme-0.8.0.ebuild
+++ b/dev-python/trustme/trustme-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 23f3948fed89..17a680ce8752 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,5 +1,5 @@
 DIST twine-3.4.1.tar.gz 211775 BLAKE2B 0fdc6a8f5a37ee9695c8db2080987b631dfe6f8ed718e3912c94d77b46d35682d27bef07715c1fe7c0d8b6ab1449a771e18d8ffa5c6044dde1536b56b3e7885e SHA512 eca2a7b6b1386868f67dec1182599a8331981585e1cc0b7eef762aa0e99b87b0c6725a2c776330a8b392254501880a68e01ed8569a169857e8079abb8da43b79
 DIST twine-3.4.2.tar.gz 212266 BLAKE2B 602bb72f4be1c0d28341fb3378a5d55737c14555495640ae3414a1c8e7ca0c06b2c2ce3c358130251c02f0a51b61eb362a1e999c3945d4d1d7afd7bcd4d17807 SHA512 3f6d8992294a35e2a26be64f56c88d31af63b05f3f477d545bc82d928ca1b9939d23fa489eca5232502a49def77d489eaf6a29663d150f78b5cdb99749ff9b50
 EBUILD twine-3.4.1.ebuild 1726 BLAKE2B 5d2749084f74af80645d6232369ecb693a89a8b309b7618f2de647e13ab1df8e791eae950dfe551c23e0efecd7f311bd76cd10bf51a2c423eb6e30008a82e304 SHA512 72e689f1436fa6ba57035074c4c60bc43ba61cb6ecc03db4b45b4c0539b41fd735e4e183aedb28ae146a7f7067e7761f181ecbb7e952538d7bbd1e9cd0d2e6a0
-EBUILD twine-3.4.2.ebuild 1774 BLAKE2B f21412daf87832f0a107b99438928a94abe1c06011c57ad0350d18b1d9d20b8ade9f1d03e8878e01f1e7db3761ceb9ef66b73a6bb63d2c5d25afc6a46fd61f8c SHA512 c172f89b737e69f0ac75ac055127b65c378971182b13e0aa01bab89244948e9ae138e6c983d1e3f1932e2099a63a73ccd2e3e40310b04f6c7b7740be7c113f3a
+EBUILD twine-3.4.2.ebuild 1781 BLAKE2B edea30cb0146b554237d7a8ccbceed3c670e3c4e1ddfc58c8ac2faa454e40efed6b87a5d5ddb3d8153d0b23da219b5fa13ed50a1267574b72261d0ae3ffe2b97 SHA512 9383f28afb2560e8723f262631be74106aa2319b47ef4a8bec385f1c3998b4f1ed9847483dd9cf409c183dfd185dada001e611b0431dcfba40dd6617068282a8
 MISC metadata.xml 382 BLAKE2B 7b1f58005d26a36c877707986c59a6ae3549b9e8118f01fc87aa05a1f7dfa4271ea2100663d49b7b5b8f278409e96b2dabcdb0d9a74809bba75d440fd42d88bd SHA512 c4ce9e0c6029c9efb8be9b36720281ed4ebf0d829e3d936d0a7a864d8f42b1f7c71dc8b605717547ac004bd94c7baebd5b2d2a224899fad0efa0747124ba5bfb
diff --git a/dev-python/twine/twine-3.4.2.ebuild b/dev-python/twine/twine-3.4.2.ebuild
index 72a1dedc5390..97a82eff44d7 100644
--- a/dev-python/twine/twine-3.4.2.ebuild
+++ b/dev-python/twine/twine-3.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 7485b613d57c..249f2a706a0b 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,20 +1,12 @@
 AUX twistd.conf 277 BLAKE2B 78ca35b410a6597c9afe6a9c8d3dfb1de113411634901f936794e8a59c0644233d0673e710bd0870ecf4312d079c46f62f43928605700559134f1fb62490559a SHA512 76d44caebab8404f16937c2515ad9ae8236732a48c7127366f7fa22c6ed3d88ace2d33b832a6d95f775973d41b7caf75344805fe5b01e964c04eb710bf3c89fb
 AUX twistd.init 563 BLAKE2B 24488118b025bf2068bbf07af900064ff6a7ee99106c3da30f15f2b3f85af7443212afebc6b52a12645488b85656f87b653df9263fc2be6bd09707917899f252 SHA512 7860601beba1efda2b0a045b2a044ec33caff9ee915d45225c05e281760a68da349b4c45080600177aab32aa806714327acf3cf5dda92be0874f781f129bb129
-AUX twisted-19.10.0-py38-cgi.patch 1356 BLAKE2B d172448bd2807dc57ac2a905427f0a91fa93dd17a1e58ab64dc17fc02fe05a81cee4c08aa667c799720cde33877e4b72f8db8df3587d8d8d711988bb2e388128 SHA512 65629acfc2f6dd6686db715024209e9ff12b97d5190c4377e6d88222c85c1d2a1f3502a93801525ee1a0fc0357f2b28ba87db888ea64bccfbfdc74fdfb667f42
-AUX twisted-19.10.0-py38.patch 3997 BLAKE2B 26df585019d5e2aca4257c9a7840a973ee9e1f3dfce65c76b021b8d6ea07ed8c6abca237c11ce75b49994ea7ed95de587a433a6a6f3577cd6f2ddf243d40defd SHA512 bc6eb1b1bbb704fe30c4ef071f8d8e95faaad3089013d11765f30f4b6bdbb108b913b043c071d00c18b53655841cb1810286331c5318d4659ad7c90d90b9fb4e
-AUX twisted-19.10.0-py39-b64.patch 7022 BLAKE2B f59573231a70318aac1f383602725949f033e017c036ab204815816ef168ad122253e903ff577c1a055c12023d06dc49ebfcdecf693d9890476785653860a628 SHA512 5904bcf5eadcd53d038870d6868fec1a81d6327c31b7b2360987a69e6f4046e92e11b52260c53a2361687161a36a5b6f53b24906d404ebe25f86e5bdc11fc6dc
-AUX twisted-20.3.0-py38-cgi.patch 8601 BLAKE2B 6eb76eaa1cfe10ba473a334bfd5e5a4c760739550c4aeba5cf68cbf380ca7f24725e102cf0f75b7a384faf639e03d9e80c11e0cc56339319329207a6342a8d55 SHA512 9877f4e3c0ad6d438cb046a04e60affbcbe7b263d06128ec6ea4d726194b044bf9f6c68891373624b435fb434fc878220834d038180d3d203defe31dab44710c
-AUX twisted-20.3.0-py38-hmac.patch 3484 BLAKE2B b89587da906517a621ba880eb6eb71cc2f397a7bcf7bcf065f79897626f821d965b2daa0d105af7e48c8c30fb79fb836c02db17058b5ac046ae92f9578899a62 SHA512 a6ed24994bf76a7e602144eed706c61cce531408db050dc2a497fb4131b5594f4d29ebd34c0d780b283460d130dfc88b19ad9cbe5436c0290b9b13eb35c9342b
-AUX twisted-20.3.0-py39-b64.patch 6747 BLAKE2B 1bb6960e5049f43b08e2ba7a56a16616e82f3b18290645b2f14bd15a199d3e1b2767e030a8295fc2d3f4a8a3d1a6e4a5d5d7d55a089da643c593b2a3df174119 SHA512 6f58dcecf07925d15a1373726e03da4083a0266ee6629089b30b0c8ab62bd007579942430989df2d550578067e2c2c542062dd20a38851794f6ef86e85aefb95
-AUX twisted-20.3.0-py39-combined.patch 3752 BLAKE2B 687698bccf6af3213812ae29e7e234c36941f0f7ecfdcfa8c14a6a7b5a433b9ff2a40c2ad870e46b3437210202cf0dc58e17c8d29ebf506c499780355cf60bdb SHA512 81f0b597a7b2609bae5f405388bccf759dd6b0295cf05e6ef2aee76d0f3ab4367a474704aab2753d101be2580d097f30d94acc529035bdb3c3ec43dd035fb733
 AUX twisted-21.2.0-force-gtk3.patch 1619 BLAKE2B d167c6e3177a345c03e68d37d596e743af0eb5b7acbc055df032bba26b38acced190baa6b44b3ae8f750fa06d4670a5e85146b95508bfb9acb93980e5a0bdbf4 SHA512 3b359d98c747a3d10e5e16fd3de5f00eb56fa64bef7fdbac07f569ad49033c63092703584ff7127e6af8394fc1b4e94846a0556bd7db38b473a473e4d833f7db
 AUX twisted-21.2.0-incremental-21.patch 2303 BLAKE2B 34bd2eef6b7bc9810466bb5daa97736eb8aba88ed6e9e1bec78a9547d7068a330685eacaaf8b5eb16a33733792a0bff8a78b08f5ff5c6766763e687a98e1295e SHA512 0f2aabc82233dd43a418de38d6b46284e5f7c136e27eaecd423d25908c9a652c7725ea0318bcbee906b2d3cdf8b9cdf44e4ee496ed33aad60f609a3980bbb115
 AUX twisted-21.2.0-int-from-bytes.patch 485 BLAKE2B c436bcfdacc124a1f6d24d1a9500940e18efb2136dbd35f86575495ee1b4afb6ae4e0eaf262167c4d4dacdda28c8ec2b951fadd2570e9894d90f0bf09ddeee6a SHA512 3794ea978ebe82103aedf284a57215a69a68804d43f2def9dba58f600f8af190ae2fd6ddcc064ece35dec85661830eb386c1ce799aefb78f60e530fe23cdcb22
-DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6ff694f78cd7600865718ffe861023a53ea6a922f7de232133edba26f5255074d7ef277ce8f3bdf02d556ccf4abf41 SHA512 de8d7fd0b2081cebeff68b060c8469377011648bc563a94a993d3530fb007ed42c3a54925c9a10c465ee7a3065cc9108ace12d10d358223fab13494becb9ac4b
-DIST Twisted-20.3.0.tar.bz2 3127793 BLAKE2B 2e85fc3ec26d89e563c9e79a5d2adea81ff1745d18f0f92b8d45ae3729fbddf09998664257880372c7a4caeb5977c5cad7c863596b8c27ad7890275cead9f763 SHA512 1b850e5fc21a3630ead4c2cc3622c16e78bb3be38ab11d021779b7ce3d3c30acc4e19d79c7791a5fce6c5c6e09c2baa349901dffe952de67dd98eec419846365
+AUX twisted-21.7.0-force-gtk3.patch 2759 BLAKE2B 65be4e948865a8de6cda3fbb9e90032d8c90b4db2e6b60d5861868273837c2ce846ab1452ca468f2e65be27882ca17ba842a9010607cc0e3969aeb70490e9ab1 SHA512 f4424f2b1f785c459263b4cdd3f906543e99ad6956130dcf3f6b589386a84637ca52d1346dc3465ef23fc82c701751e6053d145a0ca5225b846d6a7c20991f73
 DIST twisted-21.2.0.tar.gz 3882978 BLAKE2B ba37572b0f9eadf2962a2730e4c2c0ed65f582b11b3350034660a2c53c5cd0892b19867d19e0201d4808c09fca621dbe540d153dc6c7d5827d45d2423d19d28b SHA512 fa743dcf22f3c17dfd17f39b7df0cc31fb8ce3e989478ada9a026424ec2de35e6a403ef35acdef5905eed008d42e3c2fee6b7ccdda433e6c250f1feaa83ea8a4
+DIST twisted-21.7.0.tar.gz 3895345 BLAKE2B 510165ad2933f07005e508df5a8bdf2863a7988c0f18fcc089e948d190c65aab32fc876d3120e311e91d6989f1ea2d8b3b5f5db4a9dfc63c38da56213f718728 SHA512 a946769a6bc6c72af26e7763b9e0675788f134b4d005ea89d935da1b1d5f60d92c84fdb2615e442e7da2b98291ee8a63d5236ec7ba72ef04ad3f847b092feecb
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-19.10.0.ebuild 5778 BLAKE2B 357cb440aa44c8203865c199b5d00d6da0567a19270065277eed1ecaf4e999d51120aa66db9200c0b18af64e2855cee4986de6e198504b72f9d691b0a541ab8b SHA512 8d0c15bd1fd4aab254053bca7b7b65066dca3ee8078af107dd5388d893ad6edfdb8abb7e89806314d1a755e65e1055c98354774ead50dc0cf64cbe4c5e6ddd99
-EBUILD twisted-20.3.0.ebuild 5612 BLAKE2B 7fec5be0b0ccf4cddcb2b04fdd3de6ce697f0fafec4e622cdc3d1761947f7c469b70e3e4bdb21262fa8645bbfdbeba8b2070723bcee97c02f8029734baa05c30 SHA512 4375f5549010300e6e933470c3be054289acf5e6cebb18189d8c1ba1e2aa9c96e8629c0b6c5fc3aa68218b84d978120be3e703dfec901f49cc75db0533a86e16
-EBUILD twisted-21.2.0-r1.ebuild 5160 BLAKE2B f86a801b1e5b995b821b4e5327ca4cd12f39a530e6251f3344ae24b6b798f2c6a44d28acf24873404b27e38b6d1792ae28a2bbe6b268c39a4004cf9f7322844a SHA512 c98f9376e32b044fc5718455ab1777a4f6347246b33ddd9b25c8f1cb665ce9cf6bc51c67042b08bca17d97eb950ec90eed95eaba0d5ff0dfb1c1aeea76b2fb95
+EBUILD twisted-21.2.0-r1.ebuild 5159 BLAKE2B 9a7bac0617c2416d67abd62716c0434111f6fad1eea367ad9ede428f12ecd09e2569202af6162861d7c4f7f2fd760f0eaa39e2fe87df10981f98f33b82a29d2a SHA512 f7d4a6f3ceabcf59154d4a56938315c5ac881b17474c251d947ecc7292661bf1ec42b82f59cfedbc1bbf6637918fe5748581a7912dfb20b29da59934349247a7
+EBUILD twisted-21.7.0.ebuild 4975 BLAKE2B 6d4d3ebf50e33a99ecd340b824235d86a74d377c655427b27dc826aadb80b1c33d5a4856717e3d6cb8588968bdbcb6fc7e6fd9be7d026b48ed7aa71b2cf9c0a9 SHA512 e8b85128c506ca63847a7eeffd3105fcf02d17290a4ea6205ce55bb0aee9160401b88ab085280f617dbae263b6294a4070fc8ef65d6a69c9c60f89c8c9e08bca
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/files/twisted-19.10.0-py38-cgi.patch b/dev-python/twisted/files/twisted-19.10.0-py38-cgi.patch
deleted file mode 100644
index 5fc4768e5d23..000000000000
--- a/dev-python/twisted/files/twisted-19.10.0-py38-cgi.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py
-index 6001d1e40..1cf9172ef 100644
---- a/src/twisted/web/test/test_http.py
-+++ b/src/twisted/web/test/test_http.py
-@@ -9,15 +9,15 @@ from __future__ import absolute_import, division
- 
- import base64
- import calendar
--import cgi
- import random
- 
- import hamcrest
- 
- try:
-     from urlparse import urlparse, urlunsplit, clear_cache
-+    from cgi import parse_qs
- except ImportError:
--    from urllib.parse import urlparse, urlunsplit, clear_cache
-+    from urllib.parse import urlparse, urlunsplit, clear_cache, parse_qs
- 
- from io import BytesIO
- from itertools import cycle
-@@ -2156,15 +2156,15 @@ Hello,
- class QueryArgumentsTests(unittest.TestCase):
-     def testParseqs(self):
-         self.assertEqual(
--            cgi.parse_qs(b"a=b&d=c;+=f"),
-+            parse_qs(b"a=b&d=c;+=f"),
-             http.parse_qs(b"a=b&d=c;+=f"))
-         self.assertRaises(
-             ValueError, http.parse_qs, b"blah", strict_parsing=True)
-         self.assertEqual(
--            cgi.parse_qs(b"a=&b=c", keep_blank_values=1),
-+            parse_qs(b"a=&b=c", keep_blank_values=1),
-             http.parse_qs(b"a=&b=c", keep_blank_values=1))
-         self.assertEqual(
--            cgi.parse_qs(b"a=&b=c"),
-+            parse_qs(b"a=&b=c"),
-             http.parse_qs(b"a=&b=c"))
- 
- 
diff --git a/dev-python/twisted/files/twisted-19.10.0-py38.patch b/dev-python/twisted/files/twisted-19.10.0-py38.patch
deleted file mode 100644
index e787167d45b3..000000000000
--- a/dev-python/twisted/files/twisted-19.10.0-py38.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From d33b90880b8eb024daa73bc3fd39aca0bc791ff1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?= <lucas@treffenstaedt.de>
-Date: Mon, 13 Jan 2020 13:54:08 +0100
-Subject: [PATCH 1/2] CramMD5ClientAuthenticator now specifies the digestmod
- argument to hmac.HMAC constructor explicitly.
-
----
- src/twisted/mail/_cred.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/twisted/mail/_cred.py b/src/twisted/mail/_cred.py
-index 9d3646948..43c406f90 100644
---- a/src/twisted/mail/_cred.py
-+++ b/src/twisted/mail/_cred.py
-@@ -8,6 +8,7 @@ Credential managers for L{twisted.mail}.
- from __future__ import absolute_import, division
- 
- import hmac
-+import hashlib
- 
- from zope.interface import implementer
- 
-@@ -28,7 +29,7 @@ class CramMD5ClientAuthenticator:
- 
- 
-     def challengeResponse(self, secret, chal):
--        response = hmac.HMAC(secret, chal).hexdigest().encode('ascii')
-+        response = hmac.HMAC(secret, chal, digestmod = hashlib.md5).hexdigest().encode('ascii')
-         return self.user + b' ' + response
- 
- 
--- 
-2.26.2
-
-From 694bc67f3cf7d36a6f512f0b76882e85d0966dd2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Poisson?= <goffi@goffi.org>
-Date: Sun, 17 Nov 2019 19:48:53 +0100
-Subject: [PATCH 2/2] Fix parsing of namespaced attributes with Python 3.8 in
- twisted.words.xish.domish.ExpatElementStream
-
----
- src/twisted/words/newsfragments/9730.bugfix |  1 +
- src/twisted/words/test/test_domish.py       | 17 +++++++++++++++++
- src/twisted/words/xish/domish.py            | 11 +++++++++--
- 3 files changed, 27 insertions(+), 2 deletions(-)
- create mode 100644 src/twisted/words/newsfragments/9730.bugfix
-
-diff --git a/src/twisted/words/newsfragments/9730.bugfix b/src/twisted/words/newsfragments/9730.bugfix
-new file mode 100644
-index 000000000..5c91305c8
---- /dev/null
-+++ b/src/twisted/words/newsfragments/9730.bugfix
-@@ -0,0 +1 @@
-+Fixed parsing of streams with Python 3.8 when there are spaces in namespaces or namespaced attributes in twisted.words.xish.domish.ExpatElementStream
-diff --git a/src/twisted/words/test/test_domish.py b/src/twisted/words/test/test_domish.py
-index a8f8fa76b..cd16e3a4d 100644
---- a/src/twisted/words/test/test_domish.py
-+++ b/src/twisted/words/test/test_domish.py
-@@ -350,6 +350,23 @@ class DomishStreamTestsMixin:
-             self.elements[0].attributes, {(" bar baz ", "baz"): "quux"})
- 
- 
-+    def test_attributesWithNamespaces(self):
-+        """
-+        Attributes with namespace are parsed without Exception.
-+        (https://twistedmatrix.com/trac/ticket/9730 regression test)
-+        """
-+
-+        xml = b"""<root xmlns:test='http://example.org' xml:lang='en'>
-+                    <test:test>test</test:test>
-+                  </root>"""
-+
-+        # with Python 3.8 and without #9730 fix, the following error would
-+        # happen at next line:
-+        # ``RuntimeError: dictionary keys changed during iteration``
-+        self.stream.parse(xml)
-+        self.assertEqual(self.elements[0].uri, "http://example.org")
-+
-+
-     def testChildPrefix(self):
-         xml = b"<root xmlns='testns' xmlns:foo='testns2'><foo:child/></root>"
- 
-diff --git a/src/twisted/words/xish/domish.py b/src/twisted/words/xish/domish.py
-index 2063c410a..fc49285f5 100644
---- a/src/twisted/words/xish/domish.py
-+++ b/src/twisted/words/xish/domish.py
-@@ -807,11 +807,18 @@ class ExpatElementStream:
-             qname = ('', name)
- 
-         # Process attributes
-+        newAttrs = {}
-+        toDelete = []
-         for k, v in attrs.items():
-             if " " in k:
-                 aqname = k.rsplit(" ", 1)
--                attrs[(aqname[0], aqname[1])] = v
--                del attrs[k]
-+                newAttrs[(aqname[0], aqname[1])] = v
-+                toDelete.append(k)
-+
-+        attrs.update(newAttrs)
-+
-+        for k in toDelete:
-+            del attrs[k]
- 
-         # Construct the new element
-         e = Element(qname, self.defaultNsStack[-1], attrs, self.localPrefixes)
--- 
-2.26.2
-
diff --git a/dev-python/twisted/files/twisted-19.10.0-py39-b64.patch b/dev-python/twisted/files/twisted-19.10.0-py39-b64.patch
deleted file mode 100644
index f67d6240558a..000000000000
--- a/dev-python/twisted/files/twisted-19.10.0-py39-b64.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From f56133a2e0d7ddf9ee6e43bf9e1d62e970cb0b3a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 27 May 2020 13:23:37 +0200
-Subject: [PATCH] Replace base64.*string() functions to fix py3.9 support
-
-Replace base64.decodestring() and .encodestring() functions as they
-were deprecated since Python 3.1 in favor of (equivalent) .decodebytes()
-and .encodebytes(), and were eventually removed in Python 3.9.
-
-While at it, replace most of their uses with base64.b64encode()
-and .b64decode() that are preferable to the former wrt ticket #6446,
-and they do not introduce line breaks that the twisted code usually
-discarded.
-
-Use .decodebytes() and .encodebytes() in DirDBM as it seems to rely
-on the exact presence of newlines, and changing that would break
-backwards compatibility.
-
-Fixes: ticket:6446
-Fixes: ticket:9831
----
- src/twisted/conch/scripts/tkconch.py          |  2 +-
- src/twisted/conch/test/test_keys.py           |  2 +-
- src/twisted/mail/pop3.py                      |  4 ++--
- src/twisted/mail/test/test_pop3.py            |  4 ++--
- src/twisted/persisted/dirdbm.py               | 10 ++++++++--
- src/twisted/web/http.py                       |  2 +-
- src/twisted/web/test/test_http.py             |  6 +++---
- 14 files changed, 18 insertions(+), 12 deletions(-)
-
-diff --git a/src/twisted/conch/scripts/tkconch.py b/src/twisted/conch/scripts/tkconch.py
-index 9c48e8a7f..5e007ebdc 100644
---- a/src/twisted/conch/scripts/tkconch.py
-+++ b/src/twisted/conch/scripts/tkconch.py
-@@ -409,7 +409,7 @@ class SSHClientTransport(transport.SSHClientTransport):
-                 "known hosts.\r\n" %
-                 (khHost, {b'ssh-dss':'DSA', b'ssh-rsa':'RSA'}[keyType]))
-             with open(os.path.expanduser('~/.ssh/known_hosts'), 'a') as known_hosts:
--                encodedKey = base64.encodestring(pubKey).replace(b'\n', b'')
-+                encodedKey = base64.b64encode(pubKey)
-                 known_hosts.write('\n%s %s %s' % (khHost, keyType, encodedKey))
-         except:
-             log.deferr()
-diff --git a/src/twisted/conch/test/test_keys.py b/src/twisted/conch/test/test_keys.py
-index 41e49f415..795e7b8d7 100644
---- a/src/twisted/conch/test/test_keys.py
-+++ b/src/twisted/conch/test/test_keys.py
-@@ -352,7 +352,7 @@ SUrCyZXsNh6VXwjs3gKQ
- 
-         self.assertRaises(
-             keys.BadKeyError,
--            keys.Key.fromString, data=b'{' + base64.encodestring(sexp) + b'}',
-+            keys.Key.fromString, data=b'{' + base64.b64encode(sexp) + b'}',
-             )
- 
- 
-diff --git a/src/twisted/mail/pop3.py b/src/twisted/mail/pop3.py
-index ffe9714c9..057389e3a 100644
---- a/src/twisted/mail/pop3.py
-+++ b/src/twisted/mail/pop3.py
-@@ -728,7 +728,7 @@ class POP3(basic.LineOnlyReceiver, policies.TimeoutMixin):
-         self._auth = auth()
-         chal = self._auth.getChallenge()
- 
--        self.sendLine(b'+ ' + base64.encodestring(chal).rstrip(b'\n'))
-+        self.sendLine(b'+ ' + base64.b64encode(chal))
-         self.state = 'AUTH'
- 
- 
-@@ -747,7 +747,7 @@ class POP3(basic.LineOnlyReceiver, policies.TimeoutMixin):
-         """
-         self.state = "COMMAND"
-         try:
--            parts = base64.decodestring(line).split(None, 1)
-+            parts = base64.b64decode(line).split(None, 1)
-         except binascii.Error:
-             self.failResponse(b"Invalid BASE64 encoding")
-         else:
-diff --git a/src/twisted/mail/test/test_pop3.py b/src/twisted/mail/test/test_pop3.py
-index ea513487c..36780d9c9 100644
---- a/src/twisted/mail/test/test_pop3.py
-+++ b/src/twisted/mail/test/test_pop3.py
-@@ -1097,12 +1097,12 @@ class SASLTests(unittest.TestCase):
- 
-         p.lineReceived(b"AUTH CRAM-MD5")
-         chal = s.getvalue().splitlines()[-1][2:]
--        chal = base64.decodestring(chal)
-+        chal = base64.b64decode(chal)
-         response = hmac.HMAC(b'testpassword', chal,
-                              digestmod=md5).hexdigest().encode("ascii")
- 
-         p.lineReceived(
--            base64.encodestring(b'testuser ' + response).rstrip(b'\n'))
-+            base64.b64encode(b'testuser ' + response))
-         self.assertTrue(p.mbox)
-         self.assertTrue(s.getvalue().splitlines()[-1].find(b"+OK") >= 0)
-         p.connectionLost(failure.Failure(Exception("Test harness disconnect")))
-diff --git a/src/twisted/persisted/dirdbm.py b/src/twisted/persisted/dirdbm.py
-index f97c526d0..d9f29cce2 100644
---- a/src/twisted/persisted/dirdbm.py
-+++ b/src/twisted/persisted/dirdbm.py
-@@ -81,14 +81,20 @@ class DirDBM:
-         Encode a key so it can be used as a filename.
-         """
-         # NOTE: '_' is NOT in the base64 alphabet!
--        return base64.encodestring(k).replace(b'\n', b'_').replace(b"/", b"-")
-+        try:
-+            return base64.encodebytes(k).replace(b'\n', b'_').replace(b"/", b"-")
-+        except AttributeError:
-+            return base64.encodestring(k).replace(b'\n', b'_').replace(b"/", b"-")
- 
- 
-     def _decode(self, k):
-         """
-         Decode a filename to get the key.
-         """
--        return base64.decodestring(k.replace(b'_', b'\n').replace(b"-", b"/"))
-+        try:
-+            return base64.decodebytes(k.replace(b'_', b'\n').replace(b"-", b"/"))
-+        except AttributeError:
-+            return base64.decodestring(k.replace(b'_', b'\n').replace(b"-", b"/"))
- 
- 
-     def _readFile(self, path):
-diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py
-index fe88d3373..602a58f31 100644
---- a/src/twisted/web/http.py
-+++ b/src/twisted/web/http.py
-@@ -1540,7 +1540,7 @@ class Request:
-             bas, upw = authh.split()
-             if bas.lower() != b"basic":
-                 raise ValueError()
--            upw = base64.decodestring(upw)
-+            upw = base64.b64decode(upw)
-             self.user, self.password = upw.split(b':', 1)
-         except (binascii.Error, ValueError):
-             self.user = self.password = ""
-diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py
-index 6001d1e40..70065e232 100644
---- a/src/twisted/web/test/test_http.py
-+++ b/src/twisted/web/test/test_http.py
-@@ -1513,7 +1513,7 @@ class ParsingTests(unittest.TestCase):
-                 requests.append(self)
- 
-         for u, p in [(b"foo", b"bar"), (b"hello", b"there:z")]:
--            s = base64.encodestring(b":".join((u, p))).strip()
-+            s = base64.b64encode(b":".join((u, p)))
-             f = b"GET / HTTP/1.0\nAuthorization: Basic " + s + b"\n\n"
-             self.runRequest(f, Request, 0)
-             req = requests.pop()
-@@ -2139,9 +2139,9 @@ Hello,
- 
-         u = b"foo"
-         p = b"bar"
--        s = base64.encodestring(b":".join((u, p))).strip()
-+        s = base64.b64encode(b":".join((u, p)))
-         f = b"GET / HTTP/1.0\nAuthorization: Basic " + s + b"\n\n"
--        self.patch(base64, 'decodestring', lambda x: [])
-+        self.patch(base64, 'b64decode', lambda x: [])
-         self.runRequest(f, Request, 0)
-         req = requests.pop()
-         self.assertEqual(('', ''), req.credentials)
--- 
-2.26.2
-
diff --git a/dev-python/twisted/files/twisted-20.3.0-py38-cgi.patch b/dev-python/twisted/files/twisted-20.3.0-py38-cgi.patch
deleted file mode 100644
index 5151f297f7f4..000000000000
--- a/dev-python/twisted/files/twisted-20.3.0-py38-cgi.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-From 62ab0203c59c1f9788c53dfad4a212774094d05c Mon Sep 17 00:00:00 2001
-From: Craig Rodrigues <rodrigc@FreeBSD.org>
-Date: Mon, 13 Apr 2020 01:22:23 -0700
-Subject: [PATCH 2/2] Merge 9801-rodrigc-cgi: Change import of cgi.parse_qs to
- urllib.parse.parse_qs
-
-Author: rodrigc
-Reviewer: hawkowl
-Fixes: ticket:9801
----
- src/twisted/web/client.py               | 17 ++++-----
- src/twisted/web/http.py                 | 49 ++++++++++++-------------
- src/twisted/web/newsfragments/9801.misc |  0
- src/twisted/web/test/test_http.py       | 41 +++------------------
- src/twisted/web/test/test_webclient.py  |  5 +--
- 5 files changed, 38 insertions(+), 74 deletions(-)
- create mode 100644 src/twisted/web/newsfragments/9801.misc
-
-diff --git a/src/twisted/web/client.py b/src/twisted/web/client.py
-index 7e4642ef3..8209f5a5e 100644
---- a/src/twisted/web/client.py
-+++ b/src/twisted/web/client.py
-@@ -12,15 +12,8 @@ import os
- import collections
- import warnings
- 
--try:
--    from urlparse import urlunparse, urljoin, urldefrag
--except ImportError:
--    from urllib.parse import urljoin, urldefrag
--    from urllib.parse import urlunparse as _urlunparse
--
--    def urlunparse(parts):
--        result = _urlunparse(tuple([p.decode("charmap") for p in parts]))
--        return result.encode("charmap")
-+from urllib.parse import urljoin, urldefrag
-+from urllib.parse import urlunparse as _urlunparse
- 
- import zlib
- from functools import wraps
-@@ -51,6 +44,12 @@ from twisted.web._newclient import _ensureValidURI, _ensureValidMethod
- 
- 
- 
-+def urlunparse(parts):
-+    result = _urlunparse(tuple([p.decode("charmap") for p in parts]))
-+    return result.encode("charmap")
-+
-+
-+
- class PartialDownloadError(error.Error):
-     """
-     Page was only partially downloaded, we got disconnected in middle.
-diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py
-index b7afa8b0d..94d0ae81f 100644
---- a/src/twisted/web/http.py
-+++ b/src/twisted/web/http.py
-@@ -66,27 +66,10 @@ import time
- import calendar
- import warnings
- import os
--from io import BytesIO as StringIO
--
--try:
--    from urlparse import (
--        ParseResult as ParseResultBytes, urlparse as _urlparse)
--    from urllib import unquote
--    from cgi import parse_header as _parseHeader
--except ImportError:
--    from urllib.parse import (
--        ParseResultBytes, urlparse as _urlparse, unquote_to_bytes as unquote)
--
--    def _parseHeader(line):
--        # cgi.parse_header requires a str
--        key, pdict = cgi.parse_header(line.decode('charmap'))
--
--        # We want the key as bytes, and cgi.parse_multipart (which consumes
--        # pdict) expects a dict of str keys but bytes values
--        key = key.encode('charmap')
--        pdict = {x:y.encode('charmap') for x, y in pdict.items()}
--        return (key, pdict)
-+from io import BytesIO
- 
-+from urllib.parse import (
-+    ParseResultBytes, urlparse as _urlparse, unquote_to_bytes as unquote)
- 
- from zope.interface import Attribute, Interface, implementer, provider
- 
-@@ -163,6 +146,20 @@ monthname = [None,
- weekdayname_lower = [name.lower() for name in weekdayname]
- monthname_lower = [name and name.lower() for name in monthname]
- 
-+
-+
-+def _parseHeader(line):
-+    # cgi.parse_header requires a str
-+    key, pdict = cgi.parse_header(line.decode('charmap'))
-+
-+    # We want the key as bytes, and cgi.parse_multipart (which consumes
-+    # pdict) expects a dict of str keys but bytes values
-+    key = key.encode('charmap')
-+    pdict = {x: y.encode('charmap') for x, y in pdict.items()}
-+    return (key, pdict)
-+
-+
-+
- def urlparse(url):
-     """
-     Parse an URL into six components.
-@@ -486,13 +483,15 @@ class _IDeprecatedHTTPChannelToRequestInterface(Interface):
- 
- class StringTransport:
-     """
--    I am a StringIO wrapper that conforms for the transport API. I support
-+    I am a BytesIO wrapper that conforms for the transport API. I support
-     the `writeSequence' method.
-     """
-     def __init__(self):
--        self.s = StringIO()
-+        self.s = BytesIO()
-+
-     def writeSequence(self, seq):
-         self.s.write(b''.join(seq))
-+
-     def __getattr__(self, attr):
-         return getattr(self.__dict__['s'], attr)
- 
-@@ -513,7 +512,7 @@ class HTTPClient(basic.LineReceiver):
-     @type firstLine: C{bool}
- 
-     @ivar __buffer: The buffer that stores the response to the HTTP request.
--    @type __buffer: A C{StringIO} object.
-+    @type __buffer: A C{BytesIO} object.
- 
-     @ivar _header: Part or all of an HTTP request header.
-     @type _header: C{bytes}
-@@ -579,7 +578,7 @@ class HTTPClient(basic.LineReceiver):
-             if self._header != b"":
-                 # Only extract headers if there are any
-                 self.extractHeader(self._header)
--            self.__buffer = StringIO()
-+            self.__buffer = BytesIO()
-             self.handleEndHeaders()
-             self.setRawMode()
-             return
-@@ -665,7 +664,7 @@ def _getContentFile(length):
-     Get a writeable file-like object to which request content can be written.
-     """
-     if length is not None and length < 100000:
--        return StringIO()
-+        return BytesIO()
-     return tempfile.TemporaryFile()
- 
- 
-diff --git a/src/twisted/web/newsfragments/9801.misc b/src/twisted/web/newsfragments/9801.misc
-new file mode 100644
-index 000000000..e69de29bb
-diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py
-index a3067f732..4189b307c 100644
---- a/src/twisted/web/test/test_http.py
-+++ b/src/twisted/web/test/test_http.py
-@@ -9,15 +9,11 @@ from __future__ import absolute_import, division
- 
- import base64
- import calendar
--import cgi
- import random
- 
- import hamcrest
- 
--try:
--    from urlparse import urlparse, urlunsplit, clear_cache
--except ImportError:
--    from urllib.parse import urlparse, urlunsplit, clear_cache
-+from urllib.parse import urlparse, urlunsplit, clear_cache, parse_qs
- 
- from io import BytesIO
- from itertools import cycle
-@@ -28,7 +24,7 @@ from zope.interface import (
- )
- from zope.interface.verify import verifyObject
- 
--from twisted.python.compat import (_PY3, iterbytes, long, networkString,
-+from twisted.python.compat import (iterbytes, long, networkString,
-                                    unicode, intToBytes)
- from twisted.python.components import proxyForInterface
- from twisted.python.failure import Failure
-@@ -2019,33 +2015,6 @@ Content-Type: application/x-www-form-urlencoded
-         self.assertEqual(content, [networkString(query)])
- 
- 
--    def test_missingContentDisposition(self):
--        """
--        If the C{Content-Disposition} header is missing, the request is denied
--        as a bad request.
--        """
--        req = b'''\
--POST / HTTP/1.0
--Content-Type: multipart/form-data; boundary=AaB03x
--Content-Length: 103
--
----AaB03x
--Content-Type: text/plain
--Content-Transfer-Encoding: quoted-printable
--
--abasdfg
----AaB03x--
--'''
--        channel = self.runRequest(req, http.Request, success=False)
--        self.assertEqual(
--            channel.transport.value(),
--            b"HTTP/1.1 400 Bad Request\r\n\r\n")
--
--    if _PY3:
--        test_missingContentDisposition.skip = (
--            "cgi.parse_multipart is much more error-tolerant on Python 3.")
--
--
-     def test_multipartProcessingFailure(self):
-         """
-         When the multipart processing fails the client gets a 400 Bad Request.
-@@ -2373,15 +2342,15 @@ ok
- class QueryArgumentsTests(unittest.TestCase):
-     def testParseqs(self):
-         self.assertEqual(
--            cgi.parse_qs(b"a=b&d=c;+=f"),
-+            parse_qs(b"a=b&d=c;+=f"),
-             http.parse_qs(b"a=b&d=c;+=f"))
-         self.assertRaises(
-             ValueError, http.parse_qs, b"blah", strict_parsing=True)
-         self.assertEqual(
--            cgi.parse_qs(b"a=&b=c", keep_blank_values=1),
-+            parse_qs(b"a=&b=c", keep_blank_values=1),
-             http.parse_qs(b"a=&b=c", keep_blank_values=1))
-         self.assertEqual(
--            cgi.parse_qs(b"a=&b=c"),
-+            parse_qs(b"a=&b=c"),
-             http.parse_qs(b"a=&b=c"))
- 
- 
-diff --git a/src/twisted/web/test/test_webclient.py b/src/twisted/web/test/test_webclient.py
-index 680e02780..672594993 100644
---- a/src/twisted/web/test/test_webclient.py
-+++ b/src/twisted/web/test/test_webclient.py
-@@ -11,10 +11,7 @@ import io
- import os
- from errno import ENOSPC
- 
--try:
--    from urlparse import urlparse, urljoin
--except ImportError:
--    from urllib.parse import urlparse, urljoin
-+from urllib.parse import urlparse, urljoin
- 
- from twisted.python.compat import networkString, nativeString, intToBytes
- from twisted.trial import unittest, util
--- 
-2.26.2
-
diff --git a/dev-python/twisted/files/twisted-20.3.0-py38-hmac.patch b/dev-python/twisted/files/twisted-20.3.0-py38-hmac.patch
deleted file mode 100644
index 1c1ee01b2187..000000000000
--- a/dev-python/twisted/files/twisted-20.3.0-py38-hmac.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 653fb2aea0ca1f60558917d52f4ff0c33cd7b067 Mon Sep 17 00:00:00 2001
-From: Craig Rodrigues <rodrigc@crodrigues.org>
-Date: Sun, 12 Apr 2020 14:28:23 -0700
-Subject: [PATCH 1/2] Add digestmod parameter to HMAC.__init__() invocations
-
-This parameter is now required on Python 3.8+
----
- src/twisted/cred/credentials.py        |  3 ++-
- src/twisted/cred/test/test_cramauth.py | 11 ++++++++---
- src/twisted/mail/test/test_pop3.py     |  4 +++-
- 3 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/src/twisted/cred/credentials.py b/src/twisted/cred/credentials.py
-index 5469e5158..67c24cb01 100644
---- a/src/twisted/cred/credentials.py
-+++ b/src/twisted/cred/credentials.py
-@@ -441,7 +441,8 @@ class CramMD5Credentials(object):
- 
- 
-     def checkPassword(self, password):
--        verify = hexlify(hmac.HMAC(password, self.challenge).digest())
-+        verify = hexlify(hmac.HMAC(password, self.challenge,
-+                         digestmod=md5).digest())
-         return verify == self.response
- 
- 
-diff --git a/src/twisted/cred/test/test_cramauth.py b/src/twisted/cred/test/test_cramauth.py
-index 1ee08712b..d21f2f68c 100644
---- a/src/twisted/cred/test/test_cramauth.py
-+++ b/src/twisted/cred/test/test_cramauth.py
-@@ -7,6 +7,8 @@ Tests for L{twisted.cred}'s implementation of CRAM-MD5.
- 
- from __future__ import division, absolute_import
- 
-+import hashlib
-+
- from hmac import HMAC
- from binascii import hexlify
- 
-@@ -39,7 +41,8 @@ class CramMD5CredentialsTests(TestCase):
-         """
-         c = CramMD5Credentials()
-         chal = c.getChallenge()
--        c.response = hexlify(HMAC(b'secret', chal).digest())
-+        c.response = hexlify(HMAC(b'secret', chal,
-+                             digestmod=hashlib.md5).digest())
-         self.assertTrue(c.checkPassword(b'secret'))
- 
- 
-@@ -61,7 +64,8 @@ class CramMD5CredentialsTests(TestCase):
-         """
-         c = CramMD5Credentials()
-         chal = c.getChallenge()
--        c.response = hexlify(HMAC(b'thewrongsecret', chal).digest())
-+        c.response = hexlify(HMAC(b'thewrongsecret', chal,
-+                             digestmod=hashlib.md5).digest())
-         self.assertFalse(c.checkPassword(b'secret'))
- 
- 
-@@ -75,7 +79,8 @@ class CramMD5CredentialsTests(TestCase):
-         chal = c.getChallenge()
-         c.setResponse(b" ".join(
-             (b"squirrel",
--             hexlify(HMAC(b'supersecret', chal).digest()))))
-+             hexlify(HMAC(b'supersecret', chal,
-+                     digestmod=hashlib.md5).digest()))))
-         self.assertTrue(c.checkPassword(b'supersecret'))
-         self.assertEqual(c.username, b"squirrel")
- 
-diff --git a/src/twisted/mail/test/test_pop3.py b/src/twisted/mail/test/test_pop3.py
-index 4a59c3b49..ea513487c 100644
---- a/src/twisted/mail/test/test_pop3.py
-+++ b/src/twisted/mail/test/test_pop3.py
-@@ -11,6 +11,7 @@ import hmac
- import base64
- import itertools
- 
-+from hashlib import md5
- from collections import OrderedDict
- from io import BytesIO
- 
-@@ -1097,7 +1098,8 @@ class SASLTests(unittest.TestCase):
-         p.lineReceived(b"AUTH CRAM-MD5")
-         chal = s.getvalue().splitlines()[-1][2:]
-         chal = base64.decodestring(chal)
--        response = hmac.HMAC(b'testpassword', chal).hexdigest().encode("ascii")
-+        response = hmac.HMAC(b'testpassword', chal,
-+                             digestmod=md5).hexdigest().encode("ascii")
- 
-         p.lineReceived(
-             base64.encodestring(b'testuser ' + response).rstrip(b'\n'))
--- 
-2.26.2
-
diff --git a/dev-python/twisted/files/twisted-20.3.0-py39-b64.patch b/dev-python/twisted/files/twisted-20.3.0-py39-b64.patch
deleted file mode 100644
index f475614df408..000000000000
--- a/dev-python/twisted/files/twisted-20.3.0-py39-b64.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From f44c2ff111a8961d295409186cc07aaf414c76bc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 27 May 2020 13:23:37 +0200
-Subject: [PATCH 1/4] Replace base64.*string() functions to fix py3.9 support
-
-Replace base64.decodestring() and .encodestring() functions as they
-were deprecated since Python 3.1 in favor of (equivalent) .decodebytes()
-and .encodebytes(), and were eventually removed in Python 3.9.
-
-While at it, replace most of their uses with base64.b64encode()
-and .b64decode() that are preferable to the former wrt ticket #6446,
-and they do not introduce line breaks that the twisted code usually
-discarded.
-
-Use .decodebytes() and .encodebytes() in DirDBM as it seems to rely
-on the exact presence of newlines, and changing that would break
-backwards compatibility.
-
-Fixes: ticket:6446
-Fixes: ticket:9831
----
- src/twisted/conch/scripts/tkconch.py          | 2 +-
- src/twisted/conch/test/test_keys.py           | 2 +-
- src/twisted/mail/pop3.py                      | 4 ++--
- src/twisted/mail/test/test_pop3.py            | 4 ++--
- src/twisted/persisted/dirdbm.py               | 4 ++--
- src/twisted/web/http.py                       | 2 +-
- src/twisted/web/test/test_http.py             | 6 +++---
- 14 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/src/twisted/conch/scripts/tkconch.py b/src/twisted/conch/scripts/tkconch.py
-index a662cabc8..744734343 100644
---- a/src/twisted/conch/scripts/tkconch.py
-+++ b/src/twisted/conch/scripts/tkconch.py
-@@ -412,7 +412,7 @@ class SSHClientTransport(transport.SSHClientTransport):
-                 "known hosts.\r\n" %
-                 (khHost, {b'ssh-dss':'DSA', b'ssh-rsa':'RSA'}[keyType]))
-             with open(os.path.expanduser('~/.ssh/known_hosts'), 'a') as known_hosts:
--                encodedKey = base64.encodestring(pubKey).replace(b'\n', b'')
-+                encodedKey = base64.b64encode(pubKey)
-                 known_hosts.write('\n%s %s %s' % (khHost, keyType, encodedKey))
-         except:
-             log.deferr()
-diff --git a/src/twisted/conch/test/test_keys.py b/src/twisted/conch/test/test_keys.py
-index 650a19bfb..f76cbd1b4 100644
---- a/src/twisted/conch/test/test_keys.py
-+++ b/src/twisted/conch/test/test_keys.py
-@@ -404,7 +404,7 @@ SUrCyZXsNh6VXwjs3gKQ
- 
-         self.assertRaises(
-             keys.BadKeyError,
--            keys.Key.fromString, data=b'{' + base64.encodestring(sexp) + b'}',
-+            keys.Key.fromString, data=b'{' + base64.b64encode(sexp) + b'}',
-             )
- 
- 
-diff --git a/src/twisted/mail/pop3.py b/src/twisted/mail/pop3.py
-index ffe9714c9..057389e3a 100644
---- a/src/twisted/mail/pop3.py
-+++ b/src/twisted/mail/pop3.py
-@@ -728,7 +728,7 @@ class POP3(basic.LineOnlyReceiver, policies.TimeoutMixin):
-         self._auth = auth()
-         chal = self._auth.getChallenge()
- 
--        self.sendLine(b'+ ' + base64.encodestring(chal).rstrip(b'\n'))
-+        self.sendLine(b'+ ' + base64.b64encode(chal))
-         self.state = 'AUTH'
- 
- 
-@@ -747,7 +747,7 @@ class POP3(basic.LineOnlyReceiver, policies.TimeoutMixin):
-         """
-         self.state = "COMMAND"
-         try:
--            parts = base64.decodestring(line).split(None, 1)
-+            parts = base64.b64decode(line).split(None, 1)
-         except binascii.Error:
-             self.failResponse(b"Invalid BASE64 encoding")
-         else:
-diff --git a/src/twisted/mail/test/test_pop3.py b/src/twisted/mail/test/test_pop3.py
-index f7fbfaf1e..af335ab2d 100644
---- a/src/twisted/mail/test/test_pop3.py
-+++ b/src/twisted/mail/test/test_pop3.py
-@@ -1096,12 +1096,12 @@ class SASLTests(unittest.TestCase):
- 
-         p.lineReceived(b"AUTH CRAM-MD5")
-         chal = s.getvalue().splitlines()[-1][2:]
--        chal = base64.decodestring(chal)
-+        chal = base64.b64decode(chal)
-         response = hmac.HMAC(b'testpassword', chal,
-                              digestmod=md5).hexdigest().encode("ascii")
- 
-         p.lineReceived(
--            base64.encodestring(b'testuser ' + response).rstrip(b'\n'))
-+            base64.b64encode(b'testuser ' + response))
-         self.assertTrue(p.mbox)
-         self.assertTrue(s.getvalue().splitlines()[-1].find(b"+OK") >= 0)
-         p.connectionLost(failure.Failure(Exception("Test harness disconnect")))
-diff --git a/src/twisted/persisted/dirdbm.py b/src/twisted/persisted/dirdbm.py
-index 3ba7a59d4..7659ff765 100644
---- a/src/twisted/persisted/dirdbm.py
-+++ b/src/twisted/persisted/dirdbm.py
-@@ -77,14 +77,14 @@ class DirDBM:
-         Encode a key so it can be used as a filename.
-         """
-         # NOTE: '_' is NOT in the base64 alphabet!
--        return base64.encodestring(k).replace(b'\n', b'_').replace(b"/", b"-")
-+        return base64.encodebytes(k).replace(b'\n', b'_').replace(b"/", b"-")
- 
- 
-     def _decode(self, k):
-         """
-         Decode a filename to get the key.
-         """
--        return base64.decodestring(k.replace(b'_', b'\n').replace(b"-", b"/"))
-+        return base64.decodebytes(k.replace(b'_', b'\n').replace(b"-", b"/"))
- 
- 
-     def _readFile(self, path):
-diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py
-index 0e115741e..e9a080d21 100644
---- a/src/twisted/web/http.py
-+++ b/src/twisted/web/http.py
-@@ -1544,7 +1544,7 @@ class Request:
-             bas, upw = authh.split()
-             if bas.lower() != b"basic":
-                 raise ValueError()
--            upw = base64.decodestring(upw)
-+            upw = base64.b64decode(upw)
-             self.user, self.password = upw.split(b':', 1)
-         except (binascii.Error, ValueError):
-             self.user = self.password = b''
-diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py
-index 112e56f46..02a4674a7 100644
---- a/src/twisted/web/test/test_http.py
-+++ b/src/twisted/web/test/test_http.py
-@@ -1604,7 +1604,7 @@ class ParsingTests(unittest.TestCase):
-                 requests.append(self)
- 
-         for u, p in [(b"foo", b"bar"), (b"hello", b"there:z")]:
--            s = base64.encodestring(b":".join((u, p))).strip()
-+            s = base64.b64encode(b":".join((u, p)))
-             f = b"GET / HTTP/1.0\nAuthorization: Basic " + s + b"\n\n"
-             self.runRequest(f, Request, 0)
-             req = requests.pop()
-@@ -2209,9 +2209,9 @@ Hello,
- 
-         u = b"foo"
-         p = b"bar"
--        s = base64.encodestring(b":".join((u, p))).strip()
-+        s = base64.b64encode(b":".join((u, p)))
-         f = b"GET / HTTP/1.0\nAuthorization: Basic " + s + b"\n\n"
--        self.patch(base64, 'decodestring', lambda x: [])
-+        self.patch(base64, 'b64decode', lambda x: [])
-         self.runRequest(f, Request, 0)
-         req = requests.pop()
-         self.assertEqual((b'', b''), req.credentials)
--- 
-2.26.2
diff --git a/dev-python/twisted/files/twisted-20.3.0-py39-combined.patch b/dev-python/twisted/files/twisted-20.3.0-py39-combined.patch
deleted file mode 100644
index 0ed1f7b8d9c6..000000000000
--- a/dev-python/twisted/files/twisted-20.3.0-py39-combined.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 2d30860a8b71e90513ead9958f5dd312802b0d36 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 27 May 2020 14:40:53 +0200
-Subject: [PATCH 2/4] Fix imap4-utf-7 codec lookup function for Python 3.9
-
-Python 3.9 normalizes the codec name into 'imap4_utf_7' rather than
-'imap4-utf-7', and therefore the lookup function needs to account
-for the former name.  Transform the latter locally to preserve support
-for all Python versions.
-
-Fixes: ticket: 9832
----
- src/twisted/mail/imap4.py                | 2 +-
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/twisted/mail/imap4.py b/src/twisted/mail/imap4.py
-index 736ef111d..3f32982ca 100644
---- a/src/twisted/mail/imap4.py
-+++ b/src/twisted/mail/imap4.py
-@@ -6369,7 +6369,7 @@ _codecInfo = codecs.CodecInfo(encoder, decoder, StreamReader, StreamWriter)
- 
- 
- def imap4_utf_7(name):
--    if name == 'imap4-utf-7':
-+    if name.replace('-', '_') == 'imap4_utf_7':
-         return _codecInfo
- 
- codecs.register(imap4_utf_7)
--- 
-2.26.2
-
-From daf928bf0f0371816dddbd4929948c4213d0cdcb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 27 May 2020 15:12:54 +0200
-Subject: [PATCH 3/4] Fix verifyCryptedPassword() for crypt.crypt() throwing in
- py3.9
-
-In Python 3.9, the crypt.crypt() function may throw an exception
-if the underlying crypt() function fails.  Update
-verifyCryptedPassword() to account for that, and preserve the existing
-behavior of returning False in that case.
-
-Fixes: ticket:9833
----
- src/twisted/conch/checkers.py             | 5 ++++-
- src/twisted/plugins/cred_unix.py          | 5 ++++-
- 4 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/twisted/conch/checkers.py b/src/twisted/conch/checkers.py
-index 917567a39..e4e327b16 100644
---- a/src/twisted/conch/checkers.py
-+++ b/src/twisted/conch/checkers.py
-@@ -53,7 +53,10 @@ def verifyCryptedPassword(crypted, pw):
- 
-     @rtype: L{bool}
-     """
--    return crypt.crypt(pw, crypted) == crypted
-+    try:
-+        return crypt.crypt(pw, crypted) == crypted
-+    except OSError:
-+        return False
- 
- 
- 
-diff --git a/src/twisted/plugins/cred_unix.py b/src/twisted/plugins/cred_unix.py
-index 211b4ccbc..a662719b6 100644
---- a/src/twisted/plugins/cred_unix.py
-+++ b/src/twisted/plugins/cred_unix.py
-@@ -43,7 +43,10 @@ def verifyCryptedPassword(crypted, pw):
-         pw = pw.decode('utf-8')
-     if not isinstance(crypted, StringType):
-         crypted = crypted.decode('utf-8')
--    return crypt.crypt(pw, crypted) == crypted
-+    try:
-+        return crypt.crypt(pw, crypted) == crypted
-+    except OSError:
-+        return False
- 
- 
- 
--- 
-2.26.2
-
-From 4fc435df0d1eba3e5d6416a2b86d39d3404f82fe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 27 May 2020 15:37:10 +0200
-Subject: [PATCH 4/4] Use xml.etree.ElementTree instead of deprecated
- cElementTree
-
-The xml.etree.cElementTree is deprecated, and has been removed in Python
-3.9.  At the same time, xml.etree.ElementTree has already been using
-cElementTree implicitly since Python 3.3.  Update test_flatten to use
-the latter to provide compatibility with newer Python versions.
-
-Fixes: ticket:9834
----
- src/twisted/web/test/test_flatten.py    | 2 +-
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
-index 677401c55..61d50e20a 100644
---- a/src/twisted/web/test/test_flatten.py
-+++ b/src/twisted/web/test/test_flatten.py
-@@ -9,7 +9,7 @@ L{twisted.web._flatten}.
- import sys
- import traceback
- 
--from xml.etree.cElementTree import XML
-+from xml.etree.ElementTree import XML
- 
- from collections import OrderedDict
- 
--- 
-2.26.2
-
diff --git a/dev-python/twisted/files/twisted-21.7.0-force-gtk3.patch b/dev-python/twisted/files/twisted-21.7.0-force-gtk3.patch
new file mode 100644
index 000000000000..a2e40559ec59
--- /dev/null
+++ b/dev-python/twisted/files/twisted-21.7.0-force-gtk3.patch
@@ -0,0 +1,67 @@
+From eec6b60116e12e015387fe1fa3a729553d3848bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 22 May 2021 01:11:48 +0200
+Subject: [PATCH] Force using GTK+3 in twisted.internet.gireactor
+
+Modify twisted.internet.gireactor to explicitly request GTK+ version 3.
+Otherwise it uses the newest version installed which could be GTK+4
+that gireactor is currently incompatible with.
+---
+ src/twisted/internet/gireactor.py           | 3 +++
+ src/twisted/internet/test/test_gireactor.py | 3 +++
+ src/twisted/newsfragments/10200.bugfix      | 1 +
+ 3 files changed, 7 insertions(+)
+ create mode 100644 src/twisted/newsfragments/10200.bugfix
+
+diff --git a/src/twisted/internet/gireactor.py b/src/twisted/internet/gireactor.py
+index 92596db1d..a577825a8 100644
+--- a/src/twisted/internet/gireactor.py
++++ b/src/twisted/internet/gireactor.py
+@@ -24,6 +24,7 @@ On Python 3, pygobject v3.4 or later is required.
+ from twisted.internet.error import ReactorAlreadyRunning
+ from twisted.internet import _glibbase
+ from twisted.python import runtime
++import gi  # type: ignore[import]
+ import gi.pygtkcompat  # type: ignore[import]
+ from gi.repository import GLib  # type: ignore[import]
+ 
+@@ -68,6 +69,7 @@ class GIReactor(_glibbase.GlibReactorBase):
+     def __init__(self, useGtk=False):
+         _gtk = None
+         if useGtk is True:
++            gi.require_version("Gtk", "3.0")
+             from gi.repository import Gtk as _gtk
+ 
+         _glibbase.GlibReactorBase.__init__(self, GLib, _gtk, useGtk=useGtk)
+@@ -112,6 +114,7 @@ class PortableGIReactor(_glibbase.PortableGlibReactorBase):
+     def __init__(self, useGtk=False):
+         _gtk = None
+         if useGtk is True:
++            gi.require_version("Gtk", "3.0")
+             from gi.repository import Gtk as _gtk
+ 
+         _glibbase.PortableGlibReactorBase.__init__(self, GLib, _gtk, useGtk=useGtk)
+diff --git a/src/twisted/internet/test/test_gireactor.py b/src/twisted/internet/test/test_gireactor.py
+index d15a92622..af5092a36 100644
+--- a/src/twisted/internet/test/test_gireactor.py
++++ b/src/twisted/internet/test/test_gireactor.py
+@@ -25,6 +25,9 @@ else:
+         gtk3reactor = None
+     else:
+         gtk3reactor = _gtk3reactor
++        import gi  # type: ignore[import]
++
++        gi.require_version("Gtk", "3.0")
+         from gi.repository import Gtk
+ 
+ from twisted.internet.error import ReactorAlreadyRunning
+diff --git a/src/twisted/newsfragments/10200.bugfix b/src/twisted/newsfragments/10200.bugfix
+new file mode 100644
+index 000000000..7afb343be
+--- /dev/null
++++ b/src/twisted/newsfragments/10200.bugfix
+@@ -0,0 +1 @@
++twisted.internet.gireactor was fixed to force GTK+3 in order to fix use of incompatible GTK+4 API when installed
+-- 
+2.32.0
+
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
deleted file mode 100644
index cd70c36f469b..000000000000
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 virtualx
-
-TWISTED_PN="Twisted"
-TWISTED_P="${TWISTED_PN}-${PV}"
-TWISTED_RELEASE=$(ver_cut 1-2)
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
-SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-S=${WORKDIR}/${TWISTED_P}
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="conch crypt http2 serial test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	conch? (
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	http2? (
-		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-	!dev-python/twisted-core
-	!dev-python/twisted-conch
-	!dev-python/twisted-lore
-	!dev-python/twisted-mail
-	!dev-python/twisted-names
-	!dev-python/twisted-news
-	!dev-python/twisted-pair
-	!dev-python/twisted-runner
-	!dev-python/twisted-words
-	!dev-python/twisted-web
-"
-DEPEND="
-	dev-python/bcrypt
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-		net-misc/openssh
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-py38.patch
-		"${FILESDIR}"/twisted-19.10.0-py38-cgi.patch
-		"${FILESDIR}"/twisted-20.3.0-py38-hmac.patch
-		"${FILESDIR}"/twisted-19.10.0-py39-b64.patch
-		"${FILESDIR}"/twisted-20.3.0-py39-combined.patch
-	)
-
-	# upstream test for making releases; not very useful and requires
-	# sphinx (including on py2)
-	rm src/twisted/python/test/test_release.py || die
-
-	# Conch doesn't work with latest >=OpenSSH 7.6
-	#   - https://twistedmatrix.com/trac/ticket/9311
-	#   - https://twistedmatrix.com/trac/ticket/9515
-	rm src/twisted/conch/test/test_ckeygen.py || die
-	rm src/twisted/conch/test/test_conch.py || die
-	rm src/twisted/conch/test/test_cftp.py || die
-
-	# puts system in EMFILE state, then the exception handler may fail
-	# trying to open more files due to some gi magic
-	sed -e '/SKIP_EMFILE/s:None:"Fails on non-pristine systems":' \
-		-i src/twisted/internet/test/test_tcp.py || die
-
-	# TODO: times out, i can't find where to increase the timeout
-	sed -e 's:test_manyProcesses:_&:' \
-		-i src/twisted/test/test_process.py || die
-
-	# multicast tests fail within network-sandbox
-	sed -e 's:test_joinLeave:_&:' \
-		-e 's:test_loopback:_&:' \
-		-e 's:test_multiListen:_&:' \
-		-e 's:test_multicast:_&:' \
-		-i src/twisted/test/test_udp.py || die
-
-	# accesses /dev/net/tun
-	sed -e '/class RealDeviceTestsMixin/a\
-    skip = "Requires extra permissions"' \
-		-i src/twisted/pair/test/test_tuntap.py || die
-
-	# TODO: figure it out, probably doesn't accept DST date here
-	sed -e 's:test_getTimezoneOffsetWithoutDaylightSavingTime:_&:' \
-		-i src/twisted/test/test_log.py || die
-
-	# TODO: failures specific to Python 2
-	sed -e 's:testLookupProcNetTcp:_&:' \
-		-i src/twisted/test/test_ident.py || die
-	sed -e 's:test_loggingFactoryOpensLogfileAutomatically:_&:' \
-		-i src/twisted/test/test_policies.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# TODO: upstream seems to override our build paths
-	distutils_install_for_testing
-
-	"${EPYTHON}" -m twisted.trial twisted ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D}$(python_get_sitedir)" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild
deleted file mode 100644
index 48c006ad930f..000000000000
--- a/dev-python/twisted/twisted-20.3.0.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 virtualx
-
-TWISTED_PN="Twisted"
-TWISTED_P="${TWISTED_PN}-${PV}"
-TWISTED_RELEASE=$(ver_cut 1-2)
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
-SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="conch crypt http2 serial test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	conch? (
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	http2? (
-		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-	!dev-python/twisted-core
-	!dev-python/twisted-conch
-	!dev-python/twisted-lore
-	!dev-python/twisted-mail
-	!dev-python/twisted-names
-	!dev-python/twisted-news
-	!dev-python/twisted-pair
-	!dev-python/twisted-runner
-	!dev-python/twisted-words
-	!dev-python/twisted-web
-"
-DEPEND="
-	dev-python/bcrypt
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-		net-misc/openssh
-	)
-"
-
-S=${WORKDIR}/${TWISTED_P}
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/twisted-20.3.0-py38-cgi.patch
-		"${FILESDIR}"/twisted-20.3.0-py38-hmac.patch
-		"${FILESDIR}"/twisted-20.3.0-py39-b64.patch
-		"${FILESDIR}"/twisted-20.3.0-py39-combined.patch
-	)
-
-	# upstream test for making releases; not very useful and requires
-	# sphinx (including on py2)
-	rm src/twisted/python/test/test_release.py || die
-
-	# Conch doesn't work with latest >=OpenSSH 7.6
-	#   - https://twistedmatrix.com/trac/ticket/9311
-	#   - https://twistedmatrix.com/trac/ticket/9515
-	rm src/twisted/conch/test/test_ckeygen.py || die
-	rm src/twisted/conch/test/test_conch.py || die
-	rm src/twisted/conch/test/test_cftp.py || die
-
-	# puts system in EMFILE state, then the exception handler may fail
-	# trying to open more files due to some gi magic
-	sed -e '/SKIP_EMFILE/s:None:"Fails on non-pristine systems":' \
-		-i src/twisted/internet/test/test_tcp.py || die
-
-	# multicast tests fail within network-sandbox
-	sed -e 's:test_joinLeave:_&:' \
-		-e 's:test_loopback:_&:' \
-		-e 's:test_multiListen:_&:' \
-		-e 's:test_multicast:_&:' \
-		-i src/twisted/test/test_udp.py || die
-
-	# accesses /dev/net/tun
-	sed -e '/class RealDeviceTestsMixin/a\
-    skip = "Requires extra permissions"' \
-		-i src/twisted/pair/test/test_tuntap.py || die
-
-	# TODO: figure it out, probably doesn't accept DST date here
-	sed -e 's:test_getTimezoneOffsetWithoutDaylightSavingTime:_&:' \
-		-i src/twisted/test/test_log.py || die
-
-	# TODO: failures specific to Python 2
-	sed -e 's:testLookupProcNetTcp:_&:' \
-		-i src/twisted/test/test_ident.py || die
-	sed -e 's:test_loggingFactoryOpensLogfileAutomatically:_&:' \
-		-i src/twisted/test/test_policies.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# TODO: upstream seems to override our build paths
-	distutils_install_for_testing
-
-	"${EPYTHON}" -m twisted.trial twisted ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D}$(python_get_sitedir)" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-21.2.0-r1.ebuild b/dev-python/twisted/twisted-21.2.0-r1.ebuild
index 80810364d1cb..296e07d25869 100644
--- a/dev-python/twisted/twisted-21.2.0-r1.ebuild
+++ b/dev-python/twisted/twisted-21.2.0-r1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/twisted/twisted-21.7.0.ebuild b/dev-python/twisted/twisted-21.7.0.ebuild
new file mode 100644
index 000000000000..68bcdd4ffffc
--- /dev/null
+++ b/dev-python/twisted/twisted-21.7.0.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+HOMEPAGE="https://www.twistedmatrix.com/trac/"
+SRC_URI="
+	https://github.com/twisted/twisted/archive/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="conch crypt http2 serial test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
+	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.6.5[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+	conch? (
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+	)
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
+	)
+	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
+	http2? (
+		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/priority-2.0[${PYTHON_USEDEP}]
+	)
+	!dev-python/twisted-core
+	!dev-python/twisted-conch
+	!dev-python/twisted-lore
+	!dev-python/twisted-mail
+	!dev-python/twisted-names
+	!dev-python/twisted-news
+	!dev-python/twisted-pair
+	!dev-python/twisted-runner
+	!dev-python/twisted-words
+	!dev-python/twisted-web
+"
+BDEPEND="
+	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
+		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		net-misc/openssh
+	)
+"
+
+PATCHES=(
+	# https://twistedmatrix.com/trac/ticket/10200
+	"${FILESDIR}/${P}-force-gtk3.patch"
+)
+
+python_prepare_all() {
+	# upstream test for making releases; not very useful and requires
+	# sphinx (including on py2)
+	rm src/twisted/python/test/test_release.py || die
+
+	# puts system in EMFILE state, then the exception handler may fail
+	# trying to open more files due to some gi magic
+	sed -e '/SKIP_EMFILE/s:False:True:' \
+		-i src/twisted/internet/test/test_tcp.py || die
+
+	# multicast tests fail within network-sandbox
+	sed -e 's:test_joinLeave:_&:' \
+		-e 's:test_loopback:_&:' \
+		-e 's:test_multiListen:_&:' \
+		-e 's:test_multicast:_&:' \
+		-i src/twisted/test/test_udp.py || die
+
+	# accesses /dev/net/tun
+	sed -e '/class RealDeviceTestsMixin/a\
+    skip = "Requires extra permissions"' \
+		-i src/twisted/pair/test/test_tuntap.py || die
+
+	# These tests rely on warnings which seems work unreliably between python versions
+	sed -e 's:test_currentEUID:_&:' \
+		-e 's:test_currentUID:_&:' -i src/twisted/python/test/test_util.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# TODO: upstream seems to override our build paths
+	distutils_install_for_testing
+
+	"${EPYTHON}" -m twisted.trial twisted ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D}$(python_get_sitedir)" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+
+	python_doscript "${WORKDIR}"/twisted-regen-cache
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+python_postinst() {
+	twisted-regen-cache || die
+}
+
+pkg_postinst() {
+	python_foreach_impl python_postinst
+
+	einfo "Install complete"
+	if use test ; then
+		einfo ""
+		einfo "Some tests have been disabled during testing due to"
+		einfo "known incompatibilities with the emerge sandboxes and/or"
+		einfo "not runnable as the root user."
+		einfo "For a complete test suite run on the code."
+		einfo "Run the tests as a normal user for each python it is installed to."
+		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
+	fi
+}
+
+python_postrm() {
+	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+}
+
+pkg_postrm() {
+	# if we're removing the last version, remove the cache file
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		python_foreach_impl python_postrm
+	fi
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index cef081279a40..e76697687380 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,5 +1,3 @@
-DIST urllib3-1.26.5.tar.gz 292865 BLAKE2B 0b22a485635f70f198c022c13d03af2b1a9b6907276e3bc3acaa2242e1c632447762f86e9588e735462e6479ff93a172f458691ea9bf28ceaebd5e1cfbc55501 SHA512 4a1899b223b00894d49f6dff5fc95d410e5b0ab28c11f7e3cd82d03e50438b0c5b0adf693a33fd80f1586312dc0012836713998674da15531bf82d52645881f6
 DIST urllib3-1.26.6.tar.gz 289927 BLAKE2B 197b0df759b27fc4906c565426e9c7b533fad56f10695ab5ae6c6c4d05d5c889dba906be526d8b8f41405f29696046b7db6e2cbb2fa16843af80e072138cc35f SHA512 19eb4b88b7a575db717db420ff79b304769d9a6d2b576a236d69719101c4d52d6b0079bd049c885e630f0dfd60471f8bb33836847e0569652cddece910ec2979
-EBUILD urllib3-1.26.5.ebuild 1962 BLAKE2B 619160dfebe98b7497545a2044c4af5522b54d3b53a956c86041bb50588562784feb41c32faaded7feb7769e364029a695decd7a22ecc5c5673a4bba5ece4aa6 SHA512 a54a2e38a40e134c8cf8fab84b99f5a810ae89452a0204ef12ee695b3aa3d616887b6ec3d908447c2f807a258050bd55ecd4a05687f38a7811f82486cf9b454e
-EBUILD urllib3-1.26.6.ebuild 1970 BLAKE2B e3dee58d1f4b280c2c2c8a84afcb9356450f045267ec321467933ffac73a9de5050473524d971cd65724b8de1b3e22ea824fc0cfd933a3083bd46b0b6bbb6dc0 SHA512 4d14b178b5d4df05883498a6cb0b38d1630ba11e20b3d93ccb57a27bf99e0d510389f1344155177501472f4ec4f39d8bf5c4ef4fcb6141a3d0d0e2eed5a86219
+EBUILD urllib3-1.26.6.ebuild 1962 BLAKE2B 1fe2eae1dd3608a8b9f8a6ef3582f92a78a98ac8ba0378561825708f72c2341c8900ab6aa38b88a74fa8b6f0d9421dbee903a93d8b4ee1036f69d0bedebac4a2 SHA512 b265eeadf3bb12270e604cbd65b570c836b081c8b7e67a19aeba8b29b9b62bd93a2cec945bb770b422e354f97675766ed3451630cdc9c5ad6d44523c603d02f8
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/urllib3-1.26.5.ebuild b/dev-python/urllib3/urllib3-1.26.5.ebuild
deleted file mode 100644
index a718303d1a5e..000000000000
--- a/dev-python/urllib3/urllib3-1.26.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
-# dependencies. Do not add them to RDEPEND. They should be unnecessary with
-# modern versions of python (>= 3.2).
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6..10})
-	)
-"
-
-python_prepare_all() {
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	# please keep in sync with BDEPEND!
-	has "${EPYTHON}" python3.{6..10} || continue
-
-	local deselect=(
-		# TODO?
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/urllib3/urllib3-1.26.6.ebuild b/dev-python/urllib3/urllib3-1.26.6.ebuild
index b68c311d9396..c71c6adc940b 100644
--- a/dev-python/urllib3/urllib3-1.26.6.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 3e3e73f657f0..d86e6a169c2f 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -2,6 +2,6 @@ AUX uvicorn-0.13.4-fix-wsproto-1.0.patch 1122 BLAKE2B 4190a5e61af991e77271aef8be
 DIST uvicorn-0.13.4.tar.gz 505858 BLAKE2B 486436c0b4c717741c11b7da6a979dc9fe977baa2dbc3e2538ce28551d2dee593076b670b16c099056165624c149f96974f64d2847e38234122ec93b65b31cda SHA512 5332494e0b43b4e87f9d6742be679527b1ec2bc4d2e061768594d44b1fd1d6961a2bd1fa23469fca6c530ef36d6123e453306c2bb664cb27b0cd6145b9a70fd7
 DIST uvicorn-0.14.0.tar.gz 511593 BLAKE2B 9f7aee0001874c128e44d31945aaa0ca92237e594debb6fea3c6c6d0f283c96cfad5248578b0e1c170fe2fde96a6b17c56ecf2436783fcae135b8eab1997b701 SHA512 f41a7f01ac6893ceaf4d1f06a4bccd7355e319eee11d6aa290b0d316fb356eb807c926941157ec64f1fc6b7c4601930cfbe271075d6c4cf684bd7e175617390f
 EBUILD uvicorn-0.13.4.ebuild 1297 BLAKE2B e2e429e266084c92acf6965e86220494101135001bf656ce9ed1ee08b8ea07b61a8cb844bd416ddfa77ae9c8dd0d3618a8438b3dd1b08d12857efce9e6fbcbbc SHA512 3fd28de46cea2f2b8a2a7aa688155127d1a6d8e7f79137443606019e05825a1f4ab1c1ecd1dd8f4a04c8dc8e6851b59136fdcc68d5d4344be98fe70f97714dc0
-EBUILD uvicorn-0.14.0-r1.ebuild 1280 BLAKE2B 83891f78a5e59c9bafc60663bcb1aa3c00326418f1de3de0d31589103b5d88e86f27c1226542952d93c2b496527fc3eab3f5641f562cdc85c6780374daf6c1aa SHA512 8f98fbf1bd0747d74638ffdca1360deabbfc662038f43cf6939a29f1e2f6b88a67a52f11221c0558f1e5b81b70d50c4dd1d1505bb094095519c667c58d58db93
+EBUILD uvicorn-0.14.0-r1.ebuild 1279 BLAKE2B 90399c2f4a25353b5e59e6468de1b9082370c70942bbc12522060023adcfda8051d28f72960e375381d8f160607fb7f81fe2325e4c49f88c8c072766191d9086 SHA512 fe1564d7e1ae099680c19be4f5f12dcc8d15bb4a277f2bc314f2ec54ace4afaf0641f055e9c93815f82b81e47f300aa51c3a0b3aa000a735fb69966df4d2ba78
 EBUILD uvicorn-0.14.0.ebuild 1426 BLAKE2B 7051151bdae8ad61fe11b8b209f2895cc37b0d0998dfdc110210cbcc5774082e8a5d0b21e6265d7b9a9c2437784e3c499750b48c5b0271691e5a1092c6083037 SHA512 982224e58b7cd8cf7a9596b921b226bebb6d8463b7c844b691be1c284598586d8ffaf70f911644e85f5518d2a21aa1c54eaa6741e5d9227b05b8b3d42709353e
 MISC metadata.xml 450 BLAKE2B e6413874e7247880323b72113f002ade2edff362d7464ebbd5890ec95946b97bc37d74c2d6e9ff7a6a416a45f32bbab1b6eca70db8964adc6be287793c0fb4b4 SHA512 a1138016ec2d87c77f82333a0d41a68113d87c74d50e1bd6ccef0e0300f53663ecb907959be2547b42cc5cd007f47626e98b8c8cdc7e3557d2dfd0a369447268
diff --git a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild b/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
index 36625ca3ac4b..90b6ff8d6663 100644
--- a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 13ba6947a135..d94b85dc2689 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,5 +1,7 @@
+AUX uvloop-0.15.3-uint64-thread-id.patch 1548 BLAKE2B 2d1af0cd42f1911e2296db843bace2c3281e9defff1b174a7ca3c2bf651af2b9149b4066e9e252b216a33751591e0e15afec035142c35dac2bce7683c52a48e7 SHA512 0ae9fd1210d80f8efdf1d29b84450c60578848467b49616e9c5e71476779972e94ccebe13d99e74cef99ea59cf50617a8152a1768a0c14b812036310b403a55c
 DIST uvloop-0.15.2.tar.gz 2092589 BLAKE2B 05c518ba5854fa22fe72a0224856fa0529af0b9432f366b5b1cb0df09a92c787425713fadb85b151363df28800a94ed2a2ad617aaa1c4e854586e49d16f7dd1c SHA512 e398c7ff85da65344a6ab637e9b2f560e9ba61a3be7a3138d546138949359e30bc2e5f8268f1569b73c3881c66d71cf6298038ca1a883be71a33d7ef86d09eed
 DIST uvloop-0.15.3.tar.gz 2094066 BLAKE2B 77ae4634ee31211dba13f41aede4480d70271e042a30a1268e9ad18f5de2b296b84931fb6b2022d2351f33521a84264f74cbc30caa5ff84b0f429bc9f1d426a0 SHA512 5687371a13509bdac0ef7a5ca0f7c78b54d0d9225cbf68cebc6d4fdf3807c2e3346579f5440eb0ff6578088780cc5efb09fba114da0bc0e60ad3f607d9df652f
 EBUILD uvloop-0.15.2.ebuild 1179 BLAKE2B 90824270e60d1444e154fa694831fe6c9a6deefa790babfa7afc8deef627295545da7d966998165db1ebff37ed7ad466fbede4ecb13fce22586858ce3b75d335 SHA512 1df3a69ed7cf55669219004c1ed4c620788cee5a9f009e906575aadea9babdfdf61c549b1c850977ac4cb97e4c533d1644de6151d571bbf801b99f6075ad32e3
-EBUILD uvloop-0.15.3.ebuild 1180 BLAKE2B 6b861bf35c1f4b5b44aaa5ca94ae411e17d39f2c9e9237e05046cf867e779665efa6270d9d3165b90be1724c5591af8f7766f11a1b285abde2944513792663bc SHA512 f1388b3d5ac6ec2ae175496e4508fd93e8f45191a241a7e43670a408bc30f59930d4e01611fd9f83fe4700d04ff46b9e60f54e9c454fa2c9e9f3347d5f161a15
+EBUILD uvloop-0.15.3-r1.ebuild 1368 BLAKE2B dbc27abde002b5db0cb9034f092909bb2b5faba902c0de5025c7ea88a91998188a1fe4b5bcaac7ea989ebb1c32b95794615170fa6766c44216fba53a6ef80e63 SHA512 997cb0ae5f2e94e424f5f8f06b6ebb8d750f90a06113607c332cf11121e9ab232bb20a1479087921b8a485bc303a1c4232bc17b48917a0b99a39f4180dad7e1c
+EBUILD uvloop-0.15.3.ebuild 1187 BLAKE2B ee17834d7053f51fea2ab82738e4da26b84709d0f97558dc759f9ce7e0f9da6c465cfa85c30423a85ef21f5732229a6ee117ceee04d9d94c7d579d671c9bbe57 SHA512 73a371db1120e099db3e18926e63902698b2a5594233662efb91bc11549de7f9d2904476c7dde83e1a185a0bb22687e5aeb341ff8d44c2c0ab758ece9a0afe38
 MISC metadata.xml 526 BLAKE2B 1c5d5ffd994ab70aae22d5a6312708a168f89790a5999d81ccf4eab552e910fd063ace9f1e51d1b477ed96604a23265f586781feb7b692d1f49a0c502d59dd3a SHA512 e38163d8b0b033c5825d4f977cb58bc727195a7e577eb229a70c4b089943ad99f4c8121e0d4e209db51fe2977ffad2f88b8bfae3baedd853eabefabb15578b85
diff --git a/dev-python/uvloop/files/uvloop-0.15.3-uint64-thread-id.patch b/dev-python/uvloop/files/uvloop-0.15.3-uint64-thread-id.patch
new file mode 100644
index 000000000000..a74fedd308e9
--- /dev/null
+++ b/dev-python/uvloop/files/uvloop-0.15.3-uint64-thread-id.patch
@@ -0,0 +1,43 @@
+From 732df28f0739d84c687d3e6d81995dafa18ac775 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 28 Jul 2021 09:21:00 +0200
+Subject: [PATCH] Revert 32-bit thread ID hack
+
+Apparently the hack used to fix 32-bit platforms actually breaks 64-bit
+platforms using large thread IDs (e.g. sparc).
+
+Reverts: b5b4abb16ba558cf957cf40120dfd4937c53aea5
+---
+ uvloop/includes/stdlib.pxi | 2 +-
+ uvloop/loop.pyx            | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/uvloop/includes/stdlib.pxi b/uvloop/includes/stdlib.pxi
+index adf9806..21d69e6 100644
+--- a/uvloop/includes/stdlib.pxi
++++ b/uvloop/includes/stdlib.pxi
+@@ -135,7 +135,7 @@ cdef int ssl_SSL_ERROR_WANT_READ = ssl.SSL_ERROR_WANT_READ
+ cdef int ssl_SSL_ERROR_WANT_WRITE = ssl.SSL_ERROR_WANT_WRITE
+ cdef int ssl_SSL_ERROR_SYSCALL = ssl.SSL_ERROR_SYSCALL
+ 
+-cdef uint64_t MAIN_THREAD_ID = <uint64_t><int64_t>threading.main_thread().ident
++cdef uint64_t MAIN_THREAD_ID = <uint64_t>threading.main_thread().ident
+ cdef threading_Thread = threading.Thread
+ 
+ cdef int subprocess_PIPE = subprocess.PIPE
+diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx
+index d9b5aaa..96c9cde 100644
+--- a/uvloop/loop.pyx
++++ b/uvloop/loop.pyx
+@@ -707,7 +707,7 @@ cdef class Loop:
+             return
+ 
+         cdef uint64_t thread_id
+-        thread_id = <uint64_t><int64_t>PyThread_get_thread_ident()
++        thread_id = <uint64_t>PyThread_get_thread_ident()
+ 
+         if thread_id != self._thread_id:
+             raise RuntimeError(
+-- 
+2.32.0
+
diff --git a/dev-python/uvloop/uvloop-0.15.3-r1.ebuild b/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
new file mode 100644
index 000000000000..4c2a70b59ede
--- /dev/null
+++ b/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
+HOMEPAGE="https://github.com/magicstack/uvloop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64"
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc examples"
+
+RDEPEND=">=dev-libs/libuv-1.11.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+PATCHES=(
+	"${FILESDIR}"/${P}-uint64-thread-id.patch
+)
+
+python_prepare_all() {
+	cat <<-EOF >> setup.cfg || die
+		[build_ext]
+		use_system_libuv=1
+	EOF
+
+	# flake8 only
+	rm tests/test_sourcecode.py || die
+	# TODO: broken by cythonize
+	rm tests/test_cython.py || die
+	# force cythonization
+	rm uvloop/loop.c || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_ext --inplace build_sphinx
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/uvloop/uvloop-0.15.3.ebuild b/dev-python/uvloop/uvloop-0.15.3.ebuild
index da543faea652..3ff9f3019ff5 100644
--- a/dev-python/uvloop/uvloop-0.15.3.ebuild
+++ b/dev-python/uvloop/uvloop-0.15.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
@@ -32,10 +32,10 @@ BDEPEND="
 distutils_enable_tests setup.py
 
 python_prepare_all() {
-	cat <<EOF >> setup.cfg || die
-[build_ext]
-use-system-libuv=1
-EOF
+	cat <<-EOF >> setup.cfg || die
+		[build_ext]
+		use_system_libuv=1
+	EOF
 
 	# flake8 only
 	rm tests/test_sourcecode.py || die
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index a1f77baa2a6e..121cec59a413 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,5 +1,7 @@
 DIST virtualenv-20.4.7.tar.gz 10625204 BLAKE2B 1233ea45f771fb425b99c966904e2c5444e5fcb617b1d7cd34cdac097ee15566b7f4c841d444393723ed369193f33bef90ea7caa5b3c20aaf65fbde2f865abf7 SHA512 a554fb32cc46cb1cef2a2655bdae598efb52a4e71223eb10d9a36b124390546250aa11cf7da991a41ef4697523ec4562a31e35b5ab7ee8aba748ea4ff28e088b
 DIST virtualenv-20.6.0.tar.gz 8700762 BLAKE2B 718bbfda175ab4ef0820ba66b480060c0371c54a3e6c622c816d8c30141951c85b4f461fa03f71912a767b8d6a40733ab253062466e38a4a2e18b3169812e6a1 SHA512 7eff570f407a4986336d5a34bdcab1621d953aa6900d41962a85a5a44d7b68d378cda4a1bc1ddbfbc468580e051a98c37be17b0a52babbb00166718a987a591c
+DIST virtualenv-20.7.0.tar.gz 8714219 BLAKE2B 81b5ee144614a7c854e03599270d03454f991520e8381b98ef01b64e91bb7520a3949e5af9710ceb6292be6b7b7e3738ed7a08324b5ada37f8f4941b408fb425 SHA512 af0f993045013814d9397419fc9d789a1ad64dc53818cbeceb5146e418a8535f76b74ed36b4b164d6974660be77de91cda244eb70b810c8c9fb522ba1088813a
 EBUILD virtualenv-20.4.7.ebuild 4256 BLAKE2B 8fbe67f90a9b7079b5eb6b6e9c6c28fcc887fdcfa1bf31ba9fa02c62166ee8f7e42d1a98336110d452907133a0d75892b7d28c202a8075f88b32ac354dd57ca3 SHA512 db31bfb20d836ad986acff3b6ff5d16ef00a78379b02cf7d6be853aaaa08cbcbfcd7de106d47d398e9b8125644fc9daa164bfa6cb09a302e1f3135b709f38bb3
-EBUILD virtualenv-20.6.0.ebuild 4263 BLAKE2B 94fe21a4be14a85eadb08db776b648875876d83204b7e673de42cb38b2eda5773baa949b4f69cb0e8ad2e89e5820b9dd1c1b6ec7cc7c7a219a52b3cb7aecd4d2 SHA512 e0ea9767a671948a9fe47696d0d8bda66972782d0dab6194b7bf5238dda8f96dedb608d3500aae954bbde7ae665b3edf785e46270e94b7d50453d84c467bc550
+EBUILD virtualenv-20.6.0.ebuild 4276 BLAKE2B 6533c59050af3916bdf02e38671cb6fa6558bacb9ca47af9a9282594fb5d97d3c8eb405db4c6f41a180203ba54dd77066f7bab75deebc8a101d078b22e8dd5c2 SHA512 f49d6360516804b898fa90bfd4a0592c58ed224e1abea528730f041e7f3cc15d68bf2628323feb5c05f724fdb1c085dd940ffdaedceae7010551f6ebc00d08d0
+EBUILD virtualenv-20.7.0.ebuild 4223 BLAKE2B 750a8ba95e246111f3d7f59db4f724caf2b395d850bfc6bfd3197ae986515ca9aec1ca1ab0f33337c23cafc0dd8afd1a013d0650e5c6dd03b6ce9b982583408e SHA512 d0777e46b38b8f0cd8b986fa506a2500f0a694ecaaeeba5d6d08cad60e79bc364369106cfe88b89b9785ddcddbd6107ba1651dc94e2efd128d0ec8c96179670e
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.6.0.ebuild b/dev-python/virtualenv/virtualenv-20.6.0.ebuild
index 2167370f63af..3d63a4a907b5 100644
--- a/dev-python/virtualenv/virtualenv-20.6.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~mips ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/virtualenv/virtualenv-20.7.0.ebuild b/dev-python/virtualenv/virtualenv-20.7.0.ebuild
new file mode 100644
index 000000000000..848d5dc99614
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.7.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing
+	epytest ${deselect[@]/#/--deselect }
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index a9d246999ef2..e650c2e87c68 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -3,8 +3,10 @@ DIST WeasyPrint-51.tar.gz 308411 BLAKE2B f88f9e1abc09986d51d92d8a153c71242cadc8c
 DIST WeasyPrint-52.3.tar.gz 325076 BLAKE2B 2981a487938d4ceefe20da36262438a64c30beaff340be6bd48b0140f63ea3971ca80a36386dde2db270e1555b137a89480673c4fdc2fa49079efdf58e53029b SHA512 7db740dd8f7264f73efe6e2505c603cedb1f8e5c053447b03517bdb003b933e1ef58f15482d4ab316b04b6631f9102752670f8b56989983cab80f7bd110746c9
 DIST WeasyPrint-52.4.tar.gz 325062 BLAKE2B ead641007e84664dfc1a9b95a227d5c6539e19e629d95d68b663b46a873ffa83b203897dd4d03c5d72f00e2737268c64624b97a37840c86d4a555f5b1a20a7bb SHA512 0003f9b46452e60118e7f6944f0bf48b6f548814dae10f990bedb124d3c67d9c530c30ee142d416f448b3b479f54b4fcdf01e31747957438192c77031926cb8c
 DIST WeasyPrint-52.5.tar.gz 325050 BLAKE2B 425a21acba183a3313069724972a7627aeaf326ce42e84789c02552f51a660be7b1d2855b76a3034ae09c316b6f0a13219464b88af8bb8f0ca59ab8ffd263223 SHA512 0ce86db000adef95fabfb335c069ad2a602ed98056219cedde905c550b04b10b0881d72fbdd38a48fae4e263825f5fbd8a70ce13932083afb8930eacc5817fb5
+DIST weasyprint-53.0.tar.gz 386339 BLAKE2B 6d8e30a02d54061557e549a685944de7cbc61f4c1b46b23dbaef66e87232325f630fd5a34cf5c846599612914f9306b5235fad65a008e19a7c200af2f4c7d9da SHA512 de34ee5654ee90aec82b67c1bc7d9496fe3a4247b2a649ab110d1613c4780fd9ae611c9da177de07e5287749978af9a4a7d5c102d0940e5fd970e5aa8586c47e
 EBUILD weasyprint-51.ebuild 1384 BLAKE2B 8c21b4f54af4c4cfa0d231a5ce02d911a6a8d53acdc7bc530be7e39235beb0f57d8a0c0dc8c399992c7e59af1a455ec39411ce9f85f5c6f731d8cc36e31c0a5e SHA512 d101e24e5f91982c8ca2b555ae44b4a8f40f9ca729ec460404b6e471f9bd3279aa934c136ea80a9af4a26c6cca81ea6cabb18477bc559cdfc85775adb0f6bf16
 EBUILD weasyprint-52.3.ebuild 1274 BLAKE2B c436d65ab599aad4c43e29c2186f2641ec79d14d8a94f77426d2aeb276624430a393e6d76aea2191ee5114d8ad6a0ad1a6e0b953142946557df80c83e6080051 SHA512 9e7a9dbc41cfa111784921375456fcffc24650d9119f726fb3b913d4530c66741f351c6b18cdaf6ac97dc414f07ba1f4791ec15c05cf1ae9b5c8d62712be1f5d
 EBUILD weasyprint-52.4.ebuild 1274 BLAKE2B c436d65ab599aad4c43e29c2186f2641ec79d14d8a94f77426d2aeb276624430a393e6d76aea2191ee5114d8ad6a0ad1a6e0b953142946557df80c83e6080051 SHA512 9e7a9dbc41cfa111784921375456fcffc24650d9119f726fb3b913d4530c66741f351c6b18cdaf6ac97dc414f07ba1f4791ec15c05cf1ae9b5c8d62712be1f5d
 EBUILD weasyprint-52.5.ebuild 1274 BLAKE2B c436d65ab599aad4c43e29c2186f2641ec79d14d8a94f77426d2aeb276624430a393e6d76aea2191ee5114d8ad6a0ad1a6e0b953142946557df80c83e6080051 SHA512 9e7a9dbc41cfa111784921375456fcffc24650d9119f726fb3b913d4530c66741f351c6b18cdaf6ac97dc414f07ba1f4791ec15c05cf1ae9b5c8d62712be1f5d
+EBUILD weasyprint-53.0.ebuild 1149 BLAKE2B 75a2e7b17823bf97c5acde56d847ddcceac9b147f436fecdc4d32c07d1f998dad58b7ac402daf233bc55cd03fc523a903f71ac6ad56a270bbd951cb652213247 SHA512 1c6346543022a699c3e37a676688c901e21ae756a5454f0124ef484b683a667cbe3d8826147fed2f37cc54824f5a8fa430e3964bfa1bbe84e3185246f493f123
 MISC metadata.xml 381 BLAKE2B 422f89ba40bf25e47d53fa91f51ed8b12c5f37a7befd16a2cc2d78335b0dc472180c5e46c6bf890e7a30fc7936e672737e931867097e21a781819fd7ee644e94 SHA512 92ccf545a50a97d2f2cf6f85a6986525ea787d6534682b5fbdd1f0395ed7e938c4e341f5897a663b185d2b2755d4123132b8ec36866b44f2615f08d607a14398
diff --git a/dev-python/weasyprint/weasyprint-53.0.ebuild b/dev-python/weasyprint/weasyprint-53.0.ebuild
new file mode 100644
index 000000000000..15e07a807831
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-53.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jpeg tiff"
+
+# Note: specific subslot of pango since it inlines some of pango headers.
+#	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pydyf-0.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
+	x11-libs/pango
+"
+
+BDEPEND="
+	test? (
+		media-fonts/ahem
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 0c753e733c62..539067f24f02 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,3 +1,3 @@
 DIST WebOb-1.8.7.tar.gz 278544 BLAKE2B 20d8b00f181f2966b918f106080907746dac33b64e75c31749bd774709ed8aa51024258240b89abddacb041073705410845993f93ecfa4b98a7a0fcb8a14e505 SHA512 ff6a1ce796a59d9c078dc908a0d6307a080230a5c806be2278eebcbb78016bed43067e78e3e4a6d72a5f51184c137e8267ac75cbb92b057db008b51a792ff489
-EBUILD webob-1.8.7.ebuild 706 BLAKE2B 86a7befaf884e6835295a12f00f6e347c781c619d8a7cd96e5bb3d48f60ab9ac214fbde8c2b2676fa96fe5d520fccc136d784b6f83d8675a443030802b52f520 SHA512 6c3dabef4ef2a1cff9238d38e574f512a16785764973ff78dfcb5660c99ad17d1294824da6382919a70a27e19fe33d23ebdd2d8f8351729ecc9c1c90e071b72b
+EBUILD webob-1.8.7.ebuild 713 BLAKE2B b680da224e90e4e412137c94bd8345a4aec80096c2216ce0eab86090e6f8e7b2efe1b627810493db489e357d8eb73fe6a1a3b11d6d818c2473a7ff82b124937f SHA512 601c5f1580d5b95ecf431117edb5b3c6c1d13c5c40b9669d77f26716a0cdbff9e6dba747ca6f9d77f266b933d2aab2ff7124cc0b4560dcb63d34cdfce18cf878
 MISC metadata.xml 444 BLAKE2B 377d112b1afec6a033f7688d73d92b4874b31f9401df74624d34870ac4714566019391e877cf1fb10ba1176d3979fb1ca21980b45a96aa7039c9de8e2b495893 SHA512 e180ffdacb38455833badddad5dd9c022d4f20b175f3ec046eef9530d44f511a79ae00743e966246756422645212ece6c142c3e05fbd86b391618eedd827d885
diff --git a/dev-python/webob/webob-1.8.7.ebuild b/dev-python/webob/webob-1.8.7.ebuild
index fb18c79b8392..e2d7091043a7 100644
--- a/dev-python/webob/webob-1.8.7.ebuild
+++ b/dev-python/webob/webob-1.8.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 distutils_enable_sphinx docs 'dev-python/alabaster'
 distutils_enable_tests pytest
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 7219d66d6ff0..3dc95f410c22 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,6 +1,6 @@
 AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293646f84894a45ac2b72852e3f72f187e333b2efd6d76cc02c5996ae75725ef40e882d45012c492b7f3a478666a01d0189 SHA512 82539d4ec63a8b21576de38b17fe2fdf095443b4cfeabf369c443d818ce402e62dcf257ccba022c3b0d671f914f5ef88e4ff40b9fc7d6276493c9a8caf2b76fa
 AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ffdfa4b3276d01a5e9be8998be42634368f34217bd5b6505abced2ec3479b9ab4f40a5697405983740e599b76be1725bb963e3311e SHA512 04201012f1cc16913ff53a9d4868dbdaa6915b1a3a33f0342572aa56741207b6de6e274b91cd26a06511ae8d79d7fef247c2cababafd57130417caa4463a409a
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
-EBUILD wxpython-4.0.7-r1.ebuild 2306 BLAKE2B 845dc17e3f66fdc35effd8c72620ef58583b071dd5c8dac047dbfeefaa2483c2bf8b05770b997e57494b37159379ea00ff01098e3f5f59361ee669168fba9bb6 SHA512 8632153234ccbd5b699c0c98cd4cfbeffd4adddcb8280c0b0f6ed4a02100be833dd49969684bd52064a2543f50a348e7a6682bb45bb9fa35c75afb4c8b7e630d
+EBUILD wxpython-4.0.7-r1.ebuild 2310 BLAKE2B 90fb0b24c3aeb64693ed7b62541b27775192630ab49ce18b83f68fb2e8db1d7aac4b650d2546d81e487068955322d415e786088a7390d429431749b9cd557472 SHA512 75113ecf7f1d9cf8d6f35ef78ff18bd5ed9f27b41a1f8534da526f34fbaac3d6b08917ceb29f4394193bd621bf276256a8456d300c0f4eeace3834e57c09cc9a
 EBUILD wxpython-4.0.7.ebuild 2273 BLAKE2B faf2c0361be73a32f7a27b5010e4fb66c0a7cfb899046f34373bf3c30c344317226bd0c12f1db0c71194084368f8bdb59eaab675fe91153ffc32d52eb169aa21 SHA512 52fb7e58b05874e3f878a23f1c7a27ce7795f89d58ad11bddfd50a30106191d0af034ad0a99826b6303a2de265c16b2a1334e5bdf1b65f1016e20e76d9889ed5
 MISC metadata.xml 490 BLAKE2B b268c95de8e09d5027a6dff7413f8e85030c64610f0f5739321bca1c66892981e2e4273e3e4fc92f3edbbcee1d2ede23a366dfec9ffbc17c8b015b784847755f SHA512 a33e6390e4cfcedbe7a2e950b1f447195f439747e37acfa6ad234b58fd449d80b16d342213e5190fa3143c71a5e95861f11daff1b61fcb5015c3a5255a27cadb
diff --git a/dev-python/wxpython/wxpython-4.0.7-r1.ebuild b/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
index 53e159cf13cc..c4eb46fbce64 100644
--- a/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 WX_GTK_VER="3.0-gtk3"
 
 DISTUTILS_IN_SOURCE_BUILD="1"
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="test webkit"
 # Tests broken: #726812, #722716
 RESTRICT="test"
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 3035e1ac2421..ef78bce84146 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,3 +1,3 @@
 DIST xcffib-0.11.1.tar.gz 84713 BLAKE2B 6ab1ad6e582d71214cd719fdfa898e561e29d5750f5befe5c71173cfe34f2dff7dbd52fe93e618aab695646850f7ef5420114e2b1e725150c643904cdaba560a SHA512 09f4e19b88258446af26628c3a8e694c1f938fe3b5456e797b06174602fa0e9ef6e4eab76daccfd169d98fb7e869c910e6216d1f71fa2853e62b82c62c667669
-EBUILD xcffib-0.11.1.ebuild 684 BLAKE2B 4aa229f01fdb68e73f77ea92bfa21d41a402922656c2a6b6dba4d0c64cbfd8230cfff28c884f6a612b2af0dfb2d267ea081bfd32b08471116ee1957cae366a75 SHA512 fb4612ce2478dc9172aa48482a98a578f0171c60c8704f193b1e3197f641dbb83a7a7307ea9724e68e00b570c0f24342c8b380e3435073615eaacc1cdafb0d75
+EBUILD xcffib-0.11.1.ebuild 690 BLAKE2B c20a4835942b1815e7d09528ff2c6ff9839645524cd6f888fb551565fbe970af1c1ad50b1696880240975ab9d8fcca457dc6c5d52e4f92a05eb5dd19784b14e5 SHA512 360a1486788cc9f4bb742d5ac3c2b349680f65720e7d1c124f18ed7bebb46137fe92df86c5b9f8e9ea04b27a12b0c151e52d504642ecadfd5d137cb9e823d24e
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.11.1.ebuild b/dev-python/xcffib/xcffib-0.11.1.ebuild
index b76474023be7..cf9ab0a4dcf7 100644
--- a/dev-python/xcffib/xcffib-0.11.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="x11-libs/libxcb"
 RDEPEND="
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index 08f45758c3de..1568cec9f94f 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,3 +1,3 @@
 DIST xlrd-2.0.1.gh.tar.gz 368304 BLAKE2B eaf6dbefde00954452a96214c6a48e5d35526168445d15d721851da690bd99e53bd765a73495b00c8ee7ce243c487da0afbc6d6217abd7a5956820357dc97104 SHA512 b3e2efa216fc73bf55bb0b165ef63e797d16a00c62f0f2f2a2114d2db7204208f2623835697a045abe185f52c426ed5e9ef38a4f5f8e1880f0cfdf642af3c57e
-EBUILD xlrd-2.0.1.ebuild 554 BLAKE2B 106e1726b2f4020d91bd5e31a77df3d2ff9bf4dfb6e8082a103944c165aac2eeacdec2850dad37c9b24585be671bfd45910370d0cb4ab6d1018a342ec7fd7ee8 SHA512 d996490806069c9970db0377f5669c77394441ca587157570091a075211bc7a16697a128b205ff1384955adb02bb14bb7cc036191c76c457462f23c6e3706aca
+EBUILD xlrd-2.0.1.ebuild 561 BLAKE2B 125e1409084b87d614283e6e7b98ae27838dbe51a1e43dcf3b5099d6991f89bd6d825537e22b852c4a5482ccab787b79be8b5d2e73e0b97bded5e93ae9a1153d SHA512 8b8a1b8b04b66aa1c393c17e6163c5b0aa26dd0d83e5d4110dbd903bdab9e205addbff989fe0acae06167e2d7f2a86856e7167f7b6944f1e1f16c6abdea33b0c
 MISC metadata.xml 575 BLAKE2B 2c774bd63778dfc6eb2350a1744ae95a35e415d143bae22d9a9ac4430387d5f1cc9e7285a3d51eda6b115b564248a105b051633c1ebdd43e2a3be029c6a9a5d0 SHA512 4435be91096b2d966d0ea57f9d7ddbaf7e396b87bf18a4c0b54c4dbc9a2983e58705c8440cfde4812b372487a8b6ef4af0145f0db60479d35e1201ae525943fb
diff --git a/dev-python/xlrd/xlrd-2.0.1.ebuild b/dev-python/xlrd/xlrd-2.0.1.ebuild
index e8394a36d29a..ccaa55b06df1 100644
--- a/dev-python/xlrd/xlrd-2.0.1.ebuild
+++ b/dev-python/xlrd/xlrd-2.0.1.ebuild
@@ -17,6 +17,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 331a5dac818a..66edcc136ea6 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,5 +1,7 @@
 DIST XlsxWriter-RELEASE_1.4.3.tar.gz 34122578 BLAKE2B 7f9a9f2f9c7eb6f425192e30961d455dc348b51cec72ce4602b975c41cdfcbfc4e8d49efe62877d8f96dc6ce02320f64fa2ff55586a17d29cf2a950c9eaa9593 SHA512 38b12e3c6bd14122ea9bf652ef33078cf4aedc2be7ce8c3151960331827642713d25f3f9bff9ad7d375d251086e1cc58b09e4d77141dd2973c21a1d24c0b0dd0
 DIST XlsxWriter-RELEASE_1.4.4.tar.gz 34138048 BLAKE2B 159c305171eba27c66d3d9b9b1fd0e664f4acc572079c4daa6ac50c72e1e1e6016a93815b7de27af10b6e6653b02efb0291073284dabf9a6f15495c1f61ef059 SHA512 2a459e7eb924ef7475b7fed8f5689d4c2b2669a65d5f3e251a51c5e55cc8c4a545eb1d83534168b19c802740366fe2c4ef14c6c5850213fd690f01e42bbe4ca3
+DIST XlsxWriter-RELEASE_1.4.5.tar.gz 34383001 BLAKE2B 9a00ef80aec818e3b1c80000bdf0fe9dbb5b99ac04a5508ca23c6d76c56e31c94db0b5a38ef6d8345c6a5dc83175e4c79381877415f982fc7ec66d42efe8c80e SHA512 e3b969ef27ef24ce371c0a789a8cac6da4e8245ec349ca23ba9e04d5c2adf0a141f51596bd15117fc400efb9354a6730c4668f51218f0a08b312d25519a492e8
 EBUILD xlsxwriter-1.4.3.ebuild 553 BLAKE2B f3c325966e3b460ef97bb74a867bf6e4ffd10e8b7ae6298ff362e0a33ae3426a83328449cdeb2c853a5842b697cabbab5e387436bd23f06015cfe55ef3ff7a46 SHA512 ccc45f615c70873a740f9ad4203ed7322c913f8935dc48e4d9bab5ad7fa888d7967fd5bf950840ecdc42e5e46e7fa1e5a2ea8dae83e52438d823b931c7f96a10
-EBUILD xlsxwriter-1.4.4.ebuild 554 BLAKE2B 84e1db376b526b3cc358723a0ea1e4952d60b5f2d0e6fa1bb0acb3e255c46ab71dd0056c5294383db116c95f2581768bfc892a4478db42755b9b1b515c27d427 SHA512 5b73a73f39e9c8bdd573dd4bee060fd846cd9b807a4d11c6db7fd6e554819deb9ab024b8e2981126a5be74d57657de73e3a8a9932ac2f8fe191a3c88204d6e2c
+EBUILD xlsxwriter-1.4.4.ebuild 561 BLAKE2B 5e0db9c166c661747d859e3f765f51bdade87ae1bf8bee9e16cfe612540e42ea740206ad2eefe0bb7eb282d03918b97f9b00276d43a4243d72d6e8211f89c0df SHA512 a66af80092cfa4a5a330d4933894a887e96a0f389cbd8cb3227e4415ec7d71e20a6d2ffdf02affd220d7bff164a3757a2bf071f82724047a37565a3095d8e144
+EBUILD xlsxwriter-1.4.5.ebuild 561 BLAKE2B 5e0db9c166c661747d859e3f765f51bdade87ae1bf8bee9e16cfe612540e42ea740206ad2eefe0bb7eb282d03918b97f9b00276d43a4243d72d6e8211f89c0df SHA512 a66af80092cfa4a5a330d4933894a887e96a0f389cbd8cb3227e4415ec7d71e20a6d2ffdf02affd220d7bff164a3757a2bf071f82724047a37565a3095d8e144
 MISC metadata.xml 410 BLAKE2B d1fab95b5fac3e69c5303298385f65062b28934f22fe8db02db02753b5cae36137a3e02e1d38e3762933dc9297045e1efaee8d17c714ca7b22459f342f23f928 SHA512 4f3d74f5afdec59b8575446b444f1af36f71137c980f7790e952860afa98b2d128ddf8477b135715de2852b940926108dafbff3cb60f2f1a8825a02c415810e9
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.4.4.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.4.4.ebuild
index 71eaedb1ac77..c0f4419513c1 100644
--- a/dev-python/xlsxwriter/xlsxwriter-1.4.4.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-1.4.4.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.4.5.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.4.5.ebuild
new file mode 100644
index 000000000000..c0f4419513c1
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-1.4.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+TAG=RELEASE_${PV}
+MY_P=XlsxWriter-${TAG}
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="
+	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index b812af578d80..79c1bd7e40a8 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -1,3 +1,3 @@
 DIST xlwt-1.3.0.tar.gz 153929 BLAKE2B f0edb823201e477aca23af1edaa2a7bcf95aeb5b9b191f4d9a8be9e052d68699887cd829c2304b26334fb3e92d4a1fc1d0dbfabb477889a1295255170408715c SHA512 e09c515bda7edadb9624b842796a537316c1e2e06f3e74aca5440a5797dbc259036539fd64ea61648a30894f4091d3be829411d36e6170894980728c798c5963
-EBUILD xlwt-1.3.0-r1.ebuild 684 BLAKE2B 3d96b142de98d0e028720d75ea58aeffd34ae01fa0240a6499ab330c6e2d683398e96bcbbaf61aa78afb89cc8409c67f7367cd6a8d98e21621cc5dbaafdd6c89 SHA512 6286687c5d3df1a4c26c6bd9fec68a50e661c75da83d68110755e262c7939cf6bc1b02605d8f7cdc132d48ef915157562e9b38c622422e1a3db43fa5dd97f585
+EBUILD xlwt-1.3.0-r1.ebuild 690 BLAKE2B 84a4319924e248d8a91be90af8156006fa9723422a7993f2f76b437cc4ffa61c8f140afda90ade9a7df13bcdcf6568d0fcbc57c914c72ab172099bd8230649a0 SHA512 226190feba825885ec039a2ceb25923f81136740aacffa8161e630c60d42a3c7e2afc5be3bc2450afc06cde4cd02130d3fa926fe276787c6315b2f086878663f
 MISC metadata.xml 683 BLAKE2B e7fb3a5b9305f16f70a91d6c9b0ced04d0372fe5b02e0dbc2107a3a51a81565b6fdcfc7e7d63518ef682cd37c4bc9135203357350b33438340fcce53be9480a8 SHA512 b046e4cb9c128733b280809c6f702b5ba1a082ad83f67525d1cb0c4764a42412f680bc88c1331cd2d8647c671f66d1c0841d968b8ac68fc5e70d64939dad7a74
diff --git a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
index ea04e843e3df..803dcb932083 100644
--- a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 12569f0fa213..b8efa2b75068 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -2,8 +2,10 @@ DIST python-zeroconf-0.30.0.gh.tar.gz 64301 BLAKE2B ea0d5e36f3f012f217cbd4eeff0a
 DIST python-zeroconf-0.32.0.gh.tar.gz 115276 BLAKE2B 7084c02f989ebc6db6686b82ce3212158595b87e00567e4857e84790a30a2fa6f688288769d1eb118da485a6755da1ef404765070d26905d10ab45b1d95ca849 SHA512 6a612b39be85e673cffc560ea5bcc16facc5a16a370ff6edb1d4f7ff978a01d6ba249a9b313caca3b3ed0c6463a4914a98063eb89f28268cec1c9a2faa4db611
 DIST python-zeroconf-0.32.1.gh.tar.gz 116507 BLAKE2B 03de415620745b75cd43be74b724faf909aad9628175f18cf4b2c04245d02adbca984eaa861e807729f36caa3feecab913f2e4aafcdd9aac1af02de6eeefbb3d SHA512 cefcd1abdc3ca2b5ed796aee09e6826c0d0f54343bdefbf45c425d6e033542dc061c84fb4438ba53774d87c6516801c6e2196c1e6cfdd9dbf9187f5d8d4b1b11
 DIST python-zeroconf-0.33.0.gh.tar.gz 118002 BLAKE2B e5bdf8011777f46207c7f0aafbf4bfc34e704b59e01fcecd93e2ca05154f836bbe206688242eb37578a0e3b6d462de86944bdc81b96b0f3613eed21e9d0b6be0 SHA512 214fc1b25e1b900b6745f808144c0a1d94102dbc30f1e6ae49dfbfe2e75e9611e33d1341d192641be363662a0259aa340f52fe20fcf2bd5cf1611e823754186d
+DIST python-zeroconf-0.33.2.gh.tar.gz 118266 BLAKE2B e239443c778d24895a830ac8d4f23be5eeac701b92ddf945efc955a731cbce62bea10243f57a0929ad21c4444d32c37b0a9e23b53e734362b9c6b9ce85e2eb59 SHA512 9631dc348baf028794934d826a1fd2e874cf9039e6fb1c93a1b9a8e2a95ae436ab2fc1a955e2d89656c37a56b71075b578857f6de041a7e61ff55c7a62a2a7a3
 EBUILD zeroconf-0.30.0.ebuild 1089 BLAKE2B c5aebaa0b0bc8ecf9a809bd2964da3c822c87e5ff35ade028ed69894a277a0cac2f20438a616695275f94c3e32d9ae20ed53451f76ae490588f9d41309d37860 SHA512 986a489207ea2c47bfd3cc02ff53a48e3f3925f6326f1c9911d2da4adc3619c53e671f25ad024168b048b93cef39b43d7f155c1baa379d791e1f06abb97c0aa0
 EBUILD zeroconf-0.32.0.ebuild 1165 BLAKE2B 310bf2df5ace5e3ece81e42e764d7cca4f3124608287e674a308acef4060592f93c2c871c8140aafbe52e4b79d6340053b704c91c5fe227b7cf204cf3e4ae2a2 SHA512 fd1e8e11d8381cdcb38bde8d0da2b6971c3812ec90c389750ec7d23166fbbc8a379f3739c0bc60ac3b810b64e97eab0da41080ed2bb5e27b892fe003c3cb5231
 EBUILD zeroconf-0.32.1.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
 EBUILD zeroconf-0.33.0.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
+EBUILD zeroconf-0.33.2.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
 MISC metadata.xml 412 BLAKE2B 70dd13f9065885850c7c24da7e1a0825a1537e452213847e00d8af9977818d6bfcfda9c8f9e0d0b2241550a95d186432e0072762a1b77e65b66441812b29651a SHA512 28bafc2919fa66c0f1e532798ac40c537a53c18e781590881116440886d09f5511425f2cddee912e3fc63ef92ee1a9c4da0f7f79cb44dab6e5f51d62202de844
diff --git a/dev-python/zeroconf/zeroconf-0.33.2.ebuild b/dev-python/zeroconf/zeroconf-0.33.2.ebuild
new file mode 100644
index 000000000000..0e1b2943b16e
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.33.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local excludes=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+		tests/test_core.py::Framework::test_launch_and_close_v4_v6
+		tests/test_core.py::Framework::test_launch_and_close_v6_only
+		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+	)
+
+	epytest ${excludes[@]/#/--deselect }
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 9434910cd26a..136a561d34a9 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/builder/Manifest b/dev-ruby/builder/Manifest
index c862b4502328..76f63900d092 100644
--- a/dev-ruby/builder/Manifest
+++ b/dev-ruby/builder/Manifest
@@ -1,5 +1,5 @@
 DIST builder-3.2.3.gem 31744 BLAKE2B be970ffd29f146faea5e7a9d76fedb513ce9bde3ed21ed7a44fe7d4a81e3836cecbf62f3f4c19f0b1e333f607b8978d9c707f4af76613592e966cda7e537bd1c SHA512 7869f44bcf40d547846d50ab82234694420b2f38e08037ae671c90a7c3b547f11023f864e70adf82970fdddf7ee811730c17e30ec298bb6d1999f4c0c050fbb8
 DIST builder-3.2.4.gem 32256 BLAKE2B a2768fe25023631d134f062d8e7ff2aa25f6b4db0358bdc0d4baebb33d93673fca66049b8b9c42382bad3494f6e03cefdedc72d71958dff63d43eb7a2a187c75 SHA512 730317ec0a4af33e183283e309e38d47deb08db0ab6bd6dfebdedcebb7470bd383c6c1d32ad674adc43298e0f86930b97c652fff9827ca8890db2d1d68e792f1
 EBUILD builder-3.2.3.ebuild 849 BLAKE2B 9d7bd80ec5701eb1f2fe664e9b80df6ef0ee9319d2fde95f3eda430b714e6ee41ae7ae3108b0e7df02a34123603a5878e79c6645925bd8ebdd2a87116252b869 SHA512 5b764fc76d45cdc3fb799c07209ecead308e1892ca88820d99d120616f826010149f7a08d9c2a16fd94afbfbdd0988c50635b90feef7e70851c52337a6ffde37
-EBUILD builder-3.2.4.ebuild 816 BLAKE2B 02bd3df41075391dafe023b98bd4ccdb7c9904a9a195a6993e602db68b988ddc9219160b3c38159badd0dd267882b9f287a9bf6628cbd6fcb81e26ad1375af60 SHA512 af678dba4d691f4c10b855206e24aa35a3845a4af01e98da3f77825e303df6bb92a5bc1a99d53d3983f3891fd29869fba7dac8de42c86584840f421d866d9548
+EBUILD builder-3.2.4.ebuild 814 BLAKE2B 38f431f51bd43327d3148c8535150c827a0c011b79aa248e3cd5e1e21a58965ef0041d7d306ed65b41195434f9a42b33b6bde540227e50a9321bce762736a73c SHA512 41749e82f5bb4d460badd3d45a2a88bf7c947dad8eec78eb143adb40203dfe1af661ddd62ad32b5a96d3ff522f177a4b9b7a936b703201263cac5fe2f972a8e0
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/builder/builder-3.2.4.ebuild b/dev-ruby/builder/builder-3.2.4.ebuild
index 442787e87876..2c2296a1422b 100644
--- a/dev-ruby/builder/builder-3.2.4.ebuild
+++ b/dev-ruby/builder/builder-3.2.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://onestepback.org/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/css_parser/Manifest b/dev-ruby/css_parser/Manifest
index 949fad6b7678..0687e3fafbbe 100644
--- a/dev-ruby/css_parser/Manifest
+++ b/dev-ruby/css_parser/Manifest
@@ -1,5 +1,7 @@
+DIST css_parser-1.10.0.tar.gz 38843 BLAKE2B 8b611a270791e0f1e0b69d4ab0df3c119fc3f2631a7bcebab1030939e61d2799acfce0ca9f9b634d813c47c13a6c698f9449918fab1cdfb5aa4b14674b749c3f SHA512 979855df651ab56da5736f6646f4b4f0be5718899c4f81ae514299566e874d2f7b414d87616e5fba7390730bba1f20966e01641a47dc2cbb3e20fd7536f38580
 DIST css_parser-1.7.1.tar.gz 33667 BLAKE2B 5732461958bb3abe7578c3898bd80c601fc957c38b3feda5092d89c4419cd64f0c6e4be296919c07bea5e9082cb03f32bfe9255244b56206caa7bab8e1a29765 SHA512 f1dba16fa18362e1b58d463a1f718c4c981170f3a7b0b719e5a309b74decded063cd3631540a4b76c1d78e5cfa92a35b56130979d7724d745eacdc372c69dd9b
 DIST css_parser-1.9.0.tar.gz 38201 BLAKE2B 6d2042429f7347613b14649e7c205e88a26dec9759a1634a3805e79e3f8599ab6b1ab2c4283dee631476e16580f447c08cd41327a62c813eb006a7e435787f9e SHA512 79ff06b471298f2fe82b096703c828122f1ae778b71fcac3f2eea1e243145729d3871c21eb1714777a2648ba91d05b9b973691b5ff41b2361eecb4170d3a2601
+EBUILD css_parser-1.10.0.ebuild 1112 BLAKE2B b7f3ad5ae3c5a80ef1886a00100aaa9d680bcbc0f85435bf3264e2bd129dec42b0f85944d4e187ef6723b102d8959b7ce5fc6d72636b2631d225ae15fd849b5c SHA512 25f3cc53415b8bfdfdbae8bbc6652244c47956e30e99d2b8b479e4cd94dfd58b98ed10841781cd8a275af72d04a8b6ffbd2ce10d4bfa9117384089b37c01a5aa
 EBUILD css_parser-1.7.1.ebuild 1119 BLAKE2B 998514f91ea75cb3410ef97c5200316870bea664762eedb560b594d541602f346e3f5316e7bb8703c81128965cb6e575cb4f5058e86b81c89a2f99120170a478 SHA512 a1b2a1d7af2da57d971a5a516e5ef1f4cc3f4dd89fc6ad8bff9f13f1a0a9d200963f1d318b57a59b7f8ee7f37a828a4fc0185e60d114b5c908e83c39d9f7e19d
 EBUILD css_parser-1.9.0.ebuild 1119 BLAKE2B 32205500f9a21e427021275371a82d32c447757c15328dff480efc85065dc41a4ba23b1aa4de281b9db5c48cc85db136f527940eadd8d0f41b24cb8e9753d4cb SHA512 b059adedb08d019516b75f8fbf789f0cf705566fca2e1198206244eec20605ad296f808132470e476bf93540d7b939edfb6c799c89ea756ee6b30bc9c247aff3
 MISC metadata.xml 346 BLAKE2B 982f54d9e88f4c45c010fa2ba5ed692af66ecb29b8384cf99075c8d919188a1635c9c50c5fd732ff20f204c0277ec85f2a000c4367d9ebd868c6f0e2ff48a694 SHA512 117b856fc53e92ff3c62ba01bc1e54f33e5f02c688aae98cb2754485094bb9f01dc3255ef05864bb944b01c9e8d37b7b622de42a38e4b9d8de893c16fec78d45
diff --git a/dev-ruby/css_parser/css_parser-1.10.0.ebuild b/dev-ruby/css_parser/css_parser-1.10.0.ebuild
new file mode 100644
index 000000000000..e2ae1feb1af3
--- /dev/null
+++ b/dev-ruby/css_parser/css_parser-1.10.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_DOC_DIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md "
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+GITHUB_USER="premailer"
+GITHUB_PROJECT="${PN}"
+inherit ruby-fakegem
+
+DESCRIPTION="Sass-based Stylesheet Framework"
+HOMEPAGE="https://github.com/premailer/css_parser/"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/addressable
+	virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/maxitest )"
+
+all_ruby_prepare() {
+	# get rid of bundler usage
+	rm Gemfile || die
+	sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die
+	sed -i -e '/bundler/d' test/test_helper.rb || die
+	# Avoid tests using the network.
+	sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die
+
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib test/*.rb || die
+}
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index fb5226af0cbf..b3086cbf3240 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -1,9 +1,7 @@
 DIST did_you_mean-1.2.1.gem 20992 BLAKE2B e8827b3f6797145c1adf5fae2a681ad8f437c1dfcb746465c4bb0c59f61285c2f2a65d5e31e2a501da812baf52a2f1d78b81c2d74a194d7309778cece56c1752 SHA512 98a71ad3c4fe92efec50575e26723cd3b5c60b25cd24767a7aabdb4e2b343b131fe3677367c78995f07c513d39d47984af80bde0ec2f6aeafcb34be97f134b1b
-DIST did_you_mean-1.3.1.gem 24576 BLAKE2B 939dc676dd7ba5dc4b64e5796b59e2901b36e5b9e1d4ccdd8809fdd008a82377c6bbd35b8677fa273c2196615ad3b7a09cd3bb57267ba2dd9216f13cd0599aa2 SHA512 14e672540a93bcf89fb41e27cca31190f9c621c5fb669256a26ccd6c1042437a69911b7ee886305b23fa94fcd0979188b423cad88f87b0adbf6c9437ecffc84c
 DIST did_you_mean-1.4.0.gem 33792 BLAKE2B 9052b7ba7028f963595eeb79e668296b48db8659bd07c6e00076efc372f6c64eb3ad81981013bf0ae3c37b942a459146af96fa001ba225ebf1f5486d717a7a55 SHA512 bd8e47e5d0135807d1ec0a5dbf536649cbaca13fd056cefc6f57293b7869608ef92a8cdcbaf4a4c4453738ecbe8a6d8bc450826a8dadb46fc69560ed05a97f2d
 DIST did_you_mean-1.5.0.gem 34304 BLAKE2B deefea833d1fe12733a6b1422e5ae43d0cfa7ff7ddc49665762a83866634ccd0a440e5a3b351cff6d9d308e85de0490d56d7b675d582f090e0e4fb07186c197f SHA512 7fa4cce3fb895bf026788bb5d558f88d4ddb62b7cae1e284969dc4f0570e88871d5f103514da2c9d79399dcf10ffc845a594afc9c676e90cbca4d5a38d74d7f8
 EBUILD did_you_mean-1.2.1.ebuild 654 BLAKE2B 10c32d22dd810f1b31670fa83421136e2c00d865abd3229181951737587ce47e7d3df774b7ea24d2da6f705452565ba13ba48c8003afe831325a192c49b43553 SHA512 ce3a72256075206d39f1b909127d48e3e67a9d39e0a19cfbbc58eff052eb4d180fbab1bf85a2242e76f400511f3cf972c11339dc88c92697b5bb9df1e3481de8
-EBUILD did_you_mean-1.3.1.ebuild 662 BLAKE2B 3883bda20b269918ab5f29944edb3990515fa92d88d2f424cde835eedb2abef59351e964ca448e565379cda95537ad5487a533cf5cd5c03f86878a1e9ef83683 SHA512 92cc1be246c7b3bc39b59f51f209aa84d3578734cd34c7a2690294d3600de749f277a7730a1fcc345a26421aba131e7a70e7dcc36f02e4ff0d0b0aacb113e9e8
 EBUILD did_you_mean-1.4.0.ebuild 669 BLAKE2B 5486983f1c62524241b10f81c1276c89548dabfceba67077b12d40f5eb2bdfb853da72c7fc7493a0ba4fd93f4ca1b166c3e9901c24712b69fb2d7343a2c641ea SHA512 f6f3a2a0f57c11028ff433dc10cb4cd3573219d9fc2801eacc660c144aa0f3704f661a067a4f383a2a6d0498bd7dfaea399ac8c015e9e12ac5fbea6c0669c33c
 EBUILD did_you_mean-1.5.0.ebuild 691 BLAKE2B cce861947b4e1ae7a3a99ad21590ca07bfd6d0a4a67cbcc4390f47692fac04c63da34250e260ef4dfdc5d91d54d23ac73a65aa69efce9947d0f743721e242672 SHA512 50c333eb63aa54ec4e5cf4afa0eb3bf7db6792d3ab607bb7dae5e258e4dcdbbfac25fda84e26be342ae8a6a43e3ea263f4baf2ab998d47e43b1f4b2f77ef9386
 MISC metadata.xml 345 BLAKE2B b3764e5648286cb66e03f3343a41b460ea2bb24f51e1c25e89e386c2b16769c9b1f88888b1e10b2c2d0a2346659195454e4ee8262aec0d4a9066795759cad053 SHA512 418114238e3e2db16ebcdd3de5213b3bc0f0a45ed719de1be60cb19015966cf39912f38d0858e22aa6330ac2e7fb58a1452e9623e7559c26161d70e0f29e66cb
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild
deleted file mode 100644
index 0abd9bcee663..000000000000
--- a/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="'did you mean?'experience in Ruby"
-HOMEPAGE="https://github.com/yuki24/did_you_mean"
-
-LICENSE="MIT"
-SLOT="2.6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest
index 50bd2314e0dc..fba067d0e941 100644
--- a/dev-ruby/domain_name/Manifest
+++ b/dev-ruby/domain_name/Manifest
@@ -1,5 +1,3 @@
-DIST domain_name-0.5.20180417.gem 124928 BLAKE2B 56c8852c09dfabc2291a08d89b4dbb6c9c9c3aecce40fab2a176e2183ebd7b793a6677256f417b0c9cb6cd61680a738038ee2d14e4d15d9ab5a952d666014d27 SHA512 e960aa4445e19ff3e71825d94f85519ec9b1600dab64d139bf21208aec6fe1dc279e9fda6c64fd518ab22783464ba9a4d43f20ceb7699daede981cbf7d5e1876
 DIST domain_name-0.5.20190701.gem 131072 BLAKE2B 86ee60824d9480e71535312fb72c192f3d88326c72539b833132872ff15298842f09bac612e9c3d8b87a3ef6a60459b14e777105613fd76da79757d6a30abcbc SHA512 445f0e8a377bb700f8a3b926970f4351d28759e237947d6c755afff52726141c6b821b43b2a761d4d0d6237969304ef749404a5f383f69710b04803410dc70aa
-EBUILD domain_name-0.5.20180417.ebuild 1085 BLAKE2B 833a8ffa75628ed055bccdcd1a554c1f1157f22014ca87d788051970c59d3c45ab82869bd6d5f7b94a30ac19b7ba719afcdcf11df13f64e0b2282713e8ffc391 SHA512 87517d67c3a616102f14417c80c0a9a59f00a6694397c020526f13dbf9f0d7009486bc4aea224bcdb80c7c85974f94728b75a41efac708ac5ddfbeb63b5057a2
-EBUILD domain_name-0.5.20190701.ebuild 1080 BLAKE2B 020faeed5e8d645195b1d3116b04948eb45164b8d5a5ace37f3d16a1b10b30fbf3fc187fe543a154a154b257313ec5a4aa17e50f347ba1404f04fa26e8fe34b7 SHA512 fab4de576a80ba1475fe5c1d6771ccf0b1d9dbaf4471dc71b89f5bf902840db04f98f4198ab545e28b07ca773a46e2689ff1503793e6e0046f67985f134acac4
+EBUILD domain_name-0.5.20190701.ebuild 1078 BLAKE2B 57bed4b199ef3b682f26a7a90d7a15e6bd25cae2ab5557cf118ac1cd577eea76f7ddfb9792c8242f42d9f958659ba1dfda8474faf383f5d790b8e137f472884e SHA512 b9e7248de7175846fd37a2537fd31d2f12a81e3899e637fe1a7e1822f500ce8cee800e3a7ae884d5f9ea51717bf239cc9fc41285c38a151610ef87e3e3bdd5ac
 MISC metadata.xml 346 BLAKE2B e97527fee7fa9d73d77ef7a9e9325c9017fff3a9912fc76c74b76f5c4cf53aac583157ff02ccd5a969882829c1ffc4f35d44cb739497050a59402f88b06de2e5 SHA512 f9b3df47565a7827242a16355e01c450977cc12b7c0cf091590b1f642f5c941e2e3f4f14af66fe2975ffa6f7d53c3385ae2a87ffa666c1c1b7f7356f07c94830
diff --git a/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild b/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild
deleted file mode 100644
index fdb281a7459f..000000000000
--- a/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Domain Name manipulation library for Ruby"
-HOMEPAGE="https://github.com/knu/ruby-domain_name"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.5
-		dev-ruby/shoulda
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ d; i gem "unf"' test/helper.rb || die
-	rm Gemfile* || die
-
-	# Remove development dependencies
-	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on git.
-	sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib:test test/test_*.rb
-}
diff --git a/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild b/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
index 10b318c2f29f..025f75c5078b 100644
--- a/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-domain_name"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index 9519943381e7..634f438cdc1b 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,5 +1,7 @@
 DIST gruff-0.13.0.tar.gz 20027648 BLAKE2B 53a21a99df834d68ba3100111bb7141bc8aa4fd861e5ca2bd963882fc15c1778315b63297ce12ecef19548791c2d573254eb8e38fd47b55092889f82646a9ed4 SHA512 6c2e1c484c081f67797a073d33e4774f484d2e2c27f9cced2ebccb377e806669470f2be23070b9d151a8a5cb1af01ea92dbfcefa5f79bc269a18f6523807b1da
+DIST gruff-0.14.0.tar.gz 20193671 BLAKE2B b8cdaaca71c5b034206c4f88b1e50e09f8d9c5a3227eaa59a5c66718468ffa643509acfe8bd6919fd012a50daa27709569c210b030e25207c17a0ce13b60616f SHA512 e3c3acbce0888698e2aa92b8e86d2ada5499f394d100209b94ac4284f05a6a4f64c2bdcce91f76be7cec860d0546ebf5fa24aab73b51c0ca9763dc07855c8a68
 DIST gruff-0.7.0.gem 318464 BLAKE2B bcc51f524089f53b89778143b444c70d4e168983edda247cdb4c9c84c288450154ce6e5234bbf7a0a8ae7251df611333c8bb411a8fd3765ccc5fe9650c3efc38 SHA512 b9842213ab3da7b4eccf8bd06e18d62aea14a6a15d7c45ebe7e51a76acd456ce140f094a9419d4c0bd1774e7d203bea49f9c39aca36c75d744f2732bcde9f688
 EBUILD gruff-0.13.0.ebuild 1608 BLAKE2B 500779630786842908dca5c04da966577ae3894636fbb61d65269ae84e80b63caf338e17b16a856404aa66f1fff0ec9a914c89464c0c879d3753c774f13409ed SHA512 db58b519acdc8e9d51b19b25de60e3fc72f4e8318543a4deef6e07471701687d4c8da6c3924abd7694096fce62dd2042816bc5bdbb502e55b81a8531ac3db73d
+EBUILD gruff-0.14.0.ebuild 1601 BLAKE2B 8822890956ca790928e7ab0720c59b1650a9124ea35925219e5c36d3db0a57540068a542dbb238594c48e4b4bf01e51f87157b6a48c5fea39378591264506562 SHA512 5d12bc356c34e36641cca36a84a70e619c1d809c9102e2676a0ed1ed13d4e5f7677d053a9b3c206bf1b8afc36d8a598dcd8ce41ba0b66deb0838ef8faf3dede3
 EBUILD gruff-0.7.0-r2.ebuild 1448 BLAKE2B a177b6d58f8fb977308f86fa0372919d90cbff9be96d1a1ffcb362c1faad11aa0d423d7894ed8aab312bdd22f6dac58506401de873ffa18de704111fdb08092e SHA512 4790cde6289b55df95aa2ea410c7aff604b45b5056d1251c130e87939d0a06f6ba2c15c808c1920246fd5af6af5559a903e569a12c5858a2476bb155aafbfee6
 MISC metadata.xml 340 BLAKE2B e3adfc25e09939c98ba4a4323afd0babccd4b0c11ea712e93a454ea4d3074f12a895d674735f8209598336a1d62ea61d6d00c8956a47cccd583857c36f261ab7 SHA512 1136e2805ed73f18bba2c981e2788fa635face71a9b1b384e3dc20680afd4fb354f33ac099077568f7fa1f3510e1c46771f663341153ae64ef961508243c16d6
diff --git a/dev-ruby/gruff/gruff-0.14.0.ebuild b/dev-ruby/gruff/gruff-0.14.0.ebuild
new file mode 100644
index 000000000000..d8acdd3d1de3
--- /dev/null
+++ b/dev-ruby/gruff/gruff-0.14.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
+
+RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Beautiful graphs for one or multiple datasets"
+HOMEPAGE="https://github.com/topfunky/gruff"
+SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# imagemagick is an indirect dependency through rmagick. However, for
+# gruff to work properly imagemagick needs to be compiled with truetype
+# support and this cannot be expressed in the rmagick dependency. Tests
+# also require imagemagick to have jpeg and png support.
+DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
+RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
+
+ruby_add_rdepend "dev-ruby/histogram dev-ruby/rmagick:*"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/\(reporters\|simplecov\)/I s:^:#:' test/gruff_test_case.rb || die
+	sed -i -e '2irequire "date"' test/test_scatter.rb || die
+
+	sed -e 's/git ls-files/find . -print/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	# Skip the image comparison checks since the images are not
+	# pixel-perfect identical, most likely due to the use of a slightly
+	# different font.
+	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index 72016a1036e5..8fd8a22aa794 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,7 +1,7 @@
 DIST loofah-2.10.0.tar.gz 70379 BLAKE2B 1de980e181bfb0c6fc8c98713b01aaedbd5d7bc7cffb30a0b8f477ee0e475c255a8e14d9b54254d318b569ca4327e78a6b42c73f765c7bafd8a265f083cc4449 SHA512 c51e3981b4f4f2d93a1e8817c86df57c50818b0a0589e260fb4208b34c69f08b270ea399999e3354c4c15b670bbd3eaba6b3274e4f4d67a8c97fc99b28bc8ef2
-DIST loofah-2.8.0.tar.gz 68844 BLAKE2B 52b5b5c7a70939069d84d0f66c4262e456d2ed81ab4ef2541eceb9068ccdddbb1c7b470ca7504700f6f66d4aa4507b9edfd4720c1302f6026008c10100c1fecb SHA512 a9d7c21be733e1aab8353ab7bfb3db14d47e8da2c3f20eba11d0041b782e4f2cb82865bbd5a2a9321aae7ea04089f6a5fd1bd3119cbfe8a00c2ea71a40cae53b
+DIST loofah-2.11.0.tar.gz 68865 BLAKE2B ebd89f1aaa098f93ad578cbe1c028cd8805ea9f367a562382fc4cacd3d08640c539877c86de6b02d3ae2d7e451247b709664836708ca84609b0b6403085d3703 SHA512 9c1ea70894b4cc22080d219abc0282d4ea2d9f9214c857a93bccf3a99ebbe3fb011ef90b100916891cb16def52dac7db189ad9d88015e2efa7b5bf8d533b9ac3
 DIST loofah-2.9.1.tar.gz 69652 BLAKE2B 76bdd6c1ffda325314eb28c4bea6e5c8b8a69c3a7e9a661f328507a523ca086c2caf14f58b2e83cc2213c072342176bbb2de7be5a68d68e54675f30e81657b92 SHA512 625c38de7fe5fcbd8e3fb01aa7aa28560e7f3bb4e5354912bed072bd83cf35e824cf84e491155fa44b50ae418c46a187f02d4f605062abbfde05653d022bb663
-EBUILD loofah-2.10.0.ebuild 1210 BLAKE2B 00d5047a436e60e1002f0713bc37cd12fdc5ef80732db380f04ba38cc1e781187c163bfe367b837eca626baa7a504e58067093724e9de6ee1d56c00426dead93 SHA512 5739470fb231ac6ed1bc81de8f4f5881cabd1843cc0412bd86b7467d9995ca71e4d7cc7f0528133b7c73bc95b1b7bb2ea4c332103346f0574f0090c169ace863
-EBUILD loofah-2.8.0.ebuild 1202 BLAKE2B 9de000a066c830aaa8b960a1b79735a824c651a7a2d5f200463f30b362b69c14d18b9dc9d9dc62d30d4e9a05e69e44ec14b7203bc71ef00a14396a3adf885c37 SHA512 0cd53bb6da0b4d83abf2c9d83469c8da6f2d31190e549efbd42a0069499037fd858b6bca161595f25585b380e0ff0c308101e311b8a1804f076be34608b7109c
+EBUILD loofah-2.10.0.ebuild 1209 BLAKE2B f5fad4bd7f94e8bdf175fd3efbb11c93d797aea3ddd52b07aac98f256d106a3db9befd5ea6fed58bfed2f3e928d36183b085eafe0451712037f637ad40382b7f SHA512 515026baf145944c116e3be8ac87d052b72d0b7545980b8493d3517dd1f66e20fde9523ce0761f72e1bb5c4b4fe7c4cbca8ca5e88faa4f242de1a66f3a53c045
+EBUILD loofah-2.11.0.ebuild 1203 BLAKE2B d0ba039332ebca7b758a12cf6b0cfb569531176590ec65f4ac1e00e07e21ccc0817536d5200c04943075ddf6a1911544759222bb90f0f0193abbdeff0beb7e0d SHA512 bc7b493c2e8570fdb68727f18ccdd9a968303aeb38962382c4bdc9d1066d710a1af3dd695485b9700c350e7ffbce7478c9befdfdfc591de4798acdfd37870ff9
 EBUILD loofah-2.9.1.ebuild 1202 BLAKE2B 9de000a066c830aaa8b960a1b79735a824c651a7a2d5f200463f30b362b69c14d18b9dc9d9dc62d30d4e9a05e69e44ec14b7203bc71ef00a14396a3adf885c37 SHA512 0cd53bb6da0b4d83abf2c9d83469c8da6f2d31190e549efbd42a0069499037fd858b6bca161595f25585b380e0ff0c308101e311b8a1804f076be34608b7109c
 MISC metadata.xml 344 BLAKE2B a3f2ff5b2aab094581e9f6a3874fbc35fde908d210ea6fbe3643bf8ffcae21de206d0d6afa5055ef3f9dc520778aebfe182dc6018bebc19b075e717278b7babc SHA512 dbcf17023520a30b8d578f04db73d0a67851199b31589473c9bddf1d82f6096d78369ce1b943f05cca904f1bdb2a09adc605a3dc5d8d4e64db5df152b89dd843
diff --git a/dev-ruby/loofah/loofah-2.10.0.ebuild b/dev-ruby/loofah/loofah-2.10.0.ebuild
index a9bcd9d282cc..75214f53541f 100644
--- a/dev-ruby/loofah/loofah-2.10.0.ebuild
+++ b/dev-ruby/loofah/loofah-2.10.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
diff --git a/dev-ruby/loofah/loofah-2.11.0.ebuild b/dev-ruby/loofah/loofah-2.11.0.ebuild
new file mode 100644
index 000000000000..6601637f3458
--- /dev/null
+++ b/dev-ruby/loofah/loofah-2.11.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="loofah.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
+HOMEPAGE="https://github.com/flavorjones/loofah"
+SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 )"
+
+all_ruby_prepare() {
+	# Fix version in gemspec
+	sed -i -e '/s\.version/ s/".*"/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid unneeded development dependencies
+	sed -i -e '/concourse/I s:^:#:' Rakefile || die
+
+	# Avoid test failing on different whitespace.
+	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/loofah/loofah-2.8.0.ebuild b/dev-ruby/loofah/loofah-2.8.0.ebuild
deleted file mode 100644
index 50570d6e95ff..000000000000
--- a/dev-ruby/loofah/loofah-2.8.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="loofah.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
-HOMEPAGE="https://github.com/flavorjones/loofah"
-SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 )"
-
-all_ruby_prepare() {
-	# Fix version in gemspec
-	sed -i -e '/s\.version/ s/".*"/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid unneeded development dependencies
-	sed -i -e '/concourse/I s:^:#:' Rakefile || die
-
-	# Avoid test failing on different whitespace.
-	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 607a003807f1..608d7e47c357 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -1,10 +1,8 @@
 DIST minitest-4.7.5.gem 57856 BLAKE2B d0ecb0a0693c35ebbda52e9c755b72f07e38d6ccc266312a3426f9de3c40165d68bf07d5ed162ce51e31b1bb8502dc844fe61d9e93733108501f156c3096af23 SHA512 7ea0a52d37f4631fb8b11d4389da2123e4207093f7b34c497fced8729c9086faaa35e997debdb53b694e05eb52b16e843960f0b54515c32207f87161a76c3851
-DIST minitest-5.11.3.gem 79360 BLAKE2B c348957e094bd91e88c6dace522b8e88c37ec435d58b4f6f8c8b458cfd26b789cb00cd43fa9d515112a8f3c9a736756d59c46f4117d1c1948d08cab0a5eed6aa SHA512 387537aff51f8e8f9cc2feddadf6813d11f0ba623ae3d5929d7b7a88e180b60c961dfa1d2ba0f3a4ad7d2c1af250245376fa62b23f68c8b57812c7e86efba0c7
 DIST minitest-5.13.0.gem 83968 BLAKE2B 90f2bc20328a5522a51bcfee94d69e6fd03189190a04ee77499d574531e95b8f8b6652cc51a5917e51920f58c0f95465c27c5d69bab7aba01e02502ccf72ae38 SHA512 bdd0d665cfd6f6e36dcb1f2f069f5154a468f68eb4c41f5c39e3a3397644141d5e05024023b20fafbceb983b019b00a0ec6da98432f505cc8fd1cebc11cc1fca
 DIST minitest-5.14.3.gem 84992 BLAKE2B baad3e8198bcee1b2748f81a7ea822785423c2bfb07130397b2c21993c686aa6edf58811cd58c4c9685b63b8a7373948a0aa2eacb6b02383399847edbad5deaa SHA512 2aadb99c5eac8d29c78865f8ce3fae51f11c2e1dd17157b6d0c6684733a3b870146df16fd26626c6f9c56806422e1e2457208afa1c69238a2bdaa4a859c23645
 DIST minitest-5.14.4.gem 86016 BLAKE2B 1f7b8c72b41e1f4e47852021dd99df411a427ac8bbe564a2b86edbb727a4976030176331442a3a44f734347cc42f80444f8d3937e561f0063ec6bb3132d4c402 SHA512 f967a11cfce82e167879905082859273b270e8d8e663a0c1c553964a345fb8564547627b8cf97418ac5bda544bb76c1385438ad74ec8e846666dc2952d55c9e9
 EBUILD minitest-4.7.5-r2.ebuild 856 BLAKE2B 037aea7db96dd5a1527932f4ecd421ba48d039124492e2db19e11b09b5402cfe080555733097f5bedb1c1e6742af47e2b200f6174efabcf9296a85ce4f97da5b SHA512 6b6aa378b9321e4b4d8899ae1483630f10eb1fa5b433c7a7571d9c78f8c87e461296e0f058cc359d19df0b3e6b01a142a40c620ec7a682ba8f188709f2588bd9
-EBUILD minitest-5.11.3.ebuild 752 BLAKE2B 48915acc329f6639fc20abef18e420a51d3d76087e642cc8a58c55caf5a5f134d7690ecc60702890f598dc51eb8208092d179c2f2d1934e1231e8d1f1789a17a SHA512 7b44b8c01f1327d50acb399260575cac827ebfa3ddd463b582fafdd8197957d1225f9ca3a00355bf94b3930f0d10a95ece0f9747857cb011ae55a34f9f8c5c72
 EBUILD minitest-5.13.0.ebuild 720 BLAKE2B c0dfaa029354a66dde23b3cb3fb1655e88cbd2d1fd8bf97bda8573e003aef8980e95ca1b38da252687c465dcc8309d62f5ac5ca7a5656971a559c9208dfa8ef8 SHA512 09c38e025fe40616270f14f05a7716b3a1c703d2d504dc3ff612f38403874f54e927835fb769b8c80c01c27c03f2f4ca7e6bf72f72feffbd585cdd6009ea257f
 EBUILD minitest-5.14.3.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 EBUILD minitest-5.14.4.ebuild 735 BLAKE2B 22766653091e002fa662a279753ed8ebe22283ccab1156c7ddb503864f41251e1e83270f00dc5efb0496ffe0165b37add6318ae65cc04b2fb0ae2746aa8ebef2 SHA512 9fc9d5bcc391cdf6995995bfec88f39e91e23838edc4c041f17ff1accf667dd5a34ce91c36b0fed0a05f98713612fcfb4a600a45c3d857e981013d4dba43d74b
diff --git a/dev-ruby/minitest/minitest-5.11.3.ebuild b/dev-ruby/minitest/minitest-5.11.3.ebuild
deleted file mode 100644
index a12171d5a2c7..000000000000
--- a/dev-ruby/minitest/minitest-5.11.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index db8705fc0e6e..cee0476b6f6d 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,8 +1,6 @@
-DIST power_assert-1.1.5.tar.gz 17326 BLAKE2B bd5e0627b681ccebc546a8b95170a3fe20ba919ff19405552e47c8e8f7faebe0c638a71e303e63e04a88b7d48a6ccd3e1117fea863275abbd5182d66e9634db1 SHA512 bc1f98b9b8c3ac327a744a28c54c747177eef187cd998778244f3dce59d2909e94960a50179552a9a687b973bcef49f26fffa67d75e9b3b92ea9959d40b93298
 DIST power_assert-1.1.7.tar.gz 17361 BLAKE2B 54fe379af9231a1794534f0199bb587418ea6d0960f7ae5cfc3a9c484c692e08254b5bd7220120559cc1b9e6f1b85c73d0e8e58c115731faea72d70180a94336 SHA512 bc6649bf17f41f7c84611eb334b73b43a0b7c3892a46acb82ae7b43dcf43b7a556ad617a6806ce1d354796bc694cea9eef7cc47b1928102f1822a03e01160a35
 DIST power_assert-1.2.0.tar.gz 17358 BLAKE2B 8b75b34f5d80f8f52370816b916e3bc3a60493b8f52a910346c51c70770e0645566b8b7c3dd551d8bb1f1cbdac5dfcebe043457bd025d819e3782e75e41e0f16 SHA512 2f001f6223fc3fb586c7b0457f775379040e11eb83b5bdda51c02b2b24e531aecd6e12e6ec80bf9407a768ab1a10b0a6b4c8f1a92ca69ea702faf56202bb635c
 DIST power_assert-2.0.0.tar.gz 16994 BLAKE2B 5106e77566100274000c55af1bd2ff9aaf00185ed1821ac966587461919210d7460e30aefdb5a880e7ef59e4f536121371d0862df2af91cb274ed79ded8c9771 SHA512 e6faf3cf50d2c70ae421bae20b885ac858fe11b10b1a8562d9ca88afbd397fa4812631f2aa02638c273eed518091dfaa020b6c002c0559383ddca625404bcc1c
-EBUILD power_assert-1.1.5.ebuild 1412 BLAKE2B bfcc18a05ad28ce098e70a7d936b336630a1135cf781e36c8d533502cf1e55610b579c32b52354736d8de18a583a3d29cf0efb397764d74bf1ad8094230a6259 SHA512 c2fe441390ca188dcc1be729f558e8ceba61d4b2f2d820e2f29b06d55d72abedc293d839c782aab017231d692047cffe0a0924256efdd9b7bc41fc1d9ee88972
 EBUILD power_assert-1.1.7.ebuild 1412 BLAKE2B bfcc18a05ad28ce098e70a7d936b336630a1135cf781e36c8d533502cf1e55610b579c32b52354736d8de18a583a3d29cf0efb397764d74bf1ad8094230a6259 SHA512 c2fe441390ca188dcc1be729f558e8ceba61d4b2f2d820e2f29b06d55d72abedc293d839c782aab017231d692047cffe0a0924256efdd9b7bc41fc1d9ee88972
 EBUILD power_assert-1.2.0.ebuild 1418 BLAKE2B 718d355df9a75002823eb6ef8ae10dc4ddff649c314be77db00252a34a7f5daf95a5979195f2fc3e8d7b28ff3af86ce4bf9b2e5d5faf2484ce3eec325a7843fa SHA512 fb221535b77d9e84daf56cfbbbbe5bc9d05d0ca93c68d2d9bc6b2a09023f7eed2df7cce5221c5c9f50b687f97d29b78f079b5ace1cbe17ada16b6bf8507362f5
 EBUILD power_assert-2.0.0.ebuild 1423 BLAKE2B b7d1caae6dc82831297e1c9835026b190a5aa4e6e9c3f5a166a934f98d97842987985859d95ec66c876a6882583535ed02756b1efd6ce1b06c46abb9e2a73f2d SHA512 eca5293de390a9efd26e01439019c966213f40a53f2770159f52574dc4176d33f73475097181f3c3c2cf4526f530c79bd8ec8b365ea4acd8a50aafb19b135dcd
diff --git a/dev-ruby/power_assert/power_assert-1.1.5.ebuild b/dev-ruby/power_assert/power_assert-1.1.5.ebuild
deleted file mode 100644
index 1056c61f570d..000000000000
--- a/dev-ruby/power_assert/power_assert-1.1.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="power_assert.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
-	sed -i -e '1igem "test-unit"' \
-		-e '/byebug/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid git dependency
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid circular dependency on byebug when bootstrapping ruby
-	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
-	rm test/test_core_ext_helper.rb test/trace_test.rb || die
-
-	# Avoid circular dependency on pry when bootstrapping ruby
-	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
-}
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index 62f9f96fea5e..a525b2b95fb4 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -2,7 +2,7 @@ DIST racc-1.4.14.gem 116224 BLAKE2B 67abd0e9bed46d7c589c62426943c8594d3b119328cd
 DIST racc-1.4.16.tar.gz 451711 BLAKE2B d3bcb72a69df255d5468054541c281bf7bd3225eb3ba1997fccd6dcd219d3a8890e3df7b43fe106ffa3fc63a8d8079cab83e7096b0737f5bbacf816b7c3bbfb2 SHA512 7cdf6a62449e8f39984a8b27706045e509828a93a72d112b22a4c467184a63ee23b4b2048ef7017846053fb2ff4021aa43d96a6147fa271257df584ab3d66f38
 DIST racc-1.5.2.tar.gz 434903 BLAKE2B cfbaa09c1b2e233e82228075cf979c54688e51e702cade072d42b2952100b74a53e536d904cbbf15cb04ffc74018b48e5b27a5773adf6240614c815250d47119 SHA512 73c68dd75fa35727fd93a76886dd77afbb7032271e535c6e885a4ede6822052a93a610dec8a1f84daf24903c749b30a185831ec96d651588db2a2524f3dcd477
 EBUILD racc-1.4.14.ebuild 1824 BLAKE2B 1707d38bb941dcfa20e737da4281c9d588830aee6a25c23698ee25cd83831e4c187e181e60c5942e30d4016f9b864354b0c7045bb3bf3811785547d37185c5a8 SHA512 8ff0842b29957a15d063bf7496127d24777af11881b307aa88fd9250345f90d59cd1e749cec8d44e7ffd46e02ccf120d142318deb446d199b75e850150bb95cc
-EBUILD racc-1.4.16-r1.ebuild 1925 BLAKE2B 3a794b9bb23481a2fbdcf11e36574e0ba2f74bcb49c461583e2be7534a7900de83935ae53d99e13928460f2e3730d825920d729f2007b3d1a7bcee893d68c203 SHA512 dcf1ee7d75203d2e4f47d6faa815701bb2c14696eb7507363992d6d91e5cd16adf8e196e8d7a894e1a1baa13133ce18f26ccc51f4e2dc76ebe68659780450d96
+EBUILD racc-1.4.16-r1.ebuild 1923 BLAKE2B 629a32b303c87b6da05fd893315bba3dbd33d4cc6b35946e4d2c1f5a29c493dfd6ed50e0da2732815d8a38d0f3aa7b1fe0e8ff77c99b1e99f8a98f21658e361e SHA512 897c5069871a3e6ecb8f06000d90f6a50acae87dce2a2413112e82cc7be0b46499e5d9105c31bc6bcb7debb879726bc47ff6f53ab54b33ecafa1a36d1bc935a4
 EBUILD racc-1.5.2-r1.ebuild 1742 BLAKE2B a770ba3bd89dd17eb51246b612bf7928f7740db981e9165d82a49a9a8bf42d1a7c0e8b1d0f7564802130f73407de7190b5eb353c4b5076529a4c48416f27b01f SHA512 97f772ca30602aae276256a3e18f15acc7e64a8467c6d2e1b412bd3ec6b735d515931b35b09d99e22324736d5c64debbb3acf602ecf4d70a2ecdaa56e677ec69
 EBUILD racc-1.5.2.ebuild 2001 BLAKE2B f9c86a3ee7065e818e7dd6d1f865b1c6450e77d786946d6f58cbf87d07c4c413e9838a5183bacf9ab9576392b803add944d8ba92da20cf9915e0bb58fa9f1067 SHA512 9e9aaae14b6171189122c8616450a246a7969b35cb8f1ae7fec1bba22bdb332ac5cb180a77636a069077c7fc03497694fb67e45cba0cfb0eaa5a49e3fee7de26
 MISC metadata.xml 331 BLAKE2B 67dac6bbbf2927c5fa694a0de98635c952eab8ceffa913aac7762c88625957b83f7bbeb22dbab5adb445b306e7bb5efed458e23b9a2c8137e65c36b4d12744fa SHA512 cf609ee98391504a83037f2fb2601b7b4f5dcb3ce58be9dfb895b8b961ed54e19d9782979cf24f1c1187087c1a8482e755d24abec089187870dd6361f17559b1
diff --git a/dev-ruby/racc/racc-1.4.16-r1.ebuild b/dev-ruby/racc/racc-1.4.16-r1.ebuild
index 945fc5bb2747..4fd8f68e5a46 100644
--- a/dev-ruby/racc/racc-1.4.16-r1.ebuild
+++ b/dev-ruby/racc/racc-1.4.16-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index 542b66302ffb..01fb9b55d14d 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,5 +1,5 @@
 DIST rake-compiler-1.1.0.tar.gz 34819 BLAKE2B ec4fec1eb92031f9f6b378b190c4e8a2f2627623afd6fb11922f71a93431de94bce640863deea2aab05656612533ee2b110f295f87590b48500583af71b08dae SHA512 77338776506df66c2e99e9b1b82dc4d54cc4e7c8fdb1f8b7b6d7507b9f9cb0718839e5139e9c0cb6295259e819dc8a011101e2427cdd387b568b639889321d60
 DIST rake-compiler-1.1.1.tar.gz 34692 BLAKE2B c6862f24ec57c25fdeb7faeeda9eb96cb64ac972c852a81b77ec9b35d21018a5647089cd38d80b03a79e2c07d3f9af42bbaf9998457ad3beed27c8285c23689f SHA512 e9cf9752e48eae912657a34d2f86a2b41f7d57620c6e43b1fa6fb8e5715336b2fdf99bf20a4851889e8b9b7b2e834421c13e108c538abdc3cec968952345361d
 EBUILD rake-compiler-1.1.0.ebuild 1457 BLAKE2B c15c0f17fc7418431e08d0f217fd96c726863231cefb8ad5ef3bc7aee1253b52f7fd41fac0f1385352afd20cbee9bff0ae7f428f54d0ac155ca9a40429686bcf SHA512 fb4b23dab2d0462bec8cae3269a21e851d685684bb1fb7b288dd49fcd81c18323acd7a510fbaf2f6bdd2eb0b4e48581b35279260a2a4435ed46ee58a2c3af592
-EBUILD rake-compiler-1.1.1.ebuild 1462 BLAKE2B f967963b9d4e059aaaa0ec2b08a5da3e44808ecbdc5d966ef2d39c5db9260b7656b1032884a5f93696b0d7e6f6363b61cfbde38986174ff644a738c5850acdd0 SHA512 16a0ba09140ba98e51953445c9cc686a829b6c7045a2f8f0844721eb0da6a999a07c6fd7fab76312d3b7f65077c1feea4807907ff5e702449958a66b7b930ea0
+EBUILD rake-compiler-1.1.1.ebuild 1460 BLAKE2B c15b7983b125df448ae02c57ad0622291b3972dfd56982628d76f3d19273b116296ccbce78566899fee5f1008a8594f9a7e47a2d0cd2f171f846685d882742e8 SHA512 113e8a358b68ef3da3fe667d63cc195e5691629c9e54f57096deda120cc711ef39c461eebda729d77d63111d1d891dd37984b0a48bd56a44b2f0169df87792b5
 MISC metadata.xml 350 BLAKE2B 35df0cbf74d904e36dc5b5f34c31a41bf9659942415655f635a112d01e98833babfd42640d5155392f5563fd1756b104671348c077e8a62a2d6efaa68389a3f3 SHA512 2f027e154015dbb7a0535356a313b2f4bada336f6c1549aea9db77f57b43ed7ff19408e3ba507010d50e0953f5f6fd51d9bec956653725e1e087d94a6ae3eb83
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
index 341b4b51d966..6838617a5121 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
@@ -19,7 +19,7 @@ LICENSE="MIT"
 
 SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index bb50080b65f0..afc4636ba2eb 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -1,11 +1,8 @@
 AUX rake.bash-completion 1335 BLAKE2B 5f4b81b850e3435246018d7bb420263647c11573657cb7362d95727800f4197a904003b5a967cf0df862edb36af02d640a052b5ad33218d3bd7a6945302ebf94 SHA512 bac238c0023e525570dcb93c2092059b8a952ed54bd97344db8011f89720af947b840564701b75e03f37a6994f27da95d8f44f1fc28839c8cb1d735cdedf07a4
-DIST rake-12.3.3.tar.gz 122233 BLAKE2B e6c913b833092ef5d4203265bb5daf725bfc34ff3abef5a4871845ba9ee322bb8ec668564ed7fe5a2d9ce219d5b7cb00fa22d0b76fb9721f2138d2d963f16c22 SHA512 de15ea4428e845de214d35ad2155bd55cab51354feb5c7ae4c2cde5365d7a3959ee96d913346bdafacdb0542ab2d0e4c2e905514a7f97cfb18e630794bba3a3b
 DIST rake-13.0.3.tar.gz 122825 BLAKE2B a36cc6d8e5f560bc502455a756b89d763899e71b711ba6b11d17fd86a460b4cb3ac47705645d4ccbaef9b6d8964cdc5d4d535b4470582cb3658016a399f78d58 SHA512 aff09bbfa58620cd6902e6679ae3f54d90424bfac40c7ad6efcc590a1c9624ae7a0c5597b8b05b378d90e422285c41d781485b9aebe1819c0c2eaf5f2624afa2
 DIST rake-13.0.4.tar.gz 123399 BLAKE2B f91079b3e22f0b1e09857ac5f549ad1cd4372ccbd2bc152e1ed57241ebf05e8605992008a6f7e4f172f7a0fd77450092b9d03e7026e3cbba25c52731d4aaeb57 SHA512 78533cc966cf285ba5556645cc674affb41baa3076e873055491c5700c6b2301b2da8ec212f260a44d2fe83003bf84b12cd2b81775fc354c89e3fcd346030bb9
 DIST rake-13.0.6.tar.gz 123485 BLAKE2B 39c99b9d125ba7519bd8eaadac85646e785cc01fafad549becea5b2801f14d74085365743f1c5eb1126d0ae32b19ebcde636badc06670a0ad0dba419082e691f SHA512 1b438be96d8cedaf70e961b0bbd2217692b0b5537b2e1d5f599158e7da3e300cf6ab0c5f0c52fea89be0beb675effbbf563d24e55c84fb673b4982013355e03c
-EBUILD rake-12.3.3.ebuild 1263 BLAKE2B a866e416a95844a8769325352c83f439e6cd9eb72ea586ea62881203fe99b4e4b6a81553e32f3396321907a2595f789782440ac96bc87196f1ed4d32215a6cc5 SHA512 9bf0bbe94d8098e3bceb3a29f67b1779d089c81a4f0b0d978460d8c44792484c3217c62ed8d5c48ee96745d59e68221d0bd91f02253cb748187158dda722f0ff
 EBUILD rake-13.0.3-r1.ebuild 1447 BLAKE2B 96f2489a15db199dbb9359a5d2d2f030aff19cf2cf0b09df6541293261f121bce6099c2464b3f7af17b3465ffe2a908fc597806bfb6aa8c27407f796dfbd69c7 SHA512 c2cb29b463a828f0afe59643c81199677e3f990c3c9fdc45fe0e0dfbbf0d184484cbc82a80ecb47da7ead7f0b942dad4d436f54fc433d146eef5e702dd65044d
-EBUILD rake-13.0.3.ebuild 1447 BLAKE2B 20142be6848ce363e150b6d3b36611e99077794de5ee4ac7e22667e70245252ea5ae2c44243f1146405971ef31fbc74ae119e22e006e89e1d1c4bee894565db5 SHA512 7e6d6b6e16de8ebfab69c887d65751aff7c5902a3975bd99882ee060a0697391c58edd1c073d799aeec8fe0481d6e19bbad70b2116bb1ca67e6bc27e30a60158
 EBUILD rake-13.0.4.ebuild 1488 BLAKE2B 81506dd9027bf056da28aa18840319ce3502057ae76552bb5ab465929c9d9c7da0da84ef1f4fe61e22069667dbfda47a9081b370573f3d7ed9351cc8558234f8 SHA512 45f5cffd067f5c2b4d6429dfa18e17fa4ee9a10459260c9780f31eb66c8960fdc6c0655ebcb443959e9aed21cfea9dd7d73c3a5b2dd2e94e64d8a228338a0c97
 EBUILD rake-13.0.6.ebuild 1495 BLAKE2B a2ac9cd9bc02871fbcd730ff671ef1de072c6f07673f3d6346dfd6531673f3c95fb8c06ecca72956069d3fff3cc6f35b4b9c5d9cbd0e999ddce854b68d4f6948 SHA512 3097bc7c795bee111cd8bf15a8a7e2dfb687dcfc87d35c07576e2479185f331b6e6c681f1622665fc08655a14df4d29ce23a5be18da11f12d68aab04cf68af06
 MISC metadata.xml 341 BLAKE2B 4f6fce5484dd3adf4b7025f95d26ecd9f2f435d2b5e5774cb3f6ea2ea07727d4d76ef640eb039aafe67e5597b70d22258d0f8f939471af2057f0f933250098e6 SHA512 56fc95931062163036dde73847a796fd5802ff4bcb8a8e72686847537d0f38c9d15e0ec83bd06c2f86ce92952e9fbaa0e90eb4633d7afc460adbc0c9676e0040
diff --git a/dev-ruby/rake/rake-12.3.3.ebuild b/dev-ruby/rake/rake-12.3.3.ebuild
deleted file mode 100644
index 56e8a203e5cb..000000000000
--- a/dev-ruby/rake/rake-12.3.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/ruby/rake"
-SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND+=" app-arch/gzip"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
-	doc? ( dev-ruby/rdoc )"
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper rake
-
-	if use doc; then
-		pushd html
-		dodoc -r *
-		popd
-	fi
-
-	doman doc/rake.1
-
-	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
-}
diff --git a/dev-ruby/rake/rake-13.0.3.ebuild b/dev-ruby/rake/rake-13.0.3.ebuild
deleted file mode 100644
index 349412196d23..000000000000
--- a/dev-ruby/rake/rake-13.0.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rake.gemspec"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/ruby/rake"
-SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND+=" app-arch/gzip"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
-	doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
-		rm -f html/js/*.js.gz
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper rake
-
-	if use doc; then
-		pushd html
-		dodoc -r *
-		popd
-	fi
-
-	doman doc/rake.1
-
-	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
-}
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 2aaa88032cbd..ee8b382fba36 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,5 +1,3 @@
-DIST rdoc-6.1.2.tar.gz 667607 BLAKE2B 4857bcf5f72d93fe4e9ea89acfda9ae82afd61a7ff501d2eea529330d2b8a63d7cc775490648fcff5000ee60417123244518f56a31593af8efccae8f925b21d9 SHA512 a54e36adf9f98117f0b5ae4490a0ab1ce12d9b1de5b7c61ffa326b36ef13885bb8f18147f3548f95a285b15470faba14965bc87088fa3ce584928d8ee396689f
 DIST rdoc-6.3.2.tar.gz 675963 BLAKE2B 1ac931ddf0af700f2460e415a6e8c505c9a3c0f2d65b5c25928285144181d925747dad0224f014abdc1680df9130df74ba82750a2cb1d02b042c0bcd63d22e6a SHA512 1bd8eaa6c1e5cc40492b1d6e461d831cfc05bf368c982f3266b63ea4984c10de40523f9e2106b1beebd96933a2006cb81c3daa26ee0196d99d1ed6da5b72a78f
-EBUILD rdoc-6.1.2.ebuild 2636 BLAKE2B b7e269de9371299b8c7580e928e48f250a417120553d1f3520ec0a6e590d3bd55679e0fbbaa2a7e9de2890ed7c4bd7e58b70ceaffb4df5daea47e255b5feb4b9 SHA512 8ba41314f28de3f789fc4f527092ea2d97115b198a99ff1c38edb6ab6b2ca62ad3f0b71cd435335fd7589481d90e2c2fc133d72b096a91ac0bc15b2d52d3c15b
 EBUILD rdoc-6.3.2.ebuild 2734 BLAKE2B c12565ef4f9e4d3ea317dfe5c14c10f0476fde33c49c3d25a74e67f6cd789a4d66130e813ddfc22c11a0282f33e0527881c7b3002311cd8b74906de4bcf19a02 SHA512 4ea658e052c8a9a5397deca234f6d25de0c38a0e936a0e350a2cfc02219f02f2f15a513f2558e2f87dc68898330b513a6709bf353b9d5335abf9b519b3f7c921
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-6.1.2.ebuild b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
deleted file mode 100644
index a14a325b929c..000000000000
--- a/dev-ruby/rdoc/rdoc-6.1.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/ruby/rdoc/"
-SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND+=">=app-eselect/eselect-ruby-20181225"
-
-ruby_add_bdepend "
-	>=dev-ruby/kpeg-1.1.0-r1
-	>dev-ruby/racc-1.4.10
-	dev-ruby/rake
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/minitest-5.8:5
-	)"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
-
-	# Avoid unneeded dependency on bundler, bug 603696
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
-		-e '/rubocop\/rake/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove tests for code that is not included and not listed in Manifest.txt
-	rm -f test/test_rdoc_i18n_{locale,text}.rb \
-	   test/test_rdoc_generator_pot* || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		ruby -Ilib -S exe/rdoc || die
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		for version in $(ruby_get_use_implementations); do
-			version=`echo ${version} | cut -c 5-`
-			if use ruby_targets_ruby${version}; then
-				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
-				sed -i -e "1s/env ruby/ruby${version}/" \
-					"${ED}/usr/bin/${bin}${version}" || die
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-}
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index a69700623866..2a309d0f2834 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,12 +1,10 @@
 AUX testrb 177 BLAKE2B 7f0192ddcadda449bc4766d5910c76ef21ff8cadce1372a46db4fc236374eaa3cb57e145b1b7b09896b3a866ddd9fa1f910f40b751a773bac1104d705902bc0f SHA512 9de97bde52a1e5770a8dae8da3adcbde3b1dfa7cabc6d131159c8a688a7ad5b59dbb528ce9eef3346da12264c0d30415addd907bc66c1d7d90b1dbc4c605730b
 AUX testrb-3 183 BLAKE2B 5bd4712b7a73cc480669facf537b5bbeaf16eeae2782e21d5fe88cf92c9945845803d3f1611d465a3fc16f76838b5aba964e9b96eae35d9cef1b0b269bb94e2d SHA512 cff9584c54bb682f03a0253df953ea930053642e249a3c4573e34cc78f4b77ef943ca5a2c7d1869d926b4a8d9e173ebece69169d845724b03c03f00608bdbdfb
-DIST test-unit-3.3.3.gem 133120 BLAKE2B 37fc200b121e84046d1ee483277fc1274dc3bbcdce95ecb5c88a71a77ca9c164faa8364f68d777896bceb3dd1857fc7146ca464f039c0f30ce5baa466f38ede5 SHA512 ddb40e2ec1f15405cc396a9008912fd41ecdf67a0c02bc7ad4bf7725ee68cdaeec6f171f1786469ed55c1154ce094c5f0dd75103c1989a694bff412c9cc86934
 DIST test-unit-3.3.9.gem 121856 BLAKE2B f8ac1568aabc7d53c79715c6b141d3f2be0782e35dda36fc6184e7b7bbae419e883b94f163333e4e1a186c07f55cef181a2d86d4531e3968667e8c5fcfe8e36c SHA512 8e2a1516d33811793aacbf0b31b9609b43437ea6800cfe6c97b1c96395a8eea7c42f2788dd86b6decfda184a27e5818646bbe313d39ce3799a0869f62a0c4c32
 DIST test-unit-3.4.0.gem 121856 BLAKE2B ff975888027ba6122146f074926074ad7eb94e7fd442ab3d9f5d4f2eba83695e7f7ff2d17bd4578fa81caed5971170d0d8d287d8c87426dca63bf7ace1c7a850 SHA512 b7fd84165c956975f758b09c13d6d8f3a613e5d72c381cc3ee7522b5c6e1ad2751d8709bf1d45169823260769909ddaad487f51cdf68312b1e29c1d861f8107f
 DIST test-unit-3.4.1.gem 122368 BLAKE2B cb1677c83d11c0edbb6ad2eedda63f777832993d262ad0b1b5022fcc049d82d8eaf9284bad22f9a49f3d43febed6f72291eeb30d8844f3ef4703f93b9f556f7d SHA512 08c5877cf6ae80e6ef5de7c806dac74405329cd08a97431d174b756ad173e727a536fe315a624c5e1d5b071d5b887cb4b8498675f5f54073bdffe9d5ec4eb745
 DIST test-unit-3.4.2.gem 122368 BLAKE2B 3b308eb539915573762aeffb96b02bca3194b5c4e70d00ba4711e2ebf57215e5865f79e5246e5872f2ba813b81256deae289872b8f550ce630249dcf6ff5069a SHA512 ccf04ffbea05334f2d4ffed48db6d236c5eb85cc3d0bd79b5a195c43d218bc03b3b310835d7c23f78d2548dcfc8c4be5d1f3bf92d1aff6fd56ff3f483b2f1b0a
 DIST test-unit-3.4.4.gem 123392 BLAKE2B 7fe5fd5d17712e0b18e5757a22ca60d0504857c46d311874bb2528d6e6eedffdf4f468899cd08c3dddc4808bd41cb21d254d1467f4ccc259eba8bc2405e9cb57 SHA512 3387cc32fca94c2554fa5ed691eec1e0bdddc119ad26f19860c5533764041d17b0ae0515d0a3703f7427558e1eb0f0817c106f2de46b2ad5299ca08c2922de33
-EBUILD test-unit-3.3.3.ebuild 904 BLAKE2B 7c4251d9e4113cc1a3f90eca98cea78f8f288d107a4e6e37c567cf614fd8e21f8f20d46bde4332aa48ba33d0c401ebeeb154cda9ee657ca2ec5de9f2f9daa81b SHA512 ccb513f456f01217a88927a8532c4f0d8bf9630dabed5b0321b4b3d068902cc756dee598d5cdcb1823ee508a2a4d2e2eee028725a74b833de87ec98038f08c16
 EBUILD test-unit-3.3.9.ebuild 873 BLAKE2B 2802f418211232803c5b3962e19fbdc6203b4e1dfb10294049aa43de9bfd39a1716e94831f255fab67855a4b1838c2de9f0d56fc6e035617c7ef833c3037d328 SHA512 21fff12c21222e44e94a678ea4ce171c8a6c46a6e8bcdb17747a246807a7988a2fe0399b84bf55e8a7c6a059109c01a6ae3237cfe594e0701bd5f6d318abfc10
 EBUILD test-unit-3.4.0.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 EBUILD test-unit-3.4.1.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
diff --git a/dev-ruby/test-unit/test-unit-3.3.3.ebuild b/dev-ruby/test-unit/test-unit-3.3.3.ebuild
deleted file mode 100644
index 6518be294874..000000000000
--- a/dev-ruby/test-unit/test-unit-3.3.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An xUnit family unit testing framework for Ruby"
-HOMEPAGE="https://rubygems.org/gems/test-unit"
-
-LICENSE="|| ( Ruby GPL-2 ) PSF-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/power_assert"
-
-all_ruby_prepare() {
-	mv doc doc-install || die "moving doc directory out of the way failed"
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb-3 testrb-2
-}
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index 32247610c674..152a9b455ad5 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -1,7 +1,7 @@
-DIST tzinfo-1.2.5.gem 153600 BLAKE2B 3df5625c61eabf94bb457381ac7d0cdebd5b55da3bb043fe58063cccccb623b502e026a71faef4f7d7efe75eae2fdfd0bf3e0b97a3763fec9a1018f0c6c2ae0f SHA512 87f7cd66d6e80d51d216cb993cc76fe7758db03ffd39dde96eb24a9d208699766a8dbff048485fb732ce125ee9f971e38ed9ee1197f3ee3fc3ee8a8da840dd45
 DIST tzinfo-1.2.8.gem 166400 BLAKE2B 67f116171a6cfd2680c5eeac3cf7a034b446e973f2658052a70fff8d0571bfae03ee212b26d277c6b5050943f6117b5d8ce7c2ce5c5ab6891a1b8e9212bf7ded SHA512 5573b252d91a77b1e1ace2d2ccf48f7dd9bfb79b8b0b15ba2e8757e5fdcb9cbc044abdcf82beacffa284fc57ded2b579feccc393331f0f5a680e5f5c6275b62a
+DIST tzinfo-1.2.9.gem 166912 BLAKE2B 6d54a5118fbdb3556d0cdc9079462cf26afa9deddd1dc21ef670240e2aa47a66d0b4fc9c9c7ed74bd14bde96dc95f6b716aef5d32ca521221618a76c8c05cda1 SHA512 ddf28ad213f681a4e551cbd803873b279acef03fae894a3e6475030d4da5a59732b31af5d5944e8c62d15b7ec922816fede24f180fb20c55c1bd3d379c879cfe
 DIST tzinfo-2.0.4.tar.gz 224673 BLAKE2B 0c7ef231767b6fc00cf95b3e1c2037894b14dfe832eaedb3f4b7c60a884ab6f7121243af5b62acf47d02da28395e7390f968421a3a3a2d731deb079e9fc51bfa SHA512 5b2ec73f737009ba21dac7dbb9504235fdef14dc45a6450e1218ba9e53dd29735ab4fa6c2854271916cc5c0244e09ae7ab19467408b72b9b82ca238e14d3fa4f
-EBUILD tzinfo-1.2.5.ebuild 1051 BLAKE2B 1aebe08a8a828f4a2de3ef3d3d8fd96d0427741207659219a8fbb0e630629fc377ef25c12cfd54a8975946003fc260160773cfe7c999334e68aa725e1f5a7d2a SHA512 89c21fc54b9ca7b12a7f8e7d4e3a1a9285a44666b621231194296693288ef2f9cad72bcf7b13a617c85bdcac2f45d14c1a382698ea8e61a7b3f840d0989c6d39
-EBUILD tzinfo-1.2.8.ebuild 1021 BLAKE2B bf4ae323f458082e67f70991a24c166fa9aaeeafacd6b298ebe0035b1301f6064be9af5f367132b79ebf3d45f18a66839eaee46c213f2e77e0faeb03b7aa8246 SHA512 7feb29bd530d927b3fe63ba0aa63caaa403dd9e1e106186bb7d1d9096beab7484fa7f90860ba9c9cb0fda31a66ec489efb61f313dbb346da1de1a28829e0f142
-EBUILD tzinfo-2.0.4.ebuild 1423 BLAKE2B 4111153c511b854e9b61489c60177c5d627b1bc9cf67d279a4a9c7afe52d54fac6f381f2cedd0d1f80db88a836383dbe7c11d82c1f8ee1c7b7b824a19b57055b SHA512 7b041a1c36b41082af9d82764f595320aec7aa5d33f6909cd560a04a027ec1b919309e9ccc61e2a9fe83307c8f0860692bab3757911cca8011ce2d63552571e2
+EBUILD tzinfo-1.2.8.ebuild 1020 BLAKE2B 36048a7062d502cf053cca71385de336633746c7f6ad1c3752100de58448f42304406158315916ff7e94b922cec345e48230abb0cd977d2ac9a37c9f0421da30 SHA512 7b319d91bc63acc74a03ad902730c098682444e6f286ce7aefcf37a8fa5d0f9e1f13a674f6ab86237aaa1cf5819ef49efa756a265d5b19ba8a8c9517541a0e5d
+EBUILD tzinfo-1.2.9.ebuild 1023 BLAKE2B e2e5c6faa574c618a36a74edc8adc6d58071516283245371472df491d6cd9ef8a11c4ce9fb847907db1069da110e7ad499e80d9bad3d98dd23eb6ad60b51a7c8 SHA512 f28d20c537cd8439dd48e1728bfbd06b0739b5449c934cb0b3dcbb316d08cfebf38fe725b3a1e7e5ef12b9d5f0db183c77e18d62e438fe9a5f7373f9d0c2194a
+EBUILD tzinfo-2.0.4.ebuild 1422 BLAKE2B 98e6780b083da0d5c7b5ae4385f5369dfdb2d8125a2f02e8531e31e0be92457ac3fb87e3247f60d9a38300e5f8b08e6ebb70f2c855b808aee548efa8fb9669b6 SHA512 625c9be9581c422a38150789612d067076c0fffe66f084940ef5a409ebcc50e2595de7b075f8daf270c8b5981858512b43cbaaebabcac9763f16b7f5c5e11006
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild
deleted file mode 100644
index 69092df7377e..000000000000
--- a/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Daylight-savings aware timezone library"
-HOMEPAGE="https://tzinfo.github.io/"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/timezone-data"
-DEPEND="test? ( sys-libs/timezone-data )"
-
-ruby_add_rdepend ">=dev-ruby/thread_safe-0.1:0"
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Avoid taint tests that throw SecurityErrors on newer ruby versions.
-	sed -i -e '/_info_tainted/askip"SecurityError"' test/tc_ruby_data_source.rb || die
-}
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
index d6ad4d055d5a..01b52ee296e8 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://tzinfo.github.io/"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/timezone-data"
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.9.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.9.ebuild
new file mode 100644
index 000000000000..f11f1dc94154
--- /dev/null
+++ b/dev-ruby/tzinfo/tzinfo-1.2.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Daylight-savings aware timezone library"
+HOMEPAGE="https://tzinfo.github.io/"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/timezone-data"
+DEPEND="test? ( sys-libs/timezone-data )"
+
+ruby_add_rdepend ">=dev-ruby/thread_safe-0.1:0"
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Avoid taint tests that throw SecurityErrors on newer ruby versions.
+	sed -i -e '/_info_tainted/askip"SecurityError"' test/tc_ruby_data_source.rb || die
+}
diff --git a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
index 59b0a6ac89ba..6da9db3926a7 100644
--- a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/tzinfo/tzinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/timezone-data"
diff --git a/dev-ruby/unf_ext/Manifest b/dev-ruby/unf_ext/Manifest
index c1d990345a0a..7c0dd7193dc9 100644
--- a/dev-ruby/unf_ext/Manifest
+++ b/dev-ruby/unf_ext/Manifest
@@ -1,5 +1,3 @@
-DIST unf_ext-0.0.7.5.gem 398848 BLAKE2B 3c7b2a6765360f59b7b921155bb6532981c8b31fd1fcebf1adc1e113da2404fa752ef95bb385155de1a6025d51f4564e52b497c5396624a0a5e99357fff88662 SHA512 5d60740172034253fec9659bec49e60f639e93d8f147582e26a012712ec2e5fca30674efc52695def0c3cd145c5ddd93a56a6d0f854ab04e7fc81544e6aede16
 DIST unf_ext-0.0.7.7.gem 399360 BLAKE2B 040800c9598fb544d434e8d3336a7aa8aac2440a3386a520220252aa970c715462fcf242985527b23618dabb291db346d23afd02282f735df1fdb657e021be9d SHA512 7dc75f071be4d4f3cd44f64a26c5f63f01494f79f3585eea3b307c3e8133b17b1007c4b36915f7254e516ae7a62268be8f3e4b250dcec7a9a083b5a66582887d
-EBUILD unf_ext-0.0.7.5.ebuild 994 BLAKE2B b658df9d3ec2768561b36cee351c6b95a5e3d517d42d0ff602710b92eb47020bfcfa07523e2da3554deb98a258955f9ef9f246730446fc229b58243968357173 SHA512 cb4bbae8d085346b975f23924d91ca5f09c644234db1a30ccb34e06dd76dc9dc03d2827ea73663a5d8150eadf701a63986b95bd7fd9262c0a4f2cd81b7d14be3
-EBUILD unf_ext-0.0.7.7-r1.ebuild 806 BLAKE2B cbaeb4717d3499033406748390d878b14c3eb60d0a32045774d30c9379e88305b341ce357b2b700a9637f8cff12ee1144951a2e798d0a07b240e8c8b0c02bcb1 SHA512 56cfa8780d6bbc30afb2f1de6bb6fe2c17a22bebe40600f5c7fda5274541e773f00eccf10b0e89521e5e56cab48d60eab5c9310a9ae371450143b9adfc5be454
+EBUILD unf_ext-0.0.7.7-r1.ebuild 804 BLAKE2B 606a99a2173d881316cc89224e613984866fe29f61cc878205578303413ebf73dcc2d339481c7aab32ac25bcc64d3f30a81b897488ebfc940c83191bb64d5a03 SHA512 27bdb539f02abf7ab2b79438c4d6db561dc4e496f5e52f679b20fc84337b23b268be2b395930922b7aba367579480d5e0e04cc1e98ecb0f80ecf1c565609c718
 MISC metadata.xml 383 BLAKE2B 96615ab1e6b21672cd9b121a3d70bb20630897823e9cf901575c9d646d01d98826c7813fd5d468874574596a4b56479b37e8331f98c51aab496765da2a4213e5 SHA512 c37dfb0021af1d08192825188761b1c1266a8fe85b0d81700fb769d49ec75b01dc0160a6498fa9e2a0cc392d910a86613f7585af7f143c2dc5ba020580c42399
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.7.5.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.5.ebuild
deleted file mode 100644
index 1f622cafef37..000000000000
--- a/dev-ruby/unf_ext/unf_ext-0.0.7.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem multilib
-
-DESCRIPTION="Unicode Normalization Form support library for CRuby"
-HOMEPAGE="https://github.com/knu/ruby-unf_ext"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.1-r1
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ s:^:#:' Rakefile test/helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/unf_ext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/unf_ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
-	cp ext/unf_ext/*$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/test_*.rb
-}
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild
index 8da5ec5885e0..d23a58579d5c 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf_ext"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 1a30bde7aef2..22dbaf9261dc 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tablelist/Manifest b/dev-tcltk/tablelist/Manifest
index 8ed7106c523f..0f723bfa2b2e 100644
--- a/dev-tcltk/tablelist/Manifest
+++ b/dev-tcltk/tablelist/Manifest
@@ -1,5 +1,5 @@
 DIST tablelist6.12.tar.gz 606541 BLAKE2B 327e7b523993bfa92430f8bfe4c4b2f6f045e89d14644e7eae9e67a97922e9de34d6627816c99ec6c789c1a219451af0a0288eb0d7eed5e8e8851c35bae55d5e SHA512 a05998d2b5c1082f56679ed1614cde3c17cb494a36ccffab3a21c0aac716b7b0f1340a5d4f121eb16678727018d755a16df142c8a8ec737f17550fd64fe28071
 DIST tablelist6.13.tar.gz 608900 BLAKE2B 3c124ce7581e4d32f7cc1a8048f37b6bc8a5c5b474c1cdf30d6e31f36e65cc3f59f111ac0f0af2a22cf9bca77b1f03036c9a84e91e926b72042f26c873391692 SHA512 bbf5529ba744208a668cdfcfd42f27c469eed8522c6f7e9d9c5ace29daa0c5e822559df6a67f3018a341363914ec33fae31ed94f042334781b0e23286b515994
 EBUILD tablelist-6.12.ebuild 618 BLAKE2B a0dc5a0e59c1ed124c145b477352b08a146e87600e9340a350fd40c4b7c7a1133cdbbe7bdcb0db9ffa6164e8164a4565ce5eb1e6009054298a989ad464805378 SHA512 38611bff3a992516926fa2581163328165bd52f15009823a1155fb741ddc3fb76e7c9ea7defb3282ff3f470fd273a9c6871bff6f797d99bbd0dd5a5ed54c0b35
-EBUILD tablelist-6.13.ebuild 619 BLAKE2B 47cadea4954ad91cdf27b895bad9ed51934034b19ba129bb060a0739e0ac6c97ab094a88d3e57a0d146aeff2e3b80e4a8d24ec981bae2d68000ad897a2a71df1 SHA512 b66cc91c67fcfca0f657ac7e911fff547ef4e17907eb594f4a3f4146233b2bd14ef1562d668b059a8b6c6757ebf004942f10a5b02fe3aff6229e6bbb91d6e5cb
+EBUILD tablelist-6.13.ebuild 617 BLAKE2B 85271e4d1fb8de04f3203f4d995c3b1e03586981046a3d120757675508de4f5b6991573a01afec3cdaa52c216f3671da55d5990a7e7799ddbed1291b63703540 SHA512 9734f78b378cb81661414e565c91fbf502e333587cbb29d2c058e3e4f5f9474a34ee062bd23cbcc54e5e2888f860f0e3727721b315bdbf04e3e6f3f77027ce2c
 MISC metadata.xml 253 BLAKE2B e769e1636e1375309c31bf26fcfdcb1ef46b7a69346fd59011620907237204b3b7ced37cb3450c502f5b19aa1adf36f291412ee47e242ecbfc18c26bfa478f42 SHA512 819062e1ccefa39fc7f577279b08e781b9631eb14b7794db691ab92263c013ca432d279ac08671b19c80f7effb8c67528e5221278c573dd29dc0354bbff4a77e
diff --git a/dev-tcltk/tablelist/tablelist-6.13.ebuild b/dev-tcltk/tablelist/tablelist-6.13.ebuild
index 569c36bdef25..5d7ee53b53f0 100644
--- a/dev-tcltk/tablelist/tablelist-6.13.ebuild
+++ b/dev-tcltk/tablelist/tablelist-6.13.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="tablelist"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="examples doc"
 
 RDEPEND="dev-lang/tcl:0"
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 87758055f1fb..c50335031b3e 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/dvi2gr/Manifest b/dev-tex/dvi2gr/Manifest
index 37a54eec0ff3..9deec73a5991 100644
--- a/dev-tex/dvi2gr/Manifest
+++ b/dev-tex/dvi2gr/Manifest
@@ -1,3 +1,3 @@
 DIST dvi2gr-0.4.tar.gz 10240 BLAKE2B 2caeae03e7d0219542cdc939e6419f84ddcde7050509ec073dfb8010b3f957129f09ca5a25fcda3e058bbfaa1fca772927e036cdfe67cf95fea090b53579bcfe SHA512 d0b69eac3ffb9e6975195fae0a8a16c58c547eb6ffa8954799cfacf88ea1fdfe943cdbd6665694d8c346e5dda88b8df3b031a620323158081cbac45a7e44be19
-EBUILD dvi2gr-0.4-r1.ebuild 1094 BLAKE2B 0c1a6847a3f1a3d66b4e382b0817ab63228d7c2963a11cc8938584cfe0c7c9f61ec0fc381b94b767e97a4fcc8971e9d95fc388be5c36682d324178f474468d52 SHA512 580ce997d0fc2b09614146337d36efd6475dc3de2d8e09f00484bcd25ef68e19f20b35e84e4a29c280b3bb82168ba895c143196b7b5e9e5c10249e08c078927c
+EBUILD dvi2gr-0.4-r2.ebuild 1074 BLAKE2B a5764c47911699e2273dbcd3cf6545c7ef2e7d7b4bc3e726c9b0b91f8756afc1462bfdc9f82c4fa01be4531fbe3688d39ee89e54ba1044236734740359162f99 SHA512 8a9e33ba6fd298467bcfbce65b25a9f4a0ede287892453b18632c64fac42143006498fc3313ba7b29b51cba7419a17936fb30564f6274588c7bd66067516d7c0
 MISC metadata.xml 415 BLAKE2B 3deb0cf15844afb12fc48abcef56a46d52f1d611e65463fed37f116d802dd6d22852299f1c830f97809afe289732edef0a99e27adc1a217317dd4e70552c7281 SHA512 d4a50911514e2caa79ec7fd6c7393b99c83a7e1f4704137ea1c62633f324b21e7ceabb097430aba6b6b60ed587ce9019e3c5db7b6544e8aed6293938b2376b0a
diff --git a/dev-tex/dvi2gr/dvi2gr-0.4-r1.ebuild b/dev-tex/dvi2gr/dvi2gr-0.4-r1.ebuild
deleted file mode 100644
index 2cdba6f09ec5..000000000000
--- a/dev-tex/dvi2gr/dvi2gr-0.4-r1.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 toolchain-funcs virtualx
-
-DESCRIPTION="DVI to Grace translator"
-HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/"
-SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/devel/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="examples test"
-#RESTRICT="!test? ( test )"
-# Still missing some fontpackage, but which?
-RESTRICT="test"
-
-DEPEND="media-libs/t1lib"
-RDEPEND="${DEPEND}"
-BDEPEND="test? (
-	sci-visualization/grace
-)"
-
-src_prepare() {
-	tc-export CC
-	default
-	# respect flags
-	sed -i \
-		-e '/^LDFLAGS/d' -e '/^CFLAGS/d' -e '/^CC/d' \
-		Makefile || die
-	sed -i -e 's/DVI2GR=\.\/dvi2gr/DVI2GR=$(which dvi2gr)/g' runtest.sh || die
-}
-
-src_install() {
-	dobin ${PN}
-	if use examples; then
-		docinto /usr/share/doc/${PF}/examples
-		dodoc *.ti runtest.sh
-	fi
-
-	insinto /usr/share/${PN}
-	doins -r fonts
-}
-
-src_test() {
-	virtx default
-}
-
-pkg_postinst() {
-	einfo "Don't forget install the TeX-Fonts in Grace"
-	einfo "  /usr/share/${PN}/fonts/FontDataBase"
-}
diff --git a/dev-tex/dvi2gr/dvi2gr-0.4-r2.ebuild b/dev-tex/dvi2gr/dvi2gr-0.4-r2.ebuild
new file mode 100644
index 000000000000..153f64fc4943
--- /dev/null
+++ b/dev-tex/dvi2gr/dvi2gr-0.4-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs virtualx
+
+DESCRIPTION="DVI to Grace translator"
+HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/"
+SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/devel/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="examples test"
+#RESTRICT="!test? ( test )"
+# Still missing some fontpackage, but which?
+RESTRICT="test"
+
+DEPEND="media-libs/t1lib"
+RDEPEND="${DEPEND}"
+BDEPEND="test? (
+	sci-visualization/grace
+)"
+
+src_prepare() {
+	tc-export CC
+	default
+	# respect flags
+	sed -i \
+		-e '/^LDFLAGS/d' -e '/^CFLAGS/d' -e '/^CC/d' \
+		Makefile || die
+	sed -i -e 's/DVI2GR=\.\/dvi2gr/DVI2GR=$(which dvi2gr)/g' runtest.sh || die
+}
+
+src_install() {
+	dobin ${PN}
+
+	if use examples; then
+		docinto examples
+		dodoc *.ti runtest.sh
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r fonts
+}
+
+src_test() {
+	virtx default
+}
+
+pkg_postinst() {
+	einfo "Don't forget install the TeX-Fonts in Grace"
+	einfo "  /usr/share/${PN}/fonts/FontDataBase"
+}
diff --git a/dev-tex/latex2html/Manifest b/dev-tex/latex2html/Manifest
index 188293a0f0f5..fa93a0ecbce7 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -2,6 +2,6 @@ AUX latex2html-2021.2-respect-DESTDIR.patch 759 BLAKE2B e44fa0a31c248a55a1da9d26
 AUX latex2html-destdir.patch 703 BLAKE2B 47693763782d056eef223856a679112fe0989379e589f0b9d891f7dcd6b2b316de7a5d631c0b089709122d844f08ae268cb496055726abcee01ffece268640e8 SHA512 dbc4e9272ed54949fa34da8fd4b0e15db646461ef564e65d7b4a20dd89425227b93987a2a214ec57984b200135085b6456d758efd2faffd89c16d305d315d744
 DIST latex2html-2021.2.tar.gz 1139791 BLAKE2B 4fa9b45a33dbfb5c9e3bb45ebab19edb5d7a1d9c882ab30e75afbda7ad902cf519403b685f1f30b69b3d6ec976aa72b3065851b6d24b00c2e626e496ea8afd79 SHA512 b8d742b427e833f732457194cc60c043f750d202c46fb0d1d4e46df8e6d4dabacb5b474084aec46aa4eed68ee0249f3c0b053b5446401d09034e7f59148ad18a
 DIST latex2html-2021.tar.gz 1130224 BLAKE2B c3775b2546a866834c0ed94362a428f2cfe48e8fe7337261993fe1f473350ddb778c50cc4393fe33c9f3829e5dc6f5c0ef43ae6a4c21481746023ef5939308da SHA512 f1f087a58911410b3ca9f4b60149b66d17608a9a56d0e8f74f08e6d6595e3e9c4f5378a7ab5cfc7488cd182a0dc3d4c151283b57636a70271c7f734e69ed0608
-EBUILD latex2html-2021.2.ebuild 2028 BLAKE2B 2190991b5f9532e99f38907cf49f0162d67bece52c2adbc5bae7ee5676d321e9a866ccd57997a77b4f1842d51647b9671517108c64f553f3e192e2d0f0344d9a SHA512 9f447df22f2bf15f6d14de7ba234ff508a07dc1434aeaaa77d6b4c8a4842a96603ce78b7b0567cc2a56451e15fda13267f4b5b1cbdeb346ad359cd395c5649e7
+EBUILD latex2html-2021.2.ebuild 2035 BLAKE2B 787412b878b6237c6b1bb5f3b2c9116e161d5d92b7a38b696a5d263de52d0b8a879af9556ed44972afd3edb22ac63308b5822160729aa84c40936594a4fb864f SHA512 263ec691116dbe011dd3694a1230a921e4a70203fd37e009d6ab85db3ff9026c101f935bdd9b056913740c2c48c8826b302693a31c200afbccc47f1908dad2d0
 EBUILD latex2html-2021.ebuild 2018 BLAKE2B ab991b45083b57b126b6a02ee68c6ff631466e223502b9135e0e55abf87eed4772ecdb5686b0184e46629c30e96e0bf374b520d159b98c91fa0b7fc4b6f444a2 SHA512 396be78bd9ff43572f806cd2cd3f0ae7ab6eeca3eb4c1513c8ff35c480f5701a2733ef6f4a80cd0b506c845f45e3fe575cf53196469d42ec9de9b6f6b0b43e0d
 MISC metadata.xml 342 BLAKE2B 284d5c6f1d83f7613d37e72bf380f958fb448da239b0959f832a65810aa17b04e97477dccbda4328be970b5cc4c53653fcc971b4f99a09c80ff16d3ea1cb1a0c SHA512 4ce21b15cba1eae5e358022b19426e04a7e92b4185f19a95834f398cf107ee6a27f87f8b1ceccd38463dab6257a38ceac2232bbcff2d6ed95b5ecf71ec6841a4
diff --git a/dev-tex/latex2html/latex2html-2021.2.ebuild b/dev-tex/latex2html/latex2html-2021.2.ebuild
index 1751e8b25cae..09f5f2cbd8b0 100644
--- a/dev-tex/latex2html/latex2html-2021.2.ebuild
+++ b/dev-tex/latex2html/latex2html-2021.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/latex2html/latex2html/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="gif png"
 
 DEPEND="
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 48e84a931a17..0590a388c450 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 1fd45ff06f9a..a1e7c97d1e6d 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,5 +1,5 @@
-DIST bats-1.2.1.tar.gz 62685 BLAKE2B 7ac54c8955375571edf7b303dfe9228a384ca5ec06986b9ac3c368e5b855456b2a3291cb3231f963dcd9c1bd5178f06fcbc8c81bdeee82b659561de072cccba9 SHA512 632345e6d83ed930dab23abc03e4797769063bb049ae1bb99e3102dc1e93e5111144ddc61615d05962f7b5bbf72d90ce19a324faf670a3d6e4ce7ab508b0db29
 DIST bats-1.3.0.tar.gz 78392 BLAKE2B 5dbc87ee87aba0b001d25f1304939604b1682603fb0d2fae19f852171e8bd76f1a6c262b661a373aeeb9b79818eae3387b3e4d6bcf4f0f95b87dc2430caf029f SHA512 47f67681b380a70863805691eca39532af76670b7bba2406293c58f95cbbe3dade4f792177ee00d8ca72684731efb6db2c1ca8eeabe2fa48359e81c257f95b2c
-EBUILD bats-1.2.1.ebuild 817 BLAKE2B c7a757b7e60ed686a34b566e3c1c8755eede522afe3cc5b4a289097e5f490e6c274af3602e80147ebe0e5e54f307e3f54f86801233602269b68f74dcbfbd2bf0 SHA512 aa5c90cfb0a42f1f64d57e0bced092cb2b9cb51597161e15517f9be9ff98eedfe9b038760ed03f3bd373b9b60fafd9980d8d84f1b34f63ceace33e3fa0960566
+DIST bats-1.4.1.tar.gz 98964 BLAKE2B e7cb70d2d0f448e4336ccf1fe51e93730a7179a782247e28ee906eb576fc02305aeeb2a580b5d34220daf8dfd2ee1d3269fb86a386fdf00483bd3b234df3b75e SHA512 3b00af13ac97d38349f09db79179e170e2b37c5364815e0e1fb957e6593a564d291bb50c54776088dd5784ef8cd597f0c332ec3a574bcef65e3083a5f2fc1f0e
 EBUILD bats-1.3.0.ebuild 814 BLAKE2B eb9e4b8b39ccf123feb41ff3afc027537d9fcfc157b74c252cd37829ebb99a741c82dd710e6787636fcc96140894f810da5243de41122fea3fa890ca8b3c86a4 SHA512 9b8d60b1748431da443626a04672a547e2b6a217344e4c06653835a13d4ad035d5b8a430c72077bb37998468710acaf4d3f74f4a6d6e8dc2a3bb5c6daa25594d
+EBUILD bats-1.4.1.ebuild 817 BLAKE2B dc2fbac0428857444bf8928715ce2c076df9bb7eb92a3b286a78425a87ec5b11fc5f9bfafc7efd1329973f60421744ad3e0e55dfe2ca776451ba449cae5a5e34 SHA512 dc1c5d1d9e36f7c6181f87a4d609be36a00606d235d9cca844476d57d04ac67983cdc46487c6e6db81ee142d2591f7984b3fe8dfd1534b5524a80c8b604a4d0e
 MISC metadata.xml 959 BLAKE2B cc406ff1f1902059d614efb8ff9742348c4518403c38dd4f4bfdc78f56dd5b620a79e12cae4fe7f2e4084caba34a68026583be38ab2eeb676907deb180088256 SHA512 e3b0bb9b821c9f93ef85d9e5707402b8401e1ca9b4d68b26e63884a9bdfba56d7c65068fdbc2817726ab470b16a27541dcfbc5b0e91857f67e2784de57231b66
diff --git a/dev-util/bats/bats-1.2.1.ebuild b/dev-util/bats/bats-1.2.1.ebuild
deleted file mode 100644
index 6647ae0daa0e..000000000000
--- a/dev-util/bats/bats-1.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-MY_PN="bats-core"
-DESCRIPTION="Bats-core: Bash Automated Testing System"
-HOMEPAGE="https://github.com/bats-core/bats-core/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-DEPEND="app-shells/bash:*"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_test() {
-	bin/bats --formatter tap test || die "Tests failed"
-}
-
-src_install() {
-	exeinto /usr/libexec/${MY_PN}
-	doexe libexec/${MY_PN}/*
-	exeinto /usr/lib/${MY_PN}
-	doexe lib/${MY_PN}/*
-	dobin bin/${PN}
-
-	dodoc README.md
-	doman man/${PN}.1 man/${PN}.7
-}
-
-pkg_postinst() {
-	optfeature "Parallel Execution" sys-process/parallel
-}
diff --git a/dev-util/bats/bats-1.4.1.ebuild b/dev-util/bats/bats-1.4.1.ebuild
new file mode 100644
index 000000000000..fba39b434202
--- /dev/null
+++ b/dev-util/bats/bats-1.4.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature
+
+MY_PN="bats-core"
+DESCRIPTION="Bats-core: Bash Automated Testing System"
+HOMEPAGE="https://github.com/bats-core/bats-core/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="app-shells/bash:*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_test() {
+	bin/bats --tap test || die "Tests failed"
+}
+
+src_install() {
+	exeinto /usr/libexec/${MY_PN}
+	doexe libexec/${MY_PN}/*
+	exeinto /usr/lib/${MY_PN}
+	doexe lib/${MY_PN}/*
+	dobin bin/${PN}
+
+	dodoc README.md
+	doman man/${PN}.1 man/${PN}.7
+}
+
+pkg_postinst() {
+	optfeature "Parallel Execution" sys-process/parallel
+}
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index a2440f2db1f6..c9f98aeeb065 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -8,4 +8,4 @@ AUX boost-build-1.76.0-respect-user-flags.patch 456 BLAKE2B 02a383d7a969220da3a4
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 EBUILD boost-build-1.76.0-r2.ebuild 2160 BLAKE2B 863623d5adae1f31b70db03ef0259f123037ee1a40117ef9e615e9f2e0da848946a6efa4fff878a8a93dfd8fe987d3b5a64142d0263921712d841fd383869227 SHA512 0793cfbad9c7b9fd8e4e163bceaf3501b09c72f0b41ebbd3b91e5065a47a1d5cf32c623551ecdfeb8101de23bf262455b8c8c48886a3fe16228b872d85f2dcbd
-MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
+MISC metadata.xml 319 BLAKE2B 1033a43af352d26e4a99158b781300b38a97b0e52bf6a140d12b862c52feada5110f6fc8a62a22ad3635a10b98418d6a6810b9fde767cd68f2ac109493517d10 SHA512 adf5a4ccdb69f576918b3ccf54e7b900b1270428a579cfd752706b91d2bf3cf2718de3a37e7b35633560f1d6fc3eb7a84fb8537dac3f67230147ef041cf27b0d
diff --git a/dev-util/boost-build/metadata.xml b/dev-util/boost-build/metadata.xml
index 791cf4e1cfdb..335f8345b217 100644
--- a/dev-util/boost-build/metadata.xml
+++ b/dev-util/boost-build/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>soap@gentoo.org</email>
-    <name>David Seifert</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">boost</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">boost</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 48c92a3503b9..5d9f020fd3cb 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,3 +1,5 @@
 DIST catfish-4.16.0.tar.bz2 261252 BLAKE2B b495814857cb551c00dff8b92d2b24df876b1ab269bcb0ba468c791b97f3e962b875c5a687010472c5d47719475c99131d5ee6df3ce642af147b199976eb3538 SHA512 926318d3b2387386a5141347cf23b7e1505f83c48dac3804dc9c51aeeede2ef71d6d70e61bd5f608145249ccb4d3d87662bdab0c0a88dc69608b2edee55ddc19
+DIST catfish-4.16.2.tar.bz2 270051 BLAKE2B 41048edc3933664af389ae7120e6f2b25f6c92632a4d00b999eef4e26e0f6eeeed70320ed740f26a0649e423e3b8316e33b8c671a282ae1a4474b3cc6bbc4824 SHA512 a1dc2839106d55e11e537478402b44d3794cdcf326c5984bd95d0d5a8bad52d91df1be22ba347d23f030d0c62fdf2b90a507e2abc30ed4b4d1804ab8dbde1dbe
 EBUILD catfish-4.16.0.ebuild 1196 BLAKE2B 3fe6f289c69468b2fe4d1d19c091e9605f85d2ec83cccc0a9cc36fc783ad934cb9ca0e4df21a3059cb75961ef71281fd1af79f8f714e91f649d5746f4916ca96 SHA512 0086aa4c90c32c2c9d94a42c80652e26f5fee614850b99c46c3e2dd6702a728fc1c52cd4b614ec3888633b922b38c948f7341fed76abe2adc80cc63a035e3bb3
+EBUILD catfish-4.16.2.ebuild 1199 BLAKE2B 8981e4dc834c3690a0cf336f9f7a3aafd95fbf74462bc9e85bc81b2abc34c0a5ac9f4db8219a8f14d3e7cbefec4cf701395a01b8539ea9353378df13b3de09a1 SHA512 60b9f1691bb3c278d68c7eb7d85e89e09c2ad9a894655661da798d6f5052ed01534b7fd4f111f091507e576f654b8d5b1b4fa28a132b068bc03ec3523c7f3b8a
 MISC metadata.xml 216 BLAKE2B 9fe308faad3ff5d9aac2a6d04341fe2b775153198ea734e1b17d15eab6b9eb1f781686089a6487ebc2e9cceddfd3f8c4ad1513baaacf931802201aadbe9589f6 SHA512 780eab488d269f38416e3bfc9c02d1a6bc70cee7755ac7cdc9b0bc42a3a50bb8b0b403da139629767d2f0439b15edce7d7b4078a6f528a4e04cecc1aa9bd01e7
diff --git a/dev-util/catfish/catfish-4.16.2.ebuild b/dev-util/catfish/catfish-4.16.2.ebuild
new file mode 100644
index 000000000000..e20eafa63bda
--- /dev/null
+++ b/dev-util/catfish/catfish-4.16.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+# yep, GPL-2 only
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.42
+	dev-libs/gobject-introspection
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	x11-libs/pango[introspection]
+	>=xfce-base/xfconf-4.14[introspection]
+	virtual/freedesktop-icon-theme
+"
+BDEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	rm -r "${ED}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index a5e90203fa1c..63e79228e639 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -3,6 +3,7 @@ DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST cbindgen-0.19.0.crate 181286 BLAKE2B e09931704cfe0f0f777e67c66fdfd08820e8185a7ad475521eca2d6819d1d0a92791d5cd5dfb2b2199e911da9e8a92dfa09ec20d2912f1073d456f7932944438 SHA512 dc31896c75d43fa7efb6256b861b7d4a51b9b0e4dc605bcaf769b32cba2dc0b7a5c49b01f0ff48ada08488ad8c020c3bbb645d6796046caf0bd7d9eaae25a962
+DIST cbindgen-0.20.0.crate 183277 BLAKE2B 51529b21879e3a3212fbb951b3bdd5c8c396dce53e9dbe568bfe1e752caf3060bc784909cb4b37a6e6e80d357d5a8e2bab8d10d4470563358407bceb814bb7fc SHA512 83c2b0da580f0a2fc9a74922f3c44d0e73ce0d1de8b5a3f5819c7fcf1c481df1ff0346e84c5b4c199a9364542c85fb81ece4e1deca3a6f12231a4478f76a7c02
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
@@ -49,4 +50,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 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
 EBUILD cbindgen-0.19.0.ebuild 1259 BLAKE2B 631c95bc89f17fdfb13180f4e6c203d3f8f8e8297e578f098b2fc583db2725d66e70e8f2b3eb3b366fb155c004e255bbcf856a1c79579bd24b591de0c337bb4a SHA512 48bdd6a80553225bc952964aa11e9e1a27a79793588d720362ae4acc23ccf8728c36c113312a99279989f8851e7186090d709f80333f9933e624b9f5a5826ac5
+EBUILD cbindgen-0.20.0.ebuild 1262 BLAKE2B 19790c8c77bbd0a6d11eeeaa62e908358a6cd306245a1a319da01db8e3db23400656484607a053570cea95609315534d709953dd21635c864a720bd3fabc5ae8 SHA512 cb66ded180a5c8f980328d532696fc53079634931e9ed5cb099636f7d17517ffe6c920836af26b26d17a633cdd10d1ea12c25765cfa4f0bb7bbd8d31503ee4d8
 MISC metadata.xml 334 BLAKE2B 641a12af31fbdf9200e6138f07f3d63b0ad8649899ba60ac078a57a32eab710c5731133258420e258028cfbe9cbab8078256f184b0968e9a901fd11212ebd814 SHA512 4592a95f23737588e949de9fa7a562467763d2b964787b58c5c1e34aeb55fef2f099ca9e2309e198417a8d58aa4ebca181394a7c06ad81ab1d10f185dc4e8f57
diff --git a/dev-util/cbindgen/cbindgen-0.20.0.ebuild b/dev-util/cbindgen/cbindgen-0.20.0.ebuild
new file mode 100644
index 000000000000..75e46a2609ea
--- /dev/null
+++ b/dev-util/cbindgen/cbindgen-0.20.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+CRATES="
+ansi_term-0.11.0
+atty-0.2.14
+autocfg-1.0.1
+bitflags-1.2.1
+cbindgen-0.20.0
+cfg-if-0.1.10
+clap-2.33.3
+cloudabi-0.0.3
+getrandom-0.1.15
+hashbrown-0.9.1
+heck-0.3.1
+hermit-abi-0.1.16
+indexmap-1.6.0
+itoa-0.4.6
+lazy_static-1.4.0
+libc-0.2.77
+lock_api-0.3.4
+log-0.4.11
+parking_lot-0.10.2
+parking_lot_core-0.7.2
+ppv-lite86-0.2.9
+proc-macro2-1.0.21
+quote-1.0.7
+rand-0.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.57
+remove_dir_all-0.5.3
+ryu-1.0.5
+scopeguard-1.1.0
+serde-1.0.116
+serde_derive-1.0.116
+serde_json-1.0.57
+serial_test-0.5.0
+serial_test_derive-0.5.0
+smallvec-1.4.2
+strsim-0.8.0
+syn-1.0.41
+tempfile-3.1.0
+textwrap-0.11.0
+toml-0.5.6
+unicode-segmentation-1.6.0
+unicode-width-0.1.8
+unicode-xid-0.2.1
+vec_map-0.8.2
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A tool for generating C bindings to Rust code"
+HOMEPAGE="https://github.com/eqrion/cbindgen/"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+LICENSE="MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+RESTRICT="test"
+QA_FLAGS_IGNORED="usr/bin/cbindgen"
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 52e2f436d7ff..3c7f1eb33d4e 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,5 +1,7 @@
 AUX clazy-1.9-llvm12.patch 3056 BLAKE2B 7c090b17a3a598075fdcaec04df4efc0fb6c2a8d496cc8a9bc3b345eb8bc8f59c6aa4a8d7036c6c6717c5da05d5acd22544a86e0c711cb5f94e3433ffd871351 SHA512 42775ac235092241419315e4282dd7cd5953b55db0b58826ce50ae4a4520833e6575a17d6ace9ea559240bc29d033ad1b16af1f5fb5aed7f751a03e07650e7a5
 AUX clazy-1.9-llvm13.patch 1098 BLAKE2B 6933e7f9e159e4e4d10bcacf67a7f384ca1782d84606e2cde85e4f2bc5007f25e1fef96129de366c9be013ef2f602f7e34a4388576b404c0a913625de99992bf SHA512 a8d4c59236b9329ad1a0db4fc3a21eebc16faa19888c21f6fdf53a3d242dfc955f0902ba95e38f1f0666524d926611b353925e4519e60cca7d6e5d69a3f107f4
+DIST clazy-1.10.tar.xz 398920 BLAKE2B 1cdc160de21363c7dc9c93ea7e780412a4971b18e97c7ec6e06f1c7450c56e0fbbdb7592d6b92ae53e4c161f6d9abca205984f83b68646f04ea11d63e3c45fa6 SHA512 59dd8c6903bcc239dfc356804cab265597a771de3858a6add4877149e0e7875b3c9ddae9aeec889c9102fb9ec6b0125bb8a786344e47872b01ba87425ba021eb
 DIST clazy-1.9.tar.xz 394856 BLAKE2B 641ca46a31475cf7bd03ba921e390cb2712362dc97b960a519e05c47049927f805d3ef6f1c756b96d3483e8f4b75e2dc41a2419a462ed2e45cbd08c88c07f933 SHA512 2e8bec44a027366263de23c50d14192e310fd38fa2b369afb21413da9cb78da9882b2153daf1784c4c9076cc62e2867b5211c75ff9a1eabcb583e405f20f5912
+EBUILD clazy-1.10.ebuild 985 BLAKE2B ac0048fb7c7327c035aa5c4708b5b47084870a7760e14cd5749ca83c2c565f3b891b4eb4ca8111a715b1e397dcea49546524953c619b9bef1c2d9d3c5491920d SHA512 3433fa1a459c0d60a57a460d2d393d75a160f40733c2becb62ce5a40e8d53b1bd881948c50a8dcbe7438100944853a9b3d043950c1fd42ad6adff1f63c3f190c
 EBUILD clazy-1.9.ebuild 1048 BLAKE2B 19aab05c1a0ea51e60164834cd1d18c22537a35224258d5e37bee821b384efa90bbfe98b38362ebed62c667c8ec3e0947cd1ea5ebb2517f1d8ca4f621a135859 SHA512 5a1adc300ca1fd975e07b97b4fb5bce068c2b99afbbdb5701df327060bea1f2afbb77d00bb2ba5d9be795c84641ee235ab076c1a83f1075ad0ecddce260705dd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.10.ebuild b/dev-util/clazy/clazy-1.10.ebuild
new file mode 100644
index 000000000000..a4846ed8082e
--- /dev/null
+++ b/dev-util/clazy/clazy-1.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
+HOMEPAGE="https://apps.kde.org/clazy"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=sys-devel/clang-8.0:=
+	>=sys-devel/llvm-8.0:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	# this package requires both llvm and clang of the same version.
+	# clang pulls in the equivalent llvm version, but not vice versa.
+	# so, we must find llvm based on the installed clang version.
+	# bug #681568
+	local clang_version=$(best_version "sys-devel/clang")
+	export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
+	cmake_src_configure
+}
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 026bb9fd667b..7256d1f5789e 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -3,7 +3,7 @@ DIST cucumber-core-10.0.1.tar.gz 47196 BLAKE2B d048c36e3d28871e603b2092062af1e9a
 DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
 DIST cucumber-core-9.0.1.tar.gz 47009 BLAKE2B 2c78956643dfb08319732af24c08d5df811574891b582ba7ab51281c9a5299a3063c6c607af5cd9659aa0e160c0f3cab1d54b9cbd57d3dbf2768e97bb8f79e8e SHA512 0ac61797cda1d62d2b452d3d843be855f84b12fc9c435e8b5261700a981d94c9c88e36e309d8c2dc637ff195032768d363ffd9e7424c842d5b0ba98c3c678752
 EBUILD cucumber-core-10.0.0.ebuild 937 BLAKE2B 03ed124e774bbccac900eeb53342b7485613d325ff3719e8d1bbd9d6e935ce7444cb8548626fc959509aaed2304942552f5aec2c9b21ff40f12dec388cf13d57 SHA512 576f76e49e010f70a546d1a3e866f762c469e983d4517d228619498ac02d92b543a8c5e6e8b2c4adfe727786ec048df9b75fed86d43a2295285e97bbdf0e5406
-EBUILD cucumber-core-10.0.1.ebuild 937 BLAKE2B 4f95ffb7f2326d08a2cbb6c269bb2a5855811e0fabb1178f643ad9c31ff75e80c52303584678701fcbdd9f5ea9e61b13544ab99f5838344bc03f1568659db3f7 SHA512 018b6cc7c7e820e78327278f99228da78abe383483bc366ddd3c2db21434ab73752dfc5755b4efa4fe750e52213283c2134caa0426f4fc2d7951b82988e37a2e
+EBUILD cucumber-core-10.0.1.ebuild 956 BLAKE2B 465a655a3aaaacd2900f74ec78ec5d9305e4c708c197704b14efef5e2df4966a8f0384a79cde6ae876407116bdc7da7a9f546e229bf4b6a99f632a54b2f09b87 SHA512 330ed5b9f618592cebde44a64b058975c48f844e823881315f90abe7b9e6e53244f4ff63cc5705e15de078572b653842d7ffc0df4df3273d94c32971f064e3e9
 EBUILD cucumber-core-3.2.1.ebuild 1063 BLAKE2B 115e5a34df2654655c4c4d4eaafa34bbec22b277a35f484370f73e9987bc3be3809ecd61cd352a76a28b09a9afb929cfc034f82617aaf58bde424a7be07be9fb SHA512 4d0273470f96259204c7f909ddf29704c46adb498524304e4bd19f69505a5c0a78be29ebc32269fbcefce56f69c3ad27ef83df02b00aed40b8095e4b927b6d4b
 EBUILD cucumber-core-9.0.1.ebuild 1133 BLAKE2B e69b419451512f3c0212ac25657531511c5adbdb7868af45741712839ad17e2b37d687459836687895e9a2e593c8db37ba79eb968fbf749e1c95f8145e5790d5 SHA512 342e947e4f480aa3cb0829868914562941d2d085dd76fffedfe06b7d720b99e337fc3957c39bd787eab875446ea6be14b19d64f624a05620d2dccc2311df91a3
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild b/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild
index 252f0e7f4eeb..4250d27effd7 100644
--- a/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-create-meta/Manifest b/dev-util/cucumber-create-meta/Manifest
index 8974714a8e4c..359265e8c2cd 100644
--- a/dev-util/cucumber-create-meta/Manifest
+++ b/dev-util/cucumber-create-meta/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-create-meta-4.0.0.gem 8192 BLAKE2B 4809b0f9ec7f922af374ac46bd9d0cb9797f48738596f00c08bf3d861a19141160032421715d4d141b1b1854e77f3798d09308f626188c3ef6b30a491fadcd29 SHA512 0103b8277741d4eb2e590e1d7f9231187482d32f9a2c19c837baab759b3c48c11a39ac7af686d56fefb7b79120110e930c9af25fb895294529a3b5b0612a5b63
 DIST cucumber-create-meta-6.0.1.gem 8704 BLAKE2B 6e438871ffea3723d5466d24a0ccf1d672b05222de5063a6d9587b951357e631a938eac3b93dfc5f01155ace5dafafbf9d4a08f828b972c7f8b3e35f74ece26e SHA512 6e61bf4163a3575a2988c5a8fc351ad360d3b55e5bd615ee915f0f66064675514777868311d53f40d1fbfcdf7ffae2795c0d84c4f90c710f7d27a56009463b1c
 EBUILD cucumber-create-meta-4.0.0.ebuild 560 BLAKE2B b7259ad1746e8a479c54ac45e5c8f27f8b73a73f05c92263ca1be0c080515dfdd738368dc2902e10f64c5a2a69f6b4bfa84afcd632dc0d291403e78029520bd7 SHA512 acc849845cdb8cb65a444d303019b873871bf422335e640fa2dd40226a0361196da85e7d074459910cd7404b5b9d86007872712468f82150bb0418a70af37071
-EBUILD cucumber-create-meta-6.0.1.ebuild 548 BLAKE2B 5df01687659f5a7ab9d26022aa7c75c39f394b3e506ab3fdc6b25a7182f4a56af061c235c7e1f8fac8cf99c45b548d08c2475e64fc8ca77d810511693094c104 SHA512 2c021a91b52baf138fe75dae1125ba7a9c010e8b88cb226b9e0da25a0502da9ff32769487093806667572ffb7b9cc08850ea7c0a28de6c9121012c27aef841e3
+EBUILD cucumber-create-meta-6.0.1.ebuild 567 BLAKE2B 9dcf9481a07c2a99625ad41a302d296cb8d78f8897864f6f1d70731d04b6276134b52b58eac9b1a7020963ff1e50932041e9ca50b98e79ea0fc5f2ba3dbe714c SHA512 2d2a62ca653628a89a6f223ae4c3a113ea4fc29e3ab301f109b1a896b701a0ec483d7da59ce6947a6161ce268a2807858867c85bfe201ba659eacefadd4684b7
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-create-meta/cucumber-create-meta-6.0.1.ebuild b/dev-util/cucumber-create-meta/cucumber-create-meta-6.0.1.ebuild
index a0a3e7dbf181..8744c8c04a1d 100644
--- a/dev-util/cucumber-create-meta/cucumber-create-meta-6.0.1.ebuild
+++ b/dev-util/cucumber-create-meta/cucumber-create-meta-6.0.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="HTML formatter for Cucumber"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-gherkin/Manifest b/dev-util/cucumber-gherkin/Manifest
index aa6417e6523c..ca59113db648 100644
--- a/dev-util/cucumber-gherkin/Manifest
+++ b/dev-util/cucumber-gherkin/Manifest
@@ -3,5 +3,5 @@ DIST cucumber-gherkin-20.0.0.tar.gz 9238574 BLAKE2B 40dd7f31e234740528301ed20be5
 DIST cucumber-gherkin-20.0.1.tar.gz 9410066 BLAKE2B 2c34b1eec9d74b96bbf21ea20b479d9a1ab42669bce08eeac9c9f0c97b86c64e9119423eb8ed3c42897c8730d1dae9c0a75e32e407a63b6c1955e773d35fa16f SHA512 0a53a7110fde39ed921c3a883b2aa00f8599e7dda87cdf1766d606a696ba6f9e350d176edb9cf849567a9f4733d5e0653944d738fe9a9451ecf0763b8687706b
 EBUILD cucumber-gherkin-18.1.1.ebuild 951 BLAKE2B c1aafeb0612a41f93fd1465cd1c8f7f1ea77ef72c1848bcd739ddab3f88854961ca0554a5062cb4ad9678fd974e45a9be7502e8102e6250c8638f1db9ada6202 SHA512 52d650ee344b3afac54b1cc6a364708f706a56645dfb63a0c4c24734b78f3603b688fe5f43f9a998c3967c1b7d6e7320d2d6588ba8b677406979fb78f6dfdffa
 EBUILD cucumber-gherkin-20.0.0.ebuild 741 BLAKE2B d8afd727a9ae4f2b5ecf8fed65fa63cdb963b615e3c2093a1b1c6b44766d2add104984599ce79ade9c99e42a165f6afd7ea4c7d9acc3c4d242acff05d4ee7a04 SHA512 6cc882826dd95d6e83fd9a78fcb4094d9689494f6c0471ee610fa43a40159f15f75383be959d621a212e8f44c0421c596299e291adb52071a0b3976a83461ed5
-EBUILD cucumber-gherkin-20.0.1.ebuild 741 BLAKE2B 4a8e108acc05df454d632ca2b51c4dfe5573277e750e6f676fadac1588b40cae636c967af76202f6b5075550090f7cf62f20e2a6f3f67dc3872e0ce713eece22 SHA512 77110126734efb2aca5d3c611ef05c55520d4ba518c7de9e00d2179df3fd2d70150a47ecdf898d5e811d23340788b8b7e6cb3352e266f7c9bc79c6a8862c0fb8
+EBUILD cucumber-gherkin-20.0.1.ebuild 760 BLAKE2B 7ddf37df216f43c9f4c8136374d28e8766e7ad69502594aadead575bbb4fa18685416bdd5e4997c4c64277b3c7b68a8d771321f5669a3edf22c887088cfa0262 SHA512 133984c547ee5fdd7317c0f32d04eb4007d17dc2d1d403b1eb2af3dbfe743d3f81b7a9936dd724bd4fdd462fd9ec22cf49d77a131e1835f3b5c4569d2b39c85c
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild
index 7972f4775849..07dd652b4306 100644
--- a/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild
+++ b/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/cucumber/common/archive/gherkin/v${PV}.tar.gz -> ${P
 RUBY_S="common-gherkin-v${PV}/gherkin/ruby"
 LICENSE="MIT"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
diff --git a/dev-util/cucumber-html-formatter/Manifest b/dev-util/cucumber-html-formatter/Manifest
index b9cf986581f0..4841de30cd29 100644
--- a/dev-util/cucumber-html-formatter/Manifest
+++ b/dev-util/cucumber-html-formatter/Manifest
@@ -1,7 +1,7 @@
 DIST cucumber-html-formatter-13.0.0.gem 436224 BLAKE2B ce3f58995560f6d78e855e95af83128e426817c749f64de8c8b2c475893a0da02ee72ea00ccf2d5d5745d94f93924ef52e9a1c01bebaca9cde889cba49f32270 SHA512 687ccb9245213ff9e59b85cf729fad05de385c94a31ae70cb770ba515c57309107fea16756853d93b1af39c68c3f936f7975540070b4b45bbdd79baf94513dc4
 DIST cucumber-html-formatter-16.0.1.gem 432128 BLAKE2B b1b53566d15573f6f4fa87a9a87ce5c1844d9bd6f43715aee1a08ab45d66baa211631a612aedd59f97c24364ce9b6b607697763744906ec78f96adf0c5ca260d SHA512 2bcdd55e0d3dfebc60c25e2a64a0d2b132e561fdb0f77ca0a491464c9b338cffad5a436123d3ed5e85816d509caa60badda958d7b435a42d89ed27a17f97edbc
 EBUILD cucumber-html-formatter-13.0.0-r1.ebuild 560 BLAKE2B 832ad6722d23d43c276dba57ca62e46a6685cf6a4ef49dae1b361b1e5be59dd412e3f5509ac27d318130c4a97b9b46e50154e9442e7b6233a7e7341fcceb0587 SHA512 b63b1576e0def4b6c00388e4bf4284aae4c3e053bc4af691a77d533de66838dbb1cf1ed5b23a27f543ddb9735e138b51c866a19fdec60e33effbb5259da2b87e
-EBUILD cucumber-html-formatter-13.0.0-r2.ebuild 571 BLAKE2B aa7924feb8007c27a34c66f2eb8ac40b5162930fe2f4e5a42ef3575863a7687726d8c77457afc911b4ecd2286b661d7276375a31b94fdcb742923b7341bea6ba SHA512 ce18c5eba8fdcb8c86c1b00d16e0dafebe5a42d70b4ef6eadaa5926fe424ac5caf5b2e6e4d689a8438656b5b9f634cfa68543376f3ef8d985ac13d6f882e679b
-EBUILD cucumber-html-formatter-16.0.1-r1.ebuild 594 BLAKE2B a99f76edd44d738e470b0487fea769ede60527414a79c162edfe82c91c5b07cfcfa4f750f1f46479a87d5b19a0e67e8c7f114c746056e911094bae7fae8ddc0d SHA512 ce91a9e5b0af711b32395427e755bc597d4d06fb7f03bbfeea825055d095d06d9c8ddaf1936c4ed536b7c23bda1e8d41a1680f064af5e5376b08217c5342bc73
+EBUILD cucumber-html-formatter-13.0.0-r2.ebuild 585 BLAKE2B a824bca37a52cdcfe65e3deab5bf4199b308fa5e5c7a81b6d1d62a1cdade0ddcbef9fe71fe0f6afac1a6ec223af1467a4e242952554b098607a261b2b2d7e91d SHA512 5e335a3824c233b2087d8e4bcadace8f90ce9af165fb9caf4c889e86a52cec50e06f873696aa325899eac00c466657e7945698c4a51a0779dbe8c7f0371b75c6
+EBUILD cucumber-html-formatter-16.0.1-r1.ebuild 613 BLAKE2B 844d5276740f7675b4ca6d73ebe9dafbf299d20c7c7fb697f225845be2ffc3b96bbf756db4b565a54551033c254decc3ed944372c6ec5420242e84f744eba4b3 SHA512 256c0363835472c001763517f2aa25df0081294a03787aaad2a45b7bb79f23171a8cd6872e93b33c90fe12b863ec67aeb4926b03f2dd70c17f04e25624c73367
 EBUILD cucumber-html-formatter-16.0.1.ebuild 548 BLAKE2B 9726a4c2398928feefb92b8be7d0a70a3ecbe16dfc8f7f4bdf7dc5d467bd164e1d4b3de837453ece67d07e413d58607d332c6640afab5028ce2225a8119ebb8c SHA512 7e0d7e0e62cf29cf95a12b9c58cff5eae018a12bee207e1ec6c82ce49f3bfdaf36cc0aa61adc340dcd43e5c21f1ded114bac2a00293eb82eb09a36b10c382051
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r2.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r2.ebuild
index 37ab42c63ab3..1217af0a6833 100644
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r2.ebuild
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="HTML formatter for Cucumber"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r1.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r1.ebuild
index aa84e2994ee5..18026d637c55 100644
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r1.ebuild
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="HTML formatter for Cucumber"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-messages/Manifest b/dev-util/cucumber-messages/Manifest
index 427d18ee4172..c540044442a9 100644
--- a/dev-util/cucumber-messages/Manifest
+++ b/dev-util/cucumber-messages/Manifest
@@ -7,5 +7,5 @@ EBUILD cucumber-messages-13.2.1.ebuild 535 BLAKE2B 57f655316794694d9dacfa77c5fe4
 EBUILD cucumber-messages-14.0.1.ebuild 535 BLAKE2B 57f655316794694d9dacfa77c5fe4f5297c78c9206cd618b859805cd8f7963161880014b66d663a80c093f2a9f3f393056e5b3f82d46aede1ce1d4896e662832 SHA512 018db7289a6caf01688ca1677b92ed96b9ad97922af6f9e18c06d9c3f10e5ae7058c5e41f4b955af13114e67a7627dab513e10acc86e43aa6d1bee830f2182ca
 EBUILD cucumber-messages-15.0.0.ebuild 547 BLAKE2B b14433d359038538968dfd0388b6bb9726a460ae29bded7fa0ebdd5bdbb8f5f05a39494505e222fe1355249775b2e15d733815eab3bf68caed00e991302341f9 SHA512 b1443c1575f19c59fd411b06ea0be2dcf0af58717a85e6731329ca30d9b18ea014c734bfd6de541261b04292000346c23e182d3f5fb2df9416b48d0943db5e5d
 EBUILD cucumber-messages-17.0.0.ebuild 477 BLAKE2B 7bbab777d90e354ee290e6b9c2be7dd28b7c8dc0f1cb8d279e998973458d437eb3bf5ad29e63991691077daa26de1a7ec83dfdb3b3779fd099a9746572c43f28 SHA512 04e4e6e64114b9fb03f4f303086ac273817c2e44594fa8d79e91cb8d65441219441e543a9ef0dfdd6eda5fcaff3db378ecffc5ccb7db7c3cfa3f8610f048ac9e
-EBUILD cucumber-messages-17.0.1.ebuild 477 BLAKE2B 4dcf2d501afc34f316f187f605c946f4cb652081ad9090ab4f5908906d8b0b6ed64f95e17f3150a2fc8707de4dd065abf76a8f815057837eecee6682ee7f3daa SHA512 ecc1206ed87bd99ec483a0475b376ab27b0e72e58caa12cb81e2a22f7d41fd27cceb5ceb95860c9a71f6a963c4fec9271bc183ae841e1ad709483558a24a6c5b
+EBUILD cucumber-messages-17.0.1.ebuild 496 BLAKE2B 0b3a6247cbe0c5bc6b33426c4a4f932aa96c09938071c03427ab143ed9c5c323b17a1e782b95e3247419c4e0528834bd8f6a52adaf2dd7140f465c499b567251 SHA512 42087bdd634b5cd3294fd69333e7f7d71f27dc01c51fe83bd37f682a147aded4a8b98c8a20d3f071e03e03e9969899a9ab2d08591fb8c5ae3d2452308dd741b9
 MISC metadata.xml 313 BLAKE2B 8043a2240cf0e24b0307a6f068bd8bcccc65471d59ac643f3c654227695ec7a2392a6c1ed9ce4c0ca7cdd926a26be275b248626509c79aeaad48930e00f00c62 SHA512 949342e57dd6165f4402bd068865400a7affcc6e7f73adac6f8e121caf1ef9564bc95b61fa9bd7f80d9ca8597e5b5e0f3200a210d496577d4ec2fa881fbc23bb
diff --git a/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild b/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild
index e0ab32d1bfb2..3d6e49c5097b 100644
--- a/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild
+++ b/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild
@@ -15,5 +15,5 @@ DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication
 HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index e4f86f370315..222dcd51e7da 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -3,5 +3,5 @@ DIST cucumber-wire-5.0.1.gem 12288 BLAKE2B cbbf593d43cbbc003ea247d41db2cebaed14d
 DIST cucumber-wire-6.0.1.gem 12288 BLAKE2B f7d371e186a27ee1a6ce489c8663c456c29b1e8dcf3788032c799575ad42b4658110b50bff6e4a446bca7227bcd12eafb117782675ff2ff7e1d0ce67eccc6c48 SHA512 b056dd78b0e715771ec591578fa3d4a29297a1ba1abf3a0d009cc90e36b44ae20578a20198f463a0c8760b70722a0655612f286c34224849db675ae2110c0bd7
 EBUILD cucumber-wire-0.0.1-r1.ebuild 520 BLAKE2B 2a05625d160dca569f254cc0f0b78f26aff853f86bb5df8ced10f81ae09b41d5b906d0956dfc160b6564d3f805266cebc0e16185ab844ee4e8f8f545ba225e41 SHA512 49d1079ec8ae4ea16a47d509424ed299b0d1467c6ab4bc22811093f8982c7cb1d7877e951e61320e70c29ed76d8c3b3135d4ee2f655ca8ed12cb2b9c05136990
 EBUILD cucumber-wire-5.0.1.ebuild 564 BLAKE2B a23e9e882a3bd669f00ee00eb311b58d26daaca5a3bc275a1f9104671db900ba8cbfcfe93ccd8e2ce6eb7cd821e4a364bfa8e1586f270e0a1d79e241338b421f SHA512 2d0e867ce7ba1cc03f38662c08cd352ec3067f69f1db819038c2e2709fd1b6303c32309d9714f889e307e78569078950f5358f1306fcc02c7e2c627f4725c0cd
-EBUILD cucumber-wire-6.0.1.ebuild 595 BLAKE2B 599993204effb4cf222da3f7d4020ff390c2e3f47da0a2f3294c1ed988a51f12ec60cbc60b3030143156093bd48177946052f442c2f0a6739be42536ad539ec4 SHA512 b68b7f74b487b2badce911854231b45ed252eb52b5aa489c091eead86e654710941ee7f00512e76454d20e0ded87295092e8af970ba65cc7fd89207c44cf4979
+EBUILD cucumber-wire-6.0.1.ebuild 614 BLAKE2B d8d095c0fd727e873134248ddc006498ba161e2e4eb956bfe34425ae911d2575ebcb60f46fec497f299f77eb73f925ea4422f187ce2732b788d549240c65e1c0 SHA512 11ef35e9f7746ce0289dff068df8ca36a2f006bc37ccda4d19d5ffaf8c1de692408fa2bcb7b28457362f17da2a6e54e862f75391cee1961e0e75417d60293592
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild
index 4ee1d24410fd..5099bb1c1102 100644
--- a/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index cd4aed4262ee..86684d9266e2 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,5 +1,7 @@
 DIST cucumber-3.2.0.tar.gz 271886 BLAKE2B 0945336e2a4d14c21d22b3af18fb140663fa0c5acd7d29540cb6755fcc50b020640ffc573f4d4ed17af2758df3df410f93cf5067b736cb8005d9a6ae7fa4d397 SHA512 927ca314c56f83e270284921131ec62aa05053d29a77b230799bd1949751f64c964c0f87525c776d7fe260506ddb632b5cc8939df841d131f6a0af8a82110441
 DIST cucumber-6.1.0.tar.gz 250437 BLAKE2B 64b2adfe5b9b78e70bdf6eea5bad4fe96b5598b686e27aee8635c84070c2e20bd8051217db9c79c9f0de62b6a8eed85c327f2adb9965d39f58f74359b935c013 SHA512 45b455f1c1728463a3e0dd9061d30e6438710e137e923d56cee90be4aac4b9f940a79aac60eca8cee3c4800831e7f57c1893276449e18a9f58c3f3664d810b08
+DIST cucumber-7.0.0.tar.gz 406986 BLAKE2B 6d06d40e7b7029f3f5fea782b5060cf8985cd65334c722744132f40048d1d261963dd4baaa80a8fd44b18d66b63b08960350abedfbfd4d95e0a033a22192d010 SHA512 ca083c2de895f11d7cfd955c216e1e2c52ea9e5ed0034aacbec44e5daf1809e6a67a4621a64a5f236c6a0be9d8057beb917fd00a5f03191fe3d9d2c8814fa22b
 EBUILD cucumber-3.2.0.ebuild 2864 BLAKE2B ba02dcb6f95ec1f5bea0ead4f3751e5ef8239886639225bc8d7bf473a157f623edfab6562f8c59691d5fc2f301fd68178824968f66f514d57d1334c194e8268a SHA512 d95106aeb1be4f9e5e790f317571ad74a96a0a7ac6d3317ffb30485a99e0cbcdc28639e8cfdaf4586f09f2be7609d4d6855014bd6344234594c749bdf61966ce
 EBUILD cucumber-6.1.0.ebuild 2554 BLAKE2B 5705b28444f15db814ae30cfc317d1350b65c3f639cf383df0f5fc22183ba0442b44cab55359ce0acc6a458400f6970627f697c1552108e3ae0d2eeb9d0f2d78 SHA512 d588448b97c1d0e3ba789fdf3c872071cbaf2ab227f80a4b0593bc194073161e15aabc9f352b8977a4b4f9d4ea8e99bf3a5d773e8a2795edf98f7c414c74eeb7
+EBUILD cucumber-7.0.0.ebuild 2564 BLAKE2B 9fca07ed3c611b4d9f9fe9107a4d25a0fd9c54c224038a3c844b30ea09a2e79479468c44cffdff4f9f7aaf705d622c4eb6442de14a43b3d25ab714bceccdc7c3 SHA512 15c0c89cf5d6650118eed0f8a7afb4aa587d84ac1f141ea9044e6c5fa2bf0adcbd96a97b647f43c1090bd9b131af9aed26506e8ff6c919c1fb2935e8999cbd61
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-7.0.0.ebuild b/dev-util/cucumber/cucumber-7.0.0.ebuild
new file mode 100644
index 000000000000..0a0684b7343b
--- /dev/null
+++ b/dev-util/cucumber/cucumber-7.0.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP="cucumber"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		dev-ruby/rspec:3
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/syntax-1.0.0
+		dev-ruby/json
+		>=dev-util/cucumber-3
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-3.2.4:3.2
+	>=dev-util/cucumber-core-10.0.1:10
+	>=dev-util/cucumber-create-meta-6.0.1:6
+	>=dev-util/cucumber-cucumber-expressions-12.1.1:12
+	>=dev-util/cucumber-gherkin-20.0.1:20
+	>=dev-util/cucumber-html-formatter-16.0.1:16
+	>=dev-util/cucumber-messages-17.0.0:17
+	>=dev-util/cucumber-wire-6.0.1:6
+	>=dev-ruby/diff-lcs-1.4.4:0
+	>=dev-ruby/mime-types-3.3.1:3
+	>=dev-ruby/multi_test-0.1.2:0
+	>=dev-ruby/sys-uname-1.2.2:1
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' \
+		-e '/nokogiri/ s/1.8.1/1.8/' \
+		-e "/json/ s/, '~> 1.8.6'//" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on unpackaged packages
+	sed -i -e '/\(cucumber-pro\|webrick\)/ s:^:#:' Gemfile || die
+
+	# Avoid specs failing due to differing deprecation message
+	rm -f spec/cucumber/deprecate_spec.rb || die
+
+	# Avoid failing features on new delegate and forwardable behavior in ruby
+#	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
+
+	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
+
+	rm -f Gemfile.lock || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index a7acd951ef59..bf85bc8be3ac 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,7 @@
 DIST diffoscope-177.tar.gz 1590984 BLAKE2B 94daf9528c8fd0ad6ed89bdbee7b21352bf33dcef2ae7e526ea3b1036d92b6fecefcb0da46b7eedf7af1c8bd7995e73b8f0a5104c02f4db534f7bcc465c803aa SHA512 674a5cc364927437a79420b0965eb6958bd09df58a1238ea4d953bb2bc0fbdde75e42817370dd3cdab0bcc59551e1cff70db72298087af551d5dfaee57995811
 DIST diffoscope-178.tar.gz 1600094 BLAKE2B b40e45748be56e49736a826decfb3a8c3ebd91983755719f2665733ceb6ec4e860265c33b5a3c15bc501abe4efdbecbdf177431bbbc79f1ad758c7deef83e1ae SHA512 706c95f5c04cfe081fed7e3e5ed73579949c948b15eaf0f984fc7d406b74007859f7946c44e4ca13e1210b105ed65ea68fd1f03452a50f161ed27f996f4f2540
+DIST diffoscope-179.tar.gz 1600145 BLAKE2B 64b7db8ad53980b80b3c563797736032a235d82b57dfb31496cfbd19978734759919482855ac7dadb62573f950294f02987fd9525b00886e56060450df390915 SHA512 7c3a73097bda2fd55414e52f557707afd08728c73305b55dc9482aff092a65c9bef33913c5e715ff6257aec6cc67095abfec3e8e23f002d43bf9e77e0d565154
 EBUILD diffoscope-177-r1.ebuild 3325 BLAKE2B b11da425c3c3f5cbf6b6c654bc203c3d6bf56908e2dbdf35d9262a1e5b969655a62aab9aadf7501d6ffcf5c51a7c27a088dca858e81d6b041b72c52d53323da0 SHA512 137eee2580e2693c71fdc72c6cad6499c8be5bc5bb9c3eb302ae95578cbcd15b91a003357eca753392c69aa726797a8e550d7665811370b76fa54dc67bf3a55e
 EBUILD diffoscope-178.ebuild 3340 BLAKE2B 6100a3b1d8a2f4ed70ead3f59a2734e6a9844cd85e68d2824e1f27e9d12bce575f2b4e46453469ad227d6f9e238b3b17e176b58e1cec6e9e8895e5f57315dc0a SHA512 28cc4833596e5a91ff194c62c194ce1d8773961d0b7498d29a932db19726e196cd3d429502c47bea46edea986784fc041f4f121ab3a4a853cd823e1949605df6
+EBUILD diffoscope-179.ebuild 3335 BLAKE2B 62131fbcc69564f8efa0c11a048a5464f0b6306d5c8b939a499f973d895926c92d2a1767d9f2e7c91ecc4fa3866b2103b2fc693195f1d1a472df00e087a233da SHA512 f86b53fd970f20e927f5b8a21434cbcbac4c22e7d622a7d5e2752ed059cfb10ecfe4ce299dfab2b329eae711d978b1ba5937f0e9a555b7944f51660179e2abc0
 MISC metadata.xml 2077 BLAKE2B 2f4d188accf1f75c139a388f564ef5130ea8e74e403072871e4b73b848eaf405076bae7190565f374c193cb4f3fd0be16e3c781ac73df1d1cfb36101142b59eb SHA512 683e181724871d636610c7cfa93c714ceddba7e95b80fda8837e04b396f63049307b23b0471cfc19c46de5bd8b6f7bc868412f8f1c817933ac9507e7280b2272
diff --git a/dev-util/diffoscope/diffoscope-179.ebuild b/dev-util/diffoscope/diffoscope-179.ebuild
new file mode 100644
index 000000000000..ee2bed80f614
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-179.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="ncurses"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+
+RESTRICT="!test? ( test )"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-text/docx2txt
+		media-libs/libcaca
+	)
+"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	lzma? ( app-arch/xz-utils )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local exclude=(
+		# test seems to use different tarball
+		tests/test_presenters.py::test_text_proper_indentation
+
+		# needs triage
+		tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+
+		# needs triage
+		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+
+		# img2txt based failures, bug #797688
+		tests/comparators/test_ico_image.py::test_diff
+		tests/comparators/test_ico_image.py::test_diff_meta
+		tests/comparators/test_ico_image.py::test_diff_meta2
+		tests/comparators/test_ico_image.py::test_has_visuals
+		tests/comparators/test_jpeg_image.py::test_diff
+		tests/comparators/test_jpeg_image.py::test_compare_non_existing
+		tests/comparators/test_jpeg_image.py::test_diff_meta
+		tests/comparators/test_jpeg_image.py::test_has_visuals
+
+		# docx2txt based falures, bug #797688
+		tests/comparators/test_docx.py::test_diff
+	)
+	epytest ${exclude[@]/#/--deselect }
+}
diff --git a/dev-util/dput-ng/Manifest b/dev-util/dput-ng/Manifest
index 5a792e338e17..e5fe4fbc9e82 100644
--- a/dev-util/dput-ng/Manifest
+++ b/dev-util/dput-ng/Manifest
@@ -1,3 +1,3 @@
 DIST dput-ng_1.32.tar.xz 86280 BLAKE2B 7e195eab4f48d77968b866185e337f2b51113f7e11cfa4929d47e79082c2fa866af2c8394c50816b650f865db9ef244775618a05a6b398090366d342a45a3db7 SHA512 596247eecb2dce080cd6f3cd1ddb1364cfa00fc3048081149e4d6dc35822aee10fa10ec25ed91154b477a909cc29dcf17cb38ccefa649f40eb70c16e0a575b2e
-EBUILD dput-ng-1.32.ebuild 1854 BLAKE2B 62e1a46ac3662978ca7f3ca45109c0686bc74fac927b172da64ea783b19ef874dc9711c7f7f135776deb7dfc0e2227ecbb2cc4878f29fe569d140349a4ace8a7 SHA512 e367726967391cf29c39d75f15f96d51038ff0042b79bca672ad12efbd8fb6c76f54c8bb8b04e9d8c7c055059c3e50e96615c14c99358be8401e67fba18a6678
+EBUILD dput-ng-1.32.ebuild 1853 BLAKE2B c09d2b90f848a706522f2d9ccff4f6cb1d91af146139b7cb1a2fa6ea63eeb022524bf58513eb92e5c27af166e65e825396f3599b4b188f463d65b0ab8dc5d07a SHA512 51880157823a098fc72b9e48fbc87608472e4e75e29fa35992708454ad017e10b528a1abb1fcf316774986584ea3c3b0e592b16e4e1f1f4045c129399722e5de
 MISC metadata.xml 397 BLAKE2B 4d9ba102aaba8fd35794cd064553a45edc66b0b845fbcd5660ad11c66fc1d7435423f79edb021da9e44683d2a157ca3cd057cc51e660ca824f6b75c6b4adf8bc SHA512 fafafc81fdef8bd5d2c4e2c58996be3c1c78d169d28ebcd493813f3aa84cb058cdd81d660ae9e1c7711df0f5fd0b0c9e7536538c15dc3ec015e152a79897cef3
diff --git a/dev-util/dput-ng/dput-ng-1.32.ebuild b/dev-util/dput-ng/dput-ng-1.32.ebuild
index 57dceeec7759..5b8509a72cc4 100644
--- a/dev-util/dput-ng/dput-ng-1.32.ebuild
+++ b/dev-util/dput-ng/dput-ng-1.32.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 80b602086396..852b6af6b87e 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,8 +1,8 @@
 AUX idea-community-jdk.patch 379 BLAKE2B ac892a7e52d5c592b193d80a7933529f15e21982feb4c4a4b5c8286c7479a342a0121e5b464922cac68e9b7c8e3f7a4293df42d30e6907365116e736d9c862b6 SHA512 f984855440d2d4b495d8bf1b1c3172c9842c096e8fda148d8b2d1980bc3d03061954db06f73513998e52bc161c35abdcec2b88e3b31b4e36605714cb85a66fa4
-DIST ideaIC-1.2.211.7442.40.tar.gz 650671989 BLAKE2B f4c585fb4ccbcdf3bef5ad18e7a26a76703ffdaf8a3e2f4625aa084fb1185835b1d2ad12f013235b09b7dfb986ec0f6fb1fa189c3113a6a3180d814ef6aa1167 SHA512 5d9ef9fc5ca95455726326616d3a9eb75559dc58a1aa5335287f873c17b77b944c3bf1503b32c8ec0b39e23efcf6bbab68825901b92a7db15030e1747af64561
 DIST ideaIC-1.3.211.7628.21.tar.gz 650820635 BLAKE2B fc313ac46f2b8acd791cd434568ee8f0ca38071df167c514e4fbcad11cc204b2cb78d525ec123389a086c6b947177d58cee359c0f67e981e65ac25f46db31027 SHA512 c4f8d5c6e79b3e77385334496855e1743dec5dc67c9c3ee9205596b437b5d863286bf36f75e802dc8b39057113c5044e122a9fe1f41c47e129db4ea5849e7eae
-DIST jbr-11_0_10-linux-x64-b1304.4.tar.gz 201507596 BLAKE2B aa83f396dd37a96c769806c3f95a4c78bcc31e9c8eda047903cbee932a84029ad7133fc03496a248c017795ec45ff42f30f3860780a00d9d766ac7b262019905 SHA512 0de75baac30dad42927fa0cef3b78dc183f4dd317f8426021dd51cf1288680bbc65ed934e867dfa3ca9397d9bd5cff4b4d6896eb4878323c8b0aaa2b39d33d82
+DIST ideaIC-2.212.4746.92.tar.gz 666332731 BLAKE2B 0ae035f39692b27e764f2ca20fa61c3e48623f35091ccf74a8f6894bb2e52937c96b54edeb9db513df3932f89447e34265c102b89c2ec8676ca32707b541d395 SHA512 29a92199606beb13c39cba7b26a2b1cbafd1be62be9bc80dd923581d741272cb114f3dcc004946500d365063076ea199d25665d1fd26fc69eefb27dae204d8a3
 DIST jbr-11_0_10-linux-x64-b1428.2.tar.gz 291458469 BLAKE2B 371467d94b5a77eb91859297eaf409e2cbfd3b5b0fdf75216bd3ffe65426b7ebb6e8ca86e43a8d5a15ad41ef8be07e4cd94ba507bdd98c8c68aaa25601a0613c SHA512 89b63a8f2b9cd9e2d2e598b82575c294cb756e772acd625c0412bc8c4dcd65649e84d100e1569cca318589d3d622c2380c980dc1a490c4812463f9a663eaad29
-EBUILD idea-community-2021.1.2.211.7442.40.ebuild 4160 BLAKE2B 87751186ef5f7bbc93359e38dc7595c8750a8c79a1db73b5f8f32a9c6263cd2354b49bb650f0c792781d657c039f4b9a64b9b9594c8c98a55f17421c769f4026 SHA512 3aa439f1e85a5789cd943ded4f83eaa46e0b62b882977ca0badaa3a76fa4fbed151e76ac6436dfb25b98f88612f91d24516adb4fe851c1a1288cf9604106a0e6
+DIST jbr-11_0_11-linux-x64-b1504.12.tar.gz 294383766 BLAKE2B e34675acc196352ece761906ad4d3dbf4ead00f0e008f9da6cc27ee057384ed418ac914e521d3db1e61ab7d62e9187674aa188da447957124276e3ace7f2f37c SHA512 3e0e464090af6f3ddb9e7b0f3711a950488b3e9b98c13761d92de2b8e29850208fa389589316300606887ff943511f8efe6bff0d6b478ce8c548984b811b1968
 EBUILD idea-community-2021.1.3.211.7628.21.ebuild 4163 BLAKE2B d82c511b8e1cacb65f2a3dd61c9451f900d7bb543c6481164de0694423c1d2cc0e34ab3f202846c4e935fc3052f32bdf5ed11793588207013415830afe78af10 SHA512 f5aebb9216a04d2ec02539514a51318238873c8bddcc457dda6f9f43bd61330b63313908c2ba642b8d7c3c4ef55ec51245c38f9dd51f5b7b65a7f3516c183040
+EBUILD idea-community-2021.2.212.4746.92.ebuild 4275 BLAKE2B 7578d4fbccc0f81d2a76cf76e0a0f591ab0f4107d76cbf8dd318b0060f03247e3fca4452b5b9fe91d4f5d1ed5817f4dd318d8ec1d6d6441c71b4e0a1f0b43255 SHA512 b73b2452217c7020789f99d8db55f2e2df8165cdb23f871cf592c4935df8fd6d41374a01f0542de9e43d44bba1e46c2af0ee62fc896273ebe7f04cf0a1e9c7d9
 MISC metadata.xml 453 BLAKE2B f244aa814b9eb5c6b00f6fea725a344a7413710b1fae03edc4590dfa9c102872e0e4d1cdb669f739854d7fac351002f7819aec371f3bd0eeef2fdd4aa2c8f60b SHA512 e6c5f1094ca8ba70b9bfd5b028f11542c8150cea0b543b939da144887043e4ee20ddf6cc89641329bde7456492d6def6f0e72092b7fa21095463a20aba9e0b03
diff --git a/dev-util/idea-community/idea-community-2021.1.2.211.7442.40.ebuild b/dev-util/idea-community/idea-community-2021.1.2.211.7442.40.ebuild
deleted file mode 100644
index 743e9e574dfb..000000000000
--- a/dev-util/idea-community/idea-community-2021.1.2.211.7442.40.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-2).$(ver_cut 3-3)"
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# ( jre 11.0.10 build 1304.4  )
-JRE11_BASE="11_0_10"
-JRE11_VER="1304.4"
-IDEA_VER="2.23517177.257203969.1622674002-682219170.1619910833"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz?_ga=${IDEA_VER}"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~arm64"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz?_ga=${IDEA_VER} -> ${MY_PN}IC-${PV_STRING}.tar.gz
-		amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
-	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
-	GPL-2 GPL-2-with-classpath-exception ISC
-	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
-	MPL-1.0 MPL-1.1 OFL ZLIB"
-
-DEPEND="
-	|| (
-		>=dev-java/openjdk-11.0.11_p9-r1:11
-		>=dev-java/openjdk-bin-11.0.11_p9-r1:11
-	)"
-RDEPEND="${DEPEND}
-	dev-java/jansi-native
-	dev-libs/libdbusmenu
-	media-libs/harfbuzz
-	=dev-util/lldb-10*"
-
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-jdk.patch"
-)
-
-src_unpack() {
-	default_src_unpack
-	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-}
-
-src_prepare() {
-
-	default_src_prepare
-
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
-	if use arm64; then
-		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
-	else
-		rm -vf "${S}"/lib/pty4j-native/linux/aarch64/libpty.so
-	fi
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	if [[ -d ${JRE_DIR} ]]; then
-		for jrebin in $JRE_BINARIES; do
-			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-		done
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-
-	# remove bundled harfbuzz
-	rm -f "${D}"/lib/libharfbuzz.so || die
-}
diff --git a/dev-util/idea-community/idea-community-2021.2.212.4746.92.ebuild b/dev-util/idea-community/idea-community-2021.2.212.4746.92.ebuild
new file mode 100644
index 000000000000..97f0372a2996
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2021.2.212.4746.92.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-2)"
+
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# ( jre 11.0.10 build 1304.4  )
+JRE11_BASE="11_0_11"
+JRE11_VER="1504.12"
+IDEA_VER="2.8475829.1475113311.1627561399-1267779196.1624449062"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz?_ga=${IDEA_VER}"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~arm64"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz?_ga=${IDEA_VER} -> ${MY_PN}IC-${PV_STRING}.tar.gz
+		amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+	GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL ZLIB"
+
+DEPEND="
+	|| (
+		>=dev-java/openjdk-11.0.11_p9-r1:11
+		>=dev-java/openjdk-bin-11.0.11_p9-r1:11
+	)"
+RDEPEND="${DEPEND}
+	dev-java/jansi-native
+	dev-libs/libdbusmenu
+	media-libs/harfbuzz
+	=dev-util/lldb-10*"
+
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 3-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-jdk.patch"
+)
+
+src_unpack() {
+	default_src_unpack
+	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+}
+
+src_prepare() {
+
+	default_src_prepare
+
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		done
+	fi
+
+	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+	if use arm64; then
+		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
+	else
+		rm -vf "${S}"/lib/pty4j-native/linux/{aarch64,arm,x86}/libpty.so
+		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/x86-64/libpty.so || die "Unable to patch libpty for libc"
+	fi
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	if [[ -d ${JRE_DIR} ]]; then
+		for jrebin in $JRE_BINARIES; do
+			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+		done
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+
+	# remove bundled harfbuzz
+	rm -f "${D}"/lib/libharfbuzz.so || die
+}
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index af74e8f70242..726c352f57e2 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -2,4 +2,4 @@ DIST include-what-you-use-11.0.tar.gz 603435 BLAKE2B 7bfa37349cc4bf5d07033c28d9d
 DIST include-what-you-use-12.0.tar.gz 742573 BLAKE2B b8cd90db490d13f140126df8955d0968a9248480da09ca29b82fe1178c779ca75e6f29239bc6fb1556200c7d7c498f2340839e8500455ecaed9e6199fd3d55f7 SHA512 2923e18c40ddc5c03458b896d991adde03d489c6645ecc3cc4f69a508e323534afdef3233943e99533ffc21c64a10a8a5c635dc4797a61edf09d0a7a918a3cd5
 EBUILD include-what-you-use-11.0-r1.ebuild 1308 BLAKE2B bbc6ca260522f5cacd844c509c41e104eea86a97ccf65c9ff61a1a64a63b106c75cda0b9c61b12b95cd0abd63f50d32789b06ede0e8024ee9b08e9ba607f77db SHA512 29e627efe52e28b9fb1aa4dc3ef65fb49d7abf546f1d3953d1d931015568b4c65c1bcb8e7250b01d6ab32a746dc83fc87840396831b0a2179577652d0102526e
 EBUILD include-what-you-use-12.0.ebuild 1308 BLAKE2B dbafe04ed482d17721ac590a324cea24cf601de45af8af3cda3d744f58febd914b3b5cf2b48122002191e6c6bae34a1daa2ffe8bbd3d79d4fdb6d63d7f922dea SHA512 edeff418ef2284a6a60aea486926ac53c37059cb66a2a022f7d06266ef38ac76bfa8e5b94cc562013bf3df88cb0caf75b5d41bd8a0430d0d498f03e14233d08c
-MISC metadata.xml 273 BLAKE2B a07c15f597f53a569281e56cd4b23e1e22ccd8cb6ff5978418dd25d368f1f34c143f7b4675feff746858b71440aca49f2b31213c8689b59b3eff77e5b1387c9b SHA512 f6cd77fd0312ad5cee0ea22cb301772dac8f2327d5159ac19767b6203bbbc5c1196cf1858aeea2a033a725b19d6dc308a2aac414db5ee78774c09949de324a0d
+MISC metadata.xml 352 BLAKE2B 31dcaeca9099d9793d79b153d1f004f99ff1062bfd0383ef7f38c9c5cc515c72311323d8acb6c22c9134c4be21b1d0ea4513fff2ec4ff6e9370008ff4cd289f6 SHA512 a3fe7a709ff18eaa6322e0dc1d08a9b33b0a9f6525b575a4be8cc9b7c8613216afc7c8b0efba5fd787821a012f48e818a4aa9cd6f6b73656c917df9769043170
diff --git a/dev-util/include-what-you-use/metadata.xml b/dev-util/include-what-you-use/metadata.xml
index fd40528efff9..5fb0fc39368c 100644
--- a/dev-util/include-what-you-use/metadata.xml
+++ b/dev-util/include-what-you-use/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type='person'>
+		<email>flow@gentoo.org</email>
+		<name>Florian Schmaus</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">include-what-you-use/include-what-you-use</remote-id>
 	</upstream>
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 4637dd195e6e..ed69aa158b57 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,7 +3,11 @@ AUX jenkins-bin-r2.logrotate 479 BLAKE2B ccfe2179a1c3a5a49140373bb594fd4fd2c40ed
 AUX jenkins-bin-r2.service 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
 DIST jenkins-bin-2.289.2.war 74258848 BLAKE2B d217375b2846093430822392ec58fa0a44b1c2c0a311c8b1f057053911f0050c69df74d3a972c3ba84915a34ed999a8220318b2e8a22540234f89cc3d2e69194 SHA512 b1e82bd3297c2cc1c40dbe076d57eaaeb73102389ea5cdbbbe599644b92e107cdd8d8b2604125683ac986db0eaaa8a33dcc769bea8ce56cf9b292e6dff0e5c95
+DIST jenkins-bin-2.289.3.war 74258876 BLAKE2B 0964ce0e85a2db33c4f66ac6fee241732900dbfc00a11ddf0038fc8c97eb0c7b4bf52f2d620bfb3e99f476e14041798f163443390fd8b02269fb5818842ab5e4 SHA512 290cd54afe27298f1f4d665bfb5fdcac4247bb5bbc6ca6f1e0e722b7bd6a4a207cb5cc644e9b10c21eaa91f91a6142342312d486f54609dee041e517bababf7c
 DIST jenkins-bin-2.300.war 71017525 BLAKE2B 26fab2a5f26a59a2e137f8a3eb1b84e17a14c48cf7ce8171176ad60c66acf939a73cd397266abd3d779f1fc293acbae96076bd506e53cde2ba5a4b7630f0a75d SHA512 fc9903d3e280af3ab68a3926950cefda13d77a03c1366f3a88c2681163da668793a79104ec6de153df76d32f655253a327e85e468449de81897658da4184eece
+DIST jenkins-bin-2.304.war 72319365 BLAKE2B 44b6b96db50351bd50960e3c6f247d811e2f66f0bedddf103a6884e682f2d9258a348b2bb7239227034cd29451ad38ff7d7b9c6a2886ba6e0470a5500da646ee SHA512 36e4b9b0f0eacdb103ef1400bdc8b94f21108499a2cee2ea3536c27f347c5cdccb37407dea441f6a4dade827cf9f0121b84fe8fd42bc3afa5b3e9e4012588a45
 EBUILD jenkins-bin-2.289.2.ebuild 1106 BLAKE2B 8c0c672d140152b492d16a6199e1cdb7c7cf6b43189e3f694e6d7fd9f14eb1ae56be43e05bececddcfa08efed55c5c453d31481e3bddc9d4e3c414791fa3e017 SHA512 909f9120605b66bd35369495ef5c6f5ad6be9f9f62e07502d6e28186807e7b6a8e218595e54ba468312003801d564a7cd7ae234b89f9bf09268e2f40defacf2e
+EBUILD jenkins-bin-2.289.3.ebuild 1106 BLAKE2B 8c0c672d140152b492d16a6199e1cdb7c7cf6b43189e3f694e6d7fd9f14eb1ae56be43e05bececddcfa08efed55c5c453d31481e3bddc9d4e3c414791fa3e017 SHA512 909f9120605b66bd35369495ef5c6f5ad6be9f9f62e07502d6e28186807e7b6a8e218595e54ba468312003801d564a7cd7ae234b89f9bf09268e2f40defacf2e
 EBUILD jenkins-bin-2.300.ebuild 1099 BLAKE2B b59b9cd91612f6f0d8f65bc28c21787c9853929306cf521b8779f81b4d2bbb59e555ca5b18a9a6f417acbcddb40a63b0f0440498301f03d90d9ff8efb64cca12 SHA512 47409e719a68d55bbc7ae5a12655e4eb78e160c7276ed7e9e93cd9dc258c987d669691077e612961dbb7009b91facd4e3aa92172d6acc6e21b36fd9b4ea98dbb
+EBUILD jenkins-bin-2.304.ebuild 1099 BLAKE2B b59b9cd91612f6f0d8f65bc28c21787c9853929306cf521b8779f81b4d2bbb59e555ca5b18a9a6f417acbcddb40a63b0f0440498301f03d90d9ff8efb64cca12 SHA512 47409e719a68d55bbc7ae5a12655e4eb78e160c7276ed7e9e93cd9dc258c987d669691077e612961dbb7009b91facd4e3aa92172d6acc6e21b36fd9b4ea98dbb
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.289.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.289.3.ebuild
new file mode 100644
index 000000000000..4f917fe82dac
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.289.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="lts"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.304.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.304.ebuild
new file mode 100644
index 000000000000..af8ebb51388e
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.304.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kyua/Manifest b/dev-util/kyua/Manifest
index b8e3d8f5baec..fb1eee2f3464 100644
--- a/dev-util/kyua/Manifest
+++ b/dev-util/kyua/Manifest
@@ -1,3 +1,3 @@
 DIST kyua-0.13.tar.gz 663776 BLAKE2B 5bb6b2a7723567395baeace0b70085a631856ac98ddb304bb5300f26bc89a1a1add589486cd08f1569ca9c7534fd5071a62cdcbb519a10d59221df63c0aef932 SHA512 80ecf4fd888d4759122f3c1d1d5b06a19135e06f7bca1ef8458c7a5e78c1b6baff54969c863c93f11c40611ca256fc0334402531397b16788fb3ec701dd278ae
-EBUILD kyua-0.13-r2.ebuild 632 BLAKE2B 570278222a50edd7345dcd05ac6c147846798e49b35668fb9fcd13fba2ea59c6a789d9bd941f7b36a572872fa88b7e4bd3f89cf13a14da5156b02892e7ccbafe SHA512 35e8ca3796ee809e6cab714fd5253837b2fcef84fe2580e10f06c446be7d407174f7553600046636f4d98ecdc336fe98b8b554edfe3143e99069085844519fb3
+EBUILD kyua-0.13-r2.ebuild 648 BLAKE2B 1e7867a823845f54becf8e88996c0ed537907014cd2e9767dff72391581ac47cc19c5e57cec5cc42d89bd1728b9fef261780bd3acb88f6a4f3fd2327dfd02dcc SHA512 92211e9b9cdaa6b6dc35cdfe62aee895698ccc162fd91161398d659a79eaa893a82cc09b5c66486ab82685bdd17d95907a0c421ef3e366ad74b67fa3090254dd
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-util/kyua/kyua-0.13-r2.ebuild b/dev-util/kyua/kyua-0.13-r2.ebuild
index 1a0cd80bcf21..812b610db623 100644
--- a/dev-util/kyua/kyua-0.13-r2.ebuild
+++ b/dev-util/kyua/kyua-0.13-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Testing framework for infrastructure software"
 HOMEPAGE="https://github.com/jmmv/kyua"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/kyua/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 
 # Tests fail
@@ -20,12 +20,13 @@ RDEPEND="
 	dev-libs/atf
 	dev-lua/lutok
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	test? ( dev-libs/atf )
 "
 
 src_install() {
 	default
-	rm -r "${ED%/}"/usr/tests || die
+	rm -r "${ED}"/usr/tests || die
 }
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 79df85ac813a..11cd0a5aa448 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -7,4 +7,5 @@ EBUILD lldb-11.1.0.ebuild 2343 BLAKE2B 7ac5a408af2ac8e74f9ca3bc7e8ea636e394a325c
 EBUILD lldb-12.0.0.ebuild 2415 BLAKE2B 72591b9369461530face31022adfedb46c27e973a05c19c55dc33c580fda116b1e8f22df0b760cbdffafc60ccee438009c7bb1175fcbfd15cb9f55c0084c34f1 SHA512 abce2969538626084d680561ca85ece8fdb999fdf9ad41487e60f6fad62bd628ccebee369b56d394588403f7a6c3a2911ac4f699d0c51b284a6ffcbcd22dff22
 EBUILD lldb-12.0.1.ebuild 2420 BLAKE2B 8fd461752260d2e7d3cde1112863d43b0681d46ad129d36056b73b03c67b13c1263656e3577ab04ec729b70af167796991d20c91cfda5643fd63c898a3f2a993 SHA512 d14631da412a5e822f98ae6bc703e66383d848ace0d705363a4d0bf8e8f4f9126a1c7a472a4805b495b185d91098748d35a7a89f4047456904edb97735f5925c
 EBUILD lldb-13.0.0.9999.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a
+EBUILD lldb-14.0.0.9999.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-14.0.0.9999.ebuild b/dev-util/lldb/lldb-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..468fe7b0cf61
--- /dev/null
+++ b/dev-util/lldb/lldb-14.0.0.9999.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-lit
+	# failures + hangs
+	#use python && cmake_build check-lldb
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 6e8744af1e55..dc2045ac7830 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -10,5 +10,5 @@ EBUILD nvidia-cuda-toolkit-11.1.1-r2.ebuild 6238 BLAKE2B f658446f6f597fabcf7314e
 EBUILD nvidia-cuda-toolkit-11.2.2.ebuild 7119 BLAKE2B cb904f01e369415a5386873c6da3d4d89dbad96e998c47190fc5f6eef2261df4d7bc96c508eb19031fc15a6dd7fd5340bfeb544f79f4fa1b7fdcb7109c1f764d SHA512 366005e64ce6ab58d61956a341dbf654df9876003581ef500dafb3e35c7a86af120267390365de55c91927bcb4edea08722708385be32fce0bad34cd7cc7b070
 EBUILD nvidia-cuda-toolkit-11.3.1.ebuild 7121 BLAKE2B 4e1a8edfedd8972445ec7eb413b86707f6accc3acfdda75620a4e14a36376205843cc73872b8e35845e6526cb147e64132d7c4cdc29e3ae218b559e67c3fda39 SHA512 46b28a75e4adea42d6ef06065a38aa13c4bb0acd1ff924b0e81ddf2f8b437b1e18bef85b81d3c40cb58e05934fa645ec08dbea5c2972d09bb0998f0c7a36eb4b
 EBUILD nvidia-cuda-toolkit-11.4.0.ebuild 7121 BLAKE2B 0db4166fc71c33c2bdf52c56e3ba17d502dbd20fbebb6ac65ba5887cefac8504e9af40584e3cd354fd25ee4f4c49eb39c87f04df418e2aabbda7838c937c3931 SHA512 99eea9176c4b611fa769c7be7da58afbad579eb2c732490136bd218d5aea73217fd4b4bb0259d00eb150617fbf6d4c76433cf528c6f7ea1381a1ee30227376a1
-EBUILD nvidia-cuda-toolkit-9.2.88-r1.ebuild 3340 BLAKE2B d7d1519306fe876262beef0f711c596db067cfb50c7352157d6067dbda117c04f96bd0d6822d80c025c37a25f0d5cfa43cda9d776bef94d0206d0a07dd6279f4 SHA512 1533d650246c23e44f7392f17e0edcbc1cfb9ab3b7c9afc166ab8674410fed1f766b994956e3de914e726edd8b767372e62ba497fcc8935701b80e292c728317
+EBUILD nvidia-cuda-toolkit-9.2.88-r1.ebuild 3348 BLAKE2B 4239f80dcd8e12f2bd275543a0587e632bd7f96ad3f5eaf251f4f52012ceceeeaa62e9613e92707186ee2ce43041d0d0a4d2f6ed8d90ea5a9f68b59f78c6a6c1 SHA512 087f2e5a7ec5a14dc56f8a71756e8a69f89cb582aaf7473003126257135ac7ea9a876eddea08a1458be19282df374af1d24a19fcafa0d5ed3ae3b559645c4538
 MISC metadata.xml 724 BLAKE2B fd9e30ae430f56599bab7004b9cd46a79bd9b94e75b0a4574ae393d8979b5e40862bf30d110d5d47186d74e629f035f854cea720d8393709d95a9c14b1185a26 SHA512 3a77849ec1bf2e61da35ffd76c20464b5de745c73abd14ffcb7e7d3b2f52e7d114c7d4630292ea219a23e327f1b6a0a8ec488a8cbdaf763a73554f17f50c2f7f
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild
index 1fc2740c1227..e83886f3dd49 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker wrapper
 
 MYD=$(ver_cut 1-2 ${PV})
 DRIVER_PV="396.26"
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 4b7bfc23a7af..1d7098a54191 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -2,8 +2,8 @@ DIST ostree-2019.5.tar.xz 1972452 BLAKE2B a8b015118855b8b0097f535ac074aeffc599c3
 DIST ostree-2020.6.tar.xz 2014456 BLAKE2B 97d84c6838993edfbabb598bce800332ab1c8b22c0431839f7129f2f57afdd71c1b8ea8b8d6c1dc2cbf8d7f6828d624394b5e8c533f7a98eb1b1c3aeedff92cf SHA512 1d8f8ccaa3e543a6f494d3be2a3651ad340846f0c314e003955260b7bd1d8c0421acf102ec2ca6580379c354bf4cfac0940e4e95b724b7aaf9dc8116085aa538
 DIST ostree-2020.7.tar.xz 2022004 BLAKE2B 2113117ce8553b7ffcfea17e1cb3a9c697d39b4933b48c30729af72fc833bb00f39e7e3a327efeebaac1df307b1f62ccf16a7772e12ad77737e2219c87623824 SHA512 f42dca3c9e1810c0421ab99588f27c625733b71ef811534b66e0c0c4afafbad5bf475e08feaf87c2f8414c38f127fd344adbb57a4b75001077aedbfe92af3706
 DIST ostree-2020.8.tar.xz 2081080 BLAKE2B e856f9642db9fd16e96d6bdc9b3f3be93989458d72258c4586e5a49e67c197d0b7b20cefd0b5a28d77dee986db42ae5584d2894005ede654b8320402aa3af367 SHA512 2523f5742c4472f8e64614bb99edc5aec1a8f8a837b54f67efba9760aefc3385014e1296c9246ac81b361f4588deb4794768a231bf8f338c24a14255ab63da04
-EBUILD ostree-2019.5.ebuild 2220 BLAKE2B c56fbde79b750df4de06f3ed175ad15011070c9b36bacc7bad3d2efc676b485c3c72b5b138e69ef0bf1f43293ef23f71699d5b9609a94d1a8aef4a267c81a3ef SHA512 829b080ab7ec39f2de945ef3c0ae23bdba3b17b544e2556809e4a25537e454ff5eee26674068eab80e8c326688020d26ba43c01f2059fc4aaaee67538d929ded
-EBUILD ostree-2020.6.ebuild 2248 BLAKE2B 94d7161089cac60244f39487f9ce2af3e231f0f312f4807f68b1bfc54b8719870b13f025060c76a8219aad10b57f5a08d6a4cee1164307e565235404bf226c1a SHA512 6db643fa64b224e5df5b6422ab420319f63e7a67d02c66fc4f976d4b2067dfadd98e4cf54bde6d3701c1554ae06a826fe1f411ae5f8d494f757fad50c7dcda09
-EBUILD ostree-2020.7.ebuild 2533 BLAKE2B b76dac4535d8f92f72a5fe1ccaf6832223f0cd9f7adc8e3af40437330a7ddc54d20e4a1dc4ab9a0b140935b0ab53b6c0a5cb3a35eb8cc8584b53637c07e9765c SHA512 b0a86b7a6e2cb160c905c1370769e2acfb39963190e4f8787d3d3144cf20be437e9c10076217792984c271277ce8a893014d48b2786ec04a875f76d808798b44
-EBUILD ostree-2020.8.ebuild 2530 BLAKE2B ca6daf80c7efca81044448b0bdb2ac42dc7e18d106a9b2f4c97e12e745e9e419a56942bd3a4c03483b223282c44281fad3854a6dad848e759ed65df68e38a637 SHA512 f053c3d1917a97a7bd8734e0330bfc2d995475b90a41457e646f736456966f87a88dda44fa842363fe45c97b596a1beb2fa80d4088dd49a6572e8bde6062eaa4
+EBUILD ostree-2019.5.ebuild 2221 BLAKE2B e50770f764770a23583e9392e83505907e5633d0d201aac8bd6ad558c3b6d7a91a9dd0497ec660e80f5113fc696eb9199fb76a68cd8ec7b52371f1907092e5af SHA512 de09aaefd77487ec238e941355172ecedc76dfefc708d0abab635a461f86199a57e422254b3bbacb46bed19729233915dd9221e8063e4889f4a430bbe56be7c1
+EBUILD ostree-2020.6.ebuild 2249 BLAKE2B a7f0195886ec3d0da5ad40825a0b043a3f654c1fec3469d1b037d8bf70a36f1cd43e27ab052636042feadbe218b5f54b56dc8272d4ddd83602944d70e427f8e1 SHA512 0ea92cc30d34f15e14a7012acb9ed5ca487e9de8e15599b436b510f0936c8ebe396dd23dbd72e41b3a36609596d64c3198350cee250554df92b385d2ca91b83e
+EBUILD ostree-2020.7.ebuild 2534 BLAKE2B eb5a2e37dd6013140190abd1298e88179a147df2c4c6fa7b880c8a09285757aba2dff078d720e0d8f6e38aa946c7f157afc91ec29dbcf998ce7a033f6958ad36 SHA512 8805e8cb12e1f0aee907bb8951b53e3ab373045874e98a31d84f45378005edf1db2ebc41e3430b2a13640e9248dfc1c83a08dd3e246ed48cf77dd2fbe5874e75
+EBUILD ostree-2020.8.ebuild 2531 BLAKE2B 4766ab79400f6bd586bbb6613816fe0ce8ce2d8e57708abaf23fcf7d5dc3c592aa97d6275d37273a41f2113c4f06ed8bf18a3723d003b7e39da0e1fde178c4d9 SHA512 850a502d58688ca713bb37ba734b41ea668a063529cefd8ed8cbdf27f0bd78c43ad517d1b5fbb1036731c3f3eb6783677fbf8d9be84e7e70a5c9f5f392607e67
 MISC metadata.xml 1989 BLAKE2B 783f5a34c80ba2bb20cb1660a72741d8f0275dce984b67038cdd7b05fe144fe97a134562dabaa53263c378d7f2bb0459f8cdc31fb13884cc03136133116c672b SHA512 31f848aeca7afb1b3f2d5f4e1d1ddea40715acf7835ae2e1dd8111153087ffdb02c3e423a9418fb790e4459385b19b16609cc413d70443f49030111a9df760c8
diff --git a/dev-util/ostree/ostree-2019.5.ebuild b/dev-util/ostree/ostree-2019.5.ebuild
index 68c74d15f958..d06c2895971c 100644
--- a/dev-util/ostree/ostree-2019.5.ebuild
+++ b/dev-util/ostree/ostree-2019.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="LGPL-2+"
 SLOT="0"
 
-IUSE="archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl soup systemd zeroconf"
+IUSE="archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl +soup systemd zeroconf"
 RESTRICT="test"
 REQUIRED_USE="httpd? ( || ( curl soup ) )"
 
diff --git a/dev-util/ostree/ostree-2020.6.ebuild b/dev-util/ostree/ostree-2020.6.ebuild
index 9e56361e7f19..5fd21f9d1b6d 100644
--- a/dev-util/ostree/ostree-2020.6.ebuild
+++ b/dev-util/ostree/ostree-2020.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="LGPL-2+"
 SLOT="0"
 
-IUSE="archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl soup systemd zeroconf"
+IUSE="archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl +soup systemd zeroconf"
 RESTRICT="test"
 REQUIRED_USE="httpd? ( || ( curl soup ) )"
 
diff --git a/dev-util/ostree/ostree-2020.7.ebuild b/dev-util/ostree/ostree-2020.7.ebuild
index 8d249133593a..20c372540e27 100644
--- a/dev-util/ostree/ostree-2020.7.ebuild
+++ b/dev-util/ostree/ostree-2020.7.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 LICENSE="LGPL-2+"
 SLOT="0"
 
-IUSE="archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl soup systemd zeroconf"
+IUSE="archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
 RESTRICT="test"
 REQUIRED_USE="httpd? ( || ( curl soup ) )"
 
diff --git a/dev-util/ostree/ostree-2020.8.ebuild b/dev-util/ostree/ostree-2020.8.ebuild
index dbca860caa99..c01961c4902d 100644
--- a/dev-util/ostree/ostree-2020.8.ebuild
+++ b/dev-util/ostree/ostree-2020.8.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 LICENSE="LGPL-2+"
 SLOT="0"
 
-IUSE="archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl soup systemd zeroconf"
+IUSE="archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
 RESTRICT="test"
 REQUIRED_USE="httpd? ( || ( curl soup ) )"
 
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index c4f2f54cba68..0c60413b22d3 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -7,7 +7,7 @@ DIST pkgcheck-0.9.7.tar.gz 453478 BLAKE2B 486bae68af1757fbdb4b109b34cea836cb6dee
 EBUILD pkgcheck-0.10.0.ebuild 1507 BLAKE2B 70f6f537fa953ec59c3ed9b0ea017bec0fb7c569e6006b066e35a2b2b868a4e75da078c5bd60faba16a9c80f8e011a565366e611b9202628f073a27fc4e47aee SHA512 07dbe05c8d6a60d411bbd2d07e890b914c85703e024822ad7b6720818d15e6843ea05f95bfeda54b3f4c1f8db96948d25e719bf5d415082ad9c038a0403c50af
 EBUILD pkgcheck-0.10.1.ebuild 1507 BLAKE2B e9faf1f21afbd8a9846f54cb795083ecdc48853e47e171b9cbb9e7a9e668a3b09caaf1870a31830d33488c4841e04c3fedfd8c2b1219cb391f74c981dcd999ae SHA512 0b1b30f6e5fea0bc8175206903e90ef60e65d0456fdfb14448342abc811e4e9d0333000e8cd6fd79974e22803673f64349cc8404c1ed8dbff4e3f54b58ddf3b2
 EBUILD pkgcheck-0.10.2.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
-EBUILD pkgcheck-0.10.3.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
+EBUILD pkgcheck-0.10.3.ebuild 1512 BLAKE2B efeaa6e4cc534e46a35b6785c5ed17d691b53502480bd6fe33487891d55920a1c4759705399fcbb7d17004936bb45500863bba7aa8abcd87ae42c686a81015b1 SHA512 208c9a6162bc712ad3107bff0a4f1fae1b4d419d2062c600e3b065bdd78fc930aaf38b04ee976724bcd7f76f1d27c1a30b895ee1dd52f3468f42e2bd219de55e
 EBUILD pkgcheck-0.9.7-r2.ebuild 1544 BLAKE2B 7bea3bcebc9b0397682d6ea9c39798a59857ea9276095548927e6fc6f09c606e60504b7a6ebba401fd00c55238489211889744b6480e559b897d7824fa33bbd7 SHA512 1de34366c44024ea677d6ae3e41a2a71819490d22a7f0813307f790ae3f3b019daa07d259ebc2ffe39121588dfc3a9183f46cbc7858d1c17e631ff2f6668bc50
 EBUILD pkgcheck-0.9.7-r3.ebuild 1604 BLAKE2B 0e6042b6fe93f617544b08d728eb1bbc4217e6e1b675c4069990c02f99937c9ba5668a68f3b5b595c688eddad5a47a96140f58daf9ca94a803eec7b933dd874b SHA512 6a3dd00c5158e8d004a002e820dc4553294c6faa2759ed672dc91f8664725bf6e7eaca8c1f7417a6d232566fe6031dac8df045307beba52137d003d8a1b76b28
 EBUILD pkgcheck-9999.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.3.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.3.ebuild
index 9a255efb0571..0d14dccfbd9b 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.3.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 7fc67cee8a48..14a6aefef453 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -3,7 +3,7 @@ DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85
 DIST pkgconf-1.7.4.tar.xz 293888 BLAKE2B af814174b59e3ea7009230f639a6237226caafb22300946904dd10810c0b5cfcbfeea21767a3a1d2c2b5cb1fe4b7b1d995a52d820fcfce3adb383c66762b7576 SHA512 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1
 DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28
 EBUILD pkgconf-1.6.3.ebuild 1668 BLAKE2B 2343a05fc855973ed0868d066c1ff5067905b0378676efefa47211e06201f36bb3171b04754fa82f6c5044baf6465f958f7880c0285224f9431838ff86e6142b SHA512 6033f6726fd819119b2e6506e68b0bd22b50f754fa4f12c2f689b4d7a0a03c20d310203ce92eba07b90313028904f6d30c116933b305d7442438d1c8b6d9612a
-EBUILD pkgconf-1.7.4.ebuild 1877 BLAKE2B ead731a694619bdc4a2d4486ea38a6a23c73cc93415733174dfb8b26175456ece04c167e1c919f0fedadfe205beee6d0ab69050351c86d6088465ee74fd07b72 SHA512 f1c149a23adb6ff971a05aa29ae89b61fb802a567791549317b7acaac5886ba7939641e0ebf32009a9cf4703f4bad677c69f31ff75e25690c22ae5e4f2e96064
+EBUILD pkgconf-1.7.4.ebuild 1873 BLAKE2B ed29dd0df41ffce8527085cc96af044e11ab33ecaaa91897cc3e174a4c1a7559b60c4608bf4192e917a2c645482af7cec704e7aac28adec1df53d910c2724d60 SHA512 7964d22b28ab00ee8d8ba63e24c54ef66366ce8e961a9f28142d6e00731f4870d598b08f7354f4ceff97e40da3caad60bb9066397019b061fd09c758af2a0b68
 EBUILD pkgconf-1.8.0.ebuild 1880 BLAKE2B 52f19a7111de7ba6de8906d59dba37be6c27cb75daa17758dc8f65c98b7fa9b63592b35b665d28db897e3e5dbe9590adfc601555b5dbc4dbd27891e9859209bc SHA512 abec978faca72c4286ed74fe9bd6479a78b8ae87fca9ce29d8552cee1ca7de0f53eb92fe13918700fb0dc1c09e0e6075e24777ed8fd9c2febe999e9b1889f09a
 EBUILD pkgconf-9999.ebuild 1766 BLAKE2B c470aa4fc8eeb6c2e61c636eab8d9b1684eda76d1d7f2c5734e5159ae9ab4f905adbdb372166ba38ab13bc5bf83c92022c07023a0ca7ac512baa0c348086ff1a SHA512 c101e8a92926436c40a82da763c6a92a43e503b10014cd59ed202b1ea257de52f12e5c8d1bd91ea23aa07880e11a0bf8fbaea89009cf563fa9495e3b8b8a9efe
 MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/pkgconf-1.7.4.ebuild b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
index c943f65e8802..2b50f55d8aa2 100644
--- a/dev-util/pkgconf/pkgconf-1.7.4.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 57bf56708d03..5f56fec94d7d 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,10 +1,8 @@
-DIST pkgdev-0.1.2.tar.gz 32579 BLAKE2B 42ecd7403dcb49b256539e12c22a6bca72884bf55139c5f0972961fbebf4f976dedd3a4fac1186cc1d5af62d339ac7dd3eb20106ff1dcc7b8c264e1c4c53c3de SHA512 c224a054612fd6caa9c66855be9bb5ed439c3ac2abf5b32c4ac516d87fa4e345fc8bc328aa74b4fec44d7fd319322bb42af48f6dfdfff941e3b819a75b9fae9b
-DIST pkgdev-0.1.5.tar.gz 54386 BLAKE2B 1e3b87cbae263dba5dbb46f6a5df95d1f2b76382e52bff10a445abcf9af7c965cadd6e0134c3cfdb550fcdd9c96e0f4f40f3f4d6d9097913ef3ba9f309885b98 SHA512 4617f5f2e15bd3833debf76fdf02cdb9bc10e27285e18ca5958e197ab89d7392731a7f5e3846e92764d90b643f38eb1834c8d0a724e934f623edd1675a705b9e
 DIST pkgdev-0.1.6.tar.gz 55644 BLAKE2B 70c0c040ca277b108515d6c3fcbdecbf7ee20963bdc2d19218855a8261830f1509073e5a09d0daf6ccb6a276dd19401c9266d74e5c5c0b60ceb234a63779f38e SHA512 5f274d0ddbff0535862827e3e97d3378cc53c3fa2528e35ac4ef8c4bc3215de4eac2b62b2f2fc1c499f360a0594fecdb722613592ac86d01bef3f6abfc522c1f
 DIST pkgdev-0.1.7.tar.gz 55781 BLAKE2B 218842bbba75a0cc3d6005e75859ec679d2c03019c92e813c174554262f7d63bdfe1176faca102e91cfbec073d2197792c85b9c46318e6a86d7fa74d9780303a SHA512 bf68367e13298845c08089cad47a7ccd536bee43d6fb6993f3d0ba283331045032ab1b82d195cffe5368e844ea05ad8cee5b5cd248b69d18f021bb26a26145ff
-EBUILD pkgdev-0.1.2.ebuild 1543 BLAKE2B ae64288392fcb57bb88cf1d5c11e83775f1790eaee84c8b8e417bb433fcf2d30e0daaa4f121b29e78b89cb2d627c0be5bff3e8f54b0b36178eb95f60a53f01fb SHA512 46e59fc344abee0e4051e5ebea9029442aa41ed810fa3bd0344a24f00344bd59df33328fd6e50c34b1b1f6b79493972eb5d476f5ecc9f0764c3ae08387df6f14
-EBUILD pkgdev-0.1.5.ebuild 1559 BLAKE2B 0b3bf7f6063afa1c9c7ae29b7992bf6fccfdc1ac2206792719c3e5eb94a1d6c87b6cd54bba0b20e0cc541b8a1daf5b905ab1705bf078f3bace4e65fb5e2734ad SHA512 58b304e739e9a818c927d358584451f029b6b54670ba6de3f7ae69ad0147e870eccfee49a20e8ac0ed1e0d7e494af9ea05ca08d044925fcf7ba42efcb9f0e71b
+DIST pkgdev-0.1.9.tar.gz 57093 BLAKE2B 5f5d9b4956cdc949d5e37c24160c692c32cf7e5d9fe90c167adc364993370dc42291edca048db3b0a2f17b199003aea61bd6b541bc58de1c1a084365ce517660 SHA512 78c117163549cb021e8cb9bd65e9a7752633506f3db825133fc3c4c515549c6e10dc974164489c06f94c1a1e25acb8fe050a57754353b907d6026892ef034cb2
 EBUILD pkgdev-0.1.6.ebuild 1558 BLAKE2B ea3a783859224ee8a89a34e96d63a8bd0754918ede96126df4875bed41d25f2813bdb09659d542466fa2023c534d7623b27157a28b63070f9a971bb95619337b SHA512 8d275b3d06f53eeff7d0714c1a7dd7b2b5132a1394543f16ce32945c3d4de45509e30476770f291f6c5803b45b0cb3bc53b3a80bb73c0907945f85eb52c8f207
 EBUILD pkgdev-0.1.7.ebuild 1567 BLAKE2B 2227adb507811b67779e7b8a603a9d54e06685ba7ef1d54d58398cec5a300de918cb2d6f2ac1860b6260faaaa1b3a61bba365e89a99b21d9573be6c8c72633c6 SHA512 7bfbc08935cf2ea5b17850e71220606eb844731e3490df884e672f8a4157b7c15275e549b47841207be985f669ad40d1a81c135140b232d85d1c1e875043c0a8
-EBUILD pkgdev-9999.ebuild 1558 BLAKE2B 8441109b90fa8543b4d8f3beb57340b0de8baa6588844ed7f3fefb31ef560b19af5813f5a42d036da9242dad0caf5c4bd6367634a28b692fee5d2f4deebf6a18 SHA512 a63dbe4563d93a1961cd4a0edd29c32fe2acf73cc79b72e653e37d9879db06644812a6a56ac77e8590c3ea12c26fbc14833be79be908b9d2002c9a008213060c
+EBUILD pkgdev-0.1.9.ebuild 1567 BLAKE2B 2227adb507811b67779e7b8a603a9d54e06685ba7ef1d54d58398cec5a300de918cb2d6f2ac1860b6260faaaa1b3a61bba365e89a99b21d9573be6c8c72633c6 SHA512 7bfbc08935cf2ea5b17850e71220606eb844731e3490df884e672f8a4157b7c15275e549b47841207be985f669ad40d1a81c135140b232d85d1c1e875043c0a8
+EBUILD pkgdev-9999.ebuild 1567 BLAKE2B 2227adb507811b67779e7b8a603a9d54e06685ba7ef1d54d58398cec5a300de918cb2d6f2ac1860b6260faaaa1b3a61bba365e89a99b21d9573be6c8c72633c6 SHA512 7bfbc08935cf2ea5b17850e71220606eb844731e3490df884e672f8a4157b7c15275e549b47841207be985f669ad40d1a81c135140b232d85d1c1e875043c0a8
 MISC metadata.xml 426 BLAKE2B 32d3852a1fcd8dee461509886d3d031570f6691e99dc919a6acbd12d94ee8650af4fb7623d3c7582150fba36c656aa59c580b1b743c65e736e17508f01707b1b SHA512 c0f6689e722cfab69e8b4ca174c5aaedcd2702147d6b4c3c01864e1df651f9a7622731af70c717349654558792fba5261c339a72aeb8b0d7b06bc7752bd961b8
diff --git a/dev-util/pkgdev/pkgdev-0.1.2.ebuild b/dev-util/pkgdev/pkgdev-0.1.2.ebuild
deleted file mode 100644
index fe9195f2ce1b..000000000000
--- a/dev-util/pkgdev/pkgdev-0.1.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~x64-macos"
-fi
-
-DESCRIPTION="Collection of tools for Gentoo development"
-HOMEPAGE="https://github.com/pkgcore/pkgdev"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
-	"
-else
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]
-	"
-fi
-
-# Uses pytest but we want to use the setup.py runner to get generated modules
-BDEPEND+="test? ( dev-python/pytest )"
-RDEPEND+="dev-vcs/git"
-
-distutils_enable_sphinx doc
-distutils_enable_tests setup.py
-
-python_install_all() {
-	# We'll generate man pages ourselves
-	# Revisit when a release is made
-	# to pregenerate them, making USE=doc
-	# for generating the real HTML docs only.
-	if use doc ; then
-		cd doc || die
-		emake man
-		doman _build/man/*
-	fi
-
-	cd .. || die
-
-	# HTML pages only
-	sphinx_compile_all
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/pkgdev/pkgdev-0.1.5.ebuild b/dev-util/pkgdev/pkgdev-0.1.5.ebuild
deleted file mode 100644
index 2aac0526b81f..000000000000
--- a/dev-util/pkgdev/pkgdev-0.1.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x64-macos"
-fi
-
-DESCRIPTION="Collection of tools for Gentoo development"
-HOMEPAGE="https://github.com/pkgcore/pkgdev"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
-	"
-else
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
-	"
-fi
-
-# Uses pytest but we want to use the setup.py runner to get generated modules
-BDEPEND+="test? ( dev-python/pytest )"
-RDEPEND+="dev-vcs/git"
-
-distutils_enable_sphinx doc
-distutils_enable_tests setup.py
-
-python_install_all() {
-	# We'll generate man pages ourselves
-	# Revisit when a release is made
-	# to pregenerate them, making USE=doc
-	# for generating the real HTML docs only.
-	if use doc ; then
-		cd doc || die
-		emake man
-		doman _build/man/*
-	fi
-
-	cd .. || die
-
-	# HTML pages only
-	sphinx_compile_all
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/pkgdev/pkgdev-0.1.9.ebuild b/dev-util/pkgdev/pkgdev-0.1.9.ebuild
new file mode 100644
index 000000000000..8902eff76956
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.1.9.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc ~x64-macos"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]] ; then
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	"
+else
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
+	"
+fi
+
+# Uses pytest but we want to use the setup.py runner to get generated modules
+BDEPEND+="test? ( dev-python/pytest )"
+RDEPEND+="dev-vcs/git"
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
+
+python_install_all() {
+	# We'll generate man pages ourselves
+	# Revisit when a release is made
+	# to pregenerate them, making USE=doc
+	# for generating the real HTML docs only.
+	if use doc ; then
+		cd doc || die
+		emake man
+		doman _build/man/*
+	fi
+
+	cd .. || die
+
+	# HTML pages only
+	sphinx_compile_all
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 3344f643aa2f..8902eff76956 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x64-macos"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
@@ -31,9 +31,9 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
 	RDEPEND="
-		>=dev-python/snakeoil-0.9.4[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.5[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
 	"
 fi
 
diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index 8a5bd512a479..3da169b836a2 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -1,3 +1,3 @@
 DIST poke-1.3.tar.gz 6703563 BLAKE2B 7a1127d668b094f08d88fbbe1650a4604d91e4417e8bf7e1199757b6a829694d514493e1b71eb86fc56e894eec8f0ec2255784b76a3f3440af1f1671d851751f SHA512 74749c589daf17533807248febc54818445df193f4d25f665ab62f1c57be133c7f063da3b099b8af5544f88eecad79b10ca29d9d1ef18921035c0aa22e563773
 EBUILD poke-1.3.ebuild 981 BLAKE2B f8832e1bf8533caa2636b076b0bf3ba9d42b2c3fdde0f411609c337b874afae0b8c367caecd23546c2f0c198dbb06e2ff1e239f7d8f6c08a3fad664241bc3847 SHA512 821b8837f1d07aa245c0a02acda9aa9dc4b098860049f5a315df0d7e78f3dddc4bdb9e134f03b42ce01321c17250cd662cdcb2fe3f1c9311efab4f12889f6921
-MISC metadata.xml 373 BLAKE2B 5a16b41a8e507a250ba57aa741890c395eb484af1535229199399f68d62da619298d10583fd7b8d454139765526307ab3f0486814a5ccc22f32eae413e2f4abb SHA512 a74066509b1ac23992121781cb2befa222e250467e9d54ee1cff7d5e7cf5df81d86a44b0eef3768d22c0105f8f1136843f54ef1f5111e1ed8f3659f9eba1898d
+MISC metadata.xml 289 BLAKE2B 5ca0843940f5716067f3e3d330960706cf33865fdfd204abde2811a2ad0fa64ab16b43acb29ad459e9c0b0a66ade0820bba712a72b64e69fa76d425a7303885b SHA512 98948456fb1d3618ccfd08f6e81d1a66eb75e2ef5264390ec5ac9519a02e94a347b4bf3be10a3b4e55193450b1029cc866dacb12076ae3fe19129c7c926f6b08
diff --git a/dev-util/poke/metadata.xml b/dev-util/poke/metadata.xml
index 81c0a3800a8e..d5221dedc6b0 100644
--- a/dev-util/poke/metadata.xml
+++ b/dev-util/poke/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="machine-interface">enable machine-interface protocol using <pkg>dev-libs/json-c</pkg></flag>
 	</use>
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index c79098347ae8..34fd11f13209 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,5 +1,5 @@
-DIST RBTools-1.0.3.tar.gz 206634 BLAKE2B a058e9f501e5139fd550478dced02883f4fe49e3cfd9da961dfa53dd9552dee59e6a74d873f259ea3ce05884cfb0bf3e1a83d7ddcb696a0dc57139346ce81d91 SHA512 2462da124fb70df05712626451baa0294e82171bc860fce7dc0ddda7bee4ba6749d387c873b08c50f6936c539a13cd15c33bb02b7fd0f69a38c56723e24acbc8
+DIST RBTools-2.0.1.tar.gz 229394 BLAKE2B a3864c5a39854ffd8744cc562fb888aded06b86945b7b08bab1b172e557b80c0183352068722e6d530a7b0c2fae85f24ae1bbef9116538c5c31735ae5c47f313 SHA512 41ef3f6ad030e3551b76cce5358806442ddc78ad14cb3f2f5978d25858b44647fc80a8a98c84edc112d3e121748fa49aeca0ae24287c392d2f8d1d3b72df12ff
 DIST RBTools-2.0.tar.gz 229078 BLAKE2B 23a0c9e9241a6d989044a4197ed5812d81d43b10195788c7754265969166f654af5fafc5ac027f1cf6e9d00bdd7938455beef6719380e09eacf219fa13bc74ab SHA512 aa773744365fcb5bd2ed5413684290c1d794c8bc76f9f9d0fb9400ab1e2baa1b647db85b8992dfea3e3bffe7ee87f2d735b1e6d5385d621d011be62a64d8890b
-EBUILD rbtools-1.0.3.ebuild 736 BLAKE2B a9d814798d48f8cdb3d85f2785b4063482a95840260c1fd179088fd705541f8f1f11b89fe21acdf44791c8cd7dd3810f907248b51116d592807ca0eba2d21845 SHA512 19e3ca18693bfa872f066ebf56ce6ad2c65135ee637a472658b20ec84d84edec46bbd3877055dec93b9ab99c876bed5821018e88b44c90afea97d28eb2976643
+EBUILD rbtools-2.0.1.ebuild 1173 BLAKE2B a16b4ecf903cfcfe8a0bfecca89d6ed19a6148ad5f598c1d5ff927f7e089fbe87112b2dd9f49db69849604cbee954055dcc4a1e43c5ccc394e2a03583e77983e SHA512 fb041a21e5017f2ff5d98f43f063e50453444e294747aaf81a74255aeba6821bfee509ea1b92836f6831974c73a9405383e4aa20f573257cd72f8075d1f680e4
 EBUILD rbtools-2.0.ebuild 738 BLAKE2B d88fb41903444f565e20c78ddf05b73a75526f6b87f113012b40469f4983d80bff471ddd265c716875246d895df19476bdae8236f1b95aeb6f74117bb9b65070 SHA512 be221d9bd604c9f3780352d51ecace526779277354a8209235520c775f56d0b06ef402b50d34c9f3a719ef722f1db9ee4543642c8c56fc8b4e7528ab3f55033f
 MISC metadata.xml 217 BLAKE2B 92b85ca7d657eea200ee74bdafd4df6885c04b125bfdfb86650e2e1066c858aa8623f8b2a362780a200d7e33076129c9aab38a12f189c82d5ce1a9ae81257195 SHA512 1b17a615b7471a1e46b4c291aa7ff84348628ec0c3603e21db1994eb1e82ae28dc7e97321de022ccb7e4d2f411f4e7bcef5a79e93a4229126b9b58fb5d503478
diff --git a/dev-util/rbtools/rbtools-1.0.3.ebuild b/dev-util/rbtools/rbtools-1.0.3.ebuild
deleted file mode 100644
index 3169746ee8f1..000000000000
--- a/dev-util/rbtools/rbtools-1.0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-MY_PN="RBTools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Command line tools for use with Review Board"
-HOMEPAGE="https://www.reviewboard.org/"
-SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	dev-python/texttable[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/rbtools/rbtools-2.0.1.ebuild b/dev-util/rbtools/rbtools-2.0.1.ebuild
new file mode 100644
index 000000000000..4a077b612df6
--- /dev/null
+++ b/dev-util/rbtools/rbtools-2.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit distutils-r1
+
+MY_PN="RBTools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Command line tools for use with Review Board"
+HOMEPAGE="https://www.reviewboard.org/"
+SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	dev-python/texttable[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+S=${WORKDIR}/${MY_P}
+
+distutils_enable_tests nose
+
+src_prepare() {
+	default
+
+	# Avoid tests with unpackaged kgb for now
+	rm -f rbtools/clients/tests/test_svn.py rbtools/clients/tests/test_git.py \
+		rbtools/clients/tests/test_mercurial.py rbtools/utils/tests.py \
+		rbtools/commands/tests/test_setup_repo.py rbtools/api/tests/test_http_request.py || die
+
+	# Avoid tests requiring unpackaged test data
+	rm -f rbtools/clients/tests/test_scanning.py || die
+}
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index b6c20482ab59..737c3ca81cd7 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,4 +1,6 @@
 AUX re2c-2.1.1-sh.patch 1688 BLAKE2B 1143d1d5867c07aaa48e3c1795b1c4867eba665315a583d4991872b457a7ba222dac1c699917cf02b6d55306e6de3a5e0c65cf2f0505ec4283b7833522b5bb39 SHA512 33b48ee8f4ab871958eff901596c1282823eb597c7679ad8e11e72a84e4da1d72b01d2732f0d251c5f1dcb8656c86c60fc31f795cdd679f0d66a4053cb49529a
 DIST re2c-2.1.1.tar.xz 1340740 BLAKE2B e0e3cdb7ea78324467a8fe3161fe9b0cc1eb44baf9a554b892e1f7f8b8d089e8dca58da347527c595881e1119344858694c133ba0f1676424914f6518adbf4f4 SHA512 13edbe961e0482677aff52ada93129500c10e134b579365f1d0cd180a898251f3060f1fe0597fc6c900c0ea29b1eb28fc2519b0ebfa2ed496a777bf7e138feae
+DIST re2c-2.2.tar.xz 1460740 BLAKE2B f9e5920cb31c7ae8fa9f880be30513eee33ad23bcc7d44b24bbcb93376e13b092f6d0bee3304e49f87430be54b868c43115592a2accfdd94cda0d789b234f43b SHA512 8c4f18fa9a2ef6b0b5c03b73b8b7deafcbd7b17baf72e0008c9344296fcb0abeee6024d4a78ccb15b090e37ae67ddd6f2a68b4932331096328530612112ee37a
 EBUILD re2c-2.1.1-r1.ebuild 1031 BLAKE2B 37bd605831fcac4a33ed2973a9f419d71dd295e59d28227444bf664d4b7f4f568d43b161ba22dd92f08c20d82b0a27d5152b81ee4c7d8dbe4e4acb52304a5859 SHA512 10c26da7a45635380d4350a23cc0b4795bd9c4d8ffa7648ac5ef7051ee12c3e7bd875ba254982aad1b264b3b1aa1da8c30b93070390eb37bb398bbd96f192e51
+EBUILD re2c-2.2.ebuild 1002 BLAKE2B c6d4ed7b384c990ee56fc31a95530a2e0c9c55dfbfe894685bf5364bbe93dd51a567de725b5cf03d9dcd1762b01d45dd4c7e452848ae31b263f0275e2a24c963 SHA512 ce62682ceec2c95eda5b6e04c4b82ff8615899e7151f20363df29dda5c7118c1a5490582941b748098140e44890612a116dfd5427a8a5e82ec750922333fe1d1
 MISC metadata.xml 476 BLAKE2B b2dad245e1cdcbb73e8b6e53442f7e9ec41337746c50f026c0fda68d57ebe10fb6193a26fcf9fca11e23570f44b104bd40d22fa1283fa91034f7cb792d436463 SHA512 e3018ee81606a018d66169cd142a17a34248587b77deb4baeb6daae6aca2d9a70095fb5dc2180d146043030631172f6fa17b3c8ddd5bebe85eebf6f3be79f9ab
diff --git a/dev-util/re2c/re2c-2.2.ebuild b/dev-util/re2c/re2c-2.2.ebuild
new file mode 100644
index 000000000000..2c4d64c19311
--- /dev/null
+++ b/dev-util/re2c/re2c-2.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit autotools python-any-r1
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.org/"
+SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+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"
+IUSE="debug test"
+
+RESTRICT="!test? ( test )"
+
+# python is used only as a test driver
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--enable-golang \
+		ac_cv_path_BISON="no" \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc -r README.md CHANGELOG examples
+}
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 311191101757..53d23d305e96 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -7,6 +7,6 @@ AUX schroot_prompt.sh 73 BLAKE2B d833a51c7a36ba45b672e1b7adc1e371c3641b53c74530a
 DIST schroot_1.6.10-12.debian.tar.xz 83636 BLAKE2B 0289848f7e64983c06f47a70346e06d7024722c643034ac24745fe4548311b893053ec28891f39264cb0894c12236f4e8523b70cd83553d1a7179cbfc63cbfa3 SHA512 77ae2d758593de505e9381e4800eb17a9e14fb949a5bdb07b9235671ae4bd18c668aa9c35a1ba6340af93b308b5c3798afc83f14165e4b19e7cebab92b83fc52
 DIST schroot_1.6.10-7.debian.tar.xz 82524 BLAKE2B 664ee356f8de1215c761a771cc0700d25ff6c0513124f4d84d5b33a046cac6ff194b62dded1e8f966a922a013644edd3d9424b0d577a8bb2b371e23e8dd88ed5 SHA512 ee362cce46ec804cd0ad6bfe3c7dec37fdeffe56941d51aec9e9622057a4d2a94e47f7530d28862c948233c6623cfa4b4721c27f293e31a28ec0320ffe02a47a
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
-EBUILD schroot-1.6.10_p12-r1.ebuild 3505 BLAKE2B 7a57b2481fe1c47486b74e82fc442c7a190b7a615ca97e945c4fa98d2e0a65b3e88e517bc56470bd64e785bc1a0306b0101f6b44d25e17d8fec32ba54b6cf32b SHA512 457fa94d6f75850aade78766982d9da76e486d6cd843a8f765dae81cc792d93dd903be53020ceb1fe7d8e701715b7f6f624ed7f302d2975380c8ead2ba0c9c14
+EBUILD schroot-1.6.10_p12-r2.ebuild 3486 BLAKE2B 0f7edf8b57a09340b5bc6a29a2f467658b3f73062828856cdb725296e86f51e9513b1945dedd99d4426c5d6b79e91962d2e921fd7f45a2f1c2912852ec124cf2 SHA512 d07759eee9454625e671e16599a7b23fe422fa7e72eab416f3bb8054456f53c7907405d04c6f705ebd4373c4463e97e657c400c47c3921fba6b186d5e1f5e82f
 EBUILD schroot-1.6.10_p7-r1.ebuild 2936 BLAKE2B b285e3f9241e8ca1998bced999d9e8c60cfeef9a6705bc48af724fed626a2db1aebb66898d4342751b5e8935330b9d0cdfe18ffb88f638a37008703d79b2cf3b SHA512 490bf8a58156f74f14a8407fe5fbbacdec7c9596b0918e37753e4261d914c9712877db564ac5faaba080658844419589f9b563e0389522fb7b0d5e3501bc370e
 MISC metadata.xml 615 BLAKE2B 8f6cde0f4bd1d00fed8330dd097b9ce0de021621af06aee3534e9cdaf79ae9353c27d831916d4e53ecfe11f264a3a9111001aff469471d75e1c51a04d55be4d2 SHA512 3ed685c418e1f8aa15d1a50e695aa71c2c2d48888a0b888a06d830c40a617a804d3c2c5f0f0ff14cea4206aee821239b63df273ccaf7452246112c931e6a923b
diff --git a/dev-util/schroot/schroot-1.6.10_p12-r1.ebuild b/dev-util/schroot/schroot-1.6.10_p12-r1.ebuild
deleted file mode 100644
index 0a4a39d4ed2f..000000000000
--- a/dev-util/schroot/schroot-1.6.10_p12-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 cmake pam tmpfiles
-
-MY_P=${PN}_${PV/_p/-}
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="https://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P/%-*/}.orig.tar.xz
-	mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.debian.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.42.0:=
-	>=sys-apps/util-linux-2.16
-	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-	zfs? ( sys-fs/zfs )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	sys-apps/groff
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? (
-		>=app-text/po4a-0.40
-		sys-devel/gettext
-	)
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !sys-apps/dchroot )
-	nls? ( virtual/libintl )
-"
-
-S="${WORKDIR}/${PN}-${PV/%_p*/}"
-
-src_unpack() {
-	unpack ${MY_P/%-*/}.orig.tar.xz
-	cd "${S}"
-	unpack ${MY_P}.debian.tar.xz
-}
-
-src_prepare() {
-	sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
-	eapply "${S}"/debian/patches/*.patch
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Dbtrfs-snapshot=$(usex btrfs)
-		-Ddchroot=$(usex dchroot)
-		-Ddchroot-dsa=$(usex dchroot)
-		-Ddebug=$(usex debug)
-		-Ddoxygen=$(usex doc)
-		-Dlvm-snapshot=$(usex lvm)
-		-Dnls=$(usex nls)
-		-Dpam=$(usex pam)
-		-Dtest=$(usex test)
-		-Dzfs-snapshot=$(usex zfs)
-		-Dbash_completion_dir="$(get_bashcompdir)"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
-		-DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
-		-DBoost_NO_BOOST_CMAKE=ON # https://bugs.gentoo.org/791712 and https://bugs.gentoo.org/752120
-	)
-	if ! use nls; then
-		mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all $(usev doc)
-}
-
-src_test() {
-	if [[ $EUID -ne 0 ]]; then
-		ewarn "Disabling tests because you are not root"
-		return 0
-	fi
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# debian-stype PS1 for chroot
-	# checks for /etc/debian_chroot file, which is created by schroot
-	insinto /etc/bash/bashrc.d
-	doins "${FILESDIR}/schroot_prompt.sh"
-
-	# gentoo /var/tmp/portage handler
-	# e.g. portage.base.tmpdir=/var/tmp/portage in config file
-	# will use a subdirectory of hosts $PORTAGE_TMPDIR
-	exeinto /etc/schroot/setup.d
-	doexe "${FILESDIR}/11gentoo"
-
-	# support for zfs clone options.
-	# zfs.clone.options=com.sun:auto-snapshot=false
-	if use zfs; then
-		exeinto /etc/schroot/setup.d
-		doexe "${FILESDIR}/06zfscloneopts"
-	fi
-
-	keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}}
-
-	docinto /usr/share/doc/${PF}/contrib/setup.d
-	dodoc contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
-
-	newdoc debian/schroot.NEWS NEWS.debian
-
-	newinitd "${FILESDIR}"/schroot.initd schroot
-	newconfd "${FILESDIR}"/schroot.confd schroot
-	newtmpfiles "${FILESDIR}"/schroot.tmpfilesd schroot.conf
-
-	if use doc; then
-		docinto html/sbuild
-		dodoc "${BUILD_DIR}"/doc/sbuild/html/*
-		docinto html/schroot
-		dodoc "${BUILD_DIR}"/doc/schroot/html/*
-	fi
-
-	if use pam; then
-		rm -f "${ED}"/etc/pam.d/schroot
-		pamd_mimic_system schroot auth account session
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild b/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
new file mode 100644
index 000000000000..719cc0ff29d9
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.10_p12-r2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake pam tmpfiles
+
+MY_P=${PN}_${PV/_p/-}
+
+DESCRIPTION="Utility to execute commands in a chroot environment"
+HOMEPAGE="https://packages.debian.org/source/sid/schroot"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P/%-*/}.orig.tar.xz
+	mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.debian.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.42.0:=
+	>=sys-apps/util-linux-2.16
+	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	zfs? ( sys-fs/zfs )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	sys-apps/groff
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? (
+		>=app-text/po4a-0.40
+		sys-devel/gettext
+	)
+	test? ( >=dev-util/cppunit-1.10.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/debianutils
+	dchroot? ( !sys-apps/dchroot )
+	nls? ( virtual/libintl )
+"
+
+S="${WORKDIR}/${PN}-${PV/%_p*/}"
+
+src_unpack() {
+	unpack ${MY_P/%-*/}.orig.tar.xz
+	cd "${S}"
+	unpack ${MY_P}.debian.tar.xz
+}
+
+src_prepare() {
+	sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
+	eapply "${S}"/debian/patches/*.patch
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dbtrfs-snapshot=$(usex btrfs)
+		-Ddchroot=$(usex dchroot)
+		-Ddchroot-dsa=$(usex dchroot)
+		-Ddebug=$(usex debug)
+		-Ddoxygen=$(usex doc)
+		-Dlvm-snapshot=$(usex lvm)
+		-Dnls=$(usex nls)
+		-Dpam=$(usex pam)
+		-Dtest=$(usex test)
+		-Dzfs-snapshot=$(usex zfs)
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
+		-DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
+		-DBoost_NO_BOOST_CMAKE=ON # https://bugs.gentoo.org/791712 and https://bugs.gentoo.org/752120
+	)
+	if ! use nls; then
+		mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]]; then
+		ewarn "Disabling tests because you are not root"
+		return 0
+	fi
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# debian-stype PS1 for chroot
+	# checks for /etc/debian_chroot file, which is created by schroot
+	insinto /etc/bash/bashrc.d
+	doins "${FILESDIR}/schroot_prompt.sh"
+
+	# gentoo /var/tmp/portage handler
+	# e.g. portage.base.tmpdir=/var/tmp/portage in config file
+	# will use a subdirectory of hosts $PORTAGE_TMPDIR
+	exeinto /etc/schroot/setup.d
+	doexe "${FILESDIR}/11gentoo"
+
+	# support for zfs clone options.
+	# zfs.clone.options=com.sun:auto-snapshot=false
+	if use zfs; then
+		exeinto /etc/schroot/setup.d
+		doexe "${FILESDIR}/06zfscloneopts"
+	fi
+
+	keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}}
+
+	docinto contrib/setup.d
+	dodoc contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
+
+	newdoc debian/schroot.NEWS NEWS.debian
+
+	newinitd "${FILESDIR}"/schroot.initd schroot
+	newconfd "${FILESDIR}"/schroot.confd schroot
+	newtmpfiles "${FILESDIR}"/schroot.tmpfilesd schroot.conf
+
+	if use doc; then
+		docinto html/sbuild
+		dodoc "${BUILD_DIR}"/doc/sbuild/html/*
+		docinto html/schroot
+		dodoc "${BUILD_DIR}"/doc/schroot/html/*
+	fi
+
+	if use pam; then
+		rm -f "${ED}"/etc/pam.d/schroot
+		pamd_mimic_system schroot auth account session
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 46d45ee68ea5..2ac61120118b 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,8 +1,14 @@
 AUX scons-4.0.0-respect-cc-etc-r1.patch 3241 BLAKE2B 8e9cabb597db0c1cf278169bd6010168e46fc38895d00a0b013894b2783c65c5262156ded125e080b61927e34f40ef5ed4f2852dfd341d1d42bbcc1efad7b4ab SHA512 1878dc8f28d17aecd5c61b624c135ab3d1b311ec1b92687e1f205c4913dd5f99eeea0f7758d5623e6e60470c34fc2e7ce70571593f2197c8e59fed8df1586b53
 AUX scons-4.1.0-env-passthrough.patch 1498 BLAKE2B 9aaae51779053518d983c9f028fff58a68a8c3e1213c8a746aad2e6dc6cebf139939dd3fb41a643c5db7e6079e09ad9850e552192e35bc4c8bf75818334b9e0d SHA512 4c5c3364575d95f4922b7c5b3c8f536a34b58136e7a604bc06760d94a8b20c7e8cdfd3100ab8c56e08b885e2e9521f036f4009512b1f1b10aec2785a74119683
+AUX scons-4.2.0-respect-cc-etc.patch 3493 BLAKE2B 3a36a9cced15ef81e671d8a90750afc14650fef564997d250ed63f0d9b1c91361872a8816cab9ba1f0ecae46711414ccac921ded954eff7c51e4161532030e5f SHA512 ce8690a126255047c8efbcad4e75b91fca07b0afac55d818d4f5467a41795394cae8f5d47484519c482bccfdae9c3df1b040689a656098f349629f1f609adbce
 DIST scons-4.1.0-user.html 1454432 BLAKE2B 9fac4d7bfb4b25708bc4cc48d952beb030f88181af5dfee63090f726b1a82443c192c63ec5939869967ef8f374e8599321212971439fb265fb050b263681c9f8 SHA512 74f1349fa61dac9e66cfb863cb3126d07ce5f421b3e87d0220eb32bd5017ba8f6cf96eb8cb5ee45c39022671aa9f2d0408d4039970c438a69c002445aea510be
 DIST scons-4.1.0-user.pdf 2691364 BLAKE2B a910a09fa936d4d6f8dc967676d5aa009aac58a5a4566399b3ddc3512ac0259731e6c5399722fefadb3b79d8f89a5257e2e9bc2fa4d65697c8293ab995248d64 SHA512 64584731a59b59b78283be3876ecca91d742f83da2653d0de17922bec01e3c9cea1ce2ce3c8dc718597910ba86ed2c8aff0f7ae371bf763439b57a6d5484e1a7
 DIST scons-4.1.0.gh.tar.gz 5609204 BLAKE2B ede3d47a1ec652b9248681e26738073e9d01daab7ffeccc58f0fcadb79661e30edb9a35a511518e4a58459243acb027afd8fa5849b0f9e4bae451055f7b1a062 SHA512 f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44
 DIST scons-4.1.0.tar.gz 3007701 BLAKE2B 70ab64ecfd89fa2af1d78a33fcef82a5f7db9875ffe9d2c16ea75cf40e661b2874359e3a5f75d761b3d9e863f7a434560992cfb020cce3e21e389381331d90de SHA512 24fd493643545a2998b053ed0d68caf6241f05bc2437e7cbeae33d2e1c63517a61449a1a18062f8e4e5a639295a2486925296ba3e54ccfa2ecdd56fa07132de8
+DIST scons-4.2.0-user.html 1514655 BLAKE2B 036fd0e994d4a3dbf820e864c18f1dda2bb383b890919b3d99ca02e4f1f319b86050bf094309764bbb01585075697549e3168d66ee02caeee0fe4ca641f794a5 SHA512 b0dcf8d6ff32521f2ce92372a7efce4962268d2ca40645ec4b0d082e5a29ba5098488ba45bf36c9fb7e75996c7454ab80536052f43b9a533a22db05f466cd3e9
+DIST scons-4.2.0-user.pdf 2813567 BLAKE2B 2787c9dbecaefccc5f4df2bcccc474ee69e9883f9efa8358f6da00690d9f3fad48f7b696908cbb4cc8f3b9c195f86e11c81301d931783e463d7b2f3a5d528fc3 SHA512 3c36879af2b40190b7b68b162cb39e32e1d7ee01fe063dabe5404d616ab3c9972ebc8a6ce4c0b54a633cfc6825808f93207132ac9c9cd60d9e6ca28e864d5f16
+DIST scons-4.2.0.gh.tar.gz 5677165 BLAKE2B c298152db937810ab73afc304a9dc480c185ef0d6e86be5ec7f2022a7d1ed4d3df6ecc18148c3143d4e76a7ea0e50790db1224e66db68bace0759daba7f36a91 SHA512 138573f7203b52fad0527d8d88ceabe182273eff7e4b74125e0d7eda51c44408b07e2c702ee63214519392101d8bbb30013e6d34000eaeb530a816c17396de97
+DIST scons-4.2.0.tar.gz 3043008 BLAKE2B 3e69189e45b8ecc956419d3b7d4d36a78ffe219ff87a18d17c511434cf4306635c245107e7978d8f6b86f65bd2ac028fa3c76ab1212806a692d355d7d8036645 SHA512 91d77c858a888621d41432f39970547830997c8e28a851bbab7c0f181afda564abef321befaa33cbe6fd5fc4ac85fa80f2349994956edcc99c027cf7f526bbf0
 EBUILD scons-4.1.0-r1.ebuild 2764 BLAKE2B 0add0564bc259cee0d3dc5b4121577e329257d62c02c9811f1df5df680402563cdbab7fd118c585c5b4dde333d1a96c69dc4f04b4785b92b4852e40136fd0409 SHA512 cbcc1e83478eb60778e7512dd3268d064fc1e96acfc47ee598b68064acd9b44e262c2d675d5c0383d632014174036bd9b9886f8e320464d9fbcbe2572dd1f494
+EBUILD scons-4.2.0-r1.ebuild 2889 BLAKE2B 709f7adaeefaabd3bc298d661a48c116ec472d78d18052abfbb715900e152b0303ea1565cd1e8c69a3dc06364de2f2524e7a1bd742207ac507a827a37233e105 SHA512 542741fa94fa0857732d3cfdf388f22c9d86965c026460ef00754f8b7a49b6e98bfd7ec9a9288cc6fe9dfe6fbe84f56f67c87686871126f4393dca9a6ee9e11e
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/files/scons-4.2.0-respect-cc-etc.patch b/dev-util/scons/files/scons-4.2.0-respect-cc-etc.patch
new file mode 100644
index 000000000000..a075fec91d22
--- /dev/null
+++ b/dev-util/scons/files/scons-4.2.0-respect-cc-etc.patch
@@ -0,0 +1,96 @@
+From b6ba1f2b1feda529eca20fb8980f7c6c52397df6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 10 May 2018 08:01:08 +0200
+Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
+
+---
+ SCons/Platform/posix.py | 21 +++++++++++++++++++++
+ SCons/Tool/cc.py        |  3 ++-
+ SCons/Tool/cxx.py       |  3 ++-
+ SCons/Tool/link.py      |  3 ++-
+ 4 files changed, 27 insertions(+), 3 deletions(-)
+
+diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py
+index 37cd2377f..1246781de 100644
+--- a/src/SCons/Platform/posix.py
++++ b/src/SCons/Platform/posix.py
+@@ -33,6 +33,7 @@ import subprocess
+ from SCons.Platform import TempFileMunge
+ from SCons.Platform.virtualenv import ImportVirtualenv
+ from SCons.Platform.virtualenv import ignore_virtualenv, enable_virtualenv
++import SCons.Util
+ 
+ exitvalmap = {
+     2 : 127,
+@@ -86,6 +87,26 @@ def generate(env):
+         if 'ENV' in env:
+             new_env.update(env['ENV'])
+         env['ENV'] = new_env
++
++        # Furthermore, force common compiler/linker variables as well
++        envvar_mapping = {
++            'AR': 'AR',
++            'AS': 'AS',
++            'ASFLAGS': 'ASFLAGS',
++            'CC': 'CC',
++            'CXX': 'CXX',
++            'CFLAGS': 'CFLAGS',
++            'CXXFLAGS': 'CXXFLAGS',
++            'CPPFLAGS': 'CPPFLAGS',
++            'LDFLAGS': 'LINKFLAGS',
++        }
++
++        for envvar, toolvar in envvar_mapping.items():
++            if toolvar not in env and envvar in env['ENV']:
++                val = env['ENV'][envvar]
++                if toolvar.endswith('FLAGS'):
++                    val = SCons.Util.CLVar(val)
++                env[toolvar] = val
+     else:
+         if 'ENV' not in env:
+             env['ENV']        = {}
+diff --git a/src/SCons/Tool/cc.py b/src/SCons/Tool/cc.py
+index 590ec5fd3..5f9229a02 100644
+--- a/src/SCons/Tool/cc.py
++++ b/src/SCons/Tool/cc.py
+@@ -80,7 +80,8 @@ def generate(env):
+ 
+     if 'CC' not in env:
+         env['CC']    = env.Detect(compilers) or compilers[0]
+-    env['CFLAGS']    = SCons.Util.CLVar('')
++    if 'CFLAGS' not in env:
++        env['CFLAGS'] = SCons.Util.CLVar('')
+     env['CCCOM']     = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
+     env['SHCC']      = '$CC'
+     env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
+diff --git a/src/SCons/Tool/cxx.py b/src/SCons/Tool/cxx.py
+index 128cdc4f6..1f852b64c 100644
+--- a/src/SCons/Tool/cxx.py
++++ b/src/SCons/Tool/cxx.py
+@@ -69,7 +69,8 @@ def generate(env):
+ 
+     if 'CXX' not in env:
+         env['CXX']    = env.Detect(compilers) or compilers[0]
+-    env['CXXFLAGS']   = SCons.Util.CLVar('')
++    if 'CXXFLAGS' not in env:
++        env['CXXFLAGS'] = SCons.Util.CLVar('')
+     env['CXXCOM']     = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
+     env['SHCXX']      = '$CXX'
+     env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
+diff --git a/src/SCons/Tool/link.py b/src/SCons/Tool/link.py
+index 24d17a31f..4ea9917e8 100644
+--- a/src/SCons/Tool/link.py
++++ b/src/SCons/Tool/link.py
+@@ -49,7 +49,8 @@ def generate(env):
+ 
+     env['SMARTLINK'] = smart_link
+     env['LINK'] = "$SMARTLINK"
+-    env['LINKFLAGS'] = SCons.Util.CLVar('')
++    if 'LINKFLAGS' not in env:
++        env['LINKFLAGS'] = SCons.Util.CLVar('')
+ 
+     # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
+     env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
+-- 
+2.32.0
+
diff --git a/dev-util/scons/scons-4.2.0-r1.ebuild b/dev-util/scons/scons-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..9c816bfcc0bb
--- /dev/null
+++ b/dev-util/scons/scons-4.2.0-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="https://www.scons.org/"
+SRC_URI="
+	https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz
+	doc? (
+		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+	)
+	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+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 ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-libs/libxml2[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=(
+	# support env passthrough for Gentoo ebuilds
+	"${FILESDIR}"/scons-4.1.0-env-passthrough.patch
+	# respect CC, CXX, C*FLAGS, LDFLAGS by default
+	"${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
+)
+
+src_unpack() {
+	# use the git directory structure, but put pregenerated release
+	# inside src/ subdirectory to make our life easier
+	if use test; then
+		unpack "${P}.gh.tar.gz"
+	else
+		mkdir -p "${P}"/src || die
+	fi
+
+	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
+}
+
+src_prepare() {
+	# apply patches relatively to top directory
+	cd "${WORKDIR}/${P}" || die
+	distutils-r1_src_prepare
+
+	# manpage install is completely broken
+	sed -i -e '/build\/doc\/man/d' src/setup.cfg || die
+
+	if use test; then
+		local remove_tests=(
+			# TODO: does not respect PATH?
+			test/Clang
+			# broken
+			test/DVIPDF/DVIPDFFLAGS.py
+			test/Java/swig-dependencies.py
+			test/Java/multi-step.py
+			# broken by commas in date, sic!
+			test/option/option-v.py
+			test/Interactive/version.py
+		)
+		rm -r "${remove_tests[@]}" || die
+	fi
+}
+
+python_test() {
+	local -x COLUMNS=80
+	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
+	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
+	# unset some env variables to pass appropriate tests
+	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	cd "${WORKDIR}/${P}" || die
+	"${EPYTHON}" runtest.py -a --passed \
+		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+
+	# runtest.py script returns "0" if all tests are passed
+	# and returns "2" if there are any tests with "no result"
+	# (i.e. in case if some tools are not installed or it's Windows specific tests)
+	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	rm "${ED}"/usr/*.1 || die
+	distutils-r1_python_install_all
+
+	doman *.1
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
index 3a582e650b2d..9e3f02a1c57e 100644
--- a/dev-util/shards/Manifest
+++ b/dev-util/shards/Manifest
@@ -1,4 +1,4 @@
 DIST crystal-molinillo-0.2.0.tar.gz 23959 BLAKE2B 257dcca66583db87a802b27b1f100e226eb0b6ac53708d110040d7b5560f429a82f11595e303af4922f22917d922d60ea380fb395d254dc3b3ce24f4183395b6 SHA512 7c00a6a3ee4864b712ad8b703557f10498ba0b25491a55ae2f6c02d574034ec5bf8b87df777c3d34eb9cc4c87eebdcf6567c153e9edf3bc3c1b9ac4306ce3dc2
 DIST shards-0.15.0.tar.gz 62648 BLAKE2B bd36733e4a98fcc4a02038745ac2b838c61109edc593a333ebb35474d5a7ecb2767c8c1a54f7116c76e83fceb59d151813d3dd23e8afc37c29f00e6b879daf3c SHA512 cbd428627c08658213494215db78c94513482aaa54038c159e8fea4819291552eda8a8f6decf5cf90134c89e98ad7fdaee5f666f02df054fb44c703179f428ca
 EBUILD shards-0.15.0.ebuild 1054 BLAKE2B 142d0f7d1ffc9a778a5489a356bc7ceb30766999c66001a1bf95bc30a1f727edcd002ab9d03aa8afe78a9530faa02fc04ddcf3f85dad5389382f58c78b5c5680 SHA512 cbf2761c1c58479beecf65477d547c71a0426318b9c3d7829ac3a4f1487b1994bf77f48ab72730a315f936a35b1a692af71c5b64688811a5a2b9c07a473b934f
-MISC metadata.xml 249 BLAKE2B 6677e5e64f70eea28677a22bdd91559e39a1e4fdc31610fff873a793c4b9f89731f8f846dc8a86b7ca781fd56ae3697fb668aba13811c041bdf64589e9bf124f SHA512 2c9161e6cac80acad55a53383a504a985c8229fd2e42adfa71994aab9caf58003935706291b6437f4ad6aad187d7b73a535ab15a4b626d12720e82f80ce15023
+MISC metadata.xml 474 BLAKE2B f487be93060234e7ecdec50eaa5f55e6848e62fe2efb6284e53ed23f404a1a2b02c94e6895df554a20f822b866882f149910dd7ef88d7b7a8a6ac1b22a2b7246 SHA512 8b27a5551afc1a3094de39b245e695a094f5c7486426511516265130d04f181dd27cfb13af5a9154321c2103951c807d31a734d597564e60ca2647061102aee7
diff --git a/dev-util/shards/metadata.xml b/dev-util/shards/metadata.xml
index 5e1a38e3cf7b..e3f76a01b65b 100644
--- a/dev-util/shards/metadata.xml
+++ b/dev-util/shards/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>toshokan@shojigate.net</email>
+		<name>J. Pz</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">ysbaddaden/shards</remote-id>
+		<remote-id type="github">crystal-lang/shards</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/uftrace/Manifest b/dev-util/uftrace/Manifest
index 9c830c414d9d..310fc15b4be3 100644
--- a/dev-util/uftrace/Manifest
+++ b/dev-util/uftrace/Manifest
@@ -1,3 +1,3 @@
 DIST uftrace-0.10.tar.gz 1111530 BLAKE2B 29388523e1009276ba4609d85e5979e823d028ff647239aa02ec2cac5ae21c7812c7699d47c09c0b9289a0debb39a2f502615547c8e658a821d5078e3b12c6fe SHA512 788234e4156974a70f06d02527e56e5fac821e8b66363dc5fc55d68797c374043c0b66b18b4ab1488b9647e08969e8dc94a64d6bb1a38ccad4cf98eaecc6e919
-EBUILD uftrace-0.10.ebuild 1240 BLAKE2B ba99f53ac6b6b7e05f827a7d19efc507c31a0adbb9a3891083e823bedf4f5c19be48423dc4f35a41870f736239264736562842f5b681d1df8f2f18e56171d1af SHA512 cda749f52dadbe3a501dabae3b9a9a777183312b8c014b20700dfd73afcf9d82cf2191f22ce41aa8f18e611d1bb0e9a9a6119e737f840809128aa7a00aa9def8
+EBUILD uftrace-0.10-r1.ebuild 1202 BLAKE2B f9349c41687cc23c67ec8a1664074e5df3f2a9bef8cf869490a19d6f2c0c52cab466a8c25074c0eae8374171cb0da8d73daed54ad9a947912dd6562c4409257f SHA512 db312bbf04ae6e25a4a4bd4bb4634c0f824d129acf64224459182e40318475cbed0c9110e5b037f0902001aa808ac6c12a0b45f52ca109e74d7c651b4155e55e
 MISC metadata.xml 438 BLAKE2B a270f82a149c32758b8d0054b5f1204add5dabd8812ce01e6c9ed9e0a71aa38bfef9def386f8a2c6f67cae59c63e58fbff8b3f00a3cea5a334ee41434f3c6fa1 SHA512 774d0ec195987c0b98467e03a18c1eb4e2880d5c5d63e3864b5aee84981e0539197d74530a64068399dac7c0eb28e7570a0b8242e0ecf049f79d995eab884a8d
diff --git a/dev-util/uftrace/uftrace-0.10-r1.ebuild b/dev-util/uftrace/uftrace-0.10-r1.ebuild
new file mode 100644
index 000000000000..2b39cc144648
--- /dev/null
+++ b/dev-util/uftrace/uftrace-0.10-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+
+inherit bash-completion-r1 lua-single toolchain-funcs
+
+DESCRIPTION="Function (graph) tracer for user-space"
+HOMEPAGE="https://github.com/namhyung/uftrace"
+SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="capstone lua"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="test"
+
+RDEPEND="
+	sys-libs/ncurses:=
+	virtual/libelf:=
+	capstone? ( dev-libs/capstone:0= )
+	lua? ( ${LUA_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" -e "/bash.completion/d" Makefile || die
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/uftrace
+		$(use_with capstone)
+		--without-libpython
+	)
+	if use lua && use lua_single_target_luajit; then
+		myconf+=(
+			--with-libluajit
+		)
+	else
+		myconf+=(
+			--without-libluajit
+		)
+	fi
+	CC=$(tc-getCC) LD=$(tc-getLD) econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	default
+
+	dodoc doc/*.{md,gif,png}
+	newbashcomp misc/bash-completion.sh uftrace
+}
diff --git a/dev-util/uftrace/uftrace-0.10.ebuild b/dev-util/uftrace/uftrace-0.10.ebuild
deleted file mode 100644
index 92c30228011d..000000000000
--- a/dev-util/uftrace/uftrace-0.10.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-
-inherit bash-completion-r1 lua-single toolchain-funcs
-
-DESCRIPTION="Function (graph) tracer for user-space"
-HOMEPAGE="https://github.com/namhyung/uftrace"
-SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="bash-completion capstone lua"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/ncurses:=
-	virtual/libelf:=
-	capstone? ( dev-libs/capstone:0= )
-	lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" -e "/bash.completion/d" Makefile || die
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/uftrace
-		$(use_with capstone)
-		--without-libpython
-	)
-	if use lua && use lua_single_target_luajit; then
-		myconf+=(
-			--with-libluajit
-		)
-	else
-		myconf+=(
-			--without-libluajit
-		)
-	fi
-	CC=$(tc-getCC) LD=$(tc-getLD) econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc doc/*.{md,gif,png}
-	use bash-completion && newbashcomp misc/bash-completion.sh uftrace
-}
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 872fd8e41f09..7b52e44f9286 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,4 +1,6 @@
 AUX umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch 1743 BLAKE2B de1529d047dfce8038d0d466181c8ae54ffb48087620f9a391da0914665bd53d7915acf6e2611816bdb9665821b6b5379736a293f6d4ed09d065840c4decf31b SHA512 3e975a3fc03f78272c40e04a1d7c504be0fb8b4442db4598b9762afb2126608569c13e671863b7b79f9bc46d7b52be015c73b8bdd164afd591cce691e22269e9
 DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
+DIST umockdev-0.16.1.tar.xz 478308 BLAKE2B 3d49ca1d9c9b7573ac63f5f7ecd81071041597732b507619c333379095434ac55eb26f16bdf5897b94bbeb5c307a34b703accd220cd6202482e172dd3a6d1983 SHA512 baeaf05cc6b8d8e2a5cae16b808db759a18a969cea0f2ceed5f6c2521edc0c4c07dc16265a4821051de51f4314fd39d63ebf2da124fcd3e103ec743dadfedaa8
 EBUILD umockdev-0.12.1.ebuild 1304 BLAKE2B 35be39188381c08265e988b7dfc58b6b1f48b57ddb9b8d253513b37e592239d53e0e3b3a7561767336a4910505c47d4db2bba5bcb9d8472b63395d748275e8f6 SHA512 68943daec6ca268b1cc2069286fd4432cdb036c161e4b6a19c1de935a8f28414db30edc854fa87cfc04523c494886d4dc2c86f296f6e8209eee9deb13faf0dbe
+EBUILD umockdev-0.16.1-r1.ebuild 1108 BLAKE2B 1d1c0929beffe47d7752f8da835a3a8fb49ac5fba252afe918f34496632cee0fbf44977d38361d7cec53e284020bebe3b26440432cac35989931635b1bd0639b SHA512 4bb6f364395e19786b547506d57fb31a5b62ad539816c9cee5a3e528e15f0ca401adb23012a2a1414f6f653a0d19550a277d16c3ff54c762ca36670b5b40f635
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
new file mode 100644
index 000000000000..40ff4e8639d2
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit meson-multilib python-any-r1 vala
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-libs/libpcap[${MULTILIB_USEDEP}]
+	virtual/libudev:=[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=dev-libs/gobject-introspection-1.32:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+	)
+"
+BDEPEND="
+	$(vala_depend)
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	vala_src_prepare
+}
+
+multilib_src_configure() {
+	export VALAC="$(type -P valac-$(vala_best_api_version))"
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test --no-suite fails-valgrind
+}
diff --git a/dev-util/vbindiff/Manifest b/dev-util/vbindiff/Manifest
index 06ea6b64389d..708463d9dbe9 100644
--- a/dev-util/vbindiff/Manifest
+++ b/dev-util/vbindiff/Manifest
@@ -1,3 +1,3 @@
 DIST vbindiff-3.0_beta5.tar.gz 134192 BLAKE2B 9a7437833fef8db4316fd2c67a781868f6aead5ae47c7abc05683545bb3990950a465b1665ff5bc2e7d298465b3b1a427d6d67b43f59bd7dfb112143c9b52d2f SHA512 e6abd5cb93beffa3bc55455dbfbc98f0effc2a6667c8b9c721792c4a274dfe6f35ef121d27506fc9c951a1decb0e69886775fcf092a5f47fda82ed75ef760a74
 EBUILD vbindiff-3.0_beta5-r1.ebuild 399 BLAKE2B d40a08d253d9cb5a442cd825fce66f519315b0796f2c464c610ec771bf78b789aa88f3a31cf24be2d5c8defff115964b2c9c99b21f4561a0081ed5f9f97ad0c4 SHA512 586b880e304af6a85060d13741087606abfb10449ffd7822ec87a3f23fa7a6eff333962521ba96820f8c26a16bcecaa077c34ad6805854a4e521e1107ff1ec96
-MISC metadata.xml 331 BLAKE2B 62db8c95752ea477fec8b7a7bb76c5cd7c6075f8d2618c476f8da83917cd893e6878ed63bc5f8ef039d7c32fd3e1dc8cf9418a454b94adfd889d7445198de023 SHA512 99149387b18568a36c5057f0b19d1a467632ffac30cd1917688ff1d590f673ba700e16ab42d3b5b2a214f5f933b4ff0c666bbcd7d2675608ca9368f334a9904e
+MISC metadata.xml 247 BLAKE2B 2ef33e40de878859e144c3fce253edf45264cd5d650b4931fd7354941141f378f0b8200ef50254b66eef899ebf5399a63e08b6837cd6121fc66753ffaf0ab447 SHA512 7cc7f04f614e870aeac3fa1da238c3807b69f875e43299d155b16153e87e36b6154ef77adfe678216b8e994bffe3f5a523c832a301218bcff9618164ed393e86
diff --git a/dev-util/vbindiff/metadata.xml b/dev-util/vbindiff/metadata.xml
index 3174e2784a40..054029d223d1 100644
--- a/dev-util/vbindiff/metadata.xml
+++ b/dev-util/vbindiff/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">mrdudz/vbindiff</remote-id>
 	</upstream>
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 9160ab4f10ed..9bd1daf787ba 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index caeefac70b20..7634e71648e6 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -21,5 +21,5 @@ DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8
 DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
-EBUILD cvs-1.12.12-r14.ebuild 2988 BLAKE2B dc4dade29d3f2d3cfe048cb6d2a521f32ae71951840aeab67f2fa1414026de4bf6a3828aed47b44bd7f983b3b13b38418f9e1408053d1b1f89e117eb3781c663 SHA512 728d63364c254f9f766062f40eab90f8c7451aef45322aa21283b05b99734f9220f2a6fc41b99e8b1783941d66e538917ecfd226cc99e6d18cb1a0167f02ca59
+EBUILD cvs-1.12.12-r14.ebuild 2995 BLAKE2B 24d2ef20ef87a6bccd84fcf693112b85cb6602375eee28c052228f52ad7613b6577564bac3ce9882e32dcb07396269508a52eaa1e064bca38b58c227de2f6a7a SHA512 976b1a4b61827600815c987e1ca505fe5a6702abc39ecd2b41c2dd741b913ceecedc78162fd82b06be44b866ce50740fd2d76a05b68a81e7f431f3aabca61be5
 MISC metadata.xml 238 BLAKE2B 7cfdf56d73fb2842fdc430be958eda28a1feca63fb12e3b4eca388a268c9b9dfb80100d649503f333242d60084dd8b0ed7340ed5fcdbc25f2b6cda956d13a603 SHA512 ae7619f8ee8ed9bf4db2e5f53bedddc7b3653066c7dd5de3aa79623e340fdafc579a5821ed6ba49aefa52de33bf1901d082e23f4ce1e8b5ee791ae9a526a5d6a
diff --git a/dev-vcs/cvs/cvs-1.12.12-r14.ebuild b/dev-vcs/cvs/cvs-1.12.12-r14.ebuild
index 3da8f4ec91e3..9b525d7fb912 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r14.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r14.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit pam toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 RESTRICT="test"
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 15309f119176..4de4f7f9ea60 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -4,5 +4,5 @@ AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.14.1.tar.bz2 8504612 BLAKE2B 27c6c5a9e656680b10fbc4b5c6d5fed36759d42d908e2bd5e56e19a7477c779c72314eb4a6766a13f1af047a759f9f9334b963c1d41cd48573b9800d5b671cc1 SHA512 0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd
-EBUILD subversion-1.14.1.ebuild 12655 BLAKE2B e7301b1a075d60f250e5dc52c00364bb1d051f92b52e11877c6730c5d2cff290648c8562f1cf5717edcbd16a67c0de5980c12ab0be84948a8f893468d4ad8e76 SHA512 7823ef9ac34fd4dbe7f8ef31c41cd1a4fbafc9e1abb60d3f9ac3b2f8a68ff02d0d3f0c72f69f620d5e79f443b3cb51b5cd682e0d29277809839a7d93760fb8c8
+EBUILD subversion-1.14.1.ebuild 12660 BLAKE2B 6f90cb397264065064b762a3ad4d5ec7f5542a99af977a0acd82684b73538551b1b0585e9363540d616444a3547f867675aced75af48fe894dc5d51a04babe54 SHA512 75dce3caf4b603404d0f73946fdf4da1deb0244e3bc9f2e13ad33745bca03c9c038dae554886712dccccbe1b20e23fbb029c38b0bcfb754c78433860670360cc
 MISC metadata.xml 560 BLAKE2B b6b78084ae0792c458969a47b6d1a13cf330c2b410582f39c207b585a47692a7ae86b1b8c86c77da4f289331dbec2ad114b86cc9edebb3423c7ce144458e71e7 SHA512 d10e6922066c5579a7cebb53e328ba02fd92e7919cafe96e89dfa49c6d5d40e4e9247f95c987bab16e90803b54dbb9c4229afb219428f254e7850802d0d4fce1
diff --git a/dev-vcs/subversion/subversion-1.14.1.ebuild b/dev-vcs/subversion/subversion-1.14.1.ebuild
index 164331d9933e..bbe0b31da1c9 100644
--- a/dev-vcs/subversion/subversion-1.14.1.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 USE_RUBY="ruby26 ruby25 ruby24"
 DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Apache-2.0 BSD MIT BSD-2 FSFAP unicode"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl ruby sasl test"
 RESTRICT="!test? ( test )"
 
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index a1b968fc81f7..33602b0f9ac2 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass
index 03ec98c17b95..2a45df008c29 100644
--- a/eclass/gstreamer-meson.eclass
+++ b/eclass/gstreamer-meson.eclass
@@ -177,10 +177,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${GST_ORG_MODULE}/${GST_ORG_MODUL
 S="${WORKDIR}/${GST_ORG_MODULE}-${PV}"
 
 LICENSE="GPL-2"
-case ${GST_ORG_PVP} in
-	1.*) SLOT="1.0"; GST_MIN_PV="1.2.4-r1" ;;
-	*) die "Unkown gstreamer release."
-esac
+SLOT="1.0"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
@@ -194,7 +191,7 @@ BDEPEND="
 if [[ "${PN}" != "gstreamer" ]]; then
 	RDEPEND="
 		${RDEPEND}
-		>=media-libs/gstreamer-${GST_MIN_PV}:${SLOT}[${MULTILIB_USEDEP}]
+		>=media-libs/gstreamer-$(ver_cut 1-2):${SLOT}[${MULTILIB_USEDEP}]
 	"
 fi
 
diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass
index a41381c3d4ee..359f3a669d06 100644
--- a/eclass/llvm.eclass
+++ b/eclass/llvm.eclass
@@ -85,7 +85,7 @@ DEPEND="!!sys-devel/llvm:0"
 # @INTERNAL
 # @DESCRIPTION:
 # Correct values of LLVM slots, newest first.
-declare -g -r _LLVM_KNOWN_SLOTS=( {13..8} )
+declare -g -r _LLVM_KNOWN_SLOTS=( {14..8} )
 
 # @FUNCTION: get_llvm_prefix
 # @USAGE: [-b|-d] [<max_slot>]
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 83f8127a4bd7..fa426f91dff8 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -45,7 +45,7 @@ esac
 # @DESCRIPTION:
 # The major version of current LLVM trunk.  Used to determine
 # the correct branch to use.
-_LLVM_MASTER_MAJOR=13
+_LLVM_MASTER_MAJOR=14
 
 # @ECLASS-VARIABLE: _LLVM_SOURCE_TYPE
 # @INTERNAL
diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
index 3f3acc412089..8964ecbaf741 100644
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@@ -73,19 +73,17 @@
 
 [[ ${EAPI} == [5] ]] && inherit multilib
 [[ ${EAPI} == [56] ]] && inherit eutils
-inherit flag-o-matic toolchain-funcs unpacker
+inherit flag-o-matic strip-linguas toolchain-funcs unpacker
 
-case ${EAPI:-0} in
-	5|6|7)
+case ${EAPI} in
+	5|6|7|8)
 	;;
-	*) die "EAPI ${EAPI} unsupported."
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported"
 	;;
 esac
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm pkg_config
 
-IUSE=""
-
 # Name of the plugin stripped from all vdrplugin-, vdr- and -cvs pre- and postfixes
 VDRPLUGIN="${PN/#vdrplugin-/}"
 VDRPLUGIN="${VDRPLUGIN/#vdr-/}"
@@ -97,10 +95,16 @@ DESCRIPTION="vdr Plugin: ${VDRPLUGIN} (based on vdr-plugin-2.eclass)"
 S="${WORKDIR}/${VDRPLUGIN}-${PV}"
 
 # depend on headers for DVB-driver and vdr-scripts
-DEPEND=">=media-tv/gentoo-vdr-scripts-0.4.2
-	virtual/linuxtv-dvb-headers"
-RDEPEND=">=media-tv/gentoo-vdr-scripts-0.4.2
-	>=app-eselect/eselect-vdr-0.0.2"
+case ${EAPI} in
+	5|6)	DEPEND="media-tv/gentoo-vdr-scripts
+				virtual/linuxtv-dvb-headers
+				virtual/pkgconfig" ;;
+	*)		BDEPEND="virtual/pkgconfig"
+			DEPEND="media-tv/gentoo-vdr-scripts
+				virtual/linuxtv-dvb-headers" ;;
+esac
+RDEPEND="media-tv/gentoo-vdr-scripts
+	app-eselect/eselect-vdr"
 
 if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]]; then
 	IUSE="${IUSE} vdr"
@@ -151,7 +155,8 @@ vdr_create_header_checksum_file() {
 	local CHKSUM="header-md5-vdr"
 
 	if [[ -f ${VDR_CHECKSUM_DIR}/header-md5-vdr ]]; then
-		cp "${VDR_CHECKSUM_DIR}/header-md5-vdr" "${CHKSUM}"
+		cp "${VDR_CHECKSUM_DIR}/header-md5-vdr" "${CHKSUM}" \
+			|| die "Could not copy header-md5-vdr"
 	elif type -p md5sum >/dev/null 2>&1; then
 		(
 			cd "${VDR_INCLUDE_DIR}"
@@ -179,7 +184,8 @@ fix_vdr_libsi_include() {
 	for f; do
 		sed -i "${f}" \
 			-e '/#include/s:"\(.*libsi.*\)":<\1>:' \
-			-e '/#include/s:<.*\(libsi/.*\)>:<vdr/\1>:'
+			-e '/#include/s:<.*\(libsi/.*\)>:<vdr/\1>:' \
+			|| die "sed failed while fixing include of libsi-headers"
 	done
 }
 
@@ -192,7 +198,7 @@ fix_vdr_libsi_include() {
 vdr_patchmakefile() {
 	einfo "Patching Makefile"
 	[[ -e Makefile ]] || die "Makefile of plugin can not be found!"
-	cp Makefile "${WORKDIR}"/Makefile.before
+	cp Makefile "${WORKDIR}"/Makefile.before || die "Failed to copy Makefile"
 
 	# plugin makefiles use VDRDIR in strange ways
 	# assumptions:
@@ -216,14 +222,16 @@ vdr_patchmakefile() {
 		-e '/VDRINCDIR.*=/!s:$(VDRDIR)/include:$(VDRINCDIR):' \
 		\
 		-e 's:-I$(DVBDIR)/include::' \
-		-e 's:-I$(DVBDIR)::'
+		-e 's:-I$(DVBDIR)::' \
+		|| die "sed failed to set \$VDRDIR"
 
 	if ! grep -q APIVERSION Makefile; then
 		ebegin "  Converting to APIVERSION"
 		sed -i Makefile \
 			-e 's:^APIVERSION = :APIVERSION ?= :' \
 			-e 's:$(LIBDIR)/$@.$(VDRVERSION):$(LIBDIR)/$@.$(APIVERSION):' \
-			-e '/VDRVERSION =/a\APIVERSION = $(shell sed -ne '"'"'/define APIVERSION/s/^.*"\\(.*\\)".*$$/\\1/p'"'"' $(VDRDIR)/config.h)'
+			-e '/VDRVERSION =/a\APIVERSION = $(shell sed -ne '"'"'/define APIVERSION/s/^.*"\\(.*\\)".*$$/\\1/p'"'"' $(VDRDIR)/config.h)' \
+			|| die "sed failed to change APIVERSION"
 		eend $?
 	fi
 
@@ -231,13 +239,15 @@ vdr_patchmakefile() {
 	# Do not overwrite CXXFLAGS, add LDFLAGS if missing
 	sed -i Makefile \
 		-e '/^CXXFLAGS[[:space:]]*=/s/=/?=/' \
-		-e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:'
+		-e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:' \
+		|| die "sed failed to fix compile-flags"
 
 	# Disabling file stripping, the package manager takes care of it
 	sed -i Makefile \
 		-e '/@.*strip/d' \
 		-e '/strip \$(LIBDIR)\/\$@/d' \
-		-e 's/STRIP.*=.*$/STRIP = true/'
+		-e 's/STRIP.*=.*$/STRIP = true/' \
+		|| die "sed failed to fix file stripping"
 
 	# Use a file instead of a variable as single-stepping via ebuild
 	# destroys environment.
@@ -318,14 +328,16 @@ vdr_i18n() {
 		if [[ "${KEEP_I18NOBJECT:-no}" = "yes" ]]; then
 			eqawarn "Forced to keep i18n.o"
 		else
-			sed -i "s:i18n.o::g" Makefile
+			sed -i "s:i18n.o::g" Makefile \
+				|| die "sed failed to remove i18n from Makefile"
 			eqawarn "OBJECT i18n.o found, removed per sed"
 		fi
 	fi
 
 	local I18N_STRING=$( [[ -e i18n.h ]] && grep tI18nPhrase i18n.h )
 	if [[ -n ${I18N_STRING} ]]; then
-		sed -i "s:^extern[[:space:]]*const[[:space:]]*tI18nPhrase://static const tI18nPhrase:" i18n.h
+		sed -i "s:^extern[[:space:]]*const[[:space:]]*tI18nPhrase://static const tI18nPhrase:" i18n.h \
+			|| die "sed failed to replace tI18nPhrase"
 		eqawarn "obsolete tI18nPhrase found, disabled per sed, please recheck"
 	fi
 }
@@ -341,7 +353,8 @@ vdr_remove_i18n_include() {
 	local f
 	for f; do
 		sed -i "${f}" \
-		-e "s:^#include[[:space:]]*\"i18n.h\"://:"
+		-e "s:^#include[[:space:]]*\"i18n.h\"://:" \
+		|| die "sed failed to remove i18n_include"
 	done
 
 	eqawarn "removed i18n.h include in ${@}"
@@ -393,7 +406,8 @@ vdr-plugin-2_pkg_setup() {
 	append-cxxflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 
 	# Where should the plugins live in the filesystem
-	VDR_PLUGIN_DIR=$(pkg-config --variable=libdir vdr)
+	local PKG__CONFIG=$(tc-getPKG_CONFIG)
+	VDR_PLUGIN_DIR=$(${PKG__CONFIG} --variable=libdir vdr)
 
 	VDR_CHECKSUM_DIR="${VDR_PLUGIN_DIR%/plugins}/checksums"
 
@@ -405,7 +419,7 @@ vdr-plugin-2_pkg_setup() {
 
 	TMP_LOCALE_DIR="${T}/tmp-locale"
 
-	LOCDIR=$(pkg-config --variable=locdir vdr)
+	LOCDIR=$(${PKG__CONFIG} --variable=locdir vdr)
 
 	if ! has_vdr; then
 		# set to invalid values to detect abuses
@@ -422,7 +436,7 @@ vdr-plugin-2_pkg_setup() {
 	fi
 
 	VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
-	APIVERSION=$(pkg-config --variable=apiversion vdr)
+	APIVERSION=$(${PKG__CONFIG} --variable=apiversion vdr)
 
 	einfo "Compiling against"
 	einfo "\tvdr-${VDRVERSION} [API version ${APIVERSION}]"
@@ -551,10 +565,13 @@ vdr-plugin-2_src_install() {
 
 	if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
 		local mname="${P}-Makefile"
-		cp "${S}"/Makefile "${mname}.patched"
-		cp Makefile.before "${mname}.before"
+		cp "${S}"/Makefile "${mname}.patched" \
+			|| die "could not copy to Makefile.patched"
+		cp Makefile.before "${mname}.before" \
+			|| die "could not copy to Makefile.before"
 
 		diff -u "${mname}.before" "${mname}.patched" > "${mname}.diff"
+		[[ $? -ge 2 ]] && die "problem with diff"
 
 		insinto "/usr/share/vdr/maintainer-data/makefile-changes"
 		doins "${mname}.diff"
@@ -564,7 +581,6 @@ vdr-plugin-2_src_install() {
 
 		insinto "/usr/share/vdr/maintainer-data/makefile-patched"
 		doins "${mname}.patched"
-
 	fi
 
 	cd "${S}" || die "could not change to plugin source directory (src_install)"
@@ -589,11 +605,13 @@ vdr-plugin-2_src_install() {
 		local linguas
 		for linguas in ${LINGUAS[*]}; do
 		insinto "${LOCDIR}"
-		cp -r --parents ${linguas}* ${D%/}/${LOCDIR}
+		cp -r --parents ${linguas}* ${D%/}/${LOCDIR} \
+			|| die "could not copy linguas files"
 		done
 	fi
 
-	cd "${D%/}/usr/$(get_libdir)/vdr/plugins" || die "could not change to D/usr/libdir/vdr/plugins"
+	cd "${D%/}/usr/$(get_libdir)/vdr/plugins" \
+		|| die "could not change to \$D/usr/libdir/vdr/plugins"
 
 	# create list of all created plugin libs
 	vdr_plugin_list=""
diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
index 7f89e5388ba3..2bc5bd5ddba9 100644
--- a/eclass/verify-sig.eclass
+++ b/eclass/verify-sig.eclass
@@ -29,7 +29,7 @@
 # BDEPEND="
 #   verify-sig? ( app-crypt/openpgp-keys-example )"
 #
-# VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/example.asc
+# VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/example.asc
 # @CODE
 
 case ${EAPI} in
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 9e9b0f5d6f84..6ee89bad7b38 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/minecraft-launcher/Manifest b/games-action/minecraft-launcher/Manifest
index 5279aa2e3f47..7289dcf450bc 100644
--- a/games-action/minecraft-launcher/Manifest
+++ b/games-action/minecraft-launcher/Manifest
@@ -2,5 +2,5 @@ DIST minecraft-launcher-1.6.93.jar 4481683 BLAKE2B 29597977cc70f831bff7f77cb2493
 DIST minecraft-launcher-928.tar.gz 547096 BLAKE2B 8a47c62b5aa313a476cb6fb95e2993f609d3d1adde67802f3ef95df6385938dca424a3037ddb3303615323d10d0cd395807182ac75bae839502f13eb3faf2287 SHA512 57deacc588e8d90c90259841045a3df3b2b4861cb2d95b38e417daa34eee6aad4eebb601c2160627d5d5cd34f309aed854fb78872379cecfc8b976f3e14c8f91
 DIST minecraft-launcher.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a
 EBUILD minecraft-launcher-1.6.93.ebuild 917 BLAKE2B 2d9bdc8209022a0bf140dd38cc0c7afbe063596d9d62f17207f37fce79d3ac8ebf5b30ddec9f7f98695bfe8376d5ba9e21b9522b26e8b19647d30e11c1c55e99 SHA512 c219bdc9fa912a9ddf30da207dd9fcdd998a0c16fe93d88a759298a5541693246fd8ebfd6a34c52d5a88b98b84abc1ec1ff2e53284888579c192ed8ff41f03dc
-EBUILD minecraft-launcher-928-r2.ebuild 1196 BLAKE2B 872d648d927c7c7abc0057a6d30cf902a6fd57ca2eeee0916772b8b0b8d19bf98092181e5606bca6a561eac4afe8472a7d6c927f588ea7d256f5b0898f2d426c SHA512 54ba3b323a9c079aefe699c2c557d534379e25303e05188d2ff05fc1b805494b287b8a8c8b976c1b44628a5091355438bd33d078b748ec241a4a5679dd293473
+EBUILD minecraft-launcher-928-r3.ebuild 1228 BLAKE2B fa2c75420c1a524b5f8c6c2efcefedaf12306c14f106001d87e22a3f33bb717ac48585d24ad53ff7e4976975dd30c6511c7db9e4a4fd41c55c64720d774ff7eb SHA512 d51fe39236d7d13b81ee6b47a69719e5ec7778ed864fb7b179dde4c45c33da0b307c424f85bdefc84c315093ef57a0ee8b2e760ab0151efce393c9edf9f7cf03
 MISC metadata.xml 258 BLAKE2B cd6fd4c07f3e7f2e0f007951caac5ebe7d7ccf088d769ce2cd6e38172134c2f898145c77fa9d1efb9288e08b23a189be8dd87708400cbd8e5f926c54a17d756d SHA512 d6e8fa223415d98a85a3be244ce19417ffa534e92ddceab73aa0f6c7c4d329c80db74c918121ff274e7f86e9f26246584a688aefe0e3e6142ca84d20572b127b
diff --git a/games-action/minecraft-launcher/minecraft-launcher-928-r2.ebuild b/games-action/minecraft-launcher/minecraft-launcher-928-r2.ebuild
deleted file mode 100644
index fcfcd3f52428..000000000000
--- a/games-action/minecraft-launcher/minecraft-launcher-928-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg
-
-DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${PV}.tar.gz -> ${P}.tar.gz
-	https://launcher.mojang.com/download/minecraft-launcher.svg"
-
-KEYWORDS="-* ~amd64"
-LICENSE="Mojang"
-SLOT="0"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.24.32-r1[X(+)]
-	app-crypt/libsecret
-	dev-libs/nss
-	dev-libs/libbsd
-	dev-libs/libffi:0/7
-	dev-libs/libpcre
-	media-libs/alsa-lib
-	media-libs/openal
-	net-libs/gnutls[idn]
-	net-print/cups
-	sys-apps/dbus
-	virtual/jre:1.8
-	virtual/opengl
-	x11-apps/xrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-"
-
-S="${WORKDIR}/${PN}"
-
-QA_PREBUILT="
-	/usr/bin/minecraft-launcher
-"
-
-src_install() {
-	dobin minecraft-launcher
-
-	doicon -s scalable "${DISTDIR}/${PN}.svg"
-	make_desktop_entry ${PN} "Minecraft" ${PN} Game
-}
diff --git a/games-action/minecraft-launcher/minecraft-launcher-928-r3.ebuild b/games-action/minecraft-launcher/minecraft-launcher-928-r3.ebuild
new file mode 100644
index 000000000000..9532295a04cc
--- /dev/null
+++ b/games-action/minecraft-launcher/minecraft-launcher-928-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${PV}.tar.gz -> ${P}.tar.gz
+	https://launcher.mojang.com/download/minecraft-launcher.svg"
+
+KEYWORDS="-* ~amd64"
+LICENSE="Mojang"
+SLOT="0"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.24.32-r1[X(+)]
+	app-crypt/libsecret
+	dev-libs/nss
+	dev-libs/libbsd
+	|| ( dev-libs/libffi-compat:7 dev-libs/libffi:0/7 )
+	dev-libs/libpcre
+	media-libs/alsa-lib
+	media-libs/openal
+	net-libs/gnutls[idn]
+	net-print/cups
+	sys-apps/dbus
+	virtual/jre:1.8
+	virtual/opengl
+	x11-apps/xrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+"
+
+S="${WORKDIR}/${PN}"
+
+QA_PREBUILT="
+	/usr/bin/minecraft-launcher
+"
+
+src_install() {
+	dobin minecraft-launcher
+
+	doicon -s scalable "${DISTDIR}/${PN}.svg"
+	make_desktop_entry ${PN} "Minecraft" ${PN} Game
+}
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index ed6472530c54..afd5395b2b60 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/ascii-invaders/Manifest b/games-arcade/ascii-invaders/Manifest
index dbc1bbaa152b..7b5ab20880e6 100644
--- a/games-arcade/ascii-invaders/Manifest
+++ b/games-arcade/ascii-invaders/Manifest
@@ -1,5 +1,3 @@
 DIST ascii-invaders-1.0.1.tar.gz 37578 BLAKE2B 181509c07b1d9ae54f9147f7425c3d62a57f9bff9561fca6af3f3cc15b7fc96f62c809576bdbbe0ba6a2801947941e259e788f99980174848efedbc71c8a969c SHA512 326708ffc2c277e04575920c58f6a267e0bf46f8d2a3dbca9b5c317fb01006d4f673ab35f92f292549cc52dbee4400a84c85478eb81b9bd7703689a705547bc7
-DIST invaders0.1b.tgz 14597 BLAKE2B ecccca6636c4d8dffbc57b8cec82471efc2fd1a256648b9ac46fd256ef99d884205f1c86ff2bf0aedb7bb5996a59a7af3f301339944c6a4753355a8a4db23190 SHA512 3ac9dee0c532384e2849fdc8910bce885e3fdef362b629e8637df1cc0d82eba52c02a836a4925d811b339e9232f20caa7c761dbc1feeddc74e9b6f09e97046b8
-EBUILD ascii-invaders-0.1b-r2.ebuild 680 BLAKE2B 065c88431feb2b68f925c1e52ec5575adfc30576a5b01ff70b3bbdd2ce7b2db3c7803ca8fa47377bde9bcac596e60c0013b687bb4fe4a4b6021ad58bad4b8b4f SHA512 c787e980c3d1494a34c09083c564615f303c9cdb8d102f65cba512e773eea6cd538becfe2dbc86194435973be383ac811d201e73335f7a95cd29388b6c5d3921
 EBUILD ascii-invaders-1.0.1.ebuild 747 BLAKE2B ffc5e3c5c0e5d8abfc825e77e5b5dd8c95435db9c992225d7566101f9d4ecadb99bcf78f0bff79c596f6fdc353bb279d3deabfa572cf14c9c2e9acdba564a646 SHA512 f6f3bcba77cdd17a12ca7de5099890e63639c6f35da5bbe893a5faa5e84104c71ab7a3086c35919ec5bfed83a5d641631153b0c162fce5ec1fe955f4e2c41104
 MISC metadata.xml 340 BLAKE2B 2dc07ae0c7a5114d9d74aad74bcd7d00de690156767c3ccd2ffd2fff15c014aef1321dd51c07acd48fea24ab7795fbcafa9d6bb9b6c700bc03ad0b4c0aad5e48 SHA512 316b980e021ed3fa728432ec1e94b499eba243d592045f85f9d1dfa79645acbccfb7f7c28d99f56df53d837f541581e7c410274aeb965e4a633169102927686f
diff --git a/games-arcade/ascii-invaders/ascii-invaders-0.1b-r2.ebuild b/games-arcade/ascii-invaders/ascii-invaders-0.1b-r2.ebuild
deleted file mode 100644
index 407e574553b1..000000000000
--- a/games-arcade/ascii-invaders/ascii-invaders-0.1b-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Space invaders clone, using ncurses library"
-HOMEPAGE="https://packages.gentoo.org/package/games-arcade/ascii-invaders"
-SRC_URI="mirror://gentoo/invaders${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc64 ~x86 ~ppc-macos"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/invaders"
-
-src_prepare() {
-	default
-	rm -f Makefile
-}
-
-src_compile() {
-	emake LDLIBS="$($(tc-getPKG_CONFIG) ncurses --libs)" invaders
-}
-
-src_install() {
-	newbin invaders ${PN}
-	einstalldocs
-}
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index c36ee4b0a266..9dbaf7468ff8 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -3,5 +3,5 @@ AUX supertux-0.6.0-icon.patch 531 BLAKE2B ffe235acd0ebaac3ecb2588d195496ac2ea34a
 AUX supertux-0.6.0-license.patch 696 BLAKE2B 76ba58368ce9c02ce66f2a51f54e6c95ede9058130dc54e9560ad060f69806623ea6496a3cb89d823cfbae8d84ce00e4da19eb38e60519f48726a083a3633b76 SHA512 8b4baf774be6625ff253614bb68436ddc26149722af7acea0a4f0772d496c6b30013a22fd3777b11275bd901128caf11b968a37b6a7b99ab344bac78309a6e8e
 AUX supertux-0.6.0-obstack.patch 1063 BLAKE2B ab251d7514f38a8a641e680df6c69bea88b8cfb360fc93b7e91a5274ca20e0ef4210429f8ab0694cd5c3e9eee89c6ee955b54a20dd04b11cb385bccc5bb6be6c SHA512 32da8175888fca98b76640739aa531fbfcc132dbce0a89e76be49bca29bc5878266c702e5f4c7499ddd0473804b344c62d03f39f6b14941f0e669e20d2c2241d
 DIST SuperTux-v0.6.2-Source.tar.gz 174295862 BLAKE2B 1179a5ecf92dfb2ac56b87afe4fed21a2bdc1d7f91641fea8aafc2994ccfe49745420411f41b2145f06fa9714c73d75ecbc85160e85edcbd71c472026cefe708 SHA512 5baa783ee589b42a9bbce3740659dbb7b617ebfcc00c0a038c03d31b56700e3923c8548700ccebe42b325ca03bd85186bc5edef9f6580d93dc48d8aca88cbf74
-EBUILD supertux-0.6.2-r1.ebuild 1654 BLAKE2B 6c865732e4639b76bce8f9a4bfd2bba89c5171814eb13e545fd35f9bdd18ae9d9b441113becde3fe77644afb28784ad20bd65c0c89c194997200c67adbcd6d4a SHA512 cd4664c97ec59339d8ad77cddaed767563a617f9ccd2f9f9331d38e6a70abc30853f57019b198b7a9e42e39c5786e8f718ca7d099d52f022c6b3734e91d09b6c
+EBUILD supertux-0.6.2-r2.ebuild 1659 BLAKE2B 9d20ffa3966a675c41579cc0adab7112af44d9b2ab4be8efc530e85acdec49a71ee5b3e5b8335c78438f775a8fb674ee2ed4fec0f2c5bdb5cdf957b5a5cbdb1d SHA512 299c2f52397a1663d6cbde20a0aca47874423689b2f883c158630dfdc45cdba8359fb04f418931b1e0ede5ec2124cda2540166ca1aac452f0e685c0ffdb843a3
 MISC metadata.xml 389 BLAKE2B 960cbba61ef7e12c35b66f36620ba2570e159517b06a520b0c233496c0910b2949f4f87b789f3c948621b6beb2ba0a4d5e8bdb277516213cbbc115d31af58698 SHA512 e61b89a6c0da8bf74f2b126e185fbf4be02b7ac7bc80082bd4c6e80384ab00db73a196af1ed9448a31435dbb62768b7eee8c8e64a40c51a6257bffe8170deb65
diff --git a/games-arcade/supertux/supertux-0.6.2-r1.ebuild b/games-arcade/supertux/supertux-0.6.2-r1.ebuild
deleted file mode 100644
index 9dafa4b81e21..000000000000
--- a/games-arcade/supertux/supertux-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-inherit cmake flag-o-matic
-
-MY_PV="${PV/_rc/-rc.}"
-MY_P="SuperTux-v${MY_PV}-Source"
-
-DESCRIPTION="A game similar to Super Mario Bros."
-HOMEPAGE="https://supertux.org/"
-SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-# =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire
-# content of ${HOME} to ${HOME}/.local/share/supertux2/
-# DO NOT REMOVE THIS BLOCKER!!! See bug #764959
-RDEPEND="
-	!=media-libs/libsdl2-2.0.14-r0
-	>=dev-games/physfs-3.0
-	dev-libs/boost:=
-	media-libs/freetype
-	media-libs/glew:=
-	media-libs/libpng:0=
-	>=media-libs/libsdl2-2.0.1[joystick,video]
-	media-libs/libvorbis
-	media-libs/openal
-	>=media-libs/sdl2-image-2.0.0[png,jpeg]
-	>=net-misc/curl-7.21.7
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
-	"${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# This is not a developer release so switch the logo to the non-dev one.
-	sed -e 's@logo_dev@logo@' \
-		-i data/images/objects/logo/logo.sprite || die
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-
-	local mycmakeargs=(
-		-DWERROR=OFF
-		-DINSTALL_SUBDIR_BIN=bin
-		-DINSTALL_SUBDIR_DOC=share/doc/${PF}
-		-DINSTALL_SUBDIR_SHARE=share/${PN}2
-		-DENABLE_SQDBG="$(usex debug)"
-		-DUSE_SYSTEM_PHYSFS=ON
-	)
-	cmake_src_configure
-}
diff --git a/games-arcade/supertux/supertux-0.6.2-r2.ebuild b/games-arcade/supertux/supertux-0.6.2-r2.ebuild
new file mode 100644
index 000000000000..7682bb89378e
--- /dev/null
+++ b/games-arcade/supertux/supertux-0.6.2-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+inherit cmake flag-o-matic
+
+MY_PV="${PV/_rc/-rc.}"
+MY_P="SuperTux-v${MY_PV}-Source"
+
+DESCRIPTION="A game similar to Super Mario Bros."
+HOMEPAGE="https://supertux.org/"
+SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+# =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire
+# content of ${HOME} to ${HOME}/.local/share/supertux2/
+# DO NOT REMOVE THIS BLOCKER!!! See bug #764959
+RDEPEND="
+	!=media-libs/libsdl2-2.0.14-r0
+	>=dev-games/physfs-3.0
+	dev-libs/boost:=[nls]
+	media-libs/freetype
+	media-libs/glew:=
+	media-libs/libpng:0=
+	>=media-libs/libsdl2-2.0.1[joystick,video]
+	media-libs/libvorbis
+	media-libs/openal
+	>=media-libs/sdl2-image-2.0.0[png,jpeg]
+	>=net-misc/curl-7.21.7
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
+	"${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# This is not a developer release so switch the logo to the non-dev one.
+	sed -e 's@logo_dev@logo@' \
+		-i data/images/objects/logo/logo.sprite || die
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+
+	local mycmakeargs=(
+		-DWERROR=OFF
+		-DINSTALL_SUBDIR_BIN=bin
+		-DINSTALL_SUBDIR_DOC=share/doc/${PF}
+		-DINSTALL_SUBDIR_SHARE=share/${PN}2
+		-DENABLE_SQDBG="$(usex debug)"
+		-DUSE_SYSTEM_PHYSFS=ON
+	)
+	cmake_src_configure
+}
diff --git a/games-arcade/tuxanci/Manifest b/games-arcade/tuxanci/Manifest
index ee0ad66799a4..edc6cf71f66b 100644
--- a/games-arcade/tuxanci/Manifest
+++ b/games-arcade/tuxanci/Manifest
@@ -1,4 +1,4 @@
-AUX tuxanci-20110429-glu.patch 465 BLAKE2B bf6de17b99bde96779fa064969c95e351d58cbfa215611163aee449e551de9ca951939810c6e46fd5283cead74bd035ace5814e13e240af1b6688e31e7f95bd1 SHA512 9c26f868be5f1d42b14c3f5d1ee46345c75764e041d7172e3a657d21f34a3326503cfa8e7b90715d5011be9628527194fc47a52bf8bfc4a639f6d999f2db1c50
+AUX tuxanci-20110429-no-glver.patch 282 BLAKE2B 26b4e6676c93838978894a73b4e9bc8b2e1e5f53f30dcd6a8d168a05af19b0e0b6c1cdb78d9db7fb5c761357f3b402dbff58e4e3df267dfbc51b93cd76a897b5 SHA512 b40eb238ebaab9029d548b00824fbf07685d8c029aebc24baa4361ff65fd81056d5a96766933532d330d68224b91a2c5232cca25c18bc3b20d6a5d441435ca0a
 DIST tuxanci-20110429.tar.xz 4283540 BLAKE2B c45aef1a6f89284dc1d41de1718342f0f7d3303d7281698291c74acf5aee262c8ed782d73f955ad3e22a88015adb077d8950e3ce69c7295a9fe97116518045e2 SHA512 72305be823981699e9ac38c090dda2baafd45bd36554eba65bd438646e0b0b8a3ab17a7516610db17e225292c39e0cdabb383193f8b07d2d31d638483feafeea
-EBUILD tuxanci-20110429-r1.ebuild 1538 BLAKE2B aa64b3eb01b00ee0bcd5b4317e506f38864c60a911a1c3f41cd208fef9727101430c3f407154c6d0423bde14b64217f696767bcdbb5c2a6338596645ffc61195 SHA512 0cc51cb7825729309da40bc6fe81de2f7fdf8b0e28d403691cffd0ff922d51cfeaa1dad26d7b084b11c1ac00d2d7d135de26644ff1435ded7ebd41779169ed44
+EBUILD tuxanci-20110429-r2.ebuild 1014 BLAKE2B de6b14372cba777ef947142413d982a3301980e37a20709cbf39263a2bca693d4f51ec57e871960a561461ffdbf40fef12d869d1113a7e4fdf02dc8138db0e65 SHA512 e768f92fc95a93c390eed67fea87cca515fb4a87adcf92b2bb24f5024ba5aa76babd776eef3abc1eb118556aad23df4bcfb59cb84bd940065a93da76a46a521d
 MISC metadata.xml 391 BLAKE2B 9afeb2767b7924c11dc2b8407fd4f54beca1f223c2d1ebadb12a10b3a6a35e7576d63671a582197cd69e0969e676deaa924f68d381db9dc175c99dedc4b642c5 SHA512 f872f6da7bb29261230922b10e916705d073f4d780b868f25347081ffb89c96b514912b41898dc569c0b634551b925cbc18654707d40253d902ce5c74dd70414
diff --git a/games-arcade/tuxanci/files/tuxanci-20110429-glu.patch b/games-arcade/tuxanci/files/tuxanci-20110429-glu.patch
deleted file mode 100644
index 4273114e41cc..000000000000
--- a/games-arcade/tuxanci/files/tuxanci-20110429-glu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2011-04-29 00:29:40.000000000 +0200
-+++ b/CMakeLists.txt	2021-02-27 00:48:05.172582259 +0100
-@@ -187,7 +187,7 @@
- 	pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
- 	INCLUDE_DIRECTORIES ( ${FONTCONFIG_INCLUDE_DIRS} )
- 	IF ( WITH_OPENGL )
--		pkg_check_modules(OPENGL REQUIRED gl>=7.5)
-+		pkg_check_modules(OPENGL REQUIRED glu>=7.5)
- 		INCLUDE_DIRECTORIES ( ${OPENGL_INCLUDE_DIRS} )
- 	ENDIF ( WITH_OPENGL )
- 	pkg_check_modules(SDL REQUIRED sdl)
diff --git a/games-arcade/tuxanci/files/tuxanci-20110429-no-glver.patch b/games-arcade/tuxanci/files/tuxanci-20110429-no-glver.patch
new file mode 100644
index 000000000000..210e55d11998
--- /dev/null
+++ b/games-arcade/tuxanci/files/tuxanci-20110429-no-glver.patch
@@ -0,0 +1,9 @@
+https://bugs.gentoo.org/715132
+https://bugs.gentoo.org/798651
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -189,3 +189,3 @@
+ 	IF ( WITH_OPENGL )
+-		pkg_check_modules(OPENGL REQUIRED gl>=7.5)
++		pkg_check_modules(OPENGL REQUIRED gl)
+ 		INCLUDE_DIRECTORIES ( ${OPENGL_INCLUDE_DIRS} )
diff --git a/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild b/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild
deleted file mode 100644
index bbedae30502e..000000000000
--- a/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="First Tux shooter multi-player network game inspired by Bulanci"
-HOMEPAGE="https://repo.or.cz/w/tuxanci.git"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://repo.or.cz/tuxanci.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug dedicated +ipv6 nls opengl physfs +sound"
-
-# >=x11-libs/cairo-1.8.8[X,svg]
-RDEPEND="
-	!dedicated? (
-		>=media-libs/fontconfig-2.7.0
-		media-libs/libsdl[X,opengl?]
-		>=media-libs/sdl-image-1.2.10[png]
-		media-libs/sdl-ttf[X]
-		sound? ( >=media-libs/sdl-mixer-1.2.11[vorbis] )
-	)
-	physfs? ( dev-games/physfs[zip] )
-	!physfs? ( >=dev-libs/libzip-0.9 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=( "${FILESDIR}/${P}-glu.patch" ) # bug 715132
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEBUG=OFF
-		-DWITH_AUDIO=$(usex sound)
-		-DBUILD_SERVER=$(usex dedicated)
-		-DWITH_NLS=$(usex nls)
-		-DWITH_PHYSFS=$(usex physfs)
-		-DWITH_OPENGL=$(usex opengl)
-		-DENABLE_IPV6=$(usex ipv6)
-		-DDEVELOPER=$(usex debug)
-		-DCMAKE_INSTALL_ICONDIR="${EPREFIX}"/usr/pixmaps/
-		-DCMAKE_INSTALL_DESKTOPDIR="${EPREFIX}"/usr/applications/
-		-DCMAKE_DATA_PATH="${EPREFIX}"/usr/share/
-		-DCMAKE_LOCALE_PATH="${EPREFIX}"/usr/share/locale/
-		-DCMAKE_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
-		-DCMAKE_CONF_PATH="${EPREFIX}"/etc
-	)
-	cmake_src_configure
-}
diff --git a/games-arcade/tuxanci/tuxanci-20110429-r2.ebuild b/games-arcade/tuxanci/tuxanci-20110429-r2.ebuild
new file mode 100644
index 000000000000..4428d33da87f
--- /dev/null
+++ b/games-arcade/tuxanci/tuxanci-20110429-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="First Tux shooter multi-player network game inspired by Bulanci"
+HOMEPAGE="https://repo.or.cz/w/tuxanci.git"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="dedicated opengl physfs"
+
+RDEPEND="
+	!dedicated? (
+		media-libs/fontconfig
+		media-libs/libsdl[opengl?,sound,video]
+		media-libs/sdl-image[png]
+		media-libs/sdl-mixer[vorbis]
+		media-libs/sdl-ttf
+		opengl? ( virtual/opengl )
+	)
+	physfs? ( dev-games/physfs[zip] )
+	!physfs? ( dev-libs/libzip:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-glver.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SERVER=$(usex dedicated)
+		-DCMAKE_CONF_PATH="${EPREFIX}"/etc
+		-DCMAKE_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
+		-DENABLE_DEBUG=no
+		-DWITH_OPENGL=$(usex opengl)
+		-DWITH_PHYSFS=$(usex physfs)
+	)
+	cmake_src_configure
+}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index a884addcb29e..6387fc1a9ba1 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index cb898c2c98d5..7fda8dff2d03 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,5 +1,5 @@
 AUX dolphin-5.0_p20210506-musl.patch 779 BLAKE2B 5f962082cf58377801a266ec987417b731332e31ce6d79bb8e66204f6299dc1912aea760a9545ac671b090e6a3625c54b9e00583695790bd5c51ba54d524e0d7 SHA512 7a611de89b84e0f706c37d2aacdfb62cb4115098ad1b31daa4e40bd47e3793ab59f626fced184965361ba776891a63d02d66a54f8b69f675b6b88047a283bd9e
 DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862 SHA512 5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
 EBUILD dolphin-5.0_p20210506.ebuild 4817 BLAKE2B 5285d51e4404f2ae273c8315b143a18f5587356ad1d8c6b1c4fa369d5e9737742bb5b6af4c3c3f7d04e63edf5052245632256eed16136dfcc3beca83f861fb96 SHA512 f785395201fefb634972bd1c5b4538cb5e2534f1a4716f744ba1424f61deed7c833d406bfea71197d8a297e593d372c3b93c19447925ec8f72f518a900a016b6
-EBUILD dolphin-9999.ebuild 4879 BLAKE2B 6604b3589382425c39adb315b4b13a73a3bf674a63c0e68178a1ceadaf8ff6af3beff606551951845d24c280579f7eaf466030333dc533bfff1e214a027e0ed9 SHA512 bcde314b4615e30ebc03bc83dbe98c0de0774c73c437f9347ca28a0ab7c8098883fb54c09f3d3611d9c02884a3fd0992a1fccfc8ccc11410103173e2e237db79
-MISC metadata.xml 856 BLAKE2B 982e3d9ee65ed158e831ccb72d144944eaab8efd8f535f120f2d9e14f8332a980244bb23ee7fe0ca6c1ca8b6f2cdc6c1c766439b4416e17fc8df93fc24ca7655 SHA512 994efa4a7b1504a2d02f4d470382c212f0b9c2f929bbc67483b1a4efa4e68d4422216737dca65977ad99afd26fb6772224f6b1902a0eb6b869f155cf010aff33
+EBUILD dolphin-9999.ebuild 4910 BLAKE2B 6956e91cc557566ba3712050b4218f0994484037ba61ec21c66072f7d2ea050a93b52449c78c6400404f9126796f160ffdf8cc71339945304d7a1956d01e02bc SHA512 e3dd529047095cd936d9ba8dac650bc65011825e8345777e66ed35fd92523fda0a3e420a775b014081599e56804e3b28f175fd5f3c1d5857f75194db5806b207
+MISC metadata.xml 932 BLAKE2B d5ca4a316ba7874a6e3e4639c1debaef5e05cae72de68631b5a61c00ed2b9715cdb160b1c3cd7d07dcbbc619596c011e8899f295ee7b2c7401d08b616f3762f9 SHA512 5b5f339ab7cc4d12c5e388315f20ee61eb3f51215667e6a99bbecc8e60fee5d4895b6e0fca5f451c40f5b0c2d5c94e501846f029a870eab96c869eecd7b2ca71
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index fd99d4066165..891daca38b3c 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.dolphin-emu.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile pulseaudio +qt5 systemd upnp vulkan"
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto mgba profile pulseaudio +qt5 systemd upnp vulkan"
 
 RDEPEND="
 	dev-libs/hidapi:0=
@@ -153,6 +153,7 @@ src_configure() {
 		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
 		-DENABLE_LLVM=OFF
 		-DENABLE_LTO=$(usex lto)
+		-DUSE_MGBA=$(usex mgba)
 		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_SDL=OFF # not supported: #666558
diff --git a/games-emulation/dolphin/metadata.xml b/games-emulation/dolphin/metadata.xml
index 965b67caf1ee..73d4bba4f2b1 100644
--- a/games-emulation/dolphin/metadata.xml
+++ b/games-emulation/dolphin/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="evdev">Enable evdev input support</flag>
 		<flag name="log">Increase logging output</flag>
 		<flag name="lto">Add support for link-time optimizations.</flag>
+		<flag name="mgba">Enables GBA controllers emulation using libmgba.</flag>
 		<flag name="vulkan">Enable support for Vulkan-based video backend.</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 76e56efb9a25..da1c4646a3c3 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index a6c70f40083e..3ee02e430af4 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -9,5 +9,5 @@ AUX openmw-0.47.0-mygui-license.patch 728 BLAKE2B 036156d52e609fcbce3b219174e9de
 DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B 060b529fd4cd01f0fc723bb5a00a256b9c1ae4413c7b22581467cce75416e01041c3af22f0215ad9b1c475965a988065e0860c01c1e71d97454b022eec4779ea SHA512 0e165417e9ae047231fdc27b62251b33867f3782c1753f81705c886d6d3a433c8bbc3b4653a2555bc644bad11db9769d4bc2abcc84ca3ab23fabb6b80347bc32
 DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B 8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c SHA512 da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486
 EBUILD openmw-0.46.0-r2.ebuild 4282 BLAKE2B 78ebe705fe5e2365b3a2e0684d7e8bffd4ea6c94e0890d4e67377d5b6b03dd6c86c13861106c660cc65c39691d4c4df1f09d016fcf5f5eafa65c0d1412b14d61 SHA512 0c77d328ff9398cb7fe361c5ce19653905adf41030e7f041be9a9948b4c88c1a3e84b0283e32afb960c8f30cd55d2019b128c2fb1ab9887ad678b072865dc969
-EBUILD openmw-9999.ebuild 4172 BLAKE2B 2f19592efdea0f822a71b80b289b5e75e6b6eb8bfbf87c56967a3638362a519bf7696ba4a10e47c770e51769cc164255caba3d23f912abcbb386d977ba44fab0 SHA512 e51ce2640fb002ac389f2673e6d2f91b316a5965f8a8f2802910d1d9a3ced64ff94fb35eaa4995b6b3a0c6e89433214b4be39eb3205f3f4f43c5beb6749444b9
+EBUILD openmw-9999.ebuild 4201 BLAKE2B e5a1ccac389d31001ab5d26714a144f1439627f61687c4bfbad2a1a54ffce76af5684db2c1689dff7f854b6a30a9dda8d90a8ad0d31a7387a7388bc7a68c7c97 SHA512 1940f39350c3d2a9fe9097620e4716bb7f351d80e4992094244b92daa87ecd888bf54d943dfa44a52fadb4d72739228c29b40df8fddac47830dd8262e620f6d1
 MISC metadata.xml 1453 BLAKE2B b8731f5073cc74dbe2b17b776227e19c226a9bc3087996263d689771f8bcb8ceed06ef81b3a28dc693532f36e57a028fae2adc18b32dcf22bb6115f686643e63 SHA512 ead1390d762da49cb57fc978a59cde9ba1c77fb4a539c69250c98adf2ea836e1b231a939a4e0b1a88b7cbe804ebc7973a91e85f14cb701a97c983728b4bf8b0a
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index 82aa73331fdf..8692f3d2d3eb 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -38,8 +38,8 @@ RDEPEND="${LUA_DEPS}
 	media-video/ffmpeg:=
 	>=sci-physics/bullet-2.86:=[double-precision]
 	virtual/opengl
-	osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
-	!osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
+	osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
+	!osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
 	qt5? (
 		app-arch/unshield
 		dev-qt/qtcore:5
@@ -81,7 +81,7 @@ src_configure() {
 	use devtools && ! use qt5 && \
 		elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed"
 
-	append-cxxflags "-I${EPREFIX}/usr/include/recastnavigation"
+	append-cppflags "-I${ESYSROOT}/usr/include/recastnavigation"
 
 	local mycmakeargs=(
 		-DBUILD_BSATOOL=$(usex devtools)
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 4a73d2ef4082..cf70b5725187 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/chocolate-doom/Manifest b/games-fps/chocolate-doom/Manifest
index 2f31d10e0c14..acab6bf54a81 100644
--- a/games-fps/chocolate-doom/Manifest
+++ b/games-fps/chocolate-doom/Manifest
@@ -14,5 +14,5 @@ AUX chocolate-doom-3.0.1-install-AppStream-metadata-into-the-proper-location.pat
 AUX chocolate-doom-3.0.1-use-reverse-DNS-naming-for-installing-.desktop-files.patch 5485 BLAKE2B d89e14a071349cd772e5f91962429d0cdf152e2acd92be842068ee39569f79f451513a5bbd5a35f6abcd15d3eb73235e429025db1fb320c58f28feb3ca5c1d98 SHA512 e12d7e64baaaab44d8f6372cd057b4622e3758de6fb39365bcb047980eeccb6ec0b571185d084a56ac4c28a1d2916d3a8beef29466bb5d406eced60a3b2ddc6d
 DIST chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch 26736 BLAKE2B 3b75eaf6ea38280eb649eb0a35cf72376fc8daafda51a79bb321e1ac9311bd7d7edc6b7740b235288c32142c01fcf346045091783912739317556a78eb07751a SHA512 64512c47d404de1a85f84948bcf780257070f5b22dce6fa7dba66ba65027a15e93e39145424be327de4abd1f1f3b994fcd936e3dcdc564f1f96238b133a3a554
 DIST chocolate-doom-3.0.1.tar.gz 2245563 BLAKE2B 0c9babfbc9e52ea7822ca00c0dbf84e471bfe6d6ec94f729d3d0f72243205b060e5a3b5f1f99728da7764e81af735b45d001bb368dd2b5796666554e3c911090 SHA512 2a81905cf619ea2def7e2f9ebe65b38543d01bd83a95e535e88d04a79f2676f8ba0da64031a650bd905e1345cda1b9d28a398ad87c10c92f2d3d50f3253ec214
-EBUILD chocolate-doom-3.0.1.ebuild 2544 BLAKE2B 9640e7b406854a3e6e476dfc11d41c684162658d52a4f37f0db316be76dd4c50cf955a36e93c1ce58e396df0c12b7225b095805e29aed30cc262416d06b78bfb SHA512 81e05cf2d3660bfbf8897b5f82efd3ca02c70dddd84cacd4014bc5c785004018c0a5eebec1333ec48912eae8eb6e7eb9c918f59bc51a33511ddcfcaf9748ca5b
+EBUILD chocolate-doom-3.0.1-r1.ebuild 2537 BLAKE2B 6efeec6f543e52502a19d204c618e6e27175e7f7463f9a368c1f308b469a349c89ccdf6fa2bcbf84b9298e7c2cd3425f0015ef45c6d89c36eb9a048add001253 SHA512 4a0e5e028bf60ad4e71e1725fe89617ff8f3cef04c271c4d03030dacbcd2ed69fae6053fe5c91ee591b6a25db03de47b24246c38a963a4e80478db78e8b23b51
 MISC metadata.xml 1033 BLAKE2B 29efd90d416ae1858245ae325e5451acc332cf61a5f9eefe2a5da8028a3514f75f6ad8c87a5e5124c35912f7ea4b8a388d8b0fe9c5e733f05644a082bc5958f3 SHA512 e6357dd32a02f56989d0f9315fd8a77f20fcb9ae5950d35cb19eaf3d7a9f34837be51ec1c833054bfcdc742819c32db68e45d0545ea91966758f4fabcddf7eaa
diff --git a/games-fps/chocolate-doom/chocolate-doom-3.0.1-r1.ebuild b/games-fps/chocolate-doom/chocolate-doom-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..02a5356a9c32
--- /dev/null
+++ b/games-fps/chocolate-doom/chocolate-doom-3.0.1-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit autotools prefix python-any-r1 xdg
+
+DESCRIPTION="A Doom source port that is minimalist and historically accurate"
+HOMEPAGE="https://www.chocolate-doom.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz
+	https://gist.githubusercontent.com/vilhelmgray/28d4713cb6387ad62ab76cfac1443355/raw/f7600d93ca45a5102969b8f89974a3c36a3563f5/${P}-overhaul-manpages-add-parameters.patch"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc libsamplerate +midi png vorbis"
+
+DEPEND="
+	media-libs/libsdl2[video]
+	media-libs/sdl2-mixer[midi?,vorbis?]
+	media-libs/sdl2-net
+	libsamplerate? ( media-libs/libsamplerate )
+	png? ( media-libs/libpng:= )"
+RDEPEND="${DEPEND}"
+# ${PYTHON_DEPS} for bash-completion
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( ${PYTHON_DEPS} )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+	"${DISTDIR}/${P}-overhaul-manpages-add-parameters.patch"
+	"${FILESDIR}/${P}-further-manpage-substitutions-and-fixes.patch"
+	"${FILESDIR}/${P}-bash-completion-run-docgen-with-z-argument.patch"
+	"${FILESDIR}/${P}-install-AppStream-metadata-into-the-proper-location.patch"
+	"${FILESDIR}/${P}-Update-AppStream-XML-files-to-current-0.11-standards.patch"
+	"${FILESDIR}/${P}-bash-completion-Build-from-actual-shell-script-templ.patch"
+	"${FILESDIR}/${P}-configure-add-AM_PROG_AR-macro.patch"
+	"${FILESDIR}/${P}-bash-completion-always-install-into-datadir-bash-com.patch"
+	"${FILESDIR}/${P}-Update-to-latest-AppStream-formerly-AppData-standard.patch"
+	"${FILESDIR}/${P}-use-reverse-DNS-naming-for-installing-.desktop-files.patch"
+	"${FILESDIR}/${P}-Remove-redundant-demoextend-definition.patch"
+	"${FILESDIR}/${P}-Introduce-configure-options-for-bash-completion-doc-.patch"
+	"${FILESDIR}/${P}-Add-support-for-usr-share-doom-IWAD-search-path.patch"
+	"${FILESDIR}/${P}-Update-documentation-about-usr-share-doom-IWAD-locat.patch"
+	"${FILESDIR}/${P}-Fix-Python-check.patch"
+)
+
+DOCS=(
+	"AUTHORS"
+	"ChangeLog"
+	"NEWS.md"
+	"NOT-BUGS.md"
+	"PHILOSOPHY.md"
+	"README.md"
+	"README.Music.md"
+	"README.Strife.md"
+)
+
+src_prepare() {
+	default
+
+	hprefixify src/d_iwad.c
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-bash-completion \
+		$(use_enable doc) \
+		--disable-fonts \
+		--disable-icons \
+		$(use_with libsamplerate) \
+		$(use_with png libpng)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Remove redundant documentation files
+	rm -r "${ED}/usr/share/doc/"* || die
+
+	einstalldocs
+}
diff --git a/games-fps/chocolate-doom/chocolate-doom-3.0.1.ebuild b/games-fps/chocolate-doom/chocolate-doom-3.0.1.ebuild
deleted file mode 100644
index 13647f2153ff..000000000000
--- a/games-fps/chocolate-doom/chocolate-doom-3.0.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools prefix python-any-r1 xdg
-
-DESCRIPTION="A Doom source port that is minimalist and historically accurate"
-HOMEPAGE="https://www.chocolate-doom.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz
-	https://gist.githubusercontent.com/vilhelmgray/28d4713cb6387ad62ab76cfac1443355/raw/f7600d93ca45a5102969b8f89974a3c36a3563f5/${P}-overhaul-manpages-add-parameters.patch"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc libsamplerate +midi png vorbis"
-
-DEPEND="
-	media-libs/libsdl2[video]
-	media-libs/sdl2-mixer[midi?,vorbis?]
-	media-libs/sdl2-net
-	libsamplerate? ( media-libs/libsamplerate )
-	png? ( media-libs/libpng:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	bash-completion? ( ${PYTHON_DEPS} )
-	doc? ( ${PYTHON_DEPS} )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
-	"${DISTDIR}/${P}-overhaul-manpages-add-parameters.patch"
-	"${FILESDIR}/${P}-further-manpage-substitutions-and-fixes.patch"
-	"${FILESDIR}/${P}-bash-completion-run-docgen-with-z-argument.patch"
-	"${FILESDIR}/${P}-install-AppStream-metadata-into-the-proper-location.patch"
-	"${FILESDIR}/${P}-Update-AppStream-XML-files-to-current-0.11-standards.patch"
-	"${FILESDIR}/${P}-bash-completion-Build-from-actual-shell-script-templ.patch"
-	"${FILESDIR}/${P}-configure-add-AM_PROG_AR-macro.patch"
-	"${FILESDIR}/${P}-bash-completion-always-install-into-datadir-bash-com.patch"
-	"${FILESDIR}/${P}-Update-to-latest-AppStream-formerly-AppData-standard.patch"
-	"${FILESDIR}/${P}-use-reverse-DNS-naming-for-installing-.desktop-files.patch"
-	"${FILESDIR}/${P}-Remove-redundant-demoextend-definition.patch"
-	"${FILESDIR}/${P}-Introduce-configure-options-for-bash-completion-doc-.patch"
-	"${FILESDIR}/${P}-Add-support-for-usr-share-doom-IWAD-search-path.patch"
-	"${FILESDIR}/${P}-Update-documentation-about-usr-share-doom-IWAD-locat.patch"
-	"${FILESDIR}/${P}-Fix-Python-check.patch"
-)
-
-DOCS=(
-	"AUTHORS"
-	"ChangeLog"
-	"NEWS.md"
-	"NOT-BUGS.md"
-	"PHILOSOPHY.md"
-	"README.md"
-	"README.Music.md"
-	"README.Strife.md"
-)
-
-src_prepare() {
-	default
-
-	hprefixify src/d_iwad.c
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable bash-completion) \
-		$(use_enable doc) \
-		--disable-fonts \
-		--disable-icons \
-		$(use_with libsamplerate) \
-		$(use_with png libpng)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Remove redundant documentation files
-	rm -r "${ED}/usr/share/doc/"* || die
-
-	einstalldocs
-}
diff --git a/games-fps/freedm-data/Manifest b/games-fps/freedm-data/Manifest
index 84cde8c5e7ee..6cec1a6b5cb4 100644
--- a/games-fps/freedm-data/Manifest
+++ b/games-fps/freedm-data/Manifest
@@ -1,3 +1,3 @@
 DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d SHA512 7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2
-EBUILD freedm-data-0.12.1.ebuild 1086 BLAKE2B b59e7abc6ecb488b05e8dbaff5bbe901a389be303e129411023d9f65c6b4b4c3c9e3866b3d378673e52bcd4d2d89a1cb700aeb86bcad5961d3b4440f1fc8c15b SHA512 b75845ee30061170b93beb293ba5a473e00d528cddd3edda092b8de467737920e159a8a62d4f7d55df456d7d7b1dea0f47582cc3aadbba773c5b282414a0bc31
+EBUILD freedm-data-0.12.1-r1.ebuild 1092 BLAKE2B bc39a90703139ee3f23bc45cce55b0d6e0a3e52d41cd4caf6fc0ff34ab585d8d0efc86c96c53df96cbedf5fcdc6ac48da4e21b0e60cd1fa15126beb54e49c4e0 SHA512 efcb5b570a98d35bc0adc4139d82f0813f6ae5ef48ad9840a6a2df1e14b587d8b69d220764e3e8a60629257e8fa496a8ca2a0ed5427a34b65e2d5db10b457231
 MISC metadata.xml 1510 BLAKE2B 228d6788aedc580020163b04ffafb826c8e68aff148cf9d72743d64f8ee953e20fc67e246963ded56481b5aeee539d45b84af395bd604dc5bb07bfb9b8d763db SHA512 06e30065de755cc85aaee05597722a7d2679870a602214f82e49008c4dda0635f14f5724d1e07a20276abcb6ec9c1d14a5058451ed0a2f4edf63ff1f82920690
diff --git a/games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild b/games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild
new file mode 100644
index 000000000000..f9c14047d7b6
--- /dev/null
+++ b/games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit prefix python-any-r1 xdg
+
+DESCRIPTION="Game resources for FreeDM"
+HOMEPAGE="https://freedoom.github.io"
+SRC_URI="https://github.com/freedoom/freedoom/archive/v${PV}.tar.gz -> freedoom-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]')
+	app-text/asciidoc
+	games-util/deutex[png]"
+
+S="${WORKDIR}/freedoom-${PV}"
+
+DOOMWADPATH=share/doom
+
+python_check_deps() {
+	has_version -b "dev-python/pillow[${PYTHON_USEDEP},zlib]"
+}
+
+src_prepare() {
+	xdg_src_prepare
+
+	hprefixify dist/freedoom
+}
+
+src_compile() {
+	emake wads/freedm.wad \
+		freedm.6 \
+		{NEWS,README}.html
+}
+
+src_install() {
+	emake install-freedm \
+		prefix="${ED}/usr/" \
+		bindir="bin/" \
+		docdir="share/doc/${PF}" \
+		mandir="share/man/" \
+		waddir="${DOOMWADPATH}/"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "FreeDM WAD file installed into ${EPREFIX}/usr/${DOOMWADPATH} directory."
+}
diff --git a/games-fps/freedm-data/freedm-data-0.12.1.ebuild b/games-fps/freedm-data/freedm-data-0.12.1.ebuild
deleted file mode 100644
index fa8948dc07d3..000000000000
--- a/games-fps/freedm-data/freedm-data-0.12.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit prefix python-any-r1 xdg
-
-DESCRIPTION="Game resources for FreeDM"
-HOMEPAGE="https://freedoom.github.io"
-SRC_URI="https://github.com/freedoom/freedoom/archive/v${PV}.tar.gz -> freedoom-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]')
-	app-text/asciidoc
-	games-util/deutex"
-
-S="${WORKDIR}/freedoom-${PV}"
-
-DOOMWADPATH=share/doom
-
-python_check_deps() {
-	has_version -b "dev-python/pillow[${PYTHON_USEDEP},zlib]"
-}
-
-src_prepare() {
-	xdg_src_prepare
-
-	hprefixify dist/freedoom
-}
-
-src_compile() {
-	emake wads/freedm.wad \
-		freedm.6 \
-		{NEWS,README}.html
-}
-
-src_install() {
-	emake install-freedm \
-		prefix="${ED}/usr/" \
-		bindir="bin/" \
-		docdir="share/doc/${P}" \
-		mandir="share/man/" \
-		waddir="${DOOMWADPATH}/"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "FreeDM WAD file installed into ${EPREFIX}/usr/${DOOMWADPATH} directory."
-}
diff --git a/games-fps/freedm/Manifest b/games-fps/freedm/Manifest
index d02f29b773df..ec591ca0e5d2 100644
--- a/games-fps/freedm/Manifest
+++ b/games-fps/freedm/Manifest
@@ -1,2 +1,2 @@
-EBUILD freedm-0.12.1.ebuild 544 BLAKE2B 541a16219ff289e542e87c561484db201d4b83c8f3345e814777e1da614c843cb0da23e6329693d852fb7764c85ece0b6ff57e749f977081602559af3bbafad1 SHA512 7a5e483634a5f5bdfa3657b6bd00b8824e69117b1fc58c4aab1b5dc33e27ad232a2716b8b6cd0ad1d00e47d5f329dbeaf524a3f81cdbce34da03efcb6e2c7537
+EBUILD freedm-0.12.1.ebuild 571 BLAKE2B bb5695646003a6ae5dde9b03c81da6943104d8b11a0cb640a17f7b6b49e1c8342db58a02194741daf647ca9c38745c045a5fba06bf41e2e587531c3abdd997f3 SHA512 b5a8cac80d7da2b7534e231931df60ba9919d320a611b4e33113251588a0540e6c472aedf060d96b02c3517db6e8f28d59b89033c4d63639bd99391727ef8b42
 MISC metadata.xml 1510 BLAKE2B 228d6788aedc580020163b04ffafb826c8e68aff148cf9d72743d64f8ee953e20fc67e246963ded56481b5aeee539d45b84af395bd604dc5bb07bfb9b8d763db SHA512 06e30065de755cc85aaee05597722a7d2679870a602214f82e49008c4dda0635f14f5724d1e07a20276abcb6ec9c1d14a5058451ed0a2f4edf63ff1f82920690
diff --git a/games-fps/freedm/freedm-0.12.1.ebuild b/games-fps/freedm/freedm-0.12.1.ebuild
index 9b59beb2648f..1c2eae7cc6d6 100644
--- a/games-fps/freedm/freedm-0.12.1.ebuild
+++ b/games-fps/freedm/freedm-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,7 @@ RDEPEND="
 	|| (
 		games-fps/gzdoom[nonfree(+)]
 		games-engines/odamex
+		games-fps/chocolate-doom
 		games-fps/doomsday
 		games-fps/prboom-plus
 	)
diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index da1ec0666cf8..89edaa90859f 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1,3 +1,3 @@
 DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d SHA512 7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2
-EBUILD freedoom-data-0.12.1.ebuild 1118 BLAKE2B 24613fab215ab2e977bb4cfb16bf5deea7a6f4fb534c1bac7d566b540ca83630d05393c96257a3847d72a375bd1c5e1990a159cda422f702a47a35010584a85c SHA512 11e54ee30ca0fbd77238087af3336a0f0325663f8a3b5412d63412ad71e11e128a68289ff126187e4b4f1b2593b826e2402b5c9715317b88d39aadfc9cd970df
+EBUILD freedoom-data-0.12.1-r1.ebuild 1124 BLAKE2B 3fd2445ffb923a812dff19c1054a9e9c91a071edf0c82209a9a7637996a984d55a450bcc3f2f7b17ec808e0a0b7d05fe95fc86497537118d04dbc030f58ced6e SHA512 fb28628fc94b597b4a73f5b4da34c1e58754e5872fddcab7941798ae5cf723af4881e04de63cf8e898f94393d9d1514aa5889ff2e9cb5bbf2c5e5b945afadaf9
 MISC metadata.xml 1839 BLAKE2B e512baac046ee7dea937cbae541d36bc541305b0325879d6676d0c00750a3e104b6b9102d95ef016659467ab574ef746e5c6cb3e6cd1e9e5891dfb174430f7c7 SHA512 7713a4ecd003d543b8919c26400b1ba6f388767d6b43f4ba8a606277d1c39b6be696d1de83767f5eaf71057a0feffb66aa514bed7758d15f951c72e4ff65616b
diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
new file mode 100644
index 000000000000..87611ba48ea7
--- /dev/null
+++ b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit prefix python-any-r1 xdg
+
+DESCRIPTION="Game resources for Freedoom: Phase 1+2"
+HOMEPAGE="https://freedoom.github.io"
+SRC_URI="https://github.com/freedoom/freedoom/archive/v${PV}.tar.gz -> freedoom-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]')
+	app-text/asciidoc
+	games-util/deutex[png]"
+
+S="${WORKDIR}/freedoom-${PV}"
+
+DOOMWADPATH=share/doom
+
+python_check_deps() {
+	has_version -b "dev-python/pillow[${PYTHON_USEDEP},zlib]"
+}
+
+src_prepare() {
+	xdg_src_prepare
+
+	hprefixify dist/freedoom
+}
+
+src_compile() {
+	emake wads/freedoom{1,2}.wad \
+		freedoom{1,2}.6 \
+		{NEWS,README}.html
+}
+
+src_install() {
+	emake install-freedoom \
+		prefix="${ED}/usr/" \
+		bindir="bin/" \
+		docdir="share/doc/${PF}" \
+		mandir="share/man/" \
+		waddir="${DOOMWADPATH}/"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Freedoom WAD files installed into ${EPREFIX}/usr/${DOOMWADPATH} directory."
+}
diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild b/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
deleted file mode 100644
index d0402108c77b..000000000000
--- a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit prefix python-any-r1 xdg
-
-DESCRIPTION="Game resources for Freedoom: Phase 1+2"
-HOMEPAGE="https://freedoom.github.io"
-SRC_URI="https://github.com/freedoom/freedoom/archive/v${PV}.tar.gz -> freedoom-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]')
-	app-text/asciidoc
-	games-util/deutex"
-
-S="${WORKDIR}/freedoom-${PV}"
-
-DOOMWADPATH=share/doom
-
-python_check_deps() {
-	has_version -b "dev-python/pillow[${PYTHON_USEDEP},zlib]"
-}
-
-src_prepare() {
-	xdg_src_prepare
-
-	hprefixify dist/freedoom
-}
-
-src_compile() {
-	emake wads/freedoom{1,2}.wad \
-		freedoom{1,2}.6 \
-		{NEWS,README}.html
-}
-
-src_install() {
-	emake install-freedoom \
-		prefix="${ED}/usr/" \
-		bindir="bin/" \
-		docdir="share/doc/${P}" \
-		mandir="share/man/" \
-		waddir="${DOOMWADPATH}/"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Freedoom WAD files installed into ${EPREFIX}/usr/${DOOMWADPATH} directory."
-}
diff --git a/games-fps/freedoom/Manifest b/games-fps/freedoom/Manifest
index 5527172e31d6..ce3df8acb443 100644
--- a/games-fps/freedoom/Manifest
+++ b/games-fps/freedoom/Manifest
@@ -1,2 +1,2 @@
-EBUILD freedoom-0.12.1.ebuild 571 BLAKE2B 815e7a39e6b85d54e9bb68382ceb2b71577c0b1e903a8bd5eba258adfaf711c5e23c188dbe43722f80547917570affc4b780eee62869094abc7c10184b72938a SHA512 afafa4a4624910fb1d1d543eedb7c15373ff7d4d2ef50773da75e225d610263a52b6bb7e8232f9234204ba5e53795898de03e4254e399c9eba9e432d445c2d4d
+EBUILD freedoom-0.12.1.ebuild 598 BLAKE2B bd17ff88287838826efca4a5aff51b0c604d50b5d8c6264355157efffbb6a3d6663f0f6f44a1e36a01128278d1ccc14e9ffe98554cc93b63f277e7513ee6b99a SHA512 ae3e50f500d5e38c21d02af92e4aca3be928ad3fb12eb4ad0122c5d36cebc1225c611fd63f88b7ed08070466696848265426a03a671e0297a798e1d00a07bda3
 MISC metadata.xml 1839 BLAKE2B e512baac046ee7dea937cbae541d36bc541305b0325879d6676d0c00750a3e104b6b9102d95ef016659467ab574ef746e5c6cb3e6cd1e9e5891dfb174430f7c7 SHA512 7713a4ecd003d543b8919c26400b1ba6f388767d6b43f4ba8a606277d1c39b6be696d1de83767f5eaf71057a0feffb66aa514bed7758d15f951c72e4ff65616b
diff --git a/games-fps/freedoom/freedoom-0.12.1.ebuild b/games-fps/freedoom/freedoom-0.12.1.ebuild
index c0232065f78c..a122aa325f51 100644
--- a/games-fps/freedoom/freedoom-0.12.1.ebuild
+++ b/games-fps/freedoom/freedoom-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,7 @@ RDEPEND="
 	|| (
 		games-fps/gzdoom[nonfree(+)]
 		games-engines/odamex
+		games-fps/chocolate-doom
 		games-fps/doomsday
 		games-fps/prboom-plus
 	)
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 834a65a7c2e1..948f29d4ce9e 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/lpairs/Manifest b/games-puzzle/lpairs/Manifest
index 21f4686caf6f..a1597163134d 100644
--- a/games-puzzle/lpairs/Manifest
+++ b/games-puzzle/lpairs/Manifest
@@ -1,3 +1,3 @@
-DIST lpairs-1.0.4.tar.gz 536625 BLAKE2B f020f50b47290b961d77335d567dd68bc009e0952e7ebd39d39c041fcc5a2d9e97d6827921b862dd3dd59c7bef0f11165356f41eda022d7583ca27f584e4b02b SHA512 637f9782c1c1faee3fe0d02adeeb7ea70704f1b625922e1ba086cd03e9a6cf1d61a082eff4753a2ec8be5fc7041bd029f193adf847a39e773e4eedd9eafb2b97
-EBUILD lpairs-1.0.4-r1.ebuild 939 BLAKE2B 93d2d8c38038efc7ceed0ca8a0554fa5489ca838591f2d36f918b4a54bfd3c6680f12332288b73f99d8d9c518a9e6632eb887c45b2d50fd710ed4b920b9399a2 SHA512 5ecf4fcbcdc5bd6487959c9fecc8027af2e60c01d7200072424ae3a212db96a59ae76984b23cf711456c65bb38abee596864d910d02607fe54eef88eab482fb2
+DIST lpairs-1.0.5.tar.gz 557997 BLAKE2B 940482bc0b5cd209366d541fc4b936055741a7d3936b0f218c68a3ecf43ed0189bfe87fc52eefd85896cfe0b2ed592b1362581d93941a0fb73965cf4341cba6f SHA512 381c47969446b778c694f484647ab6a6bd41eb996e741a01a63f1b854c30f78c7e9f1043546a3b8649ec6db940cac3b7ae5ba3c23e6c9df2716a93e6f6d37324
+EBUILD lpairs-1.0.5.ebuild 716 BLAKE2B 45706a7b449842c7346789486d50ff79719630cba4c0017fdad5e4d7678fc1479da07afef098c99271800fc39aa9cb336c5f9e1276f43186036ec87952f285d3 SHA512 e086b04ce8a003c6cdba7f851f89d4c3db0db26b534c31d1090f8980b6a9ad9f32b247848358d909cb42b2ca4cf55e6ef1baea02b11209445f75a26a96c360b6
 MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild b/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild
deleted file mode 100644
index 0f13cdb89b69..000000000000
--- a/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A classical memory game"
-HOMEPAGE="http://lgames.sourceforge.net/LPairs/"
-SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls sound"
-
-RDEPEND="
-	media-libs/libsdl[sound?,video]
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:$localedir:/usr/share/locale:' \
-		-e 's:$(localedir):/usr/share/locale:' \
-		configure po/Makefile.in.in || die
-	# gcc5 doesn't like the way inline is used.  just punt it. (bug #568684)
-	sed -i -e 's/^inline//g' lpairs/{sdl.[ch],pairs.[ch]} || die
-}
-
-src_configure() {
-	econf \
-		--datadir=/usr \
-		$(use_enable nls) \
-		$(usex sound '' --disable-sound)
-}
-
-src_install() {
-	default
-	doicon lpairs.png
-	make_desktop_entry lpairs LPairs
-}
diff --git a/games-puzzle/lpairs/lpairs-1.0.5.ebuild b/games-puzzle/lpairs/lpairs-1.0.5.ebuild
new file mode 100644
index 000000000000..2b8156772c9e
--- /dev/null
+++ b/games-puzzle/lpairs/lpairs-1.0.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Classic memory game"
+HOMEPAGE="http://lgames.sourceforge.net/LPairs/"
+SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sound"
+
+RDEPEND="
+	media-libs/libsdl[sound?,video]
+	virtual/libintl"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	default
+
+	sed -i '/^inst_dir=/s|/games||' configure || die
+}
+
+src_configure() {
+	# --enable-sound doesn't enable it, needs to be unspecified
+	econf $(usev !sound --disable-sound)
+}
+
+src_install() {
+	default
+
+	doicon ${PN}.png
+	make_desktop_entry ${PN} LPairs
+}
diff --git a/games-puzzle/tanglet/Manifest b/games-puzzle/tanglet/Manifest
index 5d8ab407b1ba..0c55bbe15eb3 100644
--- a/games-puzzle/tanglet/Manifest
+++ b/games-puzzle/tanglet/Manifest
@@ -1,4 +1,3 @@
-AUX tanglet-1.5.2-gentoo.patch 981 BLAKE2B a581aca772c797e31ad7bd85adf1fd1f12d2e768c9bee87139871f100eb8d4a77bfe343d86b1d29840a67338bdf5b003ff427acc6653abcd2fa4b182b8a362c4 SHA512 541d1feaf1b12acdf8ff477bf3e165d6ea6fa615eca8def32b092925dfb8902759ce29b3fe6f76d761688d298b3b452c71815e94e2cd71a9b07e6641f05386e6
-DIST tanglet-1.5.3-src.tar.bz2 8631208 BLAKE2B b7b0b913a1d862f43d4fb215a09aaba379bda95d75d3d2f59b207361efeda6573055f25db9d07d330fe0957ca774679589f87b79d0766ac669709da37d164f5f SHA512 31b7aada8b244969c2581a0879c30ca1a9b9db8e0cff5c802607dd08038af9487ba59db0e64fabb35feade9d5d700a2a1e04a0052d0ff4639c10a42189671267
-EBUILD tanglet-1.5.3.ebuild 651 BLAKE2B 774258c6c7fc8b88aebd420354b7b39a80d7f7e4ed87c29d8ee23a2f948a33b37547b126314364989fa326c94a9fe2da8ff05b12dfac47358e51926bf3ec4e43 SHA512 c00e470a200dd7dc203550d72c18833b19babe0b452c89144d029bd3a9aa22f3b9827275d468afb1b717b19a11e46513a54aac8bea5bb9e0e88d4dec7fc5adc8
+DIST tanglet-1.6.1.1-src.tar.bz2 25059666 BLAKE2B df363cf77863d3dcc77dee95aa1e4dcd20d16438f23e38286bbf5362fa9f8b17a28bc03dc480d6eaf44a443f4b7f977022b978a642d93c4f4c766b5cdd868728 SHA512 d65bc14f44ed1fa1ddae8f90c2aa62fb5d14ea964e36d544916856d9b6b93009509d4d8adf17fd4a45555732fb9b656f24661b2eec52a980bdb8f20512a38ff3
+EBUILD tanglet-1.6.1.1.ebuild 628 BLAKE2B e463be4679f0a91005a9ec851e6b1b3a2b81bf24a24b2144972b499230edeafc7f7dabcd26efe24dc4d7dcd5eea6d62048a5e2548f3950d387680e6f0d084058 SHA512 7916d1d516ee6204d33109c123e7ab9de05fb2bd8dc72b9860ce557aecf4ce578ce0be26078b79a14aa743a250378b2ca4747f9bb71a3f535d60869f388a9403
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch b/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch
deleted file mode 100644
index 8409f2cc48cf..000000000000
--- a/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/src.pro	2018-05-29 13:11:55.000000000 +0200
-+++ b/src/src.pro	2018-07-11 20:02:51.415773874 +0200
-@@ -99,7 +99,7 @@
- 	RESOURCES += ../icons/icon.qrc
- 
- 	isEmpty(PREFIX) {
--		PREFIX = /usr/local
-+		PREFIX = /usr
- 	}
- 	isEmpty(BINDIR) {
- 		BINDIR = bin
---- a/src/locale_dialog.cpp
-+++ b/src/locale_dialog.cpp
-@@ -85,7 +85,7 @@
- 	if (paths.isEmpty()) {
- 		QString appdir = QCoreApplication::applicationDirPath();
- 		paths.append(appdir);
--		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
-+		paths.append("/usr/share");
- 		paths.append(appdir + "/../Resources");
- 	}
- 	foreach (const QString& path, paths) {
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -46,7 +46,7 @@
- 	QString path = app.applicationDirPath();
- 	QStringList paths;
- 	paths.append(path + "/data/");
--	paths.append(path + "/../share/tanglet/data/");
-+	paths.append("/usr/share/data/");
- 	paths.append(path + "/../Resources/data/");
- 	QDir::setSearchPaths("tanglet", paths);
- 
diff --git a/games-puzzle/tanglet/tanglet-1.5.3.ebuild b/games-puzzle/tanglet/tanglet-1.5.3.ebuild
deleted file mode 100644
index 0987abb49061..000000000000
--- a/games-puzzle/tanglet/tanglet-1.5.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Single player word finding game based on Boggle"
-HOMEPAGE="https://gottcode.org/tanglet/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5.2-gentoo.patch )
-
-src_configure() {
-	eqmake5 tanglet.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/games-puzzle/tanglet/tanglet-1.6.1.1.ebuild b/games-puzzle/tanglet/tanglet-1.6.1.1.ebuild
new file mode 100644
index 000000000000..65f7fae82093
--- /dev/null
+++ b/games-puzzle/tanglet/tanglet-1.6.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Single player word finding game based on Boggle"
+HOMEPAGE="https://gottcode.org/tanglet/"
+SRC_URI="https://gottcode.org/tanglet/tanglet-1.6.1.1-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr" tanglet.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 4eaa2a34a492..015e64ed5dd8 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 2c5d69636a6b..44f928e34d04 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -5,10 +5,12 @@ DIST stone-soup-0.25.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b6
 DIST stone-soup-0.25.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
+DIST stone-soup-0.27.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
+DIST stone-soup-0.27.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
-DIST stone_soup-0.26.0.zip 95554775 BLAKE2B 03389bae0471efe674b68dd6b99184d77cae50beaa1a82e26afa2b12e0cd06a3bd7b3eecaf5b11a78150cf3eb4694cd07e62f524630b9113fb49ef9cd328d265 SHA512 269b687ce75d8f6e888f1bcc811be2544cb9d82a1a48689187631aa2e6e0a7999bfc3ac7da81cdc44488db5d97bde48b4d6215ebd994f7ebaa6b89bdc2cba281
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
+DIST stone_soup-0.27.0.zip 96917949 BLAKE2B 1da7d54e4f3ec98514630eeb8c69c7dca02f96cdfe16974856406da0a057011f17a388669ec29844f3657cd4c7c4ef977f522578cbe0dec02ce497063c25ac83 SHA512 e3f79ce8837056c0a34847857b058e055ed23cc0987ab1d862b60739b8b7ec1e955746fa49c339f449603ce9d0707e64e564592b0798310c7c6bdc1a9edc3e70
 EBUILD stone-soup-0.25.1-r101.ebuild 4906 BLAKE2B 27a656e08f7e4539c71e1c6bced442bd23a54efca2bfd287a369ea8b8cdb0b0b0275a13912ea1316aa62ad92551890cbcfe0e9e5f7acf58d0ca7ded3b69bec78 SHA512 20b3ab2f78bba3b5b344dac9bea7ba8c4e0cfa47a0cc6cf35a7e0afe49ebbbfd5cc18d568e160ac7a9bd3963961c170d6ee79dc342dd33735cc775121eaaa026
-EBUILD stone-soup-0.26.0.ebuild 4906 BLAKE2B 691892c10fd8fce1a232ebc9f25a1ab98faf737a634c9585dfbf50d62250ecf01eaaf82f4a479a2614fbbad6fcf2dffd24523c004289587791d4a1c021d3ff76 SHA512 a23c1ae7253c7bf585c9dbb64213a18b917c796c45971e84ca89187c972182cb0d6639cfb81f206d47b45feb52593ba07c99303aa06e5176298b470aac6c73a5
 EBUILD stone-soup-0.26.1.ebuild 4906 BLAKE2B 691892c10fd8fce1a232ebc9f25a1ab98faf737a634c9585dfbf50d62250ecf01eaaf82f4a479a2614fbbad6fcf2dffd24523c004289587791d4a1c021d3ff76 SHA512 a23c1ae7253c7bf585c9dbb64213a18b917c796c45971e84ca89187c972182cb0d6639cfb81f206d47b45feb52593ba07c99303aa06e5176298b470aac6c73a5
+EBUILD stone-soup-0.27.0.ebuild 4908 BLAKE2B 405a3587ccd039bdcc652d630ae28de860ee3f26587c054dac91461bb0625d7198b6803af7bca1c14f4608b4213c26993773bf9b7416212bdb0094970b1f32fe SHA512 fa1dbc5258646c806f08df0ed8b4085127bb36aab54472b5b5f0e2df7de2d9fa28f5dcb25b20146e97a678dcdaac7aaf7933d88b91d6aa5bece661414f4f5f9d
 MISC metadata.xml 1619 BLAKE2B 2977dbcb30328109cf2f2c75535175ce089c4ede9d9ce7e550ae715bb8624abffdcf2ba53cb6dc545112dbf1da10b0237a8bffa7719956763955ff81b31554f7 SHA512 711ef0ab70235f7ab3a447bc49508b3e8f53f2dd0e108b4874f6e5a916b3c373decece2d6e4a134971941261315819c31799fd318d0c7be103356ac8e5218137
diff --git a/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
deleted file mode 100644
index cc9cc94cf890..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO
-# - attempt +test, linked bug claims to be fixed
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7,8,9} )
-VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
-
-MY_P="stone_soup-${PV}"
-DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="https://crawl.develz.org"
-SLOT="0.26"
-SRC_URI="
-	https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
-	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
-"
-
-# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
-# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
-# Public Domain|CC0: most of tiles
-# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
-LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
-KEYWORDS="amd64 x86"
-IUSE="debug ncurses sound test +tiles"
-# test is broken
-# see https://crawl.develz.org/mantis/view.php?id=6121
-RESTRICT="test"
-
-RDEPEND="
-	${LUA_DEPS}
-	dev-db/sqlite:3
-	sys-libs/zlib
-	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
-	ncurses? ( sys-libs/ncurses:0 )
-	tiles? (
-		media-fonts/dejavu
-		media-libs/freetype:2
-		media-libs/libpng:0
-		sound? (
-			   media-libs/libsdl2[X,opengl,sound,video]
-			   media-libs/sdl2-mixer
-		)
-		!sound? ( media-libs/libsdl2[X,opengl,video] )
-		media-libs/sdl2-image[png]
-		virtual/glu
-		virtual/opengl
-	)"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-lang/perl
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	sys-devel/flex
-	tiles? (
-		sys-libs/ncurses:0
-	)
-	virtual/pkgconfig
-	virtual/yacc
-	"
-
-S=${WORKDIR}/${MY_P}/source
-S_TEST=${WORKDIR}/${MY_P}_test/source
-PATCHES=(
-	"${FILESDIR}"/fixed-font-path.patch
-	"${FILESDIR}"/gitless-1.patch
-	"${FILESDIR}"/rltiles-ldflags-libs.patch
-)
-
-python_check_deps() {
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-
-	python-any-r1_pkg_setup
-
-	if use !ncurses && use !tiles ; then
-		ewarn "Neither ncurses nor tiles frontend"
-		ewarn "selected, choosing ncurses only."
-		ewarn "Note that you can also enable both."
-	fi
-
-	if use sound && use !tiles ; then
-		ewarn "Sound support is only available with tiles."
-	fi
-}
-
-src_prepare() {
-	default
-	python_fix_shebang "${S}/util/species-gen.py"
-
-	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
-		|| die "Couldn't append slot to executable name"
-}
-
-src_compile() {
-
-	# Insurance that we're not using bundled lib sources
-	rm -rf contrib || die "Couldn't delete contrib directory"
-
-	export HOSTCXX=$(tc-getBUILD_CXX)
-
-	# leave DATADIR at the top
-	myemakeargs=(
-		$(usex debug "FULLDEBUG=y DEBUG=y" "")
-		BUILD_LUA=
-		AR="$(tc-getAR)"
-		CFOPTIMIZE=''
-		CFOTHERS="${CXXFLAGS}"
-		CONTRIBS=
-		DATADIR="/usr/share/${PN}-${SLOT}"
-		GCC="$(tc-getCC)"
-		GXX="$(tc-getCXX)"
-		LDFLAGS="${LDFLAGS}"
-		MAKEOPTS="${MAKEOPTS}"
-		PKGCONFIG="$(tc-getPKG_CONFIG)"
-		RANLIB="$(tc-getRANLIB)"
-		SAVEDIR="~/.crawl-${SLOT}"
-		SOUND=$(usex sound "y" "")
-		STRIP=touch
-		USE_LUAJIT=
-		V=1
-		prefix="/usr"
-	)
-
-	if use ncurses || (use !ncurses && use !tiles) ; then
-		emake "${myemakeargs[@]}"
-		# move it in case we build both variants
-		use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;}
-	fi
-
-	if use tiles ; then
-		emake clean
-		emake "${myemakeargs[@]}" "TILES=y"
-	fi
-}
-
-src_install() {
-	emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}/usr/bin" install
-	[[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}"
-
-	# don't relocate docs, needed at runtime
-	rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license
-
-	mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \
-	   || die "Couldn't append slot to man page name"
-	doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6"
-
-	# icons and menu for graphical build
-	if use tiles ; then
-		doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png
-		doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg
-		make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	elog "Since version 0.25.1-r101, crawl is a slotted install"
-	elog "that supports having multiple versions installed.  The"
-	elog "binary has the slot appened, e.g. 'crawl-"${SLOT}"'."
-	elog
-	elog "The local save directory also has the slot appended."
-	elog "If you have saved games from 0.25 but before 0.25.1-r101"
-	elog "you can 'mv ~/.crawl ~/.crawl-0.25' to fix it"
-
-	if use tiles && use ncurses ; then
-		elog
-		elog "Since you have enabled both tiles and ncurses frontends"
-		elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the"
-		elog "tiles binary is called 'crawl-"${SLOT}"'."
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.27.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.0.ebuild
new file mode 100644
index 000000000000..2d3e1336eabd
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.27.0.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+# - attempt +test, linked bug claims to be fixed
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7,8,9} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
+
+MY_P="stone_soup-${PV}"
+DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
+HOMEPAGE="https://crawl.develz.org"
+SLOT="0.27"
+SRC_URI="
+	https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
+"
+
+# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
+# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
+# Public Domain|CC0: most of tiles
+# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
+LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ncurses sound test +tiles"
+# test is broken
+# see https://crawl.develz.org/mantis/view.php?id=6121
+RESTRICT="test"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-db/sqlite:3
+	sys-libs/zlib
+	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
+	ncurses? ( sys-libs/ncurses:0 )
+	tiles? (
+		media-fonts/dejavu
+		media-libs/freetype:2
+		media-libs/libpng:0
+		sound? (
+			   media-libs/libsdl2[X,opengl,sound,video]
+			   media-libs/sdl2-mixer
+		)
+		!sound? ( media-libs/libsdl2[X,opengl,video] )
+		media-libs/sdl2-image[png]
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/flex
+	tiles? (
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+S=${WORKDIR}/${MY_P}/source
+S_TEST=${WORKDIR}/${MY_P}_test/source
+PATCHES=(
+	"${FILESDIR}"/fixed-font-path.patch
+	"${FILESDIR}"/gitless-1.patch
+	"${FILESDIR}"/rltiles-ldflags-libs.patch
+)
+
+python_check_deps() {
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+
+	python-any-r1_pkg_setup
+
+	if use !ncurses && use !tiles ; then
+		ewarn "Neither ncurses nor tiles frontend"
+		ewarn "selected, choosing ncurses only."
+		ewarn "Note that you can also enable both."
+	fi
+
+	if use sound && use !tiles ; then
+		ewarn "Sound support is only available with tiles."
+	fi
+}
+
+src_prepare() {
+	default
+	python_fix_shebang "${S}/util/species-gen.py"
+
+	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
+		|| die "Couldn't append slot to executable name"
+}
+
+src_compile() {
+
+	# Insurance that we're not using bundled lib sources
+	rm -rf contrib || die "Couldn't delete contrib directory"
+
+	export HOSTCXX=$(tc-getBUILD_CXX)
+
+	# leave DATADIR at the top
+	myemakeargs=(
+		$(usex debug "FULLDEBUG=y DEBUG=y" "")
+		BUILD_LUA=
+		AR="$(tc-getAR)"
+		CFOPTIMIZE=''
+		CFOTHERS="${CXXFLAGS}"
+		CONTRIBS=
+		DATADIR="/usr/share/${PN}-${SLOT}"
+		GCC="$(tc-getCC)"
+		GXX="$(tc-getCXX)"
+		LDFLAGS="${LDFLAGS}"
+		MAKEOPTS="${MAKEOPTS}"
+		PKGCONFIG="$(tc-getPKG_CONFIG)"
+		RANLIB="$(tc-getRANLIB)"
+		SAVEDIR="~/.crawl-${SLOT}"
+		SOUND=$(usex sound "y" "")
+		STRIP=touch
+		USE_LUAJIT=
+		V=1
+		prefix="/usr"
+	)
+
+	if use ncurses || (use !ncurses && use !tiles) ; then
+		emake "${myemakeargs[@]}"
+		# move it in case we build both variants
+		use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;}
+	fi
+
+	if use tiles ; then
+		emake clean
+		emake "${myemakeargs[@]}" "TILES=y"
+	fi
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}/usr/bin" install
+	[[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}"
+
+	# don't relocate docs, needed at runtime
+	rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license
+
+	mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \
+	   || die "Couldn't append slot to man page name"
+	doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6"
+
+	# icons and menu for graphical build
+	if use tiles ; then
+		doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png
+		doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg
+		make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	elog "Since version 0.25.1-r101, crawl is a slotted install"
+	elog "that supports having multiple versions installed.  The"
+	elog "binary has the slot appened, e.g. 'crawl-"${SLOT}"'."
+	elog
+	elog "The local save directory also has the slot appended."
+	elog "If you have saved games from 0.25 but before 0.25.1-r101"
+	elog "you can 'mv ~/.crawl ~/.crawl-0.25' to fix it"
+
+	if use tiles && use ncurses ; then
+		elog
+		elog "Since you have enabled both tiles and ncurses frontends"
+		elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the"
+		elog "tiles binary is called 'crawl-"${SLOT}"'."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 3f9f61f3cc2a..20db2cd8e370 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 66a4ba0597cb..f6609d2b3caa 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,3 @@
 DIST freeciv-2.6.4.tar.bz2 52087948 BLAKE2B 00392974707d9a11e626ac7855fcb27780492b7bead020f6849726ad39833d9ada288bad7245664f8446d0905f027dccc205ee6c943361ba9ba455c55c52cd04 SHA512 4dca3a09f4538ce865f5bfef2fa0cdd00b21e30d80bd24343a6d77564bb5239101254155295ccc18593af6f9a32b77ecb8d50c38d0710a37960372e9b1227221
-EBUILD freeciv-2.6.4.ebuild 4861 BLAKE2B c385708a6bba1ab946bebf957e96195ad15c9e4658a6362e287adaaa67bc781c069990a410aa41d78138025b9fea7cd7b7f3776c407dee78de4c1bb3e8088266 SHA512 b8753fd5ab8da3eddcc929c31e897a68691e85a1109bd8b07de6feeb0011aeab21ef2e9975b82cdf4563382148d2290fffdf823b675915a4ef49a46ff62e0b51
+EBUILD freeciv-2.6.4.ebuild 4832 BLAKE2B f1cded70493131e2d76327a405ac19b2d7f950013735d3d11279f754f3a1538fef9fa1d6750b9a0c5ae4d444f8b5649f3a222e336f66b55d34ea7a11226838f4 SHA512 cdebf619b843d72327d575302ff9e3b2d3c180c969d1e308bd7c727b7ae191536eccae0cae6d5857b0d3be3846c8442d3939b113d8497a75fdc0704207f3b051
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/freeciv-2.6.4.ebuild b/games-strategy/freeciv/freeciv-2.6.4.ebuild
index 93e090d0ab52..9b33682fa13a 100644
--- a/games-strategy/freeciv/freeciv-2.6.4.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.4.ebuild
@@ -74,7 +74,7 @@ BDEPEND="
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	if use !dedicated && use !server ; then
+	if ! use dedicated && ! use server ; then
 		ewarn "Disabling server USE flag will make it impossible to start local"
 		ewarn "games, but you will still be able to join multiplayer games."
 	fi
@@ -129,7 +129,6 @@ src_configure() {
 			if use qt5 ; then
 				local -x MOCCMD=$(qt5_get_bindir)/moc
 				myclient+=( qt )
-				append-cxxflags -std=c++11
 			fi
 		fi
 		myeconfargs+=(
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index fb9319e3e72a..da21f5ec4a01 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/deutex/Manifest b/games-util/deutex/Manifest
index af235241c553..a71a273205b0 100644
--- a/games-util/deutex/Manifest
+++ b/games-util/deutex/Manifest
@@ -1,5 +1,5 @@
 DIST deutex-5.2.0.tar.xz 165772 BLAKE2B 4451e6abc13d3d6e9176a5d8aad6a5d3d986b2b280b2094d89876ec9bea68db5aa9179f8d650932499a2f8853fb57644f723e4214f5a973f217ef34e236e57a9 SHA512 5baa3e06e8562e36e9e520a52a7b4407277e7741deb543eb7b68587a9aab3f409c574415654e8a1ef15d2afb7750aa603189f8de749353666295c6a292b92a33
 DIST deutex-5.2.2.tar.zst 172022 BLAKE2B ad290ce6792425ba7f643cfe6c09c1a3f040ad0a4c95822f9368592dde6d489d28e892a26d78f2ebfefa086c910c948ef37eb3a3047429605653b273f9b567a8 SHA512 5f3c3d3ecad3a7949270a10c3c7e3a8be938389d4846dcac171526a9fd0485e056889323d303f61630e8735e5735edc91df7ad4efaba3d0b2b66a9d719017ebc
 EBUILD deutex-5.2.0.ebuild 565 BLAKE2B 0e507e25b9617714c7e183564af787cb8fc997a08228db79e7b4657764852e695b71ff931652ffb75d0bcdc1436b9f9c5ee453ab9f6ba81e283c5bbdf68f4f7d SHA512 a89f01e8255532877c22bcf0e12232c02e02a6d794fb69cb6734b5f70b69d5d72d4ecd6794342e05d909c72c653e147d3dbf35b3af0fd6b6972fc4bcb3cc1a29
-EBUILD deutex-5.2.2.ebuild 584 BLAKE2B cb9ae5e33c9f750b106828a829884add22b3126e3d7a0e78416802c912fcdb6bd39a19ff9218bf892cab9d86f47c48bc2329e3e3149e7a9553d20b0f991ce880 SHA512 eebbd39fd366dbd057ea702aca7235e331f4afc9ccc18f40ace39b3aee44f3edf642efdfa82db45a9cba17f4183a408856615bad6d33ea37af5d0dcf96a62b5b
+EBUILD deutex-5.2.2.ebuild 585 BLAKE2B 375d9ecfcf2c3e675cfac922fe12898e8bcfde091a1658d13de29c40ff059bca5d40774076518a102b1fd639dae7cd5cdf5b5d8a1249690ec60a460ac98fa5ad SHA512 caee7c85733a1331f31fab42c39005c3ce6e4e6caea8e6798cc8666eeabd47dd4d7d932e8537b1501c1f9b88b9148f5acc05ce84db9a0c6714996d08a8899d15
 MISC metadata.xml 1186 BLAKE2B 91b6a3a01454b2be3855b3ff499ba3f7a7759d4af526b80066e423139137fce846c8e6245cc849a41f25ebf391f3b7de69b70fefa61a337b403254570c54be09 SHA512 4e23c84b3e2ccfe0192c687f7c0d22b50256d5164ce3869f58514736714dd3119df5c4c546dca72410a59dc3eebcf4b56a8442255350e1ffd87aef7580ea8a7a
diff --git a/games-util/deutex/deutex-5.2.2.ebuild b/games-util/deutex/deutex-5.2.2.ebuild
index dcead660a3ae..93a2e6e4e35a 100644
--- a/games-util/deutex/deutex-5.2.2.ebuild
+++ b/games-util/deutex/deutex-5.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Doom-Utils/${PN}/releases/download/v${PV}/${P}.tar.z
 LICENSE="GPL-2+ LGPL-2+ HPND"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="man png"
+IUSE="man +png"
 
 DEPEND="png? ( media-libs/libpng:0= )"
 RDEPEND="${DEPEND}"
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 746cb38d40ea..00a7325a594a 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index c86e979d6956..995d76d585b2 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,3 +1,3 @@
 DIST gvfs-1.48.1.tar.xz 1225916 BLAKE2B f2c46d94ba68065fcaef93cfaf25d5d6cc2fbbf4c1842452d30a9fec2ac5259b440fe569411cf3a874d3464f8d001ef2d04a705230a21b381ff1c3abe9c0f16e SHA512 19a642bcfce37eaa0d2d9f509fed6c67abfea0f79f5be9a17074d20e9ba71252a13583a2e08de88718cb141c5e79e34c84c765c87160351fe21291a8f88abe8c
-EBUILD gvfs-1.48.1.ebuild 3753 BLAKE2B eba6aac344d0926f20cc2ef42ac1b721f793cf3fb0bfd63f12d324c243a2bd22418242d62b489b332948f0cd77f5bdd6057507391dad47b3e92b3c447ef7bcca SHA512 feda5c7bf5807f95e57200788bcb8b92b6c573bd247ef9dbd4ff7f51e83f15b801a1f9971afaa4ac05f203b6c042718182e8e84b6f2643a847a79ed5851c3a1a
+EBUILD gvfs-1.48.1-r1.ebuild 3872 BLAKE2B 559fb64b7529be42ea820d6a474de79128d306701b72f49cc53c7c6bdcbb948fcc7df42f430f30f6692d722903b3ebe8a53c57e60a16e48c55d5222bac3827a1 SHA512 275dbab450eec5b352253cb3ecaa1ed22e91e0eb5bd4273ffe878174521bdf34ebec0fecc6aed3fd720b8e0c6a35b5895614f80d5ef40732254c3a20c85bcb08
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
new file mode 100644
index 000000000000..f4b50cffc64b
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TMPFILES_OPTIONAL=1
+inherit gnome.org gnome2-utils meson systemd tmpfiles xdg
+
+DESCRIPTION="Virtual filesystem implementation for GIO"
+HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
+RESTRICT="!test? ( test )"
+# elogind/systemd only relevant to udisks (in v1.38.1)
+REQUIRED_USE="
+	?? ( elogind systemd )
+	cdda? ( udev )
+	google? ( gnome-online-accounts )
+	gphoto2? ( udev )
+	mtp? ( udev )
+	udisks? ( udev )
+"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.65.1:2
+	>=gnome-base/gsettings-desktop-schemas-3.33.0
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	sys-apps/dbus
+	app-crypt/gcr:=
+	policykit? (
+		>=sys-auth/polkit-0.114
+		sys-libs/libcap
+	)
+	http? (
+		dev-libs/libxml2:2
+		>=net-libs/libsoup-2.58.0:2.4
+	)
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+	udev? ( >=dev-libs/libgudev-147:= )
+	fuse? (
+		>=sys-fs/fuse-3.0.0:3
+		virtual/tmpfiles
+	)
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+	systemd? ( >=sys-apps/systemd-206:0= )
+	elogind? ( >=sys-auth/elogind-229:0= )
+	ios? (
+		>=app-pda/libimobiledevice-1.2:=
+		>=app-pda/libplist-1:=
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= )
+	gnome-keyring? ( app-crypt/libsecret )
+	bluray? ( media-libs/libbluray:= )
+	mtp? (
+		virtual/libusb:1
+		>=media-libs/libmtp-1.1.15
+	)
+	samba? ( >=net-fs/samba-4[client] )
+	archive? ( app-arch/libarchive:= )
+	cdda? (
+		dev-libs/libcdio:0=
+		>=dev-libs/libcdio-paranoia-0.78.2
+	)
+	google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] )
+	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
+	nfs? ( >=net-fs/libnfs-1.9.8 )
+	net-misc/openssh
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	test? ( dev-libs/libgdata )
+"
+
+src_configure() {
+	local enable_logind="false"
+	if use systemd || use elogind; then
+		enable_logind="true"
+	fi
+
+	local enable_gcrypt="false"
+	if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
+		enable_gcrypt="true"
+	fi
+
+	local enable_libusb="false"
+	if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
+		enable_libusb="true"
+	fi
+
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+		-Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		$(meson_use policykit admin)
+		$(meson_use ios afc)
+		$(meson_use afp)
+		$(meson_use archive)
+		$(meson_use cdda)
+		$(meson_use zeroconf dnssd)
+		$(meson_use gnome-online-accounts goa)
+		$(meson_use google)
+		$(meson_use gphoto2)
+		$(meson_use http)
+		$(meson_use mtp)
+		$(meson_use nfs)
+		-Dsftp=true
+		$(meson_use samba smb)
+		$(meson_use udisks udisks2)
+		$(meson_use bluray)
+		$(meson_use fuse)
+		-Dgcr=true
+		-Dgcrypt=${enable_gcrypt}
+		$(meson_use udev gudev)
+		$(meson_use gnome-keyring keyring)
+		-Dlogind=${enable_logind}
+		-Dlibusb=${enable_libusb}
+		-Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1
+		-Dinstalled_tests=false
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if use fuse; then
+		tmpfiles_process gvfsd-fuse-tmpfiles.conf
+	fi
+
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	gnome2_giomodule_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	gnome2_giomodule_cache_update
+}
diff --git a/gnome-base/gvfs/gvfs-1.48.1.ebuild b/gnome-base/gvfs/gvfs-1.48.1.ebuild
deleted file mode 100644
index be6dd089674b..000000000000
--- a/gnome-base/gvfs/gvfs-1.48.1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Virtual filesystem implementation for GIO"
-HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
-RESTRICT="!test? ( test )"
-# elogind/systemd only relevant to udisks (in v1.38.1)
-REQUIRED_USE="
-	?? ( elogind systemd )
-	cdda? ( udev )
-	google? ( gnome-online-accounts )
-	gphoto2? ( udev )
-	mtp? ( udev )
-	udisks? ( udev )
-"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.65.1:2
-	>=gnome-base/gsettings-desktop-schemas-3.33.0
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	sys-apps/dbus
-	app-crypt/gcr:=
-	policykit? (
-		>=sys-auth/polkit-0.114
-		sys-libs/libcap
-	)
-	http? (
-		dev-libs/libxml2:2
-		>=net-libs/libsoup-2.58.0:2.4
-	)
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-	udev? ( >=dev-libs/libgudev-147:= )
-	fuse? ( >=sys-fs/fuse-3.0.0:3 )
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-	systemd? ( >=sys-apps/systemd-206:0= )
-	elogind? ( >=sys-auth/elogind-229:0= )
-	ios? (
-		>=app-pda/libimobiledevice-1.2:=
-		>=app-pda/libplist-1:=
-	)
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= )
-	gnome-keyring? ( app-crypt/libsecret )
-	bluray? ( media-libs/libbluray:= )
-	mtp? (
-		virtual/libusb:1
-		>=media-libs/libmtp-1.1.15
-	)
-	samba? ( >=net-fs/samba-4[client] )
-	archive? ( app-arch/libarchive:= )
-	cdda? (
-		dev-libs/libcdio:0=
-		>=dev-libs/libcdio-paranoia-0.78.2
-	)
-	google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] )
-	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
-	nfs? ( >=net-fs/libnfs-1.9.8 )
-	net-misc/openssh
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	test? ( dev-libs/libgdata )
-"
-
-src_configure() {
-	local enable_logind="false"
-	if use systemd || use elogind; then
-		enable_logind="true"
-	fi
-
-	local enable_gcrypt="false"
-	if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
-		enable_gcrypt="true"
-	fi
-
-	local enable_libusb="false"
-	if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
-		enable_libusb="true"
-	fi
-
-	local emesonargs=(
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-		-Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		$(meson_use policykit admin)
-		$(meson_use ios afc)
-		$(meson_use afp)
-		$(meson_use archive)
-		$(meson_use cdda)
-		$(meson_use zeroconf dnssd)
-		$(meson_use gnome-online-accounts goa)
-		$(meson_use google)
-		$(meson_use gphoto2)
-		$(meson_use http)
-		$(meson_use mtp)
-		$(meson_use nfs)
-		-Dsftp=true
-		$(meson_use samba smb)
-		$(meson_use udisks udisks2)
-		$(meson_use bluray)
-		$(meson_use fuse)
-		-Dgcr=true
-		-Dgcrypt=${enable_gcrypt}
-		$(meson_use udev gudev)
-		$(meson_use gnome-keyring keyring)
-		-Dlogind=${enable_logind}
-		-Dlibusb=${enable_libusb}
-		-Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1
-		-Dinstalled_tests=false
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	gnome2_giomodule_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-	gnome2_giomodule_cache_update
-}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 7e79c238b124..035fa67a4b00 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index f5d1c40507e5..9f01ce259115 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,5 +1,5 @@
 DIST cinnamon-session-4.8.0.tar.gz 199684 BLAKE2B 07baa1d359376fb1c5150224d3420c2ea2c06c2c015739835ffa2c8f0be751362b8ea2299e155369c0cb2d3e8493d5c45ed3f521bb36b6ddb092aff493f01b1f SHA512 21e40d3776c2cd2fcb70bf5597e7f97d415a3236b7c2bdb46cc2359adcb62ec34ad529841154f87ea4a38013cd329cbba5cd6c88e16c4fc4e03acbe38a62edd7
-DIST cinnamon-session-5.0.0.tar.gz 199887 BLAKE2B c009a690c479944f8b3879a3ebff24ea3d44676b9235fcd36049e1680e5a1358266b75ca9f6e193fc51f11d8d94cf0c592dc22cbae2fededf41281748f9410cc SHA512 98ab99d09b8d4904446a38888380beb3a403457e3da4c0f4160633156a490040924743d63eaa13e23b9e5f5c45c9392be082c39c969e0639b0bb06d9c1a2207c
+DIST cinnamon-session-5.0.1.tar.gz 200036 BLAKE2B a7e254d54daa63f5dcf5592843b85e0c63a3fdd34ce5c3045ff5c7ce410f2ab340b5c778b1579e7586f7d9e0517fdf00703934395b9bbbbd234cb181a1096fcf SHA512 0c367764269ce1597035288508909aad2c031ab5b8c04bde3d81cc420f38abf6cca82f169db199cf01218e92014653f1749c0ed2096950f7bc9f3b56f1fcdebc
 EBUILD cinnamon-session-4.8.0.ebuild 1439 BLAKE2B 49215712f53037c72db9ab6a18c8c7e08a08ad3dd954910a2b7c50192fe90ec9e2e413d9a3fdbb4fd641f3c6acced73f49728cf5cea46c2f62706541f2d1289f SHA512 be4d9a0179d5f47db2bec25fea1fe066f8e6422b31a039a01347b14d2d6a0fe0c700ec09f545b4bafff33d64156e2dd3c8f4e1a7cc70daf94af39b03b5f7d812
-EBUILD cinnamon-session-5.0.0.ebuild 1468 BLAKE2B c8cea6a43ed3895b45984abca1ae0b6d43ee103ba13506ea91201ff2336c55512dfe2c8911e032f4c939690d60aa32e598cdc0bc4fe69696635de99d31368638 SHA512 0545842a2ec8f7754ba27bc3323f8d9056f1dc854fce8680167ba8d84af7ccb1d250bafbafd24fa912f1097cb5a5db7496ae51decdf150442e9a69f24c8597bf
+EBUILD cinnamon-session-5.0.1.ebuild 1468 BLAKE2B c8cea6a43ed3895b45984abca1ae0b6d43ee103ba13506ea91201ff2336c55512dfe2c8911e032f4c939690d60aa32e598cdc0bc4fe69696635de99d31368638 SHA512 0545842a2ec8f7754ba27bc3323f8d9056f1dc854fce8680167ba8d84af7ccb1d250bafbafd24fa912f1097cb5a5db7496ae51decdf150442e9a69f24c8597bf
 MISC metadata.xml 495 BLAKE2B a8a525b00061705e885d1a884c7dd9b53e4476769d59fd23fd66e8e7c717a3f9f4564f403a1f5d679b7c45ba889fc65812d96805f469e08a249c645cd3f59019 SHA512 1b8c4c3659fb88b4fd490cc8cf011c247094326dd6b9d9776fcefddd6fcfcbb947ba28fbed35a89db22cc01ffbf8a12829be981e336aabcc32c2d6430442c376
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-5.0.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild
index dfb7bf69e579..dfb7bf69e579 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-5.0.0.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index bcb6ee94d7c6..a103e481f883 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,6 +1,6 @@
 AUX cinnamon-settings-daemon-4.8.5-build-fixes.patch 4529 BLAKE2B 9e28834a8d2d091c816a74e6bc1c50260210e726251dad5ec310f68f450ccd5ec39057c15139218b65afef6e130efc8610b897f0720043a42cdc5702758458f7 SHA512 4f9fee4ec02b11789f387405f0b75f9eabdcc72d78e109b4015fe13575967ad7610a6ad208d8ee31e5b68531e6769d2a07ddc6a9b82db71bf03d7c70920b00a8
 DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad SHA512 4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a
-DIST cinnamon-settings-daemon-5.0.3.tar.gz 663648 BLAKE2B 78067cc11b0a8e77f8bc0a0a942430dbee31e9b8f1a857b9f10b7c16982c0d5e64267e91d35bbd1d66391d328e35efc536d953eee00b2b4b3c6d8c6c28052601 SHA512 ab44c5c157d5a37b35a88f89ba76254ade3f7dfdfaaa7ea7a09aabb49dce3c8f7d789d5d136b2a629c37483d2098ec957bfd07f930d786475ac1bf3973f4d56f
+DIST cinnamon-settings-daemon-5.0.4.tar.gz 663647 BLAKE2B 459ca8b407291e7a84742b75a272a621d05ef1929ec76dd913af477629db862429165cec26a5985c75f81ce8eaddccc6b74cfa882106784bbfb40e015a21bab8 SHA512 861847fb238ae53fdb31c55ab7f8475f3cad9b48a5dd3611e5ea05129e16b44cc48b3ff5d38c2fdcc3669191f952bf194b6bcba80816fb4daee9e91d85b1c781
 EBUILD cinnamon-settings-daemon-4.8.5.ebuild 2348 BLAKE2B c463d0b1b7c5304f4c8a485cfa30b9dc1d50057edc9b909ba339f988d760ede512896604be52c2ad9871bd1e2cdc13b731021c7847d1201b98f6ac0b35f9352a SHA512 6fa3c7aa4b52e67eb94cab700c78c110205f846858771afdb4ef4f05b8b0452a7540f3647a99da03ee5423337909926188ebf5c2e6ae2b7968cb3b5e94c7df5d
-EBUILD cinnamon-settings-daemon-5.0.3.ebuild 2171 BLAKE2B 221635ba6ec02c68a0014dc63bdc47e75deb739a53f164152c3fd9c4470887ec7597d5fc06b95c5858a7a7ec1a8522011cac0206a4e3dd9b0067c0afe9296671 SHA512 dfa4d2689f60e09227155b5738b08eea15e522a6a2ba63b37d36880d04fadb5003938c25179935ee12bf17b68ab3f73b75754abf05c76abdffd5f9b9b83d1f15
+EBUILD cinnamon-settings-daemon-5.0.4.ebuild 2171 BLAKE2B 221635ba6ec02c68a0014dc63bdc47e75deb739a53f164152c3fd9c4470887ec7597d5fc06b95c5858a7a7ec1a8522011cac0206a4e3dd9b0067c0afe9296671 SHA512 dfa4d2689f60e09227155b5738b08eea15e522a6a2ba63b37d36880d04fadb5003938c25179935ee12bf17b68ab3f73b75754abf05c76abdffd5f9b9b83d1f15
 MISC metadata.xml 503 BLAKE2B 140d4e0ca8fc8c1706d856b305a12b9cf26d7efb2f7fa3292423e3617e109c42ddbf7b651923b5f84a1f56422a0b2e780ddce2573b5db2bd3f91a81ccd139c44 SHA512 0caf37ce7de312218834db1ee57f9a5e860eb34d32fd80cd96407b0f28b678c70de171a491695b32c47fd54cd1058a145e40bc64ecb3b51d47718f2215af1ed6
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.4.ebuild
index 6e71b246e5ee..6e71b246e5ee 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.3.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.4.ebuild
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 9ed1f7170f59..684a880ce5b2 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -3,7 +3,7 @@ AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03
 AUX cinnamon-4.8.6-build-fixes.patch 981 BLAKE2B 735028024dfe3b0d280875411d03a2a005efb6344650e2278778621e655818c074c894f0988c1f5974ee73e341f8a4304c9834e205701fb2fe0646fbf9b7c9a4 SHA512 6a9de0e477bec8cdddf302c0878dd213f02047a71cdd6b6090cf8ed6616d185880fa18033c24c13bed6e0e651224ddd9c779320c3f441398d6c36b2741a6bd4d
 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
-DIST cinnamon-5.0.4.tar.gz 2397469 BLAKE2B d71d5c0a1d6386f77951629491fbc14f1c6e139b2a1f7ed87684ed3588897deecfe0158478ca52af18b18da250e8415822f56ce3ca758053a4b373b691627c6b SHA512 ac3eb6384fcbacab77a8a7bff1f28572df4ee62d3e9f0e0d02f9406ef690b3093355652201194d4c324bc13b6f806d27715434701a57c3b7544ad715aee27ad1
+DIST cinnamon-5.0.5.tar.gz 2397561 BLAKE2B c7f523bde1b36564155e90735a719de7d6d125dfd41c0559c68aaf02c2a3f963e7b039cabf3b47e88a527aaf333b1ad154cad04497752b3b75370dbd4491a9c4 SHA512 a54437a3b76748612e4ce3c357e94be6911087616d08cab1c20e37e9a97813eea29db2513bbc384489b223375fd02dbdb61a130f87a40fd8f353b7ca46df26eb
 EBUILD cinnamon-4.8.6.ebuild 5028 BLAKE2B 3afddcd102ded05641665b6b0ba2571119296a4d58aba59bea55824fcbf3e0eef53f84e0a3ed88d168ad4cb06b9169771819d75d46270a01503e0c0aed84ffc2 SHA512 398060a0c4e903a8ebccfc7995ac823f14518fcedf81a1ab771996e7e9314accadb84def76b557d72aaf56c4f43dbd4ca8c09fe1111526f0eb5b8c0c93cca2af
-EBUILD cinnamon-5.0.4.ebuild 5042 BLAKE2B 68b000501ff91f7653413b8e881464d1daeaca7b75547f4bd29bb31a70664c44403cf3153abd39ce22d17b04f8900da22ed138d018ece3d1fcf7960230892646 SHA512 ff516335673112f848b4fd04c4c60d11c9deb705c8bfeca6dd45b9219fca9880ab9b9a590dcb43fdb4b7c11bb6fbc176a233afda4640c18b5848d6f86a4d7d91
+EBUILD cinnamon-5.0.5.ebuild 5042 BLAKE2B 68b000501ff91f7653413b8e881464d1daeaca7b75547f4bd29bb31a70664c44403cf3153abd39ce22d17b04f8900da22ed138d018ece3d1fcf7960230892646 SHA512 ff516335673112f848b4fd04c4c60d11c9deb705c8bfeca6dd45b9219fca9880ab9b9a590dcb43fdb4b7c11bb6fbc176a233afda4640c18b5848d6f86a4d7d91
 MISC metadata.xml 487 BLAKE2B ec4d9655fccd9121ddb07b22cbc1ad94ceaf48c1994b1e27f6b0e1d5866b70d9b058af3c36c20a3856770428b6c17c6f97973be2a2040dba63fb45406ede2f2c SHA512 f6d2d4bada61a51e2af982dea1d908d31eec02f794cd72cdb80935320c17b1c25dd91a80c8b28f1d4b7c92bf40e4ab958ec394d3fec6ea90d602d6df485cc3c0
diff --git a/gnome-extra/cinnamon/cinnamon-5.0.4.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.5.ebuild
index 521a040ceb66..521a040ceb66 100644
--- a/gnome-extra/cinnamon/cinnamon-5.0.4.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.0.5.ebuild
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 93bb313f0fbd..df4d8981190b 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-boxes-40.2.tar.xz 1697352 BLAKE2B 07f9fbad526bea4239a6eac3a3a26a53d30daab938158c4904b5ae674cf64cb2dd0fc6de073c41fc023c66df0328bc02dccf994ef09af597f117914c11bedefb SHA512 22f4a66bb60b47ae7c5ca7fb6f60eddf16a1ad209aa4541f05f732d815a2ac9f2fdac9f6d87cd5cf44d402d0f0d114466efbf129b22fea7b9b054e1b3c3ac145
+DIST gnome-boxes-40.3.tar.xz 1697444 BLAKE2B a7c1677224dde80142abdeeff8b99929c7b86ce38a3432bf0368ec93146df0a813cbeae033fc8cbcd2fb8cd5b28170e0385224f36a9517ed54244e94a3453b6c SHA512 1944414feb6fab054f46e32b5f245042c882cf0a1ecde0eafced81adda16af1018203139177d3f9fa1d2eaf1565ee9e3b3fdff63c4a4b06b0802e20a2f064890
 EBUILD gnome-boxes-40.2.ebuild 3881 BLAKE2B 91ab277097e6aa0ae96d2f0b9be598f170794005b6a4d6168ab8790cc0d3a06d5d6ab57424a1013ff009bacc4e86f4ead3f184bb0513afcd7c6f049ca89ccea8 SHA512 e8ede58a1bcaa336b74aff627613c6623c1ef25d09bf6c5364cdafef600c2799a2a133548579843af01a89617508af1aff290f22fc3ce0abc384f3b26c198051
+EBUILD gnome-boxes-40.3.ebuild 3882 BLAKE2B e3499e1a412e678f3a968418f50b15684352f83bb46aa09ad4292da5aaecdb0b6442e4d8c477483dcd32cdba1b7dd2ec418bb50f8594bf48ab932aa180f33f80 SHA512 48e92fc2695d4f941b2fd9233669fc30baed3bcc0ca13bd851864870c4a48a1766869aaa484920123242c614fc50a2969f78af0a707e0052044a01633f3ebfba
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-40.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-40.3.ebuild
new file mode 100644
index 000000000000..5ce011c05b5d
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-40.3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Simple GNOME application to access remote or virtual systems"
+HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
+
+LICENSE="LGPL-2+ CC-BY-2.0"
+SLOT="0"
+
+IUSE="rdp"
+KEYWORDS="~amd64"
+
+# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
+# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
+# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
+# gtk-vnc raised due to missing vala bindings in earlier ebuilds
+DEPEND="
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.24.1:3
+	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
+	x11-libs/gtksourceview:4
+	>=sys-libs/libosinfo-1.7.0
+	app-crypt/libsecret
+	>=net-libs/libsoup-2.44:2.4
+	virtual/libusb:1
+	>=app-emulation/libvirt-glib-4.0.0
+	>=dev-libs/libxml2-2.7.8:2
+	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
+	app-misc/tracker:3
+	>=net-libs/webkit-gtk-2.26.0:4
+	>=gui-libs/libhandy-1.0.0:1=
+
+	>=dev-libs/gobject-introspection-1.56:=
+	>=dev-libs/libgudev-165:=
+	rdp? ( >=net-misc/freerdp-2.0.0:= )
+" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
+# These are called via exec():
+# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
+# app-cdr/cdrtools mkisofs is needed for unattended installer secondary disk image creation
+# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
+# sys-apps/policycoreutils restorecon is used for checking selinux context
+# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
+# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
+# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
+RDEPEND="${DEPEND}
+	app-cdr/cdrtools
+	app-misc/tracker-miners:3[iso]
+	app-emulation/spice[smartcard]
+	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
+	sys-fs/mtools
+	sys-auth/polkit
+"
+# gtk-frdp generates gir and needs gtk+ introspection for it
+# This is only needed for creating the .vapi file, but gnome-boxes needs it
+BDEPEND="
+	$(vala_depend)
+	net-libs/gtk-vnc[vala]
+	sys-libs/libosinfo[vala]
+	app-crypt/libsecret[vala]
+	net-libs/libsoup:2.4[vala]
+	app-emulation/libvirt-glib[vala]
+	net-misc/spice-gtk[vala]
+	x11-libs/vte:2.91[vala]
+	dev-libs/appstream-glib
+	rdp? ( x11-libs/gtk+:3[introspection] )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
+If you have an Intel Processor, run:
+# modprobe kvm-intel
+
+If you have an AMD Processor, run:
+# modprobe kvm-amd"
+
+pkg_pretend() {
+	linux-info_get_any_version
+
+	if linux_config_exists; then
+		if ! { linux_chkconfig_present KVM_AMD || \
+			linux_chkconfig_present KVM_INTEL; }; then
+			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
+		fi
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddistributor_name=Gentoo
+		-Ddistributor_version=${PVR}
+		$(meson_use rdp)
+		-Dinstalled_tests=false
+		-Dflatpak=false
+		-Dprofile=default
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-pop-shell/Manifest b/gnome-extra/gnome-shell-extension-pop-shell/Manifest
index f1badc98daa7..25febe813ae0 100644
--- a/gnome-extra/gnome-shell-extension-pop-shell/Manifest
+++ b/gnome-extra/gnome-shell-extension-pop-shell/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-extension-pop-shell-1.2.0_p20210603.tar.gz 1018667 BLAKE2B d09becddcab7f24b8efcdb8a6c3b9a121de1654d54c792865e28a08412feeb58d3bbd7698811b840eb7873d3ca7854469f96d1b43bc806b2b3e680b2493beffe SHA512 72cb8a71560d97c92a44d988e8eb0293012565d4eea7b49d6d83be6b844f182db22c7c9d41e68ea3fd272ef7f8b88d97afbce3f867e899e162032507be082a40
-EBUILD gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild 1366 BLAKE2B 3a693d9bbe2bc3898950a695d19d5fe5a3d4f520f91d559cf1cfb5613bd529f774f169eaf2383a9bc37a5387928dd7345daca1bb52a91006825d8a21961139ca SHA512 d5898912558ca91df564886faba346e27ac76e99a19292516906d1991f3b70fd5de50978561f5f8b07472866599c1fe779ba8e463deb825f1dfa6b5b36d1d27d
+DIST gnome-shell-extension-pop-shell-1.2.0_p20210727.tar.gz 1025387 BLAKE2B b25c3af33c6549d08e68de2971090dc74f4bdd719889bcd7397b38a9b275792fb6bdfed9e3baaa7a2c45074baf9c64c31d365809332f689f31c23b2e755793df SHA512 8a3ec6999a2b4ab9ffb67ec87e05482c489acc82ce0bd1a76e17e2ed2e4b8acc2ea22974c9363e1af7a9ec03409fe933109b2451c9be21a541f9dede32d48753
+EBUILD gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild 1361 BLAKE2B 7d04ee00310ec3ebd1883e10ca1692ac6fad08a31f99d06524e706c356c3f6ffee318ad670a986a91c37d8377221f1bd8801cce4a69a248a4d90ef9ff2bf72f8 SHA512 2be8e6a86aa47dc721ba0b18e134219a7f6b5d2bcb04b31a67bd83d6c521b5aea7ebdca1d43e083f7a0a018b95599f7425bed4604a3f2595c86b747803058a0e
+EBUILD gnome-shell-extension-pop-shell-1.2.0_p20210727.ebuild 1369 BLAKE2B b38069b6f437624fae1f2e5696fd12e57bac7d79eeb1dc37ec4e9facf866f1653e6feb3bf0f346d5e3cec5b5bf7d263418713bf98394e47f1e141fe78c0e441f SHA512 b1aef522d97ee80b7137b00ad24a858f511a89ed7afaa78224a6965513a10a04af779807b9ed719ebfd9b392991a31e8e94df527ac28afc6292e5fd3dca894c3
 MISC metadata.xml 352 BLAKE2B f4da02dd27aea654c318c70d46b78655eb52554425b3a5ce137228860514177376419deac645ab945e5ea98fb386e8619e1dc29f801f3c0667e413763d58e5f6 SHA512 187cfbf61182c405799d32555c76759b25168f3806e2b0b48ab497b879f99fce89cd6cb988bb22c263a8ab551eba42ba57535371c7006c3ee05b2fdbe55818eb
diff --git a/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild b/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild
index 3a9c7f3ff47a..24e32f5e37a1 100644
--- a/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild
+++ b/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210727.ebuild b/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210727.ebuild
new file mode 100644
index 000000000000..5d7561746a4b
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210727.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils optfeature
+
+EGIT_COMMIT=475b49dc02386e26fbe6b91a559c77515d96caaf
+
+DESCRIPTION="Keyboard-driven layer for GNOME Shell with tiling support"
+HOMEPAGE="https://github.com/pop-os/shell"
+SRC_URI="https://github.com/pop-os/shell/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-40.1
+	sys-apps/fd
+"
+
+BDEPEND="dev-lang/typescript"
+
+S="${WORKDIR}/shell-${EGIT_COMMIT}"
+
+src_install() {
+	default
+
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/org.gnome.shell.extensions.pop-shell.gschema.xml
+
+	exeinto /usr/lib/pop-shell/scripts
+	doexe scripts/configure.sh
+
+	insinto /usr/share/gnome-control-center/keybindings
+	doins keybindings/*.xml
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	gnome2_schemas_update
+
+	echo
+	elog "To configure keybindings run /usr/lib/pop-shell/scripts/configure.sh as user"
+	echo
+
+	optfeature gnome-extra/gnome-shell-extensions "better tiling via native-window-placement"
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	gnome2_schemas_update
+}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index b3ea54967c2d..2450c4c6e4e6 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/swayidle/Manifest b/gui-apps/swayidle/Manifest
index c8e329bc518d..9beaa6404911 100644
--- a/gui-apps/swayidle/Manifest
+++ b/gui-apps/swayidle/Manifest
@@ -1,4 +1,4 @@
 DIST swayidle-1.6.tar.gz 10131 BLAKE2B c0391d288c780c61b72b7a5ac612efc18c359cc7d622faa308e22b1e4359c064bc2824e7cb8fc14143ddde54fc6980bdc5d449d1f16a867b54aef9dfbaa4ff17 SHA512 c82b0d2aee06f87fd71e9e2208e917c0dc7afe80ab0b782c3165127519445021d8cf363292eee99f939165eb813909f2a4ee74153e776557c6d06672de2c1c82
-EBUILD swayidle-1.6.ebuild 1277 BLAKE2B 5725397b5300749830242d38c57f1242cab9aeb10ad69099a6658d7c00f55a349c52f7eabae5f29cae8e6f6f477d5f9e00f85ee717399f1e0e2d78b9fb63cf0f SHA512 02a9ecfae6a008e7e4bac1e89161199f1ef9b246979f13594779bc63aa151b2ba1b81c1bed391de03eabf7e91ae6ff77808a655193b1dbd6303240467ee532e9
-EBUILD swayidle-9999.ebuild 1273 BLAKE2B bbff1eb0b6121c74c1eb7404138ad81b2f060895a7eb71eda9a87e9eda79e6be0ae5477b070a6b4091220b78b9aa38783a52e5681cd01cf820eca9d663f577e0 SHA512 24ad9f33d30eec175a831a6503a47d446b8d7642e3e9827d47105b60d6099965f57094848372c2ca7b68dc1437bcf96efe450c6a9f305ee50bfd1bc022b54590
-MISC metadata.xml 1027 BLAKE2B 90746eaa42889e71c20b38dd9d656524f65ce511d2c9f988fdbebdd19504ba2f3c1ba49a4108889bb5973bd3a65cdb6879a2cdcbccd02d853678ad657fb22118 SHA512 220b8549757e9682dbcda6ff84774cab67036ba689ea818f912bf59ae2e1acb0ddbc133955d1b6d354943597f1293549da48ff9780cb3e91bd447d5068731cf6
+EBUILD swayidle-1.6.ebuild 1208 BLAKE2B 9904a6e271977f041607b3c9eae2d8697591414e956fe320c158fdbfd24a149dbf06dd84905eae892fa116bb2b434e6780bbe407196e1a51d0ef9d8408e5ee32 SHA512 cf32470d3a57457e54903ce797ef3c3d1dd529efa1831fdbe06f790e39018808e991321fbc72c06a2c39d7e1755cdc0cae6a63879fba8892bacc15dfd61e5af2
+EBUILD swayidle-9999.ebuild 1203 BLAKE2B d6b2927c46ce1edc2775740dc7e3dfa67980927406ec249e8356a1d1cc3a0955be6b2d275147cc3673e13ca71b135116c176235bc4dfb1c5acf3a1365594efe3 SHA512 ee9c7c81cbcbd6259867490f14ec943d4f60e851b22d583e05d1bc56fe8eaf9763221c159afeb43fab53760d355f2835a1b0360b24e2ff774ef30bd7c42e3526
+MISC metadata.xml 958 BLAKE2B 58225f34fed813d623ae3bb713e3b92829a716f8a6d6e3b52dcde5b7f1f20f2564309e72db04f3e1c8db832f40fb3888c0c62e343221b7b8f58b85b5a4c5a3ad SHA512 0016bebb26900b13408b9d3401bfdf42c6ddf5c2aa8e892c22088a804512afff00185f58134822289fd8e940eac881b777cd37e3aa3c500e42868e3abe53f2a1
diff --git a/gui-apps/swayidle/metadata.xml b/gui-apps/swayidle/metadata.xml
index 91ff1890bc12..4c7034b2aaff 100644
--- a/gui-apps/swayidle/metadata.xml
+++ b/gui-apps/swayidle/metadata.xml
@@ -15,7 +15,6 @@
 	</longdescription>
 	<use>
 		<flag name="elogind">Enable support for rootless session via elogind</flag>
-		<flag name="fish-completion">Enable fish completion support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">swaywm/swayidle</remote-id>
diff --git a/gui-apps/swayidle/swayidle-1.6.ebuild b/gui-apps/swayidle/swayidle-1.6.ebuild
index ae2ed9985b48..94194af2e4ae 100644
--- a/gui-apps/swayidle/swayidle-1.6.ebuild
+++ b/gui-apps/swayidle/swayidle-1.6.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="elogind fish-completion +man systemd zsh-completion"
+IUSE="elogind +man systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -36,11 +36,12 @@ BDEPEND="
 src_configure() {
 	local emesonargs=(
 		-Dman-pages=$(usex man enabled disabled)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
+		"-Dfish-completions=true"
+		"-Dzsh-completions=true"
 		"-Dbash-completions=true"
 		"-Dwerror=false"
 	)
+
 	if use systemd; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
 	elif use elogind; then
diff --git a/gui-apps/swayidle/swayidle-9999.ebuild b/gui-apps/swayidle/swayidle-9999.ebuild
index 8604bda55107..f6abc2bf7237 100644
--- a/gui-apps/swayidle/swayidle-9999.ebuild
+++ b/gui-apps/swayidle/swayidle-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="elogind fish-completion +man systemd zsh-completion"
+IUSE="elogind +man systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -36,8 +36,8 @@ BDEPEND="
 src_configure() {
 	local emesonargs=(
 		-Dman-pages=$(usex man enabled disabled)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
+		"-Dfish-completions=true"
+		"-Dzsh-completions=true"
 		"-Dbash-completions=true"
 		"-Dwerror=false"
 	)
diff --git a/gui-apps/swaylock/Manifest b/gui-apps/swaylock/Manifest
index 0ca44740ea52..3e71e7f49a0d 100644
--- a/gui-apps/swaylock/Manifest
+++ b/gui-apps/swaylock/Manifest
@@ -1,6 +1,6 @@
 DIST swaylock-1.3.tar.gz 32848 BLAKE2B 81ed50839bcb0139e7fc2081bd37e738f3e6ef23e96a5108d1acf56cc3425285f7382576a54201f1bf188883b1da06492074c091877af13832c0140e4e6099fd SHA512 723d758d76f076f3f1539ea0d651f6ad2562659c72eef7e895d7827a0be21db663652fe4ce2609065aff45ff20230879599868cff327ab52b896330ca04d78c4
 DIST swaylock-1.5.tar.gz 35350 BLAKE2B c68073d6154842c2cdb99836bda991560605f6ede66c6124986c3395575a4e2c22d59a837a09033d1632b61628e45b18b3ee5ca198bafe4fbd8f429cb0401eda SHA512 16dd9b912ca702849290cf18d91ffbd64a70118cc284982a84b567c4974fd4590b12707c0aae1fcda7ccd1caa7880f342c633b9345bd795c36702916696d1f67
-EBUILD swaylock-1.3.ebuild 1299 BLAKE2B ef276cf73b8296a58bfdbb559beb789b6b30f5de0352752313ab135af7d5d9e3f3ef22b67c8834923fe465eb86f45c85a1f999427cc5f964476a9d4de5e62307 SHA512 5c1d8b253ae607e332163cdc9fc8a7a53dcca202fdc512ef59b2d8c423818e3b7dabda42453c7fda36e8847075556472249d9433dd84be6fdee887ca965db972
-EBUILD swaylock-1.5.ebuild 1272 BLAKE2B 804a0bdafa6d96d1e7c038b42dfe5cb463afc2c0601e284c1c9e3a4d791b2f39308ff25d55feabaf5da153e4b5e19b1eafd61207c2e9a5483ed98bf34dee884a SHA512 513be1bec49a65d6027acd213a5808cc0203efe4f4d502091b4a13b728eadf06e35a10dc17031f17fc5f24aac8fee03a4f908e084ff6af585c47d32a68eb4c01
-EBUILD swaylock-9999.ebuild 1268 BLAKE2B 539547ab69041bb8ece0d9a67a5af4b66a626924873ed73014a4b789135060b8b2fa0421bba7b4a9ebffee93978f9220d0f72007e90057e3e045a3d01b936dea SHA512 1d7623d91d82cee1640256c12c91b2375cdde53eeb22a8f5de7398795147459bd159011d0b5dfed1a7693b281c1dac579872550f693612b37410c29cd43539a5
-MISC metadata.xml 1250 BLAKE2B 0fedd8edef50f471c7a4cde72b417d2b625e87cdb873149e2714879b81634f21e4ad18cd2b078bdf63c8b198955abe7812823e2101ec176a9de07c9db56b2e39 SHA512 166fc66a1bf3cd3e80461e74c7022ef2fda4ff21c49d6aa2fc4feb8ea961501022861ff17bd8850422199c09c98718b9f8b73534b9ffadb9a44bf5656ec8cd00
+EBUILD swaylock-1.3-r1.ebuild 1232 BLAKE2B f8184716c1c8c915e691ff2d8e0f506a0ad270b9c29ec518469f9be85e650edd38102118dd256f1846249e7e2adeb9783c1ad37cc33aa07f2f1d5b76fbf7698c SHA512 27b4798856b46dfb1a9ba96e4a481b3eaedee41ffcbe33440215272cc6e1c385b3b2d812886fe0cc90dfffd0c823e25b2b26ac231d314f89be9ee5b6af650e0b
+EBUILD swaylock-1.5-r1.ebuild 1205 BLAKE2B 14c382f595109a84dc1d6dbcc850da5832863da38b04fcfff1aa1e90a1e50fca4cbeb21e906f5b54136466514b05140aeca1115a9102a669d05a3669922f2859 SHA512 2e437388e59a85417a0c516c676095a6edb27885af77f5885e15cdadc8c2c3186facd6b5d139339f0201223693917d89e68d382af7b0700157cfc047acb9f2e7
+EBUILD swaylock-9999.ebuild 1201 BLAKE2B 996541932ce21eb88008e7a42b35a1b66b951548910fe39b930c7be127febf8a45162b4be715a935a898e3e311ee70e3896268ace3428c853c9e3d32f6c6d023 SHA512 583947759470721903059db410d4004ab6a7da6f35b0e8de7220b03ffe1601569416831dd66719fdd2fe739a107570e23a6a4a3a87e7b5a8c2a0a6580c7b7957
+MISC metadata.xml 1181 BLAKE2B 9b7d148bf47732dfe7cdd7b110adb13ddca77b7638e4b21f014f85cd66ca2bcc819db0daf23f6842c25feac0c5fb2cf0b6d39aa3b87afb7d19db0b4f5c811f58 SHA512 06d6b41b28f10d11f0e447d839795c453dcb9ece44a97d543e7debe53bb3dae47cae04d83f8a52388a3bcb2b6b08c6bd625c2a21d06d872d6e20e385e917c9f1
diff --git a/gui-apps/swaylock/metadata.xml b/gui-apps/swaylock/metadata.xml
index f357232b5ed0..ee32d0f89da5 100644
--- a/gui-apps/swaylock/metadata.xml
+++ b/gui-apps/swaylock/metadata.xml
@@ -18,7 +18,6 @@
 		Swaylock is the official screen locker for <pkg>gui-wm/sway</pkg>.
 	</longdescription>
 	<use>
-		<flag name="fish-completion">Enable fish completion support</flag>
 		<flag name="gdk-pixbuf">Enable additional image format support via the <pkg>x11-libs/gdk-pixbuf</pkg> library</flag>
 	</use>
 	<upstream>
diff --git a/gui-apps/swaylock/swaylock-1.3-r1.ebuild b/gui-apps/swaylock/swaylock-1.3-r1.ebuild
new file mode 100644
index 000000000000..5f1de9f7b816
--- /dev/null
+++ b/gui-apps/swaylock/swaylock-1.3-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Screen locker for Wayland"
+HOMEPAGE="https://github.com/swaywm/swaylock"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm64 x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+gdk-pixbuf +man +pam"
+
+DEPEND="
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
+	pam? ( sys-libs/pam )
+"
+RDEPEND="
+	${DEPEND}
+	!<=gui-libs/sway-1.0_beta2[swaylock]
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+	man? ( app-text/scdoc )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dpam=$(usex pam enabled disabled)
+		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
+		"-Dfish-completions=true"
+		"-Dzsh-completions=true"
+		"-Dbash-completions=true"
+		"-Dwerror=false"
+	)
+
+	if [[ ${PV} != 9999 ]]; then
+		emesonargs+=( "-Dswaylock-version=${PV}" )
+	fi
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if ! use pam; then
+		fcaps cap_sys_admin usr/bin/swaylock
+	fi
+}
diff --git a/gui-apps/swaylock/swaylock-1.3.ebuild b/gui-apps/swaylock/swaylock-1.3.ebuild
deleted file mode 100644
index 3813578e21a1..000000000000
--- a/gui-apps/swaylock/swaylock-1.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps meson
-
-DESCRIPTION="Screen locker for Wayland"
-HOMEPAGE="https://github.com/swaywm/swaylock"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion"
-
-DEPEND="
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
-	pam? ( sys-libs/pam )
-"
-RDEPEND="
-	${DEPEND}
-	!<=gui-libs/sway-1.0_beta2[swaylock]
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	virtual/pkgconfig
-	man? ( app-text/scdoc )
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dpam=$(usex pam enabled disabled)
-		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
-		"-Dbash-completions=true"
-		"-Dwerror=false"
-	)
-	if [[ ${PV} != 9999 ]]; then
-		emesonargs+=("-Dswaylock-version=${PV}")
-	fi
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	if ! use pam; then
-		fcaps cap_sys_admin usr/bin/swaylock
-	fi
-}
diff --git a/gui-apps/swaylock/swaylock-1.5-r1.ebuild b/gui-apps/swaylock/swaylock-1.5-r1.ebuild
new file mode 100644
index 000000000000..c3e2e1fccdce
--- /dev/null
+++ b/gui-apps/swaylock/swaylock-1.5-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Screen locker for Wayland"
+HOMEPAGE="https://github.com/swaywm/swaylock"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+gdk-pixbuf +man +pam"
+
+DEPEND="
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
+	pam? ( sys-libs/pam )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+	man? ( app-text/scdoc )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dpam=$(usex pam enabled disabled)
+		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
+		"-Dfish-completions=true"
+		"-Dzsh-completions=true"
+		"-Dbash-completions=true"
+		"-Dwerror=false"
+	)
+
+	if [[ ${PV} != 9999 ]]; then
+		emesonargs+=( "-Dswaylock-version=${PV}" )
+	fi
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if ! use pam; then
+		fcaps cap_sys_admin usr/bin/swaylock
+	fi
+}
diff --git a/gui-apps/swaylock/swaylock-1.5.ebuild b/gui-apps/swaylock/swaylock-1.5.ebuild
deleted file mode 100644
index d37597d6dedb..000000000000
--- a/gui-apps/swaylock/swaylock-1.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps meson
-
-DESCRIPTION="Screen locker for Wayland"
-HOMEPAGE="https://github.com/swaywm/swaylock"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion"
-
-DEPEND="
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
-	pam? ( sys-libs/pam )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	virtual/pkgconfig
-	man? ( app-text/scdoc )
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dpam=$(usex pam enabled disabled)
-		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
-		"-Dbash-completions=true"
-		"-Dwerror=false"
-	)
-	if [[ ${PV} != 9999 ]]; then
-		emesonargs+=("-Dswaylock-version=${PV}")
-	fi
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	if ! use pam; then
-		fcaps cap_sys_admin usr/bin/swaylock
-	fi
-}
diff --git a/gui-apps/swaylock/swaylock-9999.ebuild b/gui-apps/swaylock/swaylock-9999.ebuild
index 1775122395b5..68f84c85db2d 100644
--- a/gui-apps/swaylock/swaylock-9999.ebuild
+++ b/gui-apps/swaylock/swaylock-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion"
+IUSE="+gdk-pixbuf +man +pam"
 
 DEPEND="
 	dev-libs/wayland
@@ -39,13 +39,14 @@ src_configure() {
 		-Dman-pages=$(usex man enabled disabled)
 		-Dpam=$(usex pam enabled disabled)
 		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
+		"-Dfish-completions=true"
+		"-Dzsh-completions=true"
 		"-Dbash-completions=true"
 		"-Dwerror=false"
 	)
+
 	if [[ ${PV} != 9999 ]]; then
-		emesonargs+=("-Dswaylock-version=${PV}")
+		emesonargs+=( "-Dswaylock-version=${PV}" )
 	fi
 
 	meson_src_configure
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 0c080be86e4c..1d888f538648 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index a4ff5be980aa..2bab09f802bb 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,6 +1,6 @@
 DIST sway-1.6.1.tar.gz 5550126 BLAKE2B a4ecc93df0eb16fcd9037ce62dd39c63e1712b3bc9e8ae36331a815759b18576f4a2c1b78a26545922038974f226f02e2d91f78d6e3933125d9b808871b7a887 SHA512 7f37fea99970db42c5485277df06d69bef5225fa03d25be179893b14d73c1d681f0355a1bc74091b4173bbccc88994a63ad0f9322e070811ba963648cf68cdeb
 DIST sway-1.6.tar.gz 5549909 BLAKE2B ee0d7aad2fe8c57061e23e9b875ebb8e991e2fb30483dee6cf7d7faa3ec782a3f28676bf9fe2183c0e643b5ed744535eba07d7e5cf20ec0756c8e5407c0f34e2 SHA512 f62477aa4a20de99c41078c6866ec67d04d0d1824f4cb21a0c40213dbadf6394e31cd239b74376bf604d20d03ce047ba97f1728043568fd49fcef43f5101c750
-EBUILD sway-1.6.1.ebuild 2422 BLAKE2B 11eb183225551a12c59906b2464689e1929f41b352bf490d68de1c602804e4dbd936b016fe1e206fdd81e586c8a9badf875db8dd3dc891e1a76661e35c129b7d SHA512 82e77190e5d36abcf877f6a73ee7dd7828cf0f9d4f4c6c3ef8250bf89f3350a57eaa6d9811f4ad87e41d1387d96f08022163977c5dc7f4a5625456283069c1cf
-EBUILD sway-1.6.ebuild 3076 BLAKE2B 2d4a7a7ae42afcad33ba479954b2efc239f968590041c02e9106688ec0fa5cca1f37438694ba85858afeda9bfdcfc33e43166711414193eb996e8657d07ac5c9 SHA512 dc67030cb488cb4fbbd9af52a51cb7149a5aaaf9e3861704aa305af9a84d9a4dca20de0a25cf4002c89a46259e2a312096cb555c7e0d26cb21bb78f8f0e8fe22
-EBUILD sway-9999.ebuild 2418 BLAKE2B 5c67dab5bec00b8db60bb3827d9bdd6fe0c2c16afde3c5b99f4cef3557c6b8f8567c4c67eec4bb09f8b58173e6af3b2d79d0b2768f124130b9ac8acd718a8d92 SHA512 c22c6bb6a0c91ced2f8b1bbd18c0440937a57c01be4fe10e6694cf0a262ee28947dc592e6723f05f4297750a211f481b7b2b567963296fc297ca2418d274ac17
+EBUILD sway-1.6-r1.ebuild 2998 BLAKE2B 796d81e98d317d94c28b5f8c8c7a8b163cbf462a416b23bde8e65ce502f760240a87966ab36b0fba47aafa2e7ddd4212d6f9acdf2a1669b65a7b391259ff602e SHA512 bad3207e2c207c7043d100ec09c405889020f4e291de6cc883b71221d106e07b4cd34fec3de4441a52a84c28764133726e8e1922f2c9222044bdd2f493b7bf26
+EBUILD sway-1.6.1-r1.ebuild 2344 BLAKE2B 68447972210cbecf79dbc7fcffdf70296d574c94ca9ccb7270c3f416f41cba7d430c8a0b8655dc52625d3906351c7fa6fe7b3f7ce982d08b04e122f27455707e SHA512 89b0e797a827702c60e4f9c7f81bf283e71803138c4e69230e73bf60979c36b17319475897a48921a80938b54c5dba1106b7674c7dd1a9fd54f263261c97cc76
+EBUILD sway-9999.ebuild 2340 BLAKE2B 57e417902e201901b1b983e3e7ac9e6da4c314cfd43cd676037c689427b88e5e766dce5a75a136230a0bde42e6d1fe2279da2d7cab972b278b1353514f0d3f2a SHA512 a83c7d868f6653d2e15deae9bfc4de6041bb31bfd160e1886572c4d0432956a6e93200d4bf0101b29c8e81178935286943584b4af834ca974ffe9aa7d50d34b0
 MISC metadata.xml 2428 BLAKE2B 6dbfafb29a5e926b761a60d6d12658dfc59ed75c16e01907c6842c14ae97eaf7d3ceebc805f19a9c783a393b33360eb81b7ad3564d5cb2b0270425ce43616123 SHA512 e49f4e6514b8fd171423ded89c516e3c706141da132b28a2419f9b145627706b6cac9066a51f46ecfc3c1df15bd749bdf40168a3841d3789d13550894b184f7a
diff --git a/gui-wm/sway/sway-1.6-r1.ebuild b/gui-wm/sway/sway-1.6-r1.ebuild
new file mode 100644
index 000000000000..9b861ded4885
--- /dev/null
+++ b/gui-wm/sway/sway-1.6-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="https://swaywm.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X"
+REQUIRED_USE="?? ( elogind systemd )
+	tray? ( || ( elogind seatd systemd ) )"
+
+DEPEND="
+	>=dev-libs/json-c-0.13:0=
+	>=dev-libs/libinput-1.6.0:0=
+	dev-libs/libpcre
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	media-libs/mesa[gles2,libglvnd(+)]
+	elogind? ( >=sys-auth/elogind-239 )
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	swaybg? ( gui-apps/swaybg )
+	swayidle? ( gui-apps/swayidle )
+	swaylock? ( gui-apps/swaylock )
+	systemd? ( >=sys-apps/systemd-239[policykit] )
+	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]"
+else
+	DEPEND+="
+		>=gui-libs/wlroots-0.13:=[elogind=,seatd=,systemd=,X=]
+		<gui-libs/wlroots-0.14:=[elogind=,seatd=,systemd=,X=]
+	"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	>=dev-util/meson-0.53.0
+	virtual/pkgconfig
+"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
+fi
+
+src_prepare() {
+	default
+
+	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
+	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
+	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dtray=$(usex tray enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		$(meson_use wallpapers default-wallpaper)
+		-Dfish-completions=true
+		-Dzsh-completions=true
+		-Dbash-completions=true
+		-Dwerror=false
+	)
+
+	if use swaybar; then
+		emesonargs+=( -Dgdk-pixbuf=enabled )
+	else
+		emesonargs+=( -Dgdk-pixbuf=disabled )
+	fi
+
+	meson_src_configure
+}
+
+pkg_preinst() {
+	if ! use systemd && ! use elogind && ! use seatd; then
+		fowners root:0 /usr/bin/sway
+		fperms 4511 /usr/bin/sway
+	fi
+}
+
+pkg_postinst() {
+	if ! use systemd && ! use elogind && ! use seatd; then
+		elog ""
+		elog "If your system does not set the XDG_RUNTIME_DIR environment"
+		elog "variable, you must set it manually to run Sway. See wiki"
+		elog "for details: https://wiki.gentoo.org/wiki/Sway"
+	fi
+}
diff --git a/gui-wm/sway/sway-1.6.1-r1.ebuild b/gui-wm/sway/sway-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..7373d695f647
--- /dev/null
+++ b/gui-wm/sway/sway-1.6.1-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="https://swaywm.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X"
+
+DEPEND="
+	>=dev-libs/json-c-0.13:0=
+	>=dev-libs/libinput-1.6.0:0=
+	sys-auth/seatd:=
+	dev-libs/libpcre
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	media-libs/mesa[gles2,libglvnd(+)]
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	swaybg? ( gui-apps/swaybg )
+	swayidle? ( gui-apps/swayidle )
+	swaylock? ( gui-apps/swaylock )
+	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~gui-libs/wlroots-9999:=[X=]"
+else
+	DEPEND+="
+		>=gui-libs/wlroots-0.14:=[X=]
+		<gui-libs/wlroots-0.15:=[X=]
+	"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	>=dev-util/meson-0.53.0
+	virtual/pkgconfig
+"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
+fi
+
+src_prepare() {
+	default
+
+	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
+	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
+	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dtray=$(usex tray enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		$(meson_use wallpapers default-wallpaper)
+		-Dfish-completions=true
+		-Dzsh-completions=true
+		-Dbash-completions=true
+		-Dwerror=false
+	)
+
+	if use swaybar; then
+		emesonargs+=( -Dgdk-pixbuf=enabled )
+	else
+		emesonargs+=( -Dgdk-pixbuf=disabled )
+	fi
+
+	meson_src_configure
+}
diff --git a/gui-wm/sway/sway-1.6.1.ebuild b/gui-wm/sway/sway-1.6.1.ebuild
deleted file mode 100644
index 9bf7e9607774..000000000000
--- a/gui-wm/sway/sway-1.6.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="https://swaywm.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X zsh-completion"
-
-DEPEND="
-	>=dev-libs/json-c-0.13:0=
-	>=dev-libs/libinput-1.6.0:0=
-	sys-auth/seatd:=
-	dev-libs/libpcre
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-libs/pixman
-	media-libs/mesa[gles2,libglvnd(+)]
-	swaybar? ( x11-libs/gdk-pixbuf:2 )
-	swaybg? ( gui-apps/swaybg )
-	swayidle? ( gui-apps/swayidle )
-	swaylock? ( gui-apps/swaylock )
-	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
-	X? ( x11-libs/libxcb:0= )
-"
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+="~gui-libs/wlroots-9999:=[X=]"
-else
-	DEPEND+="
-		>=gui-libs/wlroots-0.14:=[X=]
-		<gui-libs/wlroots-0.15:=[X=]
-	"
-fi
-RDEPEND="
-	x11-misc/xkeyboard-config
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	>=dev-util/meson-0.53.0
-	virtual/pkgconfig
-"
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
-else
-	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
-fi
-
-src_prepare() {
-	default
-
-	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
-	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
-	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dtray=$(usex tray enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		$(meson_use wallpapers default-wallpaper)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
-		"-Dbash-completions=true"
-		"-Dwerror=false"
-	)
-
-	if use swaybar; then
-		emesonargs+=("-Dgdk-pixbuf=enabled")
-	else
-		emesonargs+=("-Dgdk-pixbuf=disabled")
-	fi
-
-	meson_src_configure
-}
diff --git a/gui-wm/sway/sway-1.6.ebuild b/gui-wm/sway/sway-1.6.ebuild
deleted file mode 100644
index 2cd639ebc15b..000000000000
--- a/gui-wm/sway/sway-1.6.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="https://swaywm.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion"
-REQUIRED_USE="?? ( elogind systemd )
-	tray? ( || ( elogind seatd systemd ) )"
-
-DEPEND="
-	>=dev-libs/json-c-0.13:0=
-	>=dev-libs/libinput-1.6.0:0=
-	dev-libs/libpcre
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-libs/pixman
-	media-libs/mesa[gles2,libglvnd(+)]
-	elogind? ( >=sys-auth/elogind-239 )
-	swaybar? ( x11-libs/gdk-pixbuf:2 )
-	swaybg? ( gui-apps/swaybg )
-	swayidle? ( gui-apps/swayidle )
-	swaylock? ( gui-apps/swaylock )
-	systemd? ( >=sys-apps/systemd-239[policykit] )
-	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
-	X? ( x11-libs/libxcb:0= )
-"
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+="~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]"
-else
-	DEPEND+="
-		>=gui-libs/wlroots-0.13:=[elogind=,seatd=,systemd=,X=]
-		<gui-libs/wlroots-0.14:=[elogind=,seatd=,systemd=,X=]
-	"
-fi
-RDEPEND="
-	x11-misc/xkeyboard-config
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	>=dev-util/meson-0.53.0
-	virtual/pkgconfig
-"
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
-else
-	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
-fi
-
-src_prepare() {
-	default
-
-	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
-	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
-	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dtray=$(usex tray enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		$(meson_use wallpapers default-wallpaper)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
-		"-Dbash-completions=true"
-		"-Dwerror=false"
-	)
-
-	if use swaybar; then
-		emesonargs+=("-Dgdk-pixbuf=enabled")
-	else
-		emesonargs+=("-Dgdk-pixbuf=disabled")
-	fi
-
-	meson_src_configure
-}
-
-pkg_preinst() {
-	if ! use systemd && ! use elogind && ! use seatd; then
-		fowners root:0 /usr/bin/sway
-		fperms 4511 /usr/bin/sway
-	fi
-}
-
-pkg_postinst() {
-	if ! use systemd && ! use elogind && ! use seatd; then
-		elog ""
-		elog "If your system does not set the XDG_RUNTIME_DIR environment"
-		elog "variable, you must set it manually to run Sway. See wiki"
-		elog "for details: https://wiki.gentoo.org/wiki/Sway"
-	fi
-}
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index c6a53ff0d87b..cfaa40e09859 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X zsh-completion"
+IUSE="+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X"
 
 DEPEND="
 	>=dev-libs/json-c-0.13:0=
@@ -80,16 +80,16 @@ src_configure() {
 		-Dtray=$(usex tray enabled disabled)
 		-Dxwayland=$(usex X enabled disabled)
 		$(meson_use wallpapers default-wallpaper)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
-		"-Dbash-completions=true"
-		"-Dwerror=false"
+		-Dfish-completions=true
+		-Dzsh-completions=true
+		-Dbash-completions=true
+		-Dwerror=false
 	)
 
 	if use swaybar; then
-		emesonargs+=("-Dgdk-pixbuf=enabled")
+		emesonargs+=( -Dgdk-pixbuf=enabled )
 	else
-		emesonargs+=("-Dgdk-pixbuf=disabled")
+		emesonargs+=( -Dgdk-pixbuf=disabled )
 	fi
 
 	meson_src_configure
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 874acd93b0ed..51b7e6608074 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index bdac7c75d1f7..f44ea386d25a 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +1,5 @@
 DIST kdenlive-20.12.3.tar.xz 11514396 BLAKE2B eb789a2dcddc67a73122d3fcab06d43d72566de8aeec97dd7bc8b76918231a859e86c8859be7eaab4017c9048edaa951fd143d8e24187437252490464bef0773 SHA512 b21c9bd59171969ab84b93bab2617333160521c3b99b61a2182f9d9b5e65c3220b6dd960d71fe5eeb032733127392dafd40748b950b9973e0edfb5ae6317380a
 DIST kdenlive-21.04.3.tar.xz 11774932 BLAKE2B 7ecf010b82261696d27f1e94f80902b124474e8f3de94d13efc494eb703b073f05047ce17e45a9e161e505eceee046ff3e5ba1b11cc356c1d83a4b3a7e086ae6 SHA512 9ab5e3f93d0423a0bd746b4bc981a1b9ac14e8440b002d76e44b68597b9c8a16c1f2b498e53755fc5399795d6716addb87c75a58053f7560b108d5019282679f
 EBUILD kdenlive-20.12.3.ebuild 2609 BLAKE2B c0e1d6a000d558c613bb79bc5375f7937f25fec6528edec55ddcfd6223b020ab5d29a6fb60ee0d83baef1da57dde9a2fd90ab1bedce119f445011505502a7939 SHA512 0049ef2fc7e1ced0585a16de9a4dec01fcba55787f52dddff8260cf863e8267412870c222fadd45256e1fd1e92098fa62f51d03ca03715fc0f99374e8572ee4a
-EBUILD kdenlive-21.04.3.ebuild 2419 BLAKE2B d9606e18de98097ffed5628ed95dc89a4a41a102818e31af1644d2dc2480acb575723c60837bff8b556f46bd0619d5fb9aa1e6353a486f41c303d3efad87de76 SHA512 7f884c9f6ff2d220a3a39933465112f367cf0ee8bd0f2276198a1a752f623c47a60366936200c4e441e5e08b2b7a28d2e68021f3a4a824d1c97344c58598833b
+EBUILD kdenlive-21.04.3-r1.ebuild 2438 BLAKE2B 4943758632064dcc5d12be348894cd830e6c0be948c57b3daa74a467d73891915f765db9ce5da033fabe328ecb4ec84e7d0c02ab57144e21e49fbb32038ef9bd SHA512 db6ff669701bd4f3a5946d792c26150c999db1ac0cbb513e6b6b4adda20fb8819790f0fc7cb468d8a87fb351811729fb9e89b0f9d0bacb136ab3bdb30ea8aa58
 MISC metadata.xml 489 BLAKE2B 51ddd82047dffa39b9fcd279857844864ae16144b31a5768384726729019541c9033f6cf2b358331f039954878cb409b4eda3dde8356ca2d3a345667cd6afe04 SHA512 855156534b3863f573fb9ccdffd144d11be83bb77c0b4e0f968a175730611bbc6b16f2a85e172076561aa02b498c975830187006a24a3095af33b6685835409f
diff --git a/kde-apps/kdenlive/kdenlive-21.04.3-r1.ebuild b/kde-apps/kdenlive/kdenlive-21.04.3-r1.ebuild
new file mode 100644
index 000000000000..de9656ad7665
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-21.04.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://kdenlive.org/en/"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="gles2-only semantic-desktop share v4l"
+
+RESTRICT+=" test" # segfaults, bug 684132
+
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtnetworkauth-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=media-libs/mlt-6.26.0[ffmpeg,frei0r,qt5,sdl,xml]
+	<media-libs/mlt-7
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	v4l? ( media-libs/libv4l )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	media-video/ffmpeg[encode,sdl,X]
+"
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package v4l LibV4L2)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	# Gentoo bug 603168
+	optfeature "Crop, Transform/Rotate and Shear effect" "media-libs/mlt[fftw]"
+}
diff --git a/kde-apps/kdenlive/kdenlive-21.04.3.ebuild b/kde-apps/kdenlive/kdenlive-21.04.3.ebuild
deleted file mode 100644
index a3aea9e415e1..000000000000
--- a/kde-apps/kdenlive/kdenlive-21.04.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="https://kdenlive.org/en/"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="gles2-only semantic-desktop share v4l"
-
-RESTRICT+=" test" # segfaults, bug 684132
-
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtnetworkauth-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/mlt-6.26.0[ffmpeg,frei0r,qt5,sdl,xml]
-	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	v4l? ( media-libs/libv4l )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	media-video/ffmpeg[encode,sdl,X]
-"
-BDEPEND="sys-devel/gettext"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package v4l LibV4L2)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	# Gentoo bug 603168
-	optfeature "Crop, Transform/Rotate and Shear effect" "media-libs/mlt[fftw]"
-}
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index f480cf0b0b8a..340fa8d33005 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 51b0987a4da4..3dcc173a070d 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,6 @@
+AUX solid-5.84.0-qstrcmp.patch 1702 BLAKE2B 8ee1bcbf71aac54a74e781307fe034b0806bd429290105c6be98fbebe12082488ea4418a4117e2564b81694aa9c7ada4122bcad8a232ed4a57da82472a7ebd39 SHA512 4d7718be8fd6ae9f06b3cd03b0bc641e983051dbd996d07096120ae3e40b0d99c8d38eb75c2507f3de6327144c6f25e1ffb9d2db54c7d4894690a2cc6366072a
 DIST solid-5.82.0.tar.xz 274184 BLAKE2B 296535424310770f3c1acb82217906c5f9ca0885202c51a6bd65e5ed4230a5f93d698a112323801f2d44fbafa637407a5e7793eb36b230e83c77059cf8317305 SHA512 ae15081a07e46590eb36f6c642adcded7bb519010f6f8bce1f38e14e97900f029a1ae0bc61d64d8a2752479ae54a9d2188e51698e0b46ebddd15bab6941ae59a
 DIST solid-5.84.0.tar.xz 275876 BLAKE2B beec229d68b57c450f9fa209af0038e060a1c16b7966cc3fec8ec0cf3eff9970162ea2f7febcc5dcac48ea2591d1a9ee5ec075926e3561868e48c017b216043b SHA512 2c646c1347312cb3cc716cd35b90da8057d09546c3e90cb0dab823c6cc07495efa04fe980503ed201e5cbcb763e130a8f0444b46139dbdf2e6749a445821616e
 EBUILD solid-5.82.0.ebuild 1038 BLAKE2B f7a79563a60771ce4500b61592f33ba93ba6d0dd674fc2b6dd3a00b652d135bfef91e6945179288a17ad6b4360ce6e503b334499523dcd1d68b0e88732b5b207 SHA512 7c2b0b7e7e90d38a49d7806aef5ada3875c704c5360f4e09e6a9702302260ed7a294f7d4daa93f337476dd5685a8337a8e96b35b854356159151d823ecb64fa2
-EBUILD solid-5.84.0.ebuild 1070 BLAKE2B ea4b813e1821929986164cc9e2ed6e8c27ba4f7a9d3de11ba5ee63cca94c5ec430b48705adbf584162da7650538c300a4f8db09ba8e064b68628465d24397d87 SHA512 213aa6dcb13d1c44b8c04dbbd195b3d698dbab2c5e0203ab45e756e29d07599554eed8fcbfbb3d36996102e14eeb06a855a3feac73b0d161440e67663b7656aa
+EBUILD solid-5.84.0-r1.ebuild 1116 BLAKE2B 98c7e4ce2c879787b72c64bce661898538204d979dedf46d0748ce2dd7005b817d7a980d809343deeb5cfbb0fefb1216ba1df7d5be461a6a368a916dd3bba277 SHA512 49970f166821a4c928c36b2274e6a58328b865c11296a7e0306b66944886cb9825abe6b2b13104cca7fc7318ad9c8d498049f9e11f943f756533a3f7ffb1ba8b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/files/solid-5.84.0-qstrcmp.patch b/kde-frameworks/solid/files/solid-5.84.0-qstrcmp.patch
new file mode 100644
index 000000000000..bdba981b8ac8
--- /dev/null
+++ b/kde-frameworks/solid/files/solid-5.84.0-qstrcmp.patch
@@ -0,0 +1,35 @@
+From e5964d13f36901e7768ca38064125a5c5c28a939 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Thu, 22 Jul 2021 01:26:37 +0200
+Subject: [PATCH] Use qstrcmp instead of strcmp
+
+qstrcmp can handle NULL args.
+
+This fixes an issue on Slackware, which doesn't use systemd and /var/run
+is a bind mount of /run, and for some reason mnt_fs_get_root(fs) would return
+NULL, which led to crashes in dolphin and plasmashell, see:
+https://invent.kde.org/frameworks/solid/-/commit/ef0b0dfa00b1de70c6d8e6913bbfdb79e7d3d1b6#note_276583
+---
+ src/solid/devices/backends/udisks2/udisksstorageaccess.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
+index 1566787..35d1aa8 100644
+--- a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
++++ b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
+@@ -92,9 +92,9 @@ static QString baseMountPoint(const QByteArray &dev)
+             const QByteArray devicePath = dev.endsWith('\x00') ? dev.chopped(1) : dev;
+ 
+             while (mnt_table_next_fs(table, itr, &fs) == 0) {
+-                if (mnt_fs_get_srcpath(fs) == devicePath
+-                    // Base mount point will have "/" as root fs
+-                    && (strcmp(mnt_fs_get_root(fs), "/") == 0)) {
++                if (mnt_fs_get_srcpath(fs) == devicePath //
++                    && (qstrcmp(mnt_fs_get_root(fs), "/") == 0) // Base mount point will have "/" as root fs
++                ) {
+                     mountPoint = QFile::decodeName(mnt_fs_get_target(fs));
+                     break;
+                 }
+-- 
+GitLab
+
diff --git a/kde-frameworks/solid/solid-5.84.0-r1.ebuild b/kde-frameworks/solid/solid-5.84.0-r1.ebuild
new file mode 100644
index 000000000000..dfd61f86b422
--- /dev/null
+++ b/kde-frameworks/solid/solid-5.84.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="ios nls"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	sys-apps/util-linux
+	sys-fs/udisks:2
+	virtual/libudev:=
+	ios? (
+		app-pda/libimobiledevice:=
+		app-pda/libplist:=
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-qstrcmp.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package ios IMobileDevice)
+		$(cmake_use_find_package ios PList)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "media player devices support" app-misc/media-player-info
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-frameworks/solid/solid-5.84.0.ebuild b/kde-frameworks/solid/solid-5.84.0.ebuild
deleted file mode 100644
index ee0d8d0d9790..000000000000
--- a/kde-frameworks/solid/solid-5.84.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="ios nls"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	sys-apps/util-linux
-	sys-fs/udisks:2
-	virtual/libudev:=
-	ios? (
-		app-pda/libimobiledevice:=
-		app-pda/libplist:=
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package ios IMobileDevice)
-		$(cmake_use_find_package ios PList)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "media player devices support" app-misc/media-player-info
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 380be980613d..40c93de62a76 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/rsibreak/Manifest b/kde-misc/rsibreak/Manifest
index c81561179286..f61b84139fbb 100644
--- a/kde-misc/rsibreak/Manifest
+++ b/kde-misc/rsibreak/Manifest
@@ -1,5 +1,5 @@
 DIST rsibreak-0.12.13.tar.xz 550544 BLAKE2B fc3380e7ae9036c072f93cc46ef0f074f0a1b2777019a25615ae9cf183979985781b7254e8041d1f5a31a0ed404ed34a399d1fb0b675540860d49145fcbbddcd SHA512 dc1411221828afab1c8f3ee89238be44d9fd3784cb5cce4f5a50ce063e14d1683257bffa1b24509d7009e74d0be16f1c788754690b503490fb8be1bedc9657fd
 DIST rsibreak-0.12.14.tar.xz 562176 BLAKE2B 1c0a687c3df8eba116eba64ed502a52ab66f5e77183a31fbb18b8ac3e1bc6ff43e8bb1e50303bcdd78536d415b61730b2dc561c72bc92544dd5855f5a937e317 SHA512 10de87ce892b0320dc6f5115985125c1e1e156022d6d0159dc64721ba2f4dbfdea0f8d2138d450fbfef8c11bedcd564df850cbeb7900dc480c94d44bf15ae997
 EBUILD rsibreak-0.12.13.ebuild 1356 BLAKE2B 990136e5883df2c50df5a719ee490084716ca648ed1d79954f6a14524e0abfcbe5f6801a2c123d931e1b03300db67294d894f92aee9f69243d9a429e0c0c4685 SHA512 e4591c4104b316deb65b666a9fd8bcd7c5bfd88f90e2baedd1b99d63c65162d3a288100b671e9902a9752de0050fb401703e05f4c2721e96dee0e47c7228559e
-EBUILD rsibreak-0.12.14.ebuild 1317 BLAKE2B 99b8c4eac2f80c08b4adfdfe34ad59dca32bd5dadb18e5be453cf31d4d79fa0b97ba0357c47f08d8397b5fa3d022ffea7489475e0d03afab68ac741395525640 SHA512 9dc1d760b957c5f1376f74122454c329297782bf3f0501d286b5bebf3f2afd35d7bd8069ac4639b24d452cb69929eac28e3b108a805af147e58ed7ef88374edb
+EBUILD rsibreak-0.12.14.ebuild 1316 BLAKE2B 99da713e32d948bd2243f628158aab4d0075cf3e7b3444e1b5b6e3f79681d64d748f09749800a89cd4c38543a9fa8bfc787138ea6fad58220df05ad591bd54a5 SHA512 9777fd0efa9cb53edf026a41fd7a5651d77f7d0fa0e808c4aec9b9a420290b8306b9aa26dcfa9c6aaa583ddc5c99796596c35757d822fd8aa656974056279df5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/rsibreak/rsibreak-0.12.14.ebuild b/kde-misc/rsibreak/rsibreak-0.12.14.ebuild
index 2a0d4b982767..20fc1e2001f5 100644
--- a/kde-misc/rsibreak/rsibreak-0.12.14.ebuild
+++ b/kde-misc/rsibreak/rsibreak-0.12.14.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/rsibreak/ https://userbase.kde.org/RSIBreak"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 0bdd0bb0bcf7..7ad15990c5f5 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index df66836bd36b..0dc97a870768 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,7 +1,5 @@
 DIST bluedevil-5.21.5.tar.xz 162788 BLAKE2B 33961069c1997e564f9cb26dbc7b866abaed8e52d8f9b532769b017c8768f5602e821d04836198a0d2bec94f18ea57bba075e676869f3cec9c0087629885db37 SHA512 9d2f06e767551b159433e87c2e0c7180152fd881d78dce59abe8af9268780e916378b2e3b3dd385d782893a530aa54f0b178762c18169230caf3975a6798fc52
-DIST bluedevil-5.22.3.tar.xz 162724 BLAKE2B 618917f163e69a6e511c0d02a9989073f518d5fb215037cd2acb33af21c3fa8a9b502dd2f29bebe7605fe07fbde48e6a6f53803e73b3ce4b60e604a761ce303e SHA512 65c76b6b431f6b4d5eb5bcdb0652b932f133ed203b072cbffc9e66b3f3248ef133f35190b6a38754c56d1aa472342ac4a0eea3d28aaa644e69071980385d6f05
 DIST bluedevil-5.22.4.tar.xz 162860 BLAKE2B 7445e7a7f5b4a88acd14dd1206708e73a9f3574464bd445cade5b68944d97c38701c48cd9d883f88112ea49f22cda3c5f717dd36610bf25aefa71fa5c0d86bca SHA512 44e11f8834b9c1fec7c017d91ec2ceee76b7cd2c035d2c6db90d42c3f43a0f6476e8ae45df1ab44ee7bcc27512fb7785baa03d8fb2a920ecf4b676cb98e59586
 EBUILD bluedevil-5.21.5-r1.ebuild 1111 BLAKE2B ce05fcd546105e93e08a5dc6dd85355af989752218a0fa0da860379a49e367c5a4f84f91244a2fc124eedca651d0ec5dbe86264dea8922f56bd319130adf8317 SHA512 74b6bd039671b3094dca77b13c366dfeefb0faa30e45333326512d921ecb4003bc9a6b60332b85cd1c2a14bacd5966328aaca22b188d99892a8ea1f154c41ba8
-EBUILD bluedevil-5.22.3.ebuild 1114 BLAKE2B 62075de061139b684027803dede5d45f7ffc5bb8534f2ce7d617360c83dd07b3b8f5e5b60c5a8c1e81b97cf2bf3f39a74badbf1ddb1ace44e4ec3242717d26de SHA512 22ae605e81bcc90b9fe4d498ad89ffd8facdb03e5009b4458128eeeffa81bea149a82213b8b9b63bd5252b37e25183259c83d88d53359a36e3ba1b484057b877
 EBUILD bluedevil-5.22.4.ebuild 1114 BLAKE2B 62075de061139b684027803dede5d45f7ffc5bb8534f2ce7d617360c83dd07b3b8f5e5b60c5a8c1e81b97cf2bf3f39a74badbf1ddb1ace44e4ec3242717d26de SHA512 22ae605e81bcc90b9fe4d498ad89ffd8facdb03e5009b4458128eeeffa81bea149a82213b8b9b63bd5252b37e25183259c83d88d53359a36e3ba1b484057b877
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.22.3.ebuild b/kde-plasma/bluedevil/bluedevil-5.22.3.ebuild
deleted file mode 100644
index abb2535daa5d..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.22.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/bluez-qt-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 83d9a8657f57..d10868f97a35 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,7 +1,5 @@
 DIST breeze-grub-5.21.5.tar.xz 3143964 BLAKE2B 96f2e3bb69dafb1ab7e2f328af0f8336431a7085ffd6ac335c6a107cabe73696bda8bb580b2529f01d0c46172e65ae46831f98af0c3ee413b80959b8ea740621 SHA512 c2f16338ad330004c961a9fda6ed48d9670e956bd8562ad05b5f804e3c45ce05c243933028caedb2de981d9fa4f6d66a627aaeb04652fabddebd71fc09b08f5f
-DIST breeze-grub-5.22.3.tar.xz 3134032 BLAKE2B bd4eb934dcb5a07114b4ebd3fa75267fb3d5177c351ba1adb7c750f99a0482853949d65d5891e92a8d204ab107db77d72088a436f97f2ca49b04f7a21132760e SHA512 716ee4acc6d2b852d5ba4907b88dc831d6915f3454b17b7c6979095a5891ed457d96010abe641dfcfc8a9df3a67e5b2e4aff73fb427b4ff720973215e3348a27
 DIST breeze-grub-5.22.4.tar.xz 3138332 BLAKE2B 4d7b39986e20267b4c1d8da46a82a6f2d3bd14b7331a86a13d2bba6938ba1a7bfc503d06157f7d5564e943e4cd475bdb9e0041adc5cfcd60164ed80b816d9337 SHA512 5a5c97fdd597a6fa9f91bc2f68d997a469542db00e2973c7958639ddb0db48223c270bcb776007b7b64efeafe42dbc57d863c1832926ea56396d9a1a027131e4
 EBUILD breeze-grub-5.21.5.ebuild 401 BLAKE2B aea7a41c8088bf3f858366719857e1f6ab94258a132e42adf8fe38f0e89cb3d815916a3e6a9821077f1e0c36b9fe2e20159c27ee953be73c211e5ae9f48efeb2 SHA512 8f4eef2d928c524a6001a4693fa083eed4cad3e15a14eb3a37a4b33e34217c5d911439121bb9ef49bc39508a351c97306ac73f0fd557e8526b8eb8ebbd9facf3
-EBUILD breeze-grub-5.22.3.ebuild 404 BLAKE2B 371c8e22792752990a85c1d9b7017bed34d607e55bed1547e0f3a4729ff4d97804240c5fe53f48da2316519da052519f3a175e70c8d23c95292ebb692179cc6f SHA512 447a6adb952a7e43c6fd758404a71a40d30de6d3130808ca6518299b02cb1bf09c2a52f8f57d7d5c2a9d72f82820a912fc2f529d281361c7a02f4f40528d1061
 EBUILD breeze-grub-5.22.4.ebuild 404 BLAKE2B 371c8e22792752990a85c1d9b7017bed34d607e55bed1547e0f3a4729ff4d97804240c5fe53f48da2316519da052519f3a175e70c8d23c95292ebb692179cc6f SHA512 447a6adb952a7e43c6fd758404a71a40d30de6d3130808ca6518299b02cb1bf09c2a52f8f57d7d5c2a9d72f82820a912fc2f529d281361c7a02f4f40528d1061
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.22.3.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.22.3.ebuild
deleted file mode 100644
index e7e9654ba6a5..000000000000
--- a/kde-plasma/breeze-grub/breeze-grub-5.22.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-inherit kde.org
-
-DESCRIPTION="Breeze theme for GRUB"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-src_prepare() { default; }
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/grub/themes
-	doins -r breeze
-}
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 286cd97efcb0..a575de12f99d 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,7 +1,5 @@
 DIST breeze-gtk-5.21.5.tar.xz 47668 BLAKE2B 4f8d0980c359e9a9aaf8bc4728e8480315e35f426c8199982d2c0f34b62174736ea944689ab88af10c3431998b296049c4b7b64a115081184a3372e466881537 SHA512 afbd9348b2cfd55412df50ef4f2732d6f2fbd58356579766187ea79d20b86127b6e140caa14132edb940fb5d72b5da981869cdeca3abb1c17352782973bf0aae
-DIST breeze-gtk-5.22.3.tar.xz 47680 BLAKE2B 8ae37bbccb098d4e8689aa5faf600c9608635e44f090246776cb612563e782300f73fbea5c8d9ffe6f5ba1ca52b29e9b94daa9f7656acd7efc3c23d890fb2765 SHA512 bf9e18584d8359a47c8538943ec16b49a4596222fb777f5ba959e9c8202e77cfc620d96718c093bfcb728465e24505025e35490cd340f2f87a9b5895e95dff20
 DIST breeze-gtk-5.22.4.tar.xz 47688 BLAKE2B 36bbd9e190649f311c3997a2eb3e1fcb460f76c959c0e0c249738b37a301f9c4a882441c31917e11bb9e4c2bbc1f38e00d3195c6afc4257083ddfeb9639a9986 SHA512 13576288f2c2d6d6dfe12c6f8e8c8a5eb27d3c306a398bfc514dcf96261e34a937b77fff7bd3543611d11130ca5800778ae640598745f00990031e340304f6c5
 EBUILD breeze-gtk-5.21.5.ebuild 790 BLAKE2B 80b432e2271aee44626fbf82f37a4224e6bfe185d5a40c8a520c885aa8217a751fc35938df2e586b47dc1fa436ff5f705acbaee8d1c2a85303bf4477404ec07a SHA512 d0fef1cab3a4be5fd0a0effa92e32e91bebb7e52b1b45ae18ada1bafb86e3d77c30e4f3dbe22ec9b1c86811ddc61a337b10ca0939060e15c33bde6fa5153f97b
-EBUILD breeze-gtk-5.22.3.ebuild 793 BLAKE2B 2244933f23a842c417209977bc5416fd3005ba09cfac353f68d76091b031a310b9a56767043a904feb65a6a747b614ea2a03a9211fd603c365a7038d4d60b56b SHA512 537d3b077e6c9598bcdfb02ab073b9da8c43b1f2619a2eee395ffbb37da3a9bdd19bd9ceb14dbfd3430eac0c001ccbe8ca5610d0a7b1610b259e733447a42d36
 EBUILD breeze-gtk-5.22.4.ebuild 793 BLAKE2B 2244933f23a842c417209977bc5416fd3005ba09cfac353f68d76091b031a310b9a56767043a904feb65a6a747b614ea2a03a9211fd603c365a7038d4d60b56b SHA512 537d3b077e6c9598bcdfb02ab073b9da8c43b1f2619a2eee395ffbb37da3a9bdd19bd9ceb14dbfd3430eac0c001ccbe8ca5610d0a7b1610b259e733447a42d36
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.22.3.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.22.3.ebuild
deleted file mode 100644
index 2507c67b7838..000000000000
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.22.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-PYTHON_COMPAT=( python3_{8..10} )
-inherit ecm kde.org python-any-r1
-
-DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
-HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/sassc
-	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
-	>=dev-util/cmake-3.16
-	>=kde-plasma/breeze-${PVCUT}:5
-"
-
-python_check_deps() {
-	has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 562305c53246..e8a45e9e86cd 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,7 +1,5 @@
 DIST breeze-plymouth-5.21.5.tar.xz 108692 BLAKE2B 7b98b1fa6f2793470c550336c3205cd7846e40fbbe3cb7bc895e67fb557868ec3e73fd5e14a0efd22b055a760a2636ed301810c60ea53d27a382bca89525ae18 SHA512 7b562a9b86baf4f362e3cd97722bbe3940be4232910e68ff1f029f2de5d1e362d930dde03a3adbed738bda559f9f6b5b812ae7e1451a145edc37e60b5af66285
-DIST breeze-plymouth-5.22.3.tar.xz 108744 BLAKE2B 4b8fedc8105dd93f6d8663f70dab982e23aa377c3e5caa8628ee17f6b48e84afa87114d95ec2211754daf567ff7ad3f459830e196980015b2dfea06caf65e246 SHA512 90949b4877a9d7c3a1d00dae07c567d59544a1537ddb807146fb342e5514abe82dc8871e359b2542b26b1796746afd28265c83c0cc51bd24f9fa6ff2e28602b4
 DIST breeze-plymouth-5.22.4.tar.xz 108764 BLAKE2B 9c48c04790fd580c1da4872990226f6b5998e1ed35cafc08cf7e509489a3c3d726e7a8dae85ba81313a264eb1086f312ba1886c7ee5ca3d8f2b758445ace7979 SHA512 e297e378de3db5c1eb409de2af558cd8c7713d6f887eb62bfbb17dc2e26f641a335231caf9d8b725cee0740bf233bf9803281e3bf1e93c3562626df1c0d8d702
 EBUILD breeze-plymouth-5.21.5.ebuild 515 BLAKE2B 762a0f8b7eaab8a20ad9788d25903df6835c8376edd5af92c386a79624acb6f5ff673b2384e78b831b05f2788a9e6c82963b091ad0d7e004237e457353b40c6d SHA512 1ad7b85267f2c05f9fd1b0e4f1804c997f64448fc92b8b195dd5c7a8f701457de312562abd1ac692921310dea26d516996c533194d146611bc51b8641a706d60
-EBUILD breeze-plymouth-5.22.3.ebuild 518 BLAKE2B 70b85edc94b2744ea490b6428d83a7bfbec913dd93cc17a4c55f695f2dfd640c29ce9d3bedb5dbad565e67ab3217f2fbdf2450ad8b8fafa61baa63bec042dcbc SHA512 29b50487fa92353159882e7d00f18817f84e7a5093fd7c65adabfc6463675149800d1182806ef821eb92adaf05378f653ff0c1ad3321d40c3e3813bbd78efe74
 EBUILD breeze-plymouth-5.22.4.ebuild 518 BLAKE2B 70b85edc94b2744ea490b6428d83a7bfbec913dd93cc17a4c55f695f2dfd640c29ce9d3bedb5dbad565e67ab3217f2fbdf2450ad8b8fafa61baa63bec042dcbc SHA512 29b50487fa92353159882e7d00f18817f84e7a5093fd7c65adabfc6463675149800d1182806ef821eb92adaf05378f653ff0c1ad3321d40c3e3813bbd78efe74
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.3.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.3.ebuild
deleted file mode 100644
index b9ecc8176c56..000000000000
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-inherit cmake kde.org
-
-DESCRIPTION="Breeze theme for Plymouth"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
-DEPEND="sys-boot/plymouth"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISTRO_NAME="Gentoo Linux"
-		-DDISTRO_VERSION=
-	)
-
-	cmake_src_configure
-}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 283b5ee9873c..6f8147958359 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,8 +1,6 @@
 AUX breeze-5.21.5-fix-splitter-proxy.patch 2306 BLAKE2B 5d95c306c34482a1aa07a64671ecd4687dc61048829b129d15c302b16c30a79d97c2896f1b84c7fa7e2dc26d486742b3cbfbb9e8b42166b92586baf6efef3a3e SHA512 6e2eb41d9c44acca58d2e4c2a93c3fd73e808bc6eccafeae8278351b9a780a0f75d8ee80343fb55cee0880fd4081537223caf430ed2093edb8b59f1b27f84fee
 DIST breeze-5.21.5.tar.xz 26286020 BLAKE2B 437666f0b509fa9d63f5ad04702831dc0ec4eedf763594c831d335b5b69a6b04052af6adc2c550b903c94a084b353d700d88cec47af537778afa31f7150e38b6 SHA512 5e449624543e2bd437bd4311e7ff091ffae33c4da34da2b9968f9551970b66350d337e6aee974f9e2cd82eff877a4ab5c6f52ec52d4f2724fe93b747f021e9eb
-DIST breeze-5.22.3.tar.xz 34545872 BLAKE2B c01573c011e95c5509d0ccb0a6d5a5c075cdac5a3b99e6be04d1292a8d9cffb83321b02fb08ff9c774e9dc145b5225f15ec01a92717c58f4595e332eb7a48872 SHA512 f5922ded36ed22d0f06cae4923d4860a3d1bcb4e0795fe845faf0fa553176e94d4210e597f78c4d3f442e4a5b57822c6abe195c5f0150fdc992b50a7210a5290
 DIST breeze-5.22.4.tar.xz 34548204 BLAKE2B 188a150493d73655a5faa7a0bac1a667b95566e1b0245fc15e700f2e9cf57e00ba67ddf14efe7d78d741a86afa527cf8625e025869a5a215272d59e1671adc39 SHA512 a429feeb22abd1fc79a3f27b096689755efa422a595ddbc5108435af26d7c275858127ccae164bba9e9bd0f3c83645cfea466de0c8d429d8e22a68bc25d1f068
 EBUILD breeze-5.21.5-r1.ebuild 1322 BLAKE2B efa9c3f9ad57d368c3256d5a506db91c9c68a5e50841aa23e9085ce59a9c51aaba4d9fa72f8b0cc8b02280e1b1dc7afdad3249bc5666c5640b0fb35ef897ac9f SHA512 b8ac6e723a12e554c848a9f55adb0a411fc0a1523074ab70b972f31030b4517792341759515ee1abfd6b81b3ee06146784b5e9bbdfb4491e91d55bf5d65388bd
-EBUILD breeze-5.22.3.ebuild 1268 BLAKE2B 3a861b41bf751ba791c81a5e4fc5b92fcf9b8cb6bc85973331cf622cb537c61a64e0f5e88b7c72c135e8c865b8af4224f8f39542ebdf6e1d521ad8ae51adf437 SHA512 0bb2d875223c501579fad443bdcbed1dee09c48eb5b0c7d63f9f03a8d04a64c48dce5a41e5d32ab1db9cb3ad210604c37501ece5c193b2160a8d1e9c8c3473bd
 EBUILD breeze-5.22.4.ebuild 1268 BLAKE2B 3a861b41bf751ba791c81a5e4fc5b92fcf9b8cb6bc85973331cf622cb537c61a64e0f5e88b7c72c135e8c865b8af4224f8f39542ebdf6e1d521ad8ae51adf437 SHA512 0bb2d875223c501579fad443bdcbed1dee09c48eb5b0c7d63f9f03a8d04a64c48dce5a41e5d32ab1db9cb3ad210604c37501ece5c193b2160a8d1e9c8c3473bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.22.3.ebuild b/kde-plasma/breeze/breeze-5.22.3.ebuild
deleted file mode 100644
index d1a274a975e7..000000000000
--- a/kde-plasma/breeze/breeze-5.22.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://invent.kde.org/plasma/breeze"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	X? ( x11-libs/libxcb )
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kpackage-${KFMIN}:5
-"
-PDEPEND="
-	>=kde-frameworks/breeze-icons-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X XCB)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index fe197ec1b698..cdff27daf39f 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,8 +1,6 @@
 AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d
 DIST discover-5.21.5.tar.xz 8431164 BLAKE2B 36d539ec0efdfa9d70c6fa3d45fb8abba5228d35a1d7260fa701610a9859ce7c9bd3d98e12b67dade598358a60ceeae78300635ea5ceb1017cc7e7fa3b046c11 SHA512 933a16dd5f99c18e61fdf77330a78e3c5251d13ce6aa99daa4f7b939320a3ddde2c66ead85e1bc31e7719c0cf657ef46516f35f08863cd6f2be25efcbf156fbf
-DIST discover-5.22.3.tar.xz 8457300 BLAKE2B 9d67bf05b95a3f06e08519122a29ebe38c8792220a2a448b44c4b8d1f1e5876efb255673d7616ca43391c80937dec4967cf86e7938856d008f9903bf6f0b90ae SHA512 ed6772f9573ac5e43f30ea83c344365154b43f87c1beea0573f646e5f7239727d49eda1eaa9588b2afae32e3fbcbeeb7f36a6fdd6ed6e2b06b82967f86c60be0
 DIST discover-5.22.4.tar.xz 8459460 BLAKE2B caa7dea7884a2822888b0faa4bc33339f441aed19a947da49fa71f6a6cccc322925b330169628208ada6910f91a777023a3cd56344d8984652f5b8106882edcf SHA512 3045ba5b4260c3098eb6d536de3598e78df8f31e26667a2b2b4c1588d8cd920586bc18a642dbfb91e3a36e527e2c34756e83fd567df29f2e31bf04fe566eada6
 EBUILD discover-5.21.5.ebuild 2217 BLAKE2B d6f0facf92e314fd59f5dd10422d0c065d9103ccfa0e3a78c1a9a7d39a00eb5bf31ab5d1855edd0e225a4d09ad387a9d37cd296702d21ea8b293da5ac9b8cd94 SHA512 c1e6c91410e560705e1be62818bbef63016bf879df5c8792be4f95451dd2c173016cb029c82bb75a801dba190120e6940c439db7d801294ea6cf0de16afd7158
-EBUILD discover-5.22.3.ebuild 2273 BLAKE2B 3ba30e3e9df6909855333ed312decf9a1b7c8ab6e0b4b9edd4d1b69b4fa1ea52321ce8c021311f21c0bedf8ff2f468062490a539b2a4b1ec8c2cf030464700a9 SHA512 a7891c220e26aefe53872c8def74a5dfd891f78e60c88f9609d97d9a5855227146769c52cf7e2696d7a92e4e64dad1b58fa003039a3454164fc80eea52667828
 EBUILD discover-5.22.4.ebuild 2273 BLAKE2B 3ba30e3e9df6909855333ed312decf9a1b7c8ab6e0b4b9edd4d1b69b4fa1ea52321ce8c021311f21c0bedf8ff2f468062490a539b2a4b1ec8c2cf030464700a9 SHA512 a7891c220e26aefe53872c8def74a5dfd891f78e60c88f9609d97d9a5855227146769c52cf7e2696d7a92e4e64dad1b58fa003039a3454164fc80eea52667828
 MISC metadata.xml 468 BLAKE2B cd98862045ebe78aecaf3dc74526afd4ff2bd377816993e2a0aa4d61cd4f14f7b3e5779d5892244233cbef03b9aba6404aa9fe9aa161f2fc868e369df6ea626f SHA512 a8807c50a9ab4b8e9fe2876fe159a3880bbaeb36a84ad7e7fed55cf6367b1c17ed7e0af135a579685bd4a5d8b550f38b240ac31c00e463befc22de35fd67b2ff
diff --git a/kde-plasma/discover/discover-5.22.3.ebuild b/kde-plasma/discover/discover-5.22.3.ebuild
deleted file mode 100644
index 56b279a23564..000000000000
--- a/kde-plasma/discover/discover-5.22.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.82.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma resources management GUI"
-HOMEPAGE="https://userbase.kde.org/Discover"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+firmware flatpak telemetry"
-
-# libmarkdown (app-text/discount) only used in PackageKitBackend
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	firmware? ( >=sys-apps/fwupd-1.5.0 )
-	flatpak? (
-		>=dev-libs/appstream-0.12.8:=
-		sys-apps/flatpak
-	)
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
-
-src_prepare() {
-	ecm_src_prepare
-	# we don't need it with PackageKitBackend off
-	ecm_punt_bogus_dep KF5 Archive
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
-		-DBUILD_FlatpakBackend=$(usex flatpak)
-		$(cmake_use_find_package flatpak AppStreamQt)
-		-DBUILD_FwupdBackend=$(usex firmware)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 686392: needs network connection
-	local myctestargs=(
-		-E "(knsbackendtest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 5889d0d36867..8ba526ede7f3 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,8 +1,6 @@
 AUX drkonqi-5.22.3-unused-dep.patch 954 BLAKE2B 8daf7abdd007f0c4ba8adc1173dc314c17bc0144aaa494076d1a031bb1de87ef33da9d9d322fd63582cd1b917383295479fdd3547ce1b1651a9f36b56ca5d0da SHA512 8b26d70986ef5cceb7abf83c36a12d3b17158d87fa3b16ac6814c17b0afbc6258dc4aebe9a630f6724ada6f41a9d3f5029cb558966b6dc01f833a91ce36ef7b4
 DIST drkonqi-5.21.5.tar.xz 774268 BLAKE2B ce58e47915577ac1eeca0c01619a3ef6c237a01c5273ae979409c004b3dc8e453855644d85165f0d5d8dabdc82dea70413b58620b4cc0b91824253b4275679c0 SHA512 ce24e52cff81cf2b9cf685dcce183cdce99110a1469d156726ca5c64e64dee6f064fe4750729619b6b455bc4e28792f92ec305c0f957f994c4e5a0aaa337f649
-DIST drkonqi-5.22.3.tar.xz 781516 BLAKE2B 752971af8f0f42089083051fbd9d29efce226013270e4e94bcd5b2bee79b003a6d99bfe4fa38a7f472e74273e1cb068f69b3ddc52f16efd24a19ca59f8100a63 SHA512 ef0f7236800fe1231657b9c92840ebf41876b77ad082a124932a3f9a5f0b793de2639073d345c32234a875bc9e240ab1bb621bf9266affaae33973e3218ebe32
 DIST drkonqi-5.22.4.tar.xz 781472 BLAKE2B dd6ada5171fd7d06edfb8df7a39e5b09e7f97b1c5427a90f1d11560e2011df8ea372e79a7f921d3221f2ff6eb88320e3113a8eb39b81544a8c1e1c9a4642e916 SHA512 8e47818520bada519711ede7604815510a51fd7978a50d6b1e5a211f0a3c27c04ebe0cee2fbd51b324d537e2f10e06c668e196066117878098823084f6ed1f6d
 EBUILD drkonqi-5.21.5-r1.ebuild 1514 BLAKE2B 39dff8afc6e052f17418f44e4cede324d7795855076e60e5c1a78d336b5ddc6b33df4c2fc62a0304f697c4de1de4ac49605b47d7e3203cb2a6aae1e9152aa14c SHA512 49af648e2f8282e8184f2b9f5b97ba3daaf2ac937d413e98726949bff857f22062f0c2f9947057098bd6d51416fafede67bad538637a9bdb6baedd1df8cab1a6
-EBUILD drkonqi-5.22.3.ebuild 1388 BLAKE2B 5ebc7529fb4c62fcfd56c7aa939f9186834c5d23d1288ccc82a9dd4d462e3fa5865ce7daf82aea9e7b6c3e290f7ccf16364fd156f2684b1e1e2fb8e9d19cb71f SHA512 39b51de412dbfd1b0c158f7660f1b0fd18b67db6a3ffa4d04b3238667d3aebb98a30f7f09003c445e9ed446b5c3a06763589982af7c01b72b0f3686b3a34b12e
 EBUILD drkonqi-5.22.4.ebuild 1388 BLAKE2B 5ebc7529fb4c62fcfd56c7aa939f9186834c5d23d1288ccc82a9dd4d462e3fa5865ce7daf82aea9e7b6c3e290f7ccf16364fd156f2684b1e1e2fb8e9d19cb71f SHA512 39b51de412dbfd1b0c158f7660f1b0fd18b67db6a3ffa4d04b3238667d3aebb98a30f7f09003c445e9ed446b5c3a06763589982af7c01b72b0f3686b3a34b12e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.22.3.ebuild b/kde-plasma/drkonqi/drkonqi-5.22.3.ebuild
deleted file mode 100644
index ba3a9d38c841..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.22.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}: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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		sys-devel/gdb
-		dev-util/lldb
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.22.3-unused-dep.patch" )
-
-src_test() {
-	# needs network access, bug #698510
-	local myctestargs=(
-		-E "(connectiontest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 294817bd8c75..4e704f49c341 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,7 +1,5 @@
 DIST kactivitymanagerd-5.21.5.tar.xz 99760 BLAKE2B ffc9499fdd2942813cf35697cab0b2813c87614db3d72312329690dfb9a06fd8abef283e7e73cf1485d2bc430e5e0a82fc81688702750fe47494d957623cd069 SHA512 097c18f39d5024a05e645e7dcf82ad39df07afb0ad0b010410699e3fa1261002f05553dbc049af63e7882c305d4c2c20d5032e9448354de7c22d9b9371a8c633
-DIST kactivitymanagerd-5.22.3.tar.xz 103096 BLAKE2B 1a250caf05a7b70aa47f811cbe542f12a0c20d851de060f8ce264c6b87650db3dc0add4db8864afd51ece6b317c94f6fd866f050add80c03db3e093851e7d17d SHA512 80100b8408d901157fda2e4a5ba01aa9a48916f6d4d02b39464c9a5292a89dfd8c0d823d1fc91a2484c5e16abe8aa460dbc71f772c9a028a2227c0594e4b94d9
 DIST kactivitymanagerd-5.22.4.tar.xz 103128 BLAKE2B b6bbb761fbfdcc09f65f714b9ca51aa1f3d5e0f39ff24b53e4b6a0952729f9d3c90f60237ba8b8a821e23b88da410037a2738108d067671904b79abd232183de SHA512 3b792abdefa7f8476b090dd42b91bf3afb90c28bc99f85e0b5af3838cef79e9341e86d04d18a3721a404153883ecb49907db985b7078ce87f0fbcb883c1df16d
 EBUILD kactivitymanagerd-5.21.5.ebuild 909 BLAKE2B 9fe2dcef2f797cec69d5fa6ab3735d88c88c4baedc5102968dbee76473f500b1f8adf0b28ae6ae8aeb399d8b98cc840fafe06126c624f5c9d04bbdda03f06bd2 SHA512 ecc51340c8c4c2b8a9243c7db2751cc1603efd587776b71ac7a7b9325991535e1e6c8eda4cb5ba95c2e01c7b1217d56e17b6bfaae78852d79e51c164de2bc714
-EBUILD kactivitymanagerd-5.22.3.ebuild 912 BLAKE2B 7efe4edbe591789dd91201a4d887085abcc18a4fdcda83a0c316f26f49bb016800e6e005ba08adb165dc6254f367c8c90a1a470d0fe477a3e67faed16131a877 SHA512 87ce3c60f6ea78ac27c8d8035322cb269f063b9b7c4673e6b8ca35ec6fbc79493304a14e085fea3e209e884d96cd74dc0e68a04a582f271f9eae7cc7168c5be4
 EBUILD kactivitymanagerd-5.22.4.ebuild 912 BLAKE2B 7efe4edbe591789dd91201a4d887085abcc18a4fdcda83a0c316f26f49bb016800e6e005ba08adb165dc6254f367c8c90a1a470d0fe477a3e67faed16131a877 SHA512 87ce3c60f6ea78ac27c8d8035322cb269f063b9b7c4673e6b8ca35ec6fbc79493304a14e085fea3e209e884d96cd74dc0e68a04a582f271f9eae7cc7168c5be4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.3.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.3.ebuild
deleted file mode 100644
index 60354aa2c005..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 64cff424b77b..a0e60980ece8 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,8 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
 DIST kde-cli-tools-5.21.5.tar.xz 610864 BLAKE2B 5f4fbbc100d8f7baec9353f9540dafe9427cf0b01736f055aaecfed48b3e31e1fa2d0a70b90cc99f30d3df33e1bbade888781b1e2ce95e925d871ae44a9b33bd SHA512 20859f88044c6af84ba4b666b803a6a3a4fbe33748495d9c186fc0739e7b5464b234166cef4d03f0dd44540919eca4f3ea8a1f5ac7b54d480cc9dadeaa0ec3fc
-DIST kde-cli-tools-5.22.3.tar.xz 626516 BLAKE2B 2aca4302d6558503be30a0716c52ce1c1aab5bd662e399b7ac23159f53d7d6147cc2ef9f080eeaab84a4391023dd2bf2d7666e834fb273f159f4371ecc1e9bc3 SHA512 c3db0082fbe55323d30cb434827028b6d82138254e99ee5a2e00ee3a808be3de5ccaa3fda4f16d96d14f0d200951a7ab14bad21ade66ebefb76fa4c369063592
 DIST kde-cli-tools-5.22.4.tar.xz 626520 BLAKE2B 70a7c21b83ec7cafe5c31ce9416309670879ea369c3fc5053167dfe62807b7a3c2352e840553902106de927f78e21ec9999f51887aa2412a9f8b6a432a39f7ce SHA512 8ef2852eb15d8d22c6f6ad3ba8f68b6df472d5641c5c2a9ce4227848c4439d0d37012122d301dd65b87b56c5420e761510be235a67fff22383b487289631f944
 EBUILD kde-cli-tools-5.21.5.ebuild 1722 BLAKE2B c3f53799f5b03bfa623099b977f31d4cbd2ffcbcf24eb97419d06ef33d269a556db0c339c74dd415eb19059c444ba0eb7fc47f1bcb22ce77d958af33dedb82c0 SHA512 240c5c44eb886b8cbe850ec32e773f5e96111429cd2198e6aa13899f4ecb71bf16d621ec628469acc25637c6911909ebf1d0028b3c7d3de96629de8547907728
-EBUILD kde-cli-tools-5.22.3.ebuild 1725 BLAKE2B d51b8bf98e9d33e347b296693cfefea2f325c0f2d02137d3665f428b15e515aecbf98a0f5e5d9ea658258091b4fcb2eda19ff0748bccaccf79f408d2cdddda7f SHA512 b35738d90476e5992bcae877e7a925744fee79ea50305c0c81fa94095b8cf797ef012f4b44345c454679c349a5b39e7c156fecfb23e6733450a6df0c7c6288a7
 EBUILD kde-cli-tools-5.22.4.ebuild 1725 BLAKE2B d51b8bf98e9d33e347b296693cfefea2f325c0f2d02137d3665f428b15e515aecbf98a0f5e5d9ea658258091b4fcb2eda19ff0748bccaccf79f408d2cdddda7f SHA512 b35738d90476e5992bcae877e7a925744fee79ea50305c0c81fa94095b8cf797ef012f4b44345c454679c349a5b39e7c156fecfb23e6733450a6df0c7c6288a7
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.3.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.3.ebuild
deleted file mode 100644
index 7ad4920020ea..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="kdesu X"
-
-REQUIRED_USE="kdesu? ( X )"
-# requires running kde environment
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	kdesu? ( sys-apps/dbus[X] )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kdesu KF5Su)
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index becbdf5e63a9..f8e811e7618d 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,7 +1,5 @@
 DIST kde-gtk-config-5.21.5.tar.xz 68764 BLAKE2B 5b63ae7d4a2f7c364d202321c87a3c6cb11361d6ee74625c3786428adbfda72d792a6de1f51e32d179f6746b33ffb801afccfac8f0167b31f759973b48bc629e SHA512 7acd5036cc008fac85cabd9f3a5321dc1c0209a1133d6063342ca1b1235843dce5e37a7712e0cbbd520f09b3ff46b71a94517c61414c8e7c1c35a2d65b428347
-DIST kde-gtk-config-5.22.3.tar.xz 70848 BLAKE2B bcf7971f1330becd8768eefe6b886c55e974313c3beeb3d6c02029065b79ef14a22f1f83bf4402a4ca3a270e5dae11c3b412ce3b4923ebf8c33bd9061149ea2c SHA512 d2308bbd83804aad37bdf534f10e8fecb277aaef84ec75e036de2ffd923133beba332287297f2cc529db1ceeeb5a686fee76ddbae083f96d6708dde37c26c6e3
 DIST kde-gtk-config-5.22.4.tar.xz 70832 BLAKE2B d77ed9afd5eeb73a98658e35a8f224589663addccf91fa167ce91afb7b0ecec15f3f9ae653038c23af4c584089aa648d17d251f100a863fc915ab31da8827895 SHA512 9fea6564d9d6ee03888c6c34002a0e387c573237a834bb5ecad28b317543744a9d4ae71d7c656fea76f738e29c13fd8c11f9beb6c03bb2f21bba1d7fa9fd72a1
 EBUILD kde-gtk-config-5.21.5.ebuild 1281 BLAKE2B 2966bfa66ca1bf58a298d8cd04e4db5052f6873aeffe865c502d3c9c1e0a2387c1d3c41c7837abe973a30b0747f5dde95126e3b74c03b3628e8ce7687e0ff0c7 SHA512 89e9a85aeb731f66987f267dbc810650a11b34d45a60458106fc6b4f3e8ecf592086fc679c3de83777b3335fd5c01668ef577f746a37b2d71e61ffed9a6a86b5
-EBUILD kde-gtk-config-5.22.3.ebuild 1284 BLAKE2B 2fe97ab88e174f2985b00846ca1f3840631abfe8192f3776f2c7b6c0027f8fccca9434db323b605faf7c72bf1ad6a85637505d51caca39f1b8fdd0cb9efa40bd SHA512 6886ae53627460280726f8cf09f3deb3c11e537471f3c53ce860691e2a89d5ea1a586a5632a50dfcf57117ad3959eb8fb6aa8de36c89a12b7d93bc5ec38f3ebb
 EBUILD kde-gtk-config-5.22.4.ebuild 1284 BLAKE2B 2fe97ab88e174f2985b00846ca1f3840631abfe8192f3776f2c7b6c0027f8fccca9434db323b605faf7c72bf1ad6a85637505d51caca39f1b8fdd0cb9efa40bd SHA512 6886ae53627460280726f8cf09f3deb3c11e537471f3c53ce860691e2a89d5ea1a586a5632a50dfcf57117ad3959eb8fb6aa8de36c89a12b7d93bc5ec38f3ebb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.3.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.3.ebuild
deleted file mode 100644
index c19ad83bd2c2..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="GTK2 and GTK3 configurator for KDE Plasma"
-HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-lang/sassc
-"
-DEPEND="
-	dev-cpp/glibmm:2
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	gnome-base/gsettings-desktop-schemas
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	x11-misc/xsettingsd
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 628dd8c1dd2a..539e10bafb61 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,7 +1,5 @@
 DIST kdecoration-5.21.5.tar.xz 46236 BLAKE2B 3fc48fd91ff5e53c4a98f37572785b25f25ba23218aefc6e07b1b7c3495055002b379f826191e0155a39ae61dd8a0052e51d50af059fa8e3bf12e3dcb22f613a SHA512 ef86f9946cad9de9a5e3767e2dce4f30436c9fb013bf73d5ca31cb852d3dae92cd3906adcb178070f74922f3776d226b8f812ea24eb82a57662c0bf675d38edb
-DIST kdecoration-5.22.3.tar.xz 47328 BLAKE2B 2eef4e02b83fd5a26958cbc79a6ec9f105e2f69afec266048542b76062a80e28a46e2ed9f210e739d2ec0ad5b6ae422c62153a0fdf89e1241cc486ef3d3ecf15 SHA512 17efbf61d169eab2286bb2912c389d875909a548ca5339ebab4c4bb12ac66138f0e38c36d2c44c0dbf6e6dc4cda1c53b28012b566c846f137d6039ec61273429
 DIST kdecoration-5.22.4.tar.xz 47348 BLAKE2B 289590267a4dd7809172771ee4047aa34507c69dd57deaf22f4fea2349c2f332b702876c66488ea1642d2a29ea1cb3de31a67aa0676fc8e46dbccc6ffda0a796 SHA512 2e5dc386d53bdeb81a0341772eed8055a9ee881cc1cc4133893a7bb7d521cbe7b81527322ab0c7d6bf7312fb874f8519bf832be0ada580204a75a3ae3fad162d
 EBUILD kdecoration-5.21.5.ebuild 479 BLAKE2B b64ec4043b3a32daf4717bca3394c031b5af903243238cb4a5514605402c6154d837ab1046ffb2b3e9424712d1def35555bc38242e4e396240d6f471f1d0ec48 SHA512 5fbce6761a4afbc358756c80f3f823ed49c313a5d20320c14b32e4addb2a95fdb329088144b6610c388cc422231c58a81c67d37a01d279191171a390cb5583b6
-EBUILD kdecoration-5.22.3.ebuild 482 BLAKE2B f786c8248edca18475c95df75a1309c30f51c8dc3f73e694c559aebf981d39f95b6569a4d1278e0ce1d4f71c1ff34639c49c96b4247f78c23708fdb85727affd SHA512 8376fc0a0c4153d9e2ba39a9ba3794bc4952491be6c9952347fdc97f3d59ffb64459d641ace223a1d770f1e45ba5410304379432773f4a876a3bfc5d7fffc426
 EBUILD kdecoration-5.22.4.ebuild 482 BLAKE2B f786c8248edca18475c95df75a1309c30f51c8dc3f73e694c559aebf981d39f95b6569a4d1278e0ce1d4f71c1ff34639c49c96b4247f78c23708fdb85727affd SHA512 8376fc0a0c4153d9e2ba39a9ba3794bc4952491be6c9952347fdc97f3d59ffb64459d641ace223a1d770f1e45ba5410304379432773f4a876a3bfc5d7fffc426
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.22.3.ebuild b/kde-plasma/kdecoration/kdecoration-5.22.3.ebuild
deleted file mode 100644
index 772726b619c5..000000000000
--- a/kde-plasma/kdecoration/kdecoration-5.22.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plugin based library to create window decorations"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index cefee7f298a6..64f55ecbc7f0 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,8 +1,6 @@
 AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
 DIST kdeplasma-addons-5.21.5.tar.xz 630108 BLAKE2B a3a4ee1885cce41621150cc1eb5fa5d6470b627f8a30231078938d82f39f888927f6482048403905cb3e680928be892718e0c4741a8da11f0e317fa06cee8106 SHA512 7c7afebd726e400c859be7051c14dc2ade658df7995b02f43595be5394f8d79322c7a7edeff6761e3980bc20aaedfc49d063308c4ee9974a400b8f855a89efe1
-DIST kdeplasma-addons-5.22.3.tar.xz 633168 BLAKE2B 43906ce3d0e2dd26d62849ff4acdb915f4b3e81b0b38d6d77070e2e85449a6b0aefcf742cc798c0ed8128a759e010546025141d87077f0a0bbae827ceebeabe7 SHA512 296aaf5928229d021ba8d549b0fa3d73bb2186e89ae263cfaec0278c53b75332bb17d52923a68ca289b7c8b19c58323f5fd723a3df7cdcb9071a9551b4540383
 DIST kdeplasma-addons-5.22.4.tar.xz 633948 BLAKE2B c17ff07e1d1bad819592ffe673b4b215ae8a6d396702e7a7ac212e4af5ac228690cf78cee25d751719033e8181a6273bb5a8c4ad69dc8f8bb700c2d766fa4db1 SHA512 ab2bdeb5c1ead16fa11c3d7c06302038c25b6c1b913494422dc41f5d0f833c6568e7b984f416b8957ae1f9568f14b85baef05e688a0f821e578c02ecd83e2c91
 EBUILD kdeplasma-addons-5.21.5.ebuild 2079 BLAKE2B 19c27c73a2d26ffae8a1cc44e48350b3d391a45d33b8e61ca81b5b7ca8fa1b026867720fe34f79f4a11b6322e4ed8a86f3d7528fe5fbae503605af71d8671650 SHA512 db7612e36ce39cab39f65c8707e347cae01a3cd572f856e9512bfdf2d006558f92bc5e47c68cb897baff800d2abef9b6add55dc879d5b0939c09e0ad78c719dc
-EBUILD kdeplasma-addons-5.22.3.ebuild 2082 BLAKE2B 7c48249ad97f9f6261825768fe7eda3e3c89612cb988f8ecfa208b1d06d08a8c8bf786d35b4bdff200d476174f35358fdda440f29db2b983e993bdbff710495a SHA512 72dfb4b13eedd04f46259d2f3bfcea9722e9dd73920176065154861bf589d8ba81e52386a2d4170ea4597b6b8d403ab890217602dfc88277997601df5cb7351b
 EBUILD kdeplasma-addons-5.22.4.ebuild 2082 BLAKE2B 7c48249ad97f9f6261825768fe7eda3e3c89612cb988f8ecfa208b1d06d08a8c8bf786d35b4bdff200d476174f35358fdda440f29db2b983e993bdbff710495a SHA512 72dfb4b13eedd04f46259d2f3bfcea9722e9dd73920176065154861bf589d8ba81e52386a2d4170ea4597b6b8d403ab890217602dfc88277997601df5cb7351b
 MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.3.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.3.ebuild
deleted file mode 100644
index 7d312067f3f2..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Extra Plasma applets and engines"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="comic share webengine"
-
-RESTRICT+=" test" # bug 727846
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kunitconversion-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	comic? ( >=kde-frameworks/kross-${KFMIN}:5 )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" ) # downstream patch
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package comic KF5Kross)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Disk quota applet" sys-fs/quota
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index ac6be56d0e88..435be1a5ab84 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,7 +1,5 @@
 DIST kgamma5-5.21.5.tar.xz 83168 BLAKE2B 5b6cec28329437dbfd93ccf24e26032dad1a394133f823dc6e47a0d82e2aee1d5ca387876a4951c2dec4b072268dcddc58cf0d9c69ad107360279c9027e6e777 SHA512 31da4b0e4aceeffaa17b9d9c13a12db8a7009575e92977f5261fea4b578cc8cca1a8f159a4229a7995cac2beb76583c125448a346ac1cdfdbb774bf76b2e34ac
-DIST kgamma5-5.22.3.tar.xz 83204 BLAKE2B 4112f0a7532715165b4042b5629d0ec6d4c5befbb9ba4241c85f2b17afbdecae4b7626d453d4c7c4d88831bc834fbef2b7e5dab2897e028b0952906d741bddc4 SHA512 cebe34026d31fcbd3b528ecf7f2bb25e9927421ca4c447bd7952149242022e0b8828f14070482746713bc95683ee98b70f088c348aef0af3565a223537bf2ace
 DIST kgamma5-5.22.4.tar.xz 83232 BLAKE2B cd2843e7e911ee200100042aae9d63f7598da5eb0e34c3e4a510262b4245b3088d9aa12a1e5434828d6e42c062c1db83ebd3dbbcfc0917e27d997e52f1893831 SHA512 ecda64caeb7c8273c887ded9dc037c8fc4835f438632a8344aea70a43cc7513e221f5c2344cf80d49d5ed03b15dcb5be6faa14aabd687ac07c2e50605803041e
 EBUILD kgamma-5.21.5.ebuild 677 BLAKE2B 276f1a82474c690e5ed4a803ddcd536728d70a3973151534cb435a69f302b2c612baa106281b28ad07b2571e739dc506549785af4e1028b11aa77a10c75667f4 SHA512 2c31c58a7011e039a4aa8f5d04520b15bd90dad56cce061d5d4b38e5b4991759ac6fa00deb9670b8926d52692d15cfa32b2d1be0eb9c18db8182891372706023
-EBUILD kgamma-5.22.3.ebuild 680 BLAKE2B 3f8a743abb35ea9b08a97b1bcfa58b2ca22599ea6cea4d5e8bc2696c7e6901bb174738acae18d2f184a9042399460cd567333fcbc8f9bdeccc41369b82d2666d SHA512 9545bd4fd9f85b331edce69a83bbf0f5066ca80ee4072ab57332732550198bdb5cf88e7ba2f25a78ac48032b3ff3778f7a00e3c72e84500416aade8b08d63c80
 EBUILD kgamma-5.22.4.ebuild 680 BLAKE2B 3f8a743abb35ea9b08a97b1bcfa58b2ca22599ea6cea4d5e8bc2696c7e6901bb174738acae18d2f184a9042399460cd567333fcbc8f9bdeccc41369b82d2666d SHA512 9545bd4fd9f85b331edce69a83bbf0f5066ca80ee4072ab57332732550198bdb5cf88e7ba2f25a78ac48032b3ff3778f7a00e3c72e84500416aade8b08d63c80
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.22.3.ebuild b/kde-plasma/kgamma/kgamma-5.22.3.ebuild
deleted file mode 100644
index 7b67115da52f..000000000000
--- a/kde-plasma/kgamma/kgamma-5.22.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_NAME="${PN}5"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Screen gamma values kcontrol module"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index c0989a9a891b..3159ff422c97 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,7 +1,5 @@
 DIST khotkeys-5.21.5.tar.xz 1861604 BLAKE2B 69f0057e62d4a03ce3e54092def09ea7bf73a4063ebd8e33c2fb81566d9fd1e02a1712b2e941295a491821b3ba4695f43884e5db532a5c166439a2d26389b1df SHA512 16409a928af050278dda012150e969b60617a66aa000cbb722781788defb02268ac56ef521916e55f257e4b166df8ddffcf14c9c35b49410a79491f197b4aef5
-DIST khotkeys-5.22.3.tar.xz 1858436 BLAKE2B 60fc3acf61ed0b9a45c9a9a79a60aa844aaa4ac5fed1215e1cab996e689de4295c2fe721e5cbf15270ababe05bdab47a045f24ffefbb156a1db6aab1a366e929 SHA512 b37e30a895a28302104d0fc4c976cca99f3f26d4261d9695d38b6a4af027dc843f1dec85c9f0d111bd9ec3aa551a3b42445f2bd1ee29ec5623f3f0e66190c19a
 DIST khotkeys-5.22.4.tar.xz 1858380 BLAKE2B e434bf5f877f76a180c1a55207e70fa499e7046cea8b89ade9e049d9a32d60502f53ba959b22c0309c6e91da18571cf145c8fae2c6c8f2da80e90c145af23500 SHA512 1d9ee07b0e1e3f5eb0104cccfdef4637cbea4c25b94261e5692ad084f00fb1696a4f33d6fd1e439cf80e64cda9bb53facc2eac30df1dda0fef7c03521f95bef6
 EBUILD khotkeys-5.21.5.ebuild 1346 BLAKE2B 98d708e9f0834e4a4572ecb4a13deb8ae3819bb25aae2191ebd12e6207c30f6404b9c1afd7b34592a96c2be5b8c2c166b7b74008a6df62419ba44fff535c5881 SHA512 de5172eb39e2d1da905fa46ffe4553efa11cff52b05f14b2842d2ff82a2daabcb76ab715ac1439497a24da9d9af23a2025b284f1ca0962000c3d921b029f9d1d
-EBUILD khotkeys-5.22.3.ebuild 1349 BLAKE2B 44f45d12ecbc77b5334007c0fec67393b6dace0eee0044d4bd1026735ab463c7759ec1d841d8d631beccd829680c6a85b5a47073c6d4d36feceb6795193901c5 SHA512 5792e75e05382883b6c1055448d8dbddd76d9316ed521fceb8dce8e05ee3f61396c1e2d3f9408af4a2a141ee307532cf5be5e14d3bff37005e75543b456f1b3c
 EBUILD khotkeys-5.22.4.ebuild 1349 BLAKE2B 44f45d12ecbc77b5334007c0fec67393b6dace0eee0044d4bd1026735ab463c7759ec1d841d8d631beccd829680c6a85b5a47073c6d4d36feceb6795193901c5 SHA512 5792e75e05382883b6c1055448d8dbddd76d9316ed521fceb8dce8e05ee3f61396c1e2d3f9408af4a2a141ee307532cf5be5e14d3bff37005e75543b456f1b3c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.22.3.ebuild b/kde-plasma/khotkeys/khotkeys-5.22.3.ebuild
deleted file mode 100644
index c6e7519c239a..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.22.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5[X]
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index c7f170799c34..226978cff84a 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,9 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.21.5.tar.xz 1304704 BLAKE2B e63d261bd57f69f3941c670f7d4e45428959544f15187829a704a240706bc04a65dad4bbfeca32444050abb1a5a8c50ccb9365d261cf71149498d1ca408bb77d SHA512 2becdd6f6be00de309467fee1478bec75bc6fa7d8d233b0a5bc8e6124f780add705d549209c842c3cd621bc8931a8ecdecb5a2902ab369bcd476939580bec41a
-DIST kinfocenter-5.22.3.tar.xz 1163596 BLAKE2B 6f06e31189109009873cf71716ee3e3fb3cb6dce246d133fee224d2739ebb40441af72d1e7e5b18078a61aecc9d56d00f82140d64bc43e0e1fe89ee824144ccb SHA512 2b33573ff3091167175df7ecb907df9c43d720dbf0776a65126f028d093cc330d887554b37c8e1e99e8f24f75e7552ec154830fe10c61ba52617acd6cd960bd0
 DIST kinfocenter-5.22.4.tar.xz 1164096 BLAKE2B ad384dfdf35c237075e2e25ac08eea1fafcfabb3bd28f72a452ff9a770577f416af52564aad9911e4d1282988512889864f20abd7f1a27e15c35f55d9d7a2953 SHA512 cb48dbe47e8d65441ba59fa1617a685218482a13099dc83667a37cfa512e0db2f0dbb954e26055926dede8ec52eebfe60312471b735b3abd1f229c3286979b14
 EBUILD kinfocenter-5.21.5.ebuild 2536 BLAKE2B cf5f5a7b0b5a934a88790f0ab564f1a0398bfe4ca94369aa1c0756e7e9846784175a0835f8062fc29ded31bb2c7254a44e47a9795ee129e07e0ff2e428641e4d SHA512 31c09305eb04dbcdd90b9c5436ce5175024ab6649085bf6f0f825bd48646ca119b6ffd86a5fddb897dc055a3c47d17bb07bfa369ea25a76aac80cf3bad0440ab
-EBUILD kinfocenter-5.22.3.ebuild 2607 BLAKE2B 807490cc08ade274e90bd2b324887fbb1de1886367071de479d937076765d42c732d8c4f94ce140cc920eadd8e664d92c11be8394ae3779e1231493560c7f729 SHA512 4dd529cdd2030276bcf201c27af789ff423b37a3918e8e8bef72c506483942fd2365ac913a48eff3a982054e49e1964c1b3c33847c3bf29148c801dadb3f141b
-EBUILD kinfocenter-5.22.4.ebuild 2607 BLAKE2B 807490cc08ade274e90bd2b324887fbb1de1886367071de479d937076765d42c732d8c4f94ce140cc920eadd8e664d92c11be8394ae3779e1231493560c7f729 SHA512 4dd529cdd2030276bcf201c27af789ff423b37a3918e8e8bef72c506483942fd2365ac913a48eff3a982054e49e1964c1b3c33847c3bf29148c801dadb3f141b
+EBUILD kinfocenter-5.22.4.ebuild 2610 BLAKE2B 33bd9f09edf507019337383c02d61580bed4b72c44465f4806d5e30215cb8ab03f9e7744dd3cdf9ed1e1b8bfcbf0b655e2bbb723ef2e356d94ba2c02bc19823e SHA512 92865b06b3411bf16ba20e3d61711d8acf640db6004f6f960c290c16682e38880ea0809b82a2e9174c50a25d6f9fd16174fc033579a5543b32dba1e57c28f0a3
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.22.3.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.22.3.ebuild
deleted file mode 100644
index 56856fb3a329..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.22.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Utility providing information about the computer hardware"
-HOMEPAGE="https://userbase.kde.org/KInfoCenter"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="gles2-only ieee1394 +opengl +pci usb wayland"
-
-REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
-
-BDEPEND=">=dev-util/cmake-3.14.3"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	x11-libs/libX11
-	gles2-only? ( media-libs/mesa[gles2] )
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		media-libs/mesa[X(+)]
-		!gles2-only? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	usb? ( virtual/libusb:1 )
-	wayland? (
-		>=kde-frameworks/kwayland-${KFMIN}:5
-		media-libs/mesa[egl]
-	)
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/systemsettings-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package ieee1394 RAW1394)
-		$(cmake_use_find_package pci PCIUTILS)
-		$(cmake_use_find_package usb USB1)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-
-	if has_version "dev-qt/qtgui[gles2-only]"; then
-		mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
-	else
-		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
-	fi
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# TODO: Make this fully obsolete by /etc/os-release
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "NFS information module" net-fs/nfs-utils
-		optfeature "Samba status information module" net-fs/samba
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.22.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.22.4.ebuild
index 56856fb3a329..40532f2226fb 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.22.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.22.4.ebuild
@@ -49,7 +49,7 @@ DEPEND="
 	usb? ( virtual/libusb:1 )
 	wayland? (
 		>=kde-frameworks/kwayland-${KFMIN}:5
-		media-libs/mesa[egl]
+		media-libs/mesa[egl(+)]
 	)
 "
 RDEPEND="${DEPEND}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 3c6784b85242..ada78e83fe87 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,7 +1,5 @@
 DIST kmenuedit-5.21.5.tar.xz 899632 BLAKE2B 8b061f883fcd8df0ab62ad8e8e2b03bba8449e43056b5def98c4c22b49454c52e9034d17cc8d6f06664e33ccedb7ce9723fe63ea72f5c3f821700a2fe7c97fc7 SHA512 a375574ac41017b033bde10d7f2bcad980b5c0758855c9787518e1f9a5185b0dbdca775f45593144fe462fe52d01001ba72e775b2b728f7a39087ffeeaae8919
-DIST kmenuedit-5.22.3.tar.xz 899324 BLAKE2B 8b4f652e46da973a038ce25324448142dd0d78e73b910a158820fa288da4300bdd690d2068d6e09c4746e4eae8d843f56804bab6157bc33c505707f5e4dd5d70 SHA512 494d5271dbd4aec40a19291d88745539949144652f8d4113744805ad87ff91cb0acff80b23632f5caeffcf8fefd17fa9bd0e609217312faedef3413aef405fdb
 DIST kmenuedit-5.22.4.tar.xz 899440 BLAKE2B 75499fa3d89bf41006f6db5c45e6c6b6957735d8fb0682e402d79c1b3c09b44ac2a8733acdc2e5e783afd5a7f021e7f1576bca4ad05cfd0b1c0f3b472c27ce71 SHA512 7a573434079cb57cd20287c37e66c666cc7d3c265d2d7e9065e2ad8f5baa58a3aa2390479f548755ee2da29a1dd25297964842f043415307c3dc0240355ec0a6
 EBUILD kmenuedit-5.21.5.ebuild 1060 BLAKE2B 9c0e66d2f8ff87c12aa71f1770f0338eafef0353733cc5e3a85629fcc3209619703717542730e712ea7827151058f366f1ca2e849c6dac844ed81f352da24888 SHA512 4734af0613b32b84d8eb38e3a4d99d0339fda1a538bab08b5471f1d69d5a2ef480d0961c5386b616b58aeb493e7a16c36e545f6b934904da28fe1df128285a8e
-EBUILD kmenuedit-5.22.3.ebuild 1063 BLAKE2B 65fceb6567d6b45683853093c7d8c4cb61d8128bf40842126abeca938d6b57ab19c11c0f9281b680814190a63e0f77e0a90f3f4317c6201f4d7e0017ab10dd4d SHA512 6d21d92d3d0ff806b37326706d163b97eaf66b7f67813f9c082662e74bbbd67037cb3984b6afeee84ca80395a7bc4488e1dd478c3a5e6ee0b5d42c20538b1c39
 EBUILD kmenuedit-5.22.4.ebuild 1063 BLAKE2B 65fceb6567d6b45683853093c7d8c4cb61d8128bf40842126abeca938d6b57ab19c11c0f9281b680814190a63e0f77e0a90f3f4317c6201f4d7e0017ab10dd4d SHA512 6d21d92d3d0ff806b37326706d163b97eaf66b7f67813f9c082662e74bbbd67037cb3984b6afeee84ca80395a7bc4488e1dd478c3a5e6ee0b5d42c20538b1c39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.22.3.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.22.3.ebuild
deleted file mode 100644
index b295b218730f..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.22.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma menu editor"
-HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 8000520f07ed..4fd0476e10ac 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,7 +1,5 @@
 DIST kscreen-5.21.5.tar.xz 114956 BLAKE2B e236b765ae57f4138feb70d9652ada33f57abd0581c1ec9a5bc826a6c31a1a5a5a6236cf55bb3a24f7a4de0a1aeb088cc62a09dd6353f126aafa04f4d3b2e73b SHA512 d57a561b22aed2301574e4af37d45046f4fbd360f8eae3465303c29a490f9dcc33a93c7e38890bd2945a4d868c23719a0ac11cfcdd22e613fc8612fa53694784
-DIST kscreen-5.22.3.tar.xz 117472 BLAKE2B 0c1fa6c4a0d257e32e454c9bf0778d864897adcddd4403b35a46e81aa155737c08c301e2527e1895ed11d6a5265d9b120a5b3828b71c6aefb14b66f4777299f0 SHA512 806c9ae9111481dced2c11cb1b7c4f12f940ecae691b5d8a47f486848adeb23fb6db19657c0544c52e0c43e1e472d5bdc7a7b08d68dbade6172b8a48605562b1
 DIST kscreen-5.22.4.tar.xz 117636 BLAKE2B 5234b01b57ea24e061c5963ae12ce0af9565ee4f0e6ca8605a8dcc44f59e1577d4aa76ece353edde34dad2beaf791b48d5b78d3dea9c1dce06853cbdff2c76aa SHA512 679dffb7b2b40433d099358ca87cf50f6f32fe646c7498cdcd02e0a6a90a00b69aaf35daf52dc4917592f67871be62cde7d90a6cbd29a3324864c5f32c6dddad
 EBUILD kscreen-5.21.5.ebuild 1225 BLAKE2B 2ca59ec61ac7ee9da79514d7201b7c312a1b00f15bfef37a534861796fb989db15eb024616e95c513bac2973586ec7c311b84187471ea9ab264aba60840e9f75 SHA512 74e702f801e6b2949a71a1195f074cb0d98bf88c10d93190e0e64512d66dc6277c95afe3e7d529a255bf949b03d6544c7d3e0bd3f11372c1317aafd7a280375e
-EBUILD kscreen-5.22.3.ebuild 1228 BLAKE2B 1674ab07aa3b0ecc2af7634455152a70a4086cfd108caba8effc4fe5fa1cc6e356b9694ae621a36442699422d10a8e34b5466bafeed42583d1c1543a72a45861 SHA512 2fa67b30793b82d4867b00128727e3f45f7fb04a4974edb09696ec10aa787a7dc0f040c2391214ee2a504bab64577dddc03b72885967f2a62c460851ee16df30
 EBUILD kscreen-5.22.4.ebuild 1228 BLAKE2B 1674ab07aa3b0ecc2af7634455152a70a4086cfd108caba8effc4fe5fa1cc6e356b9694ae621a36442699422d10a8e34b5466bafeed42583d1c1543a72a45861 SHA512 2fa67b30793b82d4867b00128727e3f45f7fb04a4974edb09696ec10aa787a7dc0f040c2391214ee2a504bab64577dddc03b72885967f2a62c460851ee16df30
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.22.3.ebuild b/kde-plasma/kscreen/kscreen-5.22.3.ebuild
deleted file mode 100644
index 43e8527e51da..000000000000
--- a/kde-plasma/kscreen/kscreen-5.22.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://invent.kde.org/plasma/kscreen"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# bug #580440, last checked 5.6.3
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsensors-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index baabdb942993..516240cacde2 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,9 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.21.5.tar.xz 117420 BLAKE2B 1727425954ee4402b8e4ce6fd05ab157597867cdfd5c6a5a4d841f5ba1723c3f0a7b056ca3bc31b48891c2edacc670595ed59677a9ee479047f5c850f4cddc27 SHA512 0ed1f1399d493f39562c3655e4f541b65c25beaeac77315af34e49f79f7dfd954099b7ab91f2eab8b1d2f5dc3be8f0a54c7d53d902bc31971bffa6b94476c8af
-DIST kscreenlocker-5.22.3.tar.xz 116924 BLAKE2B 86e98edc675b61266e56728037d4a10f295c6c3625793402c023c64dc47b5f976b502a969d719b61fc67e4c805de1d172a6304266104ad230eeddf70c4982f0c SHA512 907c23d07947045f0c2da941e0ec3220db7c7ec17c192cb659dfa2660592819ba201ba8e2e8fa2caff0ee46a9a478b0876416e8c190b2c4ec7b351840f8f7d91
 DIST kscreenlocker-5.22.4.tar.xz 117112 BLAKE2B 051996aea1fd64c17e73885f8e9ec998529fa91e8e393f06cdead569affbf6196f97d9930c3d91de68b21ce24b2dbb96248c1bd3c4c2f873215e6dd46268be99 SHA512 a49a3e7de5d90d446c336017eb94ea69b0c758097dfe074433820805551ed0d3f01dfd4eb033520b38165d4d6d216da681547801d9637e00932bec65d147ff40
 EBUILD kscreenlocker-5.21.5.ebuild 2216 BLAKE2B 7f9d583471c6863674b68ba4de62840875c592910e68ed8603e5a18c5e38968188f9e9ceac96600be1bea445fbc09d03a2e130f00a9edfbc669f3973306fa753 SHA512 0aa508fc73c7ac615df539639988a843b6dda928264309cfdc9519a7e1aa86fffe95aa05b8e14f1a20a8d2a2127287669b4891f4f687e08ec832e88f2062a51d
-EBUILD kscreenlocker-5.22.3.ebuild 2259 BLAKE2B 59f068af8cc7081fe1b2e454f21a6524bca36c806e3e02f099c5712421266ece1366d1c64d114340c73af1ffe33465a04a8855a343f51cfa462a7b704cd77e03 SHA512 62cbdcbb2aa7b21adf9d0dcad1e6761203834fb12558cea134686b50e6b368507b3f648de928eec3030d73497c745f5c74146cf80d1bf1dab7a31db1b67b5404
 EBUILD kscreenlocker-5.22.4.ebuild 2259 BLAKE2B 59f068af8cc7081fe1b2e454f21a6524bca36c806e3e02f099c5712421266ece1366d1c64d114340c73af1ffe33465a04a8855a343f51cfa462a7b704cd77e03 SHA512 62cbdcbb2aa7b21adf9d0dcad1e6761203834fb12558cea134686b50e6b368507b3f648de928eec3030d73497c745f5c74146cf80d1bf1dab7a31db1b67b5404
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.22.3.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.22.3.ebuild
deleted file mode 100644
index bf376cfd2726..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.22.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+pam"
-
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	dev-libs/wayland
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/layer-shell-qt-${PVCUT}:5
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	pam? ( sys-libs/pam )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-BDEPEND="dev-util/wayland-scanner"
-
-src_prepare() {
-	ecm_src_prepare
-	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake_use_find_package pam PAM)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	ecm_src_test
-}
-
-src_install() {
-	ecm_src_install
-
-	if use pam; then
-		newpamd "${FILESDIR}/kde.pam" kde
-		newpamd "${FILESDIR}/kde-np.pam" kde-np
-	else
-		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
-}
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 6a33bc1be076..10296df7e70a 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,8 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.21.5.tar.xz 24148 BLAKE2B 8cae47375a883948cfff373b1bf113359ce4c1d548c982dc6c9d8a9a28c16661813c1d8077f463a6ec1dc80c69b2736391c56382bf3ff2b7d2f3da24d6e64f2b SHA512 c342723383d13b8df977bb4ab3c6b50c15007d12fdd27c0e51ad41cf77bbc5ddae404a9fe10669ea22933140a55bc293e7296d8e3e488cbce36158475403d7ff
-DIST ksshaskpass-5.22.3.tar.xz 24084 BLAKE2B e906ebd788c8dd5d03ca317808d8b41096a8d7eccb97f3ee29b069d18cc95c8dd7aefb3bbfaac587df7ba239f46e22e95d68f846836d99ab7fe0ce4dc5cc3c42 SHA512 252ff146676ae4f7cf4629dec15d5f62c27c6ce1dd1c1b6742ca796cf850a03a3c64ae6d5cabedc74711f199bf99ee08971a98dbc410319132c8fe8394e8662d
 DIST ksshaskpass-5.22.4.tar.xz 24088 BLAKE2B 9a7c2a5e52d5cd166ac03dcf91f36af3b7bc6c55b1225293c6ba2c8252132ca75a9d54d3f28c9264403f8c5598bccaf29628e6c7c1b620782993e6b551b56a40 SHA512 529ff46dc3398e954b2a885fbe14c735b7ff2eb3827797dfb27708624cb5b3aa85064f2ff2924167db80c7515b6a70f1cf1c7fb72f5aabe6d4beb9e5f8a9c1d4
 EBUILD ksshaskpass-5.21.5.ebuild 1433 BLAKE2B 9d3692f5a819276620547d5220e654609fb1c0f4d4f31c4372ddd61f15cb41b46b742c105b4035c942dcb1331a44f7f99949e6868619fbbb48fbbfc387ff97c1 SHA512 c29fb24b6f166089ca64e802cee20897cc557caa92142402bd0fb25c70ce5161540463e3518874b6b3a56e878cbf51886bb078dc37d378a5da0f2317a86ebd31
-EBUILD ksshaskpass-5.22.3.ebuild 1436 BLAKE2B 1d0d2ba232fff79afc46f1ae3a4f582d599b00ef13aa2655d3a6c30523491be63e01d35c578607d2a37182ce397623058a4d49e2675c45275f834fc60ff0d531 SHA512 592d1e743b30fc37464145d8de78126a2806bc39fa6ceccb7535e863b69cb3b3e35d30e4050fca34e33a779b42d08a8b9cdb2cf8a136e16a8d9de21f8985b3b3
 EBUILD ksshaskpass-5.22.4.ebuild 1436 BLAKE2B 1d0d2ba232fff79afc46f1ae3a4f582d599b00ef13aa2655d3a6c30523491be63e01d35c578607d2a37182ce397623058a4d49e2675c45275f834fc60ff0d531 SHA512 592d1e743b30fc37464145d8de78126a2806bc39fa6ceccb7535e863b69cb3b3e35d30e4050fca34e33a779b42d08a8b9cdb2cf8a136e16a8d9de21f8985b3b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.22.3.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.22.3.ebuild
deleted file mode 100644
index 696527628879..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.22.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
-HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	ecm_src_install
-
-	insinto /etc/xdg/plasma-workspace/env/
-	doins "${FILESDIR}/05-ksshaskpass.sh"
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	elog "In order to have ssh-agent start with Plasma 5,"
-	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
-	elog "and uncomment the lines enabling ssh-agent."
-	elog
-	elog "If you do so, do not forget to uncomment the respective"
-	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-	elog "to properly kill the agent when the session ends."
-	elog
-	elog "${PN} has been installed as your default askpass application"
-	elog "for Plasma 5 sessions."
-	elog "If that's not desired, select the one you want to use in"
-	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
-
-	# Clean up pre-5.17.4 dirs
-	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
-}
diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest
index 9beddc8f7770..5197873d6693 100644
--- a/kde-plasma/ksystemstats/Manifest
+++ b/kde-plasma/ksystemstats/Manifest
@@ -1,5 +1,3 @@
-DIST ksystemstats-5.22.3.tar.xz 86184 BLAKE2B 5dd782905e690fd3c37c8a3f5e7a34166923239645e013d03fa69fef5a3d18fa036f2b18a170518fd8d964f69ed84ff51107a0e874e1e5fa491f3cff81237e43 SHA512 554873e08a4b16b1bd8db01fcaa2a547b6386d4ee859d345582c3c358f1a9dd42ef7ce15d2c46a36240bc5742cf31f1e2fbd07ecf33bcbd03db8c0a503f192cf
 DIST ksystemstats-5.22.4.tar.xz 86220 BLAKE2B 51c83e61f2745c8c7132380a6c061d4a88d82890ef8f793881b4ecc2291899773b75435bf4fb73b8d1864e0601433721e03ee4ce265ae5721c49b747b55402a0 SHA512 e7b1d936971b4d2654436444d6ca02bc95852f5bafd167a21f14487af689d50efb9fabaead121f54685f42c6a4c585de3f91e1a9c68da2fcbd6571c88b4addd7
-EBUILD ksystemstats-5.22.3.ebuild 1115 BLAKE2B 365d1f71b3d42c0386ab609ae826bab18522c0f9bbf8a7efb2c94262d218a08108411d917e1ebe5f70a696e2b9da6b6187038a306e4d05c372036bc553d6dc7d SHA512 4749e47e3e121d9f1160a5ff4e29549e248086edf1da85e7cf5de775dfe4a820ebc752e797a8fcb2568abd441e9d93aff01aa4933c61b405662cb32a611ae809
 EBUILD ksystemstats-5.22.4.ebuild 1115 BLAKE2B 365d1f71b3d42c0386ab609ae826bab18522c0f9bbf8a7efb2c94262d218a08108411d917e1ebe5f70a696e2b9da6b6187038a306e4d05c372036bc553d6dc7d SHA512 4749e47e3e121d9f1160a5ff4e29549e248086edf1da85e7cf5de775dfe4a820ebc752e797a8fcb2568abd441e9d93aff01aa4933c61b405662cb32a611ae809
 MISC metadata.xml 398 BLAKE2B 74e96ef19d58955480eed6562f9be453b43dbad78933240fc7df76c762fbafc4e5902c59f4d26506d50c3fe60239846f51da362644fea0db6922aa5b7e977160 SHA512 85822c8e59b902ec140f8566b3451fdd8c9871477eedc610762a1504084db6908c7e673d882e1de522f319a42b340431605e4066a9b23ef8d79b2a9b79fe7c28
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.22.3.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.22.3.ebuild
deleted file mode 100644
index a8dabfc8203e..000000000000
--- a/kde-plasma/ksystemstats/ksystemstats-5.22.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plugin-based system monitoring daemon"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="lm-sensors networkmanager"
-
-DEPEND="
-	dev-libs/libnl:3
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	net-libs/libpcap
-	sys-libs/libcap
-	virtual/libudev:=
-	lm-sensors? ( sys-apps/lm-sensors:= )
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	!<kde-plasma/ksysguard-5.21.90:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package lm-sensors Sensors)
-		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 8b07f34225ea..16e12fecfef7 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,7 +1,5 @@
 DIST kwallet-pam-5.21.5.tar.xz 19916 BLAKE2B ee0efa7448f7f7d599e83d9a923909fe0de965aa48a8e505b984a5cb54d16c20b3f2f57efb83cd887545e23c3aa9ac4a70c14e9173fff263190c8de5c2c9449f SHA512 4dab0ac4500c6ec01fef71e2197e59afb39c318dfe1e5727832fed2137b5d961bb1aad9c52d356346794ac1dd9e9451f507032aab29028806d9c04c3c566738d
-DIST kwallet-pam-5.22.3.tar.xz 20140 BLAKE2B 7b8199803be8d841b51149e9e816d798b3d5ad103ed2d5ab85d31e094b86f772ce162c9d1cdf308e2a9511d95a746d914bdb48a3dbfdea97151191bc5b5031c6 SHA512 642306eb23cd823e11412c5ba7502ae5a2e15fe419b6b540155bb67aebefabad66923b99b371b89ae20fa3ae894ddf5d3c09b6df55e0fea44658bbc7c8a8ad22
 DIST kwallet-pam-5.22.4.tar.xz 20144 BLAKE2B 638876d0e0f5fc12bc6de5657c78fe9c0ffe331d3432e95617dc6b74f9f257483998ee98f37a62a88562c526f51525d3ad8fd8fee110f9b663142bf058468058 SHA512 ae2a3c2e71a62b090b5fc5cb46c13d719f234496e9603fed54eb0c63e9b3174e4b42f98fd8fcf11d16e9c55fbdab7dc00091ebe0743d90c9ea7985986351e63d
 EBUILD kwallet-pam-5.21.5.ebuild 731 BLAKE2B d7380ef4185c0d9cc3a0ffdf5e36848292e083c2b20821a27ba50d9f46fd0ff2c2a03f4139d28a47a614c5f753c915c23fc47cf0d592a5330dc2bc1fb6b83d1c SHA512 ba1b94ad19d2cc0724ab7a72c04bf18307577e29d3ce8b0effc561f5323b6a9159360c39cfe121b4a3ce2e0c89514c40e097c504e9500b6776761e40b1efc422
-EBUILD kwallet-pam-5.22.3.ebuild 734 BLAKE2B a526f6380a350610992b1b88f1114f4f81ad8b919fa785c421a9c849457b9eaeaabc463c687bc41afbdc8d5a95d98099fe485868ce42e210ae2220fa953453a9 SHA512 762a7bd7e8778a7070b9f8f151cd3f277f18b35528b51be9b6b7f9558fd2b38dfa40c55b3bc56cefd6e00fb6398f0c68498214bab40bda8ecc6ba1f9a0518874
 EBUILD kwallet-pam-5.22.4.ebuild 734 BLAKE2B a526f6380a350610992b1b88f1114f4f81ad8b919fa785c421a9c849457b9eaeaabc463c687bc41afbdc8d5a95d98099fe485868ce42e210ae2220fa953453a9 SHA512 762a7bd7e8778a7070b9f8f151cd3f277f18b35528b51be9b6b7f9558fd2b38dfa40c55b3bc56cefd6e00fb6398f0c68498214bab40bda8ecc6ba1f9a0518874
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.22.3.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.22.3.ebuild
deleted file mode 100644
index 852aef5a0d46..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.22.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-inherit ecm kde.org
-
-DESCRIPTION="PAM module to not enter KWallet password again after login"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	sys-libs/pam
-"
-RDEPEND="${DEPEND}
-	net-misc/socat
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
-}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index c15fec4a422d..41c743dae54b 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,7 +1,5 @@
 DIST kwayland-integration-5.21.5.tar.xz 23336 BLAKE2B 361160eff499863787d997f7eabd9dc7acfa5e9831de700cb1fbe6a4a5f10795b9435a505ff7af40eae4e473826fefda275ad8dc15efb6ac609788d9c85b25da SHA512 87e1d71f8a18ebbaadfb76a7e2bdfb47933a500d3cccb589f697e2b368302f3b8c61a0e742cd436119adb3a885aa6d94b8d522befe2908fb2b3816def93bb282
-DIST kwayland-integration-5.22.3.tar.xz 22772 BLAKE2B 5b60f3d77f0f206caff08978d4713990c089f8cd0882ff84ea2227c4c1df1b779be986c0bd949a2cdd856082ea9ddf73dbac651d6aee68db5f4a36c78d6f0d64 SHA512 8cf845c5b07028b48d02f4614af54f4b9f25dc5e3cf8a2e7a94c0f896ff64a99698e455052992c8ed3d2fa4e31947bc132689de6ae0b49ed8b59c85af1d11897
 DIST kwayland-integration-5.22.4.tar.xz 22764 BLAKE2B 3dc035adcdf0342801a20a9651153536db81ebb8ac3313ace32f6e7f12c99a07ce61adcf0979ee749782020f1bf02bb845a9e62cbb46463052ed32049cf095c2 SHA512 ead1dd4e74bc4c0d53973a52dda86750448f4b3af5c41655d073079c5b6ec42d98a1d7fe19fd0d7fb3d232ffc3c8372060b3273c1265d0a66250d78030e5682a
 EBUILD kwayland-integration-5.21.5.ebuild 699 BLAKE2B b70d306f6debb66c8bfbd0aa3910bc109ce2dd525415ac6e7328f00307cc0aa24a201dfc5f5bd90afcc8cfb0b9582b9dbb48e7b860ae58e6af7a9262a3c51fa8 SHA512 61bf8a5a4c0fa9b5087797e579d4fd2682a21fd9a4e1bdb26c5086282345741df85cf1a264acfc4f309e466b36093a325a1f6954955182c4bacf733868dc0bad
-EBUILD kwayland-integration-5.22.3.ebuild 702 BLAKE2B 6c080feff3e03ea7187872b7bfe28166177b73474cfeac8c31ed88a33f6b5a7b71f9af36629a1dd78c14f2e2dc1b0ab8ad9a5e007230644a573eb48c1eb2cb86 SHA512 a05f520a7770d48e29b792d0a5aec0d8398da70d02b0ebf4745d38753bbeac8e2ed64b95031d60672a6f60e9c6c0cd5a51527599d5dc5005ff99a37ccb5be634
 EBUILD kwayland-integration-5.22.4.ebuild 702 BLAKE2B 6c080feff3e03ea7187872b7bfe28166177b73474cfeac8c31ed88a33f6b5a7b71f9af36629a1dd78c14f2e2dc1b0ab8ad9a5e007230644a573eb48c1eb2cb86 SHA512 a05f520a7770d48e29b792d0a5aec0d8398da70d02b0ebf4745d38753bbeac8e2ed64b95031d60672a6f60e9c6c0cd5a51527599d5dc5005ff99a37ccb5be634
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.22.3.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.22.3.ebuild
deleted file mode 100644
index c999b25b427b..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.22.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT+=" test" # bug 668872
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index ff8644d7f852..8a42c098dfce 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,7 +1,5 @@
 DIST kwayland-server-5.21.5.tar.xz 219148 BLAKE2B bae7a3a82a7251c249a8d36ffbab764c6f3372675605310f2c46d977f8a8a6f192b551b7adea590b253c64af1e22e2e8bec8671065a389396def35c83fcbe39f SHA512 ff02ee6b1fb7cd193b49a4cbcf98a6b3ab6262e9da4211d91b764d8aaaa858c17863fccee19b649d2966c3a2721ca3b7c55f8a660a91d9eb56b1eec11d0766f5
-DIST kwayland-server-5.22.3.tar.xz 219048 BLAKE2B d90ea0889909d0a80f3853b20278202eec6cbaf06487a261dc9d75573fd9d32232582cdeb8dd726ffa217e4ecc5afaf4ad168939d2ed1bbf62eaa11f87dafd37 SHA512 cbc9e283f68c66e28d449ad057b6ad722f98be9e60c2755353ca35344bb619939ead9c90c25d57d45bf5937007987ccde748ac5af2f77535397689cbf6c8d6b1
 DIST kwayland-server-5.22.4.tar.xz 218984 BLAKE2B a3670ea03eb92346f20f509312d87e088b017132f5efb17b3899dac97a55270ff00af1a7fcfbe64f876078845e7aaf5faad505b242d5ab42213cbc2622a05a92 SHA512 70fa5911a6a1e14691348875024455eb74b2e814921fa0e3560ccc97469b23e6b2c8885aebd6ad866851af626c9a2edd02fdc61e2fcfa1d55d3a7b824dd6e934
 EBUILD kwayland-server-5.21.5.ebuild 818 BLAKE2B 37c065491c6eae784d1329e77d80279d8341c90ad74a2724a68cdf6972ddd653bb177def7bb18ce7bd3d8bab348fd2dc24f3a475a2da03f419ace42c029246e9 SHA512 6c2ff07507d57f8687b72e952a4e3e1633b70211a5cf1cbb99038203cd21b642a808bf506df786273f125c1fb7d0559179ae890f5107e358e07c362609b97255
-EBUILD kwayland-server-5.22.3.ebuild 821 BLAKE2B 115e6b3c57d5f9995ef852eedc12501ea2a06842882d101863d18cbb215146732d90e165a2c484c70318712c6140b0800f0b24500129c787ab48c7ec820dc15c SHA512 eb28b01292fa642b80c986f3a36c96631a7bc1e99d5ec46c2e664a30a4f936128976074c70710e56ed85330bfd31166463545fca4847726bba7322448a912553
-EBUILD kwayland-server-5.22.4.ebuild 821 BLAKE2B 115e6b3c57d5f9995ef852eedc12501ea2a06842882d101863d18cbb215146732d90e165a2c484c70318712c6140b0800f0b24500129c787ab48c7ec820dc15c SHA512 eb28b01292fa642b80c986f3a36c96631a7bc1e99d5ec46c2e664a30a4f936128976074c70710e56ed85330bfd31166463545fca4847726bba7322448a912553
+EBUILD kwayland-server-5.22.4.ebuild 824 BLAKE2B cbccc4b5834e3c6c7612c3482f0c3aa2dd9f523658d4777ea82356249779c8f26355b360712b6d81b6b15009beda3d33c6ed706386e5c0b0d88609c75d69cdd4 SHA512 56dd2281607a609277f8773f1a21eaf45e046899c03d2fbb54fe4d14278f8eb482284c7a88612ac9893102b28dd917968acfb127739425fcc3b8b1c87829ae05
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.22.3.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.22.3.ebuild
deleted file mode 100644
index 428f62c44d5a..000000000000
--- a/kde-plasma/kwayland-server/kwayland-server-5.22.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Wayland Server Components built on KDE Frameworks"
-HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
-
-RDEPEND="
-	>=dev-libs/wayland-1.19.0
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[egl]
-	>=dev-qt/qtwayland-${QTMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	media-libs/mesa[egl]
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.3.0
-	>=dev-libs/wayland-protocols-1.18
-"
-BDEPEND="dev-util/wayland-scanner"
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.22.4.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.22.4.ebuild
index 428f62c44d5a..c88866eebb12 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.22.4.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.22.4.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5[egl]
 	>=dev-qt/qtwayland-${QTMIN}:5
 	>=kde-frameworks/kwayland-${KFMIN}:5
-	media-libs/mesa[egl]
+	media-libs/mesa[egl(+)]
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/plasma-wayland-protocols-1.3.0
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 52d35ea977ad..3fb365eaaa6a 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,9 +1,7 @@
 AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8cca39a03f932ef23780c9d5f1104bdac665744dd03878a5b7f1ccc20dccab42facb8d97474c31548b602db0debb27e5490ac76e SHA512 2b1de2ceeeed51bcc691273caea969243ef08ced929030daa94c0f19bad2fb31a507e3efbb9018833a8bd3b66850380dfbefb9018fa39e00664a1295b9482183
 AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
 DIST kwin-5.21.5.tar.xz 6394220 BLAKE2B 8a0b1ba6e1393ccd721ef8dcb925739a91ba08528ac2f61a5908b37372ade83496b3fe2dbbd9093727a12ffca35d5aac607d8888454519d33b0c924c9d030bd1 SHA512 b749892b12b027b306836bbd7b770602bff80c0ce6840db3345585a1215b415fe24fb823bbcb399f76999232f100bb2e1898d460160e1a762ea10fd24d6cf63c
-DIST kwin-5.22.3.tar.xz 6446712 BLAKE2B bcd06261e964736a5a2a504cc9e46750e4be2c2741126f922c46907b123076925470d96f58c1cca33b5ba89b4a24c8400d3959982089c27b7c1b48a0bc6a8efd SHA512 b22e815777888f9f7c673c1b3925b9099cfafc8d41a5e302ffb8bafc1915a9632892af2368f0b9098bee089827628aa42648e4a91c994bc79488002b0e205fec
 DIST kwin-5.22.4.tar.xz 6454932 BLAKE2B fb8a45124d28daff1011995c0e9a29365309afb4c2b6a42d9f9a65e24f5672adf160e0b06a2084d04130fe5ce42ac3fecdfb36e8d02f18eadd916f6d9e69636c SHA512 3be48794b8a6ae1c8b932f1b1e7db74138bd5e1edc32aa86bb6a1f51a109d20d72449d30fddcdca9d026a4c99be564a06a0a5064a51124b8073542ad5c3df8e4
 EBUILD kwin-5.21.5.ebuild 3982 BLAKE2B f311f212416378470e03db3f66ae92e3f714eaf93c7ae1ea5d9b4e5c02452efe7159cd73622f18249ef1d5be66f742442300699397ac3402f5bb249b8a79597c SHA512 9a86af01a4fcfe940114f594ce02486916c0ffb05e2a185fd9390a48b044e5ad29590795552fe3e474f838481e62ecc31e2b0a82b200ce75d8c6000156fd8a6d
-EBUILD kwin-5.22.3.ebuild 3964 BLAKE2B 7008e72f0d8a2fa8aca060fbf8206111696abaa6191cafe098dbbed3d7095fb652d985f23555d28c2533eee12122c26b55418ed85f90bbfb51233e6c5e88d7b0 SHA512 d5e4d21d4ee03752b582b1b6067938b7b658e9d00e90a92439470dc9d0a6f14c743825beb9996f24633b1fabf5bc2d596c5494f78ca288b3bc52c720b8e0cead
-EBUILD kwin-5.22.4.ebuild 3964 BLAKE2B 7008e72f0d8a2fa8aca060fbf8206111696abaa6191cafe098dbbed3d7095fb652d985f23555d28c2533eee12122c26b55418ed85f90bbfb51233e6c5e88d7b0 SHA512 d5e4d21d4ee03752b582b1b6067938b7b658e9d00e90a92439470dc9d0a6f14c743825beb9996f24633b1fabf5bc2d596c5494f78ca288b3bc52c720b8e0cead
+EBUILD kwin-5.22.4.ebuild 3970 BLAKE2B f2085c87ea0d549e016750ff85a30ed4a116403745e90c89948454903e7581188580364b5f413fe030e8d3c48e98db6bf5f1d584690f6be1deb7e4788303c214 SHA512 f3c5279c53a951a9f8bb7e30db3db05b6e215aa746d1b11cc001458f13ac0b95d42c5dc2eb2eb61339d4fbe0bd2d8dbd2e6da74382326ac1ead1753c6c66139b
 MISC metadata.xml 443 BLAKE2B e972639d031b3e32681af007b9d5daa44167bdbcb9b83ff557e7bcde84b588403240021f8880eb1cc852fbae37d9e8c5ffb392fa1aff19f2075d32876f5082af SHA512 cf0743ac8f3ed8a2ec354653cfbec6bbd5ef191227e46d5d56119f7c0b3ac5a388cfef44f7ce5f2ba9079f3eee897b29b52b726f4e99ee50e29cbb584ed19b3c
diff --git a/kde-plasma/kwin/kwin-5.22.3.ebuild b/kde-plasma/kwin/kwin-5.22.3.ebuild
deleted file mode 100644
index 5042d737e0ee..000000000000
--- a/kde-plasma/kwin/kwin-5.22.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="accessibility caps gles2-only multimedia plasma screencast"
-
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	>=dev-libs/libinput-1.14
-	>=dev-libs/wayland-1.2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwayland-server-${PVCUT}:5
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/lcms:2
-	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,wayland,X(+)]
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.7.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	accessibility? ( media-libs/libqaccessibilityclient:5 )
-	caps? ( sys-libs/libcap )
-	gles2-only? ( media-libs/mesa[gles2] )
-	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-"
-# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-	test? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-qt/qtwayland-${QTMIN}:5
-	)
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" \
-			-i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package accessibility QAccessibilityClient)
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package plasma KF5Runner)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	optfeature "color management support" x11-misc/colord
-	elog
-	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
-	elog "windows to the end of the list was changed so that it remains in the"
-	elog "original order. To revert to the well established behavior:"
-	elog
-	elog " - Edit ~/.config/kwinrc"
-	elog " - Find [TabBox] section"
-	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
-}
diff --git a/kde-plasma/kwin/kwin-5.22.4.ebuild b/kde-plasma/kwin/kwin-5.22.4.ebuild
index 5042d737e0ee..44d95b984762 100644
--- a/kde-plasma/kwin/kwin-5.22.4.ebuild
+++ b/kde-plasma/kwin/kwin-5.22.4.ebuild
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 	media-libs/freetype
 	media-libs/lcms:2
 	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,wayland,X(+)]
+	media-libs/mesa[egl(+),gbm(+),wayland,X(+)]
 	virtual/libudev:=
 	x11-libs/libX11
 	x11-libs/libXi
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 43e3f0e7bb64..f7af83487341 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,7 +1,5 @@
 DIST kwrited-5.21.5.tar.xz 20420 BLAKE2B f761da00c5025e5f9fb11b519ba5fc057ed24366206e421683ff281255d1d5ccac7ee2c33898654f33621d39e119fd16fd8d73a6cbe338af450222ffd421a82b SHA512 b187763675cfa386ef51ff6f5bb59458d799c2010d93fd35ad0fa32c1d0898d35927eb77d82dcdfa079bbd1c8c889823cc802742016d767618e6e9e25ac417fe
-DIST kwrited-5.22.3.tar.xz 20468 BLAKE2B 8bf77632d7a98b11c65a360b232788462c67169d7d157253912b5dfcc0717abb5c67aaf665178658d45d5c16551a25d42a3be1e0a70328611ba51e3d9fa84d3e SHA512 8da0305fd3de91d25e7abd8f4523c3b336e2a589242538dcf4c810e1b40690cffcdd02ceadf43599590ba33e6de4cc2acdcad33b65f6bee5c4b425e98d3c1eef
 DIST kwrited-5.22.4.tar.xz 20512 BLAKE2B 73e80fdf3fa7fd0e54b8c577b92c8e12187d4c1f64bd10918833a978142bbaa5795a403fb7d72487f51ea785ba6bbb6b11f33617bcca18ebdbeccf6236dd0490 SHA512 ca214b579e623ae96f594a0940a78dc1bdb2460f5295032ba8bf73b7990cb231a44476f025fd3ee85b15434b8ecc3251f3278dcaba6bbb7c504edc56c706155e
 EBUILD kwrited-5.21.5.ebuild 592 BLAKE2B 0756a5820fed7a1dacfbc6c3ba7ca8bafd62c1531a693536b6a4924cff98168d216c50946af0a098c4cbc9a12c53926260b1f0f544c0a46ce8b38bc0e2101f89 SHA512 24525654fbabc2987d8f187c3be98a817e23b81facd783b77debcebd41a373f75dbfeacec7bfc4e2a1a1ac72b2f3314ecfd5a12940c7e42f1296f2b9bc5428f6
-EBUILD kwrited-5.22.3.ebuild 595 BLAKE2B 312df57a2d2d12db465e13df5ae9ff450187f65824e74f4e88acd9f4a1a42573e30268499d665814d851b9adf1b14802f736a1e587d19eb78286b32cf292d84b SHA512 7a818ac5188f37260dba64a2e97fd0cfe5130ccdfe465c8e00c9b9564adbcceed72e13f01d34376555f0bf961c6419911905caba7047e791b6af3ac3de0004f6
 EBUILD kwrited-5.22.4.ebuild 595 BLAKE2B 312df57a2d2d12db465e13df5ae9ff450187f65824e74f4e88acd9f4a1a42573e30268499d665814d851b9adf1b14802f736a1e587d19eb78286b32cf292d84b SHA512 7a818ac5188f37260dba64a2e97fd0cfe5130ccdfe465c8e00c9b9564adbcceed72e13f01d34376555f0bf961c6419911905caba7047e791b6af3ac3de0004f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.22.3.ebuild b/kde-plasma/kwrited/kwrited-5.22.3.ebuild
deleted file mode 100644
index 7e9879485783..000000000000
--- a/kde-plasma/kwrited/kwrited-5.22.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
index f8b46a3849e4..f51c74ded9be 100644
--- a/kde-plasma/layer-shell-qt/Manifest
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -1,5 +1,3 @@
-DIST layer-shell-qt-5.22.3.tar.xz 17616 BLAKE2B fd9de73da7cd2e60c3fef5dea6b63308d250bc9f1c50515c46d5217990e15873dbca28b2bd291135040e79c7faad0e5cc2d67b64e1f08dd5c93a081b1a47e02d SHA512 cb6b89420fe29da4f39b3be4aa603990d3440cee6e5ee919d128031d7515824fda6e95e4feb832085e7e48edfb9b55ca8768758cfdb961bcb19f9076989e51dd
 DIST layer-shell-qt-5.22.4.tar.xz 17620 BLAKE2B bcf8d1b0e56c2ad6d757d4632bbc3034bbb3fac81b876b84793ce4d1419fc61fa85efb7723c6826170163f2dee2e5b76a552d2ad8d49bedf99e325382d30eb13 SHA512 5786493195f524068ab55258a252d7d4cac2ef92d074ac9a57346ddebdf259a33959ba7093cd9ad1caf06cab52bae362054999e16fff48485c3daa418507afc2
-EBUILD layer-shell-qt-5.22.3.ebuild 609 BLAKE2B 3946cc53fb4db09f8d0160e1addb8f81460d9376f0582032b43895dc6b070c926df93dffc4f129ebf1d2693c95ee5de807eafaf54274c90ff8648f081b35e80b SHA512 daa0f91e10d7cf084f3e07debca99200fd6b23752a182a4124d701f256054f006d5fdc1c5e547f47a9fe1865450027fb1afb66124f297f13ebb45bb12b5d6a00
 EBUILD layer-shell-qt-5.22.4.ebuild 609 BLAKE2B 3946cc53fb4db09f8d0160e1addb8f81460d9376f0582032b43895dc6b070c926df93dffc4f129ebf1d2693c95ee5de807eafaf54274c90ff8648f081b35e80b SHA512 daa0f91e10d7cf084f3e07debca99200fd6b23752a182a4124d701f256054f006d5fdc1c5e547f47a9fe1865450027fb1afb66124f297f13ebb45bb12b5d6a00
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.3.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.3.ebuild
deleted file mode 100644
index bb5a21f13cb1..000000000000
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-shell protocol"
-
-LICENSE="LGPL-3+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/wayland-1.15
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[X]
-	>=dev-qt/qtwayland-${QTMIN}:5
-	x11-libs/libxkbcommon
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.1.1
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 9c4a4a18d41e..f8290ff9da3e 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,7 +1,5 @@
 DIST libkscreen-5.21.5.tar.xz 84600 BLAKE2B a7f14446932a9e4bdd0d7d90c02916380b7f263e14c3e49d30932a2c2de50046a46b6644a24697e6f94d5e72062f17ff66a1496ca61fa65c53cde349a0b4421f SHA512 283d4cac77f106d24f6eef0ba6f7a7490aff87ef5017b2db7e52ca5fd3066a33ee4e40a190cdb4e26903a79defaa724ee0a3df360464af3f76c3386c341d2d75
-DIST libkscreen-5.22.3.tar.xz 95416 BLAKE2B ecde8ca77eb4afe35c077d5b875d26241f1891d53c34e830aa41279a8b4c19994c82a6c97af4e38c862983b2db6b5397f5b8f93210e6cd62c789390b94172fd0 SHA512 da01aff67c282acbc7b63871e3cc1e67908d0a11e322d5dd9a233075c665ba4844be24b5ab7a3218217b695408b25fc8dd3a87c8632569b9e60d1af10d2e3599
 DIST libkscreen-5.22.4.tar.xz 95416 BLAKE2B 45046040e1f549ad6f1488b0af7b19fb29be7d0c01d0d6d9d02a5c2107ce5ac765717c05b2fef92d671414ace673bb508a8f50af52fc87b020c207f1cbba5346 SHA512 464e84ac1fe65092b7286a33ebf0adfbc144581555a1c1ff7b1c0335e39ed649a06487cad913d7cb5b53a8c7616db98391a04734a02530b24a01f592bd9fd3ad
 EBUILD libkscreen-5.21.5.ebuild 647 BLAKE2B 214676fb4fa3d3cd9dc4918ff516a3743e5596a1e048294cf658a7219bacf4f917cd95fb7bf0aa63c9172b8e84e2da2852e9fd953c15f7750a2b13f0cbc3a1fd SHA512 398b080163d6a5962981697994c1ffca9fde92d2f9bb16dab66f3779e2ed40644fd2cf55602da6121cc777d65bac3154d791f668d8dfb1580209841a9332d8be
-EBUILD libkscreen-5.22.3.ebuild 657 BLAKE2B 0c099be61a74fc38df1307bc8b4ffbe0b92871d38324ff8f91643b67c4efa0c59906b3a11ffc53363749e48fa3a3dc326c452ce44162748b724718aa99588d23 SHA512 b3d4ac988a656f216b84558602d8c4bd9ed739f615656cd53dfb276491b09c4a78cb68f13cb1236989b9ab7725bd543358855e669992e3aa964f1def20084129
 EBUILD libkscreen-5.22.4.ebuild 657 BLAKE2B 0c099be61a74fc38df1307bc8b4ffbe0b92871d38324ff8f91643b67c4efa0c59906b3a11ffc53363749e48fa3a3dc326c452ce44162748b724718aa99588d23 SHA512 b3d4ac988a656f216b84558602d8c4bd9ed739f615656cd53dfb276491b09c4a78cb68f13cb1236989b9ab7725bd543358855e669992e3aa964f1def20084129
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.22.3.ebuild b/kde-plasma/libkscreen/libkscreen-5.22.3.ebuild
deleted file mode 100644
index 83d839047e08..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.22.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma screen management library"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-# requires running session
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 9b3387f32164..57ae27dc0847 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,8 +1,6 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
 DIST libksysguard-5.21.5.tar.xz 706172 BLAKE2B 776c9ae2c79ab644ee377ff76fa3d3ef41da15431bc628aa6e2f14a3914212566797c779c8aac7f0a0df3e89fe55bb748558fa56e5a3aa516535e59b5a53006f SHA512 1626f9489e0bdff3acad087577470818bd04d6d74d6afe95b11d02ecfe306328b3898a573704c11b0a34e73ec7a662b9c609b056be369694769a3dc2e6671fec
-DIST libksysguard-5.22.3.tar.xz 737164 BLAKE2B 9285ac7dc4eee38d95827c64acc7129e11c67c427236fa53e350fab5341cbf2bf30536b3102c919374126e7ee567fcf807e8858e4647e5d15405995fc909c7bf SHA512 5913df153aab821f085e4409fc84eb316ee732f41a2daecf5baa269745990a2256de03aeb5fdd89dd10a53ce490b0051d16721fdcdb1c25e28894148ddf09d10
 DIST libksysguard-5.22.4.tar.xz 737212 BLAKE2B 437906819fbe2e8c1bf4377bff5f1cb6ebe87008c7e147f8a5eae89fbed4a86c64cdf0adc5ecff76c891d3253b3f19376313920d8d16a7a03efbe7ba28ec4b7f SHA512 68eab307512b6c4c5793c3baaf1ec38c5cff82cc5c4f75fba26a6605c89f438bbeb959e55ef8226d50a09f0b796dde83ae77db00aad13efc63cad24fee2f5d49
 EBUILD libksysguard-5.21.5.ebuild 1689 BLAKE2B 25ba7ecd1b6590393450d4909d53064ee5c9b72f9ee28a2b58312293138dfdf4fc19be0060024876240ec00ea65f2d8d648c6c8602ad296d14b984314d8b3a15 SHA512 93a8decd5e9ab4e627b48cf57ec61a089dd7a81dd2f69433c3f0dbd2dae5a2627fceccbd0147b5240ee94d69b10ee5494281f41b65d12e7651d0470dc119baab
-EBUILD libksysguard-5.22.3.ebuild 1799 BLAKE2B a3c8f0962da5edc571094c092ee7e06be95cc13588ca103a2607bcd51b8488f8d8b740e905be0bab23731d12027e47c7e5c7de7fabfdff82bf28ede84f3c7a76 SHA512 c33a6420905cda7fec75ccf96d79b3e0afe63e18914988601a8c11a215a08b81f82f4ee16ace52d9b37b766b53058f790798029a3bd144c3154b9827737afcf7
 EBUILD libksysguard-5.22.4.ebuild 1799 BLAKE2B a3c8f0962da5edc571094c092ee7e06be95cc13588ca103a2607bcd51b8488f8d8b740e905be0bab23731d12027e47c7e5c7de7fabfdff82bf28ede84f3c7a76 SHA512 c33a6420905cda7fec75ccf96d79b3e0afe63e18914988601a8c11a215a08b81f82f4ee16ace52d9b37b766b53058f790798029a3bd144c3154b9827737afcf7
 MISC metadata.xml 542 BLAKE2B ff3326f819a0324fdc3ab339c3172f91d1fabd5eae8faffdb3b3bcbaab2a73fb3882e57db5fb6bdb669b5ff3338fc8b3ccc63b771255e527c7a64f0cac0d3cc9 SHA512 ea5d493aa7e05db1b63db2556ff3cae361aee8a18fd2688871cba9882f91b8dbf7897b91ddce16b2acf0b12efe100e8db0754fd86126a7c1d95b6cee02b576c9
diff --git a/kde-plasma/libksysguard/libksysguard-5.22.3.ebuild b/kde-plasma/libksysguard/libksysguard-5.22.3.ebuild
deleted file mode 100644
index e69afb619e06..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.22.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="true"
-KFMIN=5.82.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Task management and system monitoring library"
-
-LICENSE="LGPL-2+"
-SLOT="5/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="webengine X"
-
-COMMON_DEPEND="
-	dev-libs/libnl:3
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	net-libs/libpcap
-	sys-libs/libcap
-	sys-libs/zlib
-	webengine? (
-		>=dev-qt/qtwebchannel-${QTMIN}:5
-		>=dev-qt/qtwebengine-${QTMIN}:5
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/ksysguard-5.21.90:5
-	!<kde-plasma/plasma-workspace-5.18.80:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package webengine Qt5WebChannel)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	LC_NUMERIC="C" ecm_src_test # bug 695514
-}
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 30778739b148..f84f0c74e7c9 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,9 +1,7 @@
 AUX libkworkspace-5.21.5-standalone.patch 4984 BLAKE2B 84a43baece5d0233c7e274c28a7212d6fcec6692c51047ebe5459c9502bfc0fab9a46687fa57424d29691d20987ed9e2bd207b7d2d99a13ddfa7b5091267fa18 SHA512 710d9804ec23fed811d57e1f713738b435a526511609540f45953fa678eb733542682487d8a429940b20dd26bb898fbd70f2d6da3727fa6d26ff9cd839c6c447
 AUX libkworkspace-5.21.90-standalone.patch 4996 BLAKE2B 1f09de9fbd1426fc065066897b1b966cda3993f0b1b6ac2a490d4c3c71863b93212e58ccc87353dc836fd58d969cc22c0a3ab8e6c6aacf81ac35823624e693dd SHA512 8702b74cdefbfc793e9ec0a1ce6ed6cca9f92b6c2d8c60d1a40c1530336af9c212d460ebca31ba8d28e3bcb02c1e6ae99dbea39d3572f1658e8d3575d1d947ca
 DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4
-DIST plasma-workspace-5.22.3.tar.xz 8358432 BLAKE2B 3d84425fb66986db03c39c8148ef12465c07fbefaa5734c8f80465f1ff3e523420c4a78c0072523a17088fd3cadf22ac3691321b9d6b8b18efa07921e868a6c1 SHA512 9720c5aad03fb329714b54947e073b4ea0c3617ee269cc3b6a562fc6528c386a9e29a2ecaa1944593ccf4023446163e0daa1baf31110ebae0cfe51afbd8db85d
 DIST plasma-workspace-5.22.4.tar.xz 8381132 BLAKE2B 350ac0492fa393dda2613ad0828144bd7eeefb9d6cdc1ba452c9c567829ab790a880a522ac1d9dec86af47bf6643fe115a6c0203e2dd843d613d2e8e81755374 SHA512 74d0f7079977429b10f0cb91ffe1afc5c46af8aee7069730d6adad5eea29ea2877d7dadaeb859dff967453829b7737a7598cdc095bcc4ade31aa646761f12c7c
 EBUILD libkworkspace-5.21.5-r1.ebuild 1239 BLAKE2B 29b2a81890471c12443c93501ed5420dbc6fd6113a951dca6cb9ed58de6e22047c3fa54d11c5007e04ce6932aceb46742797cb17cd357a48f29aa8b849bda565 SHA512 ec2f1e5d5ce1cec05042a736ea48917521fa4c147432b92005e9675c3c0cf177f2598ead48ba043ceffab735fa5dcb419a64457e4620af050c950821525eba05
-EBUILD libkworkspace-5.22.3.ebuild 1319 BLAKE2B 4b3ab68da0124ec5f71ae70b4e79308eae68d12e09b41321451cba29fe92d7c9a8452d380f30880b05349c9491e348e0d23a68adf065fb7a84b164ea7dac1ee2 SHA512 1d505add16154af3b0ea90b6c72eaf0b89db23da8115bd2a968070f01122340cf494e9f6dc00d21aa61d22d453cd9decdfda99c4bdf7bf1bb1e632d080986fc0
 EBUILD libkworkspace-5.22.4.ebuild 1319 BLAKE2B 4b3ab68da0124ec5f71ae70b4e79308eae68d12e09b41321451cba29fe92d7c9a8452d380f30880b05349c9491e348e0d23a68adf065fb7a84b164ea7dac1ee2 SHA512 1d505add16154af3b0ea90b6c72eaf0b89db23da8115bd2a968070f01122340cf494e9f6dc00d21aa61d22d453cd9decdfda99c4bdf7bf1bb1e632d080986fc0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.22.3.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.22.3.ebuild
deleted file mode 100644
index 683900192dfd..000000000000
--- a/kde-plasma/libkworkspace/libkworkspace-5.22.3.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
-
-ECM_TEST="true"
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Workspace library to interact with the Plasma session manager"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-"
-
-S="${S}/${PN}"
-
-src_prepare() {
-	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
-		rm -rf po/*/docs || die
-		cp -a ../po ./ || die
-	fi
-
-	eapply "${FILESDIR}/${PN}-5.21.90-standalone.patch"
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die
-	cat >> CMakeLists.txt <<- _EOF_ || die
-		ki18n_install(po)
-	_EOF_
-
-	ecm_src_prepare
-}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 8134039d5c2a..64d5d7ceec46 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,7 +1,5 @@
 DIST milou-5.21.5.tar.xz 43912 BLAKE2B 070d5ba66bfd05dea05095524c71c2635dcff640deb1742ea71c08ee02d848aaf9e3f8abbed49b2d8fee3344e7a91b155f6a5cca45d9d0852c66316fbd2f3c4e SHA512 49f029d1cd5568aaaae7e7170c98e076c917bd6eeed83ea379a412f2faf2e11ce403b5d31f287cb151a37a1ad567f6f42c5f9f48c9af437d0c1ed339aaed802f
-DIST milou-5.22.3.tar.xz 52680 BLAKE2B b3e20185fb36043e1ca1f5eca2dcf9015b55ea6ab6d0e41a801651e89a7c7c60a6a0d79ccecdd73af19d236eeaaa28498f7ccbe60c43fc97d5df218f15c1eb08 SHA512 b674c192cde5bd32ed224442541235f693f8662f978d872a08d9fd477a37c9bf6402b61ce4987476cfeaa06cf67da69cc282e6e81c6d6c62b7df71fd7e3ec247
 DIST milou-5.22.4.tar.xz 52956 BLAKE2B 4ef083e1613a6a28c25b1cae50bf1d77d921eccf63bf97bc2f6da7c335f045e93153a930ab6a2d7376c42928764c18133dd7c344dd7c404cb05443dabbbc706c SHA512 d89a8a0bd7425e9046f8c01ee95ce23c0af5c389397d22cfdfa3d68e9f5b517168be05de533ee30aa2557397d7656635ec0c6eb61223a75694cec9ca22d8063f
 EBUILD milou-5.21.5.ebuild 823 BLAKE2B 753fd5c8246b905c36f73ff26ff58945a9d51bc5e46dae3ea6f6f011a2cac481cfbb4cb7323454656c72ee3d980854eccbe5e71f8fabbdacf26acc6719d34fe8 SHA512 0d1ad8eb23a902c13deb12da2e4d1471df72ad510335ed56c72f67a2a4ded48373ca4d8d41f1eb7fdd3758f9630a0586c102d5bf27fc7aece2d002cc9b515c54
-EBUILD milou-5.22.3.ebuild 826 BLAKE2B 2b8017674fcea46e24f3f4de17e2ff863936359aa6c22d883c68f6152e4144db60f657437c101505c77f945a553578088766588a331533ffe35a2ea37281251f SHA512 90f82b6df71c8e77925c2591d4a2dbf877fbe2d4af9ddb6c685dc7910d540cfa959b03ddbeda164c8eec5496d96dee0defc7279559095158fc4386e193f61c8f
 EBUILD milou-5.22.4.ebuild 826 BLAKE2B 2b8017674fcea46e24f3f4de17e2ff863936359aa6c22d883c68f6152e4144db60f657437c101505c77f945a553578088766588a331533ffe35a2ea37281251f SHA512 90f82b6df71c8e77925c2591d4a2dbf877fbe2d4af9ddb6c685dc7910d540cfa959b03ddbeda164c8eec5496d96dee0defc7279559095158fc4386e193f61c8f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.22.3.ebuild b/kde-plasma/milou/milou-5.22.3.ebuild
deleted file mode 100644
index bf862da17f31..000000000000
--- a/kde-plasma/milou/milou-5.22.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://invent.kde.org/plasma/milou"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 56d3cab9c30a..031a5912d622 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,7 +1,5 @@
 DIST oxygen-5.21.5.tar.xz 4476864 BLAKE2B bdf9d15a44c18d4cb0f18647c3960ef927bd64b7fc2c61963781ec4f690486032c7167c6995d78b9a2918571a9f55f0d3ce5a8e9848eac4acb46acb9eb9c8e77 SHA512 f8ab4989376eedecc5402dd788b15abf1a748863c510bebd306110423904790a9d3df3a246b8ed87273c4bd0425813a9b0a51181dca08b4c2ed27dcade6c950a
-DIST oxygen-5.22.3.tar.xz 4474612 BLAKE2B be54a869396e41902789d76910a56e360701abfc48b1df6f612af88bf7248e76f90a85992d3eb520a445c9f7147a6e08986eaea0962ffd03e400dce7726ad051 SHA512 8ff38ed3d6b8bd27701d716fd0645cb783ae0d6abf3f63fda284a96a958f3844071ae6037a99ddc07a06d4c6ffddf53becf1e510b6cf56db868e601fdffb66a1
 DIST oxygen-5.22.4.tar.xz 4476840 BLAKE2B b3eccef6da983489c1a1779dbc83113eba28e6b046a3b91c96f4646d7e8d0ea089791f9e5e9b185ed07cb7cdff98ec736407c02ef2f450b0624152278c0ea581 SHA512 f65b0862a4c5779cab072b3eb8273fcb76b6b5972c3f9d0d3f281ac86b4c56bb6763e7711d6e51874b9071ecfc1127d0be0891d159184eef17f15afe56d899aa
 EBUILD oxygen-5.21.5.ebuild 1363 BLAKE2B 700541554aad8371b525ac98bdd4f33e6bc78200e82279f120e0197561183f0298a1f33e4c398cb7988ec4a009d267bf08f4a907ae135db8f77d1a919ee5c11b SHA512 cc7e82878da2895030e9ff06651c7a1a71f021fb7e661e1de8b294e30c2a31145e72444fec9f6e66db597e00825fa71cba1730fad381ecf6ed8b6e21906687b5
-EBUILD oxygen-5.22.3.ebuild 1366 BLAKE2B b6c2200077941549c3d184bf9af1e7b14c5c41c489b49ac7cf370657e3ddd90996ae8ed137a529ea0308d71870a6658e88b4fa0998bf572dda63e877020d186b SHA512 5eeb1e66fc16cc8297774f45ad069916f7a44ec9bec4b22ee6a926bc3592f554150b9242e66d07c2e96d67438cc2f8689f504e99d13ced28c72ea260c60a4ee1
 EBUILD oxygen-5.22.4.ebuild 1366 BLAKE2B b6c2200077941549c3d184bf9af1e7b14c5c41c489b49ac7cf370657e3ddd90996ae8ed137a529ea0308d71870a6658e88b4fa0998bf572dda63e877020d186b SHA512 5eeb1e66fc16cc8297774f45ad069916f7a44ec9bec4b22ee6a926bc3592f554150b9242e66d07c2e96d67438cc2f8689f504e99d13ced28c72ea260c60a4ee1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.22.3.ebuild b/kde-plasma/oxygen/oxygen-5.22.3.ebuild
deleted file mode 100644
index 8ba5dd7c0f31..000000000000
--- a/kde-plasma/oxygen/oxygen-5.22.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://invent.kde.org/plasma/oxygen"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="wayland"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	x11-libs/libxcb
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kservice-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-desktop-5.16.80
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 358730586c84..3b619864c0d6 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,7 +1,5 @@
 DIST plasma-browser-integration-5.21.5.tar.xz 205668 BLAKE2B cf2eaff44d3bd4553e09b5802d01903be6d6a57acac312068a636af15a4daee44a855d3dfee771ff47b4de6a98e46f8d8225242986fc73d5e21eff6b1a59338c SHA512 83165c59606d32b65359ac7a9f79beabdcd50ea35becab2d6cfec3c34e0981a0bd0452176cf213e6de0db293b4adc1615631be6477048f5e8033cc5e16f1b9a0
-DIST plasma-browser-integration-5.22.3.tar.xz 213104 BLAKE2B 65e486129343eedfae51fa8c04b26b1df5c09f5e23507c32183979a41c58cfb35e538c527d21c9653e5d5df5041feb106c457172767021920bfddc8170fcba60 SHA512 54c2efd891806d3d877c3579a3ed756d27f236764dacf308c622563929df9970ca8463fa4b2e83237cd4579e5d60f4984bf995aaf5eda80fb02ca6e38519dbdd
 DIST plasma-browser-integration-5.22.4.tar.xz 214528 BLAKE2B 8ca8b42a138b03e5bf4877f8407744ab79052a1549675b3111816044f22bf4aaafbd6748d90f4132ade1d4d2d8d847b528ec671b3a4e7e2b9b32744da4cbd558 SHA512 5be2468937542b2cc2037e9102cb861085a8f3a368d122ac4cabfa318306fb9a8b276223c30508d55588e51f6fca4da384f0c2a2f552120194f04bd588ef2d2d
 EBUILD plasma-browser-integration-5.21.5.ebuild 1009 BLAKE2B 3053ba179dda44694f18a26061f7899453d274f596724f5fe478a0de1ea8576c51a1abd861a1a300da2ecd2a9b2a38a9d6c8eba86e34b9007d4e90d065c90050 SHA512 dc417612bbca4439133ca48e4b1ca027296beb56c3a9045d4f8e9aaed00200b66e07fd082508670d19c2ad1fa89904ecae463491e7720688ccf270b1e3090228
-EBUILD plasma-browser-integration-5.22.3.ebuild 1119 BLAKE2B 0918371278278d605d7f17b616a74b1b629bb8a230638f0e12f895a171601518426ae15665ed946820deda4d702e02712fa48bb5540a55bb03551efcb772b955 SHA512 4b97a762acf3448369c11f30be2232fb003ff16bd34f1be38c3de1945528d09e4e6b3e80bd156faaf51172a3dad974debb25148deb4b5a935286e7179c6f526e
 EBUILD plasma-browser-integration-5.22.4.ebuild 1119 BLAKE2B 0918371278278d605d7f17b616a74b1b629bb8a230638f0e12f895a171601518426ae15665ed946820deda4d702e02712fa48bb5540a55bb03551efcb772b955 SHA512 4b97a762acf3448369c11f30be2232fb003ff16bd34f1be38c3de1945528d09e4e6b3e80bd156faaf51172a3dad974debb25148deb4b5a935286e7179c6f526e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.3.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.3.ebuild
deleted file mode 100644
index 5bcf9fe1f263..000000000000
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
-HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index fdc3ba0dc500..5e6ee2539283 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,10 +1,8 @@
 AUX plasma-desktop-5.21.5-transparency.patch 8828 BLAKE2B d847a5daf3836ecbc1cbc0bacb8e6a507e5a060330d835cbb5500982d0d20148831be53e39b9613fb48d0cb5c3203b00dafa7a627ff4471d866ac6217691b729 SHA512 9b7b73d59e7d52a1acc4eb2db498c8baa31853561900653c86d6ba651093099c4bc98197a23914276ca18553c538a79b927f5829feefbbbc76592f36947fc8c7
 DIST plasma-desktop-5.21.5.tar.xz 15913496 BLAKE2B 6923a4c48d20f2611ab92ec34517a339a4fbc53875545beb5c33700933262f67b48b22ea311812d7b0cd4a169a4b19f497c0cd559c5b5f74e52410e30c187ec7 SHA512 40814910676a05d3d5a308a432c06ce9664b90724fe8c56c4f68f6eb939f35401f19dddb8c46006f44fa418e0f18b4a42b0ff78b5b07031f54e6b3c10c919e57
-DIST plasma-desktop-5.22.3.tar.xz 15738116 BLAKE2B d49ed441098b008e4559a0dbcb6a6aa690b30422bdbb0b959966fa9db69add6240cca267815052cf838daa3b558f2abe1569245b9f4a21142829aeaa456c7bac SHA512 ad7bcc269ea2da59be90dee310bd406efb6558944ac21feaaf5df1eb113a2b0626890354b8066050b9c38dfb4ecb4af18b62ed0274a4af4d76b7a6cb7445c4a3
 DIST plasma-desktop-5.22.4.tar.xz 15742204 BLAKE2B badd9128cc9c53a4e5ce79b067bd95539f1e174e2c774c87db732a20769a6cf03518c9c2382441f0abdd38f526b097729a3fd9d8a83fa783cba61bd6df68afd3 SHA512 ac355b611fb473139f23b352ab8e496ad01a4c2377c24ce7e7951847e467b176a585c92d43e4ea54cde0a5b985e2e4536c57b887fd62b747fe9ba82f34b4e739
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
 EBUILD plasma-desktop-5.21.5-r1.ebuild 5213 BLAKE2B 37173e6c0cd30af1b12dc4fa71a30ca5fc3ed5dbd25926bab399aa0d7da0bd0f1e686a251b07cb046d695b3e44c3afce889677bfa1676cfac9a96e075d006cc5 SHA512 cf1f896736e0a44210c2ac0c716ee3b7adbe97940811c162e467f9dd2de75ded801b4f48abebad92685182654cbf40d54e60fdc48c7d1216dd65237ec27e623d
-EBUILD plasma-desktop-5.22.3.ebuild 5322 BLAKE2B 7b5b802d7d19492276eaacac7b3d3659433f93c9de8ac4ec70223dfb128a22410924ead75e801f2a620baa25371c40d2ec2f9a629c7c143992acef33b5ed5b78 SHA512 fe48b6155719a545641175491eebff948b05a51e984ed833fa71bf1133b8d79429e3337536e610482cbc1cf67c64d49c97dfe08ed7cb492c9c45b6664be88686
 EBUILD plasma-desktop-5.22.4.ebuild 5322 BLAKE2B 7b5b802d7d19492276eaacac7b3d3659433f93c9de8ac4ec70223dfb128a22410924ead75e801f2a620baa25371c40d2ec2f9a629c7c143992acef33b5ed5b78 SHA512 fe48b6155719a545641175491eebff948b05a51e984ed833fa71bf1133b8d79429e3337536e610482cbc1cf67c64d49c97dfe08ed7cb492c9c45b6664be88686
 MISC metadata.xml 738 BLAKE2B a846c98d05f6e305354ee0fa36d26df2b60c3db3ee348edc64bbd5d5ab3c8f542b573d9ab395607edf0bc83fb95095147dd52a05beebe8790e21f86a45eb6890 SHA512 659770ee7aac2145f99a512049200f1049474fb97b553dd9b54663f104253939d80b3f35a6efc206db3de834862f074aa2cfaae22e2651198f6b9a298adfe6a1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.22.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.22.3.ebuild
deleted file mode 100644
index e3ac5f790ba3..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.22.3.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-1"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
-
-COMMON_DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	>=media-libs/phonon-4.11.0
-	virtual/libcrypt:=
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbfile
-	emoji? (
-		app-i18n/ibus[emoji]
-		dev-libs/glib:2
-		media-fonts/noto-emoji
-	)
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	kaccounts? (
-		kde-apps/kaccounts-integration:5
-		net-libs/accounts-qt
-	)
-	policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/user-manager
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	x11-misc/xdg-user-dirs
-	kaccounts? ( net-libs/signon-oauth2 )
-	policykit? ( sys-apps/accountsservice )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use policykit; then
-		ecm_punt_bogus_dep KF5 Wallet
-		cmake_run_in kcms cmake_comment_add_subdirectory users
-	fi
-
-	if ! use ibus; then
-		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
-	fi
-
-	use emoji || cmake_run_in applets/kimpanel/backend/ibus \
-		cmake_comment_add_subdirectory emojier
-
-	# TODO: try to get a build switch upstreamed
-	if ! use scim; then
-		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
-		-DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-	)
-	if ! use emoji && ! use ibus; then
-		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
-	fi
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# test_kio_fonts needs D-Bus, bug #634166
-	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "screen reader support" app-accessibility/orca
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index 0e8d31c199b3..94b2bb124fcd 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,7 +1,5 @@
 DIST plasma-disks-5.21.5.tar.xz 71428 BLAKE2B a5f2d27afa851f84874b05531d2f4a80b02f5c4238594fb7bffd3a364883aea777379c565621350a227d3680d87d4553dbec1f86dbdde12ff1f125cb5685ddf6 SHA512 b7057416b9ea692b70865122b4f4febb727c6a6dd72ffcd1cc23c9280ecba650b30c2e0002130ecceeb78b556c3e922c3ed83ec0e0d03163e01789cfb10d9426
-DIST plasma-disks-5.22.3.tar.xz 84248 BLAKE2B 7df101a5b081621c73bc6cfcfe3acf4deeb9237abba6578dcfd45e8f99c954a85fc1cf68e0b46b1fcb38c4d4f9ead29f8aa539cf536915055f5fa7061c542838 SHA512 7f9ba9b437d39220d8d548215b971ea9d14899ffefc17e387485380836d3ea88028ccdfcd23062ce42b99995d219710f06885b2cd3311c48c14a9c194dd9819a
 DIST plasma-disks-5.22.4.tar.xz 84496 BLAKE2B 45b00fb5d400b051373a16a7586d6fcf2e03bf2acf3bcdb46d169521d0403118b97b968a583039eea83889559cf08b300ea95bdd91749c5d2974059579842583 SHA512 cf54be894a61fbbdcbc32010475e0542dae4da59b43a5f9b2ae9e8a8e511b7a64fd1475dc4c90f33b9918f864e34549b91f210cadbf50681e36b9a6919d8711b
 EBUILD plasma-disks-5.21.5.ebuild 1030 BLAKE2B 8cc8c2981c42e066d573b4c61b0d06d6340ca62a347cda39fc807f978d4ca210e84f98736483f37bc45a829155eb232504ef2acfa3a5cb066a5c95f7aeab5cdb SHA512 7ae7aa0277c169cc8c9d25aa66db2ef1f8a9dc6b6adc23079a1f0da337dcb0e7d5577fc4c50fad3dfcbc5228365a30402ca83904ff696aec4c5dbb99a133c608
-EBUILD plasma-disks-5.22.3.ebuild 1033 BLAKE2B 9bd04493a19a15c4cb228ee3cb6e8367d9c267496d16a6d4e9fe2a3987fd36e9ee6fb8f2549886a7472e3555bbbc7fab6cb26237cc06aa1d95875fb6b80c9bf9 SHA512 77074b67c227729ca999d1a03a041b4adcf2dabe86f9043b7becb737451f1cb284712a35c2175b250f62a673debb71019e197c89275c9ec252eabd3cac03d414
 EBUILD plasma-disks-5.22.4.ebuild 1033 BLAKE2B 9bd04493a19a15c4cb228ee3cb6e8367d9c267496d16a6d4e9fe2a3987fd36e9ee6fb8f2549886a7472e3555bbbc7fab6cb26237cc06aa1d95875fb6b80c9bf9 SHA512 77074b67c227729ca999d1a03a041b4adcf2dabe86f9043b7becb737451f1cb284712a35c2175b250f62a673debb71019e197c89275c9ec252eabd3cac03d414
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.22.3.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.22.3.ebuild
deleted file mode 100644
index a48f543b9225..000000000000
--- a/kde-plasma/plasma-disks/plasma-disks-5.22.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="true"
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Monitors S.M.A.R.T. capable devices for imminent failure"
-HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
-
-LICENSE="|| ( GPL-3 GPL-2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	sys-apps/smartmontools
-"
-RDEPEND="${DEPEND}
-	kde-plasma/kinfocenter:5
-"
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index 2ac1b7879a55..7a2ef4f3edea 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,7 +1,5 @@
 DIST plasma-firewall-5.21.5.tar.xz 331812 BLAKE2B 43a026a198fb61480e90c5a5235de1abbb106e3f78d4a81fe919ec8c65c4f5ca30b340436b28369d8797d9ad1eac87fd0a4e39b5e3670f68150992e6007c4a76 SHA512 93d36b12025f1918892ad02e6b92dc8c44c27d2c6426a19fb77d8b258940a25295acd923b3957d45eb1715dae097097368b0456bf27273c217b79b441dec55fd
-DIST plasma-firewall-5.22.3.tar.xz 339064 BLAKE2B 3c15f9de5e92a719681520e3cfbb57f9ccfd7a0ae09974bb7b3437b1109803783d2c1ca5eccbd29710c0bbf1a586e79142feefd2f681f3f6de5ad186b88824b0 SHA512 7aa54d5e682ca07e4b649d138d3b93af2ee3a579ba0189f046cb7ab4a5c73fc5daf11d08845d0176537d8c40a424559336fbc8e13431b0f1108a169f47977de1
 DIST plasma-firewall-5.22.4.tar.xz 339068 BLAKE2B 3b3948e9905c448f36eba48af55983479dd4e72f4511033e445bf621cd9f2b3747ba1402611368974a6f19170b8f54207d397ed18e71fa11f2f13d87f4f5c41d SHA512 6863e369183d81d7ac381f0951dbf6b4c903b6ca1c5780c1bba80843b8f0650272059b1e3627762edb700162ac0488a3b07d159e86e78d1f0026f282815421fa
 EBUILD plasma-firewall-5.21.5.ebuild 1391 BLAKE2B b5120092b36428f2458f26417c2190faafa856bc31e25a4499aa97fea14593b8f4fb26211b97871a8a65ae5c519f64a28aa2eb2d378872a402fee0579fe5ebb1 SHA512 7b7500aba94ca646d473fd7b7b76b20675257d72dbeb252c7d2f3187f093d705d49d1890a20f9b2b2e3699b2058954d7986f28056d7df5f9c66a95e53e4855f0
-EBUILD plasma-firewall-5.22.3.ebuild 1584 BLAKE2B 1ed1837bdf6b42dbd98f28f39916eef9ad69a0579b207178cbe53e2014120d1a1737c13136b054a6387280082c87fe31fde92536a740316e4cf0a2b16dd171d8 SHA512 bb8832469d3fd8385308cdb783b7edb2474dec7e54800eaf7578451ad0924a3baa9ac789715655ef520fbd89ccd5950e4bc82563bd04f2ad1367ed99a0596efd
 EBUILD plasma-firewall-5.22.4.ebuild 1584 BLAKE2B 1ed1837bdf6b42dbd98f28f39916eef9ad69a0579b207178cbe53e2014120d1a1737c13136b054a6387280082c87fe31fde92536a740316e4cf0a2b16dd171d8 SHA512 bb8832469d3fd8385308cdb783b7edb2474dec7e54800eaf7578451ad0924a3baa9ac789715655ef520fbd89ccd5950e4bc82563bd04f2ad1367ed99a0596efd
 MISC metadata.xml 412 BLAKE2B 738cc0553aa14a9337e41a7870ab733a78a2509b70eb4ff02f9783a9b89dd6b46830b23134abe528ed3a9fcceac7e2fe6166a6849f0675834e475c53352bbf9d SHA512 b13e2e68e403a2dad70657aa92b9ea6899716f1d74da9f4b8878909e990e1bc60431d80670ff4ead837beb4c1128871f7b9f63bc9517d1feb0bc14172c896e9d
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.22.3.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.22.3.ebuild
deleted file mode 100644
index 622d3b7334c6..000000000000
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.22.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Plasma frontend for Firewalld or UFW"
-HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="firewalld +ufw"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	firewalld? ( net-firewall/firewalld )
-	ufw? ( net-firewall/ufw )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# this kind of cmake magic doesn't work for us at all.
-	sed -e "1 s:^.*$:\#\!/usr/bin/env python3.8:" \
-		-i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_FIREWALLD_BACKEND=$(usex firewalld)
-		-DBUILD_UFW_BACKEND=$(usex ufw)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst () {
-	ecm_pkg_postinst
-
-	if ! has_version sys-apps/systemd; then
-		ewarn "${PN} is not functional without sys-apps/systemd at this point."
-		ewarn "See also: https://bugs.gentoo.org/778527"
-	fi
-}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index bf7966343423..492ca896e07c 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,7 +1,5 @@
 DIST plasma-integration-5.21.5.tar.xz 60972 BLAKE2B 2122d64fa98dcd65936b18a5f8c09939680566770468817ab14d9116c92d226f234811952fd61222ca5e000fe213735c0da26ce73f3c5587cff4d61fcf88d902 SHA512 655fee4335569325431e9fb7d368bdf82b43f1e0e0f727f95f11f481a81e8dbdcdc43470c1768b9ab5701159ffaf571b551edc57510a653e1c7fedc1c4216d92
-DIST plasma-integration-5.22.3.tar.xz 65596 BLAKE2B ab5efadad2248ea8f56a604785b4cebffa92d2bedfa5a6d70ca8e159124dd6032adad71ee82ba58cb7bf502071ddaafd03c1d5ef9c0dc62fe72b225bc7ae4278 SHA512 d8a852955e52e42aea5e4e963edc052c2a778e33e2031817112ddcca2a4dffd626042460a377e5aae6f697fb2868220df9fe4f1eccee2799c713d02739d0f001
 DIST plasma-integration-5.22.4.tar.xz 65560 BLAKE2B e0e3409300c73fa17c4eadba0de1bc9ae5fb3741e5818959f4b8d3053aca916e1b0b34c818a2408165b9b9e58ba4f994099807025996bc910820de5dff4a3fec SHA512 1106e8e76391f79dad89483fa8db2d185119ac383213bb5f9597aad82642d7454822f54bbb249aba26800cfb4408e45fd4b9a7af354f2b1cee27c86afe3a25e8
 EBUILD plasma-integration-5.21.5.ebuild 1235 BLAKE2B 5c31aee5c4c9974e5d8b2cdffa271c2644e634ff2e99d6842f114aab07289aebb60cf4c6bf1398c568a786c77dabd22d5614b27ce1f24fda19b157bd0033be74 SHA512 7b9f7a55405ce89b556d04b63519304faf175b6ce119f9747d6b1a3c71b63255300d165d65663fc82e9e6b067bd33a4aacd4dccb8261ab5e96f595f1e8da8966
-EBUILD plasma-integration-5.22.3.ebuild 1238 BLAKE2B a774d3389d2e968807b00075e48846bff8eb61ab5c2eb746b65e09efbcf96206d0e4e4f9e9859a5301cf2ac248eaa2e1b389a3520c1c70ea814f006865e3963b SHA512 3216cb569143f1ca7f935218d0b420d26d549e0dc668946ab71d666f661ef00caccae8e85bcbf3773cfe5ec60a0c706f9b5134fdf44c176bf832a094c7d2130e
 EBUILD plasma-integration-5.22.4.ebuild 1238 BLAKE2B a774d3389d2e968807b00075e48846bff8eb61ab5c2eb746b65e09efbcf96206d0e4e4f9e9859a5301cf2ac248eaa2e1b389a3520c1c70ea814f006865e3963b SHA512 3216cb569143f1ca7f935218d0b420d26d549e0dc668946ab71d666f661ef00caccae8e85bcbf3773cfe5ec60a0c706f9b5134fdf44c176bf832a094c7d2130e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.22.3.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.22.3.ebuild
deleted file mode 100644
index 02ab146b45d2..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.22.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# requires running kde environment
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${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/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	x11-libs/libXcursor
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 9a53ed33876d..436ac7cb3622 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD plasma-meta-5.21.5.ebuild 4040 BLAKE2B 614877bb903d223fadc2c19963ccada9a350d65e705eba59f29b753e5bd7448f4fe66bd42e94432867403293cfd84062fce597721c4e7b16bb96c6ea6ef83dab SHA512 ec273d84d957bdbd8d641dac1594cb068bac1fa7600d41ed91bb726aa838ce41646e5ef770447258a2b7ff1c20116894f8394223152e859353fc2e2371259d15
-EBUILD plasma-meta-5.22.3.ebuild 4089 BLAKE2B b37bff3af6f404ec4ab2792387e2ce24cb19aebb04b402494fb8a8bc0038ec684db912c6b50d736ce86100baeddf38885dfc1a865af7a905a45f8c0085f405f9 SHA512 b100226f8ffae9f18fa1c733898fa5f7c9dbbf77f8b6705963a8cf9a39fb38eb487b315cbc76ed18624fdcfb10f34f1705b773020e505d326b6617ea06aaf269
 EBUILD plasma-meta-5.22.4.ebuild 4089 BLAKE2B b37bff3af6f404ec4ab2792387e2ce24cb19aebb04b402494fb8a8bc0038ec684db912c6b50d736ce86100baeddf38885dfc1a865af7a905a45f8c0085f405f9 SHA512 b100226f8ffae9f18fa1c733898fa5f7c9dbbf77f8b6705963a8cf9a39fb38eb487b315cbc76ed18624fdcfb10f34f1705b773020e505d326b6617ea06aaf269
 MISC metadata.xml 2311 BLAKE2B e7f8095b8d868028ffb9a6f0fb9795d2eea72b22e3b770ec08a2b75a463198c1e82242b39b413ffc794462fd2ea0324eec38f210867d22814ea005966ba1dcad SHA512 e680e2d8103eb6f65f186a77c57692f17483c2530029c8f4bd94816d87b73e1157f7310f60f8660b2e45fa048e783208df1b19cdd5711616f497d5ab16d3e7b5
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.22.3.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.22.3.ebuild
deleted file mode 100644
index 82a75b873114..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.22.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://kde.org/plasma-desktop/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
-+desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
-+kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk
-+smart systemd thunderbolt +wallpapers"
-
-REQUIRED_USE="^^ ( elogind systemd )"
-
-RDEPEND="
-	>=kde-plasma/breeze-${PV}:${SLOT}
-	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
-	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
-	>=kde-plasma/kdecoration-${PV}:${SLOT}
-	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
-	>=kde-plasma/kgamma-${PV}:${SLOT}
-	>=kde-plasma/khotkeys-${PV}:${SLOT}
-	>=kde-plasma/kinfocenter-${PV}:${SLOT}
-	>=kde-plasma/kmenuedit-${PV}:${SLOT}
-	>=kde-plasma/kscreen-${PV}:${SLOT}
-	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
-	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
-	>=kde-plasma/ksystemstats-${PV}:${SLOT}
-	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
-	>=kde-plasma/kwayland-server-${PV}:${SLOT}
-	>=kde-plasma/kwin-${PV}:${SLOT}
-	>=kde-plasma/kwrited-${PV}:${SLOT}
-	>=kde-plasma/layer-shell-qt-${PV}:${SLOT}
-	>=kde-plasma/libkscreen-${PV}:${SLOT}
-	>=kde-plasma/libksysguard-${PV}:${SLOT}
-	>=kde-plasma/milou-${PV}:${SLOT}
-	>=kde-plasma/oxygen-${PV}:${SLOT}
-	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
-	>=kde-plasma/plasma-integration-${PV}:${SLOT}
-	>=kde-plasma/plasma-systemmonitor-${PV}:${SLOT}
-	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
-	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
-	>=kde-plasma/powerdevil-${PV}:${SLOT}
-	>=kde-plasma/systemsettings-${PV}:${SLOT}
-	sys-apps/dbus[elogind?,systemd?]
-	sys-auth/polkit[elogind?,systemd?]
-	sys-fs/udisks:2[elogind?,systemd?]
-	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
-	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
-	colord? ( x11-misc/colord )
-	crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
-	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
-	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
-	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
-	display-manager? (
-		sddm? (
-			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
-			x11-misc/sddm[elogind?,systemd?]
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	elogind? ( sys-auth/elogind[pam] )
-	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
-	gtk? (
-		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
-		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
-		x11-misc/appmenu-gtk-module
-	)
-	handbook? ( kde-apps/khelpcenter:5 )
-	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
-	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
-	networkmanager? (
-		>=kde-plasma/plasma-nm-${PV}:${SLOT}
-		net-misc/networkmanager[elogind?,systemd?]
-		qrcode? ( kde-frameworks/prison[qml] )
-	)
-	plymouth? (
-		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
-		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
-	)
-	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
-	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
-	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
-	systemd? (
-		sys-apps/systemd[pam]
-		firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
-	)
-	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
-	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
-"
-# Optional runtime deps: kde-plasma/plasma-desktop
-RDEPEND="${RDEPEND}
-	accessibility? ( app-accessibility/orca )
-"
-
-pkg_postinst() {
-	has_version sys-auth/consolekit || return
-	ewarn "An existing installation of sys-auth/consolekit was detected even though"
-	ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
-	ewarn "There can only be one session manager at runtime, otherwise random issues"
-	ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf"
-	ewarn "or package.use and remove sys-auth/consolekit before raising bugs."
-	ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
-}
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 00fca6b4d0f6..095867b766da 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,8 +1,6 @@
 AUX plasma-nm-5.21.5-missing-include.patch 930 BLAKE2B e73b80967df714f8b9a5afbddef8e5951d02c553b70d2b7a40f7162db5fdf2ab16930ceef649818fc3afa658989eb6caf6e0f4eb91476aa88581307545f1740e SHA512 2f67d123a5280303ddd8c904828da6c2b8aa6b8c6fb06853d55d47050255d154b5731703c70208802ced0e03ffdbe85d292636cb686f0f70777903c7c5bc1ed2
 DIST plasma-nm-5.21.5.tar.xz 902104 BLAKE2B 8b881f39e01b7de0107b897c81fffb7bfa429a0bd7d8eb58026328ac42c411d5dd8e154e843767098731174a492e64b6c8a28c8af474584862f58081d9a5e751 SHA512 ac074e50d5ee3be99bab515b02522e391b14936c1c8152ca067c7513af7a8e8b81cb55ab9b412ca703554f3e35fc9392368159c9872d8c372017089a4a65e3fa
-DIST plasma-nm-5.22.3.tar.xz 899928 BLAKE2B 3c24721041ae342bed946a5f1ac5f65bcf32b40b6aeacbfcefac17e20f8438bd2a29e354d3590766d569fbafd8e0ef05f97b38d7335dd7e7a76552dd750edaf9 SHA512 eb70b1291560634b990b442e4a9d72bda0b90c14126b003efe5df8e952621a98dafdfe18bc48e3f2bc153f1e3fbf9e36f5e8982225a3c4fae6e41e48e7fde51f
 DIST plasma-nm-5.22.4.tar.xz 900192 BLAKE2B 33f5030500b8e9700e50fb1394830fea5a74bfe01f62364cb1971f6362c630a773991489d555b975586cfb7a03c89a461cf6e59bddb07d60bc6fafc552fb23eb SHA512 4c4f4f8341fb73dcd47f201f4f48a2309c9880c6bc611ab0ecbf9680b5a0bcf877faa10be8800894f141843c4fb87b1e2219dd23a44b560d14ac4f9c5a757cb5
 EBUILD plasma-nm-5.21.5.ebuild 2333 BLAKE2B 79c1df7a5e2f57323c73e9ea432093a05918f93956ad4ff3b13d308d04f62648ae8a34f8884fef890a786ba2183134eb4667e8e2ef979b51488bbadff4823b48 SHA512 04a6eb5b20bab5ee3372f2b0cc9d0ba21731119e70704ffc6cc6865af3ddef64621a69f49e25f0d01961511c9d4fde86e4501e35ebc4f612fbdd842051c6a7e1
-EBUILD plasma-nm-5.22.3.ebuild 2282 BLAKE2B 0c40591b0d7cd42ae7b2b1316e6ff56fc7f1e3c49ab7faba2d8280bdf07aaf36065cfefe6f702f06abcf7e0dbedb2d430256ef3380e95c32da18105d2bf8ec8a SHA512 5927837b3aa98afb40262bd5d8ef039d7da3139ce75bfb35ca3af872840073445b1a4318d8d51718d7d537268ad4d7ac6b7ad7769b0ac99ffe265d8f84f17223
 EBUILD plasma-nm-5.22.4.ebuild 2282 BLAKE2B 0c40591b0d7cd42ae7b2b1316e6ff56fc7f1e3c49ab7faba2d8280bdf07aaf36065cfefe6f702f06abcf7e0dbedb2d430256ef3380e95c32da18105d2bf8ec8a SHA512 5927837b3aa98afb40262bd5d8ef039d7da3139ce75bfb35ca3af872840073445b1a4318d8d51718d7d537268ad4d7ac6b7ad7769b0ac99ffe265d8f84f17223
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.22.3.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.22.3.ebuild
deleted file mode 100644
index efbeb893a417..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.22.3.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
-
-ECM_TEST="true"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	>=app-crypt/qca-2.3.0:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-misc/networkmanager[teamd=]
-	modemmanager? (
-		>=dev-qt/qtxml-${QTMIN}:5
-		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		>=dev-qt/qtxml-${QTMIN}:5
-		net-vpn/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
-		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake_use_find_package openconnect OpenConnect)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! has_version "kde-plasma/plasma-workspace:5"; then
-		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
-		elog "However, the networkmanagement KCM can be called from either systemsettings"
-		elog "or manually: $ kcmshell5 kcm_networkmanagement"
-	fi
-}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 0c860395e4be..f425b8bbd8ed 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,7 +1,5 @@
 DIST plasma-pa-5.21.5.tar.xz 114508 BLAKE2B b33b5050e7de5dfd99e2f6b881d779e6e92fbd30c45fcd86b0ec65aec81d06b983789c4e617372b74604fcb51315e57e5f1978fcaa4cb9c6c45aeac94f4a2c85 SHA512 96a170b0ae90ff5a8015a532cde50e7a786452f9d04a30f7ee2402c9e7065ed1891e229f589bc79337ad68cd310c339840b10e7bb94551bab744ab7ae9a2ba40
-DIST plasma-pa-5.22.3.tar.xz 127344 BLAKE2B a41d1dbc3e9b6821e2a09a431c3c26eae76e6da8a3ed2cf77b092068ec0e45f4f6365dea272594a15611198423164e9aa1c73c4543b6bdf75e4df81907dfa6db SHA512 7c83da5aed22c67849cedfceeea435aba2d6ff2c874d9659b689f8fef1ee383a67f6d39812cf5793a5dc0ec2c37b25cfdd904d142dd114d9e1fc5ee8b16ff406
 DIST plasma-pa-5.22.4.tar.xz 127416 BLAKE2B ceeb17c7eed3cfdaa4f2496396a734834570969bf9841a0b4cd7927175f8a7de846d151cb3d31535a49603d428469d7add4bdc24941248c03fff531b2d2f8c1c SHA512 73228e5b69aa9a6f9f6f11742c09daadfb0d8369766b774281a0a84a827348d44eb9b494e047652e8098fc59f577bd4f6f85dbf73a9969fec5e0c9a5caf5e39f
 EBUILD plasma-pa-5.21.5.ebuild 845 BLAKE2B db67708d89753791f8823b47248693673e3629f0fb55baf03f3bf1e8db4c4472e99eba74fd8b218a4abdc0f34d2232da59929b3c6c6f63645333e528a87be845 SHA512 082f71d18ba742274f806794225a8b6ca090266d2b53fad041bbdba09dc6e537d3067ef8e96278d52861ab9a401c6a997ef44c3ea2d9b816550680f93407890c
-EBUILD plasma-pa-5.22.3.ebuild 848 BLAKE2B 518c70fb3e7dee877f0f91a6290502acd27196f44f751f1619e3950edb65be199f695092285a686d8fa3522b56f601e95575cab65d20932561a6c0a9ee6cc4fe SHA512 52fd2d1cc94d145b5b5244f4551dcbdd9a7c0386dc3a60b83d5117418418a41e5dca85169f75b834419bc2976b34337382f5ea4ddbc76fd167e3f5f3f221ed2d
 EBUILD plasma-pa-5.22.4.ebuild 848 BLAKE2B 518c70fb3e7dee877f0f91a6290502acd27196f44f751f1619e3950edb65be199f695092285a686d8fa3522b56f601e95575cab65d20932561a6c0a9ee6cc4fe SHA512 52fd2d1cc94d145b5b5244f4551dcbdd9a7c0386dc3a60b83d5117418418a41e5dca85169f75b834419bc2976b34337382f5ea4ddbc76fd167e3f5f3f221ed2d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.22.3.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.22.3.ebuild
deleted file mode 100644
index 5925ffbdeefd..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.22.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	media-libs/libcanberra
-	media-sound/pulseaudio
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	x11-themes/sound-theme-freedesktop
-"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 548b0130e72e..c81e34558282 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,7 +1,5 @@
 DIST plasma-sdk-5.21.5.tar.xz 270648 BLAKE2B 59e6d00cb24a392aa829bea8e0206c7f7867e8f5cdba4a6a2ab6f4f328dd83fb18d1f25c78a5b461d182e8705cdfc8f3141ea947eba6545c9dee0d159de3bece SHA512 83d27d9ffca15baba292bdf285f19a743589f5a4433c6fad8fd581a93a910be0ce98f3163c7d6872d6a95b71342e301de5ebf6ce2677fcdfb61b8e4644a0d80f
-DIST plasma-sdk-5.22.3.tar.xz 269476 BLAKE2B caba8c6abc488e4d39097be198058c4641d02a1d611aaf95a15525a00dc9547eae8a94d1442c656785f55e2027d8119aa38842fd64d63b02f6967ed9ed29de3a SHA512 4531b4d0e7a56034f5c145c9586192185b46a40e93ba0e17bff8b82e3ccb7eaf480c2deb1208db04475ed4520e6513f5f1a679e1de8c7a8950c822409f9571e4
 DIST plasma-sdk-5.22.4.tar.xz 269548 BLAKE2B ee25d81f6dd602ffc91ffae9a2619cbfb015b9cbeae18e24f61e4080541c91563309fdb1f2d0aa28cf4db8f9b23f02035ea3cce6f96ba6e9d2766083c6f35be7 SHA512 4809f69d450f226c2d80a6f469b0c9d5e1836fd76209e7ea3e27c213e0a5ef69895da130b8021ed7ffdf2f50d3d998113b1c1c547d6b3e4a0e789b9681961c8c
 EBUILD plasma-sdk-5.21.5.ebuild 1254 BLAKE2B e7aa53c5060bfba5172d6f7acd95ded4b5ece499f1c9682ba71ec06253144cb6c778360a2bbb40f41171ae2a1fc146fd3e208d66971f6ceef6c6e05e4137bd8b SHA512 3f24a166cf129d2cee91aa4037e5754ab8bd8a179f003bf4d3448154da56407133348095c390317f7bbd978369c1e0726ebeff94517c45afe8e573618fd14e9e
-EBUILD plasma-sdk-5.22.3.ebuild 1257 BLAKE2B 24e8a128c62defc55ef8327158275a6b3888e39551e10d63521ea69bcfb52ca8740ad5bbcd1f1c83d03323f46780749d44dd3656fa4bd5f6ad1d7eda6be16ef1 SHA512 25c158cdd21d525af0dc6334cf3550463272786666a4ba44197101b48b3c7187a666be06be3f7af75acc58f1626d7377a9bb772a5a1c85de64b5cc152a43dad6
 EBUILD plasma-sdk-5.22.4.ebuild 1257 BLAKE2B 24e8a128c62defc55ef8327158275a6b3888e39551e10d63521ea69bcfb52ca8740ad5bbcd1f1c83d03323f46780749d44dd3656fa4bd5f6ad1d7eda6be16ef1 SHA512 25c158cdd21d525af0dc6334cf3550463272786666a4ba44197101b48b3c7187a666be06be3f7af75acc58f1626d7377a9bb772a5a1c85de64b5cc152a43dad6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.22.3.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.22.3.ebuild
deleted file mode 100644
index b63a63ef1036..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.22.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="optional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Useful applications for Plasma development"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index 6fc4ed003fe8..f8c86d01d36d 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,7 +1,5 @@
 DIST plasma-systemmonitor-5.21.5.tar.xz 124792 BLAKE2B 47c55bd7ceb31c7128676e539d7c48325db68b49bcbee0a4d73cd61ed1360500e7765ed2d5d01bde542bfb74e7b6db26158c6b281aa1e65a5ba450595117777a SHA512 f21db1dc9428b9f97b4b012ae481738f7aa96c9080f35870c8a8f2dfed582b937507fd626723dbd60e66656d78984bda24279c77548d65efd847e15374b024f0
-DIST plasma-systemmonitor-5.22.3.tar.xz 134032 BLAKE2B 5fb9d70695ba9487ecf63df5ee15d62c66620db24504b319ae24711c7fd80d18d73a3d866bd572ca6c442270852ffe84349e59fc890ad6f4cb722c9d654b0a44 SHA512 71e815356ddeeb5ce4ef90c0e3a7b343446005b96e42b4b256095bfcf861d354764d9d1b2a0b6f4f09c484852116bf70607ce9bbc0b1fcbc5e608daa39bc181a
 DIST plasma-systemmonitor-5.22.4.tar.xz 135508 BLAKE2B 1562d9f66c8b61c1016b702084a01500195e9fa77ad616c03b1c09593eaf2f6e73b609aa436baa43b6100fc03117ef0f78383ac0522b0ba2a136eb6dfb6808d1 SHA512 c14e93f20f6412d69ea8e9bec7e57462a2b816ea0330a848a604a297ef41dbf586e29f8cb0fd8a49240804c66f2b08996473a44ff82ac960503a214dbe4455ef
 EBUILD plasma-systemmonitor-5.21.5.ebuild 1159 BLAKE2B adc30ef18953aaf667f8c424450d57cb47deb43311696847e664b8201dc72a05cebb472f6108a528fc88c7f8d3168bf3c9fbd3217ae9257d0e5e3128b8ed6c45 SHA512 4b7101d5da1682a10664edd530573a19028510baa6ba9a82f31f5e87bc05a8a52dc069d4a603a119ba9d498c56b5912515390716d89e28fc8fadd05f0665c662
-EBUILD plasma-systemmonitor-5.22.3.ebuild 1192 BLAKE2B 097d3dc4a263828c66a85f20c253f304a2df0d32d78e16238738419bea47086f79a467f781040befff26d543881eace08375391a7618c1f33cbb189e852dd7b8 SHA512 6e124ac6a5aa180b794b5bc223f7431644415485acb18ca96fc24b19b61d293272ea5b21541176f390129b153571b45ba7e4f45618ed17c26d74ffbb876491c8
 EBUILD plasma-systemmonitor-5.22.4.ebuild 1192 BLAKE2B 097d3dc4a263828c66a85f20c253f304a2df0d32d78e16238738419bea47086f79a467f781040befff26d543881eace08375391a7618c1f33cbb189e852dd7b8 SHA512 6e124ac6a5aa180b794b5bc223f7431644415485acb18ca96fc24b19b61d293272ea5b21541176f390129b153571b45ba7e4f45618ed17c26d74ffbb876491c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.3.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.3.ebuild
deleted file mode 100644
index 58e0044c8293..000000000000
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Monitor system sensors, process information and other system resources"
-HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
-
-LICENSE="|| ( GPL-3 GPL-2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-plasma/ksystemstats-${PVCUT}:5
-"
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 2c5a6e9ad7a7..4c7b33a0758e 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,7 +1,5 @@
 DIST plasma-thunderbolt-5.21.5.tar.xz 56556 BLAKE2B 9f80e1848693fccb15cb56f8d6ce89136efa1baa60dfd42498a49f59c9e688ea454aa52b40e8791999fb12dc540308bcdb855cd7462b79079a257a58a29004c8 SHA512 b627ee07e0fe308b70b11c2a887443b8eb3997cb9895a67f8d7760a4294bf36eb612ff888c981ba63a6485180ae7d1cee3d9c7c0bb741a3db3599a2650ba6843
-DIST plasma-thunderbolt-5.22.3.tar.xz 64384 BLAKE2B c381f98c4de447e49c4ada4323b1028e5b7152796adfc0e4081dfd46ebb541a399f56c0a91df0171fdcbb45ce0d41062963d601d24c2ae82b68de1ad5edb1ccf SHA512 cda31df86e1311925a9004d30d40dc35641b2e7076841086fd261ce1ba87de3662ca594a772dcb2754b9c92fe357b90960c3352a5c36e1381b2ebeae9b26edaa
 DIST plasma-thunderbolt-5.22.4.tar.xz 64416 BLAKE2B 4af480e579351906421e484e224bf0d57bb75329862424d77aa7dfdf3efee9f673358136d46d0bbe72f74db0acca781dd6d41e0abdc35f1c21481bb483dc88e6 SHA512 e7a870d0a23f38111b0f1830d25d9a2174247e874dde08ca615bde73290137fdf8dabd79436c30cba3d9eadf286ae2d184730b63cecf0c1cc34467cf07048e20
 EBUILD plasma-thunderbolt-5.21.5.ebuild 890 BLAKE2B aea9c51bbd46e64cf892347f12ef69e949ec8c2374380ee6a4cb36aeaaf97a7ff0e8f11796d0f308fa45d49a622bbeeece5f14611b826e332f8b89cc99eae977 SHA512 5df2219a0225b546724d1d823b8015b78edc392ae8fcd517549d2a879e7fe662729180a9d1cb5db5ec3aacb9b6959ec1059cd755e3f77e548b1b0e96afeb841c
-EBUILD plasma-thunderbolt-5.22.3.ebuild 892 BLAKE2B ecb7c9805c89a7b283bad0878565644666a82fba73b92bb78091949a3ed7628ff16aaa48e9e9a945b61681572dd90d4da3c80a253be6027be9c11a95e1359e52 SHA512 48f301b3be53f70bb87d4bc34ee496fe03743d3956149cf1abb6b38e279e6de0d73ee7d2395d7d7685108e16fd475d96aa2cc1e59c6c31b5497c1aee017a6256
 EBUILD plasma-thunderbolt-5.22.4.ebuild 892 BLAKE2B ecb7c9805c89a7b283bad0878565644666a82fba73b92bb78091949a3ed7628ff16aaa48e9e9a945b61681572dd90d4da3c80a253be6027be9c11a95e1359e52 SHA512 48f301b3be53f70bb87d4bc34ee496fe03743d3956149cf1abb6b38e279e6de0d73ee7d2395d7d7685108e16fd475d96aa2cc1e59c6c31b5497c1aee017a6256
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.3.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.3.ebuild
deleted file mode 100644
index 952807b2c0bd..000000000000
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.3.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
-
-ECM_TEST="true"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
-HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
-
-LICENSE="|| ( GPL-2 GPL-3+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# tests require DBus
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	sys-apps/bolt
-"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 540c8ec956de..04d0f52a5a53 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,7 +1,5 @@
 DIST plasma-vault-5.21.5.tar.xz 160084 BLAKE2B a893a8cb9a3911eebb7cc1933f5bd6ee527a639e0ffaabfd9db864acc15962127e87abe3838a24311c65e87f2bd2320f788a731ee2145909e7d2605fccc9184f SHA512 bb3a4471e6a7cfc98eb4867142467cb009456c7643e87f274372e6d9d8cff1b97c6e70c1a3a51e21b72cc0d7a63a801f4681e3977339eac6a9ab108b13dc6d5c
-DIST plasma-vault-5.22.3.tar.xz 170884 BLAKE2B f2b24959e22f0cb0ba68fcba834da24829d25bc11437990c269565216f081ba8108d8a51f7808df9c7b7c39967c02792be0b0f97f2212c4421ca956e8cf0419f SHA512 e0525587f1dfb9241c4fc5523f173aa888f2676bc40e1a72e695cf71171b0a8677a2a54161402bcebbeaddedbd638b2ff89289fc50af72eb88d5389651fb1f96
 DIST plasma-vault-5.22.4.tar.xz 170956 BLAKE2B 516edc988716cb87e62a9c08e338fb63cfe1cb81deb00c5cae3c7687d9300e1ac36ebb2bccf5c8716eaea7183bfa6b4918a6a2b9366a8312579b6be7576ebd27 SHA512 99654996a8fa5f7cf813b2ad8735aaab055e012c1c4363d2bed6dd34e51c8f642ac9d2c48526c8c1c98c24849230b296aff148c9e863b9de8cbb411c01c69000
 EBUILD plasma-vault-5.21.5.ebuild 1274 BLAKE2B 3685fcf92739494b5a31ef3b1e0394e3be7a3e1f0d76eb5a4444e9232f5db527ac1f2e1b6cb79ab75378402d9168d786cca3e88484f106e458fe0d23713c0fc2 SHA512 920e0e6472ee03d98ca9849f280b7dfb02d08eab24d5965664762e8b3a917d2e83440f81d1f0372572a484f735d7e2a5ca37cf039455d052e1167fd34e020d38
-EBUILD plasma-vault-5.22.3.ebuild 1277 BLAKE2B f268af5874174cf55c37060db377c89957c9e948ba7774f1b188d2655ad98d04646ed64e6f54e11d6104a89064396042fe7ac5f8b2b65e2a0ccbadcc23588fd9 SHA512 d235011265a3a6a09ef33a6361aac0b04f5aa735c186f3abedf15edafcb293ca20183f10e79fcd1c0a423d45bf5238184882df9abd28f03baa7b387a296d1de1
 EBUILD plasma-vault-5.22.4.ebuild 1277 BLAKE2B f268af5874174cf55c37060db377c89957c9e948ba7774f1b188d2655ad98d04646ed64e6f54e11d6104a89064396042fe7ac5f8b2b65e2a0ccbadcc23588fd9 SHA512 d235011265a3a6a09ef33a6361aac0b04f5aa735c186f3abedf15edafcb293ca20183f10e79fcd1c0a423d45bf5238184882df9abd28f03baa7b387a296d1de1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.22.3.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.22.3.ebuild
deleted file mode 100644
index 6487b75bfa37..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.22.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma applet and services for creating encrypted vaults"
-HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
-
-LICENSE="LGPL-3"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="networkmanager"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 396b8e66d7bd..1ceee1eac616 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,7 +1,5 @@
 DIST plasma-workspace-wallpapers-5.21.5.tar.xz 48099464 BLAKE2B 1cf45627c00ebce5ac6960cbc1c773f4239398de247a2e29866de8daa53e7a9804b2185d148c3a8c507eac1c6a333c9c6a5472b37d26979029df3652e69913c0 SHA512 d0a7862b55238bafc106b654bd584cd6e2fbeead8d6694cc71df23e74a2da02c0b25b2f412514b45c1d2b04567e7758ef7d77b6fc5bd814b5f5bdee0c26926ca
-DIST plasma-workspace-wallpapers-5.22.3.tar.xz 51348192 BLAKE2B 8de5d2d8700be72edd6af4a58a46ca0a0573543f55c3b338b7fa8b71c8848ecbe170caa88c7ed8ff8213fc6f5076a2bb7aa9add861d197db2686761d98b9f9aa SHA512 cdeda0696a8f81d98ad0e217c7e5dea8801c0a0968b8bdcbd50e858aa8e4977b764a3a05c44650d90c820e2f9d5f8c7a8f6b064a6301b8eca0a818d457b76fc4
 DIST plasma-workspace-wallpapers-5.22.4.tar.xz 51348292 BLAKE2B 42a47d808f17e34af208b54dd7999389c89d7b8ddbaee36351f262c970fa9736bc8167a59a2a44170593399b52f5d96a3a7ff29ff84bac26d98554411ec1e275 SHA512 77330c5483642b9dc2bb5c985fc10a65bf11b50c1fa58a516044d82abdb4942b41617f5eaacc73283217f6aa27ed48041a3263f90fee5f5f67aa0ece2b578f19
 EBUILD plasma-workspace-wallpapers-5.21.5.ebuild 348 BLAKE2B c1e079d7883ab5f823645802a14b49636285ef2e3f4016f93ac898bd2506a447939922f5718c1952ebd1f44951dce635ea360c29f63bac5aff85cc18ea8994ae SHA512 f51435ffe85756594615cb8dfdf6e5986c94463521922ef0e36246adf96da0f2dfa1195372c26da325878bd32c873fbc95892c747c9cac133cf66582438d5a26
-EBUILD plasma-workspace-wallpapers-5.22.3.ebuild 351 BLAKE2B 478fad4796a3013a7341ba3cbb940094710b9c1a7b04f08b8dd3d1d00666204693e2ace866961502ed99c310c735bae867b740657bed355a17827153d87c0ae8 SHA512 94099de5a96a3bec754c5d76519a0b48180f23401619e86cbcc6b2ec615f1071b4a3921b90c6cd6b24c29466fde7938dc421dccd93f01435ab2353dc5d56eb46
 EBUILD plasma-workspace-wallpapers-5.22.4.ebuild 351 BLAKE2B 478fad4796a3013a7341ba3cbb940094710b9c1a7b04f08b8dd3d1d00666204693e2ace866961502ed99c310c735bae867b740657bed355a17827153d87c0ae8 SHA512 94099de5a96a3bec754c5d76519a0b48180f23401619e86cbcc6b2ec615f1071b4a3921b90c6cd6b24c29466fde7938dc421dccd93f01435ab2353dc5d56eb46
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.3.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.3.ebuild
deleted file mode 100644
index d290aa752bae..000000000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-inherit cmake kde.org
-
-DESCRIPTION="Wallpapers for the Plasma workspace"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/qtcore:5
-	kde-frameworks/extra-cmake-modules:5
-"
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 00632b819edc..af2d8f0184e3 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -6,9 +6,7 @@ AUX plasma-workspace-5.21.5-split-libkworkspace.patch 1154 BLAKE2B d37f649971b95
 AUX plasma-workspace-5.21.5-transparency-panelConfig.patch 1174 BLAKE2B fa68999f0c9f4bed18d2b00b3129c271a3d63359f618b05eebb1cbb0dc759b8daec6019069ac64adfe10fb76acd833bd3fbdbf48b83d5859d4dbdacea37a4dd8 SHA512 19878656585d8ae980b9d3350506cbcb2f5841535bf042e66a6fbb2873680207730d7f6a06065aa94268264c4d252c02d434fa6f96358906ea7c01c16188f172
 AUX plasma-workspace-5.21.5-transparency.patch 14371 BLAKE2B 6ce2619103bbff528c31b89d1aec8064e79768b66513c9b5a66d4d994f3824e733473755f3b866729c7a0a92a43209dfd641e864ee66dd69875364a93d5d69cd SHA512 cf0a6140a3905ed58f3fec0ada1f8dad4faa59f2b12e3084f26832b4e93db0c5e9a0fd86667c40ba9ddc7bb5108c3ab7e5c7a39db274e2cb46f3605707b2ae7b
 DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4
-DIST plasma-workspace-5.22.3.tar.xz 8358432 BLAKE2B 3d84425fb66986db03c39c8148ef12465c07fbefaa5734c8f80465f1ff3e523420c4a78c0072523a17088fd3cadf22ac3691321b9d6b8b18efa07921e868a6c1 SHA512 9720c5aad03fb329714b54947e073b4ea0c3617ee269cc3b6a562fc6528c386a9e29a2ecaa1944593ccf4023446163e0daa1baf31110ebae0cfe51afbd8db85d
 DIST plasma-workspace-5.22.4.tar.xz 8381132 BLAKE2B 350ac0492fa393dda2613ad0828144bd7eeefb9d6cdc1ba452c9c567829ab790a880a522ac1d9dec86af47bf6643fe115a6c0203e2dd843d613d2e8e81755374 SHA512 74d0f7079977429b10f0cb91ffe1afc5c46af8aee7069730d6adad5eea29ea2877d7dadaeb859dff967453829b7737a7598cdc095bcc4ade31aa646761f12c7c
 EBUILD plasma-workspace-5.21.5.ebuild 6350 BLAKE2B 4d126e250eedfff978e5c0d36d3f629bc03057347603ec470c4ed69656b2025ad4704883b086cd33eeb591a5dd8d259b4f58342c426b853ba86cfbc9fad3d066 SHA512 79e67ef32136f66256b044a60ed1780bf8814a826730402033c386bf538e4509807890403a5238cf6f95c483f668e7d7b4d823b9c15597e005f859ce960dc58e
-EBUILD plasma-workspace-5.22.3.ebuild 6134 BLAKE2B 09bd8e74ff5edef5184008c9e96ba863b0821fcf1b7002b13694af66b6c9f0c59a22a042a30516c1d3e1dd015e653e822fea68f0893d7759dc9ffd9588d0a068 SHA512 2a089ff02663f0b4a1b9a8551f8cef1740939364790749df62676eee88b26efc141c6a9802c93ffebd781690f99ec2e92c62232a1d092b602d8e976818b4f7bc
 EBUILD plasma-workspace-5.22.4.ebuild 6134 BLAKE2B 09bd8e74ff5edef5184008c9e96ba863b0821fcf1b7002b13694af66b6c9f0c59a22a042a30516c1d3e1dd015e653e822fea68f0893d7759dc9ffd9588d0a068 SHA512 2a089ff02663f0b4a1b9a8551f8cef1740939364790749df62676eee88b26efc141c6a9802c93ffebd781690f99ec2e92c62232a1d092b602d8e976818b4f7bc
 MISC metadata.xml 725 BLAKE2B 9407d29ff0ca14ceb51e387202b0194021799a0bd35a9587b55e5e4966f19fd1cb2ef6d6f541c5ae3929f1d8c9c6b278d7772021552b7b928933dc217cd16a7d SHA512 c02209adea54e9275a81f3e301ad5491481499a918eced7d0d308bab6f638c1ae97e62604c5d931fb1ad3a7bf5393b6717ca40a9c080764eb4a12528d99a5d71
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.3.ebuild
deleted file mode 100644
index f3b2afd529ab..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.3.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
-+semantic-desktop systemd telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	>=dev-libs/wayland-1.15
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwayland-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kunitconversion-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5[qml]
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/layer-shell-qt-${PVCUT}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=media-libs/phonon-4.11.0
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calculator? ( sci-libs/libqalculate:= )
-	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	fontconfig? (
-		>=dev-qt/qtprintsupport-${QTMIN}:5
-		media-libs/fontconfig
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-	gps? ( sci-geosciences/gpsd )
-	screencast? (
-		>=media-video/pipewire-0.3:=
-		x11-libs/libdrm
-	)
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.1.1
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	>=dev-qt/qdbus-${QTMIN}:5
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtpaths-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-apps/kio-extras-19.04.3:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-plasma/milou-${PVCUT}:5
-	>=kde-plasma/plasma-integration-${PVCUT}:5
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	systemd? ( sys-apps/dbus[user-session] )
-	!systemd? ( sys-apps/dbus )
-	!<kde-plasma/plasma-desktop-5.21.90:5
-"
-BDEPEND="
-	>=dev-util/cmake-3.14
-	virtual/pkgconfig
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream
-
-src_prepare() {
-	ecm_src_prepare
-
-	cmake_comment_add_subdirectory libkworkspace
-	# delete colliding libkworkspace translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-	fi
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
-	fi
-
-	# KDE-bug: 433730
-	use calculator ||
-		cmake_run_in runners cmake_comment_add_subdirectory calculator
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_xembed-sni-proxy=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-		$(cmake_use_find_package appstream AppStreamQt)
-		$(cmake_use_find_package calendar KF5Holidays)
-		$(cmake_use_find_package fontconfig Fontconfig)
-		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# default startup and shutdown scripts
-	insinto /etc/xdg/plasma-workspace/env
-	doins "${FILESDIR}"/10-agent-startup.sh
-
-	insinto /etc/xdg/plasma-workspace/shutdown
-	doins "${FILESDIR}"/10-agent-shutdown.sh
-	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
-	ecm_pkg_postinst
-
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
-	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index dae130c66563..eb950b688fe4 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,7 +1,5 @@
 DIST plymouth-kcm-5.21.5.tar.xz 43356 BLAKE2B 46130ebb6ce4a9522546d87f7f42d65cf41f1eb9dfc5a454732a55d8cf0b6b73bf5f2a9286f05aa21bce73218c10499de7953fe06f3ecbd369071fd9a70e2b0c SHA512 d8b8187ecce7bfdd2a3c22dec9b4ea2b085614a7e3b495671226bb9c5fe0a674d75ea03c74bfc3cc58f0ae3a7fc82ec2261d1ace5483658fd65333f61f95ba07
-DIST plymouth-kcm-5.22.3.tar.xz 38304 BLAKE2B f9bc8e8c0d0fd208ceccb1623c5f49f6861b8d3a873891579702b7ad3aaf32f742c0a073f74658221489127d09482c6102d7c3ceaa50e76fded1ef78e0af56a0 SHA512 5139cecdfaad57944d9a50aa5f83f8a5b4e7cdffae4cb2306ee228b9ceb7cc9ea4c8be3f0f110370c09c7fba12f5379cb9049ef89789266fc5b8918e9fe4af7a
 DIST plymouth-kcm-5.22.4.tar.xz 38276 BLAKE2B 82b00e6e84b36cf2eca5a66b095cab77df1c3d7d2f33b39fc219aae95d65fdc7061c021cd243d108a7753a4344b5e5a6da6d442bfad6ef60d7e982c17e917387 SHA512 e3600f041f023a0324113cc0a7a54bbe2f99fb9cca014e6fcc7a39811439f59420ccc99fe9818c6673d13f964247f9d228007df65aa86d5fdeff63e52b1f662f
 EBUILD plymouth-kcm-5.21.5.ebuild 958 BLAKE2B 36635d101b5ad1fe414c917c504a432e88b6281f474b04b5a9e62152a244150d914b571105517987496035038ad1f92f9408c5cb15a541e06b3c90b2bf21f718 SHA512 4ab44b34b5b2b59d50518641dc48df4cae86395c2ca084a64dce87d9d33e159b9ada04339557fa6fd9b2ca2ae0e34aaa1f0d8421b9951ffe3d15535b01066ba2
-EBUILD plymouth-kcm-5.22.3.ebuild 930 BLAKE2B 7581d321ecfe302a94d8b9b56e2efeed1445c7c545fd3c88ac50df92fa2cec8c8b6dea948548963564f1f8836188cbe5794a61155ead81570c6dd6a062b421cc SHA512 84314c0309c859291ac921a9772860a26c523b592609046e9a3b8f1af4374aaf135c06e0f473d6d30864c5f4e57a008a6a355f0a8ccb5de7143a93d4ca2aeacb
 EBUILD plymouth-kcm-5.22.4.ebuild 930 BLAKE2B 7581d321ecfe302a94d8b9b56e2efeed1445c7c545fd3c88ac50df92fa2cec8c8b6dea948548963564f1f8836188cbe5794a61155ead81570c6dd6a062b421cc SHA512 84314c0309c859291ac921a9772860a26c523b592609046e9a3b8f1af4374aaf135c06e0f473d6d30864c5f4e57a008a6a355f0a8ccb5de7143a93d4ca2aeacb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.3.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.3.ebuild
deleted file mode 100644
index 5d62f9cdd9ab..000000000000
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma control module for Plymouth"
-HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	sys-boot/plymouth
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index b8b190c9a681..1e1d3a124692 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,7 +1,5 @@
 DIST polkit-kde-agent-1-5.21.5.tar.xz 45848 BLAKE2B 1776b97fc4ea6a5d4ff13b90b054379997226ea3726c94ff886ba719f5445c8548d0680c3634b7ecd3f6cc2e9e1d2416e8ec58e8b822e465cbbc0c2e719053c5 SHA512 840e63d962054e6be2204f0ca5142249338050a1d3df3db66667275ae3fb1930bd3d9f4ea37b85feee73b33822c8b34015028b981d7a100afeaab793f1525ea9
-DIST polkit-kde-agent-1-5.22.3.tar.xz 45792 BLAKE2B d07a7ab994561b16d3f412b5ace8dab0a8e3aa55296574e48ce71d855d2516441cf7a407a2cdb68a5e71c1a445c9bdf6468b1a89f118acfe386614c296055b08 SHA512 d9c8955e0bdae3e72a47c0fc261983c9957e2577644464a1c6f58cd23f76f4946201aa9a6ef6fbf5d9421ae181ad8cd16f32ad19515928e93c36328c4d2e3161
 DIST polkit-kde-agent-1-5.22.4.tar.xz 45764 BLAKE2B 188f18b0d8096e3e65d501482b2ab8db29104704fcb20edb56b771c2baa7e96430062eb9c30229fa7eeae6406205a74b140e4560408807a7441c2cf38d5a15cd SHA512 19cefd4b7e7a8de7ac3dcf83e2d68bcb9a317d4afa70a610174adec4c20fe013b468d13742def227fac0218459639683f8439703562184c5cd4593a21ba81981
 EBUILD polkit-kde-agent-5.21.5.ebuild 797 BLAKE2B d7cb522daab68684ae76a2b91c95cba2b4aa788a96c439513e17e465dd485e7f8b275ad7d6c2b39762efcd8f03c43fca48039f8c5b25da6a137bde11cbb156df SHA512 76b0f30794becc44fedf66707e76a8f117e015797350994a58fa4dd93747635c7080e900d4af3826190fa6f3641a4e8e9cc8ead4b3398e3209ed02af7abfdd00
-EBUILD polkit-kde-agent-5.22.3.ebuild 800 BLAKE2B abb95b7bc181db092f98dc0cec508b0844b685d7161be8bbbed907aad9ed9ce68b5a2630b1cdcd87cf44f58863e53a0dc76deb178dfb46fe75dd80644253d078 SHA512 703772b00b37fd1ba801c64000574e4b9b476a48fb15b64dc8b8a1795f38d8042141d6e181b60412e625cf5479e939f53e432fa895d2e2c179e298a76ee3cb68
 EBUILD polkit-kde-agent-5.22.4.ebuild 800 BLAKE2B abb95b7bc181db092f98dc0cec508b0844b685d7161be8bbbed907aad9ed9ce68b5a2630b1cdcd87cf44f58863e53a0dc76deb178dfb46fe75dd80644253d078 SHA512 703772b00b37fd1ba801c64000574e4b9b476a48fb15b64dc8b8a1795f38d8042141d6e181b60412e625cf5479e939f53e432fa895d2e2c179e298a76ee3cb68
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.3.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.3.ebuild
deleted file mode 100644
index 4d7c33a4a505..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="${PN}-1"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="PolKit agent module for KDE Plasma"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=sys-auth/polkit-qt-0.113.0
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 8ee1fae36071..4959cb538ac2 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,7 +1,5 @@
 DIST powerdevil-5.21.5.tar.xz 617468 BLAKE2B a67f409ea8e5a6c3353deb749db65f64bbf4e40d8ea84b6d8df6385e62bc1fce34552bfcc7dbe63f19161af59098173c0ad1854d3ab8ff30457e6b44985b2af2 SHA512 0d6b9cbd5cbf5cf3d34e3053f352d86586ed3672ddfae068531b899827d65b9e42c5ec0013f684deca501528590ec5074371fa7699aae4d6a20b120e319b625c
-DIST powerdevil-5.22.3.tar.xz 617804 BLAKE2B c343370bf860a04625a49593dc47d634c7264efdd317ab0b43c773cff9d517fd1c6bf1068f8a12330ba24f9ef17aec910134a1df03e993e03cb026c6dee72376 SHA512 6ca57a23909690a90787f214762b0f2fe304560fe29aef76b518b10ab9909f3dadf50ed0c59f857313ce53618f4c0ba04a95cc931ef3f1bf4ea91f838e36059f
 DIST powerdevil-5.22.4.tar.xz 618088 BLAKE2B 7eac3e88daa15ddcee72265b231669cf3af40b2e2d1b4c9bb07095f6d45352138ab3f4138cd6efd7ef5bda609ec649cf95c4e5c7ca2c4e049df027b92a2fa28c SHA512 24ec7c3283562930f0b128b938df4ec76671011fdc8c259db94d3331654b0df4bfa4a3460920c13b47b1d17520f7707071ed967e6891182a70db6547eb8b3257
 EBUILD powerdevil-5.21.5.ebuild 1944 BLAKE2B 1432032d37d0b87d73948241be37f027abea350cf7fddd46c2392b004b2ae02528af97e6bbb6d7e89e6a06579d1ddd3bc07168bbd937085db5e846c293d128af SHA512 5ed57a70af96c40b428804baf98abf573002f567e85dbb8ecc0571a83cb1e0e58424d86aeb6f3e8ef2fe03aa6d9f01ce3b3b39cca7da6390b21f635d8697b7e5
-EBUILD powerdevil-5.22.3.ebuild 1947 BLAKE2B dbd20cc6d03d7c2d79cdc0e2b5738f70685a5effc1a479a54f1251429095c8f2be3df348171c51b7ee8ef2b829952a0bb6bce0f5b6c8abdfdf7d4c0f9ff01919 SHA512 4c10a44569d9f55b4a1f9125f8e3612618dbb8802633a88b6ca5e4816d75ee46bde988fd4ca5d9f816410b2caf4a2f4887ad3cf54f3a95f59424c9e99d26ae9f
 EBUILD powerdevil-5.22.4.ebuild 1947 BLAKE2B dbd20cc6d03d7c2d79cdc0e2b5738f70685a5effc1a479a54f1251429095c8f2be3df348171c51b7ee8ef2b829952a0bb6bce0f5b6c8abdfdf7d4c0f9ff01919 SHA512 4c10a44569d9f55b4a1f9125f8e3612618dbb8802633a88b6ca5e4816d75ee46bde988fd4ca5d9f816410b2caf4a2f4887ad3cf54f3a95f59424c9e99d26ae9f
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/powerdevil-5.22.3.ebuild b/kde-plasma/powerdevil/powerdevil-5.22.3.ebuild
deleted file mode 100644
index 4541c8b19d68..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.22.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="brightness-control caps +wireless"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
-	>=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/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	virtual/libudev:=
-	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
-	caps? ( sys-libs/libcap )
-	wireless? (
-		>=kde-frameworks/bluez-qt-${KFMIN}:5
-		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=sys-power/upower-0.9.23
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_DDCUTIL=$(usex brightness-control)
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package wireless KF5BluezQt)
-		$(cmake_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 5c4f4af57e10..2728b877e347 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,7 +1,5 @@
 DIST sddm-kcm-5.21.5.tar.xz 64672 BLAKE2B 4c8f3059a4d6fb57f517eb17008bf923c91ee8cd18385b117666ca294b5ebb912280281e7be624d9be803272a644ed4dd01ff3e8b6e358c9248d7daa0cee3f98 SHA512 fc2fdaf67c144cccc8d2f68cc20e50027c1a083d6b33d37e8c8e7fa703b2904c11b63fc9acca63422688013346f565c77a1f02721c7f8dfcaf52bc97c7b07dbb
-DIST sddm-kcm-5.22.3.tar.xz 64460 BLAKE2B 1eb049250585a7d72d6827777395016b07f694da229bd0b6f209a8b3edd1e037aa007f08ae08682927df7a895075e3d83667ddea551e3399d6525b476631cc9d SHA512 0b09da15bda6f15bc3aabbc99b6e00a81db2f3d2e4ee567360ea8a8b2100aa79252eed25c0bdc9109754c2959dfabd19bd833a8d7df5416379f9518e283e82c0
 DIST sddm-kcm-5.22.4.tar.xz 64540 BLAKE2B 0dc646a9cc355ec7de28a9a0e3af2f31c4ee5329748fa71c7ac898a2d59a573f3466b965a717bc80a4a09c08188ff7d33ab6dae671ecc389c159face93f6947d SHA512 2fe26e978a314af4387d36adcef2ab8cb77612d0d48183cf50bacfb36659b9b8cfedd488e1c4ead19ee1c16745e7ac25a83fe4ad89ecf6dc478cd952e7eb327b
 EBUILD sddm-kcm-5.21.5.ebuild 1072 BLAKE2B f4d0f44a3d18bd4e12c9bc8fd624629747607eb1055331815c1fb0fafd4484af1f8f750492a68610f6ac2b622d3073d19e7031e70885e79f1218f07a6e123364 SHA512 72aeb29b7261016868675f9a7a4008a2ac07f3f680e87e19d2d751f3575f294bc3e40b856b57fd615b295a4fbf17668186468b03fb9a8709361ca104aee58e7a
-EBUILD sddm-kcm-5.22.3.ebuild 1075 BLAKE2B 4cb971b1428dd4fa5bd193f3f9eca67e2dca68b1b0c655c80b50531b7a83b51a2368aa34ef72c51c24f3080eecf75962f609407ec7ece9cdf63d4dd0763a401d SHA512 619c591dc8565fd1cd50fae67312ef9e46d8d6a399b61c624f8ee246b7f886e06c84661a6e8c35da840a6fe993f93d75018c3fc094745b93ef0ff5959b218b49
 EBUILD sddm-kcm-5.22.4.ebuild 1075 BLAKE2B 4cb971b1428dd4fa5bd193f3f9eca67e2dca68b1b0c655c80b50531b7a83b51a2368aa34ef72c51c24f3080eecf75962f609407ec7ece9cdf63d4dd0763a401d SHA512 619c591dc8565fd1cd50fae67312ef9e46d8d6a399b61c624f8ee246b7f886e06c84661a6e8c35da840a6fe993f93d75018c3fc094745b93ef0ff5959b218b49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.22.3.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.22.3.ebuild
deleted file mode 100644
index bfb383decbbd..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.22.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	x11-misc/sddm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 4efdf2ee4fda..2045cbc734ea 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,7 +1,5 @@
 DIST systemsettings-5.21.5.tar.xz 199680 BLAKE2B a37300b6f3b53f5c62ffa5ff06581f1988720e87bbcb64f5c8048cdb99834b5aa37528c80615a07f8dc8f1e2bb246543479777e5c2b2c5499b1187ffca041b45 SHA512 fac4f4081583079b20c4935e694ef05908d0ef62938e4560cdf9a3119234fa3d0c13f973854b83535fde3594e713b0bfdbfbc0db36994a9a507c4063b714a410
-DIST systemsettings-5.22.3.tar.xz 204492 BLAKE2B 29583987ead7e4a0c01c39cfa556833e4bc6bb76d9abaaa7450f818f9b98b56699fb310788028bb99d2ec5512d67a94518bc95419cb8ac975881b95ea4b79889 SHA512 fdf5b2b61ca1df7006b5ac8cae7fb4a6db13ce7ca918b243c9e75bb8f48622804bc3905e376447b86007d51610e1ebeb05822d2a82ea09834be2ad4380a5d8c9
 DIST systemsettings-5.22.4.tar.xz 205644 BLAKE2B 8970037d92a1a3c616dab148f48dd00af8b0bf1271864d2b680149a23a0fb2ed258a3192f376aa4f35d116fc5e012275ae837a578787653437aa5f7303b90348 SHA512 3b3aba18f31d18f45c9d509b2c760ce1f719355d09f9790518e0938e057095c967074f37f23024d4080b440dbeebaf7ee77470c52d14b338c8516ad4dfe6b717
 EBUILD systemsettings-5.21.5.ebuild 1671 BLAKE2B 95d86adba6cfea80c54ebe2126d7323017412ca3a167b479814cc7b04d535b827fa1882b41f98e1357f868613f43ecc1e8f1fb265bcc2fdcec2054a69b2b1988 SHA512 24124ae30f11144a29c10a2da73da1edb3f48a099c6ede5b9b7e6c21af32896451333e774522ad328eeafeb1e928aa5a27604b96700a86341b7e13ded6a2ee43
-EBUILD systemsettings-5.22.3.ebuild 1674 BLAKE2B a79b56617cf723493335a7b22090ba80f3036cb012d5a805cc4b123d59f18310318a47dd60f5153c1deb614f48d10cc525f1cbf31ef727e60f6d2b988101f93b SHA512 e08d27a3368cd3b6a3521e012dc17dfece402e7b9f5bda78a26735241d6ae877659f314cc1814ace2242de10e3684265992adc5a2b36609801bd6d6e3e0691a2
 EBUILD systemsettings-5.22.4.ebuild 1674 BLAKE2B a79b56617cf723493335a7b22090ba80f3036cb012d5a805cc4b123d59f18310318a47dd60f5153c1deb614f48d10cc525f1cbf31ef727e60f6d2b988101f93b SHA512 e08d27a3368cd3b6a3521e012dc17dfece402e7b9f5bda78a26735241d6ae877659f314cc1814ace2242de10e3684265992adc5a2b36609801bd6d6e3e0691a2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.22.3.ebuild b/kde-plasma/systemsettings/systemsettings-5.22.3.ebuild
deleted file mode 100644
index 0db6d4e59dad..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.22.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Control Center to configure KDE Plasma desktop"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 9e978bc6c3ee..d290aae22d42 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,7 +1,5 @@
 DIST xdg-desktop-portal-kde-5.21.5.tar.xz 82860 BLAKE2B 583dd6f5360282d3b86d73b65ab5ddd136b5f251ad3b41a977248c44f99ab7c407868a8238307184d3206b35c987adaaa8aa15df5abb2a8ecf2aa31b4591e6a6 SHA512 98fe44d4a00cb16f3e3ebd30b184e836dd77efafbca7625b555852b0dcd45c4ecf71ab5d93659e3d508f2b3b42696422516a08e2ae759bbe916fa5f9fef6010e
-DIST xdg-desktop-portal-kde-5.22.3.tar.xz 87028 BLAKE2B e8a7aeccc1e1e1668bd351c86964cf529ae8d0e6d77a72dd026b7ba5621dbe6030c55890bff9ea48b50320bc20670348a531dea97220bdfa25bd643fab475e19 SHA512 981e359d89f9efd270c1b5755f06c150da51a7d131ec289fbbf1d97b6752439ebfa9b2ea6e04c47bafa5edd670119f11853c9227cf2be54ca9b8bc2cbf8489ab
 DIST xdg-desktop-portal-kde-5.22.4.tar.xz 87076 BLAKE2B 463124915b0b8b4a52f9ac59964f535f4d28217fda0a7183e8c0cc75e12f20c8d0d79a3262d94959001cac6b3dc5042cc6370728db4dc9526b0ff112d5a67376 SHA512 43764076e992c16039e160daf0bf430d63d858479380f462375190ef44660fc51ad3fed29e2e3c0aec182c38d0956c5612b915727ce44a12afc6ee74ab8d2841
 EBUILD xdg-desktop-portal-kde-5.21.5.ebuild 1098 BLAKE2B 22981912d0c61cb667690b79e324dfef8c30f8a59c85039962490ff865ce0b39411a2800d356ca13a0156e98aa228125fc288707bc7b301d314f657d4f8e583b SHA512 34aaf74d6c49cc3062e7ab793ba49f45036b23661c0bcf0440ecf5eef2f6f5c63b1b2da7f6e79f21ca1c1af0ba12d0397f39af84cd2ef070191d4976f79399a4
-EBUILD xdg-desktop-portal-kde-5.22.3.ebuild 1101 BLAKE2B c2859fd8c2246df5d5e62900aa8edd7def13d11fcbd177e9581c45a091020c1392261e594ebdcfad37c2eb2745423efd4ed617ef0301d9ec02a1bc8cdbfa9685 SHA512 09bc21be18330f16ff14b9366ec4225a43b339cb39bdd8b2a71c471e35e48ee19d181d129b4aaa4f0d89fd7fdaf7a637edc287c412a31e89735ef0f76f2172c8
 EBUILD xdg-desktop-portal-kde-5.22.4.ebuild 1101 BLAKE2B c2859fd8c2246df5d5e62900aa8edd7def13d11fcbd177e9581c45a091020c1392261e594ebdcfad37c2eb2745423efd4ed617ef0301d9ec02a1bc8cdbfa9685 SHA512 09bc21be18330f16ff14b9366ec4225a43b339cb39bdd8b2a71c471e35e48ee19d181d129b4aaa4f0d89fd7fdaf7a637edc287c412a31e89735ef0f76f2172c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.3.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.3.ebuild
deleted file mode 100644
index 8f474386d973..000000000000
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/wayland-1.15
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
-	>=dev-qt/qtwayland-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.1.1
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/xdg-desktop-portal
-"
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index d8d7838ca2f3..04771a84191b 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,8 +1,6 @@
 AUX xembed-sni-proxy-5.20.80-standalone.patch 2090 BLAKE2B d56e29d6bdf62bd4fea74c963e6af642c956b2907a2995335845d730b11ab09b81bf535edceecca2bbc7fa44552bc1659e5e59e95415470fe77a7bece759ba4a SHA512 8eb77b1a97715d549164cff12dd4d1b63af2d0f8bbcb447d47b4ec82f539e37dad5395e0a7f8fd5c700fc82e06569313a36cf1f7e6eca09ad6d18bb890dbb9fe
 DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4
-DIST plasma-workspace-5.22.3.tar.xz 8358432 BLAKE2B 3d84425fb66986db03c39c8148ef12465c07fbefaa5734c8f80465f1ff3e523420c4a78c0072523a17088fd3cadf22ac3691321b9d6b8b18efa07921e868a6c1 SHA512 9720c5aad03fb329714b54947e073b4ea0c3617ee269cc3b6a562fc6528c386a9e29a2ecaa1944593ccf4023446163e0daa1baf31110ebae0cfe51afbd8db85d
 DIST plasma-workspace-5.22.4.tar.xz 8381132 BLAKE2B 350ac0492fa393dda2613ad0828144bd7eeefb9d6cdc1ba452c9c567829ab790a880a522ac1d9dec86af47bf6643fe115a6c0203e2dd843d613d2e8e81755374 SHA512 74d0f7079977429b10f0cb91ffe1afc5c46af8aee7069730d6adad5eea29ea2877d7dadaeb859dff967453829b7737a7598cdc095bcc4ade31aa646761f12c7c
 EBUILD xembed-sni-proxy-5.21.5.ebuild 1008 BLAKE2B b8d6e076b18f28c877f39013b0f75ff1ce02b9b20643d0d292a422628290db5d6c0136f22caa075896ca4e59da3880f5b87dc2e4e366495e9781e5aa534a247f SHA512 d4eeee9d46b74cea015db69bc37355a290cad657eb420c9b514a491f0231fe02ccfcbc917ac92269ff096caa298acfd0ddd78ffc3d0dd11d762dab3a2d08e8d6
-EBUILD xembed-sni-proxy-5.22.3.ebuild 1011 BLAKE2B 93394e2287665a6bf2331aba17eb2deef1c57235f0f7d65f01b60015e2bcd104174411c630051545b7f7382a10eaaded7b90367ded58c2a2a78466243f32cb1d SHA512 a6c0c2ae972bc269e3cb50ae3be577f1747df86879e8ad8853617ff5c602156f2c17be2818812a0d943c17fc6fb79221ad6d6870c29a2a08c4b94b75274ef0f9
 EBUILD xembed-sni-proxy-5.22.4.ebuild 1011 BLAKE2B 93394e2287665a6bf2331aba17eb2deef1c57235f0f7d65f01b60015e2bcd104174411c630051545b7f7382a10eaaded7b90367ded58c2a2a78466243f32cb1d SHA512 a6c0c2ae972bc269e3cb50ae3be577f1747df86879e8ad8853617ff5c602156f2c17be2818812a0d943c17fc6fb79221ad6d6870c29a2a08c4b94b75274ef0f9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.3.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.3.ebuild
deleted file mode 100644
index 7049a2e9643a..000000000000
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit cmake kde.org
-
-DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
-HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/extra-cmake-modules-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/xembed-sni-proxy:0
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.20.80-standalone.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 46256a15f792..f1677aa518de 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 6428044afff4..99bcd8d29490 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -8,12 +8,14 @@ DIST postfix-3.5.8.tar.gz 4614733 BLAKE2B 13166e854f70987f981bb5e7e5dabfaa73b317
 DIST postfix-3.5.9.tar.gz 4620852 BLAKE2B 66a7bd71e7f74c8f25963ed8d41f04f1f95e060fd23c848065a0e947e766efe058e6593ed8ce1f69528f5b2e9868756d0ea0622b3d77486852882622dd3bb872 SHA512 9ff3a33cdd5811e470d5c6cfa896fa76e4d3257b139deec5f420d18e34232f327b7c8496c5d13566c6f9ae1fdf8719feb9981372b2869b0208a2eb3a1daaeadd
 DIST postfix-3.6.0.tar.gz 4748506 BLAKE2B f4692500cb78e82cede48d750eb86db61dc67ba1d69d220d24c965b57941402a5bf157b4a69d65133d37ce3d9e1341260d07ebd4477184b3caa56b22fd13b4f5 SHA512 af326472333935de111d7f7025af53a1dfd84382c2d2891e91624ce665c258831f28d92fd73d1ab68f82192d9848025bd30d16eb48b3912b46e3fb50dbf194bf
 DIST postfix-3.6.1.tar.gz 4748754 BLAKE2B c64d8f4c12cd7cb39bd15c371c20db4aa61b39120b6c078eda7c48c94d65e181b51ac8f74f3231791fc3ad6c0d04f74975f50776f984ffa9b9f8a4c5c99cbade SHA512 6f83a6aa55bd442fe005b35c7470483ff5ba6781121f783b07ef454580354fc5c85d0d5106936810d6bef0f5592937f0863eec3b82e138caac7694e2a3bb7bc3
-DIST postfix-3.7-20210707.tar.gz 4749553 BLAKE2B 97c6bc141ec39c5e64a3155067e29a06947c0396cf69948f90a1886198a4dd2b9c3431d282a8b9d0a6df38fb2e07c6e7f02c05f7f2079437416546d4cd374858 SHA512 b42a9c4343eed7e836eb2210b969f49aa8b9293c12c555923e61023f55be3f5ff0c7c2c07fcbee599fe5b77c16d854c8d5b8dcbc2f3a1fff2710884b44b4a509
+DIST postfix-3.6.2.tar.gz 4749530 BLAKE2B 349f3eb2995fe72c89e374a2f95cbb09d4a4f5a5c896e340a2a166ffcb2c498ba514022a59a17d2731807f6dadc03f804a3d4b16127dd2d6addb825558b7ffd6 SHA512 464ce9ec77e637ede91123472a0383b2bfda52102f9e9852c7191016d4fda2e14f302f2db9793887c182688c2a14dde6eeda728523196a627a8028f99555a4d9
+DIST postfix-3.7-20210717.tar.gz 4750293 BLAKE2B 59eb90f451790db9f398da79736a23c3ce64a3da2978a597b57ca8df5480739a20a7eb68a100342465b5af3764acaab46b5863207e50e5ba07553777ffd40f51 SHA512 8166c5f2a5d17e042723dbe51c128fa9ba0109de1c29a562cef8a9dbb3517ac2ac0e936467e7877e2c27ac0ef6012a4fa0159d1670ee49f6177a7702f59e9a3c
 EBUILD postfix-3.5.10.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
 EBUILD postfix-3.5.11.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
 EBUILD postfix-3.5.8-r1.ebuild 8693 BLAKE2B e0ca3baeabcb4b0e703115c6839b4b0e0d75c789421c8fbd0aaeccff22630f797f11e5b8cc5ae1f09d21773f257a5edc117392b377d9c743e5de62cf42289540 SHA512 7ff76d64ab024375f4d015634898f1f8475d349ed9718c40e02ffad2abddfb32676b076168bc0bdb35f78b4e95df596d1fd286b95b9d5a7fb57d4c8188dd46b2
 EBUILD postfix-3.5.9-r1.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
 EBUILD postfix-3.6.0.ebuild 7984 BLAKE2B 30ccb9c5339e0cf795b97e6228a5190d0bbce455d1a254b536fc684f767e82ed54d80f3291847ea0dc52f5c05d9c0e5e0309f5f4fad05bc8fa49de98c48c3e11 SHA512 5cefa9c8a1a6b83f0158e704f69fd2f6a9633c801e3051c5abe6fcff5c4213c514b93629c0f620823d0166c329126967b10fb51206e43b0cda03e0f145966634
-EBUILD postfix-3.6.1.ebuild 7980 BLAKE2B c939c0a53f96b1b30fca6375cd810e67d4cc20d7f79fe14da80e2c9cd7e88a04fa6bf8ece49dcf79e8c227cb7dbe1d2fbcf06a362316461f83eb09e4ee2318c8 SHA512 098b522c7c6217e7957b7e59c233ab9658d2257797c33db08da1cfdd7b3950b5e17a93e4a751c8a2e59ea81f22e3f8d5ba87374024e01fbcf04095a03ee25501
-EBUILD postfix-3.7_pre20210707.ebuild 7917 BLAKE2B 504cae64c2c323d844e355600f1d5daee40524a940b54d2a4d28e3a870a0d3628be5cbb1cb1c471544764cc1db4ab49378bc54feb1f9c84214aca1c3a0b28ed1 SHA512 f0011add1c12ae383a03ac9f3989509cbc86aa820680151854e0f783ec387fc571345a0f1a2b78966838bfbdb2f225584d5ee3303bbc33f84729053fd08b25f7
+EBUILD postfix-3.6.1.ebuild 7979 BLAKE2B 907b1753f88fc5fd0f13302df01e193c77dcc8f3c5256f094184cacf31a28fc06fd075157c6ffe9e0cee09d80ef854d233c3d728a92cddaaeefeeda288c1ddda SHA512 69cc8459317bfc97b3b4fd204f760d45cf52a750580032650763144f56a302d667b045136415a6763a5f0423e90b5e3788717cea45b0ad7a8f3a21d5523415b1
+EBUILD postfix-3.6.2.ebuild 7917 BLAKE2B 58ccfe215e40993ce6dcc20646a3083d2e4ec8c7e6575b65facf3060a15d4ea7184e2ae6130336099ad908b8283eef8947c0fc4db5532801f77c930082b8b5b5 SHA512 aabb59f03bef2d4a8e917c102da12f510b33dd148fa25cd8306c06bb7bd9aafef0d1b41f8e87f768b4927b33c6ebe82290cf3293bd0e0a32739489dab1a8b10d
+EBUILD postfix-3.7_pre20210717.ebuild 7917 BLAKE2B 504cae64c2c323d844e355600f1d5daee40524a940b54d2a4d28e3a870a0d3628be5cbb1cb1c471544764cc1db4ab49378bc54feb1f9c84214aca1c3a0b28ed1 SHA512 f0011add1c12ae383a03ac9f3989509cbc86aa820680151854e0f783ec387fc571345a0f1a2b78966838bfbdb2f225584d5ee3303bbc33f84729053fd08b25f7
 MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/postfix-3.6.1.ebuild b/mail-mta/postfix/postfix-3.6.1.ebuild
index 3d5e70d6653f..658ac683bd4a 100644
--- a/mail-mta/postfix/postfix-3.6.1.ebuild
+++ b/mail-mta/postfix/postfix-3.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND="
diff --git a/mail-mta/postfix/postfix-3.6.2.ebuild b/mail-mta/postfix/postfix-3.6.2.ebuild
new file mode 100644
index 000000000000..84f99b91b850
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.6.2.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit pam systemd toolchain-funcs
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+	acct-group/postfix
+	acct-group/postdrop
+	acct-user/postfix
+	>=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nis? ( net-libs/libnsl )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	"
+
+RDEPEND="${DEPEND}
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp[mta]
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install() {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger and collate and tlstype
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+	dobin auxiliary/collate/tlstype.pl
+	dodoc auxiliary/collate/README.tlstype
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02755 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	if use pam; then
+		pamd_mimic_system smtp auth account
+	fi
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/postfix/postfix-3.7_pre20210707.ebuild b/mail-mta/postfix/postfix-3.7_pre20210717.ebuild
index 7badc66a67e8..7badc66a67e8 100644
--- a/mail-mta/postfix/postfix-3.7_pre20210707.ebuild
+++ b/mail-mta/postfix/postfix-3.7_pre20210717.ebuild
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 582af92d704a..d84ecd0bf633 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index f430ed350fd9..dadc629a709e 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -2,5 +2,5 @@ AUX exiv2-0.27.4-gtest-1.11.patch 1489 BLAKE2B b20cee53dfd712389f553402779d839dc
 DIST exiv2-0.27.3-Source.tar.gz 26447901 BLAKE2B ac13e6d8fce83923278cfeb628f143310a3c62b42936c8ed8b302a2c3df4c36f5666fa749adfb1d745e42da8f519762532e6fc281993aa55bcd7ce56e08c6e3e SHA512 3f5758ee862b811eeb89cc75fc2bbd8bf10329efa2ce1e68555cdc7729faa6cfd1603e0cc859fbdbe6d8fd5e53bd9b9e6d869d8a20ed17497bf87ce78c005de9
 DIST exiv2-0.27.4-Source.tar.gz 32055837 BLAKE2B 9c31c08fafb38895fa7812a8c7a195335e80a6b9c15f7b5f3750f5ab30903c4c3bbf9aee5a7293a7d437d15a49a9cb7b45a3133cbb36ee62081efae0dd67b61a SHA512 f6798baafb36a54ba5bc65c2d28d4f4469e298582c90b417eb437b5dbda8e11963fb3314e8419717b3815ee8c3a68955cddc79e45351d9f2c165a0b73eb7b7be
 EBUILD exiv2-0.27.3.ebuild 2452 BLAKE2B a0e2c3a195f3dc70ae61d4ee17726fb41b2f1fa0446e156062fdda693dc9ffe0ff3bf3ae27dbe234d468cfb16d79ca16b4b7aadd81234f07af6af64a8a4ac57c SHA512 092f563cd4486ccacfae803cb00400e5e6609ad8505d9eff41de6e63a469b5359c0567985f78c0b16f77ee1cc1982aa541159971a189a6a15755aeab43d26b82
-EBUILD exiv2-0.27.4.ebuild 2754 BLAKE2B 18795d95a6940376e93c503946812c50d90dd279357e5392ae44b0a7199db7d9baf0dbef2c1fb9abec808699f6d5e358802d11acec34d801ec52a807dc24f31e SHA512 5e5ffa9298d2094702be4297f7cdd92b44ebac2bda6a78c2f4d65851db0729427e6c355ed217273224ec47343d796d160d649d75aea7c10fc1a9ce8033c62867
+EBUILD exiv2-0.27.4.ebuild 2753 BLAKE2B e729f43c4e5cd2509ddf07c7929e9c9b51e68cc0f952c8c104855c91e1e2722c4fdbe2da74baef2033217f061df16781b05fe12029edf028e3411009befbba19 SHA512 9dfd1c8790b9c1f1296a2c15edaa696d43a380f7417c9bb72e3de41dc2822536ab162c77f26df5c931ba947e5f74b4bcda1534216f0788baae81d25d081313e3
 MISC metadata.xml 492 BLAKE2B 06b2f7b1d7b50e853ae116ad18f254103116c88c7d6957c1c9323083f0f87d7ed268ee188e91edf8b42b02a996e5c85017fffc12b0680f7522a0eda07ecbf74a SHA512 d0e56dd6585c3f10b14043764313de11545380fb15b18ca1627bbd92db357219aef801af050cbf3466b0b4e97fce25a55293068d21db93c1b6003a802944886f
diff --git a/media-gfx/exiv2/exiv2-0.27.4.ebuild b/media-gfx/exiv2/exiv2-0.27.4.ebuild
index 58cc73bd59ce..9ee65a76efe1 100644
--- a/media-gfx/exiv2/exiv2-0.27.4.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${P}-Source"
 fi
 
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 037422d73bf8..5f10b070770c 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,6 +1,6 @@
 AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
 AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274ec22e3cb2c65d62e3095f2bb3da8f817ae52fdd6fe70e5da30bb8110202ec8c8268ffef7069c34d55ef7f7ccc3e53785418 SHA512 205694ea04e7b65c5519c564bbfa1ebd33ef4fa7800aec1a91439ed90794629dd54ab42c1c7f4f2f5ce3b7b078b3fffe76ce37c61643087f5cca244931b5bd3a
 DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
-EBUILD graphicsmagick-1.3.36.ebuild 3168 BLAKE2B 62214202bfa98ed92b9bdf622d00a51d0d99915b3b45e7f367f20775645689e7f1f1e759611305cc0eb5fbfbb3078e535f8db72ab23bb774902d1f5c9a0d9c63 SHA512 c90d3ced676401b7ed5fed30fdf205fc2cf10bb20781a06dbc1534bb2ba0bca796d99b746b28c2b314c99090d212706bc28b6d9e0100ec974c723442e6742d4e
+EBUILD graphicsmagick-1.3.36.ebuild 3167 BLAKE2B e8e55b5bd93bbe242e62a8fd9106d0d807ca4c613a710e7d8ba762d7a7a8a3f849a36ccccb07217fefc8fed9e68c7ef38ea692052693ebd32dca41d63ef1d02b SHA512 d1920edbe0c83e20baab70dcd682d0260e8008cba86fce5c87320b7724caa8129fe17f9977c724165ee83668196087e142ddf1b06ddf291952947a3fd38c4b02
 EBUILD graphicsmagick-9999.ebuild 3175 BLAKE2B 9b39a8d32a89f5fc9cff2d287fa1a050b24d15b9c221a831d17fca73818b00144788da809527592c43fd1285084ddf32e3560cadaa7a654a68465aa215fd2e57 SHA512 a3cfb09b529178980f5c54005cd9ba82e1a4284df6345600be7ddce9567bbb262babe15a1d8a5080905a53ef917a55b22db3d653b7de97b9017bd2a1656c5e1d
 MISC metadata.xml 1276 BLAKE2B 4784c9dbeb0760b1b0b8f83672a85dc318d2829dcfbe547b0e25da66128194db0662efc77bdced2c12e0219df3f6a660273d7966c8b2f320b320cbb3c210b814 SHA512 17efe89b6dcc8e93b7b4849af215210faf64e95ec34f39accf58bc2c9397818389126fe7de7ea0f2091a9e24cf282dc33b4c65b69545e8a8c19b2de57280325f
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
index 22f9ab4a3d52..86d06b0b9862 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7e3be8bad0b2..169e794fbf87 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index 5af993d6a090..7492dc64a562 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,6 +1,4 @@
-DIST glfw-3.3.3.tar.gz 763713 BLAKE2B bd6202877a3462d717a6d77b6381de704da854df011f7ab5172e626dc46df90793190284241b470a4b78e020302e5dca4051476e092e73e34731f6245a43ea14 SHA512 6d743d89d159bff6c4f7fa3fc5bc407fd728bdc432d76acc4897fd392580be272f8a9d1d7c375c4323e82bf2fd28310e5daab097fef33e8f43b69ce104f9bd31
 DIST glfw-3.3.4.tar.gz 762885 BLAKE2B b88f80ec8cfb1607a8c5ce5e6eabfe5c9813235c6225629ef8001ba5f46cdbed1d726aeed170a8749bbd048f1517cb614f9fc5ad7604ae1698b83b5e995b8cd6 SHA512 2b45ab72da7a2c007c0f42ccd56205f9684cfb980e2b1df127850cd057bb2b02ce02c7c64acd54cd433778e7017148f214afedf09badff9d2edf5f9b8d9d2701
-EBUILD glfw-3.3.3.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
-EBUILD glfw-3.3.4-r1.ebuild 1210 BLAKE2B a9f95844bb5f1a578511cf62756462259799a58d736dfd85a753ad9be0b25edf22deeef6cd20e7e2bcad44e187ed4801dbe26a1ac724565798cb5ea9a9c041cb SHA512 5163c45026772199ca6b6322cbfa3393d3173516980e136027f1859dbd9573de631012eecabc2006e137e8af7ed1a39a291bd06b843e3c2cb2d2d6e9f89d672c
-EBUILD glfw-3.3.4.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
-MISC metadata.xml 388 BLAKE2B 6f83bc48ed7a722cf0b64e450ac3839543db9713d3252c40eab395a54d53b9782e163a3238e6d443c2f8f6c8fd747a273ca018e08918fe084b048821665a8bbe SHA512 47ef3b02e4c8b3a12f328bc227f3ed2196c82e05970a9af12d1988a4466d5b614e0b788914dc03b4325a5cd2d63d93a677b6d093cdd50455c78b3d79c64a5171
+EBUILD glfw-3.3.4-r2.ebuild 920 BLAKE2B 1eea6a698f674045f0a5aceccb17a91970dcebb6df2b5a9c35a8296db0fb679764dfcaa84c5e5dca0cc34fa4762f318628770204e25c7a3a9741c719edc80462 SHA512 6eaf04bc7d9cd04725a78984f425fe35de49527ece075cf8ac9336b5a7b05c1f1643f7f1fcaf938e7697aa25b8aab39b9c6c3bc35aac242e820be189f0eaaf30
+EBUILD glfw-3.3.4-r3.ebuild 1274 BLAKE2B 9913c1bb47a27d7184740d7815e2aaac4548d95e354f11456d7348971c04b54c4ae617c1e77fc14b8ef95257ded33aea9b22ea07cd2b7735054c68098dd36e94 SHA512 632d68dc987ae90322f1bb13a7d5eb5e9611d3712e3e74947448a7eff5f17729765611a853e560256ad848683469e1a34ec5d9c0747d92d757cb7d554e2b0b0e
+MISC metadata.xml 485 BLAKE2B 0f1924b9f19207b2df6f61de6bd230a6423dac81d60dfd4602354e73db9fa6f5051e1f903c4f180fd5c0f9d58f39f645c720ebed8d7a67f4e260831ff3f3e3c9 SHA512 4cc8567cad28dff3b759614e99a02e86baf2eb8d2aa9be7bb3f4fb4efd341c59b4b25c79d204c63fa764e9b833142116f511cffa84f92d77721438d9df1df017
diff --git a/media-libs/glfw/glfw-3.3.3.ebuild b/media-libs/glfw/glfw-3.3.3.ebuild
deleted file mode 100644
index 126bde0fc027..000000000000
--- a/media-libs/glfw/glfw-3.3.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="The Portable OpenGL FrameWork"
-HOMEPAGE="https://www.glfw.org/"
-SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
-IUSE="wayland"
-
-RDEPEND="
-	x11-libs/libxkbcommon
-	!wayland? (
-		virtual/opengl
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXxf86vm
-	)
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[egl,wayland]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	!wayland? ( x11-libs/libXi )
-	wayland? ( dev-libs/wayland-protocols )
-"
-BDEPEND="
-	wayland? ( kde-frameworks/extra-cmake-modules )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGLFW_BUILD_EXAMPLES=no
-		-DGLFW_USE_WAYLAND="$(usex wayland)"
-		-DBUILD_SHARED_LIBS=1
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/glfw/glfw-3.3.4-r1.ebuild b/media-libs/glfw/glfw-3.3.4-r1.ebuild
deleted file mode 100644
index 43f33ee0dd73..000000000000
--- a/media-libs/glfw/glfw-3.3.4-r1.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
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="The Portable OpenGL FrameWork"
-HOMEPAGE="https://www.glfw.org/"
-SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-IUSE="wayland"
-
-RDEPEND="
-	x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	!wayland? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXinerama[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-		media-libs/mesa[egl,wayland,${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	!wayland? (
-		x11-base/xorg-proto
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)
-	wayland? ( dev-libs/wayland-protocols )
-"
-BDEPEND="
-	wayland? (
-		dev-util/wayland-scanner
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGLFW_BUILD_EXAMPLES=no
-		-DGLFW_USE_WAYLAND="$(usex wayland)"
-		-DBUILD_SHARED_LIBS=1
-	)
-	cmake-multilib_src_configure
-}
diff --git a/media-libs/glfw/glfw-3.3.4-r2.ebuild b/media-libs/glfw/glfw-3.3.4-r2.ebuild
new file mode 100644
index 000000000000..a8d714e18bad
--- /dev/null
+++ b/media-libs/glfw/glfw-3.3.4-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="The Portable OpenGL FrameWork"
+HOMEPAGE="https://www.glfw.org/"
+SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
+IUSE="wayland"
+
+RDEPEND="
+	x11-libs/libxkbcommon
+	!wayland? (
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXxf86vm
+	)
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[egl(+),wayland]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	!wayland? ( x11-libs/libXi )
+	wayland? ( dev-libs/wayland-protocols )
+"
+BDEPEND="
+	wayland? ( kde-frameworks/extra-cmake-modules )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGLFW_BUILD_EXAMPLES=no
+		-DGLFW_USE_WAYLAND="$(usex wayland)"
+		-DBUILD_SHARED_LIBS=1
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/glfw/glfw-3.3.4-r3.ebuild b/media-libs/glfw/glfw-3.3.4-r3.ebuild
new file mode 100644
index 000000000000..499e6061c4fe
--- /dev/null
+++ b/media-libs/glfw/glfw-3.3.4-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Portable OpenGL FrameWork"
+HOMEPAGE="https://www.glfw.org/"
+SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+IUSE="wayland-only"
+
+# note: libglfw uses dlopen() for most of these at runtime
+RDEPEND="
+	x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	wayland-only? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		media-libs/mesa[egl(+),wayland,${MULTILIB_USEDEP}]
+	)
+	!wayland-only? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXinerama[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)"
+DEPEND="
+	${RDEPEND}
+	wayland-only? ( dev-libs/wayland-protocols )
+	!wayland-only? (
+		x11-base/xorg-proto
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+	)"
+BDEPEND="
+	wayland-only? (
+		dev-util/wayland-scanner
+		kde-frameworks/extra-cmake-modules
+	)"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGLFW_BUILD_EXAMPLES=no
+		-DGLFW_USE_WAYLAND=$(usex wayland-only)
+	)
+	cmake-multilib_src_configure
+}
diff --git a/media-libs/glfw/glfw-3.3.4.ebuild b/media-libs/glfw/glfw-3.3.4.ebuild
deleted file mode 100644
index 126bde0fc027..000000000000
--- a/media-libs/glfw/glfw-3.3.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="The Portable OpenGL FrameWork"
-HOMEPAGE="https://www.glfw.org/"
-SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
-IUSE="wayland"
-
-RDEPEND="
-	x11-libs/libxkbcommon
-	!wayland? (
-		virtual/opengl
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXxf86vm
-	)
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[egl,wayland]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	!wayland? ( x11-libs/libXi )
-	wayland? ( dev-libs/wayland-protocols )
-"
-BDEPEND="
-	wayland? ( kde-frameworks/extra-cmake-modules )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGLFW_BUILD_EXAMPLES=no
-		-DGLFW_USE_WAYLAND="$(usex wayland)"
-		-DBUILD_SHARED_LIBS=1
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/glfw/metadata.xml b/media-libs/glfw/metadata.xml
index 6e5bbe581196..cd68a68804a2 100644
--- a/media-libs/glfw/metadata.xml
+++ b/media-libs/glfw/metadata.xml
@@ -9,4 +9,7 @@
 		<remote-id type="github">glfw/glfw</remote-id>
 		<changelog>https://www.glfw.org/changelog.html</changelog>
 	</upstream>
+	<use>
+		<flag name="wayland-only">Enable wayland support and disable X11 support</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index aa8ba0ce5633..ee4048884cbb 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-bad-1.16.3.ebuild 2204 BLAKE2B 4997f2c2c124f632229b3dbe185f553b53be5419d00479d4b9c712bade33bc4558800c9e64648e603cb007f2fc6bf9c67f25cc8215e66e65e32e579c373c2eed SHA512 a508b1e0d2521cbc35ddeeef9fee6a46d89d9c9670a8037875573cd34492acd2a222bd95d09e78dfd4996c977e81ec71ba382f6c68578d7e6dbb15d95653255a
-EBUILD gst-plugins-bad-1.18.4.ebuild 2283 BLAKE2B e8b5e6a9e096ca4a80b2b4528e7039eff1c9452028b40940afdd3f2761a5b444c80f25553a88f9ece038b305ec03f3d7652848edbf5d65aa2c7e959c1e80d197 SHA512 7172d2c14973d58c169d2b6a9ce58111a5af2cd70007fff14421b4b316139a2009bf6484d858ea4e55ab53fa06806f810de208ff7110ed26120e62f546c7b0a6
+EBUILD gst-plugins-bad-1.18.4-r1.ebuild 2314 BLAKE2B 75de39e014467b29cefcd5f38bd23d83bf9d2d354a013272e136d741675d86a02c0b8a2cf3f7b377105a332e8b31cc8b88a634064a17c0bfe54848e3d890ca96 SHA512 b045a8ebd940c1122cc482a5256d46dd7dfc4c702c0a84f0b856931a22fc45524c64338579fddfd504c4df88ba6f13db9ca20f4bce787392f2ab00a2faf101cc
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r1.ebuild
new file mode 100644
index 000000000000..a8972f02f837
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit flag-o-matic gstreamer-meson
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+# TODO: egl and gtk IUSE only for transition
+IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
+
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
+# FIXME	gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
+RDEPEND="
+	!media-plugins/gst-transcoder
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
+	wayland? (
+		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.4
+	)
+
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+"
+
+# FIXME: gstharness.c:889:gst_harness_new_with_padnames: assertion failed: (element != NULL)
+RESTRICT="test"
+
+src_prepare() {
+	default
+	addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_NOAUTO="shm ipcpipeline librfb hls"
+	local emesonargs=(
+		-Dshm=enabled
+		-Dipcpipeline=enabled
+		-Dhls=disabled
+		$(meson_feature vnc librfb)
+
+		$(meson_feature wayland)
+	)
+
+	if use opengl || use gles2; then
+		myconf+=( -Dgl=enabled )
+	else
+		myconf+=( -Dgl=disabled )
+	fi
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_test() {
+	# Tests are slower than upstream expects
+	CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4.ebuild
deleted file mode 100644
index 7e613b0fa6d4..000000000000
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GST_ORG_MODULE="gst-plugins-bad"
-
-inherit flag-o-matic gstreamer-meson
-
-DESCRIPTION="Less plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-# TODO: egl and gtk IUSE only for transition
-IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
-
-# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
-# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
-# FIXME	gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
-RDEPEND="
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
-	wayland? (
-		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.4
-	)
-
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-"
-
-# FIXME: gstharness.c:889:gst_harness_new_with_padnames: assertion failed: (element != NULL)
-RESTRICT="test"
-
-src_prepare() {
-	default
-	addpredict /dev # Prevent sandbox violations bug #570624
-}
-
-multilib_src_configure() {
-	GST_PLUGINS_NOAUTO="shm ipcpipeline librfb hls"
-	local emesonargs=(
-		-Dshm=enabled
-		-Dipcpipeline=enabled
-		-Dhls=disabled
-		$(meson_feature vnc librfb)
-
-		$(meson_feature wayland)
-	)
-
-	if use opengl || use gles2; then
-		myconf+=( -Dgl=enabled )
-	else
-		myconf+=( -Dgl=disabled )
-	fi
-
-	gstreamer_multilib_src_configure
-}
-
-multilib_src_test() {
-	# Tests are slower than upstream expects
-	CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest
index 3b30fc661398..45790f15dec3 100644
--- a/media-libs/libhdhomerun/Manifest
+++ b/media-libs/libhdhomerun/Manifest
@@ -2,5 +2,5 @@ AUX 20190621-use_shared_library.patch 524 BLAKE2B 51fa3fa3e8be71ce255b714f4c542e
 DIST libhdhomerun_20190621.tgz 50817 BLAKE2B 7d4293e38be5283fba5d46cb162ee19d90c30ed63481cd94445a055fa0f80597fdacedd59e35ba4edfb53934ce339e967eb0c42d0ae72289ce7d39eb1f91cd50 SHA512 d15c5b0703bf8ca1f3979a8cad93fc33d87c1309367ad5117354c60112a5505d90e80d4bf9055d16b0eef2b892015c5f4886e6544178090b3550c3a8dbd86576
 DIST libhdhomerun_20200521.tgz 51014 BLAKE2B bca7c09afd16dae9177cf8b8c828827818acf8bc24eff404591178519bd1b568bb8689721b452bf23ae5b37143cf85aa6fbce52177fcfbafcd5e30e6f1ceafce SHA512 ac253923b531a8e1f714b7fb98da5a2a062144c045117a63e5bb16b33a49ccafcffd24f5520d412d15ca55bc1810fc0ecb9ad05e2d7f5a196b5439b4e28d5c23
 EBUILD libhdhomerun-20190621.ebuild 742 BLAKE2B 4b318d87d60e18826d853bc92451f2d4659af5ed915aeb3c596f7fa33e17cb6e7a0ea2b45d53e2f9ed4237b2ddcfeb05a19afe882166c4596ccdf5c531838275 SHA512 d3ae13a413af9e8ad508d1f5834295dfedadfe1047b65fd360d4997c7b58d6c3e533bc66c09738e57261698c1c5630df463e4a063a92bc649acc7a6420d5e72e
-EBUILD libhdhomerun-20200521.ebuild 744 BLAKE2B 371d6131e7ce1c1e6993ddeb859baaa463450ff2f614208910d457bfb0fa03ac78aa97c7cdd5ee11ac5b3e698c8273e128ff535cf1cef69ab592f7b1f702de34 SHA512 5d08574b6a4a446f90228b47e363f313b474466deb8a4bb6715bb0551187515644eeaba6d2832f9b05d02fc15b82e6768c191c7688dfa5c9910f76c8571b9656
+EBUILD libhdhomerun-20200521.ebuild 743 BLAKE2B 4d0c8729a70f1a3d4d3ab8a5c469dea3f650e9778160458f1eafa8b7a92fb569563f792a36598c41d024979f08519522ae26a5f9b51ca5d54294e0d630d3b2b6 SHA512 12ea5a2751e9f82e7bfc848d1532a91f86a19831f4834492a537711b5206a97f1e27bf94da8d6329717c9f4be7c24d64d6952fdf2adf1f6286974609d5451f5d
 MISC metadata.xml 411 BLAKE2B 75f777e333bd3226a4fa56e247c2a1a9470b3d9f8a75b03fa54c6d5d286c48ca6f139f9d40deefd95516eed1c29a6d90d490a82b1614c93042efc284cd4d1fe2 SHA512 5a494427f6131f779b27d6296673dc2448bd66116a9d668d3a3814f868bf0a951cd853ec2de514083b68e0b85e99ddffed5d99b8a5c1140569c546734466da5f
diff --git a/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild b/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
index 237824f93458..a47b92cd0696 100644
--- a/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
+++ b/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 PATCHES=(
 	"${FILESDIR}/20190621-use_shared_library.patch"
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 4278c7df6c7a..bf8ad8933482 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,6 +1,6 @@
 DIST libheif-1.11.0.tar.gz 1680855 BLAKE2B a85ed643bd05cd59a34e9e42c0b8690fc779c06d01aa4925b177c1a36e7a4d11c9dfa798295c9b8215f45802e80119f2a8f5c3876103818c5436358416d97dd8 SHA512 1a5d54a09a5dc581a054052bac4299f7c96ca121650e9238312c426d5261247ce6af1840088b8717c5a53d212b7ec17bfaa109b9245abfaebf1603eaeb77b0ed
 DIST libheif-1.12.0.tar.gz 1684355 BLAKE2B 6d84678b39476f2d797d586c6dcaabc9a82351fe3bad536cd90edab16dabf91cbdcdb291195ff45061c7b0ad164748c53f87cbb2dc1e318b2cd458fcba74f644 SHA512 9e6f74dd52841a33b6021a1581ab28c56123d927caa7972acd284444e90888bbdae983b6d847d20eac7651dacea2193d27eb8df45928cb0774229ef8eea23294
 EBUILD libheif-1.11.0.ebuild 1829 BLAKE2B 79717765460165bad32b30e4e6ad000cc5436b516c62415e1b4d8d885fa03f894394f5b2e9e60114f2b0d3edfed335ee5c5de1ceb01f09bd2fbeb2cc3e29bc5e SHA512 cec879361ba3869c151da18a27059055d17466fb49bcb3d88121c8aa940b36bcd08e4ad2c9c684cfcb87db1800af23b61dbaca3d02ecdbf39a1843056c96a496
-EBUILD libheif-1.12.0.ebuild 1832 BLAKE2B c356d6900836f2be4a67be40684ffaf0546195d24c0387e1b140b5b2ffdb9d46f860af7350b6013a799ca783a37f981ca79e6e392d77b2b6f41d84e88a7a7ba5 SHA512 eedc2d6763d9a7d7116ba536f08c70c87e3255b2bcca2086eedff96109a94270ebbb424b6c87d88be58767259de1cf64ed7a63daf707143b51b563f37d6baadb
+EBUILD libheif-1.12.0.ebuild 1831 BLAKE2B d4dcb3a09dc6031152a89f01cf9ef58e9a3a8f9cb8b9dee77834cab99b0e3cb9d6badefa619b8696d45478461b7dbc31128ab6ca0dc67d2248ba473c51992f2f SHA512 12004e9b44197701e8322184321c9074112c63b277e96f68456f614aed8dfc57c824ffdebf943a40c52104f3a0ae7347b7fb1cd573e8e5802bde690d54f76413
 EBUILD libheif-9999.ebuild 1833 BLAKE2B 2049ab3555555fe927b1ebdaf5d9bb2bc29d160c836be1f346814b05f861a5c60ee8e9dad3077c59e689156dc61db57f90b2455f6ac1593aa59e11ddc155b28d SHA512 164ed6c60d44737d6915770a728e87a4bb53e58c4a6b7cd648661b6b406754aa909011066b8ba7c6a785f7f20884798c516b4c3a767f12fad015586d1f2a87b7
 MISC metadata.xml 1038 BLAKE2B c04c4e8ef4df16a22ab34e87ab9142f00243aec2e471a17645ae74b9159ab7092c396cb65131c762ab5b102bf510b3859f4a9e36870cb10d254614ba8fcdce95 SHA512 fad35ef040ebf936350bf75195aae4a8ceb42472f5243b5e3e6afa170a5a9d4c4f2e6fb93d6674c13e27051261f210f24b155f6f666f3a9af896726906280d31
diff --git a/media-libs/libheif/libheif-1.12.0.ebuild b/media-libs/libheif/libheif-1.12.0.ebuild
index 1a9f7ed19924..7189425c7796 100644
--- a/media-libs/libheif/libheif-1.12.0.ebuild
+++ b/media-libs/libheif/libheif-1.12.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
diff --git a/media-libs/libmediaart/Manifest b/media-libs/libmediaart/Manifest
index 65a9cedd776e..84da2fc13672 100644
--- a/media-libs/libmediaart/Manifest
+++ b/media-libs/libmediaart/Manifest
@@ -1,3 +1,4 @@
+AUX libmediaart-1.9.4-drop-bashisms-configure.patch 1524 BLAKE2B 6ae4ba196772750f9a09ad90d6c3e66965ee3c2a828211531aa3321f582da5b3c8e3304687fb077ff67fd1c0a5fe4ef39d9421382073452abf0e94de50eeb769 SHA512 ed049f69e5899e4fc8a897c245845a2b80e4aead9d7a28b9e20ce4b73de3c495f35afb0b8d44481ced868c537ecd0236dd5cbcc674e7483d75ac329c4ca9c0db
 DIST libmediaart-1.9.4.tar.xz 5827928 BLAKE2B defb53867341e3f0f794b3e167532f3ea232028b3ccc3968b13456eb74cacf8fab97e462914debaa0a7f08a2dcb98dcc0e77dec55319291388050a55b6a70a37 SHA512 e2526c22cb656c821da626c43c09d72afded1dfc369e77baea3de17dd6d3bd3b829cf3160e386459f55b9580cbeeb1d621c85876cb62739bc8d4f42429bdce1c
-EBUILD libmediaart-1.9.4.ebuild 1771 BLAKE2B 90f9d3b0ec1254db14cb0c12854bf50f88080ed6b09930c2370977496eb83737596fdee23725aa8eee8fd91fd6570d56e80be301f4f6ffb07299d716bf857bf9 SHA512 2230bafa2bac7c8cccbff07b3651f90f89678b6fa7bdd0e7d95ba5d853d7237e899c09a606f780d3501ced47e9eb79d01edc3705696784f395b8c63a9dee48b2
+EBUILD libmediaart-1.9.4.ebuild 1793 BLAKE2B 258615d5ea2858b72d842d52130e6e3abc67c28a9c82663c21bf285d5273c2f945387272700f6946c190d4860c288719d2dd39d8a6e92029dbe46119796258f5 SHA512 044aec185ae9be44719409479fbc9a5af5cf075a5962160b73c6d08461af05c441ce584504626b62c6f70c917083c8bf358636c7438d6ccc9899fdea8f6fb32b
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/media-libs/libmediaart/files/libmediaart-1.9.4-drop-bashisms-configure.patch b/media-libs/libmediaart/files/libmediaart-1.9.4-drop-bashisms-configure.patch
new file mode 100644
index 000000000000..8d65e7cd5c9f
--- /dev/null
+++ b/media-libs/libmediaart/files/libmediaart-1.9.4-drop-bashisms-configure.patch
@@ -0,0 +1,38 @@
+From a193e48dd01ad3aef9dd998c1247f649719f0a80 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 1 Aug 2021 07:48:51 +0100
+Subject: [PATCH] Drop bashisms from configure.ac
+
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9ae1292..106ea57 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -218,18 +218,18 @@ selected_for_media_art="no  (disabled)"
+ # Choose between backends (GdkPixbuf/Qt/etc)
+ ##################################################################
+ 
+-if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then
++if test "x$enable_qt" = "xyes" && test "x$enable_gdkpixbuf" = "xyes"; then
+    AC_MSG_ERROR([Can not enable both Qt and GdkPixbuf backends, please pick one])
+ fi
+ 
+ if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then
+-   if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x5"; then
++   if test "x$with_qt_version" = "xauto" || test "x$with_qt_version" = "x5"; then
+        PKG_CHECK_MODULES(QT5,
+                          [Qt5Gui >= $QT5_REQUIRED],
+                          [have_qt5=yes],
+                          [have_qt5=no])
+    fi
+-   if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x4"; then
++   if test "x$with_qt_version" = "xauto" || test "x$with_qt_version" = "x4"; then
+        PKG_CHECK_MODULES(QT4,
+                          [QtGui >= $QT4_REQUIRED],
+                          [have_qt4=yes],
+-- 
+2.32.0
+
diff --git a/media-libs/libmediaart/libmediaart-1.9.4.ebuild b/media-libs/libmediaart/libmediaart-1.9.4.ebuild
index 31eaf8162456..8bc2ef34496b 100644
--- a/media-libs/libmediaart/libmediaart-1.9.4.ebuild
+++ b/media-libs/libmediaart/libmediaart-1.9.4.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 VALA_USE_DEPEND="vapigen"
 VALA_MIN_API_VERSION="0.16"
 
-inherit autotools flag-o-matic gnome2 vala virtualx
+inherit autotools gnome2 vala virtualx
 
 DESCRIPTION="Manages, extracts and handles media art caches"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/libmediaart"
@@ -47,6 +47,7 @@ src_prepare() {
 	mv html/libmediaart{,-${SLOT}}.devhelp2 || die
 	cd "${S}" || die
 
+	eapply "${FILESDIR}"/${PN}-1.9.4-drop-bashisms-configure.patch
 	eautoreconf
 
 	use vala && vala_src_prepare
@@ -56,7 +57,6 @@ src_prepare() {
 src_configure() {
 	if use qt5 ; then
 		local myconf="--with-qt-version=5"
-		append-cxxflags -std=c++11
 	fi
 
 	gnome2_src_configure \
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 8d04789c78f6..06dac74ef0a6 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,4 +1,4 @@
 AUX libmng-2.0.3-jpeg-9a.patch 1378 BLAKE2B 72a3cdd738dd480bb216589bdfc1b935cf966c2e6d3e1029eaef539f67cd8e01977de71dd0c0e22321238af2963a615ca180c3efda3096cdb4fceedffc6e8db3 SHA512 d30bc5aeb586b88698695762594a238e339e5790831fea45d0ef54c8107951791c87662fa555454528ea8591dd5f42c55ff4225c1b8f83228c925eccd6f0eb71
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
 EBUILD libmng-2.0.3-r1.ebuild 1183 BLAKE2B a1a32690bb385d1da40ed6e37c5f0d4407647d2bcda137f2bf0abe88e29730f789a9012f1e2ddd0750eb5f93e935d96c566b3005014371b74ed45b7bc8116200 SHA512 bfc98412688d2261182198cc2172d8713c61133713b550717db4994112106e10181d12575d21dd3afae431ceeb5e8dd689ace57e4b148953ac3e3c96ef5a6825
-MISC metadata.xml 291 BLAKE2B a9b24a9ed6218970d09a574357f76445e0966a927f5d12cf72b2be8b01a7dc6070562bdcb13d7f341b16ea695d45bf0330eb8a9e416593f79eff1fd5171638b1 SHA512 662be34d4175954a83c5dafae699a79ddefd0faef98f541d0c7ab1cccf930e1e980f9cb1c9efe085dafe4ed6373a254aee9d5f2f936b537da29acfa0cf5ea02c
+MISC metadata.xml 320 BLAKE2B f086cdd5cf1ec69446c9b85325be155bebb814097af345023714b9ecd967de4403f97aee61a60b4de13af9bc2864bf35f6fffc37f3fe0b866c100488cc31a72e SHA512 61aabe31a3fe3613a29b6baef4d387af66edf0bc1a0c8818b42458fe4e4d4c3409a2ad31f280eb7cc5d742440b1dff29c2d5953e63d66ed661c00184624c0267
diff --git a/media-libs/libmng/metadata.xml b/media-libs/libmng/metadata.xml
index a81b3f0f7ddb..0942c0b3fee7 100644
--- a/media-libs/libmng/metadata.xml
+++ b/media-libs/libmng/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libmng</remote-id>
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 76ce4e3d79f2..c49e27ff134c 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -7,5 +7,5 @@ EBUILD openimageio-2.2.12.0.ebuild 3710 BLAKE2B 2076161c441805358fc03c4ed31a283a
 EBUILD openimageio-2.2.13.1.ebuild 3710 BLAKE2B 2076161c441805358fc03c4ed31a283a6851d59486c2cce1b4eed6a5f14171ce10f2e3c72916d00418d03488b7d38b6a777e5907a9414570428f597fb63be5a8 SHA512 d5a4a577c06d712ed7c6f55af24bdaa5be2bba5f9da838348f418da5c3d5958d5b36bffc5e33e72a02efa415d60e0f263c8e0db67f5b653e46d0ea1e8bdb0171
 EBUILD openimageio-2.2.14.0.ebuild 3796 BLAKE2B 5cfefbf0405c513ff43d6baf459adae1700d446883646cdfdf29b650d9242209d3f7e77b0b3c835c71e61d6c7c065bd700d6287699b30754b9376526a5034fff SHA512 ff91ac8f04e6977506ad2cbfcc69d0ded458f0da9740a856ec25921f016f35e212f36af517a05c76d487cc263a597def610c772e8ba646e7de0689e99b558af3
 EBUILD openimageio-2.2.15.0.ebuild 3796 BLAKE2B 5cfefbf0405c513ff43d6baf459adae1700d446883646cdfdf29b650d9242209d3f7e77b0b3c835c71e61d6c7c065bd700d6287699b30754b9376526a5034fff SHA512 ff91ac8f04e6977506ad2cbfcc69d0ded458f0da9740a856ec25921f016f35e212f36af517a05c76d487cc263a597def610c772e8ba646e7de0689e99b558af3
-EBUILD openimageio-2.2.15.1.ebuild 3796 BLAKE2B 5cfefbf0405c513ff43d6baf459adae1700d446883646cdfdf29b650d9242209d3f7e77b0b3c835c71e61d6c7c065bd700d6287699b30754b9376526a5034fff SHA512 ff91ac8f04e6977506ad2cbfcc69d0ded458f0da9740a856ec25921f016f35e212f36af517a05c76d487cc263a597def610c772e8ba646e7de0689e99b558af3
+EBUILD openimageio-2.2.15.1.ebuild 3794 BLAKE2B 268bfcdecae67835a2da461d2ffdcbfb226bc5f46b3a988bf183eb4b6d95700e385cfd51e65026bd0f51a89f33765028948ce270e9c6189ddc6b4b0f579126b5 SHA512 e54417237b52b942e0fbd7ba4b5f60026bd41a2ad70fde07487217a14cce883c8c01b6b86677680045d3d70af198af8e18d3b9e8bd860fb924ad44b74d52915f
 MISC metadata.xml 936 BLAKE2B 0ba7d5d9c77d481d876a273f479cc33f7b4233be522a6722aa4762ff682166eebf93645a5c042591c7495e4954bc0c61fa89083fd2b4ee76a5ccbdb5299dfcba SHA512 732d0ad35c7176710ac7a5362a4a6ac03c01d11d8df016654b13490e84b6d56801714158536abaccafccbc14b55234a78095e8a1d9550419bf0a67fe3d4cab5c
diff --git a/media-libs/openimageio/openimageio-2.2.15.1.ebuild b/media-libs/openimageio/openimageio-2.2.15.1.ebuild
index 36c2ee69a52d..d12beb042a0e 100644
--- a/media-libs/openimageio/openimageio-2.2.15.1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.15.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oiio-Release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/2.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 X86_CPU_FEATURES=(
 	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index e3b5fb29c452..289915f8ac19 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,4 +1,4 @@
 AUX qhull-2020.2-deprecated-pkgconfig.patch 473 BLAKE2B 5fbc2b1b9a4cd5a6c5cff46484b943b36de2f327c051b9badc32c952373b7f250eb751b46c8884e1dcd1c23b4bd2c50e4d5b1af7129ee477e1e75aab55d1f7be SHA512 a688943f6e0210ef170cfe9a8b3f186460bd2654c30cd0b0ca30b71f3245189be76dfa3648fcb9cbfe8daee27e11bec23a7a6016abf0213f0ce418f1fb3c5654
 DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36
-EBUILD qhull-2020.2-r3.ebuild 1503 BLAKE2B 686b26d03141a67125eb163ec66b64d102ff64dc218a577f33a0d24233c464e1b594191830d86d046cee78a9de8c4bb7bf0ce761925b98739c7c5d28bd977de9 SHA512 6977bb7b705e5664e37a9aee412b98623a314aa906d37a0c50abb03c7422140bfde36397f41652a4df7b3981e175fbd99a6f0bc8597df699190aa47f53e74dcc
+EBUILD qhull-2020.2-r3.ebuild 1509 BLAKE2B 49c2770268dc1cc2fd9ff9d3015ae55533d974d099f35d8d548d51021b32078dbc048e6ead0a3e004653b4cdbd4bc09ed2b5eb242158ba53547d10b47b0e5c0b SHA512 6f2232a244eb6f835240832c89ef23cdf17e28d502f228aea16a4c3ff6405deaa14ae3aa68d8bd01b3cb5806cd1be58457b7b2241c455aae461c86b7e38fa304
 MISC metadata.xml 1094 BLAKE2B 9667f9f89fc9717129401070888401f0db493c01e4fe73eb8168efae9c1c2d7f1a7aa234fe72f3beea7feb385dc920418a6affe4d99679736cc6a1aef212e4eb SHA512 b1e13904fe69b4535806a871cdda79fadbf294c30654fe119e7e3be0ed481dc926a9dfaffd75c2849e3eb91ebad671a6b7eca293b40a249c8ccbee6264cfdaf9
diff --git a/media-libs/qhull/qhull-2020.2-r3.ebuild b/media-libs/qhull/qhull-2020.2-r3.ebuild
index fe64e83f5a4e..e42418c0452d 100644
--- a/media-libs/qhull/qhull-2020.2-r3.ebuild
+++ b/media-libs/qhull/qhull-2020.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/qhull/qhull/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0/8"
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
diff --git a/media-libs/quesoglc/Manifest b/media-libs/quesoglc/Manifest
index ff1da4b75ae5..4dfbb69f8d33 100644
--- a/media-libs/quesoglc/Manifest
+++ b/media-libs/quesoglc/Manifest
@@ -1,3 +1,4 @@
 DIST quesoglc-0.7.2-free.tar.bz2 657394 BLAKE2B 73798b80fea5be9a66aa7c0090ec0564d517417a8597d102d057fcd91bc4c6d0c48352470b02182705d135cb04434178b206a964d539283cc4ac69d2f1dc5cb9 SHA512 107cc28fe85722614bc6c222a64914eeef0de1c5dfa01cef9ec611e5caff54fdbcf2b387d413c0b56533d33e06741ca8dee99fc0c5ee1e63d9a95d86c6c69190
+EBUILD quesoglc-0.7.2-r1.ebuild 980 BLAKE2B 2cfb087464181f6019c5f83748c8d3bb4baee854104c7b252bb9a16b96d18d0852cbddc9057ff2c086dd35b48f7ac3416522fc802462cef5f24addbb6056bf3a SHA512 1bcdcf0b2f95874a1f16b71d0f83ccbb32ea8f250e6686525a4f46cecc53fd8fac3e740f9737fc911f55bbdc9d84fe2de831d186fe966b58b136f20797e2b474
 EBUILD quesoglc-0.7.2.ebuild 1070 BLAKE2B d47799a691ff92458be513ceb7c3cb450a536eb9bf5083ab1af805d8d52666ba6c5fcdfbb1a17ea7eb84a6e434e8a36ba2d664f55002e59ddcf9e29276b08829 SHA512 2d718bd3914ffb01fe1e4453ce6198754b2ffb67cfb6ff6863b457bdfc1b6d1832d57e8c2d6dd451bc2c39a94c42e271ad7592acf24ef55aeb65864f0153932f
 MISC metadata.xml 331 BLAKE2B ceaba043139669fa90e55b48c5b21bd1dcc7bcec0eb8fc8bd5d3ff4ed16a3c7bc29c63dfb12b5eb7b9041e918da1b79f9cfe34b27554f9ba83efae51d6c704a3 SHA512 ca843d6a3a6abbe8148dfd89cdda0a8b1335343f77b2f12fc6ac3760bbfa893c30db593ca6730674784fe60b3c1d31addfbafc6561ed415035880b09ca5df52b
diff --git a/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild b/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..6f4fe15c6eb7
--- /dev/null
+++ b/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Free implementation of the OpenGL Character Renderer (GLC)"
+HOMEPAGE="http://quesoglc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-free.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/fribidi
+	media-libs/fontconfig
+	media-libs/freetype:2
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)"
+
+src_prepare() {
+	default
+	rm -r src/fribidi || die
+}
+
+src_configure() {
+	# Uses its own copy of media-libs/glew with GLEW_MX
+	local myeconfargs=(
+		--disable-executables
+		--with-fribidi
+		--without-glew
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake all $(usev doc)
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r docs/html
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index dc05bfbdc169..c0c6f98b532f 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -3,5 +3,5 @@ AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd
 AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
 EBUILD raptor-2.0.15-r3.ebuild 1713 BLAKE2B 9c61a997c410dc4600384ec53b8995ea4782dd2169179c49073b0812953ef399a9ce360b8b6c4d626aae7351e80d50763abe76ea2c85eb9c482bbef04817ec6b SHA512 bb56a414bd06bcf3ee8a656e87e1e7171e2e7fd4bf3c690995d97e3aedd7a99418083f19a0ab2da8772ea6d985a888757e8ba393d02a1c9298c1eaabd7f06ad5
-EBUILD raptor-2.0.15-r4.ebuild 1887 BLAKE2B 56199b0bdce95b0419b691370517fc8c689835f9f04db78e046c9137589d155af1fc8cd4ceac8e32855690a4c527792b87999bf5869f87f3231bbede34513b76 SHA512 2ebdadef2c14f9fe445ba574a870e40f193c49de1eab96a0243b1d468308a1fad5d0cbed6c39e37d5b1932e715d2185f7f2adc1e49693c6e296656eae7015998
+EBUILD raptor-2.0.15-r4.ebuild 1881 BLAKE2B 664cab272ace46c9e3bbfd63599fda487fd80f30f5fed914a8e701a1ff69cd8eec3b5487c277b9aee03329b64fe710deec18698e424f0ef74c40c7c2a044836f SHA512 c3fb47567f101ef6a916739f18743fb9975499a2fec0f360888686d1036c1b9653ca247086bd74ad3c19e88313549ed080354bb80d6f8cc46ee276d22d838094
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r4.ebuild b/media-libs/raptor/raptor-2.0.15-r4.ebuild
index f32b2698b01d..3917c369d040 100644
--- a/media-libs/raptor/raptor-2.0.15-r4.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="
diff --git a/media-libs/sdl-net/Manifest b/media-libs/sdl-net/Manifest
index c16671bb5824..e92e68a698b7 100644
--- a/media-libs/sdl-net/Manifest
+++ b/media-libs/sdl-net/Manifest
@@ -1,3 +1,4 @@
 DIST SDL_net-1.2.8.tar.gz 360958 BLAKE2B 656fb9c86949bc962656edc7b950e64eee9b9b1ce1b257e6c4974c2d9be99714128c5556d3a3b7ea92cc6d294846af7a51a1925d17418afc8409e44a7b71099a SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b
 EBUILD sdl-net-1.2.8-r1.ebuild 950 BLAKE2B eace10eddbb039153f4de12e426cc8e7f170857541a4e4502522140bce44786e45c1e214b724fe3a57df25350bbfdc0e9447e5a8683decc72480cfa3c488b440 SHA512 5e8c3e5cf9112b614a082c9f5420cfcbae3af78fd011967fe4b2f6b81c4fa76a682a3b955eb96df2d0c72bcc14ca13bffb38e7b29c71b9fcea16b58fb04b07dd
+EBUILD sdl-net-1.2.8-r2.ebuild 741 BLAKE2B 5bf3efc99c552dc2e49f309ab784fdbcfcc44bb01b100ac230e4cd4682ac0b3e5f499f8354f5639d384a3faf357dabc495144fe08eb7edc79d4e5dafd0affd55 SHA512 a7bac88177b621a81476bf966cac977cb979e0094e2014d58116285bcdb9330abace1afd418faa354a77e820fe25fce01dfa769a35789d1811cf2c07a121fcb2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
new file mode 100644
index 000000000000..c84784f71651
--- /dev/null
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+MY_P="${P/sdl-/SDL_}"
+
+DESCRIPTION="Simple Direct Media Layer Network Support Library"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_net/"
+SRC_URI="https://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="media-libs/libsdl[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf --disable-gui
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 4fe9f513d2af..f19baa934aae 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-aom/Manifest b/media-plugins/gst-plugins-aom/Manifest
new file mode 100644
index 000000000000..0f8e38e23422
--- /dev/null
+++ b/media-plugins/gst-plugins-aom/Manifest
@@ -0,0 +1,3 @@
+DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
+EBUILD gst-plugins-aom-1.18.4.ebuild 529 BLAKE2B e515d3e051075d80193e99511c1cb606e2855ee3e178a98e2d1486d49746dccac10e365f5de73c14075b0b91a879325740ddc9b0c4065ca3a7a880f9f55c4ef7 SHA512 570c43b833bb870f2f00c2511ecadb7947368ba88464401afcd3f812760a26fd74446fbe1edbff507591ee9a560cc78bdb0d3e832fd3741ee516e50043c55221
+MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-aom/gst-plugins-aom-1.18.4.ebuild b/media-plugins/gst-plugins-aom/gst-plugins-aom-1.18.4.ebuild
new file mode 100644
index 000000000000..d3db2532a59d
--- /dev/null
+++ b/media-plugins/gst-plugins-aom/gst-plugins-aom-1.18.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Alliance for Open Media AV1 plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection +orc"
+
+RDEPEND="
+	media-libs/libaom:0=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+	>=media-libs/gst-plugins-base-1.18.4[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-opusparse/metadata.xml b/media-plugins/gst-plugins-aom/metadata.xml
index fb1ea7216a80..fb1ea7216a80 100644
--- a/media-plugins/gst-plugins-opusparse/metadata.xml
+++ b/media-plugins/gst-plugins-aom/metadata.xml
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index e7e07e87047c..9af3ee5bdcd6 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -1,6 +1,7 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
+DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7959e8159baa3c3b81751b6dc825137c26fe8e52d3ff2c9c734bdda1d01a087b67d1bce4da66de390aad8169c74001c8f620c SHA512 d44d4da9cb27a6b8e59cb3f0714cc71809c0f14b42ef8d4a2dddbb940efbcb9634a40596d3cdc7391016f6e758005c14aabe1f8f30bb597a57d85c2d94045e75
 DIST gst-plugins-base-1.18.4.tar.xz 3169512 BLAKE2B 8b5a7a08641532631842e2ec02379b116ae0f08cda7654d123dbb2d56f97667b94ffc716b389a14ad034d0edb36587d8edc2c4f53782135c53def248fa60d0a3 SHA512 c750d68404462807ff03f441e232c4d98752a9bceeec3038fb37a105942f25499bde0660ca688b6f3204c58eb6a2e3f33671e979018c8bd829e7591455961a6a
 EBUILD gst-plugins-opus-1.16.3.ebuild 1238 BLAKE2B 7875e4a2ed5aba7fc3b2297ff0224c2844753d1e879442b33f28e7efbf93fda5ffdb43fc6f0bdbfdf17a861d4b0fbf6f1575c943b6cf8212d816447af9f61512 SHA512 1f16371105dbd18d9a06755418e2cd38041211573372c28f702a5d7bf4c4209787682a74ec03f2a4952df3f6dbe9a489dc74e1fce6e2de49f642727bab17d8a6
-EBUILD gst-plugins-opus-1.18.4-r1.ebuild 752 BLAKE2B 12995f5d2e62d3d1b15ca140c4cf94e1cc8725b9607a31fc5e0a807865e8606399cf4c63689db029938da59aec6c24ca88d4b4e44c9408788825851c2a2729f4 SHA512 b0d2fb7dd6d1c78e25badec5255a9784edce493a7a5c045658882c7f0f5da4efaa4a3713d32b115fb475a5309b0ab6d8e07289a4e84dcf26620308cd00189933
+EBUILD gst-plugins-opus-1.18.4-r2.ebuild 1871 BLAKE2B 6545e6107bf6891f6f6b13d6db38acc6055b91797c84c6430fae0265b8cd4f72c70748d1027f536665e7cdab0c753e4c007bd707425227c082f396b5093e48af SHA512 a1f1ec12450f03494358af81e79f31cbe0a4fd4a9310065e4ebeff687d7a4466df841e9222b862d46f0827f42ebcd18966049ab158ba19f0000937def82e0400
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4-r1.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4-r1.ebuild
deleted file mode 100644
index e4dd16864734..000000000000
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GST_ORG_MODULE=gst-plugins-base
-
-inherit gstreamer-meson
-
-DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
-
-RDEPEND="${COMMON_DEPEND}
-	>=media-plugins/gst-plugins-opusparse-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg]
-"
-DEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	default
-	gstreamer_system_package audio_dep:gstreamer-audio
-	gstreamer_system_package pbutils_dep:gstreamer-pbutils
-	gstreamer_system_package tag_dep:gstreamer-tag
-}
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4-r2.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4-r2.ebuild
new file mode 100644
index 000000000000..4f310032efaf
--- /dev/null
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer-meson
+
+DESCRIPTION="Opus audio parser plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
+
+RDEPEND="${COMMON_DEPEND}
+	!media-plugins/gst-plugins-opusparse
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg]
+"
+DEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_package audio_dep:gstreamer-audio
+	gstreamer_system_package pbutils_dep:gstreamer-pbutils
+	gstreamer_system_package tag_dep:gstreamer-tag
+}
+
+# Everything below is for building opusparse from gst-plugins-bad. Once it moves into -base, all below can be removed
+SRC_URI+=" https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.${GST_TARBALL_SUFFIX}"
+
+in_bdir() {
+	pushd "${BUILD_DIR}" || die
+	"$@"
+	popd || die
+}
+
+src_configure() {
+	S="${WORKDIR}/gst-plugins-base-${PV}" multilib_foreach_abi gstreamer_multilib_src_configure
+	S="${WORKDIR}/gst-plugins-bad-${PV}"  multilib_foreach_abi gstreamer_multilib_src_configure
+}
+
+src_compile() {
+	S="${WORKDIR}/gst-plugins-base-${PV}" multilib_foreach_abi in_bdir gstreamer_multilib_src_compile
+	S="${WORKDIR}/gst-plugins-bad-${PV}"  multilib_foreach_abi in_bdir gstreamer_multilib_src_compile
+}
+
+multilib_src_test() {
+	S="${WORKDIR}/gst-plugins-base-${PV}" multilib_foreach_abi in_bdir gstreamer_multilib_src_test
+	S="${WORKDIR}/gst-plugins-bad-${PV}"  multilib_foreach_abi in_bdir gstreamer_multilib_src_test
+}
+
+src_install() {
+	S="${WORKDIR}/gst-plugins-base-${PV}" multilib_foreach_abi in_bdir gstreamer_multilib_src_install
+	S="${WORKDIR}/gst-plugins-bad-${PV}"  multilib_foreach_abi in_bdir gstreamer_multilib_src_install
+}
diff --git a/media-plugins/gst-plugins-opusparse/Manifest b/media-plugins/gst-plugins-opusparse/Manifest
deleted file mode 100644
index 8675610bb8c2..000000000000
--- a/media-plugins/gst-plugins-opusparse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
-EBUILD gst-plugins-opusparse-1.18.4-r1.ebuild 595 BLAKE2B f8a841be7ddaabc0bf104000594370758e03484ad9d2d94e11f2f7b22c10d052c36f221e69c35fcf3e903c74f3ef939d98918485a7e435ab8969a8a458223e6b SHA512 cf233840e4488dc2fd6d118e2bc0ef442ba2ce0fed05a509dda24838b2574ce357c92e89963af06f4a3bac0dbc57f77337e5b09894a4159121cc5bb1d6570e57
-MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opusparse/gst-plugins-opusparse-1.18.4-r1.ebuild b/media-plugins/gst-plugins-opusparse/gst-plugins-opusparse-1.18.4-r1.ebuild
deleted file mode 100644
index 030563ac4049..000000000000
--- a/media-plugins/gst-plugins-opusparse/gst-plugins-opusparse-1.18.4-r1.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
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer-meson
-
-DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
-
-RDEPEND="${COMMON_DEPEND}
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg]
-	!<media-plugins/gst-plugins-opus-1.18.4-r1
-"
-DEPEND="${COMMON_DEPEND}"
-
-GST_PLUGINS_ENABLED="opus"
-GST_PLUGINS_BUILD_DIR="opus"
diff --git a/media-plugins/gst-transcoder/Manifest b/media-plugins/gst-transcoder/Manifest
index 75ad0e2c7801..82f6dbf7d4e3 100644
--- a/media-plugins/gst-transcoder/Manifest
+++ b/media-plugins/gst-transcoder/Manifest
@@ -1,3 +1,3 @@
 DIST gst-transcoder-1.14.1.tar.gz 37919 BLAKE2B 2687150ff3d609245449135d5725840aab9ed83b487bebeb0daf86634db27b3e68a5aca6ec8fb21ae5bf7e3c3808bc8729db5b24f75dabdf2bff7715a456fb9e SHA512 22dcb75bb706193e67a840218a69df797d5f833935e87d8df03838def5d426d94b25972ca4db8ae2f20fea915d18ef0044ee928a2dfe240f3134cdf1fced7657
-EBUILD gst-transcoder-1.14.1.ebuild 1130 BLAKE2B 3539b98990779cb0fd9db520537dcf858f084f119feeef65e533f038ff194ce58c930f2a1fc8bc31ebe292f0d9b7d86e09c7df68cc377c5c8c73d9869dcde223 SHA512 e2297a52a7b4dc0fcb232900c3cb4afbba1b15462a9a938744a6566f2e33eb32738261b03b9137f36bacce06b2d3b4d1ddc1bdf9f7630716d3894faa5f0f83c6
+EBUILD gst-transcoder-1.14.1-r1.ebuild 1165 BLAKE2B d04bab5ff15497a49e96c2371a5764ef4b56ad75bfce9b9b09dbdae5f363840c6e1ea59b4cc3dedb09708c412eb92e859d7e5a9288c0a472506dc7282bb167e9 SHA512 dc20b2ee05ab7c2bcc0f4308aab2a15b6a71021222ee6c2ab256521d6780e4c879940cbc5ec5d670c0a5b865ea4cf1f13bf587ea5a66b94799bee52b1c15a8d3
 MISC metadata.xml 352 BLAKE2B 1a5235ce0b573e3d90026b96fc2c0d82ee9e01096b350aca26cf999b8d8a032c0ce456158d555a55c93a2a09a0273968042bd8e7846ae98c785a832aa96291a0 SHA512 0480d71908117c09665949e3cb348033cb18b21fed508daf1d9f5e765d13fa4f92ef0c42744cb613098afc59aa24693fd28c6e7efa28ac1877dae0c54460e8e5
diff --git a/media-plugins/gst-transcoder/gst-transcoder-1.14.1-r1.ebuild b/media-plugins/gst-transcoder/gst-transcoder-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..2acbdff7a418
--- /dev/null
+++ b/media-plugins/gst-transcoder/gst-transcoder-1.14.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson xdg
+
+DESCRIPTION="GStreamer Transcoding API"
+HOMEPAGE="https://github.com/pitivi/gst-transcoder"
+SRC_URI="https://github.com/pitivi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gtk-doc"
+
+RDEPEND="
+	dev-libs/gobject-introspection:=
+	dev-libs/glib:2
+	>=media-libs/gstreamer-${PV}:1.0[introspection]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection]
+	!>media-libs/gst-plugins-bad-1.18
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2 )
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	gnome2_environment_reset # fixes gst /dev access under sandbox for g-ir-scanner
+}
+
+src_configure() {
+	addwrite /dev/dri/
+	local emesonargs=(
+		$(meson_use !gtk-doc disable_doc)
+		# gobject-introspection can be optional now, but the only consumer (pitivi) requires it.
+		# Migration to have the option is not done, as gst-transcoder moves into gst-plugins-bad-1.18 anyhow.
+		-Ddisable_introspection=false
+	)
+	meson_src_configure
+}
diff --git a/media-plugins/gst-transcoder/gst-transcoder-1.14.1.ebuild b/media-plugins/gst-transcoder/gst-transcoder-1.14.1.ebuild
deleted file mode 100644
index 9b6e5e958bd3..000000000000
--- a/media-plugins/gst-transcoder/gst-transcoder-1.14.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson xdg
-
-DESCRIPTION="GStreamer Transcoding API"
-HOMEPAGE="https://github.com/pitivi/gst-transcoder"
-SRC_URI="https://github.com/pitivi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk-doc"
-
-RDEPEND="
-	dev-libs/gobject-introspection:=
-	dev-libs/glib:2
-	>=media-libs/gstreamer-${PV}:1.0[introspection]
-	>=media-libs/gst-plugins-base-${PV}:1.0[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2 )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	gnome2_environment_reset # fixes gst /dev access under sandbox for g-ir-scanner
-}
-
-src_configure() {
-	addwrite /dev/dri/
-	local emesonargs=(
-		$(meson_use !gtk-doc disable_doc)
-		# gobject-introspection can be optional now, but the only consumer (pitivi) requires it.
-		# Migration to have the option is not done, as gst-transcoder moves into gst-plugins-bad-1.18 anyhow.
-		-Ddisable_introspection=false
-	)
-	meson_src_configure
-}
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index 0b7b03969508..8b3dbb66bf86 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -1,8 +1,10 @@
 DIST kodi-pvr-nextpvr-8.2.3.tar.gz 150375 BLAKE2B 56493c4f7cb1a42c5b792934ffe5495b8c8083fb12a262a96f47fcadab53a1acbb3c614bb3c507980860bf2cc0c54be374207bdeaf9bb6478991c299c960081a SHA512 6a0bc9e170726246fb46e6fee6c829c36afd570be98ae53901da7fd8a72c319887d8a179dc9b227b8ef0b1628767b7257ef650bc127598d1e1337328c2aa4842
 DIST kodi-pvr-nextpvr-8.2.4.tar.gz 158037 BLAKE2B 7696679bc7f4d667df95e674e48d1616aba2588f4e1ed5e5d388520369c9ab16e75748203a18d5f85df4cbb1f1cb7eb8371fd2717bce79ef12edd82b0028ad6d SHA512 e256eb268afeed810e7fe94194762a3f22ba7f24bccb06a4ac137170864d96daae00094fd185354d88baedba34dd54e15c935f4dca6b268b0c74b1e9415ddeeb
 DIST kodi-pvr-nextpvr-8.2.5.tar.gz 158146 BLAKE2B 2e6060b151b0e16decbab39762facdb7d05ddc8c8d1288894ba53e28d6ebd484799399793482dbd2e7adf1db10b0ad89dc1169a528e5ed362e3835942bcedd8e SHA512 7ff620339c03a7519d2ea01be66a18df7a800ddc7e997fef2826d956565e67b8e5ce95d959409b7a476df39947a0b430de91d7e34d8163718cba0f9f3fd7ed24
+DIST kodi-pvr-nextpvr-8.2.6.tar.gz 159496 BLAKE2B 1e09869b04e5f69279c33138bdf466db7f00e92945437d86d5a61f57a41cd3939ecba50404da844778ea92a8dca322c4cd520c045c6ccf10809cf64acc61eafd SHA512 dbd666b96982223d5f8ef546e3dbbb42390e13109aa0c4a93222e1668171001391136b952d986d30ce8742394b502f7b41d8fef3ca2967bd1cf4bff5daebb1f8
 EBUILD kodi-pvr-nextpvr-8.2.3.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
 EBUILD kodi-pvr-nextpvr-8.2.4.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
 EBUILD kodi-pvr-nextpvr-8.2.5.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
+EBUILD kodi-pvr-nextpvr-8.2.6.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
 EBUILD kodi-pvr-nextpvr-9999.ebuild 669 BLAKE2B 2df674d0426fa7f3195e7ec54e507955811e2dd2d0d0ed70d2d7d61b43e466b15fa0a5539905f88b07159a3eb220e205c95daca2f42b0ed386ca4e2899f083cb SHA512 e25dda696230ab5f661277943e9265c4efb37091beabce465460893765f4758b6f5a72f88e9697c9bdfe6014f0638599db1c59226b9672dc387d9da1734992e1
 MISC metadata.xml 363 BLAKE2B 360045b62c00991268efd908e4d47cd2468232ce63afb72b10528ffaf853f5d467d4930415a0fc56360d9a7290a4e2a17225ac40b19f3d92998cfee0f47fafa9 SHA512 db285760307fda62a5e608534a3a5e531ff9a1efb6893450144f5d295b1e66b494f4daaabe41ffaf53da803f5be8ca9dd55dec7a5aa5bd118c37bd93ec2c9b9a
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.6.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.6.ebuild
new file mode 100644
index 000000000000..f1d5484de0ab
--- /dev/null
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's NextPVR client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/tinyxml2
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index aa1a6d83d7ff..f18a4d54d076 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/tlf/Manifest b/media-radio/tlf/Manifest
index 59be051557e2..8570e5098c3c 100644
--- a/media-radio/tlf/Manifest
+++ b/media-radio/tlf/Manifest
@@ -1,5 +1,5 @@
 AUX tlf-1.4.1-zone_nr.patch 468 BLAKE2B b9dc26ba4f2775dbdf2f2aacb763a70acbe4c6331a862f9db43774d0bbdeef9214c48f4cf30b0f52de5ab65b9ac157d160b52a19777a640f3a6d53c22187e74d SHA512 e415d62ed1bbb50bf6eedbe5bc93e06c02152bbb7f4a096f9229b3314a21125eec765255a7ddfbd07a478088a5097daaab5f8702d27c04babd5a29a5db7b4e29
 DIST tlf-1.4.1.tar.gz 708105 BLAKE2B 18cd617a8780293bbfec87875491935d16022e104eed128ab69cbc3824aa5f8ab77dd07728d952e9b932ea74ee1c258522c26b5458b715320d452d58a65cfd3c SHA512 89076ba3b870f65b1469d64a223a9d35f1afd3edc6801446990d7ce197b04dacf141efc40382c69c78935a16f386385df0c7b48a040072cecc311cda56d479b5
-EBUILD tlf-1.4.1-r1.ebuild 861 BLAKE2B a13e4f88232691cad9bce217861f3bfec85ae2128931236bdf710d434e89f6d3e5c7d5957af9eda41be45b7996ae1abf9670b442cf3563a63df8f9fe44c339fa SHA512 612f9b0877c1cc382e05ab9b047cae6bf1487bfd49387b8884e896d58e70b49b6704b5268c75b4ad9204204361df65fbe93dbc5880c60701e2455a4868adb2e8
+EBUILD tlf-1.4.1-r1.ebuild 860 BLAKE2B b6e341a2dbe1231f20240644f63971fd07c95710bab13407d8029172b4b231bd6b3e3871b7c69970818ee3274514eecc348e7bca209cd5f90fd5e51bb3612460 SHA512 1b9908d4b607af9bb75baaf51a3cc41a9b052ba439a0433b49bc9aa83cc154ff62d15ee1d8d95f4c9ef79a4d555e183413afc47392d33436b9a9b50a07250ae5
 EBUILD tlf-1.4.1.ebuild 677 BLAKE2B 8f970b1886111ace7ca4d8ba2582b602a2239c60f64cf423ef1f9f54935bbd4e4bc994927d37615ef2d89a9cc2b97d0e55bef79cd7f99a1cfc6fc81fa073eaa8 SHA512 92662a2c44cb6bb7c74e76bb791bc4d1901e406b0fcb316c4eaf8e376bd7db96f979ceea0b94981170f3d844587999c0ce5a4450da80a23963f6460d8d7f8d59
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/tlf/tlf-1.4.1-r1.ebuild b/media-radio/tlf/tlf-1.4.1-r1.ebuild
index e50113487189..dcbdd0c0db5f 100644
--- a/media-radio/tlf/tlf-1.4.1-r1.ebuild
+++ b/media-radio/tlf/tlf-1.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 9b710e7f1689..2cd5cc424e80 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 2480e5c5569e..9770b3cf0450 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,5 +1,5 @@
 DIST abcMIDI-2021.05.25.zip 604797 BLAKE2B 78b2d43bb7569aa2eece63f319352aa71b77e9c5219c5f806384f007ffe026741a0852ffffe1e6b6c15b60f69f54e143cb26aa47b54baca41bc2fc231fa5b66a SHA512 57975f7c131855a713fc399c7aa1c7bd94775e7a257f2412d321aa51d0bf95cf9e1410e0819d2ad5cabde9ef996512ccca16058f7267baabc5702a926c173b3f
 DIST abcMIDI-2021.06.27.zip 605658 BLAKE2B b522c96b7f8990f297cc13a3334872763fb2879f5893f09e630d66ab425d1772e0eee64273249d26e8118c6d341dad84129e140d8c309adab160f3120b5a18a2 SHA512 b1e4a7a9b93e6633abe211258995cfa84bb8eaed3870ed20e244aa12353c6cc351ea7e1c842e4e410dad9dd91b2e8c918826138bec39503c56e95062f4a99f37
 EBUILD abcmidi-2021.05.25.ebuild 676 BLAKE2B 916e0595b5c1cbf9dad1ba1c9fd7fdba8010898e12ebbc95ef02bcc725cb22a44e8608bf07ec3dd253128aafa3af728ae3709bb9a8bef786b3e6124cd32ae7c5 SHA512 3f000a5a47de4dcc3da9279dee49e962f526833ec4f85dd7f2d749d54b4c08057a99b53deef3c978f7dd1840ffd96b97d3db875d7bf559e27e18042eb8dc8bc6
-EBUILD abcmidi-2021.06.27.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
+EBUILD abcmidi-2021.06.27.ebuild 677 BLAKE2B 15803d35ed97335c94f3ad9d1a8ed07382af8e3b45de89f733426455572547539361a4da2169bfb2aeee50500a1d04e549a2c8ebd75970f8e18a6aa54d1028b8 SHA512 0f9c098e0766993c099e924609e4b51c76c33d3b0e173c1a919dd848dcec5a5dec4af18391638732635b47f385bf9886562c4cab7680ce0f8ca33a468a3ccefa
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2021.06.27.ebuild b/media-sound/abcmidi/abcmidi-2021.06.27.ebuild
index 10c98f2d31f4..ae3ead85a3f5 100644
--- a/media-sound/abcmidi/abcmidi-2021.06.27.ebuild
+++ b/media-sound/abcmidi/abcmidi-2021.06.27.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 93ba3630530a..c6f56ad52ee5 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,7 +1,5 @@
 AUX chuck-1.4.0.0-hid-smc.patch 2937 BLAKE2B 5bc65ffc74409860218983635501c319f4a69448e93340671ad252cd4bb5edd3d4765aa196b3618d7af37897aff40267e7d8538672560dc4de9650a12a5964b6 SHA512 09b04441e9bbd11a15e798878b79010598dd97513a64f6df21e5ed066147382d6021a496e1d1a33b2268d04caa972a1a94afe48c44a226439e3334da35f47be0
 AUX chuck-1.4.0.0-makefile.patch 941 BLAKE2B 64ef7342c0c07ca573efb7e7142854a4d366494983b400af484d9c0354cc662d1090bf6396e4955634ab2e1c9864a5011a8dcc6fe1213c02d4491cd9b57fb729 SHA512 3bb7cb3fa04863c2a4debf5eade64233d3d3ce38272f2d73d14d1772895c5f88ec415b1c22aa3b077204d4569a24ad25c6ca757e2c6a4df31e9fe48eea9c9fdc
-DIST chuck-1.4.0.1.tgz 14689073 BLAKE2B 408e2512f07a33fc86db80b05005ea65351257036f663153845038a0edeef95054dac9878d37eb22cc122035a6d1f80d008e151811277d4ee9d24ba3d79ad26b SHA512 92da0569349c900e633e8e3e544a0e5ec7df7b41a8508d2a99c825dfe490f00208b50b883298ce091b46f4e9274dabe0ec8bcfd80d094dd006b3c342f74bd202
 DIST chuck-1.4.1.0.tgz 14902696 BLAKE2B df324c793236fccc26f6604d1120dc1777cb2ffd8c95a8eff42e8963b9e7011aa88fb094145b4845821c39be781d77ac163cb02025db4fd6db7972f3c390fe65 SHA512 8967c1279959b6a41759519eace468fa4384cd0511c365cef91f8c03e8d720407637c2f9f33df6abd246b7c2155005e82d206113c90a4f23fb22b02f6f426704
-EBUILD chuck-1.4.0.1-r1.ebuild 1831 BLAKE2B 913b35f2727d5f5f728bd35ad2ca414df4c364b6f3963dc67e2170433aaa3160c31c71d42da6b138a743c537fbb53f95394b14e4ed9a4dff1d69d7054dde88e4 SHA512 fec380d7c388988e382884b713ea32f6c007885cd7c1203a06ca64490e7d0ea8482e9b609387e7719ac4b8dcc1ffc6b7e07f9d53426aaa3379a3f493b570c364
-EBUILD chuck-1.4.1.0.ebuild 1833 BLAKE2B 5b1b7a9194fb5ec0d56efb3152fa46c07487aaf8bda33a2b945ebb0e5d0da53736f778d5d4abebf74e3a2b49964a1935685c0ee92b42b1f17a745941543d3b77 SHA512 210e5d6f72c8d9c3ff2b729df89676bdfb120849b2ca4e09c037d3d84620e8df44db706d8f564f55eca8ac445cb518c4f7b3cf6ec6aa49f8dc9a8370b1b6204b
+EBUILD chuck-1.4.1.0.ebuild 1831 BLAKE2B 913b35f2727d5f5f728bd35ad2ca414df4c364b6f3963dc67e2170433aaa3160c31c71d42da6b138a743c537fbb53f95394b14e4ed9a4dff1d69d7054dde88e4 SHA512 fec380d7c388988e382884b713ea32f6c007885cd7c1203a06ca64490e7d0ea8482e9b609387e7719ac4b8dcc1ffc6b7e07f9d53426aaa3379a3f493b570c364
 MISC metadata.xml 967 BLAKE2B 505781d22a20892538d6bcdda07f1a1ecaecb56c8574cc6745d4fddfa2b4d3ab643947c1403827bc306eb0082434327beccd0eb583287eea9a488bf6adc4ad21 SHA512 9d4c5d826ec6f90bf81a84e389f2ecca527b5116693fc5c32ccb456f5cb29f7daa42f4d655d57d4ed11a0c7625ec65904777e765a64217a4c3b5ad8a9e17b6e0
diff --git a/media-sound/chuck/chuck-1.4.0.1-r1.ebuild b/media-sound/chuck/chuck-1.4.0.1-r1.ebuild
deleted file mode 100644
index 7bfdf97b999c..000000000000
--- a/media-sound/chuck/chuck-1.4.0.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language"
-HOMEPAGE="http://chuck.cs.princeton.edu/"
-SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa jack examples"
-REQUIRED_USE="|| ( alsa jack )"
-
-RDEPEND="app-eselect/eselect-chuck
-	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0.0-hid-smc.patch
-	"${FILESDIR}"/${PN}-1.4.0.0-makefile.patch
-)
-
-compile_backend() {
-	backend=$1
-	pushd "${S}/src" &>/dev/null || die
-	einfo "Compiling against ${backend}"
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX) linux-${backend}
-	mv chuck{,-${backend}} || die
-	emake clean
-	popd &>/dev/null || die
-}
-
-src_compile() {
-	# when compile with athlon or athlon-xp flags
-	# chuck crashes on removing a shred with a double free or corruption
-	# it happens in Chuck_VM_Stack::shutdown() on the line
-	#   SAFE_DELETE_ARRAY( stack );
-	replace-cpu-flags athlon athlon-xp i686
-
-	use jack && compile_backend jack
-	use alsa && compile_backend alsa
-}
-
-src_install() {
-	use jack && dobin src/chuck-jack
-	use alsa && dobin src/chuck-alsa
-
-	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Chuck now can use multiple audio engines, so you can specify"
-		elog "the preferred audio engine with chuck-{jack,alsa}"
-		elog "Or you can use 'eselect chuck' to set the audio engine"
-	fi
-	eselect chuck update --if-unset
-}
diff --git a/media-sound/chuck/chuck-1.4.1.0.ebuild b/media-sound/chuck/chuck-1.4.1.0.ebuild
index fe70a1b1ed7b..7bfdf97b999c 100644
--- a/media-sound/chuck/chuck-1.4.1.0.ebuild
+++ b/media-sound/chuck/chuck-1.4.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack examples"
 REQUIRED_USE="|| ( alsa jack )"
 
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index cc4c0fba0a3f..27561eba7daf 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,5 +1,7 @@
 DIST drumstick-2.2.1.tar.gz 1976813 BLAKE2B ac27fbcfb92fff2b7d69c70f9ec677343e8d66164997a29f319fbe94e6d12582cb4af67f0ff36126a6102e48bcbe4d4620e9442fdecf07aaaeecf37e9458c590 SHA512 d99c774f33db9d8555efd83adc8968d6d244e56e7976d68f0f90ff89cfda1143b2e07eece6b465fffba354073d4616c5a767f09f2ba282e252ca0955723cadc7
 DIST drumstick-2.3.0.tar.gz 1978608 BLAKE2B ab05030d402c03053bfcf315e8c4e54b73975f0059719cf5e58db64ddac394555b898e3e0008b892901d7395c89a160631ae8eeb9d1cd52c3abd0533c5fdafdb SHA512 b12a39153600b37ef61a31255721466bdae5896b562276860688f9e22259ba4747086abeb828dcfef24c8e1fb7bd371dea1c6d51098cf5e1797e212cde70f46a
+DIST drumstick-2.3.1.tar.gz 1978856 BLAKE2B 47f7c9872964fb267834b23e2d52fc1b10826629fb256dae410161305c3587845ffcaf00f0d30a73df67b4a00849c53f3f1412c0473a52fbf69b106362175b3e SHA512 aaf0080405765878c8d1e164343eff0bb18d4add4a2f67de1ed0e978ae688948b73121f9cb50c52c23fc34b8c57e184d22a5c5aaa29969409071567142685dc7
 EBUILD drumstick-2.2.1.ebuild 1474 BLAKE2B 07193c21cb0472ca1c4a2dd7c7f5aa61000f8c8355a30250fdc02b5dd618db289b74b88bda95fa0f9eff5a182e92b67b5c57891d0cd2b265fc7d968f915674b8 SHA512 e88f66b0013ebf2e6bca1cdbac194a8f8b5363503119bd782b862bbbf7430892f8ed428822220764925a0528c5b4f03f5dec245c93e89d1243bca919a02170da
 EBUILD drumstick-2.3.0.ebuild 1320 BLAKE2B a07f4a8af466bb54ebbb2d77da55503386a0717dd0dfe9d4b63ee2eff1418edad5056092c516e73dc3d6fe40e208e58d612c3ee5a3b26d1de71daa119f8f75be SHA512 4b51e3f56701a6fa8fd5f5f0af28213680c6fa1fd16680381e6a3862c829cd31ec3d771bc7a5daa2e3f0b5b4654c5b1ab8e31da68e64cec116227a24fcf41b38
+EBUILD drumstick-2.3.1.ebuild 1320 BLAKE2B a07f4a8af466bb54ebbb2d77da55503386a0717dd0dfe9d4b63ee2eff1418edad5056092c516e73dc3d6fe40e208e58d612c3ee5a3b26d1de71daa119f8f75be SHA512 4b51e3f56701a6fa8fd5f5f0af28213680c6fa1fd16680381e6a3862c829cd31ec3d771bc7a5daa2e3f0b5b4654c5b1ab8e31da68e64cec116227a24fcf41b38
 MISC metadata.xml 598 BLAKE2B 099351919e92e9d8197fe31f09336761f9d886b67582b6dde4ce5b387a44f496e562de9456482d6651d63429955870b8ef8aadc178417d847da2d2e999a4add1 SHA512 16a287bd1c3039970522c09ab0dae6018924a34577692ccfdcde6d80476338eb4cc6576f155882cf96d44bb87d5523ff8df17f3ee8a86b3d1cf2a28c7543b089
diff --git a/media-sound/drumstick/drumstick-2.3.1.ebuild b/media-sound/drumstick/drumstick-2.3.1.ebuild
new file mode 100644
index 000000000000..8b2d865ce0f9
--- /dev/null
+++ b/media-sound/drumstick/drumstick-2.3.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
+HOMEPAGE="https://drumstick.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fluidsynth network pulseaudio"
+
+BDEPEND="
+	dev-libs/libxslt
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	doc? (
+		app-doc/doxygen[dot]
+		app-text/docbook-xsl-stylesheets
+	)
+"
+DEPEND="
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	fluidsynth? ( media-sound/fluidsynth )
+	network? ( dev-qt/qtnetwork:5 )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS readme.md TODO )
+
+RESTRICT="test"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		-DUSE_DBUS=ON
+		-DUSE_FLUIDSYNTH=$(usex fluidsynth)
+		-DUSE_NETWORK=$(usex network)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_DOCS=$(usex doc)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doxygen
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
+}
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 9fbc43fdef58..52314e83f6e7 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -3,5 +3,5 @@ DIST easyeffects-5.0.4.tar.gz 2070912 BLAKE2B 848d2fa6fc1290b6fc25e13c4bbe4d8df9
 DIST easyeffects-6.0.3.tar.gz 1905373 BLAKE2B f423cefd0e6124ee1128bf5a07fb23df03df4ca25a6ebcbcd122032e5768ee68ff3464cdb51263d731fee3e9f5fee180858d96ab627771099808b1194adb78b1 SHA512 eb88f0befb6cf86b7da03137cb7ed6ac833f204d17860d9bd508dc8b007b2a0fb941b63a015b1179cb4da28abd0b3d8a8c53d026fd5a22057fee27e02618035c
 EBUILD easyeffects-5.0.4-r1.ebuild 2267 BLAKE2B af9ad6a20cd77d8400ecf0fd91889795044414787ff96e7213d9a9a23f1269ca3936136506175600b45bdb1e046dbc7249eaa172e8c9de3450193bbd132fbfdf SHA512 601783a228252724fdd157fdfb5ffc7e83d40aae0f8f6eae69b53f5bb073d6f3ef45b80ded69618821496bbe037071f4f6b5b359ed1ca5cc52563d6ce19d4b0e
 EBUILD easyeffects-5.0.4.ebuild 1790 BLAKE2B 5be8a0a80e5ee355ab69ae30cf9553de9b0859dcdd9baaff20373c7aa1e89d95730a3a2ab0f552a4ee37209cfed53871a5e423b8d434d0532673e230c1fbbd56 SHA512 18ef1d69d988aa1d5553f97c48be4bed66e8d9859d22a2764593c9cfb3f7b36b1e784b0f7ddf6c206f99f4d2a534b133472ee4461afb5a66b04a20f9ba5ff6f2
-EBUILD easyeffects-6.0.3.ebuild 1816 BLAKE2B cbb1e54c3b2b7189b0a061d06001b34f6649b585f372c8517e0ece28032f9e8c86ff5284471709f5541ac521170609f483a230fd546c0efdbd8e24fb1de6c5b0 SHA512 e3aac477fb345dd72fc55cc36a20d2cf4e099ff5868638ec7c65b37efb38764c2e45f13f4a08c099274d4d79de6083b17e1290003fc8cb96cb86e3fd0e1c18bb
+EBUILD easyeffects-6.0.3.ebuild 1829 BLAKE2B 122c74b13a6669aefbebe0f0f12b93af6596eccad6d9bc70d2d41b7cea5de6c854981c01162227fc19bc0d2f49111aad8ead310c60eb905486546f8225c84c4e SHA512 4ac962f7ff6d91bfb968e49c4fc5b765e5505d97d332f66f458fec3c5b28deade15dc66ba4a5635d1946d6591e5509f39d091407ec15d0155c2b9b21d69e837f
 MISC metadata.xml 1098 BLAKE2B a64c34f1ecfabe52d954e6f1b9a3e5137c3b68a169166dae3f5cd0b02e22759b1e5e60e530d137e6460407247c1e4ef5c3de59ad959f9467fa296571aa823910 SHA512 303657f7a638668a65c9e17d39de40f46871b0a916ec39198529ab1270b0234705e819ad95a366a127a79fee5243a935d3f99c9daa0bad19ef7bc27f364a0828
diff --git a/media-sound/easyeffects/easyeffects-6.0.3.ebuild b/media-sound/easyeffects/easyeffects-6.0.3.ebuild
index 226bf5a1acd0..229d807b1c5c 100644
--- a/media-sound/easyeffects/easyeffects-6.0.3.ebuild
+++ b/media-sound/easyeffects/easyeffects-6.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome2-utils meson toolchain-funcs
+inherit gnome2-utils flag-o-matic meson toolchain-funcs
 
 DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
 HOMEPAGE="https://github.com/wwmm/easyeffects"
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index d6ce0a44006d..5894ac03bc38 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -4,7 +4,7 @@ AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
 DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
-EBUILD murmur-1.3.3.ebuild 3688 BLAKE2B 73d7bc6c7a50a5136736d3e53a2be1ba41a127d1289e13a05acecb0f4c79795e73935b46014d3e7bab08d5a453234fc90e099886a5a06f2a4ee1bfd5bc77f9c3 SHA512 c3e83e80d90b452e0e615b380805b969bbacaa29dc1518c2b3bca622321d6c84dfbb45b494230b4060b5df29d3f15cd53f9db13f6c6eeb71dd3022230569a9ea
-EBUILD murmur-1.3.4.ebuild 3690 BLAKE2B db48dd485b3e307aadf435a74189dfdf87ed76e3b563b8a4d8860869c2ec1c268a0f14b3a6fc81b71d029829d9f899af85d967534b01336d768ff8e690c4a5d2 SHA512 f889b8827df86105812a65275d8dd49fb815dae221a7f5d1ee8883b5f877d80e55d94b1c88b78a8ea52f953b196296cd2cf77bd8991f3092a6149bec50e6d5c8
-EBUILD murmur-9999.ebuild 3748 BLAKE2B aee27d701d61212481ddd4b24ff36b6bfcdf1e1d1439fcbe0cf0cd2d387b638063e2c28c520d63648bbae66bf3744b34ad44b0f3ee50db47d48ce77032869551 SHA512 3436bad5ff84371da14210b759dcc05d3f7bed961cf57098f658e0511e8ab3685bccd6b2866cd70ada32ca8a4c85b5562a00f031daaac93fa49cc52a07c07456
+EBUILD murmur-1.3.3.ebuild 3717 BLAKE2B b696165aaefb36ddc61ca17008bfc128d01664bccac3dd02729865a8d9f0b12b5d9f75648099d1b43d374e5cba18ff99c89cbec7174130e8c4598d6569c86958 SHA512 a76d12a2cc60d016cd4527b9776898e7dae75a4aa438eee36617afa40d118cd619396cec8db5eff2cd5579aac2cf61941cc77e027120a5996fbe5f574e7b0320
+EBUILD murmur-1.3.4.ebuild 3719 BLAKE2B 3b0dd3378a043e2bbfc5ebde7832985365a83ac4b524e818f5bb2a70963824376e3bf2973c6a43f02edf8b59c33947572150e250206595a73cf21a95f4a59d21 SHA512 5ecf3483b8c9e1c5bd74f385e5e4bd129f0997df9b51c18595797bfb60a624757be69592f0b0ed7b7b7e9a339eb52412ce9a0d9fbd309ca16d88382a6ffeea27
+EBUILD murmur-9999.ebuild 3777 BLAKE2B 4a25f63367c23082d3dff4e75027e077ca402612e1587246c21410a7cf582d20fa7a59c52f08ff9206cbd56df308d67524075c2258ed9557b6739566b5f64a90 SHA512 dab8a355b497a0b78a6958166960d2bde03edc2b07d56394420f5372e0aa9995aaf91b57b6e570221d5436904f9c15ab932aa12901205ac2646e8078a09d1c59
 MISC metadata.xml 530 BLAKE2B a6618cb804deee82cf3f88ee683a5b406eee1317e9ca815f7f4e363a0e14c7c8cc2bcf4400d3a79b62f5652881e46be4405d0ac88afe610187419978ac57c9a6 SHA512 ef162d69805d3262f9f4f1732e9d8a031cac73e130f04013123d8f8e1d8e48132df243653ef2464bda1d8b8c0b88485fd32edaab8b3e62555a6295c676c1f5b5
diff --git a/media-sound/murmur/murmur-1.3.3.ebuild b/media-sound/murmur/murmur-1.3.3.ebuild
index 2c04f6f334ec..9131ecb5514c 100644
--- a/media-sound/murmur/murmur-1.3.3.ebuild
+++ b/media-sound/murmur/murmur-1.3.3.ebuild
@@ -157,5 +157,6 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
 	readme.gentoo_print_elog
 }
diff --git a/media-sound/murmur/murmur-1.3.4.ebuild b/media-sound/murmur/murmur-1.3.4.ebuild
index adbc89cd82c7..6af71f6272f0 100644
--- a/media-sound/murmur/murmur-1.3.4.ebuild
+++ b/media-sound/murmur/murmur-1.3.4.ebuild
@@ -157,5 +157,6 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
 	readme.gentoo_print_elog
 }
diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
index 5eb4b58cfda9..49460f4e5a97 100644
--- a/media-sound/murmur/murmur-9999.ebuild
+++ b/media-sound/murmur/murmur-9999.ebuild
@@ -162,5 +162,6 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
 	readme.gentoo_print_elog
 }
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index fa35143d32ec..37459b889793 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -7,7 +7,7 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-DIST pulseaudio-14.99.2.tar.xz 1518460 BLAKE2B 66150756ca64aa3b0c8f689131e294ea67b48ae682ef7446bb4934a29a4e90d5944025b0a4701b623f53f07d7bfb790d64185e6d5ba0ec1012eaa0a3e9e2f9ba SHA512 fe8c1e5fe74d78d7f7155be2ea65a90909547841a717921ad526c05e4c4dbe4e810c3bb6d1fbae705a109c70cef627b87a2b16d948bb6d714f72f5e22e4a6b5f
-EBUILD pulseaudio-13.0-r1.ebuild 11418 BLAKE2B 9a656044d67e37951ce61533a7b10a6830256aca510ef86b6893af4227565d76c4402894b68bf41456aff9de9fc9b33505aa90044f59a55be639645df1cbe4bc SHA512 fd88106961566905f2826630f6044816569414d0276a4a61582b39b96bbad22f5ccb73f51e8bf0a02b2de5dcf297e62c081abd69ecbee80f28591d3c0a19307b
-EBUILD pulseaudio-14.99.2_pre1.ebuild 10634 BLAKE2B 3bfd97cd4fbb39c8c4a94b45fb14d2a07dff2f5524e46ff2effeac25dad827d2f4532dcc1f89e6ed8cd200595abe4f271a62e69f9ea38907621df9b41f01ab75 SHA512 808f45bee501ca9775155cd89c5321a24f0a46317e4dba3f1822850bccaca4b6aaa5fde342e7cd36d259fd569dc769f5978b623cba8975ad54ce8d9e46ce6f51
-MISC metadata.xml 3542 BLAKE2B 219478a02cb996393839789ad8b79196754bb52a2168f243e88bb7c3ec8e6bfbfce96de9cb26cd93fef84a63c1397854e4b3028d5fc55e30f09d67b86769044b SHA512 9509fc630c2bf7fb9a089163198d326ac1d16e48bd22113b21a27e98ad68ed0da042fd6bacbf2dfaff7706cf64d39270c6a2a564418fb498872f2d1ae67fc3fc
+DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
+EBUILD pulseaudio-13.0-r1.ebuild 11451 BLAKE2B 52399970366b0217262e323c5dd095785a013c900d8b195e0004994de746d0bcb833453cd93c56e43289ab0dc868a8c7c32c54f0eded761bd9d4bbb17d9b00da SHA512 40683ea13f4b53046579261042c3c1f74b58346b56e1bbaa3a2372275b2b8e35b19cc315e52b1b57ff3f4361d0614acfe989514375944e235c8656ae1b66fa5f
+EBUILD pulseaudio-15.0.ebuild 10504 BLAKE2B c869afb80d810f7351b23a210e74f95ce7eb8de755f8bbe4e8923931ad935203362e43c4d0e17f18c05bfc12ac4d0e175ee7a7bfa0a278c775938fcf68285e8c SHA512 5e70e846f8315f961926d96fb602844c1e3708bd684df08e0021c6b4ba48dadcf568325fce5cad3fae867aa2aaada3fe1e375a538259d82b6f540021b89d9a4c
+MISC metadata.xml 3399 BLAKE2B f5437eac692dc4ea22f069d60672235d802b65e803a6191259d132ce55657168854052bc31b2616bbb8108f7b0202ad5d0d6d9b6abbe4b5208ce3434ee6f2d06 SHA512 930efbc7f86cdca9445dc6282091ee5a4e9e8b9866239961dbdb01fa18bdc538a371317d6df6891981c2c27f973c897c821a200e2f5757ac70ac9a4c2b1e0abb
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index d6b7247df40a..a3cef6a38fd4 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -19,9 +19,6 @@
     </flag>
     <flag name="daemon">Build the pulseaudio binary (not-needed for pipewire-pulse)</flag>
     <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for giving each session a PA client</flag>
-    <flag name="forget-missing">
-      Enables clearing of unavailable devices from database files which is recommended for GNOME.
-    </flag>
     <flag name="gconf">
       Ensure <pkg>gnome-base/gconf</pkg> is present for pulseaudio GConf
       to GSettings module automatic migration (keeping the user configuration)
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
index 0b9a7d18570d..ee5b8c283111 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
@@ -313,6 +313,8 @@ multilib_src_install_all() {
 pkg_postinst() {
 	gnome2_schemas_update
 	if use system-wide; then
+		tmpfiles_process "${PN}.conf"
+
 		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
 		elog "This mode should only be used on headless servers, embedded systems,"
 		elog "or thin clients. It will usually require manual configuration, and is"
diff --git a/media-sound/pulseaudio/pulseaudio-14.99.2_pre1.ebuild b/media-sound/pulseaudio/pulseaudio-14.99.2_pre1.ebuild
deleted file mode 100644
index dd3c1344e506..000000000000
--- a/media-sound/pulseaudio/pulseaudio-14.99.2_pre1.ebuild
+++ /dev/null
@@ -1,356 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV/_pre*}"
-MY_P="${PN}-${MY_PV}"
-
-inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd tmpfiles udev
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_BRANCH="master"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}"
-else
-	SRC_URI="https://freedesktop.org/software/${PN}/releases/${MY_P}.tar.xz"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-
-# +alsa-plugin as discussed in bug #519530
-# TODO: Deal with bluez5-gstreamer
-# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
-# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
-IUSE="+alsa +alsa-plugin +asyncns bluetooth dbus +daemon doc elogind equalizer forget-missing +gdbm
-gstreamer +glib gtk ipv6 jack lirc native-headset ofono-headset +orc oss selinux sox ssl systemd
-system-wide tcpd test +udev +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
-# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
-REQUIRED_USE="
-	alsa-plugin? ( alsa )
-	bluetooth? ( dbus )
-	daemon? ( ?? ( elogind systemd ) )
-	!daemon? (
-		!alsa
-		!alsa-plugin
-		!bluetooth
-		!equalizer
-		!gdbm
-		!gtk
-		!jack
-		!lirc
-		!native-headset
-		!ofono-headset
-		!orc
-		!oss
-		!sox
-		!ssl
-		!system-wide
-		!udev
-		!webrtc-aec
-		!zeroconf
-	)
-	equalizer? ( dbus )
-	native-headset? ( bluetooth )
-	ofono-headset? ( bluetooth )
-	udev? ( || ( alsa oss ) )
-	zeroconf? ( dbus )
-"
-
-BDEPEND="
-	sys-devel/gettext
-	sys-devel/m4
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	system-wide? ( dev-util/unifdef )
-"
-
-# NOTE:
-# - libpcre needed in some cases, bug #472228
-# - media-libs/speexdsp is providing echo canceller implementation
-COMMON_DEPEND="
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	>=media-libs/speexdsp-1.2[${MULTILIB_USEDEP}]
-	virtual/libc
-	alsa? ( >=media-libs/alsa-lib-1.0.24 )
-	asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		media-libs/sbc
-	)
-	daemon? (
-		dev-libs/libltdl
-		sys-kernel/linux-headers
-		>=sys-libs/libcap-2.22-r2
-	)
-	dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] )
-	elogind? ( sys-auth/elogind )
-	equalizer? (
-		sci-libs/fftw:3.0
-	)
-	gdbm? ( sys-libs/gdbm:= )
-	glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gst-plugins-base
-		>=media-libs/gstreamer-1.14
-	)
-	gtk? ( x11-libs/gtk+:3 )
-	jack? ( virtual/jack )
-	lirc? ( app-misc/lirc )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	selinux? ( sec-policy/selinux-pulseaudio )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-	X? (
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		daemon? (
-			x11-libs/libICE
-			x11-libs/libSM
-			>=x11-libs/libX11-1.4.0
-			>=x11-libs/libXtst-1.0.99.2
-		)
-	)
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/libatomic_ops
-	dev-libs/libpcre:*
-	test? ( >=dev-libs/check-0.9.10 )
-	X? ( x11-base/xorg-proto )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
-# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
-RDEPEND="
-	${COMMON_DEPEND}
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		acct-user/pulse
-		acct-group/audio
-		acct-group/pulse-access
-	)
-"
-
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-DOCS=( NEWS README )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${MY_P}-require-GIO-for-RTP-GStreamer.patch
-	"${FILESDIR}"/${MY_P}-require-bluez-dependency.patch
-)
-
-src_prepare() {
-	default
-
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dadrian-aec=false # Not packaged?
-		--localstatedir="${EPREFIX}"/var
-		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/${PN}/modules" # Was $(get_libdir)/${P}
-		-Dsystemduserunitdir=$(systemd_get_userunitdir)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
-		$(meson_native_use_feature alsa)
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_bool daemon)
-		$(meson_native_use_bool doc doxygen)
-		$(meson_native_use_bool native-headset bluez5-native-headset)
-		$(meson_native_use_bool ofono-headset bluez5-ofono-headset)
-		$(meson_native_use_feature glib gsettings) # Supposedly correct?
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gtk)
-		$(meson_native_use_feature jack)
-		-Dsamplerate=disabled # Matches upstream
-		$(meson_native_use_feature lirc)
-		$(meson_native_use_feature orc)
-		$(meson_native_use_feature oss oss-output)
-		$(meson_native_use_feature ssl openssl)
-		# tests involve random modules, so just do them for the native # TODO: tests should run always
-		$(meson_native_use_bool test tests)
-		$(meson_native_use_feature udev)
-		$(meson_native_use_feature webrtc-aec)
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature equalizer fftw)
-		$(meson_native_use_feature sox soxr)
-		-Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it
-		$(meson_use forget-missing stream-restore-clear-old-devices)
-		$(meson_feature glib) # WARNING: toggling this likely changes ABI
-		$(meson_feature asyncns)
-		#$(meson_use cpu_flags_arm_neon neon-opt)
-		$(meson_native_use_feature tcpd tcpwrap)
-		$(meson_feature dbus)
-		$(meson_native_use_feature elogind)
-		$(meson_feature X x11)
-		$(meson_native_use_feature systemd)
-		$(meson_use ipv6)
-	)
-
-	if multilib_is_native_abi; then
-		# Make padsp work for non-native ABI, supposedly only possible with glibc;
-		# this is used by /usr/bin/padsp that comes from native build, thus we need
-		# this argument for native build
-		if use elibc_glibc; then
-			emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
-		fi
-	else
-		if ! use elibc_glibc; then
-			# Non-glibc multilib is probably non-existent but just in case:
-			ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!"
-		fi
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-
-	if multilib_is_native_abi; then
-		if use doc; then
-			einfo "Generating documentation ..."
-			meson_src_compile doxygen
-		fi
-	fi
-}
-
-multilib_src_install() {
-	# The files referenced in the DOCS array do not exist in the multilib source directory,
-	# therefore clear the variable when calling the function that will access it.
-	DOCS= meson_src_install
-
-	if multilib_is_native_abi; then
-		if use doc; then
-			einfo "Installing documentation ..."
-			docinto html
-			dodoc -r doxygen/html/.
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use system-wide; then
-		newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')}
-
-			use "${1}" && echo "-D${define}" || echo "-U${define}"
-		}
-
-		unifdef \
-			$(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}"/pulseaudio.init.d-5 \
-			> "${T}"/pulseaudio \
-			|| die
-
-		doinitd "${T}"/pulseaudio
-
-		systemd_dounit "${FILESDIR}"/${PN}.service
-
-		# We need /var/run/pulse, bug 442852
-		newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
-	else
-		# Prevent warnings when system-wide is not used, bug 447694
-		if use dbus && use daemon; then
-			rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf; then
-		sed -i \
-			-e '/module-zeroconf-publish/s:^#::' \
-			"${ED}/etc/pulse/default.pa" \
-			|| die
-	fi
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-
-	if use system-wide; then
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog ""
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-		elog ""
-	fi
-
-	if use equalizer; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-		elog ""
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-		elog ""
-	fi
-
-	if use systemd && use daemon; then
-		elog "It's recommended to start pulseaudio via its systemd user units:"
-		elog ""
-		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
-		elog ""
-		elog "The change from autospawn to user units will take effect after restarting."
-		elog ""
-	fi
-
-	optfeature_header "PulseAudio can be enhanced by installing the following:"
-	use equalizer && optfeature "using the qpaeq script" dev-python/PyQt5[dbus,widgets]
-	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseaudio/pulseaudio-15.0.ebuild b/media-sound/pulseaudio/pulseaudio-15.0.ebuild
new file mode 100644
index 000000000000..7d6aebdee1db
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-15.0.ebuild
@@ -0,0 +1,353 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV/_pre*}"
+MY_P="${PN}-${MY_PV}"
+
+inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd tmpfiles udev
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}"
+else
+	SRC_URI="https://freedesktop.org/software/${PN}/releases/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+
+# +alsa-plugin as discussed in bug #519530
+# TODO: Deal with bluez5-gstreamer
+# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
+# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
+IUSE="+alsa +alsa-plugin +asyncns bluetooth dbus +daemon doc elogind equalizer +gdbm
+gstreamer +glib gtk ipv6 jack lirc native-headset ofono-headset +orc oss selinux sox ssl systemd
+system-wide tcpd test +udev +webrtc-aec +X zeroconf"
+
+RESTRICT="!test? ( test )"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
+# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
+REQUIRED_USE="
+	alsa-plugin? ( alsa )
+	bluetooth? ( dbus )
+	daemon? ( ?? ( elogind systemd ) )
+	!daemon? (
+		!alsa
+		!alsa-plugin
+		!bluetooth
+		!equalizer
+		!gdbm
+		!gtk
+		!jack
+		!lirc
+		!native-headset
+		!ofono-headset
+		!orc
+		!oss
+		!sox
+		!ssl
+		!system-wide
+		!udev
+		!webrtc-aec
+		!zeroconf
+	)
+	equalizer? ( dbus )
+	native-headset? ( bluetooth )
+	ofono-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+	zeroconf? ( dbus )
+"
+
+BDEPEND="
+	sys-devel/gettext
+	sys-devel/m4
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	system-wide? ( dev-util/unifdef )
+"
+
+# NOTE:
+# - libpcre needed in some cases, bug #472228
+# - media-libs/speexdsp is providing echo canceller implementation
+COMMON_DEPEND="
+	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+	>=media-libs/speexdsp-1.2[${MULTILIB_USEDEP}]
+	virtual/libc
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		media-libs/sbc
+	)
+	daemon? (
+		dev-libs/libltdl
+		sys-kernel/linux-headers
+		>=sys-libs/libcap-2.22-r2
+	)
+	dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] )
+	elogind? ( sys-auth/elogind )
+	equalizer? (
+		sci-libs/fftw:3.0
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gst-plugins-base
+		>=media-libs/gstreamer-1.14
+	)
+	gtk? ( x11-libs/gtk+:3 )
+	jack? ( virtual/jack )
+	lirc? ( app-misc/lirc )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	selinux? ( sec-policy/selinux-pulseaudio )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+	X? (
+		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+		daemon? (
+			x11-libs/libICE
+			x11-libs/libSM
+			>=x11-libs/libX11-1.4.0
+			>=x11-libs/libXtst-1.0.99.2
+		)
+	)
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/libatomic_ops
+	dev-libs/libpcre:*
+	test? ( >=dev-libs/check-0.9.10 )
+	X? ( x11-base/xorg-proto )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
+# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
+RDEPEND="
+	${COMMON_DEPEND}
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		acct-user/pulse
+		acct-group/audio
+		acct-group/pulse-access
+	)
+"
+
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+DOCS=( NEWS README )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	gnome2_environment_reset
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dadrian-aec=false # Not packaged?
+		--localstatedir="${EPREFIX}"/var
+		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/${PN}/modules" # Was $(get_libdir)/${P}
+		-Dsystemduserunitdir=$(systemd_get_userunitdir)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
+		$(meson_native_use_feature alsa)
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_bool daemon)
+		$(meson_native_use_bool doc doxygen)
+		$(meson_native_use_bool native-headset bluez5-native-headset)
+		$(meson_native_use_bool ofono-headset bluez5-ofono-headset)
+		$(meson_native_use_feature glib gsettings) # Supposedly correct?
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gtk)
+		$(meson_native_use_feature jack)
+		-Dsamplerate=disabled # Matches upstream
+		-Dstream-restore-clear-old-devices=true
+		$(meson_native_use_feature lirc)
+		$(meson_native_use_feature orc)
+		$(meson_native_use_feature oss oss-output)
+		$(meson_native_use_feature ssl openssl)
+		# tests involve random modules, so just do them for the native # TODO: tests should run always
+		$(meson_native_use_bool test tests)
+		$(meson_native_use_feature udev)
+		$(meson_native_use_feature webrtc-aec)
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature equalizer fftw)
+		$(meson_native_use_feature sox soxr)
+		-Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it
+		$(meson_feature glib) # WARNING: toggling this likely changes ABI
+		$(meson_feature asyncns)
+		#$(meson_use cpu_flags_arm_neon neon-opt)
+		$(meson_native_use_feature tcpd tcpwrap)
+		$(meson_feature dbus)
+		$(meson_native_use_feature elogind)
+		$(meson_feature X x11)
+		$(meson_native_use_feature systemd)
+		$(meson_use ipv6)
+	)
+
+	if multilib_is_native_abi; then
+		# Make padsp work for non-native ABI, supposedly only possible with glibc;
+		# this is used by /usr/bin/padsp that comes from native build, thus we need
+		# this argument for native build
+		if use elibc_glibc; then
+			emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
+		fi
+	else
+		if ! use elibc_glibc; then
+			# Non-glibc multilib is probably non-existent but just in case:
+			ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!"
+		fi
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+
+	if multilib_is_native_abi; then
+		if use doc; then
+			einfo "Generating documentation ..."
+			meson_src_compile doxygen
+		fi
+	fi
+}
+
+multilib_src_install() {
+	# The files referenced in the DOCS array do not exist in the multilib source directory,
+	# therefore clear the variable when calling the function that will access it.
+	DOCS= meson_src_install
+
+	if multilib_is_native_abi; then
+		if use doc; then
+			einfo "Installing documentation ..."
+			docinto html
+			dodoc -r doxygen/html/.
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use system-wide; then
+		newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')}
+
+			use "${1}" && echo "-D${define}" || echo "-U${define}"
+		}
+
+		unifdef \
+			$(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}"/pulseaudio.init.d-5 \
+			> "${T}"/pulseaudio \
+			|| die
+
+		doinitd "${T}"/pulseaudio
+
+		systemd_dounit "${FILESDIR}"/${PN}.service
+
+		# We need /var/run/pulse, bug 442852
+		newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+	else
+		# Prevent warnings when system-wide is not used, bug 447694
+		if use dbus && use daemon; then
+			rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
+		fi
+	fi
+
+	if use zeroconf; then
+		sed -i \
+			-e '/module-zeroconf-publish/s:^#::' \
+			"${ED}/etc/pulse/default.pa" \
+			|| die
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	if use system-wide; then
+		tmpfiles_process "${PN}.conf"
+
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog ""
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+		elog ""
+	fi
+
+	if use equalizer; then
+		elog "You will need to load some extra modules to make qpaeq work."
+		elog "You can do that by adding the following two lines in"
+		elog "/etc/pulse/default.pa and restarting pulseaudio:"
+		elog "load-module module-equalizer-sink"
+		elog "load-module module-dbus-protocol"
+		elog ""
+	fi
+
+	if use native-headset && use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+		elog ""
+	fi
+
+	if use systemd && use daemon; then
+		elog "It's recommended to start pulseaudio via its systemd user units:"
+		elog ""
+		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "The change from autospawn to user units will take effect after restarting."
+		elog ""
+	fi
+
+	optfeature_header "PulseAudio can be enhanced by installing the following:"
+	use equalizer && optfeature "using the qpaeq script" dev-python/PyQt5[dbus,widgets]
+	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/media-sound/qmidiroute/Manifest b/media-sound/qmidiroute/Manifest
index 5911e99228f0..3c4f34a4cfa6 100644
--- a/media-sound/qmidiroute/Manifest
+++ b/media-sound/qmidiroute/Manifest
@@ -1,4 +1,4 @@
 AUX qmidiroute-0.4.0-drop-qtopengl.patch 1031 BLAKE2B 5491b8f59590f44165753cf3d5a845bbb5e36f037cb637dca109c660bf2a2be0f0fe6252f292d4920f9580a1d205f44694e967bbdef7b37823f2d03c3c2866b0 SHA512 e7fb53f481818912646502fa84ab32e2f115443f662f9a3442aa63f04794847d4be7973e4e5d2d7d718825ca5b5bf9c099d1ffecd8e90a0adbd7ba7edef1a501
 DIST qmidiroute-0.4.0.tar.bz2 121625 BLAKE2B b538f405debb33e16d505075b9fc2b53f0b1d993670bfc5b0fdcd5d76d06ee8c81b8357b3435266f8b0f7d1609a4835450cd664bc73470ab1a3ba9e60e5476bb SHA512 b3b5ded66c0e226848a3181d67f61ea9e4e76c253400dac63592e4f462f4cf06760b3f2d24a33bbc836f4fe29950a4d702adc048ad80c9b6d673ade8c1a88342
-EBUILD qmidiroute-0.4.0.ebuild 723 BLAKE2B e9a67b9982990b15ff8b2e5d242dc8a52738e0f22950874c03b24b52e7da3a8dcea6d8b11d5c2a779cbba4c1fdf42ee0a7845ddd04f97d2ef741a5302b693e93 SHA512 5f1731d726d68e3a059f787ed8e9535e05770e055337259afdd6156fe84d6f2997a41a01166c933db2cb7ba1320fa7cfe469e2dde33710ddac629f1b3f5b91f8
+EBUILD qmidiroute-0.4.0.ebuild 672 BLAKE2B d75043fd92c39c6f16c1e85c44fa7697931c084c53176cb956ec21fb36c9bbce6cf8269c50608e51138d95b154c82fb241d0817a1e0b6a06d36bdadddcf271a3 SHA512 f69758a46729cf35dc5348c0c4c812f68f30413e7c9ce8797ca7ee8e53d131518bc689a654dbeeab95a3648b7acbecba355bb9b2c080672d7dfbcaf9e23f589d
 MISC metadata.xml 334 BLAKE2B ded2024993e7a9d276e0eee0c2862d5223a1bbaafef282d5ff420c3e80aca6efecb6f0b407fc3ff218ec8b982d675fdde6c75e871c57be9fad0d8e5a12aa3747 SHA512 e2486625819d1be0d7f0e638a5bb9312633c085d1d568dc329d1aae35575a8eff40845baab9ac171c0739667becc59332996ed8162db168b6fbf2250f71ded60
diff --git a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild b/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
index bda001fdd4ca..c432b7d42dba 100644
--- a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
+++ b/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic qmake-utils
+inherit autotools qmake-utils
 
 DESCRIPTION="QMidiRoute is a filter/router for MIDI events"
 HOMEPAGE="http://alsamodular.sourceforge.net"
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE=""
 
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -34,7 +33,6 @@ src_prepare() {
 }
 
 src_configure() {
-	append-cxxflags '-std=c++11'
 	export PATH="$(qt5_get_bindir):${PATH}"
 	econf --enable-qt5
 }
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index b6df15745e53..7edf4d96e4d6 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -4,6 +4,7 @@ AUX snapclient.initd 381 BLAKE2B defa09df346dac279f1ed903adaf88842b060b34d774cfd
 AUX snapserver.confd 1010 BLAKE2B 9d29348f1618dd399c5a9c500d1ec89fd6719243f472dbb666cfa16e6128411a83c9ac9401a1754b79ae4b560643d1f38c3f00f6f6d0a2301ad6e3fa2168c884 SHA512 98818d75e965d54082b33fa36769b74810b3137f07693eac00d10313c3716e72170e9148faa0ac25fefc7868bb7a206ac5ca6d18396fa71d1a74efcc14485548
 AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d66179fc952b636296ee1b1d151a90d8774ad419cd7ec982305da3da3ddda43d55f5ad47c45d98adb72649 SHA512 d8f6b72d1a5be5f2ddd9266fac33b6d24b046993c532f204e68824919ed09f41988923a59ba722c3c9c748b87c1fdda1c91026f8e591993f34188ef3c488f379
 DIST snapcast-0.20.0.tar.gz 729346 BLAKE2B 01a937b74d12f40717cec049e9af0c03f01cc957a97aa0c7316cac2c90f29d8a79dae99a0ae390b72e1a6ff8dce8e6134d40c83ac051641a97bbcd8df90ef64e SHA512 55542a5d915e359b4d8dcb69292dc8ee61067c5b35318151542d875b47a357b8713780ec03fb247ee424645457e68371499e84bae38fbb197737b1369dc7b622
+DIST snapcast-0.25.0.tar.gz 1412827 BLAKE2B 54d0c7b4fd20ec7d7ea414ed9915da9458c0875e5ca0277ba9c4d1415d50b0ef5940530ede3a09fe7d6bb94c7b17c7d0c6194105aa88a9719506f7494e79c723 SHA512 bc5e0540574f96a73971bae4b185a96f8ce0ca6619a51d9418368cf19f1e5b5248052a3a1e8922a15ba6b54dc8c3234c2f800fa2951fa5e97b9dd5610f78419d
 EBUILD snapcast-0.20.0.ebuild 1702 BLAKE2B b128cfcf8229d777d6876e43d9c98d9d13d8a4844d866c579aadafb22ee0983c5be9c15768d02556cac35a889a00a04f3e826824f93363705e57ba09af434e35 SHA512 66b48503ebc593f1a1dcf34a679ef1977163071ed9c7c3e401609a4b234b388ca41489cf17e0dac3865c40be992ddc882e4686eb52402d6ff3cca1d39903db48
-EBUILD snapcast-9999.ebuild 1657 BLAKE2B 0c009f0083f15d91e64164692d820aed1c6b5138348d2c3846a2c8a12614b017390740ed53c43cb5ae7e41b79663d759b17c76ea4377d3c7f0c1a7661b532f78 SHA512 60259ffd6baac10b38b05d16b4513e346b340ec393c50434287a2fd0848b77934043d4f401211e3d0e78429ce1f8d1fbed23ab526f02729928580523213ffb1c
+EBUILD snapcast-0.25.0.ebuild 1597 BLAKE2B 97b6451e8b2708b5936a8463d71a87c191eb44ab4acff9a9cdd19e0c06ebe473ef7c64a03cdc5885dc411b954208eb1aad0cae49be4911519bc6d007a9712d9b SHA512 0d59b65a21d4ef66fec2f53dc3173bfc79f8e12a6c788c9442a914133b4f6d4c5ec35d2a31f458ec08a5d867146f230b026be4b452a486c992d21ba43b163cbf
 MISC metadata.xml 1190 BLAKE2B b5cc3702af67dc6de92adefc2ed47067079df1c4a34190fbe7ffdf1b233c8b5d01ce5823c841614da40abe05a0caabd4de2a31a8448715fc166cfe828d0c3ace SHA512 0195d09d431cffe95365aeb9cfbc3ae5384dbc1c62b1cd8abf26841162df824e7c8cf6bc0087cf0cb7696cc66ed4b71446bcb44783c4b2f13b6aac1e435f3cd5
diff --git a/media-sound/snapcast/snapcast-0.25.0.ebuild b/media-sound/snapcast/snapcast-0.25.0.ebuild
new file mode 100644
index 000000000000..b27a764a85cf
--- /dev/null
+++ b/media-sound/snapcast/snapcast-0.25.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Synchronous multi-room audio player"
+HOMEPAGE="https://github.com/badaix/snapcast"
+SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client +expat +flac +opus +server tremor +vorbis +zeroconf"
+REQUIRED_USE="|| ( server client )"
+
+RDEPEND="
+	client? (
+		acct-user/snapclient
+		media-libs/alsa-lib
+	)
+	expat? ( dev-libs/expat )
+	flac? ( media-libs/flac )
+	opus? ( media-libs/opus )
+	server? (
+		acct-group/snapserver
+		acct-user/snapserver
+	)
+	tremor? ( media-libs/tremor )
+	vorbis? ( media-libs/libvorbis )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-cpp/aixlog-1.2.1
+	>=dev-cpp/asio-1.12.1
+	>=dev-cpp/popl-1.2.0
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0-gcc-11.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_WITH_EXPAT=$(usex expat)
+		-DBUILD_WITH_FLAC=$(usex flac)
+		-DBUILD_WITH_OPUS=$(usex opus)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_STATIC_LIBS=no
+		-DBUILD_TESTS=no
+		-DBUILD_WITH_TREMOR=$(usex tremor)
+		-DBUILD_WITH_VORBIS=$(usex vorbis)
+		-DBUILD_WITH_AVAHI=$(usex zeroconf)
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	for bin in server client ; do
+		if use ${bin} ; then
+			doman "${bin}/snap${bin}.1"
+
+			newconfd "${FILESDIR}/snap${bin}.confd" "snap${bin}"
+			newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}"
+		fi
+	done
+}
diff --git a/media-sound/snapcast/snapcast-9999.ebuild b/media-sound/snapcast/snapcast-9999.ebuild
deleted file mode 100644
index 6228cd7ec667..000000000000
--- a/media-sound/snapcast/snapcast-9999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Synchronous multi-room audio player"
-HOMEPAGE="https://github.com/badaix/snapcast"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/badaix/snapcast.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+client +expat +flac +opus +server static-libs tremor +vorbis +zeroconf"
-
-REQUIRED_USE="|| ( server client )"
-
-RDEPEND="client? (
-		acct-user/snapclient
-		media-libs/alsa-lib )
-	expat? ( dev-libs/expat )
-	flac? ( media-libs/flac )
-	opus? ( media-libs/opus )
-	server? (
-		acct-group/snapserver
-		acct-user/snapserver )
-	tremor? ( media-libs/tremor )
-	vorbis? ( media-libs/libvorbis )
-	zeroconf? ( net-dns/avahi[dbus] )"
-DEPEND="${RDEPEND}
-	>=dev-cpp/aixlog-1.2.1
-	>=dev-cpp/asio-1.12.1
-	>=dev-cpp/popl-1.2.0"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CLIENT=$(usex client)
-		-DBUILD_WITH_EXPAT=$(usex expat)
-		-DBUILD_WITH_FLAC=$(usex flac)
-		-DBUILD_WITH_OPUS=$(usex opus)
-		-DBUILD_SERVER=$(usex server)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTS=no
-		-DBUILD_WITH_TREMOR=$(usex tremor)
-		-DBUILD_WITH_VORBIS=$(usex vorbis)
-		-DBUILD_WITH_AVAHI=$(usex zeroconf)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	for bin in server client ; do
-		if use ${bin} ; then
-			doman "${bin}/snap${bin}.1"
-
-			newconfd "${FILESDIR}/snap${bin}.confd" "snap${bin}"
-			newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}"
-		fi
-	done
-}
diff --git a/media-sound/xmms2-scrobbler/Manifest b/media-sound/xmms2-scrobbler/Manifest
deleted file mode 100644
index 40f6e957ee5f..000000000000
--- a/media-sound/xmms2-scrobbler/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX xmms2-scrobbler-0.4.0-gcc-7.patch 130 BLAKE2B 8e2180c1d6f00e4e3c3ba6f9e8339fece4354d0b98035852ce2131b366a30b3453b89c0e2bc7f8ba1b85193ca073f015f8a3fa3db8047995d2da3c59a784d6a8 SHA512 ce5582e35f714c7554c1f4ab65231cb179524165e0e02f2e10da57627ccffbc31ff640b6eb23c321d441c47c8dd384e1cf0f483f1d3d528663c1f95028e3fdcf
-AUX xmms2-scrobbler-0.4.0-ld-order.patch 1599 BLAKE2B fb2fae49c2eb4d3f3cc1f93e4923d6a6ebb2e8d3c9ce441f221f564e9dc383c56394f3791db333f44ddd07d8af1e2fccd5068de7a37043edf2927f695d66c428 SHA512 f730f08dfbcbe1ce07153bb15b6308e7a8091491196dcd81cf0e271a8117ca6a938d58a1011845c40ab781df82f7c8efa45beff4a2d171d9ec2b745a5f7a59a0
-AUX xmms2-scrobbler-0.4.0-ldflags.patch 622 BLAKE2B 788c89110b44b0d1f160a0bf65453766631753f2d4807a15051145249fef25ee5a106e36091c1f7590e0b1336a74f7a269f5df362ac77dfd91172aad46735099 SHA512 4bbae7c0d1652dd467d85a89e755bc7752d9df7a6af72e3a0e1d82ba5309ea740bbf8dd2204b38bc32cb4f4e129c0d620d3b4dc992a270c271b32498a71ed768
-AUX xmms2-scrobbler-0.4.0-libs.patch 558 BLAKE2B ca130e564b22e4ab10848903a81c5bd3c775612ad6413f86b89a8c0296e8383bd6639a952bb364e593fe17da2c273ed691ca76bc38d143b35774c59558175d85 SHA512 bf6f1a052a237828be64c338c20af9753f86accc81c0f04b44b2f1802a34542083d16caeccb35b12ef15673fcaa84a2cae840d6f159fb537056f3ee935feb7df
-AUX xmms2-scrobbler-0.4.0-no-XPTR.patch 529 BLAKE2B 8a3a79ba35afa0f75160d3bd74529e4ffac6ed039b5f1bc7617b6b9491fcf931b5e5578eea72b930f8d202277ad09898507f9e4e555438b91512979e7ff2e1dd SHA512 5b8e39d48259cfba1dc9a163b13b2ad8650b40be745aab3f12847595a8355d78cecc6b94ac35730db347a417895a9ca51cd124bb17489e6e7c08c2812aa2f45b
-DIST xmms2-scrobbler-0.4.0.tar.gz 19831 BLAKE2B 84194a2359b825c5571637e4d875003262235f8bce550ffeb54a123c53b1aeee49b7fd21c5549903e24348869abba96ba9b7e78cade4dc44dcbb798f4604d8fa SHA512 2df20693479413a18e487f16e87f0a711866221dcbc8f96c970be55aac2c495fcb84e9e3ea754473c747d33d5d1ef54823f6a050d5054581454f956c86f6236b
-EBUILD xmms2-scrobbler-0.4.0-r1.ebuild 1298 BLAKE2B 60e15173cc17e6790455206cd5edde0f8cae04ba172ff4c8f58ab3fc124671351b8703b1eec973a69bff4573037be79582a9a403457220f849edcb07e202cfd2 SHA512 64078c2b5f2c0825aa6111c95bd9f1eebe7981bb7fc7a17f68f18704786c7f3f6211a7f89d663106376f7f82f724ad1641cb2865d5ab0871b21e337a033d0712
-MISC metadata.xml 534 BLAKE2B cba02182ace8baaf5933ba4e01464e323ea0c6dc58c575ebea0850808429f45df267c55d4856394885dcb4f8c69763f1c8aacec5ab401b079c8cee893d8e5f61 SHA512 ee2450fc9a95750c4c86c4413ae4b3a560952a6fcee22f5d27f5ac5ff0388deb8e71131a92972e15415cea0f736be554db3c9c607ac374cddfb9b46ba181da76
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch
deleted file mode 100644
index 6cc9686b6164..000000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- a/src/submission.c
-+++ b/src/submission.c
-@@ -24,2 +24,3 @@
- #include <stdlib.h>
-+#include <stdio.h>
- #include "submission.h"
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch
deleted file mode 100644
index f252edaa56a9..000000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 096ee717070bdde9c1adc29f02fcb537920daca9
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Sat Mar 3 20:24:21 2012 +0300
-
-    Makefile: set proper link order for libraries
-    
-    '-Wl,--as-needed' enforces libraries to go in proper dependency order:
-    
-        $ x86_64-pc-linux-gnu-gcc -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu -Wl,--hash-style=gnu `pkg-config xmms2-client --libs` `pkg-config libcurl --libs` src/xmms2-scrobbler.o src/list.o src/queue.o src/strbuf.o src/md5.o src/submission.o -o bin/xmms2-scrobbler
-        src/xmms2-scrobbler.o: In function `save_profile_submissions_queue':
-        xmms2-scrobbler.c:(.text+0x281): undefined reference to `xmmsc_userconfdir_get'
-        src/xmms2-scrobbler.o: In function `load_config':
-        xmms2-scrobbler.c:(.text+0x3e2): undefined reference to `xmmsc_userconfdir_get'
-        src/xmms2-scrobbler.o: In function `maybe_submit_to_profile':
-        xmms2-scrobbler.c:(.text+0x7e3): undefined reference to `xmmsc_medialib_get_info'
-        xmms2-scrobbler.c:(.text+0x7f7): undefined reference to `xmmsc_result_notifier_set'
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,7 @@ install: $(BINARY)
- 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
- 
- $(BINARY): $(OBJECTS) bin
--	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@ $(LIBS)
-+	$(QUIET_LINK)$(CC) $(OBJECTS) -o $@ $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) $(LIBS)
- 
- src/%.o : src/%.c
- 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch
deleted file mode 100644
index 33f188cc8a92..000000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit 8b97319c1a03acecc21b5608516859daaf5bca75
-Author: James Le Cuirot <chewi@aura-online.co.uk>
-Date:   Fri Mar 26 20:10:54 2010 +0100
-
-    Fixed the build if the --as-needed linker option is enabled.
-
---- a/Makefile
-+++ b/Makefile
-@@ -35,7 +35,7 @@ install: $(BINARY)
- 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
- 
- $(BINARY): $(OBJECTS) bin
--	$(QUIET_LINK)$(CC) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) $(OBJECTS) -o $@
-+	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@
- 
- src/%.o : src/%.c
- 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch
deleted file mode 100644
index 7f8f417b7a5d..000000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,5 @@
- CFLAGS += -std=gnu99 -Wall -Wwrite-strings -pthread
-+LIBS = -lrt -lpthread
- ENDIAN_CFLAGS=
- PREFIX ?= /usr/local
- 
-@@ -35,7 +36,7 @@ install: $(BINARY)
- 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
- 
- $(BINARY): $(OBJECTS) bin
--	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@
-+	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@ $(LIBS)
- 
- src/%.o : src/%.c
- 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch
deleted file mode 100644
index bb25361a4e41..000000000000
--- a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/xmms2-scrobbler.c
-+++ b/src/xmms2-scrobbler.c
-@@ -534,3 +534,3 @@ on_medialib_get_info2 (xmmsv_t *val, void *udata)
- {
--	bool reset_current_id = XPOINTER_TO_INT (udata);
-+	bool reset_current_id = (bool)(uintptr_t)(udata);
- 
-@@ -572,3 +572,3 @@ maybe_submit_to_profile (bool reset_current_id)
- 	                           on_medialib_get_info2,
--	                           XINT_TO_POINTER (reset_current_id));
-+	                           (void*)(uintptr_t)(reset_current_id));
- 	xmmsc_result_unref (mediainfo_result);
diff --git a/media-sound/xmms2-scrobbler/metadata.xml b/media-sound/xmms2-scrobbler/metadata.xml
deleted file mode 100644
index dbb50391915b..000000000000
--- a/media-sound/xmms2-scrobbler/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-	<longdescription>
-		XMMS2-Scrobbler is a client for XMMS2 that feeds information about the songs
-		you played to last.fm, formerly known as AudioScrobbler.
-		XMMS2-Scrobbler supports "multi-scrobbling", i.e. it can talk to more than
-		one AudioScrobbler server.
-	</longdescription>
-</pkgmetadata>
diff --git a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild b/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
deleted file mode 100644
index 365cdbe757ab..000000000000
--- a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="XMMS2 AudioScrobbler client"
-HOMEPAGE="https://code-monkey.de/pages/xmms2-scrobbler"
-SRC_URI="ftp://ftp.code-monkey.de/pub/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-sound/xmms2
-	net-misc/curl"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ldflags.patch
-	"${FILESDIR}"/${P}-libs.patch
-	"${FILESDIR}"/${P}-ld-order.patch
-	"${FILESDIR}"/${P}-gcc-7.patch
-	"${FILESDIR}"/${P}-no-XPTR.patch
-)
-
-src_compile() {
-	emake CC="$(tc-getCC)" VERBOSE=1
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	dodoc README AUTHORS
-}
-
-pkg_postinst() {
-	einfo "xmms2-scrobbler will fail to start until you create a configfile"
-	einfo ""
-	einfo "mkdir -p ~/.config/xmms2/clients/xmms2-scrobbler/lastfm"
-	einfo "echo 'user: foo' >> ~/.config/xmms2/clients/xmms2-scrobbler/lastfm/config"
-	einfo "echo 'password: bar' >> ~/.config/xmms2/clients/xmms2-scrobbler/lastfm/config"
-	einfo "echo 'handshake_url: http://post.audioscrobbler.com' >> ~/.config/xmms2/clients/xmms2-scrobbler/lastfm/config"
-	einfo ""
-	einfo "More info and configuration-options can be found in xmms2-scrobbler's README file"
-}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 074add0037c3..95ca319d76e6 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest
index a95b5a70f6a6..210a609ebcd7 100644
--- a/media-tv/dtv-scan-tables/Manifest
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -3,6 +3,6 @@ DIST dtv-scan-tables-2019-09-22-f07bde777d4d.tar.bz2 270211 BLAKE2B 76d5250a8eb7
 DIST dtv-scan-tables-2021-04-30-4181e93a30ab.tar.bz2 272870 BLAKE2B b9672235ad2ed826205278ffd06ed793126f743fe2b0b8af4369c1cb24825662e579f9246a287df1d61efad7985e2e18d59097d359fe84626149464bfc253bc5 SHA512 c15c07937cabefad731f4b3f8b6e9f993e500f7c59b17ef5e5c46f9bb86f9cbdf748f7d875c363c641ed9f3333a03b5033cc7d0272e96323d36be944ea35379d
 EBUILD dtv-scan-tables-0_p20171003.ebuild 737 BLAKE2B 239cd08dda04b32e1090c15edbea043c5319af646256c89389bb28f1dfaf32051365ee54b395932bea67fc31f13b0ed28b66edda834b0884c88bd0c1cbc3c821 SHA512 b75a884494995705e88bd2a5808e0671511487c3e3d9d891816034d24d285b31aad5a0d580e62a990c2ed158226da3f993babe6b75cdc71c10bb1489561610f6
 EBUILD dtv-scan-tables-0_p20190922.ebuild 749 BLAKE2B c8354f3eb9dacaef712d03310899fa9d3f1141f462631a71701c13effbb9266e0441ae2be60b1b6d63ecf344c2e0d7ef50226a5625d48d99e96c5826b76eaecb SHA512 71c288a544feb26a214896dd51a697b4fd93768f03d0e4801e4d66fc5a7d3d2344164ea2f5058eb863eb6cbd723f566ad5a1293a149bd835006daabdad1182ad
-EBUILD dtv-scan-tables-0_p20210430.ebuild 748 BLAKE2B 39534b202b27d74c88dcb1c3fd6dfacd07812a5532b50d8c63432a7d8b5e930d02166aaf31b97938216d364ea6fa2045fd827df2231b2135794da1b33df19670 SHA512 8dbd372b68e7de50081c8967c19413ba5ede97dd06afbe9c67ae49157f995296b3aefc6e969065e2bcd9fdec69dea2ae5bb333cfb5fbcf76f0145093164ab0c8
+EBUILD dtv-scan-tables-0_p20210430.ebuild 747 BLAKE2B 0e4b91166b318cf66ceb1f19ba5453cb0b2a2ea0dc66eeff3d63acda91578e40f69c355349799e2b967982d105be74869b05b3b9b41018a626a37dfbd7057dd1 SHA512 8fafd50f18522c4efaea9dcd8e60b19dccb5dfdef276f32ad1e51e07f027b631a57a429f66af852e5c1f5ee553b9b54bcadc4fdba297a9ee2d15df6b53bc061c
 EBUILD dtv-scan-tables-9999.ebuild 749 BLAKE2B c8354f3eb9dacaef712d03310899fa9d3f1141f462631a71701c13effbb9266e0441ae2be60b1b6d63ecf344c2e0d7ef50226a5625d48d99e96c5826b76eaecb SHA512 71c288a544feb26a214896dd51a697b4fd93768f03d0e4801e4d66fc5a7d3d2344164ea2f5058eb863eb6cbd723f566ad5a1293a149bd835006daabdad1182ad
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
index 175a2ff8088f..18fe02bfa3f4 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 else
 	COMMIT="4181e93a30ab"
 	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 	S="${WORKDIR}/usr/share/dvb"
 fi
 
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 8da3b9ea34b6..5215369e4b65 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -4,10 +4,10 @@ AUX plex-media-server.conf.d 216 BLAKE2B 094d0f6f7cdfa696ae47d7879c7459be5755dfe
 AUX plex-media-server.init.d 380 BLAKE2B 03d5737128390c13d914a94e8d861cf24abed92b2a5c672e72cd7dad8ed9a71ba7bccc28f06acaf5920be7d0b809746b6a8f4daffef4594830cf8ad5f071a2f5 SHA512 44ddd5a046851f77f550ff9f0bf158a3bce465101b5fdbd31b68ed64dc6c8e823f70c05b833f97101b4608256422ff4aa026114fac17f9e6e3670602ed9ef816
 AUX plexmediaserver 89 BLAKE2B c7866fce849e6ce2a15ec5a1550146072aa62d278ee47bf2ca70327babf5877750c0749d879e51bacc05ddd242d8a46c808665b9f299cee999dfa2d243ced073 SHA512 798a1736133339865aa1ffc6074720e84b28f3e3298c044019ec4959ba724f7a96dcbfcac29f1f39252cadb2a863a500423027970e5f2699e806bc4d532d9974
 AUX start_pms 1768 BLAKE2B c111f268535f03f1763c9a2f16ccc4a317f9540721a1c89e33306d6ad6d6ee34673d6a13326923c2fa399d1a3f7ad3e26c89d097de8f977a9ad7973c99dff811 SHA512 8c672a9de6f20c968869fb2bd643bdfe6d3e7ca6d89dfddfd5d7a4bc425a34e1b30ba711a0f0afd79df428df4151a59f18880cff7e0ef12df146421f299858c5
-DIST plexmediaserver_1.23.5.4841-549599676_amd64.deb 81750100 BLAKE2B 2b8e110c6e4728607b9cdb033da97e71a124e19a0e05a14ef5053195a23d621efb4a7774a332899aaef471fd7bdc5ee88e958affdc11e268c907cfc0d845d830 SHA512 3c3ef651e512405f57ec8c794955937a9b571d5251efe66024dbccd982eeacf5417562037d9b970fdb9ac9f68fc3963b525537b9d42dc3d673b109a6ef18e370
-DIST plexmediaserver_1.23.5.4841-549599676_i386.deb 75095044 BLAKE2B 724a8f0c9d29c591759de8b2208ddcf1f6ec81aee0535939f95a11b2927c1c47545eb85de26ee41dd0e9ca021eeda00bde45fb6efe8bfc6c11e021f2fdd86eff SHA512 29ce137e93223b83960ac439314aec1f4c4ad78d392f48376faa3912023f4fd866005b14380b91eeacb1a3673f8b8ea464cd9ceff3ece2592190c32d24c9c8e8
 DIST plexmediaserver_1.23.5.4862-0f739d462_amd64.deb 81567672 BLAKE2B af6df77cef72901a7483d25bc957d4f0d9bdf9ea3bd0f6822c31c1f2ba3e896b83d86892532da3335a361c3ee660321a70fdf2a532fdca3705e6d4e9c66493c7 SHA512 0e89067946aa77ef5df8b28618396171a1caac051a6109437edc71ed509fcc73bc175f084616f8abf73a4495eb624bad2b39c1c50eaa7bca1859bf3b57f691b6
 DIST plexmediaserver_1.23.5.4862-0f739d462_i386.deb 74930234 BLAKE2B 36c5b62317ee55bb585dd98f488f29191d9203f07d983936c4c7ed7c85dac5c6bd9cdf635658ebe6518e2d975391652b02253a569388252de74517e2f7c34bf5 SHA512 1f6284e22fc1de9f8e3ab6f6d9ec40d9cebac9e9babf1f25741f6b8c72d376a2479b894a5fd3bfd85db7b3d47314ab178ccc34bcbf021393d03059463cad9e58
-EBUILD plex-media-server-1.23.5.4841.ebuild 1897 BLAKE2B 7b06fd697dde210dee0e11d41517e05eb93ebd540a90b058e35105586c2b643d68e1b9b20fc7a38b6601493c8f056298e0d70c31a85fff110ae4237782ee74bd SHA512 b0c71fc246653aa7ad99ced412cb8a6683b00bb9e00f3ad8ce8999680048bc3c2b8834561443433f785fe332c5e71152627d6d626493829666a855fccd4f942b
+DIST plexmediaserver_1.23.6.4881-e2e58f321_amd64.deb 81538488 BLAKE2B 4ef972686fcce2e69728f7b19b3b40354808862efde93b7c247828671518ed420981222dce002f8477e84afe460a78f41287a9d31c525289c73a395ac475efc3 SHA512 da9a487b28b6fa341da6652c77018cde3446375a7344222c9c617e0b4f4686915f3f8044d38d80247b0ef9d2875f875ba81064edf7429deaa4be32c3d06d4971
+DIST plexmediaserver_1.23.6.4881-e2e58f321_i386.deb 74534752 BLAKE2B b9b29f4397bae7de86a6f8a09fe32bd751ec0df8f37335fd451b304c3e3a938fe37208613861a1b349b2e9ef7c531e57e6f9987852123614b19df917b3abdfea SHA512 8441ca480073b3378ddb5f9c96a7866e9a46151365c2d956924398fb33ecbc3eb92bdf883a9f59a34d4d3a142314c86046a549e10baae5571cb0bdf38b126078
 EBUILD plex-media-server-1.23.5.4862.ebuild 1897 BLAKE2B 2e54cc1e1622fb15414f94cc9af77f86ddffc6695f284ab528b8d938d64aeac89cb8289dcf2da1f9383db824129e68b0ec88d6375e8c89467f6c47344b07f52a SHA512 0337e16954efcb077fc3d2c019ea2791163398c4a064d2b9e25fa138df6cacbafc8d2d3f6e675f92ec50429cf7f5e6a3b9072a52ff45d7b716e49d6b71707230
+EBUILD plex-media-server-1.23.6.4881.ebuild 1897 BLAKE2B 692cd2798f2cfe529b7ade4823a7333bba308b4b6a08af0be9685962269024a8595a9c6b6e8d5f1e83501751cf2027efdc42fb169d2a6870d1fa6a1f044a7d9f SHA512 9a813c77a7929ebbae25e9bb0d200c0437c2c539049a6727d5f40ed75d167486795a8db1cb7b31adeb79cdf9490cc490fab2d07b6801771198e7cdb0d4a6883a
 MISC metadata.xml 597 BLAKE2B ccb49cc2f1115157ace237440b8c59e4466eb96a4f3c274c13e275fa6564b5bb0506bc3e3d9bdee4d2385d151e1f1bf9e3e3b70c7e0400d884aa1fcb3f0a1522 SHA512 d33bfd6ff84128622666b9452b975879840b3b6d24e555536cb8daf98f41411000ea26754df7fb31a639749c9f9b4aca64ed7524fb48d918a74d30a003a19d04
diff --git a/media-tv/plex-media-server/plex-media-server-1.23.5.4841.ebuild b/media-tv/plex-media-server/plex-media-server-1.23.5.4841.ebuild
deleted file mode 100644
index d4e54c130d2c..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.23.5.4841.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 systemd unpacker
-
-MY_PV="${PV}-549599676"
-MY_URI="https://downloads.plex.tv/plex-media-server-new"
-
-DESCRIPTION="Free media library that is intended for use with a plex client"
-HOMEPAGE="https://www.plex.tv/"
-SRC_URI="
-	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
-	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )"
-S="${WORKDIR}"
-
-LICENSE="Plex"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="mirror bindist"
-
-DEPEND="
-	acct-group/plex
-	acct-user/plex"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
-	"usr/lib/plexmediaserver/lib/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
-)
-
-src_install() {
-	# Remove Debian specific files
-	rm -r "usr/share/doc" || die
-
-	# Add startup wrapper
-	dosbin "${FILESDIR}/start_pms"
-
-	# Add user config file
-	mkdir -p "${ED}/etc/default" || die
-	cp "${FILESDIR}/plexmediaserver" "${ED}/etc/default/" || die
-
-	# Copy main files over to image and preserve permissions so it is portable
-	cp -rp usr/ "${ED}" || die
-
-	# Make sure the logging directory is created
-	keepdir /var/log/pms
-	fowners plex:plex /var/log/pms
-
-	keepdir /var/lib/plexmediaserver
-	fowners plex:plex /var/lib/plexmediaserver
-
-	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-
-	systemd_dounit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service
-	keepdir /var/lib/plexmediaserver
-
-	# Adds the precompiled plex libraries to the revdep-rebuild's mask list
-	# so it doesn't try to rebuild libraries that can't be rebuilt.
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/80plexmediaserver
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-tv/plex-media-server/plex-media-server-1.23.6.4881.ebuild b/media-tv/plex-media-server/plex-media-server-1.23.6.4881.ebuild
new file mode 100644
index 000000000000..332463574089
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.23.6.4881.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1 systemd unpacker
+
+MY_PV="${PV}-e2e58f321"
+MY_URI="https://downloads.plex.tv/plex-media-server-new"
+
+DESCRIPTION="Free media library that is intended for use with a plex client"
+HOMEPAGE="https://www.plex.tv/"
+SRC_URI="
+	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
+	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )"
+S="${WORKDIR}"
+
+LICENSE="Plex"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="mirror bindist"
+
+DEPEND="
+	acct-group/plex
+	acct-user/plex"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/plexmediaserver/lib/.*"
+	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
+	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
+)
+
+src_install() {
+	# Remove Debian specific files
+	rm -r "usr/share/doc" || die
+
+	# Add startup wrapper
+	dosbin "${FILESDIR}/start_pms"
+
+	# Add user config file
+	mkdir -p "${ED}/etc/default" || die
+	cp "${FILESDIR}/plexmediaserver" "${ED}/etc/default/" || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}" || die
+
+	# Make sure the logging directory is created
+	keepdir /var/log/pms
+	fowners plex:plex /var/log/pms
+
+	keepdir /var/lib/plexmediaserver
+	fowners plex:plex /var/lib/plexmediaserver
+
+	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
+	newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
+
+	systemd_dounit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service
+	keepdir /var/lib/plexmediaserver
+
+	# Adds the precompiled plex libraries to the revdep-rebuild's mask list
+	# so it doesn't try to rebuild libraries that can't be rebuilt.
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/80plexmediaserver
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 0b09cda370cc..3e3aa3af855f 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -11,6 +11,6 @@ AUX tvheadend.confd 359 BLAKE2B 3b44e47b9216daaa2defa69254700693015619e8b0196060
 AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7
 AUX tvheadend.service 573 BLAKE2B e99853082623ca0522bf83aec4be33f2cdc62ba3e3e09bd22246f93c93d5342180be409ba9ad8f862830aca68ca0dbfafd3da0ecb9033e43d6a7e50a523c0bd8 SHA512 8f8e8f9feed45c20919bca402ef9179208a305cd7b06b47dfbbc368fc85d739c3dca2b53e6964bff10f8581cc4c8091660ac2be3b975d80941dc7a16cbb3fb49
 DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
-EBUILD tvheadend-4.2.8-r2.ebuild 3532 BLAKE2B c3d40f247309ffcbfd32549ae21fc48dceba715b3f0daf7990d3d14d545855eca2d7119fb93799ecf11e925ce9a29e4cf9cda1f97f5a260d480269f92bfd1627 SHA512 66a3f2de71fddb881be41cb65c8cdd00dac223bc6aa04cdc61d5c336058d818e708481758d2a7999f334a1ec1ef60fe28af83f9e4964be6e81c422b5d3ac95a9
+EBUILD tvheadend-4.2.8-r2.ebuild 3531 BLAKE2B 1ffb19e513b56df16efd9839b73354b98fb6c464f72217f37b48a39150cc3b964feff7e3230b2bb5802e67de1597e35174bce2441292888f1717cb99e789a548 SHA512 1b068d2b8ede6a49afdb3d319c8d6866819ece5c6e4c6785a24d3e28c94caf8406a39905f890dc4ced86ce36068e748aec65343bcb04b2b5417b258d3d48693c
 EBUILD tvheadend-9999.ebuild 4135 BLAKE2B 07f636e118cabae70d477bb09f979932af0ad7769eeaf354801ffbac18951be1387e39beedec3c7631f37bc594120fc8fca878a97ab73e59ecd526c3251056bf SHA512 473f5418b410cd2282596c56e72e47d195a0ce33826a4a025619506bfa3d272bb6edf6c33a149f40fe23045d4d23d574d7863ac4f3a14ce18c0b50efd1b7289d
 MISC metadata.xml 1445 BLAKE2B f71dc280d5fce7c0945939bcaf75d0d7f294aea6055c956b04e9e439199c2a6c107c800be6d18a0c58d154bdf7cdd0cd7d874e5cde5fc93f9b24160f536d21d8 SHA512 e26b94f14a619051e637b018d0f47ce86381821dd5207ba5b34429e0c0f83c55bfa9c37871e722af85719cf3e06322703d4709cbbd771b8f092efb8e85cb5b72
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index 6a3050a9e5ac..d38ebf0d7b8b 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf zlib"
 
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 72ffb90fc1fc..235aa7e5fb9b 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,4 +1,4 @@
 AUX v4l-utils-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
 DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
-EBUILD v4l-utils-1.20.0.ebuild 2446 BLAKE2B d5008b2f3497f10070131a4ea094876d6b9ae289f6bee69e917a91d9e3a62c51286bbb4876c903bfa78ac26ac421dc57246b8312d8c5a9f3bcb3f62906109df0 SHA512 0fd157053cd420889d63b5ef1dcf4933f8c01c46a782dea7fac6db0fa084aa9c6f66ef934fdb643d142565185bab5c2ece18a5036dd492e3ffcbf4ccf3759224
+EBUILD v4l-utils-1.20.0.ebuild 2447 BLAKE2B 0036ee1bef177cab6b6875b5b770d95f133ab6e1d77f2efdf985bed23ed006ef91769f0a6ca0afbd9e4a66fd93013c35942bcbd23b1788050dabce5956a09623 SHA512 c118c0ebb17ff7ba72df6a912373edf9204cb1ec01d9c3b58a2edafb2080a38f357d7927891be11ea69c81091b5b77ad2573d87beaef8c317858729188c78619
 MISC metadata.xml 322 BLAKE2B 0e97d8cbd1e3c9efd375500604308990419a8a1684241309406bf2516eab3b2c381c3efeb3838715c1f55fa72d906d9e7a05e6130619b7be0235621b63659f5d SHA512 e5f448069693b582de3044925082100a530a1c7e246b3d61a81accaa49918548a48f39b3785e96462c702361409b45d1aa95040dcdc33d742f45126d8531c9d2
diff --git a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
index 6a579d1605e2..71e15ab03e4a 100644
--- a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
@@ -68,14 +68,15 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cxxflags -std=c++14
+
 	if use qt5; then
-		append-cxxflags -std=c++11
 		local qt5_paths=( \
 			MOC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/moc" \
 			UIC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/uic" \
 			RCC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/rcc" \
 		)
-		if use !opengl; then
+		if ! use opengl; then
 			sed -e 's/Qt5OpenGL/DiSaBlEd/g' -i configure || die
 		fi
 	fi
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 25d6e1a244f5..0099509002f4 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,5 +1,5 @@
 DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec020d386182f6fd78f9f8c18821d0dc09077cccb1ad30e6f0583f958210fbf717d356f1e47dcf785e5a85864dc4 SHA512 36dd497dc20d296ca984ad0a1ca19f471c97cac7bfe7c5d4baeaae7faea565c36103bea10e7a7ae813c1cfc35c7ac376299edd2bf01c4c5da981cb5cca13317c
 DIST xmltv-0.6.1.tar.gz 838051 BLAKE2B d4011ee31b56096ae275647e0cbd85b11c2edbc3d150208aa619900c9741ac3bed2a1255d778622883b3d24a32ce3b803f5719fdd2273549bafa31ebdcb1a887 SHA512 137dad875c6f7f77fb986b4662b411766424676df0a2422f3dc123c8cec4e1dff123ea68577add65c0e5bcf2d0bdf89d7fba0ed423502ec27e2aa82ec6b10bc2
 EBUILD xmltv-0.5.70.ebuild 5265 BLAKE2B d348aea253e6d6a9f9f23d462e5bfba6f0ab9bd0f71b41832583f87d6e81e3a3d655ebb3853a0dee48ab52d11967911870e22e81a9fdeede15cdfc37f82c91d9 SHA512 d3504aaa69166138922e3a955cf1e549739a4667fb680c34bc523f3e0958a37ec76e3d6bd28cea0be93eb253d16fed904af148680e189c55850d3c033f7b99bc
-EBUILD xmltv-0.6.1.ebuild 5930 BLAKE2B eabe355301e78b16131bd9d7d1130c616074672cbf05f4c4d2649d5bd1bd455a788186e1d522f9b3144adf47001232602a21af1fe11cb177d7869d96fe4f7203 SHA512 c48c1758d9f590d6fd248958c6d597998fe6ab1ca49d7e45d9fa7773f326013100996887f92ce2adb5f77a0022dd04c8b33cff6bd31095264bf8dfbccd9b3350
+EBUILD xmltv-0.6.1.ebuild 5929 BLAKE2B ab1c87869507b148627744279c8f516e48fd31800ee377586596418480fd26795a613f27fe32819705722b8c08012e812660e873ff2aacb5a00d8c4f823cd60d SHA512 f3ed0a46295375731077293e823037079ef599eda8b78953b0065150e0e2dc0835328e70fc42642d27dde073a2318c8eaad46461d10b90ced7c2c343937dd05f
 MISC metadata.xml 2715 BLAKE2B 217df2efea127bf288238afaffc6ce3ba08db1afeafbc84f01625b373bd09cb002f96c47d44d1f6c434ee60a200e262b913b561e0a81376dbd1a777bbe32f090 SHA512 6ae132d5075564c7d32d2230e0b6a029723266507ec9db2b7c756986421753f8ee8519fd0cf0b754250842563a91dc28d284a82ffc930c04c64d141b8e0fedf5
diff --git a/media-tv/xmltv/xmltv-0.6.1.ebuild b/media-tv/xmltv/xmltv-0.6.1.ebuild
index f8d94fe30e2a..15e60c1c60f4 100644
--- a/media-tv/xmltv/xmltv-0.6.1.ebuild
+++ b/media-tv/xmltv/xmltv-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/XMLTV/xmltv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~x86-linux"
 
 IUSE="ar ch-search dk dtvla eu-dotmedia eu-epgdata eu-xmltvse fi fi-sv fr
 huro il is it na-dd na-dtv na-tvmedia pt-meo pt-vodafone se-swedb se-tvzon tr
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4804e90351e6..ff51e7874b29 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/droidcam/Manifest b/media-video/droidcam/Manifest
index 65d681babb72..6da92260ef0a 100644
--- a/media-video/droidcam/Manifest
+++ b/media-video/droidcam/Manifest
@@ -1,4 +1,4 @@
-AUX droidcam-makefile-fixes.patch 1830 BLAKE2B f1a5c48b36160797c3f75b54620b673640a4bc41178a43bd3ffa80d11068afb2b683c29169b5158db03b7851b0ca7fe890239c844d6885d2b79c7b203d8861d7 SHA512 522a15aa19d8e2fe55d078558f530015919f21e438a3cd5e424ef460c62a5fbb8745ede24e76852d84ac5e0ca00bd8fbeec3b9ef05d891cade574cb6de017756
-DIST droidcam-1.7.3.tar.gz 83146 BLAKE2B b79d210a7d6a3cee7322b373cd92b2c1a326dd9887dff1df752e9818f9e7ed88dfdfd4a33a22ccb39c601df81c4e9538b1efa8029a9ad56f39d400fc50bc746b SHA512 39d6947b66f1be7896c56aa01d471cbd025deaeb2d2359f9434e5ea91e4302f4c16ee31486bb04fab1dfc7f6d8b2de3f6800ead665b7b3d366b01b25297beaba
-EBUILD droidcam-1.7.3.ebuild 3015 BLAKE2B 2d2104d1dec0389fae851e9a9b84e103f84355194b9aca64b0e3707ce36135b9206b798a8035475f6e1cd6a5a13abea83a1c3a983fb18bc392c593f956af2d63 SHA512 fc44d8d9b5c1b2beff2b2182aefd5c0884b403c94cf14c85164760530b89649b4da3035fb9df65d9af1260f5e99da75f021c4c72613434555bf4a318d4512f25
+AUX droidcam-makefile-fixes.patch 1834 BLAKE2B de9b0ae494e419d89dee767afcc78fc8d5222dcd54706ec94a875c032e835015ef60b8a60285a99974df5dde35becd742432bb81e818574022fd699af021e9ad SHA512 5490ce729f622ae93319a299317c1d394cb7af1f1b71c71c1927ae259a6cce682b705eb26fc0c95c467716c9f79b81688ba2d12e33c1c8af4b454333d8cdbca8
+DIST droidcam-1.8.0.tar.gz 84376 BLAKE2B 581e57e2c80dd9662764e399dd797e5893f617e69ee2501a1063d1c51434baf64d7d2b72779debede6d679127f31fa95a4e67953978da591acbf6a41bd05551d SHA512 b448f686562030b352630c6b677a098ecb5041582dd06e57809b04674cb334d02ddfdf1d09b43e1ecc70897e8073714ad6913ab14d894a7679fc433adb3fda82
+EBUILD droidcam-1.8.0.ebuild 3094 BLAKE2B 942b8790090c2edbd1a9f35bf7d34e451f51b903a96c62424433b982959c7fc3ecb55a01c5b069869953b416cc6aa421760ca680da7d36dfdaed2fb0f3b5ea98 SHA512 6dc37f34ca0f9f0c4c8e2d0ceb0c8e778726baddd59c3e9c58177f128e8088bb0c92113093ae05e617f54f9fde1f42163908301420aef730c0105902950cc221
 MISC metadata.xml 1420 BLAKE2B 5169fa76ab742c2992797bf82e8f4a783134eddbb11c00d21c18b5d271bafdce6501ef31c35f461836081014ddf444070e27bf94e45a86d8f912bbf0519ca5ce SHA512 344a159166adba2beb80621d1d798038646af18878497b03e46c9458d306b1615e8feac8fad8be502474919da00cb550cc74499967f74157ce1b6a717eb0a8f8
diff --git a/media-video/droidcam/droidcam-1.7.3.ebuild b/media-video/droidcam/droidcam-1.7.3.ebuild
deleted file mode 100644
index 9ac87c8084a8..000000000000
--- a/media-video/droidcam/droidcam-1.7.3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop linux-mod xdg
-
-DESCRIPTION="Use your phone or tablet as webcam with a v4l device driver and app"
-HOMEPAGE="https://www.dev47apps.com/droidcam/linux/"
-SRC_URI="https://github.com/dev47apps/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk"
-
-# Requires connection to phone/tablet
-RESTRICT="test"
-
-DEPEND="
-	app-pda/libplist
-	app-pda/libusbmuxd
-	dev-libs/glib
-	dev-libs/libappindicator:3
-	dev-libs/libxml2
-	dev-util/android-tools
-	media-libs/alsa-lib
-	media-libs/libjpeg-turbo
-	>=media-libs/speex-1.2.0-r1
-	media-video/ffmpeg
-	gtk? (
-		dev-cpp/gtkmm:3.0
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
-MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
-
-CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
-ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support"
-
-PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
-
-src_prepare() {
-	if ! use gtk; then
-		sed -i -e '/cflags gtk+/d' Makefile || die
-		default
-	else
-		# remove path and extension from icon entry
-		sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' droidcam.desktop || die
-		sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die
-		xdg_src_prepare
-	fi
-}
-
-src_configure() {
-	set_arch_to_kernel
-	default
-}
-
-src_compile() {
-	if use gtk; then
-		emake droidcam
-	fi
-	emake droidcam-cli
-	KERNELRELEASE="${KV_FULL}" linux-mod_src_compile
-}
-
-src_test() {
-	pushd "v4l2loopback"
-	default
-	./test || die
-	popd
-}
-
-src_install() {
-	if use gtk; then
-		dobin droidcam
-		newicon -s 32 icon.png droidcam.png
-		newicon -s 96 icon2.png droidcam.png
-		domenu droidcam.desktop
-	fi
-	dobin droidcam-cli
-
-	# The cli and gui do not auto load the module if unloaded (why not though?)
-	# so we just put it in modules-load.d to make sure it always works
-	insinto /etc/modules-load.d
-	if linux_config_exists; then
-		if linux_chkconfig_module SND_ALOOP; then
-			newins - "${PN}.conf" <<-EOF
-				v4l2loopback-dc
-				snd_aloop
-			EOF
-		else
-			newins - "${PN}.conf" <<-EOF
-				v4l2loopback-dc
-			EOF
-		fi
-	fi
-
-	einstalldocs
-	linux-mod_src_install
-}
-
-pkg_preinst() {
-	if use gtk; then
-		xdg_pkg_preinst
-	fi
-	linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if use gtk; then
-		xdg_pkg_postinst
-	else
-		elog
-		elog "Only droidcam-cli has been installed since 'gtk' flag was not set"
-		elog
-	fi
-
-	elog "The default resolution for v4l2loopback-dc (i.e. droidcam) is 640x480."
-	elog "You can change this value in /etc/modprobe.d/v4l2loopback-dc.conf"
-	elog
-	elog "Links to the Android/iPhone/iPad apps can be found at"
-	elog "https://www.dev47apps.com/"
-}
-
-pkg_postrm() {
-	if use gtk; then
-		xdg_pkg_postrm
-	fi
-	linux-mod_pkg_postrm
-}
diff --git a/media-video/droidcam/droidcam-1.8.0.ebuild b/media-video/droidcam/droidcam-1.8.0.ebuild
new file mode 100644
index 000000000000..60f47eb1847b
--- /dev/null
+++ b/media-video/droidcam/droidcam-1.8.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop linux-mod xdg
+
+DESCRIPTION="Use your phone or tablet as webcam with a v4l device driver and app"
+HOMEPAGE="https://www.dev47apps.com/droidcam/linux/"
+SRC_URI="https://github.com/dev47apps/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="gtk"
+
+# Requires connection to phone/tablet
+RESTRICT="test"
+
+DEPEND="
+	app-pda/libplist
+	app-pda/libusbmuxd
+	dev-libs/glib
+	dev-libs/libappindicator:3
+	dev-libs/libxml2
+	dev-util/android-tools
+	media-libs/alsa-lib
+	media-libs/libjpeg-turbo
+	>=media-libs/speex-1.2.0-r1
+	media-video/ffmpeg
+	gtk? (
+		dev-cpp/gtkmm:3.0
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
+MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
+
+CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
+ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support"
+
+PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
+
+src_prepare() {
+	if ! use gtk; then
+		sed -i -e '/cflags gtk+/d' Makefile || die
+		default
+	else
+		# remove path and extension from Icon and Exec entry
+		sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' \
+			-e 's/\/usr\/local\/bin\/droidcam/droidcam/g' \
+			droidcam.desktop || die
+		sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die
+		xdg_src_prepare
+	fi
+}
+
+src_configure() {
+	set_arch_to_kernel
+	default
+}
+
+src_compile() {
+	if use gtk; then
+		emake droidcam
+	fi
+	emake droidcam-cli
+	KERNELRELEASE="${KV_FULL}" linux-mod_src_compile
+}
+
+src_test() {
+	pushd "v4l2loopback" || die
+	default
+	./test || die
+	popd || die
+}
+
+src_install() {
+	if use gtk; then
+		dobin droidcam
+		newicon -s 32 icon.png droidcam.png
+		newicon -s 96 icon2.png droidcam.png
+		domenu droidcam.desktop
+	fi
+	dobin droidcam-cli
+
+	# The cli and gui do not auto load the module if unloaded (why not though?)
+	# so we just put it in modules-load.d to make sure it always works
+	insinto /etc/modules-load.d
+	if linux_config_exists; then
+		if linux_chkconfig_module SND_ALOOP; then
+			newins - "${PN}.conf" <<-EOF
+				v4l2loopback-dc
+				snd_aloop
+			EOF
+		else
+			newins - "${PN}.conf" <<-EOF
+				v4l2loopback-dc
+			EOF
+		fi
+	fi
+
+	einstalldocs
+	linux-mod_src_install
+}
+
+pkg_preinst() {
+	if use gtk; then
+		xdg_pkg_preinst
+	fi
+	linux-mod_pkg_preinst
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if use gtk; then
+		xdg_pkg_postinst
+	else
+		elog
+		elog "Only droidcam-cli has been installed since 'gtk' flag was not set"
+		elog
+	fi
+
+	elog "The default resolution for v4l2loopback-dc (i.e. droidcam) is 640x480."
+	elog "You can change this value in /etc/modprobe.d/v4l2loopback-dc.conf"
+	elog
+	elog "Links to the Android/iPhone/iPad apps can be found at"
+	elog "https://www.dev47apps.com/"
+}
+
+pkg_postrm() {
+	if use gtk; then
+		xdg_pkg_postrm
+	fi
+	linux-mod_pkg_postrm
+}
diff --git a/media-video/droidcam/files/droidcam-makefile-fixes.patch b/media-video/droidcam/files/droidcam-makefile-fixes.patch
index c413d7edd11c..5230c18f0f33 100644
--- a/media-video/droidcam/files/droidcam-makefile-fixes.patch
+++ b/media-video/droidcam/files/droidcam-makefile-fixes.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index b5f696c..bcb5800 100644
+index 7be3c15..099a707 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -6,7 +6,7 @@
@@ -17,7 +17,7 @@ index b5f696c..bcb5800 100644
  LIBS  =  -lspeex -lasound -lpthread -lm
 -JPEG  = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
 +JPEG  = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.so
- SRC   = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c
+ SRC   = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c src/queue.c
 -USBMUXD = -lusbmuxd
 +USBMUXD = -lusbmuxd-2.0
  
@@ -35,13 +35,13 @@ index b5f696c..bcb5800 100644
  
  droidcam-cli: LDLIBS += $(JPEG) $(LIBAV) $(LIBS)
  droidcam-cli: src/droidcam-cli.c $(SRC)
--	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
++	$(CC) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
  
  droidcam: LDLIBS += $(GTK) $(JPEG) $(LIBAV) $(LIBS)
  droidcam: src/droidcam.c src/resources.c $(SRC)
--	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
++	$(CC) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
  
  clean:
  	rm -f droidcam
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index b262f0170741..3e0927d352d5 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,3 +1,3 @@
 DIST guvcview-src-2.0.6.tar.gz 1131013 BLAKE2B ec8d7a82344e26890fe184d0edf77d0e415aa708bdf3cf55f96c555aaef479b1b7441a0425db035d10a6dc31f90282c169afff2d13684599ab1c005a5ea50ab1 SHA512 f73ba0a013f5afadb45c9bf60f723058ee31e99e204c951c49335a8ef9902a2caa752d6d51f6dd20ae960217cc25155e70efe4c49299a95e6780aaf8034078ec
-EBUILD guvcview-2.0.6-r2.ebuild 1612 BLAKE2B b6e109dae592443ad89c73246519be6d87980d62466ae4b3d59f8071bddda4647fe260aea05ac3012b75d76624aaef692ef466a5f49b75e62ddfba517064e581 SHA512 5aafb73fe8a00c5d17f4c0e68c5241182dace7e83bd81eaeb85bfd0f9e3a09cde8525388880cd3d6543786da73617be539e04b158614a9f98234237f6b8f6682
+EBUILD guvcview-2.0.6-r2.ebuild 1561 BLAKE2B de1fd42c887e4f52fdabd6cd2f506957419efe2f9cae0121f78feb235f786737874c5c72fbd57ebb3ee80d2172f80b6ea1498183af0f2350388e4c0a3d075e53 SHA512 b9731b3e7547bf840da9761ff7b3a330403a0ff5341c768cbc2ff6e02da00dd4cebe063a8d2c8e3d01dca566f2cc9b8864c1c1b23b831329493e8e478cbc0f11
 MISC metadata.xml 380 BLAKE2B 0059009c82869365d8ad9bd1266dbd048b97c3e24bad5d47e9598ae1f90a348395089faa27ae52982525dbd02a6ad3c48961c8b66eba9077a09ffde6f1a8eaf9 SHA512 6eb897ab0df42c6ecb1b5559eea22eccaca63cfa72f350361634b424baa1d7405175968930e57151164d2999e2d2db28e2606576994895259c065ae07d623f1d
diff --git a/media-video/guvcview/guvcview-2.0.6-r2.ebuild b/media-video/guvcview/guvcview-2.0.6-r2.ebuild
index fb40e25584fb..fb946dd29efb 100644
--- a/media-video/guvcview/guvcview-2.0.6-r2.ebuild
+++ b/media-video/guvcview/guvcview-2.0.6-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 MY_P=${PN}-src-${PV}
-inherit autotools flag-o-matic qmake-utils toolchain-funcs
+inherit autotools qmake-utils toolchain-funcs
 
 DESCRIPTION="Simple Qt5 or GTK+3 interface for capturing and viewing video from v4l2 devices"
 HOMEPAGE="http://guvcview.sourceforge.net/"
@@ -56,7 +56,7 @@ src_prepare() {
 
 src_configure() {
 	export MOC="$(qt5_get_bindir)/moc"
-	use qt5 && append-cxxflags -std=c++11
+
 	# 599030
 	tc-export CC CXX
 
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index 61735101a725..9c8846d5dd9b 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -2,5 +2,5 @@ AUX pitivi-0.999-metainfo.patch 734 BLAKE2B 6187b6d596c80e3ea00e5b79df6f9092f6be
 AUX pitivi-0.999-optional-tests.patch 638 BLAKE2B 7d43b76384250b091908369ed274d93d3dde9365df1a6fb31d30bcb35c824cd9dfae8802346ee3019625a83cf4fcf9a249cecae9f670594b1d7f9b73c42f4efd SHA512 d564ab01b702bf30486c3fa947fa62ef9021b00816f3d2759ace16590e3b4ea3d6423ef4f41acc78bf857c2d54a4402fd8da8a4a14762067b26f25396a216e1f
 AUX pitivi-0.999-python38.patch 1809 BLAKE2B fe95c44a409f0a629602d4656cfc90a02e2e676a40d3d3f232457e2a506225f25ab86d585f26ddbaf8551c5efc54e13f474b8b259dd05c2a8285c0b98b9249ba SHA512 f90523242fd8acaa4f0637b8facc5a528186c5dd371f67049b11b307bd6f06c693dd79bb305f2163bed4bd0140bd7fcee86fe7d4b2239be82a7dea47c6038026
 DIST pitivi-0.999.tar.xz 12296928 BLAKE2B 16736fef4f2d16c02b64f8eba56f8c9ddb26f49742ee577da4e4c47077f8d5d71ce653dba366a041ba523153532728c5eb37cb2b76e11e9c51827efb990bd99d SHA512 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8
-EBUILD pitivi-0.999-r4.ebuild 2694 BLAKE2B 08f404a53c6904808629d7c794fa6095695aff57135e318cc3d7ba900db27e8ee6e2874afb55b0ac90d2ed066622f0d53ba5a5fd161b90814202cdcded83d66d SHA512 de1911d77b966949d6e3d4c23085706dfe1f673f1dac7d0042a20eadb36ada5275068569f2c344e5cb1513dadbf601d76eb52c5d1b3e697e87605a8e737edc11
+EBUILD pitivi-0.999-r4.ebuild 2739 BLAKE2B 551e39afea4389eb5d7c928b8c4990536542bdfe791f9de6a020bca0a3a6cbfbb0b2fe645b54123feb4c7c9b9d666565a2ef3723411db9aeff7103803d22a059 SHA512 57dd791c91816f6c06dd3705e08fef1175400057a910b055af61fd190ba6966633d6579077339fbc4d040291b3fc458f800535dc34370dcd311db007b87d2c87
 MISC metadata.xml 379 BLAKE2B a4f21a8cd6e5f4b09d1a89e426610108ab92ba52ef432d1780d100e76e43dda198cee09f105aec83994d4d1fa701be6c33a5981253b6c38b8ec888da08b5975a SHA512 30023299fba3c7c3743e24223d36366e7b59b01540a874ff432b8431ab29b240fdcd4ac4066b228af5421b009cfe4f67fdb69f7d1030c0fa409a4d545ffd43d1
diff --git a/media-video/pitivi/pitivi-0.999-r4.ebuild b/media-video/pitivi/pitivi-0.999-r4.ebuild
index b7c61e6d521f..111b1146a2ea 100644
--- a/media-video/pitivi/pitivi-0.999-r4.ebuild
+++ b/media-video/pitivi/pitivi-0.999-r4.ebuild
@@ -32,7 +32,10 @@ COMMON_DEPEND="
 	>=x11-libs/cairo-1.10
 
 	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
-	>=media-plugins/gst-transcoder-1.14.1
+	|| (
+		>media-libs/gst-plugins-bad-1.18
+		>=media-plugins/gst-transcoder-1.14.1
+	)
 "
 RDEPEND="${COMMON_DEPEND}
 	>=dev-libs/glib-2.30.0:2
diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest
index 2c8661a42e44..0c1b7e20efb5 100644
--- a/media-video/rav1e/Manifest
+++ b/media-video/rav1e/Manifest
@@ -1,88 +1,62 @@
 DIST addr2line-0.14.1.crate 31201 BLAKE2B 52564dd603a9c02694ea41bafc91bf20aaf6837321407d2fdf3e7a0db9f92726c73735fb7d8424295bda9db016d319bd6ab1b3ffcd79df60656a0524006732eb SHA512 f665deccae566ec2754cd43fc1d8fc05db11320af54d0561a612faad769234e8b3b8c0235f90f86027a4db9b7ef2915c86398005c949e2c096fac8e53f3f441e
-DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
-DIST aom-sys-0.2.1.crate 3122 BLAKE2B b36dda367b7a5b65b3ae9aa33e60ec19f51f3a72126c41de049a1a18b76283c717b12380030e7155c2dd00c7674f4ebc8329d6ef7163075fff9e8d99a91580b1 SHA512 1bc6934004e070891abbd98f237a4026aedbd96ceeedd8186df894f833a72af78533176ae406d5aa3ebbe3cc8581761ce1868046aaf3522655fd715ad9a288b9
 DIST aom-sys-0.2.2.crate 3134 BLAKE2B 07b0ae83708bcbdee36df9d67657f8c178a2d6f360e1b7fa83104a44d5b035a3905ad7a6bb930eacae8c67bd1faf4068ba5cc578bfd7967c2705ad38dacb51ea SHA512 972ba26950eddb495e9d1335bd46fe91426e2d981906a1d2530ab12cf3845bbc023d47214f382f7515c9bf9a70f3da7f8f33c103752a475723d6817cd988920b
-DIST arbitrary-0.2.0.crate 4743 BLAKE2B 2bf19d83340d582ecfad69053b852e6928d5a3a66e90bc1af44def6d057c023bc6e1263cea7cdcfc5f7bf8694f26acf6aa88452a4a5be391d07dc5350d450013 SHA512 995e99bdea49ccd2bc153569cfc24c0e936e719a1cbd32471abbaf9d2a148daa76b735576c5dc802c6eb6eb0b913ddb6a1431e8b1d05eac4674786be07435677
 DIST arbitrary-0.4.7.crate 26282 BLAKE2B 1a304154926c9f24a80eced744f13379814377f067f8340672c2588edad22b26088b359b304c1c22f068bf6c7a1da09715caefa28eab046fe79085e67ecb259e SHA512 17968466d1403903a8cb5ec7f8af403e2ecbbbd8beed3df41035c34af1c19bc9d57596e1751f3aaf4c6021fe8fc7e23a7f0c1bbd1a5942d94f9dcafd0b19c1a6
-DIST arg_enum_proc_macro-0.3.0.crate 4213 BLAKE2B 13680bf0754b3096d183f1d1900d45b6a937b7b2e1a44b4f58d79e13ac6ddc608d1aa8fde8155ef8dcb1ab8a513afd91fb60dfd16f11dee9e9666193578e6ef3 SHA512 fe575c5e70c132051d7900885f4aa8c0568efeb383e4f305bb62d69f70f21f1dee9d36e6715d482c594fdbc0e9bfdb445ae55e619d4ab44815b044abad4066da
 DIST arg_enum_proc_macro-0.3.1.crate 4687 BLAKE2B a35b8077b49836f9f8eb310b81052414cc5c9a35c7658e2cb1262a067dd2e0319bd88a3e5dc9837942a4ac40ea622ea47816b2932d8fa6b5935d0e7add3fb769 SHA512 b4c4472393ca6ee00e5859478caefa011f0fa51acd9072457d02c0dc7a9afbf18871ff1135bfe0ac9a26b8a2c419dfdeb878f2a2cab87f8714101f1a59ea1963
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
-DIST assert_cmd-1.0.2.crate 25037 BLAKE2B b7fe731a66ce7270b165e30da774420ff17f29a881e738b8b8a9ed37170edc6d0c27f1b052553c408c93b832f879742123b1585abccfde9c7e4b5830d0f327a6 SHA512 1d17d4ac5748a3a44ed25c8788f17bb5edcc15ce0e3f2232dfcb0c88cf735406e1048752473ae76fb033aad6d544c142c699c49e0398d2625e59b36526417f7a
 DIST assert_cmd-1.0.3.crate 26323 BLAKE2B 97fa287db425901474b2e9c4e0b9c500209e6ae23de73d079458ef21e8d1f6a49837683c543ce05ed79b0a07a4e1075d02630789760b52956f16e2f629e3d439 SHA512 3205f9eac594113996287dab2a641115e5fdb4e92734fa34e12d99b3808597e13371658857896c76449ab1fdca4cf4e675d812ea120602e16024409483b60bf2
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST av-metrics-0.6.2.crate 22396 BLAKE2B 300827869d546f4d093a3e1246cf3b4c67d0c7a483028b7ef1b7e400dec2f55ca31238c0c918b799cd73ae94c8184570c6a31b4b4f3c909bf603da7f83ee09bd SHA512 47aae94ef05302c0ac2bd20dfed97c3ca41db0f63ced9bbac206824bbef017e0abcd39e9805eac268c88adb2bdf6ef3b662a7865e6f3ce311795dba1e84cc996
-DIST backtrace-0.3.55.crate 73145 BLAKE2B 51206670a26275afd43da11c210b4c581c962ace22f7da19411aa287961313d71fd0d1e09866b8870d5f25fdb25b524aa79ea65b7e66eb25cd134c12455bfae7 SHA512 c39ef484034fd10577d3fb3d1b57a2de246d882c0f401477dca29bf856b33fe0fbd9c3732dc926c3df0f29cfaeb2e2ee94f810e645ad21642e445b6f239f8e69
 DIST backtrace-0.3.56.crate 73377 BLAKE2B ef13597495bc655bb01ffe3d5724ef487d48dce598d9522c737c694ebed1f4c78d8e6bb1b80c817409ec4eb8c99b4835b254ee92a2c2befd1cce2034d0b3567a SHA512 0baf075eb3a964f27306863c19a2961121b52758b58d12ec7dfb508fbae2f3136e8be21d2d9f63ca5b54d4e9db78d9cdbe65fa27b31c42b65c182ccd79a0d7e6
-DIST bindgen-0.54.0.crate 192585 BLAKE2B 623084aa43a8781dad202d82e17cac8f00b0683546b5417d05a021b1205c6fed5b142f27634da22ba5cc15f71eeb570daf21d089ceb37a69db7e0750af2c9701 SHA512 17053d27fc54cf905c2ec481f7e236352fca4e676c4dfaa260f36a357f4b54bec2a6a5983ca036055df236aa21e80f6650635462ce9e700cde4ca119a80c5da1
 DIST bindgen-0.56.0.crate 198300 BLAKE2B 96a4434f5cd0dc474a344e58944acf6dea915cfe27adede48bba10c9c542e5c4748f5ab90a0cbdb6901495f985f9112383e40021e60703695b5ff3afb29fd05d SHA512 e7bc3700d3db533380b40874d258d9c3132a85bb704929922f203619dc7e62d0778d92cc23e9409a3c098095e0a29d995b9feb1409a57a402f6059d094a109fb
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bitmaps-2.1.0.crate 16717 BLAKE2B 817045077c198a84d114f68474b14515309bf56abde29398fcb47d7593d41c3fac069825d8a2aa1a598dea5b4865b94a21e83d03dc8d069672e1b835bc1ad551 SHA512 a423ea009bf61629e6dd7cb954f2781dd3c578d2216cd843957e0db05abc8f8c5971d2cca1915929b2b3c7b712450c817bb1de8d08715a1ca2641ace015a1dc7
-DIST bitstream-io-0.8.5.crate 22710 BLAKE2B 7b3e7448745ff4e7d735377ed2f531a5784a95238e1b4f2676876cdf86031ecdaa9f549c4f6b491140c7054dbf28dcd373a1798fc70efab556becced0c5b399a SHA512 79d87a9b3780e6bf38000d435a2fe7579ce88bbbf50cc2fe4b3eaeb1b7812813216682adf968de369fa6f749f75958a47e6232d3a5154cdd2c8bbc69a616e3ca
 DIST bitstream-io-1.0.0.crate 27035 BLAKE2B 6775b22bec5d54467f83f58b6421bc247338c7a862fe5edf920f805cc2ac6a047a314ea0c6eca13cc6c97eaee7f0aa5f816704bad764e572f2db9901b6f72f78 SHA512 c1741d748e3c65d790037fef2b025db4ac1fb0a9fb3ef152d09e96d7067eff077fd74a406d5b2569f404d49b0e0fe02f2b85af8f283a36627b85007428f6fa90
-DIST bstr-0.2.14.crate 345490 BLAKE2B 96095cf4d70d88cd5cb4a61bd0e72a673933c7d1d95b713bd44375e739037ae12451602fa539ebf98e73d39a6786728ad145e882117b98108d945ba96b810e83 SHA512 de62c0f31ad672f90a8038fa163c7cdaf474b35ec24592aee5549af7c76d43e6ed00f8d7237e15ab27576c27a7232033a217955de6a0a3b40c83661b3a7e1e8a
 DIST bstr-0.2.15.crate 344206 BLAKE2B 3a4f24d2a039f7aeee3b6fcbfcc2fa72f1ef8a06ff8bc039af055739436655851565a57e5a4f86a7984b00ee7598c1fbdf26f3302929f91d7efb1327fd36eb57 SHA512 6e464ca1aec722a283759ff6978bab1769dfc8d61aa683f8e4c59bd69c7be2fe86c5470f4c54457871c6640e2d50b6b882747ec567098eb78e62f7cb07cb93a2
-DIST bumpalo-3.4.0.crate 129102 BLAKE2B b585c8d682acf555cbe695dfe150074e4afb1620736f28b29567070e445a12293b460d3c85ff88979abfc74fe7453010ebbcfd64bb2b2d575258d51fab2b1400 SHA512 955e49eeeb803547092b58c086a2582e905578179d93500c1f55dd3fb7a65349f33ddc4c2710c0ee804abbe4e1f2afbdeb998533d362177298a86a4f9a8822a5
 DIST bumpalo-3.6.1.crate 133836 BLAKE2B d67f19bd68e87c1c1360c77df2cd9b11e66f4db3ed5468463d266d2ce187006f2b2117f647a9c331838b8ce6c50519db2f9645fbce190ade2c10a0284b29fa06 SHA512 0d923bda2c98bae60d8ca09d63dc12b67c8fb5addd4a675e27b619bb41b36d3dfc0742696fb53e5fa538790814cf2401d15b110216daf49e5a2ce046bd540866
-DIST bytemuck-1.4.1.crate 23450 BLAKE2B dfa2dd2cf2861069238076d7986f0395297989d6f7838b5c6e7c7190287a533b61aa6fefacb73fc821ed281738ada6045966f8bb99bf89e604247494f6bbd7e1 SHA512 234f524538afd0e28049d1559d0aafbc2803b9461c6b7f65525a3a8d9a9042886acfbcc037dcc4837cc9c42d9f2208eec61536ce559939064d5b0cab73d9e1b3
 DIST bytemuck-1.5.1.crate 24562 BLAKE2B 25221f8a42f7b43fcaf94351fd1c42c3640ebcec254a73d0083c5880774db63e74b831b67092e20c9d80dd04c7d6af0ff28b2c1b2a53bfda465453e8d79dea8d SHA512 23aa2ce347d8cd031e341acbdd4d3f4e0d950afe3b215e0c61d2a313a62f139710333f0fcec9510a3007e31d50c5bdbd765d52ce33713b594476de456babeb31
-DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
-DIST byteorder-1.4.2.crate 22148 BLAKE2B 4fd246d80ec9e0abf41a0779668d8b383098206eacbf7e16ab94a4aac39858471742934df41e20084f976a738154a97f642bebe51cb871afb2a50ff2cbdbf943 SHA512 f6d2bdc3fb456b3f7a99358a987bb593be027b47b06b896938a30a88d36459ec4d28be166ff8fea9b1ea468d95ad387488cc6aa8f07d0723d6a2a7d43e3617e8
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytesize-1.0.1.crate 7629 BLAKE2B c1f969f809abf5ac432e8590158781c26d11448ff0590647f2d60ad62d416a9f93e8bf1d5a650a40cac21bda90310c02f323bcc4fd1e2ee122de1588aff29352 SHA512 99a11059c27ed3c0279acafff1c0fa27fb7e5021876d2ad3a79ff8f31030fdc8a1b5969063ec6578499412804564cd3cb325c9198196bd4a078225a47179f605
 DIST cargo-0.51.0.crate 1348742 BLAKE2B 13568c915970e7accbe41f792c3bb0ae0f2d305d4bd6c393655b06a475cc6dc35542977e950c81606af932d875b7310a679f0024daffad525c041c30581ba966 SHA512 81026a3fc8f24e4e71fa8d6d39417d497e313382eb0e8f99397ee57fa199dfb8215bda529e77f3579146e29bb79e44a5255a75a8e3a3f4072745bbaafb6521fb
 DIST cargo-platform-0.1.1.crate 7409 BLAKE2B 503bc17f9cf08cecdc02371cfb69c70b0f61203153fee4ad4e5b8adb995e1f84e6a6cbb12565607fdb1606372b744fd3d4519f2605f05eb83078c1fc14d789a3 SHA512 b8758e002ac6c4c4440707a27cd747c90e2b128f51bc80464be93bf8677aaa26bec28cc1f730cfba639fb022bb030fae5c06c41773c5692bf3a12167d04f0d57
 DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5f6edd8023d55425273b9aad36a2d1c7f429799565c02a0c9d6db1a869137aec9c8d1e2fe12b228e4c8c4 SHA512 2afdba50989aaefd64b2cd1274dcf8812f69e7b2d8ed783a261fe9d3805bd7800e8e0b30beccc64f640df1a869c012d35c7cdac5ef976829a53dc82e73048ae0
 DIST cbindgen-0.18.0.crate 180380 BLAKE2B f12f95a3e7c9af2ad933e7cf51248eaf5a30816f8aa5a160b8e7decffffc9fadf90a9bb832690be51639209470e4644154525b6cd6e51dc0a03dbea53a7e0595 SHA512 5d09c5720f5157239228f8570b18c33057cfd7e68f453d9e31bd5eb69541e21a348bbe9116c3387a00425803c6ae8eab9b2b97359fb275f5a7fb982974008909
-DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
 DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
 DIST cexpr-0.4.0.crate 18023 BLAKE2B 4a55c6c80f09c1d4ee86706d8af1f52219ceee99f19ecd0618825ce5bb27535184b64c0a49a540756b0c5e9cce6e39aac271545c504fbfb37c44052d04856cb2 SHA512 31592e38d80414cd07b25f7460775eafce1f91570abc1b94af7452961604574d1ca2374c0177875569b644f615a2b6fede273f37a6ee137f9adc9c0315c59b37
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
-DIST clang-sys-0.29.3.crate 36660 BLAKE2B 51169ccae4f69b656e608bec3ff8f0ed323f3c569e7a27d097f83609efa6a772ba2c2a549d1b112577da0d74ce5e4a68c1d8095217bb0bdbca974b90dc7240ce SHA512 a34ae3e1963e64e3d5e28e2d665aca7caea1c0b604ffa184eaec8824d2fd8f8b4f48a6bf4721be8355411163a521e273218217deaac7adf1e4f8542244277bec
 DIST clang-sys-1.1.1.crate 36567 BLAKE2B f2bb14b5e984e0aba35e381bcfbdb365b28aefe9e3a06286aafaae302b9e409c037432fb5434f12478f64bf1bd30d4ae278c6c336b4596b0d26c705e5cc8284e SHA512 cf6745d021a779d49fe7271b1c940fb2c69d80d06afc4a6548a736c819f16f82875bd94f946a189c67453b346bcf73f360af846b30619189fcde82ed04fe964e
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST cmake-0.1.45.crate 14375 BLAKE2B aaeb4b910087bcc735f2cef65fb46184de3c3181add90715ec709c3162c081cc506ed4c7f4f3e6ed6d76aef8213ce80b9b865b2e737166b498a50b60acb7c83b SHA512 7de4ae0c3a50806f2b060e145948be6c6dd0db3975b626e0432301f454612fb7bc7fd2f4549529deaf7a1a55063a11dd553efb59a9dd5aa61ede5e63371d6b2d
 DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
 DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
 DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
-DIST console-0.11.3.crate 20886 BLAKE2B d24a8988673195a09eb5299ab5c5da1d346c6d760821eb094604cd653f6624b6779642616c55bb7e1f20ebf6cbec9737cb43c33466dd759f736bb9084f2c3f9a SHA512 9eae29976d27c46de43e8839ec909fd6fa392a630b47610097e5d8882d3c3bfdbed5be5fe2b8f88a6c01e53ec89e9d4840cf834da7bee334cdf76f337ace3eb5
-DIST console-0.14.0.crate 22587 BLAKE2B 3e91af20994c45b503fa4187ca537fad18efb0b552e09a3cc8e97f84ae0b51309dc1bff91bb54d06412f4779bb218652d649936216bb24fba473b988f1191ad2 SHA512 d453e82559629f0a7516760c18ce28ad347b4016e02d0c4f1aa725b93000cabc41749ce0bbb43cc98d6f9b0b92bf6726a8a265369d86f54a41a0a3f4ff8dd4b1
 DIST console-0.14.1.crate 22844 BLAKE2B 2e7a1480fc10ba92d4d5c601b87a0dac840b71c6c44679acf0a90667f37a40528ff2155130aa72be2ade1fdef4e6512dfb404b0eff181d77fbafb00c25dd6c5c SHA512 2c85d1938faca5163dd7eede2a8a07569e536c92fd0fbc7f6e6ed91c60fa7f947f0ae101817ed943b0668c4d98ddfd3149033c83614786b5d841b19a8b011c91
 DIST console_error_panic_hook-0.1.6.crate 501738 BLAKE2B 1fc227061d615b580e08905ad47e3dd2b63b4ee4e4cdaa92a4dbfc0a63e0f272eb552b17aabf7d03b73630f64c41a1653a034fbf8afc2ccca337d8ad405a90d2 SHA512 622500b82ce27a1dd33197f54f8c0495aa34b870b96a71fd0fa92cf1f0b0e7d4968b9f6bc5e41c23a145980cbe7a4bc5a7ddd03571e1e4688b2eeb7d146aa5c9
-DIST const_fn-0.4.4.crate 16138 BLAKE2B 80885ad10a5649876d37635dc6eb8b426e68f23d7bfdac234ae32816e7fae6d246ff0657d904a3b18dc5ab93fcaa3d4ff28984a1144fa3557d082c1c4d064fd1 SHA512 d79f07982c8ead364f314672ed471d41c6f31431cf511eff5e4c42ebdde324842110ffb8238394d9e8ba2ac19d884fa5f359ba04cef83acb1ca9431e14acb030
-DIST const_fn-0.4.5.crate 13107 BLAKE2B 00a90cd0087060f2d4fd279ae8a771913d6be6055d0c2365b76eddf55d294ce203d1dc7eab907890a96379c910f08fe9456517671a9ba48231f54bc411fb75e1 SHA512 6e41e2d5b185178ea0b7efe8303b7a3a532d3c7d7c7c4c9f093007c81edef2ed5ac8d456da167247b53a128c12ba3a6e1c32497ca11b7c5cb1b03ae37c7c897c
 DIST core-foundation-0.9.1.crate 25985 BLAKE2B 22e70b7b1cd1f39c4ac287f406dabc549e3ba750ecf17955f129ff83afe67bb4bdee7e7907287eac0c28597df971de27dae77619f44d0368864c08798def1ae2 SHA512 d6dae760082ef9dcfc37d18acfa9a6ad8ee491335d17ee17447c5bccad623564f1e8bdc54460fb260aebe9276ce5ea4d8a389a83b5c7d17193614906c3d2bea9
 DIST core-foundation-sys-0.8.2.crate 17461 BLAKE2B bafa6f6af67f55b34c20e50093a5426bed35c159058a97c03d28c99b6f0075305596907291d26b170ee2ce1bf0c74bd51e2c54f11ef021399791129de6cabb57 SHA512 1c66f2012c11185603a0e4c09311d32bc4ffe639ef7626e49bb15006306fbed4c963f2c53d3b853a254b29cda73c393e0236436575d217992268463441ac7348
 DIST crates-io-0.31.1.crate 8943 BLAKE2B ea8b4ea737ef07b27861555b8940722798306fc8c8adb908f81158f16309eca2a88db2ce6ce4a4d814d7a11f1625f2f9a13500ebe2dccb2cef1d435161baf5ad SHA512 2b04cf7ca5a79c31f25877c5d28d70d958a9bf31f5a057568272ffabdfc8131dd4fb5c76cc06700ff74fd8877b8a0096ec0a72b38a7db0054e75dcd6f2b45e74
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
-DIST criterion-0.3.3.crate 106132 BLAKE2B e216e65e5c1e9abca23fab01af7253562be7d36e5dd43f6e80bfc17d3f230f3c116d6332006db053e7d0405a3d817df585260e82fb08736fbeb7999b996e006f SHA512 6f8ce0b6af810f2a28c3d5acfcdaf338633fec9ee7c3e7995eaae249c1a9fa92ea6d209c09e5ea4ae7fbac47b2330867ef0a8c3555cd3412ae72c503489e62ea
 DIST criterion-0.3.4.crate 111110 BLAKE2B 1a27f32745dfedcddd1b41f1d9fa2096cecb11d90c4126bc0d7a52a14c4b97d99204a7156e55c2ca5e525d4b648a82f3126f5d2b6c3d97ce424d1d7fde9656ae SHA512 e54f73d39e54f74758710d14c970ab928b86595b2ecc3759c218e4a57a2d618f8d425049763669de6ac48ff97dda72eecbce2e48b731cf0c11a240cc20e9fb86
 DIST criterion-plot-0.4.3.crate 17226 BLAKE2B cf896d08a208e9e317aa7b9095086660e57e5d8e6552b3615b027847e64fd4cf135d361bca7ee45fbe55163739285907320e9a39fbd28506fcb2ba56e091497c SHA512 69620d5b215757ddd818606d1a979c411de803032391be3b56e1c1ff73fbea992ae5e6c14cd78b519eeab806a34320468b44adb04fd1c67076163658f03d2844
 DIST crossbeam-0.8.0.crate 10993 BLAKE2B 9758a7ed1373f10da09c07875842a1fbb549dd20add43c50918276574fa57b5c5b51d15593e6611b34ff2472e51770fd965fc0810d0bf18f7740467d866c5669 SHA512 8846d29074f5e2a601e1bb741db9396b16270689f108e0b1621d29d15e774898e5f8d159e9af990fbba2cb414a13948a6236254353d4c594c38bf9cbfd2032d7
 DIST crossbeam-channel-0.5.0.crate 86811 BLAKE2B 9af4384f2b74d202971f1967887cfd0e71ddba9a6456ffbdfc80bf192d527f61242239d2eb6a0d9dcbe47be22eb414736976e6b1840c021610d96a3bf03c3d18 SHA512 838b433d48b84f1fea020a1d1324e366e6cdae30ef07396140f195afc45b8f705de6347d949b68ce1ed0708fe533ffaa2cfdedc9d2e6288a7325c188ccde9aa2
 DIST crossbeam-deque-0.8.0.crate 20756 BLAKE2B 6bb602547cb0ca65552a9b981502221f1d3570422d22c867f654ba677e5c95aa5f81ed0022a498d3408c3f69291e1805b49fcfbfaff0d9a6075b75be3bf926ea SHA512 4efa73dcb9ef40b841039d24ffaf9bd7c63f8c0233bba1e0728fd5558702b4ef0af117543834c527335e99384d3c80d56293e891c9d94440f51f454b1b90c399
-DIST crossbeam-epoch-0.9.1.crate 39561 BLAKE2B dedbd19d8aba2c19b844a10323ab488f0dffd5a8ad041cd715a9b1d6d14da343c0c680f6756736501ae420846a5d19bf5aa7bc7142daa39fee901e97f28bb557 SHA512 63d03e71013f7ffbc7b7a8ec5fe478323e7cf679bd126f03980c5e0790b57f5c48ce0ddb5e9c7ece31bd7380a944c1a1d462a9a1bf0126f9851e549739d8afc4
 DIST crossbeam-epoch-0.9.3.crate 42766 BLAKE2B a9f458d912dc247bbc8d2172792e06992ae4b51f588a7cb5a4851c6d7021b428c8225ccf07f0e4597e3e9585cf7b860781c1829d6269826893da3cddc2a753a3 SHA512 f68e1957018f7b88440492403b6812403312b7252e0e873715a2a970a4c9d2647174a19853d1533451ff1f568ac7df2deaa614f342d695c613053b1a3d5d1ef1
 DIST crossbeam-queue-0.3.1.crate 14787 BLAKE2B 136cf26e3a932a4c8035c50b8d6f905f59d3116a8bfaaeb5511e48e7225d05857722240e169d8efe3aab07c370923a57178f058f05c83cee9c1992d03f907f1e SHA512 f666d14ffe4be603ada67ac1fd28526bd2517c32856dc077e5bfe512fa012c08f197e206afb2547b9b5a52ecfb1231a9bffb5b9d24cc4e58aee37ebb87b54d6f
-DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
 DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e43bbd6c8251b5a2f9fd574522539814098b17da03ac5222177332042303f129e0c2729db6bc80e8f76bf4b097d973d4 SHA512 2e89ceea586873e957a31b510f8e8cb0c6675def32ea6b9a9483166b47f69c1ad448a79d897796883b696bf77cb0fcb1d0ac28ee779146f6500ca9a54aa7b4fb
 DIST crypto-hash-0.3.4.crate 8102 BLAKE2B 8bcf39d195d40a2e6d899fa254c9f64e982d742fb304f4b271b75db305d5afa8ea5361c0b6adb23c0fbfd212f3c4601bc7476b4874eaac00a26c8a65b711b0ae SHA512 57d020650689c988859f51ec9252702a7e8510526364b00058b263f4decb249d7296811adf3b8c5e76f8aa744cd5e444aa198f3dfe134c98257b99cdeb824537
-DIST csv-1.1.5.crate 886773 BLAKE2B c5da00c6d81b3cc1336edbe462cbca59121c3438d41c55148de21a538c5a3a9d81d10da44177c51898dd6b9d027f794fa15779cf0c01861183efed54fd6b95a3 SHA512 d878a953fd1079b1aef7f23108c1bc5db3cadc2e1a1dc1ceb4e26508e4249db01f957f6626eef721153d3b0cc47f5f3b25380e4c943adbdf28647b9bb7cd8f05
 DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
-DIST ctor-0.1.17.crate 4793 BLAKE2B e30442d8a37c4d55e0fa17e1bc676defdb6a79c532989c827a2d41e120b7da5d130cca6960ff9325999d4bea988fdebfa07fae26122d15c0de94872a05732eac SHA512 0565ed8caf8f4663bb33007c12fd3d74169a56f2d417f312bef4922c1821d02ab89f59a5dbff0bc83b30e8bfcfe1ec0ac12f5ec270c80834458bb479b6ba4f69
-DIST ctor-0.1.18.crate 9279 BLAKE2B f3e388e35d9de7340ba5610e6c6a9f7df3b1325087e9fc6a219e062d1926ab98c4d014ae9970ce6e51285b90bfd8a069a01c3bf6c5028b1b7172cc6fc70f808c SHA512 82040822370eef7d276275f2042940a6b9d8b94667ef22fcf6f8eb0b527b56cd1d00d5520e42ec000512d17560b13fc792fef2c77f47337e9c843922e61325be
 DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
 DIST curl-0.4.35.crate 85012 BLAKE2B 11ab2e14e425caf91c4c42650f68e1ea5fe5edf6759b10e66718ee2c603056facd8dd00da4acb3124669fff3c8af366bad4f163b5477c28be0e9329ca188e7a8 SHA512 255f4f8d7ed2c0a4f4f9b32b3cbd6e9f20f299bf5379e084d884107836b108f4df31b3f8ef5ad3731e7209ee5eca63568b6d3b68a0e7cdf24d83d36b80bc23b4
 DIST curl-sys-0.4.41+curl-7.75.0.crate 2907738 BLAKE2B f165531da074c856e8cb6725f55b1d00f6dcabf2756dab59c35fefe193b25aeb11dadcfb7f7a5bfc986d8983ffb360637ca76cc937b8559f5da6c15a019d7244 SHA512 34bd579b80135d72c50edcedeab88b00dfd7a5aed62f4eee59ce3fbbeac43553bdeb87d5cdb513bb8c6c064a64552443fad7c02501a44b840ad35bcf22cd4179
-DIST dav1d-sys-0.3.2.crate 2828 BLAKE2B a2915ec47646e1cee14a9f57f14396d09ced2b46b278661f01dcb8cbe09a7d91b9e73146d102d494b9d96eebfd7ff50cb9d65379875da01729ac81961977bb91 SHA512 ab664883fadd003a91ebec09f69774f897f8a857c6487559d80ffdac985a4cebb20d2e1333a042ff380db11708cb4a5dfa3621f99b588a4da15a7591d54709f2
 DIST dav1d-sys-0.3.3.crate 2816 BLAKE2B c6824ee66c2a199839e56ba6f5d2ea2d5c2f7cbd2e82fc9f423127285bf99ea1473945088658846b27d2d355c87079a46a115306ac4a9d0c7d5f9b7c1a12f3ae SHA512 d29262bc5124c469d758dfc2d477273fc499082528daace2f1a5e74865e78f1540b5c09af0c3518918cfd643cd343bd6990c8d132457c5056c903af17bb08dba
 DIST dcv-color-primitives-0.1.16.crate 69927 BLAKE2B 7ab85222d4b4fa0a3395bb45be191a3135f9f66db13b980c1db2a3f03679173ca0fe1bb19510978f2db5a9e9b97d8fc66d72a2bb2668158ed0748d666f8e3c16 SHA512 991bde0cab882ebebfc599388dc6d508a6a53825ab484beb76259af15c6e7c49320bd4c0d3857b1cab965c420be968d7e284859ad58bfb8eb6c5d9b27ee13652
 DIST deflate-0.8.6.crate 62365 BLAKE2B 05b1f81e4c423f9fdd823bc33352d8421f2ca0c26d43cf0c5990db12f5e31c46ff7769f1baa3b971166b4146eb448ed0bd3ffe68f7c4aff5885b47826f77d847 SHA512 7e2e23205c56cc4c834ade2a6a22b056253c32e29346907558117714a18d8433882a712711413addb15da79f9f59e089a06dfd680b756ab2725b500a49dc16b2
@@ -90,9 +64,7 @@ DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22ed
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
-DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST env_logger-0.8.3.crate 32543 BLAKE2B 513790f39c63eb096b0fb62687c74262b42b0edc3e6fc2e2f2fdd44463eb4cfbf67560136ec206e252afa1477fabf66917f4fc0e8192e040670f98f3d7c4bb51 SHA512 7f6c3c79b8f4efb8d1d4e4b879c1c78a427f15669244ce1eca869aea9bcad950ffa5b59f3f8e4513e085c2daf1f5857313b374e238fc78b731bba2646ec895ff
-DIST error-chain-0.10.0.crate 18432 BLAKE2B ec4623513667d68a2f491eae64fc7e3ab11819b64ca95f7a0e5776cea433b19ce8198fcdae7ac16831c63594dfa27b1a285a7989990111af6f91eec88399ab70 SHA512 77552e8db32e2c7d37e01b1050fc889964193d21f281c3ad28c6adf5fcf8d3ee4c73fe182b27282fba4dbc3e6584df7894a3b1fabdee7e219b6d59fcf18a1a3e
 DIST fern-0.6.0.crate 299856 BLAKE2B e7adf3beaa2f5fc029acc8d87411c5ef8d3288100b5521d0c1379db6868bcaae73e197f456509bf29f52429ec72bc6e5ef297e971ce9cf6d7cc6232b5d9813fd SHA512 d0524c272cba970b5193d845d4e84698d64bc28c75b38dd2f265f1a132e1c9ea177ebdc38741614f6a6f3d106c7c50565b8562378a50d59ed093e00aee8ca382
 DIST filetime-0.2.14.crate 14358 BLAKE2B 7d50e71b5a556bc24a6bcf737ec07f185c6d6a2ba2717d91aaba71ec15d1981c47dd6010e5a4278f8996e05bd49d04f3481f0b9e3156a8ad1da1cf39a84796d6 SHA512 f2e6e41b8b705c510e1f1932451ab8a0acc6a4f84a7a21880c7e69639a6aace7c5ed4f694ebf47d04ae6ff227f8d6c6733f2c4bcb953088531dd91b37262e45b
 DIST flate2-1.0.20.crate 74036 BLAKE2B c5a1270debdb42f8612c0db9b684d339dfb668dfa3b06f6dcef94b43c115daee99c3558562d605da5ba1a554930030083baa8128036e9999d47907f29687ee0e SHA512 1415cba53183b7ae0f3396859186b92001060a78fbee10dd0dd4c8a93119aeb78bd8d782735c292badc1ae6d369badc6fa1a0105835614a6f70e82b080d8549b
@@ -101,29 +73,23 @@ DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a864685020250
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST fwdansi-1.1.0.crate 8280 BLAKE2B 5c46e66a7fe25e02aaf42668853a0eea8ab3bbf9d160702770d94f8e6c4b3efcac9f840387516d1d14cf34271981ba095e3e0f7a5eb009b9d5837f94f8fdee3b SHA512 5f91a6fbc40b00a06abb6686cdc0389a837fea6513a9b9bde7cc4ce5cdb19c180ab21ecb5927c41a52c56675991ee10d127335c1f6d8c52dc7e6b30b32411370
-DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
-DIST getrandom-0.2.1.crate 25459 BLAKE2B 2b3eb82c444d15a770691e1c312e4e694292de6b8a0eb8f6b3e19e0ceadc2d44a6cabb93f2a309e7ee388bc0d9a4b323800d863db7b7e7460e98e4ef6156eb6d SHA512 3cd15d52c5821972d1777cf2249a5f55ca0705ac2ff688ec45c21b70e3e956b538133a529e229d778cc0d0b48f293466d1bbccd0e18d43b9b6646daec4b08480
 DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
 DIST gimli-0.23.0.crate 702175 BLAKE2B 9acdb3afc092e43b25a11639407eba7258d25e6dd57c1f1aa18d17ac7c2ad73b422f85d850947498deb3ad8c1b8001077f9b636f7c1c11a4215b957c990483f7 SHA512 b5dce7b563ce7b8dd6cfec5258793323d370f217779d0d57265bbbe2b1eb2704dbf0f25c189ae6e9079989b6ac7d5341e10fe49457577e482a3904c745c89b5a
 DIST git2-0.13.17.crate 181726 BLAKE2B be159d2f3602a65b133d6bdb3d949a48b34029b7a491961469d7a5a6dd8d471b0460ea53e802f69a216ed6111d0329e8a8ee29024af3753a185258f1268b5ead SHA512 5d95ff8d5c62df55b9995f2319dc350dfc9c44b90bb594f6b90df4985f8ebed50211e380885826251aa4e86eef1cfac99f648fba5f91cd4b725b0d05b3800fc9
 DIST git2-curl-0.14.1.crate 9336 BLAKE2B ac2338bcc95315dfbc1528e29fbe7e16a4442b2e2aa94350b0f7e8a5d643db60f901d99ac5689c1b242335eee78194449c64d3e7082a2f164b6b80fcf3100134 SHA512 bd1f074631f902c1affd167db0cbff329aa07b2a46758af97c71dfbb5308a82562efa2c42e21c5be63d7c93bc1052d688beb71cfe1588a4c2e9705679cec5a1c
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
-DIST half-1.6.0.crate 36740 BLAKE2B 712af6d7dacca729e3063c5aa56211f5539f47deb61de466969a4ebfbc4c2eb8e179ca29c4d466e9188c877a3415a25dd70719b2e65106e4d8f56c3422e647f5 SHA512 52a459a793c43d66dbc79eb517b1cb63313b009aa8ce64c0ba09c4e49d4abe51ab1085f1f28421dfb78d3f83eecce7113dd50b6bac8a58259fbda4a5529b2ec2
 DIST half-1.7.1.crate 36168 BLAKE2B 632fefc24ad4b44c64ef6d3da745392ac016580baa5ba898c45bf41598ebb9ea86bb11c041b8813df73aaa755e323cc762b9e95b834aff7118d0d77e1834e7d5 SHA512 cd678b9277fd909083b67eb86c1fe92f464c92e1932246c6793dd835069aac5af6b9dc16bfbdcfbcdd75d3a641bc1f2240effd83dff6068a41b6c54d3739f73e
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
-DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
 DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadcf1495bf69f3ce813774c9a49776c6b3641001b6007c01e24ffa6d2600c1bab05c4ea3353c74ddae2fd6 SHA512 cb3b7b24db30a8b29f36f90a0d345b2e187f9e76f22203e142a77c8308dcc62e97b5714fb0ed890210b31375cf30d3362b8d740fe189079a6d3a095be50dcb0b
-DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST idna-0.2.2.crate 271070 BLAKE2B 3a07d53ea832d53a2e99ed3345d748b6299f6b4e6d4c33de17fd5ed70b9a46727272c9facf1bbb79e2981a4ad1953cabeb53d71cefcdc2a1e9e9f57c4a9f0d22 SHA512 71be89a626b087ca3a33576857799c15634263e2bbe43290750eaa6b074088cb6b54b3f778930e3dcc796a883daf662c0935178d4f096c751027bbe727124212
 DIST ignore-0.4.17.crate 53056 BLAKE2B 734e74210f13e5ad08864cc8b143fb780383cd36048e78da04a0475eaa760867dd4a385b37fdfaff0c5aca946d4aab19c4901df0833271a3ba05887ea5dec9c5 SHA512 52380126bb46478875093eb39972949625e1d9ada6fac7148faeccc22807d8e2a1e41c34549e7d9f884fd3cd6dc3d42b47a88b5b6de1089d7e3ee8014b3aea35
 DIST im-rc-15.0.0.crate 182171 BLAKE2B 94605a89b9f375cc2e0a60f107db600ca57b7f342d1d686ed73a24d9e4851d790b71293b0b0440262ee45ec94defa8780c7611969fbbe36532b328964ef12c22 SHA512 4be0ad2ef6272d39b3305dcf50c97836839c4917163c030ff2a950fb16deb4eed0d3026f09743479b344f9f688419449e8732923ee1146aa655ff5aae6279003
-DIST image-0.23.12.crate 217913 BLAKE2B ba8b3891785a8af7231425217044d4a24e418829bd55a966886df0b84d167c177d8d6088e9d039fd12dbf5f5c6bdead5dcae27cceaea3c899f7a3fe6abbbf0eb SHA512 bf97aea11b89d66f5887dd4b1d0927d1907b7b93457329ac58f082d7b17738ca6e5629eb5e3648cb6d2e75ee1a2cf0f302dd30fa232611dd2eab0dafa7e3bce6
 DIST image-0.23.14.crate 226804 BLAKE2B 0debec9484b54cb56eedbf07c246b80afc6de99b03e5f41b5cb9aa29ad2269cb7e9891b7377ef7ff53200959317bd38b24e823ebe5c2125677ef2588eec81ae8 SHA512 4eb07fd698c2d902979ab06ae0baef4a53db74da78493c45f0c32d5903c5399cb8a1a25a2e89bf504ffb612e8153eaba4ae41df3d17f02c27e7991fdca518f63
 DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
 DIST interpolate_name-0.2.3.crate 4165 BLAKE2B 4399a4330a833c45918b94c78a269e9166a616714faec00998a69484e3fcb8cef20b2a0fc266fa6dea5abda2830e0f9bc958f51497b249c01e1f60373e198a59 SHA512 964944384c39d0c085c05a7643ed2e8a25e224e6b28fd9da9d971567b4d56e7c4887a61e107c718cd95c19c6d83f355256d1130206491f7b286a68899eb7b894
@@ -132,36 +98,26 @@ DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46
 DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
-DIST js-sys-0.3.46.crate 67064 BLAKE2B cae8b3f5d9318f684869aca74d762364a4655b56eedb3dcc3b3678386ece5275c4990ba997a787158aca296320bc7a73915db5e9654b3590af179afaec823e8e SHA512 504048b9a2efb42315e351d3a972cbb7474cda1374281e25b26a62c5811a3b34606489b95bfd417b41316569aa33ebbd02af2aa359b576198f3123bf7e9e4d28
 DIST js-sys-0.3.50.crate 67123 BLAKE2B e31d81932e8c219524aca9159013e3e7e24519f154e6789b9b5e23de7da0b89e7ec5bf3f949a28a87a0a9671831d619aff1b84ed0b2011ddb01668b110c4d9b7 SHA512 961f1e2949ae8e662aac866807b2522537ed8756caaeaeca2be837329d6b684dd928aca1a7da9dbc402388625c54177dbc6b8141a1efa4087c78a3240d002d87
 DIST lab-0.8.2.crate 13245 BLAKE2B c8e8c42301205355a29ff165bd52a3a6425bd3ff4b4171d51547875fb99d8569816cebab8e883e84ff5a3dc0e0a3e2732f8c00baf672004343e1042f31f05b8e SHA512 a08f0fb5daa02a24ea2fdacf818a9def23793f6ba614d971ade84e05381631ded6d2d7bf7e57e7fdc0d27bf27180a28862551929874101bd8afbcc0ffe620d6c
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST libc-0.2.81.crate 513105 BLAKE2B 789a79faf2d5079f5c4248446fa7c07b11af647bbcc32521e7989928788bea7dc2f65204f396b4fe0c7b3a6cf5248882d7775b97c028a3af1ba35e8ecdb489f8 SHA512 8e121e0dcbd8218e02c2c6536ef6398cd002a92406d433c39bf84576e9b881c5b8a66fee826da6a6189f44b825f3a9d959075eeb0501d7f604bf9cc1a8b8d437
-DIST libc-0.2.82.crate 515967 BLAKE2B 60c1ebdf659f1eb37f47a068e778567412bb133526df28fee1d20b3fd58dbe7fee1abbdd21c5445bc1022f2cdc39847244dcb7412114037a0be64f5a2a383978 SHA512 25eaf390acb409d329b9e32008078824eed4ca3a10af851f5097b653793db316419a395910c23dff293dfe2bac051a51871281a6bf2487937121b403286630c1
 DIST libc-0.2.92.crate 522480 BLAKE2B 4390c54531fc908b8d8e200fe271cd8536660b907dab3da07056b650f13fab0dda83969518438eac7ee75761bc1913ffd056a7cf98b58ab31d4ef98676193220 SHA512 bee1495a75cce8d117d5a565dcd9e2050b9b308aeef40dffe5b970cec4a0840eef07e8d65a64558cb75494a77a6b0023923ee451b29288e02573b54121fc7b34
 DIST libfuzzer-sys-0.3.5.crate 112480 BLAKE2B 0c566e9f8187e51708b8df88333a9ad92f80e62be22c6dcede44729c87a245f41ad254dd4bcbb76f5f6be3c7c426770b0800e82ad6e4b1e5b598e54ac033ee9e SHA512 d07c49351ff8bdb1cfc62f60cbf9147213bfd524e26dc50ca17f2374868a05581c432822c396222fbb9c72098fe47a57d97423f4b40fc2e7577801b829a8e796
 DIST libgit2-sys-0.12.18+1.1.0.crate 1434936 BLAKE2B f283177caa941757388042ca4578394e160ea8e5776f6b4d842f778218286ccf65ce2febbfc780606d7624660224b11a470849b4d61302dbc11b3ba5e8d1b49f SHA512 3d9be57074e15bb0dbed151804d401d4688a77f1d46eee171e39b00815a983c103b614509ea0bcbe3c1355fc6c47738fe9da7ef6b8ee2d040fc30062db701233
-DIST libloading-0.5.2.crate 16420 BLAKE2B 1b73f3294830cdd97b7ad42f0458bbdc95f641a182352095c26f835ba4fdc71cf9a0fa85244511b07bb79dd1c4e913625fc69b4b1e2ec28306dada1aaec2750f SHA512 d04cb1bb220c9364c02da4f360593907c875951fc0f6de5da1455bac4e96a470128409f77b21194fd6a87550f3ba00abe3b7a3426e7637acb62b80d61da46be4
 DIST libloading-0.7.0.crate 26216 BLAKE2B 83827746f57fb5f1819aa0ccce0ffd698a3ed4b85ef0e954741691003c843ca877de81b4a97ad7c53d28f79701a5caf2fee801a68c015d19c20230f2560b5fc3 SHA512 e2089a8ecacd65522b246cebcf531b6b1ce697d4eaf294e0540e1f34bfd714037177ba802406c31e6bcc722b4f391a84709427de1c6fb441cdeb8e41fd4f1e28
 DIST libnghttp2-sys-0.1.6+1.43.0.crate 4458350 BLAKE2B 90357f647b7ffbd1bb5debaf22f57de48da392bf6ae64a5a7fe02fdc0c791c945f918432c21c97fdec75a6aa16fbd3c7ad6619e42e04462bb58fca906984c551 SHA512 d64cef5933c01cc4243f8cd9b9b00224d1d89b00d21202ce2e0baab0491357b7bd23a5310443bddf9b2ecf3309747080aff4eaf5bf7a0e81c9ae1482a3c64cee
 DIST libssh2-sys-0.2.21.crate 482836 BLAKE2B d92ef8081bd1ffceabf1be840b20722de647b50a0b95832d544afd7f1930dd51620622a9bf3031b37db9b0a1da4a925050bde16c916a8a71b3e79c73f125ea1a SHA512 654dc947e32070cd03fc8e9bc6046e28c9cc401bbc4c914319102a2c7ace7f319dbf0414a51d9812a09c9a88f7fba6b9203286fdc383d0e75f86b6a87fc78faf
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
-DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
-DIST log-0.4.13.crate 36015 BLAKE2B e71388a74a491e519a6c4dc048c46d2ec7fc30e68663806084db1bd772b8cbf89f684879114c09865b1ddc37d187499652d1731f62268eb634567d2166147e04 SHA512 22713712656ffdbfee7d2862c208fc7ad1c1c5380601ae9d0cc100fa460902ebd7a90cdf9fb5dccb5dcd17248d5c8ae8b1c53946c1baa8490cc9f06cab3d4a4a
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
-DIST memoffset-0.6.1.crate 7706 BLAKE2B 351e6ff24a61b1016e7749571e1e66dae370c58746baf00b4688bb1e2d8c88621aa6f135468593bcd8ba30acf2c097d06a0dd7243eb06b9825e3fc1ffd31ea52 SHA512 74d081af00b7e442198b786d79e4ef35c243d2e78347ab9cb50e127569aed3fd77b47b95df6f361a716abce27c8cc6cb1dfa12c92b0b2208b21f9eb9527b61be
 DIST memoffset-0.6.3.crate 7697 BLAKE2B aae9b5dedf06680bc597825653c08bcfaef6429a8367c8dbb58df7f09e91b166d04a231f28856af592590eda0e255a947294e0b8064d7651f490e44e4d1e748a SHA512 5afd2f9a282e9bbc60da1abbf911a3b4480ab975c04c565149dca8a36e9975b3262023b73c67d9dcf80b2eba3e8540aa2b91466d37a2504facb3f1eae98f52bd
-DIST metadeps-1.1.2.crate 2768 BLAKE2B 96effbe67bf7b1f29a6746914321c7911c2d2619f360cf01ef4451b07fce5c36b6f2a7c8bf9abfa08e7e5d2e6e43b44f08a94701cbcf6d66b1631e7c8d76a519 SHA512 d9a1c14918579e5beb2e9126dbe7558440c73fa87c06f5d721df9cf8bc6297b8ed16cf40cdbb26b6f72dde9d39111c74306c70e8c7a16e85262c6279308f9da5
 DIST miniz_oxide-0.3.7.crate 44996 BLAKE2B 0e89ec4131e7abdadaa9feb6019b31853976a34434216e0f89ddab519559d0e1feaf2228fbc09906e51fb0242a18abe1a67a5362e080c19fc7cd00c2f95f08ae SHA512 d4eff239f8d6e947b94619e80fe03ed32aabd1a6393f63145d70ed7f08c51c45c7261d8157bf61c78d1637ea1f71ef15f9813ec733efd8afe6aa14810888718e
-DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST nasm-rs-0.2.0.crate 9522 BLAKE2B f4a6266e83a5b17116eed0776003894b42d71edfb0a2a4d5ce39e8695f001233ba2ad12f59b0a564813680aae085c2366304fd16b9a127236b11b8eab6c61ffa SHA512 fcaa05cc8ec2128f25caa44772ec56a971cf9e63f3525a21d10bf2d54bb3d30e729a90f4d812e451318726c743045da24c9f31a80e218c807ef44271fa32cc2a
 DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca
-DIST noop_proc_macro-0.2.1.crate 2025 BLAKE2B 739e953d8b8d087e5c907e6dbf0cec79bb9aaab11dcf225b6aaaf4e7c3657c8f73a5e5cac9442a943e2b625a8a11afeaa9a15b3481f03bc279b00f68997bda34 SHA512 3f2cf8eaf66fa8ec3c7704d9d525e38dfb10432a1e5c7be2b3c2b9833ddb72884dc3748adbeb34dabc94e643702fe2c9c69b96436347d7571fceee2529493c51
 DIST noop_proc_macro-0.3.0.crate 2157 BLAKE2B 0be977f9820fe4cab4035e866d6ebc77a07cf634ee6889dc91581a9eb43f308b0fc60b87c8bcf200742bcea4af14a94c69c5b9dfbb32b95454219a4197fd5228 SHA512 a5ad22e815b8c574b42f7b70486a3fac319c24334ade74726ec07b976a838954d1de2d3632fc55ce6c8de2673e62b987fb4607a49c576f60959b1609e47b3771
 DIST num-derive-0.3.3.crate 14545 BLAKE2B 3af73d35ced61f8e4fa2f2bef695f72a3cf1f1a67c77982d3518d9383331f34c1222dd7d72802cec22baa108ae08a87805a11942132c565ab8439c4983e99871 SHA512 e0f4d06fff26c2d2b140ff5ec1ba655a46c8d8fda484f03a8ad4910e8cf1392f0130d5c0bfbbe3bfb95da1f93e964f73364de6551fddd81e6fc27bfa35c15053
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
@@ -169,7 +125,6 @@ DIST num-iter-0.1.42.crate 10450 BLAKE2B 8ef03f8f84bbac51a11d22ad79d745c74c4092b
 DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
-DIST object-0.22.0.crate 181505 BLAKE2B 5a7430b47954c8aa89624d7895b861dd1a8daad926a59f2cf4f6c4528bfb794c1b0715782844ab142c8f1121eabaae71958e5fb8b67c45ba801bd31053cd08d4 SHA512 9491319361ff42d19f0e3dc72186dfa2a21e28090516a0a1be5bfa78a267fc5447e1be73b16f25709586113a78ba5d49d8d6c72243c9adee3d3e4d7aa2f268e6
 DIST object-0.23.0.crate 203889 BLAKE2B 41dd20ad5b43b026d032b50360bcb1efff7aab471342da1ab787d820722f4374fef8df48eae722016893618f0e1af3014e42c56a57ea8792594b5fee676a4d6b SHA512 6352624a9071bef53e4b7209b3f8cd5168d54174962565d76f8eb9201dc84dc3b26f08c81ac954bc9d4c55032a022abb35d160817bb434ef27f76949290bc7ef
 DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
 DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
@@ -179,58 +134,37 @@ DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed
 DIST openssl-src-111.15.0+1.1.1k.crate 5087962 BLAKE2B 50a7528ca83e30434f14aeddbc83c434c74962faa106c597794a5c5a9d43d4c37de524f657cea9d3c87ca3f605bc59cde0273d64149954526ddffe96bb9c2093 SHA512 0adee57c5a9dc12b7a2c438f838a5d26286f9e885500708a6945a53c96708838071ee7a521e7dd9f18f5de59c5c3e66880ea99f64669daee442766471c8c2898
 DIST openssl-sys-0.9.61.crate 52010 BLAKE2B 4746fdfffb1f0cf626ff0fe93e3057bafd8277c6469f577e37370010d5267b0f9bde8a91279e9f8d0ca0b93cad2231153ca07d667fb3b7c8feb637a04dbc352c SHA512 0ef36b2483163af083465ba9e84586ac0c2068285a8b3f1ad1e6a2831361722132d1d008791d969be669ab1131500416852813bb431307a484c1a277b5ab9abd
 DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
-DIST paste-0.1.18.crate 12259 BLAKE2B ed72b93a27166b0989743c2528d4a41f4b87ffdd0c588557d11a5f37f85d5b8f03ced86150af6209f9fa8d0f6efee705769b26a2f4dc3363f35cc3ac12c0e6ad SHA512 a4d9c75f6f358d6c86eb0a66cdf22eedec180db37358ca2870a992e215d5b389b7991837d8f2769742ac1b093674cb4352ef9d6754a249253472fbcb3a81c001
-DIST paste-1.0.4.crate 17431 BLAKE2B 304b7b5f2735daade64c99785412420b209aba104d316d49e4d4458cac5fb632d2648a3363505b416da769b97ae972d84b18d3f1cd2a5029bee0f258c42e6848 SHA512 5c8d4a0c970babf81c7de5feaff8c31f0b92427c21c58741e169e55f801fddf6d369c1aec1e665f3a7171a0b7f07367dfa76bbeb2cf3f19e777fb42f69b7733a
 DIST paste-1.0.5.crate 17669 BLAKE2B fa8eafd98dec09e488cb7ce0600c18554887249f1f1dd4c4cf3d1902b7ace184324a4b9afe16a7f16bbbac0d7b15885649bcf8a33473413e37fcfe3fa1b57c4a SHA512 c363e56e1b9bc2e401827c292625951cf577ede568033cee53da2ec2383c4ca17082b52b82477c48d65881a8c76f535a66768022d1eae2cd5f55218dbfb9be22
-DIST paste-impl-0.1.18.crate 9451 BLAKE2B e465c4c7eef44d02eb1b61b5290090513607b452f4adc11487947b7047ddc44905d7a02df827feb2142f0e74583afdd9648c1c66086f10e1bd861b663200bf8c SHA512 c635efee46cb251b76ee9427432f81a0d944cdf1d0a95693d824c6085e7dea7e1e3f48c692ae27946f69e4e78d8080220058acf98e5c8a78482007349f8a7a4b
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
-DIST plotters-0.2.15.crate 1047949 BLAKE2B b293fb49e20d34038212d008a1d5ae95f7619d14f16f0f9b72d5d8188e83d2274cbba30734518fea8adf367282644058c589d9121cef5377753d78444c5ce489 SHA512 d66b9c8154a9106e990a8a544aade2baa61e293cc36fa9833fcb2d814da3aa87382f50e637eb25cd2c4b7e2fe28a71f3fdfbe8d210d835e839f9685d33d11c2a
 DIST plotters-0.3.0.crate 3242931 BLAKE2B 946c47a0b15d9a0a4c44b1a086bfd366be93b47b13290681b578ebab421e7a8e0d5cdd224de29c325b213d43b11b41f8d6dd26a961dbc98bccf4d3a580dbcaa0 SHA512 c54a833b2184cf0a9e9ac93739dfe06cafbbf381b20fa8601a5d97a25998881d92197afb086d1dc40dceb283aa2bd054151f9a21d38e0eefc817247c8e2c40f6
 DIST plotters-backend-0.3.0.crate 13492 BLAKE2B b9963648fd1a95f557bc92781c292ab0917ef373666cba95b0a1d3821253cfe8de19677f65973fddcd96bcd2d37bc817cdd783680dcc26be9556813baf413d29 SHA512 2071a4e249277a25cabf2f39c8fbf68ee5246b853c3f054fa49ff5356492b770419ca7dd7e481465b764fe8a1606491a2ff49a3215c3a5dd7c7b28779c54f3ad
 DIST plotters-svg-0.3.0.crate 7488 BLAKE2B 87e22fec00b61737f3ca630fec669b277470455da19de52ea5098bdebc1061c03a15dbe0cb498f321f168d64369493f0d8c4260490a19989b5fe6bcbabb4ad18 SHA512 a706b4db5160d30d1e1e2d718b511a9c3f875947ea989d981e7cf221aab3d7b1c41ceb7704956683f2ad5415e698463c0eceb1e3e60fe1f794ac90f4dd175d82
 DIST png-0.16.8.crate 52598 BLAKE2B 03f706591182a89b0566f8a793163372a4db3e7a742f3aadf06fda93068c42a4351722796ddbbb013fdc1be5a88dc02debae50ab1cc3ac81d72d07a814b456ce SHA512 df96f8580d8cc11df54788ff64ab3269b14369a467d7c29964a5b19add5e7a82258e6bfda40eedf135bffa98a2a86afbb725cd085cf37f6c433abf9a7485edee
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
-DIST predicates-1.0.6.crate 26093 BLAKE2B 20eec0af0b3464931f486938fd7a058d4ccd15fc12d7842387906f142897b929ec79068ef410853b6008b71945424930064bafd84ead7afcdca29f35b9624926 SHA512 0e971a05e1ada5ffe61054d551330a6bcb1c9a5df541d19b442d7a06842ccfec9db981d347e3357f83b1cad750e8af1f90cc9130df94f417267063e7954c529e
 DIST predicates-1.0.7.crate 274733 BLAKE2B 5275012b3759356882fc1256119b52526eb8a39f3670d8e38d10ea96918bdc3bd13fbdfc841c6784aa3dbe8147777048f751886427c1ee8c4380b5084c5a70c5 SHA512 6d72f940714d698f5ff92f16a35e26675d995ea94c82de9bddbd386e7783ce0ed726b21c85bac3dd21e8f8a92cd2d4ee37dafe1cbc42e8e6b30ba13f06858b40
-DIST predicates-core-1.0.1.crate 8186 BLAKE2B cef5cbdc252e3f953fb9417bd5a439f226f627b2ca6a9c537834ee8ee59cf3a252ad92ef5ee40f4e544e388757e5dba6b07b6807e95dd89eb35bf45f612d09b8 SHA512 3addfc4f6e3f549125eddc9f1aa11072e17f48909f53ce8e476ce783cc690c0b52a1fe6416d87816d8b558350fb8b4666adc6b79cff880956bf258f646459da0
 DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
-DIST predicates-tree-1.0.1.crate 6355 BLAKE2B b79f756d9f1822a037c05a65f90cf01592ec6ba83bde2c44aa6fc8a3d476f9e4e3d0ac13afdcd3936b0d43244e8e7ab1eeaf0223cecc3f7941af96e44c45366f SHA512 f97f6e05b3edc1faf82931ab47541b3e459066e0f5181f77a4ab885e10bdce43f71021bf2c848993125a4feef13c3290a312a74ad1d2b4a2cb55fe7d24492a19
 DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
 DIST pretty_assertions-0.6.1.crate 61551 BLAKE2B 1e92be2282e42720c9e1d1d26f9e67515cf8aa528479e14bae9c79193652c435e9513e85b7958016c105ed581fcbae19ceaa742fac6b07374a2e6f7b57a689b2 SHA512 10010c6e6b02098def38a8e6cbfe34fd052fe5773628d57a8141c7933f868906870158b4d4b1948b752d2c5f7b2981806d5f835e125aa2447d408415ba764f71
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
-DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
 DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
-DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
-DIST quote-1.0.8.crate 24997 BLAKE2B 53f8d9e363e2697b580f4bfa39257a6ea1d1899f6cd73f96233cb476de1aecd0c4bca9a8856d128af81ae0f428be71c19b0d2e4816d856bff20030c4cc9258b5 SHA512 448d06465d93d384bf31b0249fd143a92edc4b9be8bb3a8c1a86366241be6469c3874dac98acb3810d5177b106d7307c7d9e879f91cce2e278a319ef1935577f
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
-DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
-DIST rand-0.8.2.crate 84288 BLAKE2B 406820e506cb3dfd2529703ff4ac42dc1a693fc4c12023ab46fd69c5517b3136f02b580d850730855493a69ce31f8825bd9fb1905717178b1221f6c6c9aa3788 SHA512 573090e4a3501df912b04e5cecc40b1c61a46602f790a8f6068a06fc28acb40ff760882cb1c65eda073d33b4ab74691ca84456e5f1744bd0fc2bc9990ba894f3
 DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
-DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
 DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
-DIST rand_core-0.6.1.crate 21634 BLAKE2B f059ef57238977208711b2b25f96682f58a5e935406b24a91cbbfca2cea918e764c512efa8ed8d77ee8df1fa3aae1d887148c5dd54cc0bd82ff14ee2dfade0f9 SHA512 546c1cc6064f22fa2b0cda1e42329aa7da1ea3be9b6aa277ef97de13067f28c473fe7f5bae4cf4151693aff31df3e57d6e99c6ff10d8fc79f94154dc26d19bf3
 DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfca1242d820d760bade713822b7b8e283852a2e337a6d33b40ddbd95f86c36bfc4c418ef0ded86f59ae4a4df56a SHA512 f1f21dd6306d6f4b5666d1ef4994d0d68f10a7a94fe628a5aa8ba28ae0376cb34b7c091f82e2db8f2555eec4f35088f6c4df42ed84de7467d5780e284b397115
-DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
 DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
 DIST rand_xoshiro-0.4.0.crate 17029 BLAKE2B efee418e99b15aba76385a4320da667554effdde4f5d19dd55d16c1069d7915851f64526d4b4c9ed1cb6e5827572c0c96484f13669ff233baca124377ccbd48b SHA512 e889eb75ef40ad52eaf32692b3a405e01eacfeb20e0dc171de8f1b2ce05723ba448e293a2ee91eb3bec3cb5a2667bd05c11433b50470eea9219586afa73f519e
-DIST rav1e-0.3.5.tar.gz 803183 BLAKE2B ceca6ba44f2ca0f4b3580e24520fc2f4e2b61482da800e5e1d61b925a875fc222d13d2f871ab69968863443689c2a5378fc0910e0a5e805e8fd9cf56ffdb6ea7 SHA512 5e3ebdfe9392f7a7ca5b657c1843d1d575d1b856c6c01d3f52a88154d138c3992646e045acd9f8b15c7517cf99d8ce41ef1d373ccd3ab529197aea8f61f4fa82
-DIST rav1e-0.4.0.tar.gz 4535773 BLAKE2B 74b8f9a0bb366a20f3b097cf58a43e43d4e17437fd47021062640bf3e735320177618295d984120fb9191066523e9fd3076e8d87f68a6189677750cd5d3e6538 SHA512 79eaf580e60bc3dafc518813392d34339a6f3ca39567d0658c48fea3e2eafd4bfa89630aa0ada8200eaeaa1b1f0d4701d87636edf9c14bbe602c53e2b36367e9
 DIST rav1e-0.4.1.tar.gz 4536093 BLAKE2B d1200707783b5ceb13ab6403b4a4e8ac2af9a8d9a4bbd0765946d4752e98e4a5df286adc4883dd9ffbf4a21b0cd3bd486d34d563fcd955edf26f3e58181bbca6 SHA512 d8466c7392cdcd6c6693174cc7148d57a82a8b2328f27b0665a3311e24c9fba136e7f5a35a222004e0554d64005e8b676601e437dcba5365cf69e3b8c61691d8
 DIST rayon-1.5.0.crate 158037 BLAKE2B 6cb7f696e9c04d3aa6c3bf9c95690c2e259267024ac9701da5cd85c7d39b900a7e9e423e5b7602e108587a34c2519642ce1456dfd82fb13328ed3aba7516b569 SHA512 be15cbc7ad0fadb55e5640c78aa2eeac282872be88c5402338caad0a7ea604d2b8477648dcf7e453e22fbcdfefa915aa4bdbfa75e3d4f7a993fd8d85ed68395a
 DIST rayon-core-1.9.0.crate 63787 BLAKE2B bc5f930b1ce8e9fde03c01df7a53eeb3318ae24ac1c6b22e401a0b2359f4b9d6e419fcd41c7db33881c4ec29fbb844a44e2cff747d7dde2133668e733f8b6966 SHA512 d05b4c1e7bcb1c4e9238ab08bde39f08f069a08593084f041720694bae8bd524d1761766beb93e97784d7d541bde3e290446344fe129b0e10491405c1577366f
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
-DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
-DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
 DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
-DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
-DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
 DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rust_hawktracer-0.7.0.crate 4718 BLAKE2B 269902116f53e1f50cfb524bedd4594c9c43d481ae5eebb16dc12f4314024afa16e224fbccc97907429534cfb74e06cc263c69da3ac1cc2f04b49ec4b8b29890 SHA512 62756c6c99a1ff1dd78565a522cebec3a9bed637a157b3d5d7ab91f7ce74d6de809604e8406b7e80807f34a7fa7b72fc9b6df51bcbd41e4fb503425d0b8cbc02
@@ -241,12 +175,10 @@ DIST rustc-demangle-0.1.18.crate 19913 BLAKE2B fd0b955e9f552d5a3759dec05bf5f971d
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
-DIST rustc_version-0.3.2.crate 12064 BLAKE2B 425d5db88b23d2245b05b8c0b1be74a56d38c154b4eb3507ac5befa96ca58be7d5f349ac1e3962bba096c66eee421d1c1777fffc3b018f71e20a3f716e92aea7 SHA512 dcc78339eb5079ba0964d8a6ef7f6d024a4992ebf370cc664f2aebfe36d0fbe3eb76dd033567bf79d8854b6926de4406fdde996bbc21ee5abde44c9d87313934
 DIST rustc_version-0.3.3.crate 12119 BLAKE2B a8cfe3dcbaf436b74e9798ee1296ea7aa372cfa26788b7a84c9ce7ab3de5c5e00c6962e4310aed9bef8584e3c30298bf1bec1ac23c3b70c6aea32394359712e8 SHA512 37732b3b28eca41de205db34479c75b31af4ddd811f0f1606933eb31e25e5ed3966a41a8b7d338be20fcf47540629824c41a267436c185a98f8acfdce608b5cf
 DIST rustfix-0.5.1.crate 17768 BLAKE2B 6c1e58267fc4b81ba025d33a9bd95ab1832ed651d22d52b8808f52870aec674bffc18ce2d53bce58c4bc36f98f1e049e4c9609eb7e99e407ef78eeb756186837 SHA512 61990f482a5d490154fc55d7c052464e50268c0f752068669afb3c387d27a1e980a052ba29fe0aa301cbe4b17c7374db071a8a38d3562c943e8292605c40b3a4
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
-DIST scan_fmt-0.2.5.crate 9015 BLAKE2B 3b6b82454a1fd2e5301022a6cf8e1ebfdccc4d9e2fe4fa2dac91bdb0ec29cfb7c1a36d1ef4eb3e2af08d5868905c9da378bd2649e2bcec994322b7b632e9c3c3 SHA512 8cfd8b4961ddaffaa468cb4daf6c69f65de977efecb10ef781deaaaa2fe6a4d0918bfd515b7f85b08b99f417504ba69059f2652ccb8c5ce6f19229e85ae0fc64
 DIST scan_fmt-0.2.6.crate 9676 BLAKE2B eb314c3e456de46b31d4286016b9194e663f7c3aea0b699a2693d180b2f0fa549448609b845afbbd0053661b5777a8912c2c607ffb26e490f86fd43ee2c2a1ab SHA512 ac24f699aa39d6fb29c309a9716eda9bda7331769114f52ab51f4aa781ecb3c7694ac385c7d60cec9b87e134fa2a5d8f586b54166ee9d58cc4bc34c83943ecc0
 DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
 DIST scoped-tls-1.0.0.crate 9146 BLAKE2B e6cecc543760a293b9ba4e71bf0d12f3360782795bc9d0f0bb054614a1c393f081b6178e98708b896037f5b8edcf371b727e7eb80f62bca24fe09a1903456729 SHA512 f09dd404bb45349ef444e7274a2aabfeaeda7c3c9f964bf5c52c39984c137f63bdf9fb3e33df8e312e52872f7721de25951a7f3b8333a670626c51afd36d314c
@@ -256,20 +188,13 @@ DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.118.crate 74248 BLAKE2B 0d78d29a9d97da401dba93cd6e118dfa48c73351e32ee48bdc2a649ad60f1b198574b78a5261564d466e8097f8b635e810f4c8a52592e3f39550910e250971e8 SHA512 d3b316e721ce395fad656a598fed7e83b248a3dbd98a9eced98fdc337c8fd40f415356a0af6a0e5a104a592ad10e1265d47d94b10b343ce9475797b3a74306e4
-DIST serde-1.0.119.crate 74321 BLAKE2B 334922cb9b3115a929c7b32ee7ca3356de1f7cadbda224bffb7044db9ec0a6d949c415e10ffc7cdae356da749e779185072e965162ac036987ab997b40cf761f SHA512 7bce4d7c836c3d65f8d63e1200ea28e11f7b43c4c72e3d9576e2493699b2cc1dc88908a1086310a46961f6cf2e1191724f0a6f1fb137030659280dad434a451b
 DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
 DIST serde_cbor-0.11.1.crate 43947 BLAKE2B 4c1dc444089276b4bfb1b1237eeaefbb6954fa8b613e539fa6eabe01ddda990be50c5e5ce72e5f765835224e9de4fb0fdb26d2fada2b18d6b03f77665e2c41cc SHA512 165192ed999cfdbe162abd3aff92f86f4300ffa9347e57fda2ef3c32c69a18183d468db059d9dd80218bf01de15fec6fde7cf6dbb8cc2a6158785484353f2192
-DIST serde_derive-1.0.118.crate 50589 BLAKE2B b1328a3c7fb0fd6321f0d020969f1b7e32150488410d574cf9e75ca06bebef3d753dacfac4e45cbc0eb9626246734a1dd5b766b96a1a98b53f3f17897dcfb349 SHA512 f0909822f73e900c8a0b791a30fc5cf5be0a79e6c455766a90d6cc314408b95f2b9d7e3ef99363860d615620968e217da304457d2d6e00f60da8ab8fd2db7115
-DIST serde_derive-1.0.119.crate 50617 BLAKE2B 71520b2b83e55129b901876fcaebb4e7a1717f89d573b9b7780a9a27e3f50915eafa9a0fbd803af31f17ba2de7e7708b8357cc915827217ebb0f227f2632f087 SHA512 6fb88db514c30f4706a1f535fb0997a753601e2f6a4d0c7546b50b9d5febde4b982bab172101973232784cb8a8ba54ecf8584ac0f980f339b6578bfab41001b5
 DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
 DIST serde_ignored-0.1.2.crate 12179 BLAKE2B 45b8cab135fac2d7b23443462fe630212ae170207061f968540dd2b86a1f8c1203a185dfaa158f87dc36ceb8f769ea6c57e67c1497f2374444424237b7275af2 SHA512 c6f76051a5397615eea4aa953535ffa227cbdd6747f8f2ed0bf57d0a0b7bfa71536d8372a6cb8eb046b9a761e36f273e019754f607e6c84ae71bce25e25132cd
-DIST serde_json-1.0.61.crate 114887 BLAKE2B a06e2b3572b01b57d39a7df4d4c333408594cfe80b6b6a810f8c36479550f56f085cbd7e693d3c27f307bf0b49eefd34f55bef1872a4a0318797e4b9585cce9e SHA512 ff626602b547fa8e48c37251d2f6c91633fd45b49ed8211e66a3174f52f9aafe8778238466e7deb5d5477ed23eea0091596d78894e0967d6978f6737ae115891
 DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
 DIST shell-escape-0.1.5.crate 6847 BLAKE2B ccd71a73b217b375843d3f0a762b3f5317bc0fdc8e43380a17f25e1ffdc391de0af7b0e4472be23241a6654f5b6ab799a51bbed8da35295322002c54ad84e9a5 SHA512 848f8d47d802b82e83f113fb07f44fe962628379481d1bef9d15f2e5821a382c9928c32175652361aae9fe4c8fa5c1dc1c89350db6ef5e68691bae4a3742df93
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
-DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
-DIST signal-hook-0.3.3.crate 48707 BLAKE2B c082528a452628748743cb4fc8b84d31b1d66f4360a83d572078653bf68971f9e2e581de96bbb85c4430e2d2933f005c8e52826d70444b9d85007eec1ea19422 SHA512 02ac145e61577cdb9e3552ce8299718462cec42cffb773bfcb7e953e4b098472aa615deb9af3ac753e77dc2415c2e5bb9c03d17908fcce7370296f8a6f6d79ed
 DIST signal-hook-0.3.7.crate 49462 BLAKE2B 9238e39216b0a3e2e44e43c7f55b719da8766a8d113c76be16efa5c17335d2298a30a7da6286876c39cf5ef319d773b58bdb3482ab1fae87430a97964a8406e0 SHA512 80aae49b5c780c1e4db4d1ee038681a7df35bd5902b540af5c48f756dcbd2400477a64fb7e46520f78b4376d89c5f7f8aea95d787e0fab47a2cd57eb9f1d958a
 DIST signal-hook-registry-1.3.0.crate 17786 BLAKE2B fbd4284bc1020145b92557a99628b985860bd5020cc870ceb6067933c8e58be11d7bdb3c1f715231ca2f0ec2930487ceb88a82d9b9d1c0a31bfcf4a581a002f4 SHA512 2576d474c490deb6cbd759985f55340bb4e4ae0abac3ee02055bc30fa4008fc96ebf4d96f0a85c634b4f04d57b00243625194b333cf330f59fc82286bbeb30a9
 DIST simd_helpers-0.1.0.crate 1527 BLAKE2B dc556646a3fc94548f1e16e837e94fa2e28b78b650260aa50535a45e92fdcd952bf0eebddfc2fcb9e653871447e9b9db82f3f8c1090fe09442b7916c65ade3e7 SHA512 20577ab7615f955ee3a88c617630fc6c88703d455629d5b3838a551baebbeae8c64a2587871ec5a4fb6bc203945cace50593a238e4765b5fa2313bac30237ca7
@@ -281,33 +206,21 @@ DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
 DIST strum-0.20.0.crate 5172 BLAKE2B 755be909504b106848079cd975331dafdf24914ebc22e5642d2b0e867a3619eb7424bea818cb3228d17baaafcc6ffe6ded22a5fa802e96e3bd685c7f94391cbc SHA512 4de0497d47ed09931107a7ee8a7b87fc00c38ea578b7c5910df98c71b3df0970b3cf0d629844c0e9a52864d43887cb435c0f419d26a68a23d0211ab0e86d1989
 DIST strum_macros-0.20.1.crate 15634 BLAKE2B 61b36751545b80297a8f66391175cedb8bce5a144014eb789101f9adeecdfb85b76b598f9db556b64804158dc8118f3f9bbc49f13a4c99192bf68d40017fa4cd SHA512 c209a690370b50698c7489210dd799bb10e53b3e6fc84db370ca7aa3f205694a8f07071d25a75f37970a650bf1fc047e2e5ea4dc588c2604c980211276a6580a
-DIST syn-1.0.56.crate 229279 BLAKE2B f2cbafdcccdcde982da9dfc9136829be836cccf8cf8933ad888ba1747bf4a09aa0878b6c46220f2539d863481c268f03edf4f7a9b29a1017dbfe4b08590291ae SHA512 d874787b3c9f2aaf54c6beb0a6d5986b20053e2499ddb462b118e3275f30389afd93be6590ef188c30656400ecec83f4e50ba42f75e3bb40fd7f486fd8c1d4ff
-DIST syn-1.0.58.crate 229250 BLAKE2B 28df7854962f46339d1f993d2e1dae4c142731c3d7f08d03015ffcbf7eb307c1da9d35eb603d6efe653ff80bb0108bd5faabe1d7c68cec9476eaa0b710a27586 SHA512 b6bd101a455b77c2836384d7346f79b651f41c7685667b64032905cdd4026ee673c24de16a2acb2b8005af743a6d1b40628b30cd09c8454a39cc7d131ce71487
 DIST syn-1.0.67.crate 231889 BLAKE2B 28807964411994b126e132c42b1361d55788a641da24773d1f1006373d3c21048f78553682441766b7257e5b4a4a1833954075fd2c4965f949d8465ee57a3ca7 SHA512 06a5f203c7e4c6f6bed489bea7e171cc8f29020401eb32405373a838526c6a5bed47e1310f41636d475358c420b82837bc7c1f90374fa6d0e842dd0224de3552
 DIST syn-1.0.68.crate 231887 BLAKE2B 2e2547391fcd7a9854cfb888448eb89cdfd19ac20e9d909782ff11eb5bbd0b00717b3892199c2c88d005b8fda358ed10828a3f5a123a8d6416910d3b78971d5b SHA512 3023baeacb0164db641e809ac46fa48bdb8ff725e6c767764fa23552d53605dcad3d629f9c7a976a01ad7dd423595575d41c338223df5f7b72c417a97793414e
 DIST system-deps-2.0.3.crate 17504 BLAKE2B 87a175214b612ce03810378f65ae36bd35f873271de9bc3ad9e29cfabc1f741ca0e4ae719807e12a8bbb172921b75c47726b1ac0676ad2abe761fa217f774dd8 SHA512 9b1c4df589b1f0d0771ca8e10cf94a884a4f615bf2e8ec993e1dfd3f42273b3b188c81e0bdad1637b9ede1e223fe9bba44542058f150379c3c87de24b414bb79
 DIST tar-0.4.33.crate 45448 BLAKE2B 380f20835bf04624c87201f54f575ce6f94a2ddcee4e58917777ce069fcc822101994d8b9f1f3a249d25e62d59527001807842e650edc9fbf7cdf55f65615da9 SHA512 69c5932790c2448d6d754a622066564027414ceff5b555c928f55f627c9e5e7c192e0c13f93af48d64d37d4f9f56c0cf8feeb3fe17d3861b277c66bcb8b1d9ec
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
-DIST terminal_size-0.1.15.crate 8795 BLAKE2B 2e7590a524bd8e439d385f925c3d5a3aadea20bb24b7fb5c52dedc4dccdd67f986b304208dc6d9cecf0e4b2c449dd980613b4e381603cad74fd9038420b289e2 SHA512 cf1612f46c8502e079b87a240ddecdc02be8481cb7b78115ba1550a9a732103bc19de11f46160dbc5af06f8576d3dc780ed0b199b7f24c92fc0734e0d07e484e
 DIST terminal_size-0.1.16.crate 8755 BLAKE2B 33cfd9a62bdb77bd096563330ee5f07465d69c16659294a9e6ebeccf3d49e17473185fb84c2a4b50d29b084da0633b2ac4bf41801b0bd17f5c927d9bf68fdce7 SHA512 afefb529a80249ec398b444f593b6010b2a85e65e29557373cec72ee18bac5a5359aa2da3cda28d494f34c8eaddfc8a82029fb936d49726261ae0c5557bd5c17
-DIST termios-0.3.3.crate 17103 BLAKE2B 855b1115d02dcb275ea772dec3db383f9a6f84c14876ac037a5e3bbd1e71e26d3adc64e41521145093256acbea56c28b6c14f7e3e2bc9fda37e7cea113abe214 SHA512 3d4cacdaa8bbbd9083a050e723c93510829210f5ca8eb806e661a3a1e3c8aee33565142c5df34fca74aad0d26319525ee70ca6faf3f55a29427423d37fda43ff
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thiserror-1.0.23.crate 16423 BLAKE2B fd257d34da829c8d0fd2cdce9910e0b5e797ec233af3a6b3be6b47a4fa3f39bc0170edd08cde3fb546d8f3c7be63049ddd94400b602dc73262fba2c323229650 SHA512 e6b6ab7a4a23f3c50e765a16071b65007441ad3f1eb5566e91bc19755cd019fb8efb358cea5663bf7c83cb3be63fae9ee0d019cffb3fddae58233c84b93aea9c
 DIST thiserror-1.0.24.crate 16580 BLAKE2B 5cda4153e32ea4cf2f4f45fb60f18230dca61bc8d9b76aa598f7336babba8d6615d929ae325c84976ac60f4e8afa803f96d1b2afb6369445934e1e657bd9c846 SHA512 38ff620f1d33041600faaf3162ca0c1cfbe191100b6442513e4076a35296e97e28dedfda25dd0d7613f6a81b6b72816c11ac37424d94baa295142b1002d0e962
-DIST thiserror-impl-1.0.23.crate 13269 BLAKE2B 7b570c1a0d122a11fcbb7784e6c0620bee0e4644e6e8e988de6936ba23901ef6549585d1e14afa8240b199e3c92a6471af3e4b63fac902292f46ab7ff0a7a6f5 SHA512 72098ef63a73986c8d6a0f3fff6d5b23e29da0dc8eb4eddb410b7bdfcedb303e73418b2a3518d9315772b0c2c1b9c3d86d6a67bc7cdebd45f4488c13a5b62162
 DIST thiserror-impl-1.0.24.crate 13361 BLAKE2B 4ae667e69d3dbe755cfb07083649c6d41bd5bddcfbe1d8954980e93390fb8eb51ffce6fb2d24c51fb676b6e75051ac66cff8c0cb3ad6683275581749f7c9f9f5 SHA512 4309506b8cf939e6a400542dce772b951d40faff3b2fb765ef87299547615fe18dfb877844b5ce892c594623a2de941a32629e53e2d59b03f611cfefeb169db5
-DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
-DIST thread_local-1.1.0.crate 12222 BLAKE2B 4d19e85f5e342cdad8bcb33ab4c54d19563a831128c0d98dd79906f1096d3665a2bd0bdc114f11f51bf517dd5f401b2788a16482e38895610b080d1e2eba6dc7 SHA512 4681b69e471f2b90091f51422358cd86d1e851cb7118613d7e791b18d7464cd71e9d21d50223ccaa9dcca1c54b220474d3d6739634f57666938baf4dc174e621
 DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
-DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
-DIST tinytemplate-1.1.0.crate 25611 BLAKE2B 4eee211f337cc94ff6ded7901eaa451d15a79bcd258aefe77d769c831865ae6ccf76d5e7a36d2af9feab38df828027ed4ac8f2e64fab141993c9123a7cdd85d3 SHA512 0de214a2e908e2c0e30c277fcdf015b1054d96b299797724f95d0b65a4c31ff1fd6d2ccb738b84cc44ac7f63db917c43846cea432c012123dce2fbeafd5f9a80
-DIST tinytemplate-1.2.0.crate 26423 BLAKE2B d3547b014db6e6edd4fd4f70f82f44c638ddad9c96c7efa03761c44e0f122fbbb25f01a2dcd908e43d5cbc1dd404c8a7b9c620edee5b935057db13f75c4fa205 SHA512 e187a1c53ff3c9d58ff0f69fae4d944e4d175ef14e10ebb550b6fcd6047ddfd317c5cc1f09d65767a93c1ea0a843115f715c615a31d81b4490680c4cc8f2ec51
 DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
 DIST tinyvec-1.1.1.crate 39896 BLAKE2B 7655703bb7c3eda6a4bfb78c46cd10d5bd195ccc9aae9b8eab78c1584c904a6ac1a75511952b7f63eb953590b0b3a3c436296c13b6dabba11d279931ca769442 SHA512 de8de26bdb39d4b2255099b85c116a95b7f563f27549816d360a7cf68f04d3940745236aea4c73eeb86ed5427ae5f65d8936f0d60dae9b16076827134d77281e
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
-DIST toml-0.2.1.crate 47258 BLAKE2B 0016d906559a13b97e16614597e41ad9d6f9892abb0897b69a33c87415578dd7d12cab9821ed7d64c335d0d738fd7ac516265aca7b1afcd567ae746b1c841d14 SHA512 e802d66d207debc8f5d7655c0eb797fe09125d5e85fcf4cc8c3088d9811b141f8db40b9a95f76df271a9d32640a8e59f1e9520da670f0a994bc73994552cf4bc
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
 DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
@@ -322,43 +235,26 @@ DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683
 DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02ed256e6b08407b17066ed949f03bda42645d56e1227b50dc4c0e3865f10856605c2eadab3b74f55f005789b SHA512 d67bc244c81827165bf976808f79fd02f9149a19006898e60ff8ef11df2d72657c56bc9fc14c8f91b091075ceb23c3f96a3df81be345bb01881679eb47a0e6e9
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version-compare-0.0.11.crate 15208 BLAKE2B b2b463f1965739369aa168b4d58775cd35c9a072ddc3775c439026e3b7a9cad5b60e9745980cebf498d22ca85932e1c670409007c4206ee6112d95096d552161 SHA512 dc0871daf7a1eb1890b70d5b876291f10b5f61b19f276a104176901f46671799e0254f0af8bb9c4106e3c8255b4d3fd65f6f408e51f080d79947c2fea4eb3558
-DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
-DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
-DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
-DIST wasi-0.10.1+wasi-snapshot-preview1.crate 26898 BLAKE2B 658d12823fdff936f3205917a2370a6d2dd87288f4b9b93956298a58ac6ced8da1081d6f024505b5532655329dd437557b3e56319d742d791bf4108173c7a6a3 SHA512 7e40e580df3707681e3d31c7058234549f036628a6bbfae301bdffabf5c36133ba2f20a6c0f5ddb4c7129500b3bce57fdc9049f0bc227df8fab4d8ff398fb9a9
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
-DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
-DIST wasm-bindgen-0.2.69.crate 159046 BLAKE2B 076ce37babce89fd08c6145869fdc724e800ed6bbf764388a4960c2b08ee1d18ddd647795123376556a00e49b6c4cb42cf6980f5af487faeb862dd8d88c6dad9 SHA512 4fd058cce1f641982f2800cb6d6c9979748ddc23091012d95dc81963d578188e82600a5d8d9ff06f588865c069410ce915da4e00f02e170876cac10fa6c99c6d
 DIST wasm-bindgen-0.2.73.crate 159293 BLAKE2B 3ad8a4221d5a3824d8c7788294b3b3b571ba4d676c782f7890be6f0f8acf5fc88166b8bf28933bb7511a388defa5ebd968b8fb8a69bdc424ff8ae64fddba1d16 SHA512 69b070d71df7b5539a9b45cb61704629cb917626e8e9f892ff684007647c36aaa04b7413f1f87eee7fffbcf28550b2d9e632c3747cd1a73a2a75043ea0849722
-DIST wasm-bindgen-backend-0.2.69.crate 25508 BLAKE2B 421943499a5b38da565d1d99683beda31dfc6621fe19e93ffb8619cee0739f4ba336748f7bd73c7f20ed86076e8a5a45ae3fd72facef88646e0a31690012ced7 SHA512 b04515acf4c00093d288d2073a46d3a64241ab87b802e39629560695c40324cd855582aee617879a7964285e82c67733e59f82bb948a4a0ca99c66aa5a890723
 DIST wasm-bindgen-backend-0.2.73.crate 25434 BLAKE2B 63298c33497fac327ecf31f2dafa3681b906c8d0a873a80bce1282c53a6d63aa8b0d30b8962ecef1f9a0986ab481a41b79cba5b8180f48b084d04fb0c6ba4577 SHA512 853fd0e354aa41706e19de192c9872812072cc881520f8c81b94eadb0cceaa693855598380dcb7729c8c6125eb90cac440453545a5fff0e40714038c86ff2cb6
-DIST wasm-bindgen-futures-0.4.19.crate 13865 BLAKE2B 9af8a196406d6192b820a5846b763b6913e3935857964a0749cd2193c77a23839c7f1910c0ff695126c9da7f600f5372091f726bc32b2c9fa4ef6ac4e5f88861 SHA512 a3a339a3f43284a9e9a6ed199ada927572676a38f65c9d82392c081b7973b79ef534c2ba26e66473c3ac6a48a7812f6bd01ebdb0b0296d073edcb6049cc87095
 DIST wasm-bindgen-futures-0.4.23.crate 14760 BLAKE2B 3b783c6056e7566197f68c9f18c557328b8a32a671247497999107052a3e51d2e616d5dd03f5399154b3cafd002b953dfc2850e9d018031b4d4ed3b940a09505 SHA512 344f2705a64f0618584c5a9ad0a026f156918873ad6fafbaf92d57b564445ab6d557d76233445ec263a18a0bb19b6be7d1d7710d3f83b25114ea1b621fe102d9
-DIST wasm-bindgen-macro-0.2.69.crate 11596 BLAKE2B fc263ec70dbe065e556e0c40bf9c13a86b6add4bacd880294602933199e2cfafcc6ec016d395afbdc429c851a1cf30b109c3dc7774ce11fdec2238099cb756d9 SHA512 a26616dbb3a3bf3f8e9be658078760475a8f82aa2492ef1588d4408f66898103f3478bf0ee468ca8ebfbc981e9c1433cacc9ffc5309c9d6a053c50b2eda67fc8
 DIST wasm-bindgen-macro-0.2.73.crate 11545 BLAKE2B 481800c0c118048b29733a3bbe11ed5c816c1b5496b10b4142310d79ab6b825eb12280cf3c7304e768e6c8acd77105faa8574cf21afbf27810c9b7eac31010b9 SHA512 7ac842e68e6ba577b33df50ebe5c5fd250b1f4bc4e1ec1112be4fc806980d21f73f33612b14024626904a6116a8c72b83f2b7c5405fc111cd2164b4744f843d1
-DIST wasm-bindgen-macro-support-0.2.69.crate 17844 BLAKE2B 5df460238d7276559074e821977b9770bce02a5d2ff9136a7efe3f25bb713aa30a0dbefa436434fac2ad5eea9d86bfa78231466d0a2b979be936105c47703e49 SHA512 01cf7154a5bf83b2bd15920cadb61ec588de3b6194a7e9e99bc08246a6a6be8017c28877325d9abf1b62f17573bc71a50cc52cf75b56d1a5cc11eff9da445f0d
 DIST wasm-bindgen-macro-support-0.2.73.crate 17835 BLAKE2B 8e18ef319106273d3f41e947bd1f5ffa7a91e04f713fd67fa0bb697579ae51bbcce75b48a91949aca8e64e6f52ed35eda6b49cec366365126115a9c30572281c SHA512 22e322840ebda05ffdd2f4ffd07745d0f24b928e3425c66425392560f8dd59b007f80d7c4e4a01dafd83c09d76953ecc2cd61d362219791ed88f7f4ecc56960d
-DIST wasm-bindgen-shared-0.2.69.crate 6726 BLAKE2B 20ecb830f6546b48ce4c45ed5ff97f6d6d2bbdd063ddfa032cba50b5a0c12b9dadafba5f3bda0dd2fdc60595a8452ce868a7aca0f846546093feac40a851f078 SHA512 e14bd33effa81a033155416c12426249ad6ef7fb38389439ec81212534d09680c8351eaf867235cae726f1bc7fbb4ebb6183f7f339d7ad04dde62709a2d2ec47
 DIST wasm-bindgen-shared-0.2.73.crate 6691 BLAKE2B fbde26dfb5f36474ed3e01f7254dbe742a205cacc85848b85efda09c22e1f9fdb464bd3b7a2c429b73e4f5f3095803e9e477cfb81d6bcc779c04c2602c465bb6 SHA512 d3a28e4bf42071496f2e48c3ba3134a06856be12deac79fe13d1e2e7da8018d5e7f220f4dcc02fdda9eddfc2d52ceef18cd180db7d2bcced44e88a36304f947c
-DIST wasm-bindgen-test-0.3.19.crate 15612 BLAKE2B 0df4f4643370af40d1b42618c53b144e25e97ee41a4a875c7a9a30497e54db13f015d5845f02f6909f9f0ff45320f2f8f7a6d4579b3ea96496482b4e5db73400 SHA512 85489acb8fef8eaea572676d3dcb8c3775d86a635832419c2f29057e4a1e42a4b6845b3e7cac17f2de2b6c69ffb95e361027057bfbb89b074d22c02994795e1a
 DIST wasm-bindgen-test-0.3.23.crate 15577 BLAKE2B ad5e671ec812142fbf498ed1dcbe7e62708004e8396bfd35ea4d75589e1f4270ca926554459eb57a76b5e4971065dec4a3bfe950c7a66d3b9043720d1ea1dc57 SHA512 06c4a0f996deb0da292b126fd21f94bbddf16c4be00d9835759cbefc5f4c5eca276ce0e4a762dd3c42104fe585469c7be0fea13e66ffd791ec4e15d5aad89d5a
-DIST wasm-bindgen-test-macro-0.3.19.crate 6375 BLAKE2B 259972d70a64ab7ae15c84d95ac8ed10d3baa51980814696de0f3360b67201b543c747c1016629ee47ceb62536bab88dcdadaec90d614393dff9b1bbf368a00a SHA512 3490113b22016f2c91d31c0af52ed340fce8a5f73be15c5d6e881a59a052508dfdcf67edd5c318d4b042acadd3d06c382337367ab4ae3e6894dd7ad205eea713
 DIST wasm-bindgen-test-macro-0.3.23.crate 6337 BLAKE2B 31af4921ba1a6dc8b5300ce4d4b4f31efe7aae1fc3d744f5f85935aca98578622f7d087b28a7f379cc6349473f67cf2fd6b04784d656e7a23a5b0a62482dcd1f SHA512 eb7de7f94380678d2691d1cc53acb59cf27d88153422b685c6d30b42a05214001a43ed282369f8faa67aeac395e858d2bc53c285c8b3a5e8a5c11323a9f2db0a
-DIST web-sys-0.3.46.crate 648005 BLAKE2B 6d257fe5e489961d3c9a8f6aa5ff7d6f2f786372764bfec4d2321f895a361e052400847f3c77295ec48fa63c1108284cee35c63cce84b22bf3eecd9fbcd9d2be SHA512 4198f854b73b2c63288b920aada7c69934393e0d6ce93599d907d1db055d2c25383b8574f0297af4ea89f45c7f7ee706622d564958d49d1b1aea89d4e9f127b5
 DIST web-sys-0.3.50.crate 650100 BLAKE2B 448227dfbb6b91ab316ceebe554c9d9b89c397c25cd465f2e8a77560f185eb7308caf3b6052946e691d8fc22d6d382a0e3f164f7d29d873591ce17da792a993a SHA512 32afbfd3021c6cc4f228fc1762a4e29935373f4e7c572128723b508e6ab9588f3737167b91d5837e05a08c0bd182dd339c8f16b71e8a032f7e735cd619949d14
 DIST which-3.1.1.crate 8071 BLAKE2B b53adc5136f26fc1be6ae18987d0129527cfd6eb2fb1f0876600ff55ac2f935f608337ff89478f3aed2e8c97a08c474109382a56eabe67dc788b744d90c73ad9 SHA512 3677d709eced54a332e68d9c9385708205838301a576da0c4d88049403a81676c3939a97cd1bec4ab261c7e8fb6211956b47afe5d1fee84d9c4ecf4eb30184f5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST y4m-0.5.3.crate 11447 BLAKE2B d3a7081899f12a50907ecbce6f63f1b1119618aefdc97bf967d5fe5b908b234552aac0fe96cc359f12aad7018af8b47b34b6219e0d87d036c8b4df1c1bcf1a27 SHA512 2d414d178c4bc16db7f5804987494629d12b85b409327012db2e9e868a7bb952cb630a86190fb455228ae40776b2c30c042eca65a1d3730e8425daf53f034991
 DIST y4m-0.7.0.crate 12045 BLAKE2B 4f48eb7ad5be2486e0f723b9beb9109cd1b38a0d0c5ac4a64411fce0bd9371d45496e5e0e839d15e7d1616b3888cfc1a0fc1ca364e65ac508306cad9a4ed44a7 SHA512 b85b0dd6df46c9bf125eee3e51ea39545ea1c794a2a097bba0aa31c682532ed3a9ba141745c61915fff13535fc5fff5a490d7c9e731c75bb5ce38a702075467e
-EBUILD rav1e-0.3.5.ebuild 4218 BLAKE2B b4a4e63de87d673c12f814a174598ec8dea06bf208d6e4f0f7e6c6bb4e2f6b53051c1cf220be8335f1757cb85aa495104f91de621a079a1c9a7fb7b8d3e503f5 SHA512 69bd68f8a5b077f63eb43765c7d07a9681cf8ff2f9d89bf7c331fb35789a2f8ee779f45fc592618eced604b1b6e632ab4bbf5dc7e8ad93823b4c32133dbaf71f
-EBUILD rav1e-0.4.0.ebuild 4468 BLAKE2B 8760cdb7b50991dd861b6010eff114e71af8ddc1979eff893f8e5b85729971ffc5d8fa46714ee80a488f2ba7b05a78e71bc1d377c5a477653239e1cf53d7d290 SHA512 2435c1737201fee6eeb7008f7f292abc29ea899d5f64c0e3a6475d78ae711d64306bd640232c3bc71d8d82dbf70f0a565fcd87b17e6661934109f4ab597f2a6e
-EBUILD rav1e-0.4.1.ebuild 5856 BLAKE2B 35cac0d61da537b74144317a6d56919d62b92edb10f85d3f4bd2ba1cf382fcb362d5086dc2fd3654b2da91ae402caa24efbb100f003ffcdbbb77bbbd8df258c7 SHA512 4283515165bc0eee459335c3f47cbee98756c4693fcaff0f9293dca9df9d226630ffc80100a3fc7093558ff610be9c854b4240ef1d3fa9f8dbde9edc7a54c13e
-EBUILD rav1e-9999.ebuild 1361 BLAKE2B 8eaf63b69c5eef56c0e7fb725aea974e688da362dec3cfe1bac18562f281102e0f4430c1dd612c66425e60d7146b2b8e5504717229cd19e260834c2d2bd6e74b SHA512 e0f16779f8646fe7f283a5f0a07b3374aa5db1f31155637780a0dc3d25148664373e92907e27d4a1259e063d7a392c8a9e320a21bf05c4bbc4fe756fa5b8d1c9
+EBUILD rav1e-0.4.1.ebuild 5873 BLAKE2B bff616e320e5e4f563c9c18a2c7cb181629b1816a2f865b8f8bd4108175b3e284ef6f331055e740ba1c9eceff30f0b68f5eb03713a302f8eebe02e026be69b93 SHA512 4504289c24ef9b74f23cc8d21750dac8d465756bd36eb0366402d5aef9cb831f895613ee4ffab1c4512f035c95f83abc21870cf4c146cf26e1789e40d6ad5325
+EBUILD rav1e-9999.ebuild 1338 BLAKE2B 458b0b3caeb9f9ca18c35fe09d1cd8f2c9944b3154d150e559009f0cc4ac15833ce97862c2c64520a1164af22ad9c8d902e171e6d588a2a4bfa67af28e035015 SHA512 6bb8b42bc0dbd3265d2b14fc60b73d5aa1f43fc044aff8e205c784d8525f92d5060bb9f40d491f6c619da8db78bcf418af1245e361f93cc078f0b5e8fa7bb012
 MISC metadata.xml 396 BLAKE2B 3f15123aeeca6df02c1b6a886418af6cfd4e4e977a5a93b2cc13301ae8e5a17a918a9e8116e19ae120cc27e42bcdaeb5e6c546f99b0333144bbc4aa9960b862e SHA512 4d650221196a5f48b12f2dcd6ccd3ea56abc7ec205e78d470aae267c7706cf81f03a691ca916d5c2a8c9e09a62c07b0802b5c688bc60bbc09d74ea7a135278ed
diff --git a/media-video/rav1e/rav1e-0.3.5.ebuild b/media-video/rav1e/rav1e-0.3.5.ebuild
deleted file mode 100644
index d2fb3b3e19e5..000000000000
--- a/media-video/rav1e/rav1e-0.3.5.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-addr2line-0.14.1
-adler-0.2.3
-adler32-1.2.0
-aho-corasick-0.7.15
-ansi_term-0.11.0
-aom-sys-0.2.1
-arbitrary-0.2.0
-arg_enum_proc_macro-0.3.0
-arrayvec-0.5.2
-assert_cmd-1.0.2
-atty-0.2.14
-autocfg-1.0.1
-backtrace-0.3.55
-bindgen-0.54.0
-bitflags-1.2.1
-bitstream-io-0.8.5
-bstr-0.2.14
-bumpalo-3.4.0
-bytemuck-1.4.1
-byteorder-1.3.4
-cast-0.2.3
-cc-1.0.66
-cexpr-0.4.0
-cfg-if-0.1.10
-cfg-if-1.0.0
-chrono-0.4.19
-clang-sys-0.29.3
-clap-2.33.3
-cmake-0.1.45
-color_quant-1.1.0
-console-0.11.3
-const_fn-0.4.4
-crc32fast-1.2.1
-criterion-0.3.3
-criterion-plot-0.4.3
-crossbeam-channel-0.5.0
-crossbeam-deque-0.8.0
-crossbeam-epoch-0.9.1
-crossbeam-utils-0.8.1
-csv-1.1.5
-csv-core-0.1.10
-ctor-0.1.17
-dav1d-sys-0.3.2
-deflate-0.8.6
-difference-2.0.0
-doc-comment-0.3.3
-either-1.6.1
-encode_unicode-0.3.6
-env_logger-0.7.1
-error-chain-0.10.0
-fern-0.6.0
-getrandom-0.1.15
-gimli-0.23.0
-glob-0.3.0
-half-1.6.0
-hermit-abi-0.1.17
-humantime-1.3.0
-image-0.23.12
-interpolate_name-0.2.3
-itertools-0.8.2
-itertools-0.9.0
-itoa-0.4.7
-jobserver-0.1.21
-js-sys-0.3.46
-lazycell-1.3.0
-lazy_static-1.4.0
-libc-0.2.81
-libloading-0.5.2
-log-0.4.11
-memchr-2.3.4
-memoffset-0.6.1
-metadeps-1.1.2
-miniz_oxide-0.3.7
-miniz_oxide-0.4.3
-nasm-rs-0.2.0
-nom-5.1.2
-noop_proc_macro-0.2.1
-num_cpus-1.13.0
-num-derive-0.3.3
-num-integer-0.1.44
-num-iter-0.1.42
-num-rational-0.3.2
-num-traits-0.2.14
-object-0.22.0
-oorandom-11.1.3
-output_vt100-0.1.2
-paste-0.1.18
-paste-impl-0.1.18
-peeking_take_while-0.1.2
-pkg-config-0.3.19
-plotters-0.2.15
-png-0.16.8
-ppv-lite86-0.2.10
-predicates-1.0.6
-predicates-core-1.0.1
-predicates-tree-1.0.1
-pretty_assertions-0.6.1
-proc-macro2-1.0.24
-proc-macro-hack-0.5.19
-quick-error-1.2.3
-quote-1.0.8
-rand-0.7.3
-rand_chacha-0.2.2
-rand_core-0.5.1
-rand_hc-0.2.0
-rayon-1.5.0
-rayon-core-1.9.0
-regex-1.4.2
-regex-automata-0.1.9
-regex-syntax-0.6.21
-rustc-demangle-0.1.18
-rustc-hash-1.1.0
-rustc_version-0.2.3
-rust_hawktracer-0.7.0
-rust_hawktracer_normal_macro-0.4.1
-rust_hawktracer_proc_macro-0.4.1
-rust_hawktracer_sys-0.4.2
-ryu-1.0.5
-same-file-1.0.6
-scan_fmt-0.2.5
-scopeguard-1.1.0
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.118
-serde_cbor-0.11.1
-serde_derive-1.0.118
-serde_json-1.0.61
-shlex-0.1.1
-signal-hook-0.1.17
-signal-hook-registry-1.3.0
-simd_helpers-0.1.0
-strsim-0.8.0
-syn-1.0.56
-termcolor-1.1.2
-terminal_size-0.1.15
-termios-0.3.3
-textwrap-0.11.0
-thiserror-1.0.23
-thiserror-impl-1.0.23
-thread_local-1.0.1
-time-0.1.44
-tinytemplate-1.1.0
-toml-0.2.1
-toml-0.5.8
-treeline-0.1.0
-unicode-width-0.1.8
-unicode-xid-0.2.1
-vec_map-0.8.2
-version_check-0.9.2
-wait-timeout-0.2.0
-walkdir-2.3.1
-wasi-0.10.0+wasi-snapshot-preview1
-wasi-0.9.0+wasi-snapshot-preview1
-wasm-bindgen-0.2.69
-wasm-bindgen-backend-0.2.69
-wasm-bindgen-macro-0.2.69
-wasm-bindgen-macro-support-0.2.69
-wasm-bindgen-shared-0.2.69
-web-sys-0.3.46
-which-3.1.1
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-winapi-x86_64-pc-windows-gnu-0.4.0
-y4m-0.5.3
-"
-
-inherit cargo
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/xiph/rav1e.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		$(cargo_crate_uris ${CRATES})
-		"
-	KEYWORDS="amd64 arm arm64 ppc64 x86"
-fi
-
-DESCRIPTION="The fastest and safest AV1 encoder"
-HOMEPAGE="https://github.com/xiph/rav1e/"
-RESTRICT=""
-LICENSE="BSD-2 Apache-2.0 MIT Unlicense"
-SLOT="0"
-
-IUSE="+capi"
-
-ASM_DEP=">=dev-lang/nasm-2.14"
-DEPEND="amd64? ( ${ASM_DEP} )"
-RDEPEND="capi? ( dev-util/cargo-c )"
-
-src_unpack() {
-	if [[ "${PV}" == *9999* ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		default
-		cargo_src_unpack
-	fi
-}
-
-src_compile() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	local args=$(usex debug "" --release)
-
-	cargo build ${args} \
-		|| die "cargo build failed"
-
-	if use capi; then
-		cargo cbuild ${args} \
-			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
-			|| die "cargo cbuild failed"
-	fi
-}
-
-src_install() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	local args=$(usex debug "" --release)
-
-	if use capi; then
-		cargo cinstall $args \
-			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
-			|| die "cargo cinstall failed"
-	fi
-
-	cargo_src_install
-}
diff --git a/media-video/rav1e/rav1e-0.4.0.ebuild b/media-video/rav1e/rav1e-0.4.0.ebuild
deleted file mode 100644
index 02ade85c4947..000000000000
--- a/media-video/rav1e/rav1e-0.4.0.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-addr2line-0.14.1
-adler-0.2.3
-adler32-1.2.0
-aho-corasick-0.7.15
-ansi_term-0.11.0
-aom-sys-0.2.1
-arbitrary-0.4.7
-arg_enum_proc_macro-0.3.0
-arrayvec-0.5.2
-assert_cmd-1.0.2
-atty-0.2.14
-autocfg-1.0.1
-av-metrics-0.6.2
-backtrace-0.3.55
-bindgen-0.54.0
-bitflags-1.2.1
-bitstream-io-1.0.0
-bstr-0.2.14
-bumpalo-3.4.0
-bytemuck-1.4.1
-byteorder-1.4.2
-cast-0.2.3
-cc-1.0.66
-cexpr-0.4.0
-cfg-if-0.1.10
-cfg-if-1.0.0
-chrono-0.4.19
-clang-sys-0.29.3
-clap-2.33.3
-cmake-0.1.45
-color_quant-1.1.0
-console-0.14.0
-console_error_panic_hook-0.1.6
-const_fn-0.4.5
-crc32fast-1.2.1
-criterion-0.3.3
-criterion-plot-0.4.3
-crossbeam-0.8.0
-crossbeam-channel-0.5.0
-crossbeam-deque-0.8.0
-crossbeam-epoch-0.9.1
-crossbeam-queue-0.3.1
-crossbeam-utils-0.8.1
-csv-1.1.5
-csv-core-0.1.10
-ctor-0.1.18
-dav1d-sys-0.3.2
-dcv-color-primitives-0.1.16
-deflate-0.8.6
-difference-2.0.0
-doc-comment-0.3.3
-either-1.6.1
-encode_unicode-0.3.6
-env_logger-0.7.1
-error-chain-0.10.0
-fern-0.6.0
-getrandom-0.2.1
-gimli-0.23.0
-glob-0.3.0
-half-1.6.0
-hermit-abi-0.1.17
-humantime-1.3.0
-image-0.23.12
-interpolate_name-0.2.3
-itertools-0.10.0
-itertools-0.8.2
-itertools-0.9.0
-itoa-0.4.7
-jobserver-0.1.21
-js-sys-0.3.46
-lab-0.8.2
-lazy_static-1.4.0
-lazycell-1.3.0
-libc-0.2.82
-libfuzzer-sys-0.3.5
-libloading-0.5.2
-log-0.4.13
-memchr-2.3.4
-memoffset-0.6.1
-metadeps-1.1.2
-miniz_oxide-0.3.7
-miniz_oxide-0.4.3
-nasm-rs-0.2.0
-nom-5.1.2
-noop_proc_macro-0.3.0
-num-derive-0.3.3
-num-integer-0.1.44
-num-iter-0.1.42
-num-rational-0.3.2
-num-traits-0.2.14
-num_cpus-1.13.0
-object-0.22.0
-oorandom-11.1.3
-output_vt100-0.1.2
-paste-1.0.4
-peeking_take_while-0.1.2
-pest-2.1.3
-pkg-config-0.3.19
-plotters-0.2.15
-png-0.16.8
-ppv-lite86-0.2.10
-predicates-1.0.6
-predicates-core-1.0.1
-predicates-tree-1.0.1
-pretty_assertions-0.6.1
-proc-macro2-1.0.24
-quick-error-1.2.3
-quote-1.0.8
-rand-0.8.2
-rand_chacha-0.3.0
-rand_core-0.6.1
-rand_hc-0.3.0
-rayon-1.5.0
-rayon-core-1.9.0
-regex-1.4.3
-regex-automata-0.1.9
-regex-syntax-0.6.22
-rust_hawktracer-0.7.0
-rust_hawktracer_normal_macro-0.4.1
-rust_hawktracer_proc_macro-0.4.1
-rust_hawktracer_sys-0.4.2
-rustc-demangle-0.1.18
-rustc-hash-1.1.0
-rustc_version-0.2.3
-rustc_version-0.3.2
-ryu-1.0.5
-same-file-1.0.6
-scan_fmt-0.2.5
-scoped-tls-1.0.0
-scopeguard-1.1.0
-semver-0.11.0
-semver-0.9.0
-semver-parser-0.10.2
-semver-parser-0.7.0
-serde-1.0.119
-serde_cbor-0.11.1
-serde_derive-1.0.119
-serde_json-1.0.61
-shlex-0.1.1
-signal-hook-0.3.3
-signal-hook-registry-1.3.0
-simd_helpers-0.1.0
-strsim-0.8.0
-syn-1.0.58
-termcolor-1.1.2
-terminal_size-0.1.15
-textwrap-0.11.0
-thiserror-1.0.23
-thiserror-impl-1.0.23
-thread_local-1.1.0
-time-0.1.43
-tinytemplate-1.2.0
-toml-0.2.1
-toml-0.5.8
-treeline-0.1.0
-ucd-trie-0.1.3
-unicode-width-0.1.8
-unicode-xid-0.2.1
-vec_map-0.8.2
-version_check-0.9.2
-wait-timeout-0.2.0
-walkdir-2.3.1
-wasi-0.10.1+wasi-snapshot-preview1
-wasm-bindgen-0.2.69
-wasm-bindgen-backend-0.2.69
-wasm-bindgen-futures-0.4.19
-wasm-bindgen-macro-0.2.69
-wasm-bindgen-macro-support-0.2.69
-wasm-bindgen-shared-0.2.69
-wasm-bindgen-test-0.3.19
-wasm-bindgen-test-macro-0.3.19
-web-sys-0.3.46
-which-3.1.1
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-winapi-x86_64-pc-windows-gnu-0.4.0
-y4m-0.7.0"
-
-inherit cargo
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/xiph/rav1e.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		$(cargo_crate_uris ${CRATES})
-		"
-	KEYWORDS="amd64 arm arm64 ppc64 x86"
-fi
-
-DESCRIPTION="The fastest and safest AV1 encoder"
-HOMEPAGE="https://github.com/xiph/rav1e/"
-RESTRICT=""
-LICENSE="BSD-2 Apache-2.0 MIT Unlicense"
-SLOT="0"
-
-IUSE="+capi"
-
-ASM_DEP=">=dev-lang/nasm-2.15"
-DEPEND="amd64? ( ${ASM_DEP} )"
-RDEPEND="capi? ( dev-util/cargo-c )"
-
-src_unpack() {
-	if [[ "${PV}" == *9999* ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		default
-		cargo_src_unpack
-	fi
-}
-
-src_compile() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	local args=$(usex debug "" --release)
-
-	cargo build ${args} \
-		|| die "cargo build failed"
-
-	if use capi; then
-		cargo cbuild ${args} \
-			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
-			|| die "cargo cbuild failed"
-	fi
-}
-
-src_install() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	local args=$(usex debug "" --release)
-
-	if use capi; then
-		cargo cinstall $args \
-			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
-			|| die "cargo cinstall failed"
-	fi
-
-	cargo_src_install
-}
diff --git a/media-video/rav1e/rav1e-0.4.1.ebuild b/media-video/rav1e/rav1e-0.4.1.ebuild
index 3e7a00ad98aa..daec6bb06fa2 100644
--- a/media-video/rav1e/rav1e-0.4.1.ebuild
+++ b/media-video/rav1e/rav1e-0.4.1.ebuild
@@ -284,8 +284,10 @@ SLOT="0"
 IUSE="+capi"
 
 ASM_DEP=">=dev-lang/nasm-2.15"
-DEPEND="amd64? ( ${ASM_DEP} )"
-RDEPEND="capi? ( dev-util/cargo-c )"
+BDEPEND="
+	amd64? ( ${ASM_DEP} )
+	capi? ( dev-util/cargo-c )
+"
 
 src_unpack() {
 	if [[ "${PV}" == *9999* ]]; then
@@ -305,19 +307,19 @@ src_compile() {
 		|| die "cargo build failed"
 
 	if use capi; then
-		cargo cbuild ${args} \
-			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
+		cargo cbuild ${args} --target-dir="capi" \
+			--prefix="/usr" --libdir="/usr/$(get_libdir)" \
 			|| die "cargo cbuild failed"
 	fi
 }
 
 src_install() {
 	export CARGO_HOME="${ECARGO_HOME}"
-	local args=$(usex debug "" --release)
+	local args=$(usex debug --debug "")
 
 	if use capi; then
-		cargo cinstall $args \
-			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
+		cargo cinstall $args --target-dir="capi" \
+			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED%/}" \
 			|| die "cargo cinstall failed"
 	fi
 
diff --git a/media-video/rav1e/rav1e-9999.ebuild b/media-video/rav1e/rav1e-9999.ebuild
index 483453914d15..775e51232df2 100644
--- a/media-video/rav1e/rav1e-9999.ebuild
+++ b/media-video/rav1e/rav1e-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,8 +27,10 @@ SLOT="0"
 IUSE="+capi"
 
 ASM_DEP=">=dev-lang/nasm-2.14"
-DEPEND="amd64? ( ${ASM_DEP} )"
-RDEPEND="capi? ( dev-util/cargo-c )"
+BDEPEND="
+	amd64? ( ${ASM_DEP} )
+	capi? ( dev-util/cargo-c )
+"
 
 src_unpack() {
 	if [[ "${PV}" == *9999* ]]; then
@@ -49,7 +51,7 @@ src_compile() {
 
 	if use capi; then
 		cargo cbuild ${args} \
-			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
+			--prefix="/usr" --libdir="/usr/$(get_libdir)" \
 			|| die "cargo cbuild failed"
 	fi
 }
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 018ffeb40931..e750dfb31a6d 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 3937e501c09e..c4217f2d7aae 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jul 2021 08:39:07 +0000
+Sun, 01 Aug 2021 20:38:55 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 564a6bb3249c..2376134bfd94 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 517807 BLAKE2B 2ecdb63e9cfe1a1b71d23ab4fe58b057928be5a410ab9012b87ec1e7c917af227099229248e5b2c7dc5b25edb96e4adad920259d956349d0ecbb204178f8da2c SHA512 4ca9cc06a8ae7d4eefdd8a435b92f1f4e675295b618afdb11cf1d7f45b49f0fd5137f7f0c81b60933a8b942fe25de9928a9f4ffe0d5968bae8eae39c95a7da50
-TIMESTAMP 2021-07-28T08:39:11Z
+TIMESTAMP 2021-08-01T20:38:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEBF69fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEHBmNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAX3RAAkvsBA/kd65kQIpe4XhaxvLHE72rTAf9y/0NQBfXNbTpE+hrp7Gik3kHM
-9BxVeKql3lhMER9ktmbE4Ijr4SEdHA7JmcoPGnjNl98LNZ8sxRcTAvLDhJ/HriAU
-18QlN/6rjjLU92TN2jmAk7HBd/AjY/giU5g6vFuy06mP3sOSJIXT05kAd5TgG9Rw
-NbaHUtAOyMzq3Q8ZPWeRlh3UxBA5ckIN8DWhtJkm6PyO8B4HllD55xjshUjbShPc
-fW5JN7ZR7Mx4TlHTDpNK2hZMeyDTYp9t/ih9nkVG2ADvRzPfQSQnfEQ63LFNeogD
-xT+g/QsPHAQi5PZtswmL9ir0ISQDuyhz9aUomCDWlogp8aM63yUTLYoRhXG2dANc
-8WzKrK0zpZiubPRX/KV2IQmyfxcavO23KQHT1l2rE/A6k+Nzp4gNqo2wjweVkqGm
-Ca62JhQ4RR7qnWZXjWkZljUTSZPxO2ARFoCKJcQv1jJkR19RKq78Td8u4dzZDIKg
-64iaCmxDXpmWv6J7XBo0Yo/Rd8G6qDyEjIiABm8A9iGl1GscariAENoNbn5L0B4p
-2q9bR+NsTXNjucnMsnAQDyapaQOIuIVvrHUmBhQJG3kRerItwFP7nSsaZvvq3eYT
-zin5NmgYB5AQrFs6pHc9/cSx/0saPo2xFXh2kR53FXEXCws3wjw=
-=nMXl
+klByFw//VQE/GAJmecOy06sUbBhuQyxwlzD003HOlNab8HmqtUsUf0uMLe1Cb5k+
+4hvjR8LXo7JTLGqIXibrhJ8bfgQklT5RaxfhmOC6NBVzFP2K6pF4l9HDgB+qMvLW
+zmdqOHqQtpTqhXd7FPivfdM09hwk/N8XopALgq63sYFEewRbIsvqEt0nVUym2JV1
+wEijFQewXBMC1yprGfA2US7UTIhOsDU/mgcU3nyajB4sKtectiH6FUv4p+EscZZj
+TenTPw5Zd4Q16HiPdrC+mvBVJbui4RHokbCUdz/F5yVHvy/JpKju2hxXieIYDbit
+70760B+rdxW/sMf/WIjZxeBe+kKxfSIgsAySYWxzDrfML/wYgF4FqLq03tTL4Fcs
+kDe51gsAvMTa8fZ6m7YtgIy26msUNsuNNAqupxAXOQG5v2PCqUhfKctaicAcnrEE
+jY1nZcX2Rvkt203GeUdT0vpl/w8nzVXlk1uLh98zrYgRG3P5M1dNu1DVkU3jVLjE
+afPsYZCkCy5IAEx7jNA4ssL1ii9MWbvWuEq9no6x5jAcrGpDmeeDi2ZuKvrX1QuF
+tHPGpSbTGyOK5MYxpU7YVvkJnym6DmSLEjTeb/m05/3nR4itYxvJmYzVfNhdg9jz
+jng7pWpxFclu7z9pYiB1ENagqLauBQnxkL0rbg2d03nSZuS2w+Y=
+=dtYS
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3937e501c09e..c4217f2d7aae 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jul 2021 08:39:07 +0000
+Sun, 01 Aug 2021 20:38:55 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 7da14092208d..24953501ef1e 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 84da7915f624..1ae9fb41da21 100644
--- a/metadata/md5-cache/acct-user/Manifest.gz
+++ b/metadata/md5-cache/acct-user/Manifest.gz
diff --git a/metadata/md5-cache/acct-user/badvpn-0 b/metadata/md5-cache/acct-user/badvpn-0
new file mode 100644
index 000000000000..2f5f296e4d29
--- /dev/null
+++ b/metadata/md5-cache/acct-user/badvpn-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for net-vpn/badvpn
+EAPI=7
+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
+RDEPEND=acct-group/badvpn
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=57991e78304efde8811537fa8da26d93
diff --git a/metadata/md5-cache/acct-user/cockroach-0 b/metadata/md5-cache/acct-user/cockroach-0
new file mode 100644
index 000000000000..a76df0923e44
--- /dev/null
+++ b/metadata/md5-cache/acct-user/cockroach-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for dev-db/cockroach
+EAPI=7
+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
+RDEPEND=acct-group/cockroach
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=66aad5eb86372334bebb73c64835f23d
diff --git a/metadata/md5-cache/acct-user/drone-0 b/metadata/md5-cache/acct-user/drone-0
new file mode 100644
index 000000000000..7d9cbc998d17
--- /dev/null
+++ b/metadata/md5-cache/acct-user/drone-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for dev-util/drone
+EAPI=7
+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
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=188d09a798a313ccd18ce18876c88f80
diff --git a/metadata/md5-cache/acct-user/rundeck-0 b/metadata/md5-cache/acct-user/rundeck-0
new file mode 100644
index 000000000000..551e3ce3d00a
--- /dev/null
+++ b/metadata/md5-cache/acct-user/rundeck-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for app-misc/rundeck-bin
+EAPI=7
+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
+RDEPEND=acct-group/rundeck
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=f2e0eda740c73fa29cee27997f8526c0
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index d013d97929d2..4134ecf39c7a 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/brltty-6.1 b/metadata/md5-cache/app-accessibility/brltty-6.1
index 79088777aaf6..3a4867c4d147 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.1
+++ b/metadata/md5-cache/app-accessibility/brltty-6.1
@@ -12,4 +12,4 @@ REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python
 SLOT=0
 SRC_URI=https://brltty.app/archive/brltty-6.1.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	findlib	1470b3b78030acb2c8fcd04414f4c611	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e515caa3a83a122963e4fff093d645e9
+_md5_=4bdbfdc381458f0c4307e21dba783703
diff --git a/metadata/md5-cache/app-accessibility/freetts-1.2.2-r1 b/metadata/md5-cache/app-accessibility/freetts-1.2.2-r1
deleted file mode 100644
index cf7a96104195..000000000000
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* jsapi? ( app-arch/sharutils ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A speech synthesis system written entirely in Java
-EAPI=7
-HOMEPAGE=https://freetts.sourceforge.net/
-IUSE=jsapi mbrola elibc_FreeBSD doc examples source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=jsapi? ( sun-bcla-jsapi ) freetts
-RDEPEND=>=virtual/jre-1.8:* mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/freetts/freetts-1.2.2-src.zip
-_eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=724c5b605c8fdc2e0262bd1879f355de
diff --git a/metadata/md5-cache/app-accessibility/freetts-1.2.2-r2 b/metadata/md5-cache/app-accessibility/freetts-1.2.2-r2
new file mode 100644
index 000000000000..e3cd238046ef
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8:* jsapi? ( app-arch/sharutils ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A speech synthesis system written entirely in Java
+EAPI=7
+HOMEPAGE=https://freetts.sourceforge.net/
+IUSE=jsapi mbrola elibc_FreeBSD doc examples source
+KEYWORDS=amd64 ppc64 x86
+LICENSE=jsapi? ( sun-bcla-jsapi ) freetts
+RDEPEND=>=virtual/jre-1.8:* mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/freetts/freetts-1.2.2-src.zip
+_eclasses_=java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ab922cad4b9f3940dab9f1e877cdedf8
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 043bb533b1f7..74d4a9100903 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.48-r1 b/metadata/md5-cache/app-admin/apache-tools-2.4.48-r1
index 74b5e0da9c62..3cf83e56251d 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.48-r1
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.48-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=7
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre virtual/libcrypt:= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.48.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=09d10509e22d5d3a9f478ee2c23d2b7e
+_md5_=a2e9a4f1cb77b97f2ff0c698ebddc3b1
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.10 b/metadata/md5-cache/app-admin/awscli-1.20.10
new file mode 100644
index 000000000000..95447ee19075
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.21.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.10.tar.gz -> awscli-1.20.10.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.11 b/metadata/md5-cache/app-admin/awscli-1.20.11
new file mode 100644
index 000000000000..233275db0071
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.11
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.21.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.11.tar.gz -> awscli-1.20.11.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.9 b/metadata/md5-cache/app-admin/awscli-1.20.9
new file mode 100644
index 000000000000..8a69c4f78bf0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.9
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.21.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.9.tar.gz -> awscli-1.20.9.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/filebeat-7.13.4 b/metadata/md5-cache/app-admin/filebeat-7.13.4
new file mode 100644
index 000000000000..b70fc7fc5827
--- /dev/null
+++ b/metadata/md5-cache/app-admin/filebeat-7.13.4
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
+EAPI=7
+HOMEPAGE=https://www.elastic.co/products/beats
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD-2 MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/elastic/beats/archive/v7.13.4.tar.gz -> filebeat-7.13.4.tar.gz mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.zip -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.zip mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.mod -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.mod mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.zip -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.zip mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.mod -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.mod mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.zip -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.zip mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.zip -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.zip mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.mod -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.mod mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.zip -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.zip mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.mod -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.mod mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.zip -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.mod -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.mod mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.zip -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.zip mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.mod -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.zip -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.zip mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.zip -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.zip -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.zip mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.mod -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.8.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.9.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.6.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.zip -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.zip mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.6.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.6.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.zip -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.zip mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.zip -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.mod -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.zip -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.zip mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.mod mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.zip -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.zip mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.mod -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.mod mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.zip -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.zip mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.mod -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.mod mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.zip -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.zip mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.mod -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.zip -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.zip -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.zip mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.mod -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.mod mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.zip -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.zip mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.mod -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.mod mirror://goproxy//github.com/antihax/optional/@v/v0.0.0-20180407024304-ca021399b1a6.zip -> github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.zip mirror://goproxy//github.com/antihax/optional/@v/v0.0.0-20180407024304-ca021399b1a6.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200820155224-be881fa6b91d.zip -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200820155224-be881fa6b91d.zip mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200820155224-be881fa6b91d.mod -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200820155224-be881fa6b91d.mod mirror://goproxy//github.com/apache/thrift/@v/v0.13.1-0.20200603211036-eac4d0c79a5f.zip -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.1-0.20200603211036-eac4d0c79a5f.zip mirror://goproxy//github.com/apache/thrift/@v/v0.13.1-0.20200603211036-eac4d0c79a5f.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.1-0.20200603211036-eac4d0c79a5f.mod mirror://goproxy//github.com/apoydence/eachers/@v/v0.0.0-20181020210610-23942921fe77.zip -> github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.zip mirror://goproxy//github.com/apoydence/eachers/@v/v0.0.0-20181020210610-23942921fe77.mod -> github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.zip -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.zip mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.zip -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.zip -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/awslabs/goformation/v3/@v/v3.1.0.zip -> github.com%2Fawslabs%2Fgoformation%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/awslabs/goformation/v3/@v/v3.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.zip -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bi-zone/go-winio/@v/v0.4.15.zip -> github.com%2Fbi-zone%2Fgo-winio%2F@v%2Fv0.4.15.zip mirror://goproxy//github.com/bi-zone/go-winio/@v/v0.4.15.mod -> github.com%2Fbi-zone%2Fgo-winio%2F@v%2Fv0.4.15.mod mirror://goproxy//github.com/blakerouse/service/@v/v1.1.1-0.20200924160513-057808572ffa.zip -> github.com%2Fblakerouse%2Fservice%2F@v%2Fv1.1.1-0.20200924160513-057808572ffa.zip mirror://goproxy//github.com/blakerouse/service/@v/v1.1.1-0.20200924160513-057808572ffa.mod -> github.com%2Fblakerouse%2Fservice%2F@v%2Fv1.1.1-0.20200924160513-057808572ffa.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.zip -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.zip mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.mod -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.mod mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.zip -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.zip mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.mod -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.zip -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.zip -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.zip mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.mod -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.mod mirror://goproxy//github.com/cloudfoundry/noaa/@v/v2.1.0+incompatible.zip -> github.com%2Fcloudfoundry%2Fnoaa%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/cloudfoundry/noaa/@v/v2.1.0+incompatible.mod -> github.com%2Fcloudfoundry%2Fnoaa%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.zip -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.zip mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.mod -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.zip -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.zip mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.zip mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.zip mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.zip -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.zip mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.zip mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.zip -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.zip mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.zip -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.mod -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.zip -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.zip mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.mod -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.zip -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.zip mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.zip -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.zip mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.mod mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.2007.3-0.20201012072640-f5a7e0a1c83b.zip -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.3-0.20201012072640-f5a7e0a1c83b.zip mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.2007.3-0.20201012072640-f5a7e0a1c83b.mod -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.3-0.20201012072640-f5a7e0a1c83b.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.3-0.20200630154024-f66de99634de.zip -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.3-0.20200630154024-f66de99634de.zip mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.3-0.20200630154024-f66de99634de.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.3-0.20200630154024-f66de99634de.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.zip -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.zip -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.zip mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.mod -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.zip -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.zip mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.mod -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.zip -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.zip mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.zip -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.zip mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.mod -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.zip -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.zip -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.zip -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.mod mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.zip -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.zip mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.mod -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.mod mirror://goproxy//github.com/elastic/ecs/@v/v1.8.0.zip -> github.com%2Felastic%2Fecs%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/elastic/ecs/@v/v1.8.0.mod -> github.com%2Felastic%2Fecs%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/elastic/elastic-agent-client/v7/@v/v7.0.0-20210308165121-7dd05ee2b5a5.zip -> github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20210308165121-7dd05ee2b5a5.zip mirror://goproxy//github.com/elastic/elastic-agent-client/v7/@v/v7.0.0-20210308165121-7dd05ee2b5a5.mod -> github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20210308165121-7dd05ee2b5a5.mod mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.zip -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.zip mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.mod -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.mod mirror://goproxy//github.com/elastic/go-concert/@v/v0.1.0.zip -> github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/elastic/go-concert/@v/v0.1.0.mod -> github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/elastic/go-libaudit/v2/@v/v2.2.0.zip -> github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//github.com/elastic/go-libaudit/v2/@v/v2.2.0.mod -> github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/elastic/go-licenser/@v/v0.3.1.zip -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/elastic/go-licenser/@v/v0.3.1.mod -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.zip -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.mod -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.zip -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.mod -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.zip -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.zip mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.mod -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.mod mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.zip -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.zip mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.mod -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.mod mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.zip -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.mod -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.8.zip -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.8.mod -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.1.1.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.6.0.zip -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.6.0.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.zip -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.mod -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.7.0.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.zip -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.0.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.zip -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/elastic/gosigar/@v/v0.14.1.zip -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/elastic/gosigar/@v/v0.14.1.mod -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/elastic/sarama/@v/v1.19.1-0.20210120173147-5c8cb347d877.zip -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20210120173147-5c8cb347d877.zip mirror://goproxy//github.com/elastic/sarama/@v/v1.19.1-0.20210120173147-5c8cb347d877.mod -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20210120173147-5c8cb347d877.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.2.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.2.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.2.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.zip -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.zip mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.zip -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.zip -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.zip mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.mod -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.7.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.7.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/gobuffalo/here/@v/v0.6.0.zip -> github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/gobuffalo/here/@v/v0.6.0.mod -> github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.zip -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.zip mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.mod -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godror/godror/@v/v0.10.4.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.zip mirror://goproxy//github.com/godror/godror/@v/v0.10.4.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.zip -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/gomodule/redigo/@v/v1.8.3.zip -> github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.3.zip mirror://goproxy//github.com/gomodule/redigo/@v/v1.8.3.mod -> github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.3.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.zip -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.zip mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/licenseclassifier/@v/v0.0.0-20200402202327-879cb1424de0.zip -> github.com%2Fgoogle%2Flicenseclassifier%2F@v%2Fv0.0.0-20200402202327-879cb1424de0.zip mirror://goproxy//github.com/google/licenseclassifier/@v/v0.0.0-20200402202327-879cb1424de0.mod -> github.com%2Fgoogle%2Flicenseclassifier%2F@v%2Fv0.0.0-20200402202327-879cb1424de0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.zip -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20180427100037-88b0669f7d75.zip -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.zip mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20180427100037-88b0669f7d75.mod -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/h2non/filetype/@v/v1.1.1-0.20201130172452-f60988ab73d5.zip -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.1.1-0.20201130172452-f60988ab73d5.zip mirror://goproxy//github.com/h2non/filetype/@v/v1.1.1-0.20201130172452-f60988ab73d5.mod -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.1.1-0.20201130172452-f60988ab73d5.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/nomad/api/@v/v0.0.0-20200303134319-e31695b5bbe6.zip -> github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20200303134319-e31695b5bbe6.zip mirror://goproxy//github.com/hashicorp/nomad/api/@v/v0.0.0-20200303134319-e31695b5bbe6.mod -> github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20200303134319-e31695b5bbe6.mod mirror://goproxy//github.com/hectane/go-acl/@v/v0.0.0-20190604041725-da78bae5fc95.zip -> github.com%2Fhectane%2Fgo-acl%2F@v%2Fv0.0.0-20190604041725-da78bae5fc95.zip mirror://goproxy//github.com/hectane/go-acl/@v/v0.0.0-20190604041725-da78bae5fc95.mod -> github.com%2Fhectane%2Fgo-acl%2F@v%2Fv0.0.0-20190604041725-da78bae5fc95.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.zip -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.zip mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.4.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.4.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.zip -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.zip -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.zip mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.mod mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.zip -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.zip mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.mod -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.zip -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.2.2.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.2.2.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20190209210621-63e6d1acd3dd.zip -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20190209210621-63e6d1acd3dd.zip mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20190209210621-63e6d1acd3dd.mod -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20190209210621-63e6d1acd3dd.mod mirror://goproxy//github.com/jpillora/backoff/@v/v0.0.0-20180909062703-3050d21c67d7.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.zip -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.6.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.6.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.6.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.6.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.zip -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.zip -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.0.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.11.0.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/kolide/osquery-go/@v/v0.0.0-20200604192029-b019be7063ac.zip -> github.com%2Fkolide%2Fosquery-go%2F@v%2Fv0.0.0-20200604192029-b019be7063ac.zip mirror://goproxy//github.com/kolide/osquery-go/@v/v0.0.0-20200604192029-b019be7063ac.mod -> github.com%2Fkolide%2Fosquery-go%2F@v%2Fv0.0.0-20200604192029-b019be7063ac.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.zip mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.mod mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/magefile/mage/@v/v1.11.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.11.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/markbates/pkger/@v/v0.17.0.zip -> github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.0.zip mirror://goproxy//github.com/markbates/pkger/@v/v0.17.0.mod -> github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.zip -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.mod -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.zip -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.zip mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.zip -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.zip mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.zip -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.zip -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.5.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.2.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.zip -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.zip mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/otiai10/copy/@v/v1.2.0.zip -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/otiai10/copy/@v/v1.2.0.mod -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/otiai10/curr/@v/v0.0.0-20150429015615-9b4961190c95.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod mirror://goproxy//github.com/otiai10/curr/@v/v1.0.0.zip -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/otiai10/curr/@v/v1.0.0.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.0.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.1.zip -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/otiai10/mint/@v/v1.3.1.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.zip -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.mod -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160517101806-924dca7d15f0.zip -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160517101806-924dca7d15f0.zip mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160517101806-924dca7d15f0.mod -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160517101806-924dca7d15f0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20170505043639-c605e284fe17.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20170505043639-c605e284fe17.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/poy/eachers/@v/v0.0.0-20181020210610-23942921fe77.zip -> github.com%2Fpoy%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.zip mirror://goproxy//github.com/poy/eachers/@v/v0.0.0-20181020210610-23942921fe77.mod -> github.com%2Fpoy%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190425082905-87a4384529e0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190425082905-87a4384529e0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.zip -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.zip mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.mod -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20200313005456-10cdbea86bc0.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20200313005456-10cdbea86bc0.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20200313005456-10cdbea86bc0.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20200313005456-10cdbea86bc0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.zip -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.zip -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.zip mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.mod -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.mod mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.zip -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.zip mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.mod -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.mod mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.zip -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.zip mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.mod -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v0.0.0-20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv0.0.0-20170819201035-0056894fa522.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.zip -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.zip mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.mod mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.zip -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.mod -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v3.20.12+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.20.12+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v3.20.12+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.20.12+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.1.5-0.20170601210322-f6abca593680.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.5-0.20170601210322-f6abca593680.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.zip -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.zip mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.mod -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.mod mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20200626092518-2ab8e397a786.zip -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.zip mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20200626092518-2ab8e397a786.mod -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.8.zip -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/ugorji/go/@v/v1.1.8.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.8.zip -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.zip mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.zip -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.zip mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.mod -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.mod mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.zip -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.zip mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.mod -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.mod mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.zip -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.zip mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.mod -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.mod mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.zip -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.zip mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.mod -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.mod mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.zip -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.zip mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.mod -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.mod mirror://goproxy//github.com/vbatts/tar-split/@v/v0.11.1.zip -> github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.1.zip mirror://goproxy//github.com/vbatts/tar-split/@v/v0.11.1.mod -> github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.zip -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.zip mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.mod mirror://goproxy//go.elastic.co/apm/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/@v/v1.8.1-0.20200909061013-2aef45b9cf4b.zip -> go.elastic.co%2Fapm%2F@v%2Fv1.8.1-0.20200909061013-2aef45b9cf4b.zip mirror://goproxy//go.elastic.co/apm/@v/v1.8.1-0.20200909061013-2aef45b9cf4b.mod -> go.elastic.co%2Fapm%2F@v%2Fv1.8.1-0.20200909061013-2aef45b9cf4b.mod mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/ecszap/@v/v0.3.0.zip -> go.elastic.co%2Fecszap%2F@v%2Fv0.3.0.zip mirror://goproxy//go.elastic.co/ecszap/@v/v0.3.0.mod -> go.elastic.co%2Fecszap%2F@v%2Fv0.3.0.mod mirror://goproxy//go.elastic.co/fastjson/@v/v1.0.0.mod -> go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.mod mirror://goproxy//go.elastic.co/fastjson/@v/v1.1.0.zip -> go.elastic.co%2Ffastjson%2F@v%2Fv1.1.0.zip mirror://goproxy//go.elastic.co/fastjson/@v/v1.1.0.mod -> go.elastic.co%2Ffastjson%2F@v%2Fv1.1.0.mod mirror://goproxy//go.elastic.co/go-licence-detector/@v/v0.4.0.zip -> go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.zip mirror://goproxy//go.elastic.co/go-licence-detector/@v/v0.4.0.mod -> go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.zip -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.zip mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.zip -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.zip mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191002035440-2ec189313ef0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191021144547-ec77196f6094.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191021144547-ec77196f6094.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190130055435-99b60b757ec1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180810173357-98c5dad5d1a0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180810173357-98c5dad5d1a0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180815093151-14742f9018cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180815093151-14742f9018cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190204203706-41f3e6584952.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190204203706-41f3e6584952.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190529164535-6a60838ec259.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190529164535-6a60838ec259.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191025021431-6c3a3bfe00ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191025021431-6c3a3bfe00ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200622214017-ed371f2e16b4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201009025420-dfb3f7c4e634.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210308170721-88b6017d0656.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210308170721-88b6017d0656.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210308170721-88b6017d0656.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210308170721-88b6017d0656.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200602230032-c00d67ef29d0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200602230032-c00d67ef29d0.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200602230032-c00d67ef29d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200602230032-c00d67ef29d0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.zip mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190927181202-20e1ac93f88c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.zip -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.zip mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.zip -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.zip mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.mod -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.mod mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.zip -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.mod -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/gotestsum/@v/v0.6.0.zip -> gotest.tools%2Fgotestsum%2F@v%2Fv0.6.0.zip mirror://goproxy//gotest.tools/gotestsum/@v/v0.6.0.mod -> gotest.tools%2Fgotestsum%2F@v%2Fv0.6.0.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.zip -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.mod -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod mirror://goproxy//k8s.io/api/@v/v0.19.4.zip -> k8s.io%2Fapi%2F@v%2Fv0.19.4.zip mirror://goproxy//k8s.io/api/@v/v0.19.4.mod -> k8s.io%2Fapi%2F@v%2Fv0.19.4.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.19.4.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.4.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.19.4.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.4.mod mirror://goproxy//k8s.io/client-go/@v/v0.19.4.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.19.4.zip mirror://goproxy//k8s.io/client-go/@v/v0.19.4.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.19.4.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200805222855-6aeccd4b50c6.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200805222855-6aeccd4b50c6.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200805222855-6aeccd4b50c6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200805222855-6aeccd4b50c6.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.zip -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.zip mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200729134348-d5654de09c73.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200729134348-d5654de09c73.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.zip -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.zip mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.1.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.1.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=25f1867cecef458838ad91fb6cbbe13c
diff --git a/metadata/md5-cache/app-admin/logrotate-3.18.0 b/metadata/md5-cache/app-admin/logrotate-3.18.0
deleted file mode 100644
index 1e1e02c79456..000000000000
--- a/metadata/md5-cache/app-admin/logrotate-3.18.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) >=sys-apps/sed-4
-DESCRIPTION=Rotates, compresses, and mails system logs
-EAPI=7
-HOMEPAGE=https://github.com/logrotate/logrotate
-IUSE=acl +cron selinux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron ) virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.18.0/logrotate-3.18.0.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a26f9842be3ad0ef9156b9c52a36aca5
diff --git a/metadata/md5-cache/app-admin/logrotate-3.18.1 b/metadata/md5-cache/app-admin/logrotate-3.18.1
deleted file mode 100644
index 56a7423cc7be..000000000000
--- a/metadata/md5-cache/app-admin/logrotate-3.18.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl )
-DESCRIPTION=Rotates, compresses, and mails system logs
-EAPI=7
-HOMEPAGE=https://github.com/logrotate/logrotate
-IUSE=acl +cron selinux
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron ) virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.18.1/logrotate-3.18.1.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3bac2fa11248d80928c501c9a4c3a0f5
diff --git a/metadata/md5-cache/app-admin/logrotate-3.18.1-r1 b/metadata/md5-cache/app-admin/logrotate-3.18.1-r1
new file mode 100644
index 000000000000..2c811c8a3571
--- /dev/null
+++ b/metadata/md5-cache/app-admin/logrotate-3.18.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl )
+DESCRIPTION=Rotates, compresses, and mails system logs
+EAPI=7
+HOMEPAGE=https://github.com/logrotate/logrotate
+IUSE=acl +cron selinux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron ) virtual/tmpfiles
+SLOT=0
+SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.18.1/logrotate-3.18.1.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9101dbbf9d8442b9c44e805b5b2a6767
diff --git a/metadata/md5-cache/app-admin/logstash-bin-6.8.17 b/metadata/md5-cache/app-admin/logstash-bin-6.8.17
new file mode 100644
index 000000000000..a88840a44df1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/logstash-bin-6.8.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Tool for managing events and logs
+EAPI=7
+HOMEPAGE=https://www.elastic.co/products/logstash
+IUSE=x-pack elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT x-pack? ( Elastic )
+RDEPEND=acct-group/logstash acct-user/logstash virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-6.8.17.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-6.8.17.tar.gz )
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=c363eff25b36b0ec6f38b4d9a416d2ad
diff --git a/metadata/md5-cache/app-admin/logstash-bin-7.13.4 b/metadata/md5-cache/app-admin/logstash-bin-7.13.4
new file mode 100644
index 000000000000..69f7b9f6c1cb
--- /dev/null
+++ b/metadata/md5-cache/app-admin/logstash-bin-7.13.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Tool for managing events and logs
+EAPI=7
+HOMEPAGE=https://www.elastic.co/products/logstash
+IUSE=x-pack elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT x-pack? ( Elastic )
+RDEPEND=acct-group/logstash acct-user/logstash virtual/jre >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-7.13.4-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.13.4-linux-x86_64.tar.gz )
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=155ba86266876b1ea31938fc485922db
diff --git a/metadata/md5-cache/app-admin/monit-5.27.1-r1 b/metadata/md5-cache/app-admin/monit-5.27.1-r1
deleted file mode 100644
index e3248d2562bc..000000000000
--- a/metadata/md5-cache/app-admin/monit-5.27.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=Monitoring and managing daemons or similar programs running on a Unix system
-EAPI=7
-HOMEPAGE=http://mmonit.com/monit/
-IUSE=ipv6 pam ssl
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux
-LICENSE=AGPL-3
-RDEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=http://mmonit.com/monit/dist/monit-5.27.1.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b0f9cd4a34f96edb25c78334510a81c6
diff --git a/metadata/md5-cache/app-admin/monit-5.28.1-r1 b/metadata/md5-cache/app-admin/monit-5.28.1-r1
new file mode 100644
index 000000000000..3793a113edd1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/monit-5.28.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=Monitoring and managing daemons or similar programs running on a Unix system
+EAPI=7
+HOMEPAGE=http://mmonit.com/monit/
+IUSE=ipv6 pam ssl
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=AGPL-3
+RDEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=http://mmonit.com/monit/dist/monit-5.28.1.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f57a32ee5231fba20e7112938f00cee8
diff --git a/metadata/md5-cache/app-admin/pass-1.7.3 b/metadata/md5-cache/app-admin/pass-1.7.3
deleted file mode 100644
index 94737e2422f3..000000000000
--- a/metadata/md5-cache/app-admin/pass-1.7.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
-EAPI=6
-HOMEPAGE=https://www.passwordstore.org/
-IUSE=+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
-SLOT=0
-SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.3.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c212f1491880a9837abab79581527ec3
diff --git a/metadata/md5-cache/app-admin/pass-1.7.3-r1 b/metadata/md5-cache/app-admin/pass-1.7.3-r1
new file mode 100644
index 000000000000..fb77f95bb995
--- /dev/null
+++ b/metadata/md5-cache/app-admin/pass-1.7.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
+EAPI=7
+HOMEPAGE=https://www.passwordstore.org/
+IUSE=+git X emacs dmenu importers elibc_Darwin
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
+SLOT=0
+SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.3.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=718c5fbc3df792188606e7dae61177bc
diff --git a/metadata/md5-cache/app-admin/pass-1.7.4 b/metadata/md5-cache/app-admin/pass-1.7.4
deleted file mode 100644
index 7da66086e7f6..000000000000
--- a/metadata/md5-cache/app-admin/pass-1.7.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
-EAPI=7
-HOMEPAGE=https://www.passwordstore.org/
-IUSE=+git wayland X zsh-completion fish-completion emacs dmenu importers elibc_Darwin
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
-SLOT=0
-SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.4.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bf37ed6d6733cc0532f40e0850633f2a
diff --git a/metadata/md5-cache/app-admin/pass-1.7.4-r1 b/metadata/md5-cache/app-admin/pass-1.7.4-r1
new file mode 100644
index 000000000000..22c026586428
--- /dev/null
+++ b/metadata/md5-cache/app-admin/pass-1.7.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
+EAPI=7
+HOMEPAGE=https://www.passwordstore.org/
+IUSE=+git wayland X emacs dmenu importers elibc_Darwin
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
+SLOT=0
+SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.4.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3c574e0a8b13fc2e37eb0d8a1940242e
diff --git a/metadata/md5-cache/app-admin/pass-9999 b/metadata/md5-cache/app-admin/pass-9999
index 6972e5df7ae5..4d58bc4a0d5c 100644
--- a/metadata/md5-cache/app-admin/pass-9999
+++ b/metadata/md5-cache/app-admin/pass-9999
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install postinst postrm prepare unpack
 DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
 EAPI=7
 HOMEPAGE=https://www.passwordstore.org/
-IUSE=+git wayland X zsh-completion fish-completion emacs dmenu importers elibc_Darwin
+IUSE=+git wayland X emacs dmenu importers elibc_Darwin
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
+RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 SLOT=0
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ed702abb271fde06b8d455b7ba503d19
+_md5_=0e941046218616952550029113c92d2f
diff --git a/metadata/md5-cache/app-admin/prelude-manager-5.1.0-r1 b/metadata/md5-cache/app-admin/prelude-manager-5.1.0-r1
index b12b252ecf43..dadbd27a7127 100644
--- a/metadata/md5-cache/app-admin/prelude-manager-5.1.0-r1
+++ b/metadata/md5-cache/app-admin/prelude-manager-5.1.0-r1
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=configure install postinst prepare
 DEPEND=net-libs/gnutls:= >=dev-libs/libprelude-5.1.0 <dev-libs/libprelude-6 dbx? ( >=dev-libs/libpreludedb-5.1.0 <dev-libs/libpreludedb-6 ) geoip? ( dev-libs/libmaxminddb ) tcpd? ( sys-apps/tcp-wrappers ) xml? ( dev-libs/libxml2 )
 DESCRIPTION=Bus communication for all Prelude modules
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=net-libs/gnutls:= >=dev-libs/libprelude-5.1.0 <dev-libs/libprelude-6 dbx
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.1.0/prelude-manager-5.1.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=50036a5495f6076f4e4297f2bdf90d6f
+_md5_=f5c2be24994b5b9bd531b2e9d68891e1
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.22 b/metadata/md5-cache/app-admin/puppet-5.5.22
deleted file mode 100644
index 4f212ff2f4b2..000000000000
--- a/metadata/md5-cache/app-admin/puppet-5.5.22
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby25(-)] =dev-ruby/facter-3*[ruby_targets_ruby25(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby25(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby25(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby26(-)] =dev-ruby/facter-3*[ruby_targets_ruby26(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby26(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby27(-)] =dev-ruby/facter-3*[ruby_targets_ruby27(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=7
-HOMEPAGE=https://puppet.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby25(-)] =dev-ruby/facter-3*[ruby_targets_ruby25(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby25(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby25(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby26(-)] =dev-ruby/facter-3*[ruby_targets_ruby26(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby26(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby27(-)] =dev-ruby/facter-3*[ruby_targets_ruby27(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby25(-)] =dev-ruby/facter-3*[ruby_targets_ruby25(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby25(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby25(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby26(-)] =dev-ruby/facter-3*[ruby_targets_ruby26(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby26(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby27(-)] =dev-ruby/facter-3*[ruby_targets_ruby27(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppet/puppet-5.5.22.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f4c31d6d737e7901c2f5568bd4d81a10
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.22-r1 b/metadata/md5-cache/app-admin/puppet-5.5.22-r1
new file mode 100644
index 000000000000..fa2c8bd869fd
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-5.5.22-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby25(-)] =dev-ruby/facter-3*[ruby_targets_ruby25(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby25(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby25(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby26(-)] =dev-ruby/facter-3*[ruby_targets_ruby26(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby26(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby27(-)] =dev-ruby/facter-3*[ruby_targets_ruby27(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A system automation and configuration management software.
+EAPI=7
+HOMEPAGE=https://puppet.com/
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby25(-)] =dev-ruby/facter-3*[ruby_targets_ruby25(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby25(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby25(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby26(-)] =dev-ruby/facter-3*[ruby_targets_ruby26(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby26(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby27(-)] =dev-ruby/facter-3*[ruby_targets_ruby27(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby25(-)] =dev-ruby/facter-3*[ruby_targets_ruby25(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby25(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby25(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby26(-)] =dev-ruby/facter-3*[ruby_targets_ruby26(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby26(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/hiera-3.2.1:0[ruby_targets_ruby27(-)] =dev-ruby/facter-3*[ruby_targets_ruby27(-)] >=dev-ruby/fast_gettext-1.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/locale-2.1:0[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) virtual/tmpfiles
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppet/puppet-5.5.22.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b629ef8594123b64a26d470bc37eb328
diff --git a/metadata/md5-cache/app-admin/puppet-7.8.0 b/metadata/md5-cache/app-admin/puppet-7.8.0
deleted file mode 100644
index aca3bc264bd3..000000000000
--- a/metadata/md5-cache/app-admin/puppet-7.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=https://puppet.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f5ad801dd7098c84e862a5ac5cb0ccf2
diff --git a/metadata/md5-cache/app-admin/puppet-7.8.0-r1 b/metadata/md5-cache/app-admin/puppet-7.8.0-r1
new file mode 100644
index 000000000000..d3157820e27b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-7.8.0-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig
+DESCRIPTION=A system automation and configuration management software.
+EAPI=6
+HOMEPAGE=https://puppet.com/
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) virtual/tmpfiles
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.8.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=83919d8bfc870bcf5e6a57ed5a30d47b
diff --git a/metadata/md5-cache/app-admin/puppet-7.9.0 b/metadata/md5-cache/app-admin/puppet-7.9.0
deleted file mode 100644
index 96e8d0bbfb19..000000000000
--- a/metadata/md5-cache/app-admin/puppet-7.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=https://puppet.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a8dc1c5f4827aa7db2884ea448db6177
diff --git a/metadata/md5-cache/app-admin/puppet-7.9.0-r1 b/metadata/md5-cache/app-admin/puppet-7.9.0-r1
new file mode 100644
index 000000000000..9b3a880807f5
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-7.9.0-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig
+DESCRIPTION=A system automation and configuration management software.
+EAPI=6
+HOMEPAGE=https://puppet.com/
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) virtual/tmpfiles
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.9.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e8b5af1178ffbe13dc522fbce0c631ec
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1 b/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
index f48235880bc3..6b77092aa430 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install unpack
+DEFINED_PHASES=install postinst unpack
 DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what acct-user/puppet acct-group/puppet app-admin/augeas
 DESCRIPTION=general puppet client utils along with hiera and facter
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_6.19.1-1focal_amd64.deb
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=144d0472e3fa069ba612f16421eb1385
+_md5_=9134d597eab86b2808d6f3f4c6465c92
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.8.0 b/metadata/md5-cache/app-admin/puppet-agent-7.8.0
index 170a90c1202d..e21d2708a172 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-7.8.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.8.0
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install unpack
+DEFINED_PHASES=install postinst unpack
 DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet app-admin/augeas
 DESCRIPTION=general puppet client utils along with hiera and facter
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.8.0-1focal_amd64.deb
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=ad00f7abcecc3f9c9e9586c721778e29
+_md5_=c6761f8d2f52fffea132d5e2cf885302
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.9.0-r2 b/metadata/md5-cache/app-admin/puppet-agent-7.9.0-r2
index 9b01dcdf191e..1f76aff8cd8d 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-7.9.0-r2
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.9.0-r2
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install unpack
+DEFINED_PHASES=install postinst unpack
 DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet app-admin/augeas
 DESCRIPTION=general puppet client utils along with hiera and facter
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.9.0-1focal_amd64.deb
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=3ca67f5d520e60b6eb89fd7b6545d9ed
+_md5_=76b7b6686416b158dfb69e899664b567
diff --git a/metadata/md5-cache/app-admin/puppetdb-7.4.1 b/metadata/md5-cache/app-admin/puppetdb-7.4.1
index 6a96ba0c9307..3f5dff40fb0d 100644
--- a/metadata/md5-cache/app-admin/puppetdb-7.4.1
+++ b/metadata/md5-cache/app-admin/puppetdb-7.4.1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jdk-1.8.0 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-7.4.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5c1ea212f264f1bd15bf25e586cd1b97
+_md5_=a75632211b9f62d1d2b3baba4e357a6c
diff --git a/metadata/md5-cache/app-admin/puppetdb-7.5.0 b/metadata/md5-cache/app-admin/puppetdb-7.5.0
index e05a76df384e..dc6f0cfea7a3 100644
--- a/metadata/md5-cache/app-admin/puppetdb-7.5.0
+++ b/metadata/md5-cache/app-admin/puppetdb-7.5.0
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jdk-1.8.0 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-7.5.0.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c84df5452a2667121514ddf963f76049
+_md5_=cf9044901dc441e6db55e7b3248c1a59
diff --git a/metadata/md5-cache/app-admin/puppetserver-7.2.0 b/metadata/md5-cache/app-admin/puppetserver-7.2.0
deleted file mode 100644
index e2531e176dc6..000000000000
--- a/metadata/md5-cache/app-admin/puppetserver-7.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=acct-user/puppet acct-group/puppet
-DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
-EAPI=7
-HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
-IUSE=puppetdb
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-7.2.0.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=78650f085a609e1d2bfc5f063049e9c3
diff --git a/metadata/md5-cache/app-admin/puppetserver-7.2.0-r1 b/metadata/md5-cache/app-admin/puppetserver-7.2.0-r1
new file mode 100644
index 000000000000..a029a5ddfb46
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetserver-7.2.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/puppet acct-group/puppet
+DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
+IUSE=puppetdb
+KEYWORDS=amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-7.2.0.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=44a5418969ad8f63ba51a9b78d6e3aa7
diff --git a/metadata/md5-cache/app-admin/puppetserver-7.2.1 b/metadata/md5-cache/app-admin/puppetserver-7.2.1
deleted file mode 100644
index be59a63a2e4a..000000000000
--- a/metadata/md5-cache/app-admin/puppetserver-7.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=acct-user/puppet acct-group/puppet
-DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
-EAPI=7
-HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
-IUSE=puppetdb
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-7.2.1.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bb709592cb4d4a3065475163c897bdd5
diff --git a/metadata/md5-cache/app-admin/puppetserver-7.2.1-r1 b/metadata/md5-cache/app-admin/puppetserver-7.2.1-r1
new file mode 100644
index 000000000000..1f92a8292729
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetserver-7.2.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/puppet acct-group/puppet
+DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
+IUSE=puppetdb
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-7.2.1.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=80166a866915209d71d346457d919bef
diff --git a/metadata/md5-cache/app-admin/pwgen-2.08 b/metadata/md5-cache/app-admin/pwgen-2.08
index 1fccf71d530c..bc73e07e7c67 100644
--- a/metadata/md5-cache/app-admin/pwgen-2.08
+++ b/metadata/md5-cache/app-admin/pwgen-2.08
@@ -3,8 +3,8 @@ DESCRIPTION=Password Generator
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/pwgen/
 IUSE=livecd
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/pwgen/pwgen-2.08.tar.gz
-_md5_=6749efeec20a2585bc266d517406046b
+_md5_=0b24e7aecffa6f80e80a1d2521d7ba48
diff --git a/metadata/md5-cache/app-admin/rex-1.13.4 b/metadata/md5-cache/app-admin/rex-1.13.4
new file mode 100644
index 000000000000..19e14264b406
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rex-1.13.4
@@ -0,0 +1,15 @@
+BDEPEND=!minimal? ( dev-perl/DBI dev-perl/Expect dev-perl/IPC-Shareable dev-perl/XML-LibXML ) virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/Data-Validate-IP dev-perl/Devel-Caller dev-perl/Digest-HMAC virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec dev-perl/HTTP-Message dev-perl/Hash-Merge virtual/perl-IO dev-perl/IO-String dev-perl/IO-Tty dev-perl/JSON-MaybeXS virtual/perl-MIME-Base64 dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape virtual/perl-Storable dev-perl/TermReadKey virtual/perl-Test-Simple dev-perl/Text-Glob virtual/perl-Text-Tabs+Wrap virtual/perl-Time-HiRes dev-perl/URI dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-version >=virtual/perl-CPAN-Meta-Requirements-2.120.620 >=virtual/perl-ExtUtils-MakeMaker-7.110.100 >=dev-perl/File-ShareDir-Install-0.60.0 virtual/perl-Module-Metadata test? ( !minimal? ( dev-perl/File-LibMagic ) virtual/perl-File-Temp dev-perl/Test-Deep dev-perl/Test-Output dev-perl/Test-UseAllModules virtual/perl-autodie ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/perl
+DESCRIPTION=(R)?ex, the friendly automation framework
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Rex https://www.rexify.org
+IUSE=minimal test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!minimal? ( dev-perl/DBI dev-perl/Expect dev-perl/IPC-Shareable dev-perl/XML-LibXML ) virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/Data-Validate-IP dev-perl/Devel-Caller dev-perl/Digest-HMAC virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec dev-perl/HTTP-Message dev-perl/Hash-Merge virtual/perl-IO dev-perl/IO-String dev-perl/IO-Tty dev-perl/JSON-MaybeXS virtual/perl-MIME-Base64 dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape virtual/perl-Storable dev-perl/TermReadKey virtual/perl-Test-Simple dev-perl/Text-Glob virtual/perl-Text-Tabs+Wrap virtual/perl-Time-HiRes dev-perl/URI dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FE/FERKI/Rex-1.13.4.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=775060fd4ae278a14a97e3a3a4967e0b
diff --git a/metadata/md5-cache/app-admin/setools-4.4.0 b/metadata/md5-cache/app-admin/setools-4.4.0
index e6a8c9ffa88e..72539f39d590 100644
--- a/metadata/md5-cache/app-admin/setools-4.4.0
+++ b/metadata/md5-cache/app-admin/setools-4.4.0
@@ -5,7 +5,7 @@ DESCRIPTION=Policy Analysis Tools for SELinux
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/setools/wiki
 IUSE=X test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/networkx-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools >=sys-libs/libsepol-2.8:= >=sys-libs/libselinux-2.8:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/setools/releases/download/4.4.0/setools-4.4.0.tar.bz2
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=969147d0d310c590eac1e0a4a6d097dc
+_md5_=12b733ba0d33eae097c560ea93e494dd
diff --git a/metadata/md5-cache/app-admin/stow-2.3.1 b/metadata/md5-cache/app-admin/stow-2.3.1
index f8fa8efc1bca..0d54becf816e 100644
--- a/metadata/md5-cache/app-admin/stow-2.3.1
+++ b/metadata/md5-cache/app-admin/stow-2.3.1
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/stow/stow-2.3.1.tar.gz verify-sig? ( mirror://gnu/stow/stow-2.3.1.tar.gz.sig )
-_eclasses_=perl-functions	fea344a91ebf37efadf172c6a3de5a72	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=a6391d59f83bc8b8af7a215ed3be4c26
+_eclasses_=perl-functions	fea344a91ebf37efadf172c6a3de5a72	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=dea6e91e052ae1a6b556b57deb729362
diff --git a/metadata/md5-cache/app-admin/terraform-1.0.3 b/metadata/md5-cache/app-admin/terraform-1.0.3
new file mode 100644
index 000000000000..b540eaf960a7
--- /dev/null
+++ b/metadata/md5-cache/app-admin/terraform-1.0.3
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A tool for building, changing, and combining infrastructure safely
+EAPI=7
+HOMEPAGE=https://www.terraform.io/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/terraform/archive/v1.0.3.tar.gz -> terraform-1.0.3.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v45.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv45.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v47.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv47.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v51.2.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.2.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v52.5.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv52.5.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v52.5.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv52.5.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v11.1.2+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv11.1.2+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.10.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.10.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20180810175552-4a21cbd618b4.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20180810175552-4a21cbd618b4.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!chris!trenkamp/goxpath/@v/v0.0.0-20170922090931-c385f95c6022.mod -> github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20170922090931-c385f95c6022.mod mirror://goproxy//github.com/!chris!trenkamp/goxpath/@v/v0.0.0-20190607011252-c5096ec8773d.zip -> github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20190607011252-c5096ec8773d.zip mirror://goproxy//github.com/!chris!trenkamp/goxpath/@v/v0.0.0-20190607011252-c5096ec8773d.mod -> github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20190607011252-c5096ec8773d.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.zip -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.zip mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!qcloud!api/qcloud_sign_golang/@v/v0.0.0-20141224014652-e4130a326409.mod -> github.com%2F!qcloud!api%2Fqcloud_sign_golang%2F@v%2Fv0.0.0-20141224014652-e4130a326409.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.1.mod -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.2.zip -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.2.mod -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190329064014-6e358769c32a.zip -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190329064014-6e358769c32a.zip mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190329064014-6e358769c32a.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190329064014-6e358769c32a.mod mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190103054945-8205d1f41e70.zip -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190103054945-8205d1f41e70.zip mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190103054945-8205d1f41e70.mod -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190103054945-8205d1f41e70.mod mirror://goproxy//github.com/aliyun/aliyun-tablestore-go-sdk/@v/v4.1.2+incompatible.zip -> github.com%2Faliyun%2Faliyun-tablestore-go-sdk%2F@v%2Fv4.1.2+incompatible.zip mirror://goproxy//github.com/aliyun/aliyun-tablestore-go-sdk/@v/v4.1.2+incompatible.mod -> github.com%2Faliyun%2Faliyun-tablestore-go-sdk%2F@v%2Fv4.1.2+incompatible.mod mirror://goproxy//github.com/antchfx/xpath/@v/v0.0.0-20190129040759-c8489ed3251e.zip -> github.com%2Fantchfx%2Fxpath%2F@v%2Fv0.0.0-20190129040759-c8489ed3251e.zip mirror://goproxy//github.com/antchfx/xpath/@v/v0.0.0-20190129040759-c8489ed3251e.mod -> github.com%2Fantchfx%2Fxpath%2F@v%2Fv0.0.0-20190129040759-c8489ed3251e.mod mirror://goproxy//github.com/antchfx/xquery/@v/v0.0.0-20180515051857-ad5b8c7a47b0.zip -> github.com%2Fantchfx%2Fxquery%2F@v%2Fv0.0.0-20180515051857-ad5b8c7a47b0.zip mirror://goproxy//github.com/antchfx/xquery/@v/v0.0.0-20180515051857-ad5b8c7a47b0.mod -> github.com%2Fantchfx%2Fxquery%2F@v%2Fv0.0.0-20180515051857-ad5b8c7a47b0.mod mirror://goproxy//github.com/apparentlymart/go-cidr/@v/v1.1.0.zip -> github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/apparentlymart/go-cidr/@v/v1.1.0.mod -> github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20180507223929-23540a00eaa3.mod -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20180507223929-23540a00eaa3.mod mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20190214190832-042adf3cf4a0.zip -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20190214190832-042adf3cf4a0.zip mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20190214190832-042adf3cf4a0.mod -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20190214190832-042adf3cf4a0.mod mirror://goproxy//github.com/apparentlymart/go-shquot/@v/v0.0.1.zip -> github.com%2Fapparentlymart%2Fgo-shquot%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/apparentlymart/go-shquot/@v/v0.0.1.mod -> github.com%2Fapparentlymart%2Fgo-shquot%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/apparentlymart/go-textseg/@v/v1.0.0.zip -> github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/apparentlymart/go-textseg/@v/v1.0.0.mod -> github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/apparentlymart/go-textseg/v13/@v/v13.0.0.zip -> github.com%2Fapparentlymart%2Fgo-textseg%2Fv13%2F@v%2Fv13.0.0.zip mirror://goproxy//github.com/apparentlymart/go-textseg/v13/@v/v13.0.0.mod -> github.com%2Fapparentlymart%2Fgo-textseg%2Fv13%2F@v%2Fv13.0.0.mod mirror://goproxy//github.com/apparentlymart/go-userdirs/@v/v0.0.0-20200915174352-b0c018a67c13.zip -> github.com%2Fapparentlymart%2Fgo-userdirs%2F@v%2Fv0.0.0-20200915174352-b0c018a67c13.zip mirror://goproxy//github.com/apparentlymart/go-userdirs/@v/v0.0.0-20200915174352-b0c018a67c13.mod -> github.com%2Fapparentlymart%2Fgo-userdirs%2F@v%2Fv0.0.0-20200915174352-b0c018a67c13.mod mirror://goproxy//github.com/apparentlymart/go-versions/@v/v1.0.1.zip -> github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/apparentlymart/go-versions/@v/v1.0.1.mod -> github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20190214190532-5111143e8da2.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20190214190532-5111143e8da2.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.78.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.9.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.9.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.0.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.0.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.0.mod mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.zip -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.mod -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.zip -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.zip mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.mod -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bmatcuk/doublestar/@v/v1.1.5.zip -> github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/bmatcuk/doublestar/@v/v1.1.5.mod -> github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.27.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.11.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20160705203006-01aeca54ebda.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20160705203006-01aeca54ebda.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dylanmei/iso8601/@v/v0.1.0.zip -> github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/dylanmei/iso8601/@v/v0.1.0.mod -> github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/dylanmei/winrmtest/@v/v0.0.0-20190225150635-99b7fe2fddf1.zip -> github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.zip mirror://goproxy//github.com/dylanmei/winrmtest/@v/v0.0.0-20190225150635-99b7fe2fddf1.mod -> github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v0.0.0-20190203023257-5858425f7550.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.1.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.3.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.3.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/gogo/protobuf/@v/v0.0.0-20171007142547-342cbe0a0415.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv0.0.0-20171007142547-342cbe0a0415.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.1.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20160524151835-7d79101e329e.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20160524151835-7d79101e329e.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.zip -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20190126172459-c818fa66e4c8.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190126172459-c818fa66e4c8.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.6.1-0.20191122030953-d8ac278c1c9d.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.6.1-0.20191122030953-d8ac278c1c9d.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.10.1-0.20200424014253-c3bfe50899e5.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.10.1-0.20200424014253-c3bfe50899e5.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.10.1-0.20200424014253-c3bfe50899e5.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.10.1-0.20200424014253-c3bfe50899e5.mod mirror://goproxy//github.com/gophercloud/utils/@v/v0.0.0-20200423144003-7c72efc7435d.zip -> github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20200423144003-7c72efc7435d.zip mirror://goproxy//github.com/gophercloud/utils/@v/v0.0.0-20200423144003-7c72efc7435d.mod -> github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20200423144003-7c72efc7435d.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20170728041850-787624de3eb7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20170728041850-787624de3eb7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/aws-sdk-go-base/@v/v0.6.0.zip -> github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/hashicorp/aws-sdk-go-base/@v/v0.6.0.mod -> github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/hashicorp/consul/@v/v0.0.0-20171026175957-610f3c86a089.zip -> github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.zip mirror://goproxy//github.com/hashicorp/consul/@v/v0.0.0-20171026175957-610f3c86a089.mod -> github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-azure-helpers/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-azure-helpers/@v/v0.14.0.zip -> github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.14.0.zip mirror://goproxy//github.com/hashicorp/go-azure-helpers/@v/v0.14.0.mod -> github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.14.0.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-getter/@v/v1.5.2.zip -> github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/hashicorp/go-getter/@v/v1.5.2.mod -> github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.15.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.15.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.15.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v0.0.0-20180129170900-7f3cd4390caa.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v0.0.0-20180129170900-7f3cd4390caa.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.4.1.zip -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.4.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.zip -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.mod -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v0.0.0-20180320115054-6d291a969b86.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv0.0.0-20180320115054-6d291a969b86.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v0.0.0-20180320115054-6d291a969b86.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv0.0.0-20180320115054-6d291a969b86.mod mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.15.0.zip -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.15.0.zip mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.15.0.mod -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20170504190234-a4b07c25de5f.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20170504190234-a4b07c25de5f.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.mod mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.10.1.zip -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.10.1.zip mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.10.1.mod -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.10.1.mod mirror://goproxy//github.com/hashicorp/jsonapi/@v/v0.0.0-20210518035559-1e50d74c8db3.zip -> github.com%2Fhashicorp%2Fjsonapi%2F@v%2Fv0.0.0-20210518035559-1e50d74c8db3.zip mirror://goproxy//github.com/hashicorp/jsonapi/@v/v0.0.0-20210518035559-1e50d74c8db3.mod -> github.com%2Fhashicorp%2Fjsonapi%2F@v%2Fv0.0.0-20210518035559-1e50d74c8db3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.0.0-20160124182025-e4ec8cc423bb.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.0.0-20160124182025-e4ec8cc423bb.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.0.0-20160124182025-e4ec8cc423bb.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.0.0-20160124182025-e4ec8cc423bb.mod mirror://goproxy//github.com/hashicorp/terraform-config-inspect/@v/v0.0.0-20210209133302-4fd17a0faac2.zip -> github.com%2Fhashicorp%2Fterraform-config-inspect%2F@v%2Fv0.0.0-20210209133302-4fd17a0faac2.zip mirror://goproxy//github.com/hashicorp/terraform-config-inspect/@v/v0.0.0-20210209133302-4fd17a0faac2.mod -> github.com%2Fhashicorp%2Fterraform-config-inspect%2F@v%2Fv0.0.0-20210209133302-4fd17a0faac2.mod mirror://goproxy//github.com/hashicorp/terraform-svchost/@v/v0.0.0-20200729002733-f050f53b9734.zip -> github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20200729002733-f050f53b9734.zip mirror://goproxy//github.com/hashicorp/terraform-svchost/@v/v0.0.0-20200729002733-f050f53b9734.mod -> github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20200729002733-f050f53b9734.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jhump/protoreflect/@v/v1.6.0.zip -> github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/jhump/protoreflect/@v/v1.6.0.mod -> github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180313100802-d8f9c0314926.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.zip mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180313100802-d8f9c0314926.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180701071628-ab8a2e0c74be.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kardianos/osext/@v/v0.0.0-20190222173326-2bc1f35cddc0.zip -> github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.zip mirror://goproxy//github.com/kardianos/osext/@v/v0.0.0-20190222173326-2bc1f35cddc0.mod -> github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.2.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.2.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.11.2.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.15.zip -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.15.zip mirror://goproxy//github.com/likexian/gokit/@v/v0.20.15.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.15.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod mirror://goproxy//github.com/lusis/go-artifactory/@v/v0.0.0-20160115162124-7e4ce345df82.zip -> github.com%2Flusis%2Fgo-artifactory%2F@v%2Fv0.0.0-20160115162124-7e4ce345df82.zip mirror://goproxy//github.com/lusis/go-artifactory/@v/v0.0.0-20160115162124-7e4ce345df82.mod -> github.com%2Flusis%2Fgo-artifactory%2F@v%2Fv0.0.0-20160115162124-7e4ce345df82.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/masterzen/simplexml/@v/v0.0.0-20160608183007-4572e39b1ab9.mod -> github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20160608183007-4572e39b1ab9.mod mirror://goproxy//github.com/masterzen/simplexml/@v/v0.0.0-20190410153822-31eea3082786.zip -> github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20190410153822-31eea3082786.zip mirror://goproxy//github.com/masterzen/simplexml/@v/v0.0.0-20190410153822-31eea3082786.mod -> github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20190410153822-31eea3082786.mod mirror://goproxy//github.com/masterzen/winrm/@v/v0.0.0-20200615185753-c42b5136ff88.zip -> github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20200615185753-c42b5136ff88.zip mirror://goproxy//github.com/masterzen/winrm/@v/v0.0.0-20200615185753-c42b5136ff88.mod -> github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20200615185753-c42b5136ff88.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.4.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.4.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.8.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.8.zip mirror://goproxy//github.com/miekg/dns/@v/v1.0.8.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.8.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-linereader/@v/v0.0.0-20190213213312-1b945b3263eb.zip -> github.com%2Fmitchellh%2Fgo-linereader%2F@v%2Fv0.0.0-20190213213312-1b945b3263eb.zip mirror://goproxy//github.com/mitchellh/go-linereader/@v/v0.0.0-20190213213312-1b945b3263eb.mod -> github.com%2Fmitchellh%2Fgo-linereader%2F@v%2Fv0.0.0-20190213213312-1b945b3263eb.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v0.0.0-20150314170334-ad45545899c7.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv0.0.0-20150314170334-ad45545899c7.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/panicwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpanicwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/panicwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpanicwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mozillazg/go-httpheader/@v/v0.2.1.zip -> github.com%2Fmozillazg%2Fgo-httpheader%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/mozillazg/go-httpheader/@v/v0.2.1.mod -> github.com%2Fmozillazg%2Fgo-httpheader%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nu7hatch/gouuid/@v/v0.0.0-20131221200532-179d4d0c4d8d.zip -> github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.zip mirror://goproxy//github.com/nu7hatch/gouuid/@v/v0.0.0-20131221200532-179d4d0c4d8d.mod -> github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.zip -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20190113212917-5533ce8a0da3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20190113212917-5533ce8a0da3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packer-community/winrmcp/@v/v0.0.0-20180921211025-c76d91c1e7db.zip -> github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180921211025-c76d91c1e7db.zip mirror://goproxy//github.com/packer-community/winrmcp/@v/v0.0.0-20180921211025-c76d91c1e7db.mod -> github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180921211025-c76d91c1e7db.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20201207095918-0426ae3fba23.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20201207095918-0426ae3fba23.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20201207095918-0426ae3fba23.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20201207095918-0426ae3fba23.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.1.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.82+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.82+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.82+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.82+incompatible.mod mirror://goproxy//github.com/tencentyun/cos-go-sdk-v5/@v/v0.0.0-20190808065407-f07404cefc8c.zip -> github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.0.0-20190808065407-f07404cefc8c.zip mirror://goproxy//github.com/tencentyun/cos-go-sdk-v5/@v/v0.0.0-20190808065407-f07404cefc8c.mod -> github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.0.0-20190808065407-f07404cefc8c.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20200427203606-3cfed13b9966.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20200427203606-3cfed13b9966.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20200427203606-3cfed13b9966.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20200427203606-3cfed13b9966.mod mirror://goproxy//github.com/tombuildsstuff/giovanni/@v/v0.15.1.zip -> github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.15.1.zip mirror://goproxy//github.com/tombuildsstuff/giovanni/@v/v0.15.1.mod -> github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.15.1.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.8.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.8.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.8.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.8.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/vmihailenco/msgpack/@v/v3.3.3+incompatible.zip -> github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv3.3.3+incompatible.zip mirror://goproxy//github.com/vmihailenco/msgpack/@v/v3.3.3+incompatible.mod -> github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv3.3.3+incompatible.mod mirror://goproxy//github.com/vmihailenco/msgpack/v4/@v/v4.3.12.zip -> github.com%2Fvmihailenco%2Fmsgpack%2Fv4%2F@v%2Fv4.3.12.zip mirror://goproxy//github.com/vmihailenco/msgpack/v4/@v/v4.3.12.mod -> github.com%2Fvmihailenco%2Fmsgpack%2Fv4%2F@v%2Fv4.3.12.mod mirror://goproxy//github.com/vmihailenco/tagparser/@v/v0.1.1.zip -> github.com%2Fvmihailenco%2Ftagparser%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/vmihailenco/tagparser/@v/v0.1.1.mod -> github.com%2Fvmihailenco%2Ftagparser%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.zip -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.mod -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20161029104018-1d6e34225557.zip -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20161029104018-1d6e34225557.zip mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20161029104018-1d6e34225557.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20161029104018-1d6e34225557.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.0.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.1.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.2.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.8.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.9.0.zip -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/zclconf/go-cty/@v/v1.9.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/zclconf/go-cty-debug/@v/v0.0.0-20191215020915-b22d67c1ba0b.zip -> github.com%2Fzclconf%2Fgo-cty-debug%2F@v%2Fv0.0.0-20191215020915-b22d67c1ba0b.zip mirror://goproxy//github.com/zclconf/go-cty-debug/@v/v0.0.0-20191215020915-b22d67c1ba0b.mod -> github.com%2Fzclconf%2Fgo-cty-debug%2F@v%2Fv0.0.0-20191215020915-b22d67c1ba0b.mod mirror://goproxy//github.com/zclconf/go-cty-yaml/@v/v1.0.2.zip -> github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/zclconf/go-cty-yaml/@v/v1.0.2.mod -> github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20210428180535-15715dcf1ace.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20210428180535-15715dcf1ace.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20210428180535-15715dcf1ace.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20210428180535-15715dcf1ace.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181025213731-e84da0312774.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181025213731-e84da0312774.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190219172222-a4c6cb3142f2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190222235706-ffb98f73852f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190222235706-ffb98f73852f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190426145343-a29dc8fdc734.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191202143827-86a70503ff7e.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191202143827-86a70503ff7e.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180530234432-1e491301e022.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180530234432-1e491301e022.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180811021610-c39426892332.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180811021610-c39426892332.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190206173232-65e2d4e15006.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190206173232-65e2d4e15006.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190812203447-cdfb69ac37fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190812203447-cdfb69ac37fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191009170851-d66e71096ffb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191009170851-d66e71096ffb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191126235420-ef20fe5d7933.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191126235420-ef20fe5d7933.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190221075227-b4e8571b14e0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502175342-a43fa875dd82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502175342-a43fa875dd82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190509141414-a5b02f93d862.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190509141414-a5b02f93d862.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191128015809-6d18c012aee9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210403161142-5e06dd20ab57.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210403161142-5e06dd20ab57.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201210144234-2321bbc49cbf.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201210144234-2321bbc49cbf.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20161028155119-f51c12702a4d.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20161028155119-f51c12702a4d.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191203134012-c197fd4bf371.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191203134012-c197fd4bf371.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.44.0-impersonate-preview.zip -> google.golang.org%2Fapi%2F@v%2Fv0.44.0-impersonate-preview.zip mirror://goproxy//google.golang.org/api/@v/v0.44.0-impersonate-preview.mod -> google.golang.org%2Fapi%2F@v%2Fv0.44.0-impersonate-preview.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20170818010345-ee236bd376b0.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20170818010345-ee236bd376b0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201109203340-2640f1f9cdfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201201144952-b05cb90ed32e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201210142538-e3217bee35cc.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201214200347-8c77b98c765d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210222152913-aa3ee6e6a81c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210310155132-4ce2db91004e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod mirror://goproxy//google.golang.org/grpc/@v/v1.8.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.8.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.35.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.27.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190620084959-7cf5895f2711.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190620084959-7cf5895f2711.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190620084959-7cf5895f2711.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190620084959-7cf5895f2711.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190612205821-1799e75a0719.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190612205821-1799e75a0719.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190913080033-27d36303b655.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190913080033-27d36303b655.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190913080033-27d36303b655.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190913080033-27d36303b655.mod mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20190620085101-78d2af792bab.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.zip mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20190620085101-78d2af792bab.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.1.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.1.mod mirror://goproxy//k8s.io/klog/@v/v0.4.0.zip -> k8s.io%2Fklog%2F@v%2Fv0.4.0.zip mirror://goproxy//k8s.io/klog/@v/v0.4.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.4.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190228160746-b3a7cee44a30.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190221042446-c2654d5206da.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190221042446-c2654d5206da.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200411171748-3d5a2fe318e4.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200411171748-3d5a2fe318e4.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200411171748-3d5a2fe318e4.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200411171748-3d5a2fe318e4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef
+_md5_=f0112ab80ea20e67f6543590cd29ac07
diff --git a/metadata/md5-cache/app-admin/xkcdpass-1.19.2 b/metadata/md5-cache/app-admin/xkcdpass-1.19.2
index 4225102b8459..fbd61ff852dc 100644
--- a/metadata/md5-cache/app-admin/xkcdpass-1.19.2
+++ b/metadata/md5-cache/app-admin/xkcdpass-1.19.2
@@ -1,14 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Password generator inspired by XKCD 936
 EAPI=7
 HOMEPAGE=https://github.com/redacted/XKCD-password-generator
-IUSE=l10n_de l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD CC-BY-3.0 l10n_de? ( GPL-3 ) l10n_it? ( CC-BY-SA-3.0 ) l10n_no? ( CC-BY-4.0 )
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+REQUIRED_USE=test? ( l10n_en ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xkcdpass/xkcdpass-1.19.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0e92060e10f0a850353ffe9fa3c12e5e
+_md5_=0ea067280cb67b9f94384ccd293e8073
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index d0fdbff1fc78..51090c446a76 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.103.2 b/metadata/md5-cache/app-antivirus/clamav-0.103.2
index fa866e3f3292..652bdb239695 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.103.2
+++ b/metadata/md5-cache/app-antivirus/clamav-0.103.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.103.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e817a4f388efe5bc8352b849b213e703
+_md5_=c09ff55817a5d067659b674d031bb5e8
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.103.3 b/metadata/md5-cache/app-antivirus/clamav-0.103.3
index 31aaf42dd6fe..0210b504d8c6 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.103.3
+++ b/metadata/md5-cache/app-antivirus/clamav-0.103.3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.103.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8f966870ca10355593c8db9af7334e31
+_md5_=bf198efd19413a1c6a77eed6b7451d58
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.103.3-r1 b/metadata/md5-cache/app-antivirus/clamav-0.103.3-r1
index 8826a3ab85ab..3ca9dc233229 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.103.3-r1
+++ b/metadata/md5-cache/app-antivirus/clamav-0.103.3-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.103.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bba42423cd774f93c0a0f21796dbc4b5
+_md5_=169567415b641ddbde4dd0b7e28955a9
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 913219f48af9..7aecefe6bfb0 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/bareos-19.2.9 b/metadata/md5-cache/app-backup/bareos-19.2.9
deleted file mode 100644
index cf9554cbc317..000000000000
--- a/metadata/md5-cache/app-backup/bareos-19.2.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] dev-libs/openssl:0=[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib )
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=7
-HOMEPAGE=https://www.bareos.org/
-IUSE=X acl ceph clientonly +director glusterfs ipv6 jansson lmdb logwatch mysql ndmp +postgres readline scsi-crypto sqlite static +storage-daemon systemd tcpd vim-syntax xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] dev-libs/openssl:0=[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=!clientonly? ( || ( mysql postgres sqlite ) ) static? ( clientonly ) x86? ( !ceph )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/19.2.9.tar.gz -> bareos-19.2.9.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6407f6dc7cab095ce4feb3924bbb4248
diff --git a/metadata/md5-cache/app-backup/bareos-19.2.9-r1 b/metadata/md5-cache/app-backup/bareos-19.2.9-r1
new file mode 100644
index 000000000000..ff4f72399a53
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bareos-19.2.9-r1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] dev-libs/openssl:0=[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib )
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=7
+HOMEPAGE=https://www.bareos.org/
+IUSE=X acl ceph clientonly +director glusterfs ipv6 jansson lmdb logwatch mysql ndmp +postgres readline scsi-crypto sqlite static +storage-daemon systemd tcpd vim-syntax xattr
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] dev-libs/openssl:0=[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/tmpfiles
+REQUIRED_USE=!clientonly? ( || ( mysql postgres sqlite ) ) static? ( clientonly ) x86? ( !ceph )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/bareos/bareos/archive/Release/19.2.9.tar.gz -> bareos-19.2.9.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b9bb0c58745ee1b9949eb98b0dda2503
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.5.16 b/metadata/md5-cache/app-backup/borgmatic-1.5.16
deleted file mode 100644
index d841d95c670e..000000000000
--- a/metadata/md5-cache/app-backup/borgmatic-1.5.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_8? ( dev-python/flexmock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/flexmock[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flexmock[python_targets_python3_10(-)] ) ) test? ( app-backup/borgbackup python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/colorama[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-4.5.0[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DESCRIPTION=Automatically create, prune and verify backups with borgbackup
-EAPI=8
-HOMEPAGE=https://torsion.org/borgmatic/
-IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~riscv
-LICENSE=GPL-3
-RDEPEND=app-backup/borgbackup python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/colorama[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.5.16.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=710a32e0078b66778e6265e29c370de9
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.5.17 b/metadata/md5-cache/app-backup/borgmatic-1.5.17
new file mode 100644
index 000000000000..389a263055e9
--- /dev/null
+++ b/metadata/md5-cache/app-backup/borgmatic-1.5.17
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_single_target_python3_8? ( dev-python/flexmock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/flexmock[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flexmock[python_targets_python3_10(-)] ) ) test? ( app-backup/borgbackup python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/colorama[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-4.5.0[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=Automatically create, prune and verify backups with borgbackup
+EAPI=8
+HOMEPAGE=https://torsion.org/borgmatic/
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~riscv
+LICENSE=GPL-3
+RDEPEND=app-backup/borgbackup python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/colorama[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.5.17.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=053ff51da6a356a4a55e4d9f904c0a31
diff --git a/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r2 b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r2
new file mode 100644
index 000000000000..3d332df265fb
--- /dev/null
+++ b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Back up Untangle configurations via the web admin UI
+EAPI=7
+HOMEPAGE=http://michael.orlitzky.com/code/untangle-https-backup.xhtml
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=http://michael.orlitzky.com/code/releases/untangle-https-backup-0.0.10.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6e855aa1aa169f94e50e9728b9985456
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 894b962566b2..ed45d3f63633 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09 b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09
index 93a31c5e9704..f3f902b5a7f1 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09
@@ -4,10 +4,10 @@ DESCRIPTION=A set of tools for CD/DVD reading and recording, including cdrecord
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/cdrtools/
 IUSE=acl caps nls unicode +filecaps
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
 RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.02a09.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1c6d68cffc59c6f6912e75720f94b26b
+_md5_=b953c56a934de0ca46013fb1aa698285
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r2 b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r2
index a24ff91c33e0..fb6894ce4e7e 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r2
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r2
@@ -5,10 +5,10 @@ DESCRIPTION=A set of tools for CD/DVD reading and recording, including cdrecord
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/cdrtools/
 IUSE=acl caps nls unicode selinux +filecaps
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
 RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit selinux? ( sec-policy/selinux-cdrecord ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.02a09.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a5f90bfe9b7003e3f03e7e80aead6c06
+_md5_=e362a9d079ecc9aafefecdff4ef74313
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r3 b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r3
index b18443037631..1bcd6530284c 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r3
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r3
@@ -5,10 +5,10 @@ DESCRIPTION=A set of tools for CD/DVD reading and recording, including cdrecord
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/cdrtools/
 IUSE=acl caps nls unicode selinux +filecaps
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
 RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit selinux? ( sec-policy/selinux-cdrecord ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.02a09.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c9be7aa9785df22c44607e9ca290742d
+_md5_=237bcee7408ea1b927bd63f903128c98
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index ed398067ce7f..dd2aa512a385 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.35 b/metadata/md5-cache/app-crypt/ccid-1.4.35
new file mode 100644
index 000000000000..9539b059fb52
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/ccid-1.4.35
@@ -0,0 +1,14 @@
+BDEPEND=kernel_linux? ( virtual/pkgconfig ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install
+DEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
+DESCRIPTION=CCID free software driver
+EAPI=7
+HOMEPAGE=https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID
+IUSE=twinserial kobil-midentity +usb
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
+SLOT=0
+SRC_URI=https://ccid.apdu.fr/files/ccid-1.4.35.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=41afffaff522d4ac3726ee41b09f3315
diff --git a/metadata/md5-cache/app-crypt/dieharder-3.31.1-r4 b/metadata/md5-cache/app-crypt/dieharder-3.31.1-r4
index a546b3eb5264..4db851a8e72f 100644
--- a/metadata/md5-cache/app-crypt/dieharder-3.31.1-r4
+++ b/metadata/md5-cache/app-crypt/dieharder-3.31.1-r4
@@ -5,11 +5,11 @@ DESCRIPTION=An advanced suite for testing the randomness of RNGs
 EAPI=7
 HOMEPAGE=https://www.phy.duke.edu/~rgb/General/dieharder.php
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sci-libs/gsl:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.phy.duke.edu/~rgb/General/dieharder/dieharder-3.31.1.tgz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=28be9d393501251888cb5238d84721f1
+_md5_=06c6e8ad262d0aced325749b575bd58e
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.19.2 b/metadata/md5-cache/app-crypt/mit-krb5-1.19.2
new file mode 100644
index 000000000000..3c57bf586e9f
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.19.2
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/yacc cpu_flags_x86_aes? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) ) doc? ( virtual/latex-base ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/tcl:0 dev-util/dejagnu dev-util/cmocka ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd )
+DESCRIPTION=MIT Kerberos V
+EAPI=7
+HOMEPAGE=https://web.mit.edu/kerberos/www/
+IUSE=cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
+RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.19/krb5-1.19.2.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a027e48c9ed599f5f14bcc9d6a3864b7
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.4.1 b/metadata/md5-cache/app-crypt/nitrocli-0.4.1
new file mode 100644
index 000000000000..59fcd78884c2
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.4.1
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=dev-libs/hidapi
+DESCRIPTION=A command line tool for interacting with Nitrokey devices.
+EAPI=8
+HOMEPAGE=https://github.com/d-e-s-o/nitrocli
+IUSE=debug
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Apache-2.0 BSD-2 CC0-1.0 GPL-3+ LGPL-3 MIT
+RDEPEND=dev-libs/hidapi app-crypt/gnupg
+RESTRICT=test
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/anyhow/1.0.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/directories/3.0.2/download -> directories-3.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/envy/0.4.2/download -> envy-0.4.2.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.94/download -> libc-0.2.94.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/merge/0.1.0/download -> merge-0.1.0.crate https://crates.io/api/v1/crates/merge_derive/0.1.0/download -> merge_derive-0.1.0.crate https://crates.io/api/v1/crates/nitrocli/0.4.1/download -> nitrocli-0.4.1.crate https://crates.io/api/v1/crates/nitrokey/0.9.0/download -> nitrokey-0.9.0.crate https://crates.io/api/v1/crates/nitrokey-sys/3.6.0/download -> nitrokey-sys-3.6.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.5.0/download -> nitrokey-test-0.5.0.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/progressing/3.0.2/download -> progressing-3.0.2.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.8/download -> redox_syscall-0.2.8.crate https://crates.io/api/v1/crates/redox_termios/0.1.2/download -> redox_termios-0.1.2.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/serde/1.0.125/download -> serde-1.0.125.crate https://crates.io/api/v1/crates/serde_derive/1.0.125/download -> serde_derive-1.0.125.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/syn/1.0.72/download -> syn-1.0.72.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termion/1.5.6/download -> termion-1.5.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=13c4874bed87f1c372f65e46ea4ddf65
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-4.0.5-r1 b/metadata/md5-cache/app-crypt/yubikey-manager-4.0.5-r1
new file mode 100644
index 000000000000..fa93e4acd0cb
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-4.0.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library and command line tool for configuring a YubiKey
+EAPI=8
+HOMEPAGE=https://developers.yubico.com/yubikey-manager/
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-crypt/ccid dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fido2:0/0.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyscard[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-4.0.5.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1a7833b9db37e2e3268d58e329d6ac95
diff --git a/metadata/md5-cache/app-crypt/yubioath-desktop-5.0.5 b/metadata/md5-cache/app-crypt/yubioath-desktop-5.0.5
new file mode 100644
index 000000000000..ce91ebf77aea
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/yubioath-desktop-5.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-qt/qtcore:5 dev-qt/qtquickcontrols2:5 dev-qt/qtdeclarative:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 x11-libs/libdrm dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Library and tool for personalization of Yubico's YubiKey NEO
+EAPI=7
+HOMEPAGE=https://developers.yubico.com/yubioath-desktop/ https://github.com/Yubico/yubioath-desktop
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-qt/qtcore:5 dev-qt/qtquickcontrols2:5 dev-qt/qtdeclarative:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 x11-libs/libdrm python_single_target_python3_8? ( >=app-crypt/yubikey-manager-4.0.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=app-crypt/yubikey-manager-4.0.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=app-crypt/yubikey-manager-4.0.0[python_targets_python3_10(-)] ) dev-python/pyotherside[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?]
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/Yubico/yubioath-desktop/archive/yubioath-desktop-5.0.5.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=dfe4ee162f9a620fec15927dac6e738e
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 8bf59b2384e7..08eb3bc3d0f0 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.17-r1 b/metadata/md5-cache/app-doc/doxygen-1.8.17-r1
index 01ba1a8e69ca..40044006d5a4 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.17-r1
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.17-r1
@@ -11,5 +11,5 @@ RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libi
 RESTRICT=test
 SLOT=0
 SRC_URI=http://doxygen.nl/files/doxygen-1.8.17.src.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b9e98b3cf55da24f2a816598e7776549
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.20 b/metadata/md5-cache/app-doc/doxygen-1.8.20
index 9ca6dadf4087..ab902e8b2484 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.20
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.20
@@ -11,5 +11,5 @@ RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libi
 RESTRICT=test
 SLOT=0
 SRC_URI=http://doxygen.nl/files/doxygen-1.8.20.src.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e9aefa905ee64d1f3119c037718a3ac6
diff --git a/metadata/md5-cache/app-doc/doxygen-1.9.1 b/metadata/md5-cache/app-doc/doxygen-1.9.1
index 3cdfced65cfd..fd3e90c70174 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.9.1
+++ b/metadata/md5-cache/app-doc/doxygen-1.9.1
@@ -11,5 +11,5 @@ RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libi
 RESTRICT=!doc? ( test )
 SLOT=0
 SRC_URI=http://doxygen.nl/files/doxygen-1.9.1.src.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4ab2f27265686b36cdb2b84702ed34fe
diff --git a/metadata/md5-cache/app-doc/doxygen-9999 b/metadata/md5-cache/app-doc/doxygen-9999
index 8089f8de1b31..b8efd1eb2326 100644
--- a/metadata/md5-cache/app-doc/doxygen-9999
+++ b/metadata/md5-cache/app-doc/doxygen-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-10:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doc? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) doxysearch? ( dev-libs/xapian:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 )
 RESTRICT=!doc? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b09ec03773c658dc9b34306b8bbb13ae
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index c3febd5e421e..396d28ed563e 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/mousepad-0.5.6 b/metadata/md5-cache/app-editors/mousepad-0.5.6
new file mode 100644
index 000000000000..0c89e4d37516
--- /dev/null
+++ b/metadata/md5-cache/app-editors/mousepad-0.5.6
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=dev-libs/glib-2.52 >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0.0:4
+DESCRIPTION=GTK+-based editor for the Xfce Desktop Environment
+EAPI=7
+HOMEPAGE=https://git.xfce.org/apps/mousepad/about/
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.52 >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0.0:4
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/mousepad/0.5/mousepad-0.5.6.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c18b24fdaedfadc6b6bfaf0f1eb79287
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 905c3dfbbd46..428cded07dcd 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713 b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
index e539ec669cb4..ff8ebd98b8e8 100644
--- a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
+++ b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libvterm >=app-editors/emacs-26:*[dynamic-loading] >=app-editor
 SLOT=0
 SRC_URI=https://github.com/akermu/emacs-libvterm/archive/f41849c2c9c1899f22d1c3d4f871ec47c82627ce.tar.gz -> vterm-0.0.1_pre20200713.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6c456abde569f69db8b1fb478d9c6bb3
+_md5_=51f2968bbc9fe9ef9255ec396acb05e8
diff --git a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618 b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618
new file mode 100644
index 000000000000..7d48e9e851fb
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=app-editors/emacs-26:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-libs/libvterm
+DESCRIPTION=Fully-featured terminal emulator based on libvterm
+EAPI=7
+HOMEPAGE=https://github.com/akermu/emacs-libvterm
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/libvterm >=app-editors/emacs-26:*[dynamic-loading] >=app-editors/emacs-26:*
+SLOT=0
+SRC_URI=https://github.com/akermu/emacs-libvterm/archive/d9dfa624679afdd5db6ad25429ef86d3dd91401e.tar.gz -> vterm-0.0.1_pre20210618.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=93472e45029ea47e0ad6653aa57303c4
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 1cef16f6424d..aca92fec06a8 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/distrobuilder-1.2 b/metadata/md5-cache/app-emulation/distrobuilder-1.2
new file mode 100644
index 000000000000..4c0868851bf7
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/distrobuilder-1.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst setup unpack
+DESCRIPTION=System container image builder for LXC and LXD
+EAPI=8
+HOMEPAGE=https://linuxcontainers.org/distrobuilder/introduction/
+IUSE=kernel_linux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-util/debootstrap app-crypt/gnupg sys-fs/squashfs-tools dev-vcs/git net-misc/rsync
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/lxc/distrobuilder/archive/distrobuilder-1.2.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20200113171025-3fe6c5262873.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20200113171025-3fe6c5262873.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210211115548-6eac466e5fa3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210211115548-6eac466e5fa3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7-0.20190325164909-8abdbb8205e4.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7-0.20190325164909-8abdbb8205e4.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.9.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.15.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.15.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.15.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.15.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20201218223536-d3e5debf77da.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20201218223536-d3e5debf77da.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20210227013316-43a75bb4edd3.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20210227013316-43a75bb4edd3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!open!pee!dee!p/depguard/@v/v1.0.0.mod -> github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.mod -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod mirror://goproxy//github.com/antchfx/xpath/@v/v1.1.11.zip -> github.com%2Fantchfx%2Fxpath%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/antchfx/xpath/@v/v1.1.11.mod -> github.com%2Fantchfx%2Fxpath%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/apex/log/@v/v1.1.1.mod -> github.com%2Fapex%2Flog%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/apex/log/@v/v1.9.0.zip -> github.com%2Fapex%2Flog%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/apex/log/@v/v1.9.0.mod -> github.com%2Fapex%2Flog%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/apex/logs/@v/v1.0.0.mod -> github.com%2Fapex%2Flogs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aphistic/golf/@v/v0.0.0-20180712155816-02c07f170c5a.mod -> github.com%2Faphistic%2Fgolf%2F@v%2Fv0.0.0-20180712155816-02c07f170c5a.mod mirror://goproxy//github.com/aphistic/sweet/@v/v0.2.0.mod -> github.com%2Faphistic%2Fsweet%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/aphistic/sweet/@v/v0.3.0.mod -> github.com%2Faphistic%2Fsweet%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.20.6.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.20.6.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.23.21.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.23.21.mod mirror://goproxy//github.com/aybabtme/rgbterm/@v/v0.0.0-20170906152045-cc83f3b3ce59.mod -> github.com%2Faybabtme%2Frgbterm%2F@v%2Fv0.0.0-20170906152045-cc83f3b3ce59.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20160804104726-4c0e84591b9a.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200702112145-1c8d4c9ef775.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20200908144142-dab0cbea06f4.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20200908144142-dab0cbea06f4.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20201003224125-76a6863f2989.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20201003224125-76a6863f2989.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20210316121734-20793ff83c97.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20210316121734-20793ff83c97.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20201111183144-404b9149801e.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20210316141732-918d888fb676.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20210316141732-918d888fb676.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190717030353-c4b9ac5c7601.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190717030353-c4b9ac5c7601.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200710171044-318312a37340.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200824123100-0b889c03f102.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200824123100-0b889c03f102.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20210114181951-8a68de567b68.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.zip mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20210114181951-8a68de567b68.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20181022165439-0650fd9eeb50.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20181022165439-0650fd9eeb50.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.2.10.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.2.10.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20191213020239-082f7e3aed57.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.0-beta.2.0.20200729163537-40b22ef07410.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.0-beta.2.0.20200729163537-40b22ef07410.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.4.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.4.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.4.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.4.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190815185530-f2a389ac0a02.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190815185530-f2a389ac0a02.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20191127005431-f65d91d395eb.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20191127005431-f65d91d395eb.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200228182428-0f16d7a0959c.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200228182428-0f16d7a0959c.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20201208142359-180525291bb7.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20201208142359-180525291bb7.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20210208174643-50096c924a4e.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210208174643-50096c924a4e.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20210315143101-93e15499afd5.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210315143101-93e15499afd5.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20210315143101-93e15499afd5.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210315143101-93e15499afd5.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20180307165137-3d5202aec260.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20180307165137-3d5202aec260.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20200410184934-f15a3290365b.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20201026212402-0724c46b320c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20201026212402-0724c46b320c.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20210316144830-115abcc95a1d.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20210316144830-115abcc95a1d.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20190911050354-e029b79d8cda.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20190911050354-e029b79d8cda.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20201020171139-16b287bc67d0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20201020171139-16b287bc67d0.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.4-0.20210301171431-0ae5c75f59ba.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.4-0.20210301171431-0ae5c75f59ba.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1-0.20210312161619-7ed62a527887.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1-0.20210312161619-7ed62a527887.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20201007170849-eb1350a75164.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20201007170849-eb1350a75164.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20210316161719-dbaa18c31c14.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20210316161719-dbaa18c31c14.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828172938-92c8520ef9f8.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828172938-92c8520ef9f8.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20191028202541-4f1b8fe65a5c.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20191028202541-4f1b8fe65a5c.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190911142611-5eb25027c9fd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190911142611-5eb25027c9fd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20200918131355-0a33824f23a2.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20200918131355-0a33824f23a2.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210301145711-11e8f1707f62.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210301145711-11e8f1707f62.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210315114300-dde8f0fda960.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210315114300-dde8f0fda960.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.0.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.0.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20161114122254-48702e0da86b.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.11.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.11.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.mod -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.mod -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.mod -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.mod -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20171011171712-7484e51bf6af.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20171011171712-7484e51bf6af.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20190905152932-14b96e55d84c.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20190905152932-14b96e55d84c.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20191101170500-ac7306503d23.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20191101170500-ac7306503d23.mod mirror://goproxy//github.com/docker/docker/@v/v20.10.3-0.20210216175712-646072ed6524+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.3-0.20210216175712-646072ed6524+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v20.10.5+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.5+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v20.10.5+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.5+incompatible.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20170721190031-9461782956ad.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20170721190031-9461782956ad.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20160708172513-aabc10ec26b7.zip -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20160708172513-aabc10ec26b7.zip mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20160708172513-aabc10ec26b7.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20160708172513-aabc10ec26b7.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.6.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/flosch/pongo2/@v/v0.0.0-20200913210552-0d938eb266f3.zip -> github.com%2Fflosch%2Fpongo2%2F@v%2Fv0.0.0-20200913210552-0d938eb266f3.zip mirror://goproxy//github.com/flosch/pongo2/@v/v0.0.0-20200913210552-0d938eb266f3.mod -> github.com%2Fflosch%2Fpongo2%2F@v%2Fv0.0.0-20200913210552-0d938eb266f3.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fsouza/go-dockerclient/@v/v1.6.4.mod -> github.com%2Ffsouza%2Fgo-dockerclient%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/fsouza/go-dockerclient/@v/v1.7.2.zip -> github.com%2Ffsouza%2Fgo-dockerclient%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/fsouza/go-dockerclient/@v/v1.7.2.mod -> github.com%2Ffsouza%2Fgo-dockerclient%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.mod -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-critic/go-critic/@v/v0.3.5-0.20190526074819-1df300866540.mod -> github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.3.5-0.20190526074819-1df300866540.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-lintpack/lintpack/@v/v0.5.2.mod -> github.com%2Fgo-lintpack%2Flintpack%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-toolsmith/astcast/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcast%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astcopy/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcopy%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v0.0.0-20180903214952-dcb477bfacd6.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv0.0.0-20180903214952-dcb477bfacd6.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v0.0.0-20180903215011-8f8ee99c3086.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv0.0.0-20180903215011-8f8ee99c3086.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astinfo/@v/v0.0.0-20180906194353-9809ff7efb21.mod -> github.com%2Fgo-toolsmith%2Fastinfo%2F@v%2Fv0.0.0-20180906194353-9809ff7efb21.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v0.0.0-20180903215135-0af7e3c24f30.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv0.0.0-20180903215135-0af7e3c24f30.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v0.0.0-20181119091011-e9e65178eee8.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv0.0.0-20181119091011-e9e65178eee8.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/strparse/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fstrparse%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/typep/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gobuffalo/logger/@v/v1.0.3.zip -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/gobuffalo/logger/@v/v1.0.3.mod -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v1.0.0.zip -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/gobuffalo/packd/@v/v1.0.0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.8.1.zip -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.8.1.zip mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.8.1.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.8.1.mod mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20151105175453-c7fdd8b5cd55.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20151105175453-c7fdd8b5cd55.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.2.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.0.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golangci/check/@v/v0.0.0-20180506172741-cfe4005ccda2.mod -> github.com%2Fgolangci%2Fcheck%2F@v%2Fv0.0.0-20180506172741-cfe4005ccda2.mod mirror://goproxy//github.com/golangci/dupl/@v/v0.0.0-20180902072040-3e9179ac440a.mod -> github.com%2Fgolangci%2Fdupl%2F@v%2Fv0.0.0-20180902072040-3e9179ac440a.mod mirror://goproxy//github.com/golangci/errcheck/@v/v0.0.0-20181223084120-ef45e06d44b6.mod -> github.com%2Fgolangci%2Ferrcheck%2F@v%2Fv0.0.0-20181223084120-ef45e06d44b6.mod mirror://goproxy//github.com/golangci/go-misc/@v/v0.0.0-20180628070357-927a3d87b613.mod -> github.com%2Fgolangci%2Fgo-misc%2F@v%2Fv0.0.0-20180628070357-927a3d87b613.mod mirror://goproxy//github.com/golangci/go-tools/@v/v0.0.0-20190318055746-e32c54105b7c.mod -> github.com%2Fgolangci%2Fgo-tools%2F@v%2Fv0.0.0-20190318055746-e32c54105b7c.mod mirror://goproxy//github.com/golangci/goconst/@v/v0.0.0-20180610141641-041c5f2b40f3.mod -> github.com%2Fgolangci%2Fgoconst%2F@v%2Fv0.0.0-20180610141641-041c5f2b40f3.mod mirror://goproxy//github.com/golangci/gocyclo/@v/v0.0.0-20180528134321-2becd97e67ee.mod -> github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528134321-2becd97e67ee.mod mirror://goproxy//github.com/golangci/gofmt/@v/v0.0.0-20181222123516-0b8337e80d98.mod -> github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20181222123516-0b8337e80d98.mod mirror://goproxy//github.com/golangci/golangci-lint/@v/v1.17.2-0.20190909185456-6163a8a79084.mod -> github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.17.2-0.20190909185456-6163a8a79084.mod mirror://goproxy//github.com/golangci/gosec/@v/v0.0.0-20190211064107-66fb7fc33547.mod -> github.com%2Fgolangci%2Fgosec%2F@v%2Fv0.0.0-20190211064107-66fb7fc33547.mod mirror://goproxy//github.com/golangci/ineffassign/@v/v0.0.0-20190609212857-42439a7714cc.mod -> github.com%2Fgolangci%2Fineffassign%2F@v%2Fv0.0.0-20190609212857-42439a7714cc.mod mirror://goproxy//github.com/golangci/lint-1/@v/v0.0.0-20190420132249-ee948d087217.mod -> github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20190420132249-ee948d087217.mod mirror://goproxy//github.com/golangci/maligned/@v/v0.0.0-20180506175553-b1d89398deca.mod -> github.com%2Fgolangci%2Fmaligned%2F@v%2Fv0.0.0-20180506175553-b1d89398deca.mod mirror://goproxy//github.com/golangci/misspell/@v/v0.0.0-20180809174111-950f5d19e770.mod -> github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.0.0-20180809174111-950f5d19e770.mod mirror://goproxy//github.com/golangci/prealloc/@v/v0.0.0-20180630174525-215b22d4de21.mod -> github.com%2Fgolangci%2Fprealloc%2F@v%2Fv0.0.0-20180630174525-215b22d4de21.mod mirror://goproxy//github.com/golangci/revgrep/@v/v0.0.0-20180526074752-d9c87f5ffaf0.mod -> github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180526074752-d9c87f5ffaf0.mod mirror://goproxy//github.com/golangci/unconvert/@v/v0.0.0-20180507085042-28b1c447d1f4.mod -> github.com%2Fgolangci%2Funconvert%2F@v%2Fv0.0.0-20180507085042-28b1c447d1f4.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.4.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.4.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.0.0-20190318220348-4088753ea4d3.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.0-20190318220348-4088753ea4d3.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20180404174102-ef8a98b0bbce.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20180404174102-ef8a98b0bbce.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/heroku/docker-registry-client/@v/v0.0.0-20181004091502-47ecf50fd8d4.mod -> github.com%2Fheroku%2Fdocker-registry-client%2F@v%2Fv0.0.0-20181004091502-47ecf50fd8d4.mod mirror://goproxy//github.com/heroku/docker-registry-client/@v/v0.0.0-20190909225348-afc9e1acc3d5.zip -> github.com%2Fheroku%2Fdocker-registry-client%2F@v%2Fv0.0.0-20190909225348-afc9e1acc3d5.zip mirror://goproxy//github.com/heroku/docker-registry-client/@v/v0.0.0-20190909225348-afc9e1acc3d5.mod -> github.com%2Fheroku%2Fdocker-registry-client%2F@v%2Fv0.0.0-20190909225348-afc9e1acc3d5.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.10.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.10.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.mod -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/v0.0.0-20180909062703-3050d21c67d7.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.8.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.8.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v0.0.0-20161130080628-0de1eaf82fa3.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv0.0.0-20161130080628-0de1eaf82fa3.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.0.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.1.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.8.3.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.3.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.3.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.12.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.12.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.11.12.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.12.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v0.0.0-20180405133222-e7e905edc00e.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20180405133222-e7e905edc00e.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/klauspost/pgzip/@v/v1.2.1.mod -> github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/klauspost/pgzip/@v/v1.2.5.zip -> github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.5.zip mirror://goproxy//github.com/klauspost/pgzip/@v/v1.2.5.mod -> github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/logrusorgru/aurora/@v/v0.0.0-20181002194514-a7b3b318ed4e.mod -> github.com%2Flogrusorgru%2Faurora%2F@v%2Fv0.0.0-20181002194514-a7b3b318ed4e.mod mirror://goproxy//github.com/lxc/lxd/@v/v0.0.0-20210322210645-afff9e5620d6.zip -> github.com%2Flxc%2Flxd%2F@v%2Fv0.0.0-20210322210645-afff9e5620d6.zip mirror://goproxy//github.com/lxc/lxd/@v/v0.0.0-20210322210645-afff9e5620d6.mod -> github.com%2Flxc%2Flxd%2F@v%2Fv0.0.0-20210322210645-afff9e5620d6.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.7.6.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.7.6.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/markbates/errx/@v/v1.1.0.zip -> github.com%2Fmarkbates%2Ferrx%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/markbates/errx/@v/v1.1.0.mod -> github.com%2Fmarkbates%2Ferrx%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/markbates/oncer/@v/v1.0.0.zip -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/markbates/oncer/@v/v1.0.0.mod -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.zip -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.mod -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mattn/goveralls/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.mod -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20170309133038-4fdf99ab2936.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20180220230111-00c29f56e238.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20180220230111-00c29f56e238.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/moby/sys/mount/@v/v0.2.0.zip -> github.com%2Fmoby%2Fsys%2Fmount%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/moby/sys/mount/@v/v0.2.0.mod -> github.com%2Fmoby%2Fsys%2Fmount%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.0.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.mod -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20201216013528-df9cb8a40635.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20201216013528-df9cb8a40635.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170929034955-c48cc78d4826.zip -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170929034955-c48cc78d4826.zip mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170929034955-c48cc78d4826.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170929034955-c48cc78d4826.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mozilla/tls-observatory/@v/v0.0.0-20180409132520-8791a200eb40.mod -> github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20180409132520-8791a200eb40.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/mudler/docker-companion/@v/v0.4.6-0.20201209184016-2d26fc9143d4.zip -> github.com%2Fmudler%2Fdocker-companion%2F@v%2Fv0.4.6-0.20201209184016-2d26fc9143d4.zip mirror://goproxy//github.com/mudler/docker-companion/@v/v0.4.6-0.20201209184016-2d26fc9143d4.mod -> github.com%2Fmudler%2Fdocker-companion%2F@v%2Fv0.4.6-0.20201209184016-2d26fc9143d4.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20160627004424-a22cb81b2ecd.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20160627004424-a22cb81b2ecd.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20171102151520-eafdab6b0663.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20171102151520-eafdab6b0663.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/open!s!u!s!e/umoci/@v/v0.1.1-0.20191030112807-c0dd46ae078f.mod -> github.com%2Fopen!s!u!s!e%2Fumoci%2F@v%2Fv0.1.1-0.20191030112807-c0dd46ae078f.mod mirror://goproxy//github.com/open!s!u!s!e/umoci/@v/v0.4.5.zip -> github.com%2Fopen!s!u!s!e%2Fumoci%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/open!s!u!s!e/umoci/@v/v0.4.5.mod -> github.com%2Fopen!s!u!s!e%2Fumoci%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20170106003457-a6d0ee40d420.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc93.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc93.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2-0.20190207185410-29686dbc5559.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.6.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.zip -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.1.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180209125602-c332b6f63c06.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20171117100541-99fa1f4be8e5.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180110214958-89604d197083.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/quasilyte/go-consistent/@v/v0.0.0-20190521200055-c6f3937de18c.mod -> github.com%2Fquasilyte%2Fgo-consistent%2F@v%2Fv0.0.0-20190521200055-c6f3937de18c.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.5.2.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.5.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/rootless-containers/proto/@v/v0.1.0.zip -> github.com%2Frootless-containers%2Fproto%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/rootless-containers/proto/@v/v0.1.0.mod -> github.com%2Frootless-containers%2Fproto%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v0.0.0-20170128012129-256dc444b735.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv0.0.0-20170128012129-256dc444b735.mod mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20180427012116-c95755e4bcd7.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20180427012116-c95755e4bcd7.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.5.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.3.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.1.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/smartystreets/go-aws-auth/@v/v0.0.0-20180515143844-0c1422d1fdb9.mod -> github.com%2Fsmartystreets%2Fgo-aws-auth%2F@v%2Fv0.0.0-20180515143844-0c1422d1fdb9.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/smartystreets/gunit/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fgunit%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/gunit/@v/v1.0.4.mod -> github.com%2Fsmartystreets%2Fgunit%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sourcegraph/go-diff/@v/v0.5.1.mod -> github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.2.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.6.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v0.0.0-20180109140146-7c0cea34c8ec.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv0.0.0-20180109140146-7c0cea34c8ec.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.0.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.mod -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.0.0-20180129172003-8a3f7159479f.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20180303142811-b89eecf5ca5d.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20190721030226-87058b9bfcec.mod -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190721030226-87058b9bfcec.mod mirror://goproxy//github.com/tj/assert/@v/v0.0.0-20171129193455-018094318fb0.mod -> github.com%2Ftj%2Fassert%2F@v%2Fv0.0.0-20171129193455-018094318fb0.mod mirror://goproxy//github.com/tj/assert/@v/v0.0.3.zip -> github.com%2Ftj%2Fassert%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/tj/assert/@v/v0.0.3.mod -> github.com%2Ftj%2Fassert%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/tj/go-buffer/@v/v1.1.0.mod -> github.com%2Ftj%2Fgo-buffer%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/tj/go-elastic/@v/v0.0.0-20171221160941-36157cbbebc2.mod -> github.com%2Ftj%2Fgo-elastic%2F@v%2Fv0.0.0-20171221160941-36157cbbebc2.mod mirror://goproxy//github.com/tj/go-kinesis/@v/v0.0.0-20171128231115-08b17f58cb1b.mod -> github.com%2Ftj%2Fgo-kinesis%2F@v%2Fv0.0.0-20171128231115-08b17f58cb1b.mod mirror://goproxy//github.com/tj/go-spin/@v/v1.1.0.mod -> github.com%2Ftj%2Fgo-spin%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ultraware/funlen/@v/v0.0.1.mod -> github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.5.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasthttp/@v/v1.2.0.mod -> github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/valyala/quicktemplate/@v/v1.1.1.mod -> github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/valyala/tcplisten/@v/v0.0.0-20161114210144-ceec8f93295a.mod -> github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod mirror://goproxy//github.com/vbatts/go-mtree/@v/v0.4.4.mod -> github.com%2Fvbatts%2Fgo-mtree%2F@v%2Fv0.4.4.mod mirror://goproxy//github.com/vbatts/go-mtree/@v/v0.5.0.zip -> github.com%2Fvbatts%2Fgo-mtree%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/vbatts/go-mtree/@v/v0.5.0.mod -> github.com%2Fvbatts%2Fgo-mtree%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11-0.20200630133818-d5bec3311243.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.mod -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.16.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.16.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.16.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.16.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181009213950-7c1a557ab941.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190426145343-a29dc8fdc734.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191122220453-ac88ee75c92c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191122220453-ac88ee75c92c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170915142106-8351a756f30f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170915142106-8351a756f30f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180911220305-26e67e76b6c3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180911220305-26e67e76b6c3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190912160710-24e19bdeb0f2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190912160710-24e19bdeb0f2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20171026204733-164713f0dfce.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20171026204733-164713f0dfce.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190522044717-8097e1b27ff5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190522044717-8097e1b27ff5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190812073006-9eafafc0a87e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190812073006-9eafafc0a87e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190913121621-c3b328c6e5a7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190913121621-c3b328c6e5a7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200622214017-ed371f2e16b4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200817155316-9781c653f443.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200817155316-9781c653f443.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200831180312-196b9ba8737a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200909081042-eff7692f9009.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200916030750-2334cc1a136f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916030750-2334cc1a136f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200922070232-aee5d888a860.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200922070232-aee5d888a860.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201202213521-69691e467435.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201202213521-69691e467435.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210216224549-f992740a1bac.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210216224549-f992740a1bac.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201113234701-d7a72108b828.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201113234701-d7a72108b828.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210317153231-de623e64d2a6.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210317153231-de623e64d2a6.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915090833-1cbadb444a80.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915090833-1cbadb444a80.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20170915040203-e531a2a1c15f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20170915040203-e531a2a1c15f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181117154741-2ddaf7f79a09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181117154741-2ddaf7f79a09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190110163146-51295c7ec13a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190110163146-51295c7ec13a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190121143147-24cd39ecf745.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190121143147-24cd39ecf745.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311215038-5c2858a9cfe5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311215038-5c2858a9cfe5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190322203728-c1a832b0ad89.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190322203728-c1a832b0ad89.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190521203540-521d6ed310dd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190521203540-521d6ed310dd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190913181337-0240832f5c3d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190913181337-0240832f5c3d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200308013534-11ec41452d41.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200308013534-11ec41452d41.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190522204451-c2c4e71fbf69.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190522204451-c2c4e71fbf69.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200117163144-32f20d992d24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201110150050-8816d57aaa9a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/antchfx/htmlquery.v1/@v/v1.2.2.zip -> gopkg.in%2Fantchfx%2Fhtmlquery.v1%2F@v%2Fv1.2.2.zip mirror://goproxy//gopkg.in/antchfx/htmlquery.v1/@v/v1.2.2.mod -> gopkg.in%2Fantchfx%2Fhtmlquery.v1%2F@v%2Fv1.2.2.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/flosch/pongo2.v3/@v/v3.0.0-20141028000813-5e81b817a0c4.zip -> gopkg.in%2Fflosch%2Fpongo2.v3%2F@v%2Fv3.0.0-20141028000813-5e81b817a0c4.zip mirror://goproxy//gopkg.in/flosch/pongo2.v3/@v/v3.0.0-20141028000813-5e81b817a0c4.mod -> gopkg.in%2Fflosch%2Fpongo2.v3%2F@v%2Fv3.0.0-20141028000813-5e81b817a0c4.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/robfig/cron.v2/@v/v2.0.0-20150107220207-be2e0b0deed5.zip -> gopkg.in%2Frobfig%2Fcron.v2%2F@v%2Fv2.0.0-20150107220207-be2e0b0deed5.zip mirror://goproxy//gopkg.in/robfig/cron.v2/@v/v2.0.0-20150107220207-be2e0b0deed5.mod -> gopkg.in%2Frobfig%2Fcron.v2%2F@v%2Fv2.0.0-20150107220207-be2e0b0deed5.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200605160147-a5ece683394c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200605160147-a5ece683394c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//k8s.io/api/@v/v0.20.1.mod -> k8s.io%2Fapi%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.20.1.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/apiserver/@v/v0.20.1.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/client-go/@v/v0.20.1.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/component-base/@v/v0.20.1.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/cri-api/@v/v0.17.3.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cri-api/@v/v0.20.1.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//mvdan.cc/interfacer/@v/v0.0.0-20180901003855-c20040233aed.mod -> mvdan.cc%2Finterfacer%2F@v%2Fv0.0.0-20180901003855-c20040233aed.mod mirror://goproxy//mvdan.cc/lint/@v/v0.0.0-20170908181259-adc824a0674b.mod -> mvdan.cc%2Flint%2F@v%2Fv0.0.0-20170908181259-adc824a0674b.mod mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20190209190245-fbb59629db34.mod -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190209190245-fbb59629db34.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.14.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.14.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b1a3f1620aa415ea8a3ee6b1fd8e58ac
diff --git a/metadata/md5-cache/app-emulation/flannel-0.11.0 b/metadata/md5-cache/app-emulation/flannel-0.11.0
index 13720432c182..81a8ad5ecb2f 100644
--- a/metadata/md5-cache/app-emulation/flannel-0.11.0
+++ b/metadata/md5-cache/app-emulation/flannel-0.11.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install prepare test unpack
+DEFINED_PHASES=compile install postinst prepare test unpack
 DEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
 DESCRIPTION=An etcd backed network fabric for containers
 EAPI=6
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coreos/flannel/archive/v0.11.0.tar.gz -> flannel-0.11.0.tar.gz
 _eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=21cb631ba48fc27cc8f05586ee83b917
+_md5_=3a395b581bdbcab92bba52310c27301c
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.0.0-r3 b/metadata/md5-cache/app-emulation/libvirt-7.0.0-r3
index ab8f636fab93..5c843efe26e3 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.0.0-r3
+++ b/metadata/md5-cache/app-emulation/libvirt-7.0.0-r3
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.0.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.0.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.0.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bc5391f3b2b6324a3bfcf6c243ce8730
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=bab91bb21cd9165b3c0af2e41e0b11b3
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.1.0-r1 b/metadata/md5-cache/app-emulation/libvirt-7.1.0-r1
index 1eaa1b12bff5..88408c64d755 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.1.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-7.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.1.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.1.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.1.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=2d202afb794ada23ac836763f4ac6157
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=a37f83bbab3fccfd2310b87e35c7e0d6
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.2.0-r1 b/metadata/md5-cache/app-emulation/libvirt-7.2.0-r1
index 5a82c7d93494..adf088a75dd9 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.2.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-7.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.2.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.2.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.2.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=5f2c325d953e787c57f19fe5803bca9c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=95724c01bac1835f9da25ccc301571c6
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.3.0 b/metadata/md5-cache/app-emulation/libvirt-7.3.0
index 97a77ff7dd06..8b8822b4a294 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.3.0
+++ b/metadata/md5-cache/app-emulation/libvirt-7.3.0
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.3.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.3.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.3.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=f6519aec5e6ba22d5a1ba3dddb818feb
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=c2451c769d0fc4cc2e1838198ee31076
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.4.0 b/metadata/md5-cache/app-emulation/libvirt-7.4.0
index 66403e72b3cf..05bf16d55153 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.4.0
+++ b/metadata/md5-cache/app-emulation/libvirt-7.4.0
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.4.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.4.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.4.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=e916be3bc136f1ecdaa1344848761a7c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=2dee8c302c614f8a63cd96c93cdcb6f5
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.5.0 b/metadata/md5-cache/app-emulation/libvirt-7.5.0
index 5fc8de7a3322..67471041dd66 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.5.0
+++ b/metadata/md5-cache/app-emulation/libvirt-7.5.0
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.5.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.5.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.5.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=11f8d24a41695606e6c1a9430a172258
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=2a80c2e5df614abf6e8c62d0fb7fd62c
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 23e8921e9483..94577ed16e7a 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6,script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) virtual/tmpfiles
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=11f8d24a41695606e6c1a9430a172258
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=2a80c2e5df614abf6e8c62d0fb7fd62c
diff --git a/metadata/md5-cache/app-emulation/lxc-4.0.10 b/metadata/md5-cache/app-emulation/lxc-4.0.10
index cab8de7621a6..d8554b7c0399 100644
--- a/metadata/md5-cache/app-emulation/lxc-4.0.10
+++ b/metadata/md5-cache/app-emulation/lxc-4.0.10
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=acct-group/lxc acct-user/lxc app-misc/pax-utils sys-apps/util-linux sys-libs/libcap virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.10.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-4.0.10.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e546f8fc40e32d9aa745a10a0296131
diff --git a/metadata/md5-cache/app-emulation/lxc-4.0.9-r1 b/metadata/md5-cache/app-emulation/lxc-4.0.9-r1
index 677a79375b73..7fcee7e65e80 100644
--- a/metadata/md5-cache/app-emulation/lxc-4.0.9-r1
+++ b/metadata/md5-cache/app-emulation/lxc-4.0.9-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=acct-group/lxc acct-user/lxc app-misc/pax-utils sys-apps/util-linux sys-libs/libcap sys-libs/libseccomp virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.9.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-4.0.9.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=932827931ea6840cbef1638999cc7b85
diff --git a/metadata/md5-cache/app-emulation/lxc-templates-3.0.4 b/metadata/md5-cache/app-emulation/lxc-templates-3.0.4
index c1042c9d1b58..096b123a3ddb 100644
--- a/metadata/md5-cache/app-emulation/lxc-templates-3.0.4
+++ b/metadata/md5-cache/app-emulation/lxc-templates-3.0.4
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=>=app-emulation/lxc-3.0
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-templates-3.0.4.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-templates-3.0.4.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=0ddf1fe3f8e8401d649a6527a74d1263
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.6-r1 b/metadata/md5-cache/app-emulation/lxd-4.0.6-r1
index 26d96d2507c9..b39aa6fa7c22 100644
--- a/metadata/md5-cache/app-emulation/lxd-4.0.6-r1
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.6-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:* sys-fs/lxcfs sys-fs/squashfs-tools[lzma] virtual/acl
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.6.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.6.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=fc76da6c338016edac3ce2e147bbd6a7
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.7 b/metadata/md5-cache/app-emulation/lxd-4.0.7
index e80833af84fc..0defe8798968 100644
--- a/metadata/md5-cache/app-emulation/lxd-4.0.7
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.7
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft[lz4] >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:* sys-fs/lxcfs sys-fs/squashfs-tools[lzma] virtual/acl
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.7.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.7.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=0e0cf9c4a82d660b7b5731f95b2c5c81
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-6.1.22
index fcb3eb5d447b..60e42b882a46 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.22
@@ -12,4 +12,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.22/VirtualBox-6.1.22.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1224462583c468ce9abc056c64c3dcf2
+_md5_=2f965c66df97e97a4681e33897d2bc40
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.24 b/metadata/md5-cache/app-emulation/virtualbox-6.1.24
index e8d05837ff3f..d2b005f26c52 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.24
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.24
@@ -12,4 +12,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.24/VirtualBox-6.1.24.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7842f423d34c991f09c420cccbd5a740
+_md5_=da05a1c67362d3f3783ded98b392fe82
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.26 b/metadata/md5-cache/app-emulation/virtualbox-6.1.26
new file mode 100644
index 000000000000..1f6f6d9d5e95
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.26
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( >=virtual/jdk-1.8 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.26 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=GPL-2 dtrace? ( CDDL )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.26 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.26/VirtualBox-6.1.26.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b0ebc2737ecb85fc70b6b34981b74856
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.26 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.26
new file mode 100644
index 000000000000..fb3922c0e25b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.26
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
+RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
+RESTRICT=mirror
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.26/VBoxGuestAdditions_6.1.26.iso
+_md5_=9a3ebdc4f46e6d0d0728925a64b6731e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.26 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.26
new file mode 100644
index 000000000000..aa534f197edf
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.26
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=PUEL
+RDEPEND==app-emulation/virtualbox-6.1.26*
+RESTRICT=bindist mirror strip
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.26/Oracle_VM_VirtualBox_Extension_Pack-6.1.26.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.26.tar.gz
+_md5_=dd4ab2845ea226aae4bd27069e0ffac8
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.26 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.26
new file mode 100644
index 000000000000..f567b48861c8
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.26
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=X kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
+RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.26/VirtualBox-6.1.26.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=461efe0d1f7e7c52d3b739d39e645ef7
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.26 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.26
new file mode 100644
index 000000000000..235c1c62c906
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.26
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=pax-kernel kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0/6.1
+SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.26.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ddbe0a12f0704314ed8f71d00594f8fc
diff --git a/metadata/md5-cache/app-emulation/wine-gecko-2.47-r1 b/metadata/md5-cache/app-emulation/wine-gecko-2.47-r1
deleted file mode 100644
index de4c6112e164..000000000000
--- a/metadata/md5-cache/app-emulation/wine-gecko-2.47-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=A Mozilla Gecko based version of Internet Explorer for Wine
-EAPI=6
-HOMEPAGE=https://winehq.org
-IUSE=abi_x86_32 abi_x86_64
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
-SLOT=2.47
-SRC_URI=abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86.msi ) abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86_64.msi )
-_md5_=c6119fd9e087fc92747c343c830fa54c
diff --git a/metadata/md5-cache/app-emulation/wine-gecko-2.47.1 b/metadata/md5-cache/app-emulation/wine-gecko-2.47.1
deleted file mode 100644
index 08624dfac69e..000000000000
--- a/metadata/md5-cache/app-emulation/wine-gecko-2.47.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=A Mozilla Gecko based version of Internet Explorer for Wine
-EAPI=6
-HOMEPAGE=https://winehq.org
-IUSE=abi_x86_32 abi_x86_64
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
-SLOT=2.47.1
-SRC_URI=abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/2.47.1/wine-gecko-2.47.1-x86.msi ) abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/2.47.1/wine-gecko-2.47.1-x86_64.msi )
-_md5_=61051f2ae544261dad0387909bada124
diff --git a/metadata/md5-cache/app-emulation/wine-gecko-2.47.2 b/metadata/md5-cache/app-emulation/wine-gecko-2.47.2
index 6ce1c5330d74..89f972e50ce8 100644
--- a/metadata/md5-cache/app-emulation/wine-gecko-2.47.2
+++ b/metadata/md5-cache/app-emulation/wine-gecko-2.47.2
@@ -3,9 +3,9 @@ DEPEND=!!app-emulation/wine:0
 DESCRIPTION=A Mozilla Gecko based version of Internet Explorer for Wine
 EAPI=6
 HOMEPAGE=https://winehq.org
-IUSE=abi_x86_32 abi_x86_64
+IUSE=abi_x86_32 abi_x86_64 +shared
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
 SLOT=2.47.2
-SRC_URI=abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86.msi ) abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86_64.msi )
-_md5_=6aadeb062d6c7659a8065ac9f824501f
+SRC_URI=!shared? ( abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86.msi ) abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86_64.msi ) ) shared? ( abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86.tar.xz ) abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86_64.tar.xz ) )
+_md5_=ed0d970e9706fa1e63768de4428c2ecb
diff --git a/metadata/md5-cache/app-emulation/wine-mono-5.1.1 b/metadata/md5-cache/app-emulation/wine-mono-5.1.1
index f2aefb935f30..b6e04cd8d665 100644
--- a/metadata/md5-cache/app-emulation/wine-mono-5.1.1
+++ b/metadata/md5-cache/app-emulation/wine-mono-5.1.1
@@ -3,8 +3,9 @@ DEPEND=!!app-emulation/wine:0
 DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
 EAPI=7
 HOMEPAGE=https://www.winehq.org/
+IUSE=+shared
 KEYWORDS=amd64 x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
 SLOT=5.1.1
-SRC_URI=https://dl.winehq.org/wine/wine-mono/5.1.1/wine-mono-5.1.1-x86.msi
-_md5_=1606a22937b2d66f9d07a1d944eb10f2
+SRC_URI=!shared? ( https://dl.winehq.org/wine/wine-mono/5.1.1/wine-mono-5.1.1-x86.msi ) shared? ( https://dl.winehq.org/wine/wine-mono/5.1.1/wine-mono-5.1.1-x86.tar.xz )
+_md5_=2d5268c2ed0689c1afd3a82539cc841d
diff --git a/metadata/md5-cache/app-emulation/wine-mono-6.1.1 b/metadata/md5-cache/app-emulation/wine-mono-6.1.1
deleted file mode 100644
index 1ca5082f75ef..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-6.1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
-EAPI=7
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=6.1.1
-SRC_URI=https://dl.winehq.org/wine/wine-mono/6.1.1/wine-mono-6.1.1-x86.msi
-_md5_=304f1e427ca5128d3db2978a1b69a457
diff --git a/metadata/md5-cache/app-emulation/wine-mono-6.2.0 b/metadata/md5-cache/app-emulation/wine-mono-6.2.0
index c281945ae373..bbef9efc4eac 100644
--- a/metadata/md5-cache/app-emulation/wine-mono-6.2.0
+++ b/metadata/md5-cache/app-emulation/wine-mono-6.2.0
@@ -3,8 +3,9 @@ DEPEND=!!app-emulation/wine:0
 DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
 EAPI=7
 HOMEPAGE=https://www.winehq.org/
+IUSE=+shared
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
 SLOT=6.2.0
-SRC_URI=https://dl.winehq.org/wine/wine-mono/6.2.0/wine-mono-6.2.0-x86.msi
-_md5_=304f1e427ca5128d3db2978a1b69a457
+SRC_URI=!shared? ( https://dl.winehq.org/wine/wine-mono/6.2.0/wine-mono-6.2.0-x86.msi ) shared? ( https://dl.winehq.org/wine/wine-mono/6.2.0/wine-mono-6.2.0-x86.tar.xz )
+_md5_=3bfd44b807f09bbabfd48107859a6589
diff --git a/metadata/md5-cache/app-emulation/wine-mono-6.3.0 b/metadata/md5-cache/app-emulation/wine-mono-6.3.0
new file mode 100644
index 000000000000..00260035f3ec
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-mono-6.3.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=!!app-emulation/wine:0
+DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
+EAPI=7
+HOMEPAGE=https://www.winehq.org/
+IUSE=+shared
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
+SLOT=6.3.0
+SRC_URI=!shared? ( https://dl.winehq.org/wine/wine-mono/6.3.0/wine-mono-6.3.0-x86.msi ) shared? ( https://dl.winehq.org/wine/wine-mono/6.3.0/wine-mono-6.3.0-x86.tar.xz )
+_md5_=3bfd44b807f09bbabfd48107859a6589
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.10 b/metadata/md5-cache/app-emulation/wine-staging-6.10
deleted file mode 100644
index 4df9cc531f87..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-6.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.2.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=6.10
-SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.10.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.10.tar.gz -> wine-staging-6.10.tar.gz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3280e006e3608b1d08f4083aeaabb5ba
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.14 b/metadata/md5-cache/app-emulation/wine-staging-6.14
new file mode 100644
index 000000000000..c7a4db76615b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.14
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.3.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=6.14
+SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.14.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.14.tar.gz -> wine-staging-6.14.tar.gz )
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d753f83aedac07d27411077a1f992566
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index 68d30993ed83..60a6946970fa 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.2.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.3.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6f35a4835c3d11d5375e55139cd5cb2e
+_md5_=d753f83aedac07d27411077a1f992566
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.10 b/metadata/md5-cache/app-emulation/wine-vanilla-6.10
deleted file mode 100644
index 0c6a61cfcfa9..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.2.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=6.10
-SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.10.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b42d6ad3c07fa9ef7e6594f276f82814
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.14 b/metadata/md5-cache/app-emulation/wine-vanilla-6.14
new file mode 100644
index 000000000000..39c9b783865e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.14
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.3.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=6.14
+SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.14.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=89b087f668fbd98dc8dcba34c40cf5fe
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index 7088d6f4aaee..7531f7392f1a 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.2.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.3.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b42d6ad3c07fa9ef7e6594f276f82814
+_md5_=89b087f668fbd98dc8dcba34c40cf5fe
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 656203b9086f..0309d0298413 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-10 b/metadata/md5-cache/app-eselect/eselect-repository-10
deleted file mode 100644
index acd1051825b7..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-repository-10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup
-DESCRIPTION=Manage repos.conf via eselect
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/eselect-repository
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-admin/eselect python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) net-misc/wget
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/eselect-repository/archive/v10.tar.gz -> eselect-repository-10.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=863a0fe917ef0da991296e6935ceafdd
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-11 b/metadata/md5-cache/app-eselect/eselect-repository-11
index 3d937e884faf..c90c95b08797 100644
--- a/metadata/md5-cache/app-eselect/eselect-repository-11
+++ b/metadata/md5-cache/app-eselect/eselect-repository-11
@@ -4,7 +4,7 @@ DESCRIPTION=Manage repos.conf via eselect
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/eselect-repository
 IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-admin/eselect python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) net-misc/wget
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/eselect-repository/archive/v11.tar.gz -> eselect-repository-11.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9ef5df340b12a74a636b7cc21e0939b
+_md5_=422fb97ea40e948edeba395e9847c60c
diff --git a/metadata/md5-cache/app-eselect/eselect-rust-20210703 b/metadata/md5-cache/app-eselect/eselect-rust-20210703
index cc7fcee6d6c7..0840e4b9c83a 100644
--- a/metadata/md5-cache/app-eselect/eselect-rust-20210703
+++ b/metadata/md5-cache/app-eselect/eselect-rust-20210703
@@ -3,9 +3,10 @@ DEFINED_PHASES=postinst prepare
 DESCRIPTION=Eselect module for management of multiple Rust versions
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-rust.git
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/eselect-rust.git/snapshot/eselect-rust-20210703.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d7d4e3d79e8bd3a80fc0d6ddb68c6be9
+_md5_=baf2d16c201e92139ab5a257c21ca885
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 23ead4c01299..2497aaea0a20 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-3.12c-r3 b/metadata/md5-cache/app-forensics/aflplusplus-3.12c-r3
index 05c6eae2c7b5..3360b6009393 100644
--- a/metadata/md5-cache/app-forensics/aflplusplus-3.12c-r3
+++ b/metadata/md5-cache/app-forensics/aflplusplus-3.12c-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/3.12c.tar.gz -> aflplusplus-3.12c.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a70d9f54ce47602d49583607f9b9343
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-3.13c-r1 b/metadata/md5-cache/app-forensics/aflplusplus-3.13c-r1
index 6b5430e00dd8..ae6bfc74ed49 100644
--- a/metadata/md5-cache/app-forensics/aflplusplus-3.13c-r1
+++ b/metadata/md5-cache/app-forensics/aflplusplus-3.13c-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/3.13c.tar.gz -> aflplusplus-3.13c.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d27f18918395a0992fcf4db55176692b
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1 b/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1
index 9b6100da0de9..0eaa7297c096 100644
--- a/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1
+++ b/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/3.14c.tar.gz -> aflplusplus-3.14c.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c3fdb0fbbce3de4a90f2c767d0389f3
diff --git a/metadata/md5-cache/app-forensics/chkrootkit-0.55 b/metadata/md5-cache/app-forensics/chkrootkit-0.55
index 0cc6d5ce29be..f74afff32a2b 100644
--- a/metadata/md5-cache/app-forensics/chkrootkit-0.55
+++ b/metadata/md5-cache/app-forensics/chkrootkit-0.55
@@ -3,10 +3,10 @@ DESCRIPTION=Tool to locally check for signs of a rootkit
 EAPI=7
 HOMEPAGE=http://www.chkrootkit.org/
 IUSE=+cron
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=cron? ( virtual/cron )
 SLOT=0
 SRC_URI=ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-0.55.tar.gz https://dev.gentoo.org/~sam/distfiles/app-forensics/chkrootkit/chkrootkit-0.55-gentoo.patch.bz2
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9377f946cc2dcfed2f9f56624f8f65e9
+_md5_=c5a2241d366687972c952c701a5af403
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 78e0b9f6b70e..0806461a6aa5 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.4 b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.4
deleted file mode 100644
index e99d30fc853d..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=M17N engine for IBus
-EAPI=7
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=gtk gtk2 nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) nls? ( virtual/libintl ) >=dev-db/m17n-db-1.7
-REQUIRED_USE=gtk2? ( gtk )
-SLOT=0
-SRC_URI=https://github.com/ibus/ibus-m17n/releases/download/1.4.4/ibus-m17n-1.4.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d58cd8236cc3adc78bf09f3c2975398f
diff --git a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.5 b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.5
index 4c467c8f0137..a043f421fb84 100644
--- a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.5
+++ b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.5
@@ -1,15 +1,14 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig
 DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=M17N engine for IBus
 EAPI=7
 HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=gtk gtk2 nls
-KEYWORDS=~amd64 ~x86
+IUSE=gtk nls
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) nls? ( virtual/libintl ) >=dev-db/m17n-db-1.7
-REQUIRED_USE=gtk2? ( gtk )
+RDEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) >=dev-db/m17n-db-1.7
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus-m17n/releases/download/1.4.5/ibus-m17n-1.4.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2bdd26f8f06e62f4ac7bb33ffd90bbad
+_md5_=c36017fe723c618c168c05e680461e97
diff --git a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.6 b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.6
new file mode 100644
index 000000000000..5e80af95a5ad
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.6
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=M17N engine for IBus
+EAPI=7
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=gtk nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) >=dev-db/m17n-db-1.7
+SLOT=0
+SRC_URI=https://github.com/ibus/ibus-m17n/releases/download/1.4.6/ibus-m17n-1.4.6.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=caa1f1eb3081e511938175fe94afa1a0
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.12.4 b/metadata/md5-cache/app-i18n/ibus-table-1.12.4
deleted file mode 100644
index 649c909aefef..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-table-1.12.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) virtual/libiconv nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Tables engines for IBus
-EAPI=7
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=nls python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) virtual/libiconv nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.12.4/ibus-table-1.12.4.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f01702679fef5ff589cdcb962fed4e23
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.13.3 b/metadata/md5-cache/app-i18n/ibus-table-1.13.3
index 525263d867ae..64f2f2b8e991 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-1.13.3
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.13.3
@@ -5,7 +5,7 @@ DESCRIPTION=Tables engines for IBus
 EAPI=7
 HOMEPAGE=https://github.com/ibus/ibus/wiki
 IUSE=nls python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) virtual/libiconv nls? ( virtual/libintl )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.13.3/ibus-table-1.13.3.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5282be0289c91995d3ef330d1f53d32d
+_md5_=f01702679fef5ff589cdcb962fed4e23
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.14.0 b/metadata/md5-cache/app-i18n/ibus-table-1.14.0
new file mode 100644
index 000000000000..cd4533438212
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.14.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) virtual/libiconv nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Tables engines for IBus
+EAPI=7
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=nls python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) virtual/libiconv nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.14.0/ibus-table-1.14.0.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5282be0289c91995d3ef330d1f53d32d
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 4b598c021e23..57311b457275 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r1 b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r1
deleted file mode 100644
index 7a94b4fa4f23..000000000000
--- a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=Linux kernel laptop_mode user-space utilities
-EAPI=7
-HOMEPAGE=https://github.com/rickysarraf/laptop-mode-tools/wiki
-IUSE=+acpi apm bluetooth
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/iproute2 sys-apps/ethtool sys-apps/which || ( sys-apps/sdparm sys-apps/hdparm ) acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) bluetooth? ( net-wireless/bluez:= )
-SLOT=0
-SRC_URI=https://github.com/rickysarraf/laptop-mode-tools/releases/download/1.72.2/laptop-mode-tools_1.72.2.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=2b0cc06063457d823b122e40f557e035
diff --git a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r2 b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r2
new file mode 100644
index 000000000000..4ff7fbebb33f
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=Linux kernel laptop_mode user-space utilities
+EAPI=7
+HOMEPAGE=https://github.com/rickysarraf/laptop-mode-tools/wiki
+IUSE=+acpi apm bluetooth
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/iproute2 sys-apps/ethtool sys-apps/which || ( sys-apps/sdparm sys-apps/hdparm ) acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) bluetooth? ( net-wireless/bluez:= ) virtual/tmpfiles
+SLOT=0
+SRC_URI=https://github.com/rickysarraf/laptop-mode-tools/releases/download/1.72.2/laptop-mode-tools_1.72.2.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=0034dbc628cf645827a712e15683b92c
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index dbde69dd89e4..9bfb34283615 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/abook-0.6.1-r3 b/metadata/md5-cache/app-misc/abook-0.6.1-r3
deleted file mode 100644
index 9d8528998666..000000000000
--- a/metadata/md5-cache/app-misc/abook-0.6.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-devel/autoconf-archive virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Abook is a text-based addressbook program designed to use with mutt mail client
-EAPI=6
-HOMEPAGE=http://abook.sourceforge.net/
-IUSE=nls
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:= sys-libs/readline:= dev-libs/libvformat nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=http://abook.sourceforge.net/devel/abook-0.6.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=797811f02ee4292a1d03f39851852951
diff --git a/metadata/md5-cache/app-misc/abook-0.6.1-r4 b/metadata/md5-cache/app-misc/abook-0.6.1-r4
new file mode 100644
index 000000000000..cbdb0e93d0e7
--- /dev/null
+++ b/metadata/md5-cache/app-misc/abook-0.6.1-r4
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure prepare
+DEPEND=sys-libs/ncurses:= sys-libs/readline:= dev-libs/libvformat nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=Abook is a text-based addressbook program designed to use with mutt mail client
+EAPI=7
+HOMEPAGE=http://abook.sourceforge.net/
+IUSE=nls
+KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:= sys-libs/readline:= dev-libs/libvformat nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=http://abook.sourceforge.net/devel/abook-0.6.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8512fca370d957e8ed0315eb2ea87ae2
diff --git a/metadata/md5-cache/app-misc/broot-1.6.1 b/metadata/md5-cache/app-misc/broot-1.6.1
new file mode 100644
index 000000000000..2b43532fcb48
--- /dev/null
+++ b/metadata/md5-cache/app-misc/broot-1.6.1
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A new way to see and navigate directory trees
+EAPI=8
+HOMEPAGE=https://dystroy.org/broot/ https://github.com/Canop/broot
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB
+SLOT=0
+SRC_URI=https://github.com/Canop/broot/archive/v1.6.1.tar.gz -> broot-1.6.1.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/ahash/0.4.7/download -> ahash-0.4.7.crate https://crates.io/api/v1/crates/ahash/0.7.4/download -> ahash-0.7.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_colours/1.0.3/download -> ansi_colours-1.0.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.41/download -> anyhow-1.0.41.crate https://crates.io/api/v1/crates/argh/0.1.4/download -> argh-0.1.4.crate https://crates.io/api/v1/crates/argh_derive/0.1.4/download -> argh_derive-0.1.4.crate https://crates.io/api/v1/crates/argh_shared/0.1.4/download -> argh_shared-0.1.4.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bet/1.0.0/download -> bet-1.0.0.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/bytemuck/1.7.0/download -> bytemuck-1.7.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.68/download -> cc-1.0.68.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/char_reader/0.1.0/download -> char_reader-0.1.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cli-log/0.1.0/download -> cli-log-0.1.0.crate https://crates.io/api/v1/crates/cli-log/2.0.0/download -> cli-log-2.0.0.crate https://crates.io/api/v1/crates/clipboard-win/4.2.1/download -> clipboard-win-4.2.1.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam/0.8.1/download -> crossbeam-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.5/download -> crossbeam-epoch-0.9.5.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.2/download -> crossbeam-queue-0.3.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crossterm/0.19.0/download -> crossterm-0.19.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.7.0/download -> crossterm_winapi-0.7.0.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/csv2svg/0.1.5/download -> csv2svg-0.1.5.crate https://crates.io/api/v1/crates/custom_error/1.9.2/download -> custom_error-1.9.2.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/deser-hjson/1.0.1/download -> deser-hjson-1.0.1.crate https://crates.io/api/v1/crates/directories/3.0.2/download -> directories-3.0.2.crate https://crates.io/api/v1/crates/directories-next/2.0.0/download -> directories-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/error-code/2.3.0/download -> error-code-2.3.0.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/file-size/1.0.3/download -> file-size-1.0.3.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gif/0.11.2/download -> gif-0.11.2.crate https://crates.io/api/v1/crates/git2/0.13.20/download -> git2-0.13.20.crate https://crates.io/api/v1/crates/glassbench/0.3.0/download -> glassbench-0.3.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hashlink/0.6.0/download -> hashlink-0.6.0.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/id-arena/2.2.1/download -> id-arena-2.2.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/image/0.23.14/download -> image-0.23.14.crate https://crates.io/api/v1/crates/indexmap/1.6.2/download -> indexmap-1.6.2.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/is_executable/0.1.2/download -> is_executable-0.1.2.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.22/download -> jobserver-0.1.22.crate https://crates.io/api/v1/crates/jpeg-decoder/0.1.22/download -> jpeg-decoder-0.1.22.crate https://crates.io/api/v1/crates/lazy-regex/2.2.1/download -> lazy-regex-2.2.1.crate https://crates.io/api/v1/crates/lazy-regex-proc_macros/2.2.1/download -> lazy-regex-proc_macros-2.2.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lfs-core/0.3.4/download -> lfs-core-0.3.4.crate https://crates.io/api/v1/crates/libc/0.2.97/download -> libc-0.2.97.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.21+1.1.0/download -> libgit2-sys-0.12.21+1.1.0.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.20.1/download -> libsqlite3-sys-0.20.1.crate https://crates.io/api/v1/crates/libz-sys/1.1.3/download -> libz-sys-1.1.3.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.4/download -> lock_api-0.4.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/minimad/0.7.1/download -> minimad-0.7.1.crate https://crates.io/api/v1/crates/minimad/0.8.0/download -> minimad-0.8.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.13/download -> mio-0.7.13.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/onig/6.2.0/download -> onig-6.2.0.crate https://crates.io/api/v1/crates/onig_sys/69.7.0/download -> onig_sys-69.7.0.crate https://crates.io/api/v1/crates/open/1.7.0/download -> open-1.7.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/pathdiff/0.2.0/download -> pathdiff-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plist/1.1.0/download -> plist-1.1.0.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.27/download -> proc-macro2-1.0.27.crate https://crates.io/api/v1/crates/proc-status/0.1.1/download -> proc-status-0.1.1.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rayon/1.5.1/download -> rayon-1.5.1.crate https://crates.io/api/v1/crates/rayon-core/1.9.1/download -> rayon-core-1.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.9/download -> redox_syscall-0.2.9.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rusqlite/0.24.2/download -> rusqlite-0.24.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/secular/1.0.0/download -> secular-1.0.0.crate https://crates.io/api/v1/crates/serde/1.0.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/siphasher/0.3.5/download -> siphasher-0.3.5.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/splitty/0.1.0/download -> splitty-0.1.0.crate https://crates.io/api/v1/crates/str-buf/1.0.5/download -> str-buf-1.0.5.crate https://crates.io/api/v1/crates/strict/0.1.4/download -> strict-0.1.4.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/svg/0.8.2/download -> svg-0.8.2.crate https://crates.io/api/v1/crates/syn/1.0.73/download -> syn-1.0.73.crate https://crates.io/api/v1/crates/syntect/4.5.0/download -> syntect-4.5.0.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termimad/0.10.3/download -> termimad-0.10.3.crate https://crates.io/api/v1/crates/termimad/0.11.1/download -> termimad-0.11.1.crate https://crates.io/api/v1/crates/terminal-clipboard/0.2.1/download -> terminal-clipboard-0.2.1.crate https://crates.io/api/v1/crates/termux-clipboard/0.1.0/download -> termux-clipboard-0.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.25/download -> thiserror-1.0.25.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.25/download -> thiserror-impl-1.0.25.crate https://crates.io/api/v1/crates/tiff/0.6.1/download -> tiff-0.6.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/umask/1.0.0/download -> umask-1.0.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/weezl/0.1.5/download -> weezl-0.1.5.crate https://crates.io/api/v1/crates/which/4.1.0/download -> which-4.1.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.2/download -> x11-clipboard-0.5.2.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ca39e493ef19894e0d83c582600c9d52
diff --git a/metadata/md5-cache/app-misc/broot-1.6.2 b/metadata/md5-cache/app-misc/broot-1.6.2
new file mode 100644
index 000000000000..66462638c546
--- /dev/null
+++ b/metadata/md5-cache/app-misc/broot-1.6.2
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-libs/zlib
+DESCRIPTION=A new way to see and navigate directory trees
+EAPI=8
+HOMEPAGE=https://dystroy.org/broot/ https://github.com/Canop/broot
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB
+RDEPEND=sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/Canop/broot/archive/v1.6.2.tar.gz -> broot-1.6.2.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/ahash/0.4.7/download -> ahash-0.4.7.crate https://crates.io/api/v1/crates/ahash/0.7.4/download -> ahash-0.7.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_colours/1.0.4/download -> ansi_colours-1.0.4.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.42/download -> anyhow-1.0.42.crate https://crates.io/api/v1/crates/argh/0.1.5/download -> argh-0.1.5.crate https://crates.io/api/v1/crates/argh_derive/0.1.5/download -> argh_derive-0.1.5.crate https://crates.io/api/v1/crates/argh_shared/0.1.5/download -> argh_shared-0.1.5.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bet/1.0.0/download -> bet-1.0.0.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/bytemuck/1.7.2/download -> bytemuck-1.7.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.69/download -> cc-1.0.69.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/char_reader/0.1.0/download -> char_reader-0.1.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cli-log/0.1.0/download -> cli-log-0.1.0.crate https://crates.io/api/v1/crates/cli-log/2.0.0/download -> cli-log-2.0.0.crate https://crates.io/api/v1/crates/clipboard-win/4.2.1/download -> clipboard-win-4.2.1.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam/0.8.1/download -> crossbeam-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.5/download -> crossbeam-epoch-0.9.5.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.2/download -> crossbeam-queue-0.3.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crossterm/0.19.0/download -> crossterm-0.19.0.crate https://crates.io/api/v1/crates/crossterm/0.20.0/download -> crossterm-0.20.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.7.0/download -> crossterm_winapi-0.7.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.8.0/download -> crossterm_winapi-0.8.0.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/csv2svg/0.1.5/download -> csv2svg-0.1.5.crate https://crates.io/api/v1/crates/custom_error/1.9.2/download -> custom_error-1.9.2.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/deser-hjson/1.0.1/download -> deser-hjson-1.0.1.crate https://crates.io/api/v1/crates/directories/3.0.2/download -> directories-3.0.2.crate https://crates.io/api/v1/crates/directories-next/2.0.0/download -> directories-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/error-code/2.3.0/download -> error-code-2.3.0.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/file-size/1.0.3/download -> file-size-1.0.3.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gif/0.11.2/download -> gif-0.11.2.crate https://crates.io/api/v1/crates/git2/0.13.20/download -> git2-0.13.20.crate https://crates.io/api/v1/crates/glassbench/0.3.0/download -> glassbench-0.3.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashlink/0.6.0/download -> hashlink-0.6.0.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/id-arena/2.2.1/download -> id-arena-2.2.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/image/0.23.14/download -> image-0.23.14.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/instant/0.1.10/download -> instant-0.1.10.crate https://crates.io/api/v1/crates/is_executable/0.1.2/download -> is_executable-0.1.2.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.22/download -> jobserver-0.1.22.crate https://crates.io/api/v1/crates/jpeg-decoder/0.1.22/download -> jpeg-decoder-0.1.22.crate https://crates.io/api/v1/crates/lazy-regex/2.2.1/download -> lazy-regex-2.2.1.crate https://crates.io/api/v1/crates/lazy-regex-proc_macros/2.2.1/download -> lazy-regex-proc_macros-2.2.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lfs-core/0.4.2/download -> lfs-core-0.4.2.crate https://crates.io/api/v1/crates/libc/0.2.98/download -> libc-0.2.98.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.21+1.1.0/download -> libgit2-sys-0.12.21+1.1.0.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.20.1/download -> libsqlite3-sys-0.20.1.crate https://crates.io/api/v1/crates/libz-sys/1.1.3/download -> libz-sys-1.1.3.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.4/download -> lock_api-0.4.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/minimad/0.7.1/download -> minimad-0.7.1.crate https://crates.io/api/v1/crates/minimad/0.8.0/download -> minimad-0.8.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.13/download -> mio-0.7.13.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/onig/6.2.0/download -> onig-6.2.0.crate https://crates.io/api/v1/crates/onig_sys/69.7.0/download -> onig_sys-69.7.0.crate https://crates.io/api/v1/crates/open/1.7.1/download -> open-1.7.1.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/pathdiff/0.2.0/download -> pathdiff-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plist/1.2.0/download -> plist-1.2.0.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.28/download -> proc-macro2-1.0.28.crate https://crates.io/api/v1/crates/proc-status/0.1.1/download -> proc-status-0.1.1.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rayon/1.5.1/download -> rayon-1.5.1.crate https://crates.io/api/v1/crates/rayon-core/1.9.1/download -> rayon-core-1.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.9/download -> redox_syscall-0.2.9.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rusqlite/0.24.2/download -> rusqlite-0.24.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/secular/1.0.1/download -> secular-1.0.1.crate https://crates.io/api/v1/crates/serde/1.0.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/serde_json/1.0.66/download -> serde_json-1.0.66.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook/0.3.9/download -> signal-hook-0.3.9.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.1/download -> signal-hook-mio-0.2.1.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/siphasher/0.3.6/download -> siphasher-0.3.6.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/splitty/0.1.0/download -> splitty-0.1.0.crate https://crates.io/api/v1/crates/str-buf/1.0.5/download -> str-buf-1.0.5.crate https://crates.io/api/v1/crates/strict/0.1.4/download -> strict-0.1.4.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/svg/0.8.2/download -> svg-0.8.2.crate https://crates.io/api/v1/crates/syn/1.0.74/download -> syn-1.0.74.crate https://crates.io/api/v1/crates/syntect/4.5.0/download -> syntect-4.5.0.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termimad/0.10.3/download -> termimad-0.10.3.crate https://crates.io/api/v1/crates/termimad/0.14.0/download -> termimad-0.14.0.crate https://crates.io/api/v1/crates/terminal-clipboard/0.2.1/download -> terminal-clipboard-0.2.1.crate https://crates.io/api/v1/crates/termux-clipboard/0.1.0/download -> termux-clipboard-0.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.26/download -> thiserror-1.0.26.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.26/download -> thiserror-impl-1.0.26.crate https://crates.io/api/v1/crates/tiff/0.6.1/download -> tiff-0.6.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.3.1/download -> tinyvec-1.3.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/umask/1.0.0/download -> umask-1.0.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/weezl/0.1.5/download -> weezl-0.1.5.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.2/download -> x11-clipboard-0.5.2.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0ecd64b29aa9bf032cafd5ad2f410687
diff --git a/metadata/md5-cache/app-misc/datefudge-1.24 b/metadata/md5-cache/app-misc/datefudge-1.24
index d80da7dd8396..08d13972fc9f 100644
--- a/metadata/md5-cache/app-misc/datefudge-1.24
+++ b/metadata/md5-cache/app-misc/datefudge-1.24
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A program (and preload library) to fake system date
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/d/datefudge.html
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/datefudge/datefudge_1.24.tar.xz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fe331a3b038eae09334dce23d62e3556
+_md5_=25c9526696d1d7957dd2cd10dfc6f4ea
diff --git a/metadata/md5-cache/app-misc/elasticsearch-6.8.15 b/metadata/md5-cache/app-misc/elasticsearch-6.8.15
index 7053173e63bc..8dcd6e4b0cfc 100644
--- a/metadata/md5-cache/app-misc/elasticsearch-6.8.15
+++ b/metadata/md5-cache/app-misc/elasticsearch-6.8.15
@@ -10,4 +10,4 @@ RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre:1.8 virtual
 SLOT=0
 SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.15.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.8.15.tar.gz )
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2b704023a1759a8460ccc3a95a4d800a
+_md5_=2c4ecd56dd5b7c8aeafff445a805d5ea
diff --git a/metadata/md5-cache/app-misc/elasticsearch-6.8.16 b/metadata/md5-cache/app-misc/elasticsearch-6.8.16
index f0aaab6987bd..ee606dcf37c0 100644
--- a/metadata/md5-cache/app-misc/elasticsearch-6.8.16
+++ b/metadata/md5-cache/app-misc/elasticsearch-6.8.16
@@ -10,4 +10,4 @@ RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre:1.8 virtual
 SLOT=0
 SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.16.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.8.16.tar.gz )
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2b704023a1759a8460ccc3a95a4d800a
+_md5_=2c4ecd56dd5b7c8aeafff445a805d5ea
diff --git a/metadata/md5-cache/app-misc/elasticsearch-6.8.17 b/metadata/md5-cache/app-misc/elasticsearch-6.8.17
new file mode 100644
index 000000000000..b4f4c3212de8
--- /dev/null
+++ b/metadata/md5-cache/app-misc/elasticsearch-6.8.17
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
+EAPI=7
+HOMEPAGE=https://www.elastic.co/products/elasticsearch
+IUSE=x-pack
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )
+RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre:1.8 virtual/tmpfiles
+SLOT=0
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.17.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.8.17.tar.gz )
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2b704023a1759a8460ccc3a95a4d800a
diff --git a/metadata/md5-cache/app-misc/elasticsearch-7.12.0 b/metadata/md5-cache/app-misc/elasticsearch-7.12.0
index 9180a3de830f..be8c6f0dd9c7 100644
--- a/metadata/md5-cache/app-misc/elasticsearch-7.12.0
+++ b/metadata/md5-cache/app-misc/elasticsearch-7.12.0
@@ -9,4 +9,4 @@ RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre virtual/tmp
 SLOT=0
 SRC_URI=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.12.0-no-jdk-linux-x86_64.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a5a17ad81fc2e2d9264da40ca5500126
+_md5_=88cf2502f40b0fa741dc3f70780f88e0
diff --git a/metadata/md5-cache/app-misc/elasticsearch-7.12.1 b/metadata/md5-cache/app-misc/elasticsearch-7.12.1
index fe8fd89e6bde..d034e5c27c19 100644
--- a/metadata/md5-cache/app-misc/elasticsearch-7.12.1
+++ b/metadata/md5-cache/app-misc/elasticsearch-7.12.1
@@ -9,4 +9,4 @@ RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre virtual/tmp
 SLOT=0
 SRC_URI=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.12.1-no-jdk-linux-x86_64.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9495a7b3a0a47c79eeb614ef4854d567
+_md5_=3b5a5929f904bd95d398e4ff2a197c31
diff --git a/metadata/md5-cache/app-misc/elasticsearch-7.13.2 b/metadata/md5-cache/app-misc/elasticsearch-7.13.2
index f7625aa43554..06ac8c154730 100644
--- a/metadata/md5-cache/app-misc/elasticsearch-7.13.2
+++ b/metadata/md5-cache/app-misc/elasticsearch-7.13.2
@@ -9,4 +9,4 @@ RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre virtual/tmp
 SLOT=0
 SRC_URI=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.13.2-no-jdk-linux-x86_64.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9495a7b3a0a47c79eeb614ef4854d567
+_md5_=3b5a5929f904bd95d398e4ff2a197c31
diff --git a/metadata/md5-cache/app-misc/elasticsearch-7.13.4 b/metadata/md5-cache/app-misc/elasticsearch-7.13.4
new file mode 100644
index 000000000000..1a95f12df328
--- /dev/null
+++ b/metadata/md5-cache/app-misc/elasticsearch-7.13.4
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Free and Open, Distributed, RESTful Search Engine
+EAPI=7
+HOMEPAGE=https://www.elastic.co/elasticsearch/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain
+RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre virtual/tmpfiles
+SLOT=0
+SRC_URI=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.13.4-no-jdk-linux-x86_64.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9495a7b3a0a47c79eeb614ef4854d567
diff --git a/metadata/md5-cache/app-misc/fhem-6.0-r1 b/metadata/md5-cache/app-misc/fhem-6.0-r1
index 624633146a07..b50803e90c83 100644
--- a/metadata/md5-cache/app-misc/fhem-6.0-r1
+++ b/metadata/md5-cache/app-misc/fhem-6.0-r1
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile install postinst prepare
 DEPEND=media-gfx/pngcrush
 DESCRIPTION=A GPL'd perl server for house automation
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=acct-group/fhem acct-user/fhem dev-perl/Crypt-CBC dev-perl/Device-Serial
 SLOT=0
 SRC_URI=https://www.fhem.de/fhem-6.0.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=68f5e765cb9f27a5aeba183e638d9af3
+_md5_=d511d0cede03e02756bd9467763f4060
diff --git a/metadata/md5-cache/app-misc/gramps-5.1.4 b/metadata/md5-cache/app-misc/gramps-5.1.4
new file mode 100644
index 000000000000..9b42cdc5067e
--- /dev/null
+++ b/metadata/md5-cache/app-misc/gramps-5.1.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_8(-)] dev-python/pyicu[python_targets_python3_8(-)] berkdb? ( dev-python/bsddb3[python_targets_python3_8(-)] ) exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_8(-),introspection] ) ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_9(-)] dev-python/pyicu[python_targets_python3_9(-)] berkdb? ( dev-python/bsddb3[python_targets_python3_9(-)] ) exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_9(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils reports? ( media-gfx/graphviz[postscript?] ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) python_single_target_python3_8? ( dev-python/jsonschema[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jsonschema[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DESCRIPTION=Community genealogy program aiming to be both intuitive and feature-complete
+EAPI=8
+HOMEPAGE=https://gramps-project.org/
+IUSE=berkdb exif geo postscript +rcs +reports spell test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_8(-)] dev-python/pyicu[python_targets_python3_8(-)] berkdb? ( dev-python/bsddb3[python_targets_python3_8(-)] ) exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_8(-),introspection] ) ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_9(-)] dev-python/pyicu[python_targets_python3_9(-)] berkdb? ( dev-python/bsddb3[python_targets_python3_9(-)] ) exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_9(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils reports? ( media-gfx/graphviz[postscript?] ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gramps-project/gramps/archive/v5.1.4.tar.gz -> gramps-5.1.4.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ecf5d8b5a4be01ccba2ae45869f2ec81
diff --git a/metadata/md5-cache/app-misc/khal-0.10.1-r1 b/metadata/md5-cache/app-misc/khal-0.10.1-r1
deleted file mode 100644
index 334ceedf35f3..000000000000
--- a/metadata/md5-cache/app-misc/khal-0.10.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>dev-python/setuptools_scm-1.12.0[python_targets_python3_8(-)?] dev-python/vdirsyncer[python_targets_python3_8(-)?] dev-python/freezegun[python_targets_python3_8(-)?]
-DESCRIPTION=A CalDAV based calendar
-EAPI=7
-HOMEPAGE=http://lostpackets.de/khal/
-IUSE=zsh-completion python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/click-3.2[python_targets_python3_8(-)?] >=dev-python/click-log-0.2.0[python_targets_python3_8(-)?] >=dev-python/icalendar-4.0.3[python_targets_python3_8(-)?] dev-python/urwid[python_targets_python3_8(-)?] dev-python/pyxdg[python_targets_python3_8(-)?] dev-python/pytz[python_targets_python3_8(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?] dev-python/configobj[python_targets_python3_8(-)?] >=dev-python/atomicwrites-0.1.7[python_targets_python3_8(-)?] >=dev-python/tzlocal-1.0[python_targets_python3_8(-)?] dev-python/setproctitle[python_targets_python3_8(-)?] zsh-completion? ( app-shells/zsh ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/k/khal/khal-0.10.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6277a3587d9fd18b5c20ede0081b89e3
diff --git a/metadata/md5-cache/app-misc/khal-0.10.1-r2 b/metadata/md5-cache/app-misc/khal-0.10.1-r2
new file mode 100644
index 000000000000..278b3cb6da16
--- /dev/null
+++ b/metadata/md5-cache/app-misc/khal-0.10.1-r2
@@ -0,0 +1,14 @@
+BDEPEND=>dev-python/setuptools_scm-1.12.0[python_targets_python3_8(-)?] dev-python/vdirsyncer[python_targets_python3_8(-)?] dev-python/freezegun[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A CalDAV based calendar
+EAPI=7
+HOMEPAGE=http://lostpackets.de/khal/
+IUSE=python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/click-3.2[python_targets_python3_8(-)?] >=dev-python/click-log-0.2.0[python_targets_python3_8(-)?] >=dev-python/icalendar-4.0.3[python_targets_python3_8(-)?] dev-python/urwid[python_targets_python3_8(-)?] dev-python/pyxdg[python_targets_python3_8(-)?] dev-python/pytz[python_targets_python3_8(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?] dev-python/configobj[python_targets_python3_8(-)?] >=dev-python/atomicwrites-0.1.7[python_targets_python3_8(-)?] >=dev-python/tzlocal-1.0[python_targets_python3_8(-)?] dev-python/setproctitle[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/k/khal/khal-0.10.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5ae411fef56c5e0509564cbcbf07503c
diff --git a/metadata/md5-cache/app-misc/khal-0.10.2 b/metadata/md5-cache/app-misc/khal-0.10.2
deleted file mode 100644
index d3a924770c34..000000000000
--- a/metadata/md5-cache/app-misc/khal-0.10.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>dev-python/setuptools_scm-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vdirsyncer[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=A CalDAV based calendar
-EAPI=7
-HOMEPAGE=https://lostpackets.de/khal/
-IUSE=zsh-completion python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click-log[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/icalendar-4.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/urwid-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/atomicwrites-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tzlocal-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setproctitle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] zsh-completion? ( app-shells/zsh ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/k/khal/khal-0.10.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=203b55a92b7fd96e52955dca196a742a
diff --git a/metadata/md5-cache/app-misc/khal-0.10.2-r1 b/metadata/md5-cache/app-misc/khal-0.10.2-r1
new file mode 100644
index 000000000000..d2e77fb72b8d
--- /dev/null
+++ b/metadata/md5-cache/app-misc/khal-0.10.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=>dev-python/setuptools_scm-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vdirsyncer[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A CalDAV based calendar
+EAPI=7
+HOMEPAGE=https://lostpackets.de/khal/
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click-log[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/icalendar-4.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/urwid-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/atomicwrites-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tzlocal-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setproctitle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/k/khal/khal-0.10.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b4b6eea0f3dcf46bbded9af5b7cf7fd3
diff --git a/metadata/md5-cache/app-misc/khard-0.13.0 b/metadata/md5-cache/app-misc/khard-0.13.0
deleted file mode 100644
index d0dcf2e09ed1..000000000000
--- a/metadata/md5-cache/app-misc/khard-0.13.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?] test? ( dev-python/atomicwrites[python_targets_python3_8(-)?] dev-python/configobj[python_targets_python3_8(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?] dev-python/unidecode[python_targets_python3_8(-)?] >dev-python/vobject-0.9.3[python_targets_python3_8(-)?] )
-DESCRIPTION=Console CardDAV client
-EAPI=7
-HOMEPAGE=https://github.com/scheibler/khard
-IUSE=test zsh-completion python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/atomicwrites[python_targets_python3_8(-)?] dev-python/configobj[python_targets_python3_8(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?] dev-python/unidecode[python_targets_python3_8(-)?] >dev-python/vobject-0.9.3[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/k/khard/khard-0.13.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ceda5cda580c0d4ef41b3f9bf6be91e8
diff --git a/metadata/md5-cache/app-misc/khard-0.13.0-r1 b/metadata/md5-cache/app-misc/khard-0.13.0-r1
new file mode 100644
index 000000000000..3eeaa2604505
--- /dev/null
+++ b/metadata/md5-cache/app-misc/khard-0.13.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/atomicwrites[python_targets_python3_8(-)?] dev-python/configobj[python_targets_python3_8(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?] dev-python/unidecode[python_targets_python3_8(-)?] >dev-python/vobject-0.9.3[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Console CardDAV client
+EAPI=7
+HOMEPAGE=https://github.com/scheibler/khard
+IUSE=test python_targets_python3_8
+KEYWORDS=amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/atomicwrites[python_targets_python3_8(-)?] dev-python/configobj[python_targets_python3_8(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?] dev-python/unidecode[python_targets_python3_8(-)?] >dev-python/vobject-0.9.3[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/k/khard/khard-0.13.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=aa355425c2faf974137ea534b6822b60
diff --git a/metadata/md5-cache/app-misc/khard-0.17.0 b/metadata/md5-cache/app-misc/khard-0.17.0
deleted file mode 100644
index fdc1ceabc47f..000000000000
--- a/metadata/md5-cache/app-misc/khard-0.17.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml-clib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Console CardDAV client
-EAPI=7
-HOMEPAGE=https://github.com/scheibler/khard
-IUSE=test zsh-completion python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=GPL-3
-RDEPEND=dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml-clib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/k/khard/khard-0.17.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9c0b59eb37cd8c0bd4e71ed63808e057
diff --git a/metadata/md5-cache/app-misc/khard-0.17.0-r1 b/metadata/md5-cache/app-misc/khard-0.17.0-r1
new file mode 100644
index 000000000000..900799a25a29
--- /dev/null
+++ b/metadata/md5-cache/app-misc/khard-0.17.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml-clib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Console CardDAV client
+EAPI=7
+HOMEPAGE=https://github.com/scheibler/khard
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 arm arm64 x86
+LICENSE=GPL-3
+RDEPEND=dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml-clib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/k/khard/khard-0.17.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dcc1f0a909f65dd9928f0ba21a6576be
diff --git a/metadata/md5-cache/app-misc/livecd-tools-2.10 b/metadata/md5-cache/app-misc/livecd-tools-2.10
new file mode 100644
index 000000000000..04ec59b03f7e
--- /dev/null
+++ b/metadata/md5-cache/app-misc/livecd-tools-2.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=Gentoo LiveCD tools for autoconfiguration of hardware
+EAPI=7
+HOMEPAGE=https://gitweb.gentoo.org/proj/livecd-tools.git/
+IUSE=kernel_linux
+KEYWORDS=~alpha ~amd64 arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-util/dialog media-sound/alsa-utils net-dialup/mingetty sys-apps/openrc sys-apps/pciutils
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/livecd-tools-2.10.tar.bz2
+_eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9928acb8093c34f40cb4ef5d3b4b1c8a
diff --git a/metadata/md5-cache/app-misc/rpick-0.8.2 b/metadata/md5-cache/app-misc/rpick-0.8.2
deleted file mode 100644
index 4d242cdfc652..000000000000
--- a/metadata/md5-cache/app-misc/rpick-0.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=Helps you pick items from a list by various algorithms
-EAPI=7
-HOMEPAGE=https://github.com/bowlofeggs/rpick
-IUSE=debug
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/alga/0.9.3/download -> alga-0.9.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.3.2/download -> approx-0.3.2.crate https://crates.io/api/v1/crates/approx/0.4.0/download -> approx-0.4.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/assert_cmd/1.0.3/download -> assert_cmd-1.0.3.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/bstr/0.2.15/download -> bstr-0.2.15.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.3/download -> crossbeam-utils-0.8.3.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/downcast/0.10.0/download -> downcast-0.10.0.crate https://crates.io/api/v1/crates/dtoa/0.4.7/download -> dtoa-0.4.7.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/fragile/1.0.0/download -> fragile-1.0.0.crate https://crates.io/api/v1/crates/generic-array/0.13.3/download -> generic-array-0.13.3.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.88/download -> libc-0.2.88.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/matrixmultiply/0.2.4/download -> matrixmultiply-0.2.4.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/mockall/0.9.1/download -> mockall-0.9.1.crate https://crates.io/api/v1/crates/mockall_derive/0.9.1/download -> mockall_derive-0.9.1.crate https://crates.io/api/v1/crates/nalgebra/0.19.0/download -> nalgebra-0.19.0.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-complex/0.2.4/download -> num-complex-0.2.4.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.7/download -> predicates-1.0.7.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.2/download -> predicates-tree-1.0.2.crate https://crates.io/api/v1/crates/prettytable-rs/0.8.0/download -> prettytable-rs-0.8.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_distr/0.2.2/download -> rand_distr-0.2.2.crate https://crates.io/api/v1/crates/rand_distr/0.4.0/download -> rand_distr-0.4.0.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/rawpointer/0.2.1/download -> rawpointer-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.4.4/download -> regex-1.4.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.23/download -> regex-syntax-0.6.23.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rpick/0.8.2/download -> rpick-0.8.2.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.124/download -> serde-1.0.124.crate https://crates.io/api/v1/crates/serde_derive/1.0.124/download -> serde_derive-1.0.124.crate https://crates.io/api/v1/crates/serde_yaml/0.8.17/download -> serde_yaml-0.8.17.crate https://crates.io/api/v1/crates/statrs/0.13.0/download -> statrs-0.13.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/syn/1.0.63/download -> syn-1.0.63.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.24/download -> thiserror-1.0.24.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.24/download -> thiserror-impl-1.0.24.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c7e6d80b2d0ef4767cc78468b1fcba98
diff --git a/metadata/md5-cache/app-misc/rpick-0.8.5 b/metadata/md5-cache/app-misc/rpick-0.8.5
new file mode 100644
index 000000000000..915310b4ea5a
--- /dev/null
+++ b/metadata/md5-cache/app-misc/rpick-0.8.5
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Helps you pick items from a list by various algorithms
+EAPI=8
+HOMEPAGE=https://github.com/bowlofeggs/rpick
+IUSE=debug
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.5.0/download -> approx-0.5.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/assert_cmd/1.0.7/download -> assert_cmd-1.0.7.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/downcast/0.10.0/download -> downcast-0.10.0.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/fragile/1.0.0/download -> fragile-1.0.0.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.98/download -> libc-0.2.98.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/matrixmultiply/0.3.1/download -> matrixmultiply-0.3.1.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/mockall/0.10.2/download -> mockall-0.10.2.crate https://crates.io/api/v1/crates/mockall_derive/0.10.2/download -> mockall_derive-0.10.2.crate https://crates.io/api/v1/crates/nalgebra/0.27.1/download -> nalgebra-0.27.1.crate https://crates.io/api/v1/crates/nalgebra-macros/0.1.0/download -> nalgebra-macros-0.1.0.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-complex/0.4.0/download -> num-complex-0.4.0.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-rational/0.4.0/download -> num-rational-0.4.0.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/paste/1.0.5/download -> paste-1.0.5.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.8/download -> predicates-1.0.8.crate https://crates.io/api/v1/crates/predicates/2.0.1/download -> predicates-2.0.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.2/download -> predicates-tree-1.0.2.crate https://crates.io/api/v1/crates/prettytable-rs/0.8.0/download -> prettytable-rs-0.8.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.28/download -> proc-macro2-1.0.28.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_distr/0.4.1/download -> rand_distr-0.4.1.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/rawpointer/0.2.1/download -> rawpointer-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.9/download -> redox_syscall-0.2.9.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rpick/0.8.5/download -> rpick-0.8.5.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/serde_yaml/0.8.17/download -> serde_yaml-0.8.17.crate https://crates.io/api/v1/crates/simba/0.5.1/download -> simba-0.5.1.crate https://crates.io/api/v1/crates/statrs/0.15.0/download -> statrs-0.15.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.22/download -> structopt-0.3.22.crate https://crates.io/api/v1/crates/structopt-derive/0.4.15/download -> structopt-derive-0.4.15.crate https://crates.io/api/v1/crates/syn/1.0.74/download -> syn-1.0.74.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.26/download -> thiserror-1.0.26.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.26/download -> thiserror-impl-1.0.26.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=07eab618afdc07458455eb80dfa0148d
diff --git a/metadata/md5-cache/app-misc/screen-4.8.0-r3 b/metadata/md5-cache/app-misc/screen-4.8.0-r3
index 8fb8b6b431e4..3aac0f9bab46 100644
--- a/metadata/md5-cache/app-misc/screen-4.8.0-r3
+++ b/metadata/md5-cache/app-misc/screen-4.8.0-r3
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.2:0= virtual/libcrypt:= pam? ( sys-libs/pam ) acct-
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.8.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1c547901bbd9b6b176342f2b637e6df3
+_md5_=dee27d483ee37d5f48a656e5f31778c5
diff --git a/metadata/md5-cache/app-misc/screen-9999 b/metadata/md5-cache/app-misc/screen-9999
index 5477efa7e44a..a5ae7de69b4d 100644
--- a/metadata/md5-cache/app-misc/screen-9999
+++ b/metadata/md5-cache/app-misc/screen-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-5.2:0= virtual/libcrypt:= pam? ( sys-libs/pam ) acct-group/utmp selinux? ( sec-policy/selinux-screen ) virtual/tmpfiles
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=87d3616371414f64f3a15ef5f4560404
+_md5_=e6f03698f4aeaac2d6d2d85195ec60a7
diff --git a/metadata/md5-cache/app-misc/tmux-xpanes-4.1.2 b/metadata/md5-cache/app-misc/tmux-xpanes-4.1.2
deleted file mode 100644
index c680042be1f6..000000000000
--- a/metadata/md5-cache/app-misc/tmux-xpanes-4.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0= zsh-completion? ( app-shells/zsh )
-DESCRIPTION=tmux-based terminal divider
-EAPI=7
-HOMEPAGE=https://github.com/greymd/tmux-xpanes
-IUSE=zsh-completion
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0= zsh-completion? ( app-shells/zsh )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/greymd/tmux-xpanes/archive/v4.1.2.tar.gz -> tmux-xpanes-4.1.2.tar.gz
-_md5_=81fe5cb614547959ac728de411b0ebf1
diff --git a/metadata/md5-cache/app-misc/tmux-xpanes-4.1.2-r1 b/metadata/md5-cache/app-misc/tmux-xpanes-4.1.2-r1
new file mode 100644
index 000000000000..095546fda056
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tmux-xpanes-4.1.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=tmux-based terminal divider
+EAPI=7
+HOMEPAGE=https://github.com/greymd/tmux-xpanes
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/greymd/tmux-xpanes/archive/v4.1.2.tar.gz -> tmux-xpanes-4.1.2.tar.gz
+_md5_=460a65951e0a9cd7d358a9c9202b12b2
diff --git a/metadata/md5-cache/app-misc/tmux-xpanes-4.1.3 b/metadata/md5-cache/app-misc/tmux-xpanes-4.1.3
deleted file mode 100644
index 53e8bc264084..000000000000
--- a/metadata/md5-cache/app-misc/tmux-xpanes-4.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0=
-DESCRIPTION=tmux-based terminal divider
-EAPI=7
-HOMEPAGE=https://github.com/greymd/tmux-xpanes
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/greymd/tmux-xpanes/archive/v4.1.3.tar.gz -> tmux-xpanes-4.1.3.tar.gz
-_md5_=4ac39dd7bbee56aea2429f9d5f2dce4c
diff --git a/metadata/md5-cache/app-misc/tmux-xpanes-4.1.3-r1 b/metadata/md5-cache/app-misc/tmux-xpanes-4.1.3-r1
new file mode 100644
index 000000000000..ba0948a87f25
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tmux-xpanes-4.1.3-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=tmux-based terminal divider
+EAPI=7
+HOMEPAGE=https://github.com/greymd/tmux-xpanes
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/greymd/tmux-xpanes/archive/v4.1.3.tar.gz -> tmux-xpanes-4.1.3.tar.gz
+_md5_=22848f312572ff908f7f3b8e5e65bf70
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.7.2-r1 b/metadata/md5-cache/app-misc/tmuxp-1.7.2-r1
index a6467da5e822..a3dc670ca480 100644
--- a/metadata/md5-cache/app-misc/tmuxp-1.7.2-r1
+++ b/metadata/md5-cache/app-misc/tmuxp-1.7.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=tmux session manager. built on libtmux
 EAPI=7
 HOMEPAGE=https://tmuxp.git-pull.com
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=app-misc/tmux-3.0a >=dev-python/kaptan-0.5.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/libtmux-0.8.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/libtmux-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.7.2.tar.gz -> tmuxp-1.7.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c5244067c23ac4b94c1d49a308638d77
+_md5_=bce58de0d5f0333c5150f2ac7555d127
diff --git a/metadata/md5-cache/app-misc/tracker-miners-2.3.5 b/metadata/md5-cache/app-misc/tracker-miners-2.3.5
deleted file mode 100644
index 61dfaf21de6d..000000000000
--- a/metadata/md5-cache/app-misc/tracker-miners-2.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/gdbus-codegen >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( dev-lang/python:3.8 ) gstreamer? ( media-libs/gstreamer:1.0[introspection] || ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-openh264:1.0 ) ) ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.2.0:0= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Collection of data extractors for Tracker/Nepomuk
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-IUSE=cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.2.0:0= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip !>=app-misc/tracker-miners-2.99
-REQUIRED_USE=cue? ( gstreamer )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/tracker-miners/2.3/tracker-miners-2.3.5.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9c77125bbabe1c839396b4c9215aea20
diff --git a/metadata/md5-cache/app-misc/tracker-miners-2.3.5-r1 b/metadata/md5-cache/app-misc/tracker-miners-2.3.5-r1
new file mode 100644
index 000000000000..6bcb9c045120
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tracker-miners-2.3.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils dev-util/gdbus-codegen >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) gstreamer? ( media-libs/gstreamer:1.0[introspection] || ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-openh264:1.0 ) ) ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.2.0:0= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Collection of data extractors for Tracker/Nepomuk
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
+IUSE=cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.2.0:0= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
+REQUIRED_USE=cue? ( gstreamer )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/tracker-miners/2.3/tracker-miners-2.3.5.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=548345f2daba765e72b7683fced115d8
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.4 b/metadata/md5-cache/app-misc/uptimed-0.4.4
new file mode 100644
index 000000000000..6bb0a3ec3bf9
--- /dev/null
+++ b/metadata/md5-cache/app-misc/uptimed-0.4.4
@@ -0,0 +1,14 @@
+BDEPEND=acct-group/uptimed acct-user/uptimed sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/uptimed acct-user/uptimed
+DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
+EAPI=8
+HOMEPAGE=https://github.com/rpodgorny/uptimed/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/uptimed acct-user/uptimed
+SLOT=0
+SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.4.tar.gz -> uptimed-0.4.4.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=617682f6061255d33b0495f59cbe2082
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index 5d5711d86243..74652c3f4cce 100644
--- a/metadata/md5-cache/app-mobilephone/Manifest.gz
+++ b/metadata/md5-cache/app-mobilephone/Manifest.gz
diff --git a/metadata/md5-cache/app-mobilephone/smstools-3.1.21-r2 b/metadata/md5-cache/app-mobilephone/smstools-3.1.21-r2
index b247926ec51f..a19b6eb55652 100644
--- a/metadata/md5-cache/app-mobilephone/smstools-3.1.21-r2
+++ b/metadata/md5-cache/app-mobilephone/smstools-3.1.21-r2
@@ -11,4 +11,4 @@ RDEPEND=acct-group/sms acct-user/smsd sys-process/procps stats? ( dev-libs/mm )
 SLOT=0
 SRC_URI=http://smstools3.kekekasvi.com/packages/smstools3-3.1.21.tar.gz https://dev.gentoo.org/~soap/distfiles/smstools-3.1.21-patches.tgz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dc2b5920ab31fa73651f76e144ea8276
+_md5_=2d324e44de25fbdb81607d3ff18e031f
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 0d9bbb6dc8cb..2c5a8a664022 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/libreoffice-7.1.4.2 b/metadata/md5-cache/app-office/libreoffice-7.1.4.2
deleted file mode 100644
index 04ebfb3dcbd1..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-7.1.4.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) clang? ( || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:11 sys-devel/llvm:11 =sys-devel/lld-11* ) ( sys-devel/clang:10 sys-devel/llvm:10 =sys-devel/lld-10* ) ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/1.5 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core || ( dev-java/openjdk:11 dev-java/openjdk-bin:11 ) ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-IUSE=accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND==app-office/libreoffice-l10n-7.1*
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) clang? ( || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:11 sys-devel/llvm:11 =sys-devel/lld-11* ) ( sys-devel/clang:10 sys-devel/llvm:10 =sys-devel/lld-10* ) ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( || ( dev-java/openjdk:11 dev-java/openjdk-jre-bin:11 >=virtual/jre-1.8 ) ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.1.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.1.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.1.4//libreoffice-7.1.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.1.4//libreoffice-help-7.1.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.1.4.2/src/libreoffice-7.1.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.1.4.2/src/libreoffice-help-7.1.4.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4581ed4b81a90d07a6393175f173f322
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-7.1.4.2 b/metadata/md5-cache/app-office/libreoffice-l10n-7.1.4.2
deleted file mode 100644
index 83a8d6a9a2a5..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-l10n-7.1.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/rpm2targz
-DEFINED_PHASES=compile configure install prepare unpack
-DESCRIPTION=Translations for the Libreoffice suite
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-IUSE=offlinehelp l10n_am l10n_ar l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_lo l10n_lt l10n_lv l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_si l10n_sid l10n_sk l10n_sl l10n_sq l10n_sv l10n_ta l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_as l10n_be l10n_br l10n_brx l10n_ckb l10n_cy l10n_dgo l10n_dsb l10n_fa l10n_fur l10n_fy l10n_ga l10n_gd l10n_gug l10n_hsb l10n_kab l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_rw l10n_sa l10n_sat l10n_sd l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_szl l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_vec l10n_xh l10n_zu
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-RDEPEND=app-text/hunspell
-RESTRICT=strip
-SLOT=0
-SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_am.tar.gz ) ) l10n_ar? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_ar.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ar.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ar.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ko.tar.gz ) ) l10n_lo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_lo.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_lo.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_lo.tar.gz ) ) l10n_lt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_lt.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_lt.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_lt.tar.gz ) ) l10n_lv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_lv.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_lv.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_lv.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_pt.tar.gz ) ) l10n_ro? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_ro.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ro.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ro.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_si.tar.gz ) ) l10n_sid? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_sid.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sid.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sid.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_sv.tar.gz ) ) l10n_ta? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_ta.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ta.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ta.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_am.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ar.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ko.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lv.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pt.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ro.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_si.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sid.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sv.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ta.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_af.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_brx.tar.gz ) l10n_ckb? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ckb.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ckb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ckb.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ckb.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_dgo.tar.gz ) l10n_dsb? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_dsb.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_dsb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_dsb.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_dsb.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fa.tar.gz ) l10n_fur? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_fur.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fur.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fur.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fur.tar.gz ) l10n_fy? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_fy.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fy.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fy.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_fy.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_gug.tar.gz ) l10n_hsb? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_hsb.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hsb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hsb.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_hsb.tar.gz ) l10n_kab? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_kab.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kab.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kab.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kab.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_lb.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sd.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz ) l10n_szl? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_szl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_szl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_szl.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_szl.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_ve.tar.gz ) l10n_vec? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_vec.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_vec.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_vec.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_vec.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/7.1.4/rpm/x86_64/LibreOffice_7.1.4_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.1.4/rpm/x86_64/LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_7.1.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c073c7f0078fb21edfd3b5ac0e53639f
diff --git a/metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1 b/metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1
index caa3a2537132..d88c89234a1f 100644
--- a/metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1
+++ b/metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( app-office/libreoffice[odk] >=app-office/libreoffice-bin-6.4.7.2_p1 ) dev-libs/voikko-fi dev-libs/libvoikko
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/libreoffice-voikko/libreoffice-voikko-5.0.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/libreoffice-voikko/libreoffice-voikko-5.0.tar.gz.asc )
-_eclasses_=verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=771a1e71aecc3d3c90a33cf80a86e3cc
diff --git a/metadata/md5-cache/app-office/skrooge-2.26.1 b/metadata/md5-cache/app-office/skrooge-2.26.1
new file mode 100644
index 000000000000..e3582eb491ee
--- /dev/null
+++ b/metadata/md5-cache/app-office/skrooge-2.26.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/qca-2.3.0:2 dev-db/sqlcipher dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtsql-5.15.2:5= >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 activities? ( >=kde-frameworks/kactivities-5.74.0:5 ) kde? ( >=kde-frameworks/krunner-5.74.0:5 ) ofx? ( dev-libs/libofx:= ) >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Personal finances manager, aiming at being simple and intuitive
+EAPI=7
+HOMEPAGE=https://skrooge.org/
+IUSE=activities kde ofx test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-crypt/qca-2.3.0:2 dev-db/sqlcipher dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtsql-5.15.2:5= >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 activities? ( >=kde-frameworks/kactivities-5.74.0:5 ) kde? ( >=kde-frameworks/krunner-5.74.0:5 ) ofx? ( dev-libs/libofx:= ) >=dev-qt/qtquickcontrols-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/skrooge/skrooge-2.26.1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c85cfcfab21d04fb36e983062d041ec2
diff --git a/metadata/md5-cache/app-office/texmaker-5.0.4 b/metadata/md5-cache/app-office/texmaker-5.0.4
index 17e6514cae5c..016f4d2be4a1 100644
--- a/metadata/md5-cache/app-office/texmaker-5.0.4
+++ b/metadata/md5-cache/app-office/texmaker-5.0.4
@@ -4,10 +4,10 @@ DEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qt
 DESCRIPTION=A nice LaTeX-IDE
 EAPI=7
 HOMEPAGE=https://xm1math.net/texmaker/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=https://xm1math.net/texmaker/texmaker-5.0.4.tar.bz2
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=21c0e461eb0e613c46e88b3a573ab616
+_md5_=d09e85e25573c0bc8cd2a4500679a5e0
diff --git a/metadata/md5-cache/app-office/wps-office-11.1.0.10161-r1 b/metadata/md5-cache/app-office/wps-office-11.1.0.10161-r1
deleted file mode 100644
index 72899f736fe8..000000000000
--- a/metadata/md5-cache/app-office/wps-office-11.1.0.10161-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=WPS Office is an office productivity suite
-EAPI=7
-HOMEPAGE=https://www.wps.cn/product/wpslinux/ http://linux.wps.com/
-KEYWORDS=~amd64
-LICENSE=WPS-EULA
-RDEPEND=app-arch/bzip2:0 app-arch/xz-utils app-arch/lz4 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libbsd dev-libs/libffi:0/7 dev-libs/libgcrypt:0 dev-libs/libgpg-error dev-libs/libpcre:3 dev-libs/nspr dev-libs/nss media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/flac media-libs/libogg media-libs/libsndfile media-libs/libvorbis media-libs/libpng:0 media-sound/pulseaudio net-libs/libasyncns net-print/cups sys-apps/attr sys-apps/util-linux sys-apps/dbus sys-apps/tcp-wrappers sys-libs/libcap sys-libs/zlib:0 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXau x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/libXv x11-libs/libxcb x11-libs/pango virtual/glu
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/wps-office_11.1.0.10161.XA_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=85520ef148a1ef88d56c52f871f71a08
diff --git a/metadata/md5-cache/app-office/wps-office-11.1.0.10161-r2 b/metadata/md5-cache/app-office/wps-office-11.1.0.10161-r2
new file mode 100644
index 000000000000..c73a6bd42f69
--- /dev/null
+++ b/metadata/md5-cache/app-office/wps-office-11.1.0.10161-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=WPS Office is an office productivity suite
+EAPI=7
+HOMEPAGE=https://www.wps.cn/product/wpslinux/ http://linux.wps.com/
+KEYWORDS=~amd64
+LICENSE=WPS-EULA
+RDEPEND=app-arch/bzip2:0 app-arch/xz-utils app-arch/lz4 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libbsd || ( dev-libs/libffi:0/7 dev-libs/libffi-compat:7 ) dev-libs/libgcrypt:0 dev-libs/libgpg-error dev-libs/libpcre:3 dev-libs/nspr dev-libs/nss media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/flac media-libs/libogg media-libs/libsndfile media-libs/libvorbis media-libs/libpng:0 media-sound/pulseaudio net-libs/libasyncns net-print/cups sys-apps/attr sys-apps/util-linux sys-apps/dbus sys-apps/tcp-wrappers sys-libs/libcap sys-libs/zlib:0 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXau x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/libXv x11-libs/libxcb x11-libs/pango virtual/glu
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/wps-office_11.1.0.10161.XA_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b6d0bdbd73fc62734f3681650f45688f
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 7ab3521d8841..383abcd9e6a0 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/eix-0.35.2 b/metadata/md5-cache/app-portage/eix-0.35.2
index c27fcec5aef6..e5cabc3b2cbf 100644
--- a/metadata/md5-cache/app-portage/eix-0.35.2
+++ b/metadata/md5-cache/app-portage/eix-0.35.2
@@ -5,10 +5,10 @@ DESCRIPTION=Search and query ebuilds
 EAPI=7
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug doc nls sqlite
-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
+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
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.35.2/eix-0.35.2.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9d5765c1143b032a7de5f391dbc994f0
+_md5_=a48ef99777dc759f02b27e5e450bff29
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r1 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r1
index 59ce8de5e361..9db5b393a790 100644
--- a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r1
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Wrapper integrating aria2 into portage's FETCHCOMMAND
 EAPI=7
 HOMEPAGE=https://github.com/hartwork/fetchcommandwrapper
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=net-misc/aria2-1.10.2[metalink,xmlrpc] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fetchcommandwrapper/fetchcommandwrapper-0.8.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a5546537136db348ad14948c55b7cf76
+_md5_=4420b609b53b0de00ca14ef2e3bf5e3e
diff --git a/metadata/md5-cache/app-portage/nattka-0.2.18 b/metadata/md5-cache/app-portage/nattka-0.2.18
new file mode 100644
index 000000000000..b1fdbaeb3d4b
--- /dev/null
+++ b/metadata/md5-cache/app-portage/nattka-0.2.18
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/vcrpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( dev-python/sphinx ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/pkgcheck[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] depgraph-order? ( dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A New Arch Tester Toolkit -- open-source stable-bot replacement
+EAPI=8
+HOMEPAGE=https://github.com/mgorny/nattka/
+IUSE=depgraph-order doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD-2
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/pkgcheck[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] depgraph-order? ( dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mgorny/nattka/archive/v0.2.18.tar.gz -> nattka-0.2.18.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ab6e5f942701185c94029c5f1195bc67
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 4a75507967eb..955fd54483ee 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/fbreader-0.99.4-r5 b/metadata/md5-cache/app-text/fbreader-0.99.4-r5
index fdf6c9fe917e..2146a5cee107 100644
--- a/metadata/md5-cache/app-text/fbreader-0.99.4-r5
+++ b/metadata/md5-cache/app-text/fbreader-0.99.4-r5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-db/sqlite dev-libs/expat dev-libs/fribidi dev-libs/libunibreak dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 net-misc/curl sys-libs/zlib
 SLOT=0
 SRC_URI=https://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz https://dev.gentoo.org/~juippis/distfiles/tmp/fbreader-0.99.4-combined.patch
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fafb3fa55975f7264f9b3578088da2a1
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a59e58e85952c7106e2c75ab8bf71d4d
diff --git a/metadata/md5-cache/app-text/highlight-3.57-r100 b/metadata/md5-cache/app-text/highlight-3.57-r100
index c0b9195247aa..64a9416510ec 100644
--- a/metadata/md5-cache/app-text/highlight-3.57-r100
+++ b/metadata/md5-cache/app-text/highlight-3.57-r100
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_t
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-3.57.tar.bz2
 _eclasses_=lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=56db539cba6db05f3e85912241d71c0c
+_md5_=0f25cedcb5b4226d9c1313cdb86a3136
diff --git a/metadata/md5-cache/app-text/highlight-3.60 b/metadata/md5-cache/app-text/highlight-3.60
index f14db962c4c3..5cf3f368f198 100644
--- a/metadata/md5-cache/app-text/highlight-3.60
+++ b/metadata/md5-cache/app-text/highlight-3.60
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_t
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-3.60.tar.bz2
 _eclasses_=lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=56db539cba6db05f3e85912241d71c0c
+_md5_=0f25cedcb5b4226d9c1313cdb86a3136
diff --git a/metadata/md5-cache/app-text/highlight-4.1 b/metadata/md5-cache/app-text/highlight-4.1
index bd0559548b88..8e22b6aa6109 100644
--- a/metadata/md5-cache/app-text/highlight-4.1
+++ b/metadata/md5-cache/app-text/highlight-4.1
@@ -5,11 +5,11 @@ DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with synt
 EAPI=7
 HOMEPAGE=http://www.andre-simon.de/
 IUSE=examples qt5 lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-4.1.tar.bz2
 _eclasses_=lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=56db539cba6db05f3e85912241d71c0c
+_md5_=0fb27388c6f263b3d1df773c6b3d2c69
diff --git a/metadata/md5-cache/app-text/ocrad-0.27 b/metadata/md5-cache/app-text/ocrad-0.27
index 3394fcb02394..f19fe7af5790 100644
--- a/metadata/md5-cache/app-text/ocrad-0.27
+++ b/metadata/md5-cache/app-text/ocrad-0.27
@@ -3,9 +3,9 @@ DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )
 DESCRIPTION=GNU Ocrad is an OCR (Optical Character Recognition) program
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/ocrad/ocrad.html
-KEYWORDS=~alpha ~amd64 ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://nongnu/ocrad/ocrad-0.27.tar.lz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=7c5aebf8f507d9f31118fae9fcb4fc06
+_md5_=92031f23ad13d543b2bbd1a52b071f14
diff --git a/metadata/md5-cache/app-text/poppler-21.07.0 b/metadata/md5-cache/app-text/poppler-21.07.0
index a5b540b34a14..0015bbfe93d0 100644
--- a/metadata/md5-cache/app-text/poppler-21.07.0
+++ b/metadata/md5-cache/app-text/poppler-21.07.0
@@ -5,11 +5,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=7
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/111
 SRC_URI=https://poppler.freedesktop.org/poppler-21.07.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a92045ff6f71305afd22a22f2176e4ee
+_md5_=a826a2657f176e41ff4be1d8bc4e75e7
diff --git a/metadata/md5-cache/app-text/sigil-1.4.3 b/metadata/md5-cache/app-text/sigil-1.4.3
deleted file mode 100644
index 85d46b4811a2..000000000000
--- a/metadata/md5-cache/app-text/sigil-1.4.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/hunspell:= dev-libs/libpcre:3=[pcre16] python_single_target_python3_8? ( dev-python/css-parser[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/css-parser[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cssselect[python_targets_python3_8(-)] dev-python/dulwich[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cssselect[python_targets_python3_9(-)] dev-python/dulwich[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) ) system-mathjax? ( dev-libs/mathjax )
-DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
-EAPI=7
-HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
-IUSE=+plugins system-mathjax python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ Apache-2.0
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/hunspell:= dev-libs/libpcre:3=[pcre16] python_single_target_python3_8? ( dev-python/css-parser[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/css-parser[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cssselect[python_targets_python3_8(-)] dev-python/dulwich[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cssselect[python_targets_python3_9(-)] dev-python/dulwich[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) ) system-mathjax? ( dev-libs/mathjax )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/1.4.3.tar.gz -> sigil-1.4.3.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5b5b0b726e536b9060079ee71afc0322
diff --git a/metadata/md5-cache/app-text/sigil-1.7.0 b/metadata/md5-cache/app-text/sigil-1.7.0
new file mode 100644
index 000000000000..45e311e8debd
--- /dev/null
+++ b/metadata/md5-cache/app-text/sigil-1.7.0
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/hunspell:= dev-libs/libpcre:3=[pcre16] python_single_target_python3_8? ( dev-python/css-parser[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/css-parser[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cssselect[python_targets_python3_8(-)] dev-python/dulwich[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cssselect[python_targets_python3_9(-)] dev-python/dulwich[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) ) system-mathjax? ( dev-libs/mathjax ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
+EAPI=7
+HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
+IUSE=+plugins system-mathjax python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ Apache-2.0
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/hunspell:= dev-libs/libpcre:3=[pcre16] python_single_target_python3_8? ( dev-python/css-parser[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/css-parser[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cssselect[python_targets_python3_8(-)] dev-python/dulwich[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cssselect[python_targets_python3_9(-)] dev-python/dulwich[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) ) system-mathjax? ( dev-libs/mathjax )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/1.7.0.tar.gz -> sigil-1.7.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=560a2cd4f8c9db78ec391812e8529921
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 4d671b1cfa32..23ecdd6992c2 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/nginx-syntax-0.3.3 b/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
index c8a36ecfaab6..a87ce528c787 100644
--- a/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
+++ b/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Nginx configuration files syntax
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1886
-KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 x86 ~amd64-linux
+KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/nginx-syntax-0.3.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/nginx-syntax-0.3.3.tar.bz2
 _eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
-_md5_=c0fae57be6807c1169e1a547c4b9de29
+_md5_=1197378fdf6903d0ef3f8e3bad9e5d5e
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 2c5f74b2f0de..b7cb8a080946 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/catch-2.13.6 b/metadata/md5-cache/dev-cpp/catch-2.13.6
new file mode 100644
index 000000000000..6be5d4d57efb
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/catch-2.13.6
@@ -0,0 +1,13 @@
+BDEPEND=test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Modern C++ header-only framework for unit-tests
+EAPI=7
+HOMEPAGE=https://github.com/catchorg/Catch2
+IUSE=test
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+LICENSE=Boost-1.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/catchorg/Catch2/archive/v2.13.6.tar.gz -> Catch2-2.13.6.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3dcd629b3c49fe0fc941bebae20d8b9d
diff --git a/metadata/md5-cache/dev-cpp/notcurses-2.3.12 b/metadata/md5-cache/dev-cpp/notcurses-2.3.12
new file mode 100644
index 000000000000..0895520db278
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/notcurses-2.3.12
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libunistring media-video/ffmpeg >=sys-libs/readline-8.0 sys-libs/zlib
+DESCRIPTION=Blingful TUIs and character graphics
+EAPI=7
+HOMEPAGE=https://notcurses.com
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/libunistring media-video/ffmpeg >=sys-libs/readline-8.0 sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/dankamongmen/notcurses/archive/v2.3.12.tar.gz -> notcurses-2.3.12.tar.gz https://github.com/dankamongmen/notcurses/releases/download/v2.3.12/notcurses-doc-2.3.12.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=964f510392ea56c7d2e8fd206dcecf9e
diff --git a/metadata/md5-cache/dev-cpp/notcurses-2.3.6 b/metadata/md5-cache/dev-cpp/notcurses-2.3.6
deleted file mode 100644
index 7155cd131db7..000000000000
--- a/metadata/md5-cache/dev-cpp/notcurses-2.3.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libunistring media-video/ffmpeg >=sys-libs/readline-8.0
-DESCRIPTION=Blingful TUIs and character graphics
-EAPI=7
-HOMEPAGE=https://notcurses.com
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/libunistring media-video/ffmpeg >=sys-libs/readline-8.0
-SLOT=0
-SRC_URI=https://github.com/dankamongmen/notcurses/archive/v2.3.6.tar.gz -> notcurses-2.3.6.tar.gz https://github.com/dankamongmen/notcurses/releases/download/v2.3.6/notcurses-doc-2.3.6.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2a43c1de51bdb348bcab03dc1ffa99b3
diff --git a/metadata/md5-cache/dev-cpp/tree-3.17 b/metadata/md5-cache/dev-cpp/tree-3.17
index a278be42064f..76acbd27617f 100644
--- a/metadata/md5-cache/dev-cpp/tree-3.17
+++ b/metadata/md5-cache/dev-cpp/tree-3.17
@@ -4,9 +4,9 @@ DESCRIPTION=An STL-like tree class
 EAPI=7
 HOMEPAGE=https://github.com/kpeeters/tree.hh
 IUSE=doc
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( GPL-2 GPL-3 )
 SLOT=0
 SRC_URI=https://github.com/kpeeters/tree.hh/archive/refs/tags/3.17.tar.gz -> tree-3.17.tar.gz
 _eclasses_=docs	7c38d94fa7c1b4235fe571dc09e018df	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8f0e897db78e6df8caa2376090dafead
+_md5_=f97da3d5b2b8fea86c88ddfc595affc1
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 2743b721c125..8b056a6ed086 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/citus-10.0.4 b/metadata/md5-cache/dev-db/citus-10.0.4
new file mode 100644
index 000000000000..5fa80476a2d8
--- /dev/null
+++ b/metadata/md5-cache/dev-db/citus-10.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) app-arch/lz4 app-arch/zstd
+DESCRIPTION=Open-source postgresql extension for clustering/multi-node setups
+EAPI=7
+HOMEPAGE=https://www.citusdata.com/
+IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11
+KEYWORDS=~amd64
+LICENSE=POSTGRESQL AGPL-3
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) app-arch/lz4 app-arch/zstd
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/citusdata/citus/archive/v10.0.4.tar.gz -> citus-10.0.4.tar.gz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=3388d80b4d1019e9c0357f1fb12a76f7
diff --git a/metadata/md5-cache/dev-db/citus-10.1.0 b/metadata/md5-cache/dev-db/citus-10.1.0
new file mode 100644
index 000000000000..f9f280bf273f
--- /dev/null
+++ b/metadata/md5-cache/dev-db/citus-10.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
+DESCRIPTION=Open-source postgresql extension for clustering/multi-node setups
+EAPI=7
+HOMEPAGE=https://www.citusdata.com/
+IUSE=postgres_targets_postgres13 postgres_targets_postgres12
+KEYWORDS=~amd64
+LICENSE=POSTGRESQL AGPL-3
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/citusdata/citus/archive/v10.1.0.tar.gz -> citus-10.1.0.tar.gz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=c31462be49577232c82d4f0766921cbe
diff --git a/metadata/md5-cache/dev-db/citus-9.5.6 b/metadata/md5-cache/dev-db/citus-9.5.6
new file mode 100644
index 000000000000..684a657a0750
--- /dev/null
+++ b/metadata/md5-cache/dev-db/citus-9.5.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) app-arch/lz4 app-arch/zstd
+DESCRIPTION=Open-source postgresql extension for clustering/multi-node setups
+EAPI=7
+HOMEPAGE=https://www.citusdata.com/
+IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11
+KEYWORDS=~amd64
+LICENSE=POSTGRESQL AGPL-3
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) app-arch/lz4 app-arch/zstd
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/citusdata/citus/archive/v9.5.6.tar.gz -> citus-9.5.6.tar.gz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	postgres	c90f34fec636bb31d36838ad7e11b37b	postgres-multi	45f967e4809b0f1162e4e2c726308439	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=3388d80b4d1019e9c0357f1fb12a76f7
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.23 b/metadata/md5-cache/dev-db/etcd-3.3.23
index bc392ad465d5..3e9649712b0b 100644
--- a/metadata/md5-cache/dev-db/etcd-3.3.23
+++ b/metadata/md5-cache/dev-db/etcd-3.3.23
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/etcd-io/etcd/archive/v3.3.23.tar.gz -> etcd-3.3.23.tar.gz
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2ab2d507892264f93bd6cb688a064f51
+_md5_=40c6294221c15447bf56b8344fac248d
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.24 b/metadata/md5-cache/dev-db/etcd-3.3.24
index 67624ba9323e..23c4d5f75eeb 100644
--- a/metadata/md5-cache/dev-db/etcd-3.3.24
+++ b/metadata/md5-cache/dev-db/etcd-3.3.24
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/etcd-io/etcd/archive/v3.3.24.tar.gz -> etcd-3.3.24.tar.gz
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f26bc1ba3314f1017e2b416c73289cf
+_md5_=1376d12f1d5a9cb726a83312ef323d68
diff --git a/metadata/md5-cache/dev-db/etcd-3.4.10 b/metadata/md5-cache/dev-db/etcd-3.4.10
index d7b87828af6c..1bd9f32199d1 100644
--- a/metadata/md5-cache/dev-db/etcd-3.4.10
+++ b/metadata/md5-cache/dev-db/etcd-3.4.10
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/etcd-io/etcd/archive/v3.4.10.tar.gz -> etcd-3.4.10.tar.gz
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=71e6355cdb2242f599a5807e3d475855
+_md5_=88dd8e5ac92f23b039314bc481ee4d00
diff --git a/metadata/md5-cache/dev-db/etcd-3.4.11 b/metadata/md5-cache/dev-db/etcd-3.4.11
index c64f10c85545..e4d316ffb195 100644
--- a/metadata/md5-cache/dev-db/etcd-3.4.11
+++ b/metadata/md5-cache/dev-db/etcd-3.4.11
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/etcd-io/etcd/archive/v3.4.11.tar.gz -> etcd-3.4.11.tar.gz
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a2022850dfca39427df12336b7cfd5b7
+_md5_=e36cacb75456f4070bb4904b64164932
diff --git a/metadata/md5-cache/dev-db/etcd-3.4.14 b/metadata/md5-cache/dev-db/etcd-3.4.14
index 3cb6c48b6923..f4691032599d 100644
--- a/metadata/md5-cache/dev-db/etcd-3.4.14
+++ b/metadata/md5-cache/dev-db/etcd-3.4.14
@@ -12,4 +12,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/etcd-io/etcd/archive/v3.4.14.tar.gz -> etcd-3.4.14.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.zip mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.zip -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.zip mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6d6bc6c05da7df449b68a418d688f410
+_md5_=e4d5fc22afd1ac6e0b25c8209a1f1da0
diff --git a/metadata/md5-cache/dev-db/libiodbc-3.52.15 b/metadata/md5-cache/dev-db/libiodbc-3.52.15
index 72b8136df954..bbf985f22dc9 100644
--- a/metadata/md5-cache/dev-db/libiodbc-3.52.15
+++ b/metadata/md5-cache/dev-db/libiodbc-3.52.15
@@ -5,10 +5,10 @@ DESCRIPTION=ODBC Interface for Linux
 EAPI=7
 HOMEPAGE=http://www.iodbc.org/
 IUSE=gtk abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( LGPL-2 BSD )
 RDEPEND=gtk? ( x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/openlink/iODBC/archive/v3.52.15.tar.gz -> libiodbc-3.52.15.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2ad701bed8d0abed250b791647be0e3a
+_md5_=1353f91f0254a45f07349ec70b16b83e
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.38-r1 b/metadata/md5-cache/dev-db/mariadb-10.2.38-r1
index 1fdcc8026e5c..bf16fb920b7b 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.38-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.38-r1
@@ -5,7 +5,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !dev-db/mariadb:10.6 !<virtual/mysql-5.6-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.2/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.38/source/mariadb-10.2.38.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.2.38-patches-01.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ebae113e921ef7bb7e2aff6896654c7d
+_md5_=6386d8e6cba03d829591c2ef0af5f094
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.29-r1 b/metadata/md5-cache/dev-db/mariadb-10.3.29-r1
index f88b68a584f2..93ce6dad6b0b 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.29-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.29-r1
@@ -5,7 +5,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !dev-db/mariadb:10.6 !<virtual/mysql-5.6-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.3/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.29/source/mariadb-10.3.29.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.3.29-patches-01.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0a71f060d5dd2bc74e0de33aea3694b2
+_md5_=3ea64483e43df0c0a07bdacf28f78291
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.19-r1 b/metadata/md5-cache/dev-db/mariadb-10.4.19-r1
index 001289597951..f4f20c6ecdbb 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.19-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.19-r1
@@ -5,7 +5,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.5 !dev-db/mariadb:10.6 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.4/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.19/source/mariadb-10.4.19.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.4.19-patches-01.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=75085cf0b8ab8624fd450414124c38e0
+_md5_=e1e6dddbb44cb293d4802feb4ea3da65
diff --git a/metadata/md5-cache/dev-db/mariadb-10.5.10-r1 b/metadata/md5-cache/dev-db/mariadb-10.5.10-r1
index 9a935227e6ec..f34f1323a3ce 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.5.10-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.5.10-r1
@@ -5,7 +5,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://mariadb.org/
 IUSE=+backup bindist columnstore cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc test xml yassl elibc_FreeBSD jdbc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1+
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy dev-libs/boost:0= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.6 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 selinux? ( sec-policy/selinux-mysql ) server? ( columnstore? ( dev-db/mariadb-connector-c ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.5/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.5.10/source/mariadb-10.5.10.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.5.10-patches-01.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cef5f80c61c9802036687fa3ebb89d85
+_md5_=0b22b69f6ed137c01a545978b70e4ed6
diff --git a/metadata/md5-cache/dev-db/opendbx-1.4.6-r3 b/metadata/md5-cache/dev-db/opendbx-1.4.6-r3
index 63fe4bb14484..e487f4f3d2b0 100644
--- a/metadata/md5-cache/dev-db/opendbx-1.4.6-r3
+++ b/metadata/md5-cache/dev-db/opendbx-1.4.6-r3
@@ -12,4 +12,4 @@ RESTRICT=firebird? ( bindist )
 SLOT=0
 SRC_URI=https://www.linuxnetworks.de/opendbx/download/opendbx-1.4.6.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2cba9d6fc8557965a678d78e29d1fb31
+_md5_=932928f36a4c32472f0381bb82f5b883
diff --git a/metadata/md5-cache/dev-db/postgresql-10.17-r1 b/metadata/md5-cache/dev-db/postgresql-10.17-r1
deleted file mode 100644
index a2b513cd00bd..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-10.17-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=10
-SRC_URI=https://ftp.postgresql.org/pub/source/v10.17/postgresql-10.17.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d6b0ea1ef8a89c918ea08f6585b698f8
diff --git a/metadata/md5-cache/dev-db/postgresql-10.17-r2 b/metadata/md5-cache/dev-db/postgresql-10.17-r2
new file mode 100644
index 000000000000..48c81965d966
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-10.17-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libcrypt:= virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc icu kerberos kernel_linux ldap nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libcrypt:= virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+SLOT=10
+SRC_URI=https://ftp.postgresql.org/pub/source/v10.17/postgresql-10.17.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c2098bd21a1bb2f0d8b32b66b9b011b3
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.25-r1 b/metadata/md5-cache/dev-db/postgresql-9.5.25-r1
index 40d84af2b18f..3dd27844d1b5 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.25-r1
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.25-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 SLOT=9.5
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.5.25/postgresql-9.5.25.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c2e12c77e70b374836dda4e20e5368e2
+_md5_=798e1f41777991739515ecd064816d5f
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.22-r1 b/metadata/md5-cache/dev-db/postgresql-9.6.22-r1
deleted file mode 100644
index aa0e9f481a0d..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-9.6.22-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap nls pam perl pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=9.6
-SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.22/postgresql-9.6.22.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=af080e7dbf5f3d16e73b7347d9aee3ca
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.22-r2 b/metadata/md5-cache/dev-db/postgresql-9.6.22-r2
new file mode 100644
index 000000000000..811a17dd54d3
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.22-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libcrypt:= virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc kerberos kernel_linux ldap nls pam perl pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libcrypt:= virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=9.6
+SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.22/postgresql-9.6.22.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=58f15153ec1bbb10eb4b253b036979a8
diff --git a/metadata/md5-cache/dev-db/redis-5.0.12 b/metadata/md5-cache/dev-db/redis-5.0.12
index 8dbf9d526d97..6296f2b6116c 100644
--- a/metadata/md5-cache/dev-db/redis-5.0.12
+++ b/metadata/md5-cache/dev-db/redis-5.0.12
@@ -1,5 +1,5 @@
 BDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:5.1 ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:5.1 ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) test? ( dev-lang/tcl:0= )
 DESCRIPTION=A persistent caching system, key-value and data structures database
 EAPI=7
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-5.0.12.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0dc2c99db37f7982ecda2360ed8ca53e
+_md5_=292572687af8de9133b460cc0e92935b
diff --git a/metadata/md5-cache/dev-db/redis-5.0.13 b/metadata/md5-cache/dev-db/redis-5.0.13
index 0c63a0246c2c..f4b6f631ed95 100644
--- a/metadata/md5-cache/dev-db/redis-5.0.13
+++ b/metadata/md5-cache/dev-db/redis-5.0.13
@@ -1,5 +1,5 @@
 BDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:5.1 ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:5.1 ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) test? ( dev-lang/tcl:0= )
 DESCRIPTION=A persistent caching system, key-value and data structures database
 EAPI=7
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-5.0.13.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0dc2c99db37f7982ecda2360ed8ca53e
+_md5_=292572687af8de9133b460cc0e92935b
diff --git a/metadata/md5-cache/dev-db/redis-6.0.14 b/metadata/md5-cache/dev-db/redis-6.0.14
index 7a1f3deaeb08..21cf2b7590db 100644
--- a/metadata/md5-cache/dev-db/redis-6.0.14
+++ b/metadata/md5-cache/dev-db/redis-6.0.14
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.0.14.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5f7a1d24f9c230497c482ba5d1cd425f
+_md5_=7dc067b9befe6b81124e774271daf86e
diff --git a/metadata/md5-cache/dev-db/redis-6.0.15 b/metadata/md5-cache/dev-db/redis-6.0.15
index 7c12cf42d878..6821c499cf9d 100644
--- a/metadata/md5-cache/dev-db/redis-6.0.15
+++ b/metadata/md5-cache/dev-db/redis-6.0.15
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.0.15.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5f7a1d24f9c230497c482ba5d1cd425f
+_md5_=7dc067b9befe6b81124e774271daf86e
diff --git a/metadata/md5-cache/dev-db/redis-6.2.4 b/metadata/md5-cache/dev-db/redis-6.2.4
index 80fcfbda3b67..a417a05d71dc 100644
--- a/metadata/md5-cache/dev-db/redis-6.2.4
+++ b/metadata/md5-cache/dev-db/redis-6.2.4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.2.4.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f0ef90542d047eb3d9aacfb46a59880e
+_md5_=b28062c9ca3bf1fb1257c0eda4142942
diff --git a/metadata/md5-cache/dev-db/redis-6.2.5 b/metadata/md5-cache/dev-db/redis-6.2.5
index 23a6adf4fde7..505780088188 100644
--- a/metadata/md5-cache/dev-db/redis-6.2.5
+++ b/metadata/md5-cache/dev-db/redis-6.2.5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.2.5.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=783e096ac1e949fef081b84bd0c9ad1a
+_md5_=ec505f27e99dbe5bb73fd4e419fb7a0f
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index fb22a3fa4633..eff536a5a7ad 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/avarice-2.14 b/metadata/md5-cache/dev-embedded/avarice-2.14
index 1a9014b6a8ea..021c6467d472 100644
--- a/metadata/md5-cache/dev-embedded/avarice-2.14
+++ b/metadata/md5-cache/dev-embedded/avarice-2.14
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=configure install
 DESCRIPTION=Interface for GDB to Atmel AVR JTAGICE in circuit emulator
 EAPI=7
 HOMEPAGE=http://avarice.sourceforge.net/
@@ -6,4 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/avarice/avarice-2.14.tar.bz2
-_md5_=54bbed874528bebb1bf73ae40e9c19f5
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c9dd4b5f2b974daa685d0e87abcbdbf3
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 78656a43c2a7..b960baff3de7 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r100 b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r100
deleted file mode 100644
index 4d2765aeef24..000000000000
--- a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) >=dev-libs/boost-1.37.0:* x11-base/xorg-proto
-DESCRIPTION=Open source high performance 3D graphics toolkit
-EAPI=7
-HOMEPAGE=http://www.openscenegraph.org/
-IUSE=curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib lua_single_target_lua5-1 lua_single_target_lua5-2
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=wxWinLL-3 LGPL-2.1
-RDEPEND=media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) openexr? ( zlib ) sdl2? ( sdl )
-SLOT=0/161
-SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0a61120bb66b92cfee187c5b7cad8ca0
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101 b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101
new file mode 100644
index 000000000000..e80c869bc137
--- /dev/null
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) >=dev-libs/boost-1.37.0:* x11-base/xorg-proto
+DESCRIPTION=Open source high performance 3D graphics toolkit
+EAPI=7
+HOMEPAGE=http://www.openscenegraph.org/
+IUSE=curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib lua_single_target_lua5-1 lua_single_target_lua5-2
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
+LICENSE=wxWinLL-3 LGPL-2.1
+RDEPEND=media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) openexr? ( zlib ) sdl2? ( sdl )
+SLOT=0/161
+SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f7eb92f2ed3e38c025a6232e4a764368
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110 b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110
new file mode 100644
index 000000000000..fc41e7acca97
--- /dev/null
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) dev-libs/boost x11-base/xorg-proto
+DESCRIPTION=Open source high performance 3D graphics toolkit
+EAPI=7
+HOMEPAGE=http://www.openscenegraph.org/
+IUSE=collada curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib +lua_single_target_lua5-1
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=wxWinLL-3 LGPL-2.1
+RDEPEND=media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) openexr? ( zlib ) sdl2? ( sdl )
+SLOT=0/161
+SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d00be8554c8c73905694da706b060093
diff --git a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r100 b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r100
deleted file mode 100644
index 3b64ab9b1159..000000000000
--- a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!dev-games/openscenegraph media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) x11-base/xorg-proto
-DESCRIPTION=OpenMW-specific fork of OpenSceneGraph
-EAPI=7
-HOMEPAGE=https://github.com/OpenMW/osg
-IUSE=curl debug doc examples egl ffmpeg fltk fox gdal gif glut gstreamer jpeg lua openexr openinventor osgapps pdf png qt5 sdl sdl2 svg tiff truetype vnc wxwidgets xine xrandr zlib lua_single_target_lua5-1 lua_single_target_lua5-2
-KEYWORDS=~amd64 ~x86
-LICENSE=wxWinLL-3 LGPL-2.1
-RDEPEND=!dev-games/openscenegraph media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) sdl2? ( sdl ) openexr? ( zlib )
-SLOT=0/132
-SRC_URI=https://github.com/OpenMW/osg/archive/8b07809fa674ecffe77338aaea2e223b3aadff0e.tar.gz -> openscenegraph-openmw-3.4_p20200425.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f5109c5ce72b0aae7a6389844db4c10c
diff --git a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r101 b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r101
new file mode 100644
index 000000000000..ee8832ec0e81
--- /dev/null
+++ b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r101
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!dev-games/openscenegraph media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) x11-base/xorg-proto
+DESCRIPTION=OpenMW-specific fork of OpenSceneGraph
+EAPI=7
+HOMEPAGE=https://github.com/OpenMW/osg
+IUSE=curl debug doc examples egl ffmpeg fltk fox gdal gif glut gstreamer jpeg lua openexr openinventor osgapps pdf png qt5 sdl sdl2 svg tiff truetype vnc wxwidgets xine xrandr zlib lua_single_target_lua5-1 lua_single_target_lua5-2
+KEYWORDS=~amd64 ~x86
+LICENSE=wxWinLL-3 LGPL-2.1
+RDEPEND=!dev-games/openscenegraph media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) sdl2? ( sdl ) openexr? ( zlib )
+SLOT=0/132
+SRC_URI=https://github.com/OpenMW/osg/archive/8b07809fa674ecffe77338aaea2e223b3aadff0e.tar.gz -> openscenegraph-openmw-3.4_p20200425.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e4b1f0d405bc67e144239f847af916a7
diff --git a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20210610 b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20210610
new file mode 100644
index 000000000000..1e32931837bb
--- /dev/null
+++ b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20210610
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!dev-games/openscenegraph media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) dev-libs/boost x11-base/xorg-proto
+DESCRIPTION=OpenMW-specific fork of OpenSceneGraph
+EAPI=7
+HOMEPAGE=https://github.com/OpenMW/osg
+IUSE=collada curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib +lua_single_target_lua5-1
+KEYWORDS=~amd64 ~x86
+LICENSE=wxWinLL-3 LGPL-2.1
+RDEPEND=!dev-games/openscenegraph media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) openexr? ( zlib ) sdl2? ( sdl )
+SLOT=0/162
+SRC_URI=https://github.com/OpenMW/osg/archive/b02abe200c4847e73b887b064a89ea1758a5b733.tar.gz -> openscenegraph-openmw-3.6_p20210610.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c5125660b032484b602f5a0aae3da63a
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index e8a67b046765..3a264f60d52a 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/haskell-platform-2014.2.0.0-r1 b/metadata/md5-cache/dev-haskell/haskell-platform-2014.2.0.0-r1
deleted file mode 100644
index 825d25c7da2d..000000000000
--- a/metadata/md5-cache/dev-haskell/haskell-platform-2014.2.0.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DEPEND=>=dev-haskell/cabal-1.18.1.3 >=dev-haskell/xhtml-3000.2.1 >=dev-haskell/async-2.0.1.5 >=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/case-insensitive-1.1.0.3:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] >=dev-haskell/hashable-1.2.2.0:=[profile?] >=dev-haskell/haskell-src-1.0.1.6:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] >=dev-haskell/http-4000.2.10:=[profile?] >=dev-haskell/hunit-1.2.5.2:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] >=dev-haskell/network-2.4.2.3:=[profile?] >=dev-haskell/parallel-3.2.0.4:=[profile?] >=dev-haskell/parsec-3.1.5:=[profile?] >=dev-haskell/primitive-0.5.2.1:=[profile?] >=dev-haskell/quickcheck-2.6:2=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] >=dev-haskell/regex-base-0.93.2:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] >=dev-haskell/regex-posix-0.95.2:=[profile?] >=dev-haskell/split-0.2.2:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/syb-0.4.1:=[profile?] >=dev-haskell/text-1.1.0.0:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-haskell/unordered-containers-0.2.4.0:=[profile?] >=dev-haskell/vector-0.10.9.1:=[profile?] >=dev-haskell/xhtml-3000.2.1:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] X? ( >=dev-haskell/gluraw-1.4.0.1:=[profile?] >=dev-haskell/glut-2.5.1.1:=[profile?] >=dev-haskell/opengl-2.9.2.0:=[profile?] >=dev-haskell/openglraw-1.5.0.0:=[profile?] ) >=dev-lang/ghc-7.8.3:= >=dev-haskell/alex-3.1.3 >=dev-haskell/cabal-install-1.18.0.5 >=dev-haskell/happy-1.19.4 >=dev-haskell/hscolour-1.20.3 doc? ( >=dev-haskell/haddock-2.14.2 )
-DESCRIPTION=The Haskell Platform
-EAPI=7
-HOMEPAGE=http://haskell.org/platform
-IUSE=+doc profile +X
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/cabal-1.18.1.3 >=dev-haskell/xhtml-3000.2.1 >=dev-haskell/async-2.0.1.5 >=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/case-insensitive-1.1.0.3:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] >=dev-haskell/hashable-1.2.2.0:=[profile?] >=dev-haskell/haskell-src-1.0.1.6:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] >=dev-haskell/http-4000.2.10:=[profile?] >=dev-haskell/hunit-1.2.5.2:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] >=dev-haskell/network-2.4.2.3:=[profile?] >=dev-haskell/parallel-3.2.0.4:=[profile?] >=dev-haskell/parsec-3.1.5:=[profile?] >=dev-haskell/primitive-0.5.2.1:=[profile?] >=dev-haskell/quickcheck-2.6:2=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] >=dev-haskell/regex-base-0.93.2:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] >=dev-haskell/regex-posix-0.95.2:=[profile?] >=dev-haskell/split-0.2.2:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/syb-0.4.1:=[profile?] >=dev-haskell/text-1.1.0.0:=[profile?] >=dev-haskell/transformers-0.3.0.0:=[profile?] >=dev-haskell/unordered-containers-0.2.4.0:=[profile?] >=dev-haskell/vector-0.10.9.1:=[profile?] >=dev-haskell/xhtml-3000.2.1:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] X? ( >=dev-haskell/gluraw-1.4.0.1:=[profile?] >=dev-haskell/glut-2.5.1.1:=[profile?] >=dev-haskell/opengl-2.9.2.0:=[profile?] >=dev-haskell/openglraw-1.5.0.0:=[profile?] ) >=dev-lang/ghc-7.8.3:= >=dev-haskell/alex-3.1.3 >=dev-haskell/cabal-install-1.18.0.5 >=dev-haskell/happy-1.19.4 >=dev-haskell/hscolour-1.20.3 doc? ( >=dev-haskell/haddock-2.14.2 )
-SLOT=0/2014.2.0.0
-_md5_=c2ca32d31fdfaf9139ab99d03c656c82
diff --git a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1 b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1
index e8f9b01e92f5..1605e258b521 100644
--- a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1
+++ b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/1.0.3.1
 SRC_URI=https://hackage.haskell.org/package/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ac88ca4bbeba76b204d4d350b76ef620
+_md5_=10d998c399169bcd3b9383e6d9d4b01d
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.0.0 b/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.0.0
deleted file mode 100644
index 2a6624487ebf..000000000000
--- a/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/base-orphans-0.1:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/contravariant:=[profile?] dev-haskell/fail:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-8.0.1:= binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) ) >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=QuickCheck common typeclasses from 'base'
-EAPI=7
-HOMEPAGE=https://github.com/andrewthad/quickcheck-classes#readme
-IUSE=+binary-laws +unary-laws doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/base-orphans-0.1:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/contravariant:=[profile?] dev-haskell/fail:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-8.0.1:= binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) )
-SLOT=0/0.6.0.0
-SRC_URI=https://hackage.haskell.org/package/quickcheck-classes-base-0.6.0.0/quickcheck-classes-base-0.6.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=257a35eb8df34a3e382b949343d841f2
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.2.0 b/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.2.0
new file mode 100644
index 000000000000..1afc53a50082
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/contravariant:=[profile?] >=dev-lang/ghc-8.4.3:= binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) ) >=dev-haskell/cabal-2.4 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=QuickCheck common typeclasses from 'base'
+EAPI=7
+HOMEPAGE=https://github.com/andrewthad/quickcheck-classes#readme
+IUSE=+binary-laws +unary-laws doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/contravariant:=[profile?] >=dev-lang/ghc-8.4.3:= binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) )
+SLOT=0/0.6.2.0
+SRC_URI=https://hackage.haskell.org/package/quickcheck-classes-base-0.6.2.0/quickcheck-classes-base-0.6.2.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=849fe24a6c1b31004fb15786268a2399
diff --git a/metadata/md5-cache/dev-haskell/reflection-2.1.4 b/metadata/md5-cache/dev-haskell/reflection-2.1.4
deleted file mode 100644
index 1be5417a6996..000000000000
--- a/metadata/md5-cache/dev-haskell/reflection-2.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Reifies arbitrary terms into types that can be reflected back into terms
-EAPI=8
-HOMEPAGE=https://github.com/ekmett/reflection
-IUSE=+template-haskell doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/2.1.4
-SRC_URI=https://hackage.haskell.org/package/reflection-2.1.4/reflection-2.1.4.tar.gz
-_eclasses_=ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=216f5d7789e4dd404b45b3abc12ccfc3
diff --git a/metadata/md5-cache/dev-haskell/reflection-2.1.6 b/metadata/md5-cache/dev-haskell/reflection-2.1.6
new file mode 100644
index 000000000000..12f4966dd909
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/reflection-2.1.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reifies arbitrary terms into types that can be reflected back into terms
+EAPI=8
+HOMEPAGE=https://github.com/ekmett/reflection
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-8.4.3:=
+RESTRICT=!test? ( test )
+SLOT=0/2.1.6
+SRC_URI=https://hackage.haskell.org/package/reflection-2.1.6/reflection-2.1.6.tar.gz
+_eclasses_=ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=34b054e4caf142e8fa9b862e5893eca3
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index cd1123c9dae0..191e3bf49991 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/jansi-1.13 b/metadata/md5-cache/dev-java/jansi-1.13
new file mode 100644
index 000000000000..20b1b6de2b40
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jansi-1.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jansi-native:0 test? ( dev-java/junit:4 ) >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=A library that allows you to use ANSI escape sequences in your console output
+EAPI=7
+HOMEPAGE=https://fusesource.github.io/jansi/
+IUSE=elibc_FreeBSD doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fusesource/jansi/archive/jansi-project-1.13.tar.gz -> jansi-1.13.tar.gz
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=2eac88788981e200e76c591f4f9c2029
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26 b/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
new file mode 100644
index 000000000000..07b44797bd89
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/c3p0:0 dev-java/protobuf-java:0 dev-java/slf4j-api:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JDBC Type 4 driver for MySQL
+EAPI=7
+HOMEPAGE=https://dev.mysql.com/doc/connector-j/en/
+IUSE=elibc_FreeBSD doc source
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2-with-MySQL-FLOSS-exception
+RDEPEND=dev-java/c3p0:0 dev-java/protobuf-java:0 dev-java/slf4j-api:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.26/mysql-connector-java-8.0.26-sources.jar -> jdbc-mysql-8.0.26-sources.jar
+_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_md5_=0f76d8b6633f4be2c5c5ec08e091f6cc
diff --git a/metadata/md5-cache/dev-java/swt-4.10-r2 b/metadata/md5-cache/dev-java/swt-4.10-r2
index 6ce81c8b5161..133e3fac7068 100644
--- a/metadata/md5-cache/dev-java/swt-4.10-r2
+++ b/metadata/md5-cache/dev-java/swt-4.10-r2
@@ -5,10 +5,10 @@ DESCRIPTION=GTK based SWT Library
 EAPI=7
 HOMEPAGE=http://www.eclipse.org/
 IUSE=cairo opengl webkit elibc_FreeBSD
-KEYWORDS=~amd64 ppc64
+KEYWORDS=amd64 ppc64
 LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=4.10
 SRC_URI=amd64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-x86_64.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-ppc64le.zip )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-osgi	ce28920e0b96f350c1d47b5880faff44	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2bba261188682a2fd87f3c904dbce5ba
+_md5_=7ee352c08907a4dcf2f198e51ab248b4
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.4.9.1 b/metadata/md5-cache/dev-java/zstd-jni-1.4.9.1
index f4b150260fc5..c16b96935fa7 100644
--- a/metadata/md5-cache/dev-java/zstd-jni-1.4.9.1
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.4.9.1
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/luben/zstd-jni/archive/v1.4.9-1.tar.gz -> zstd-jni-1.4.9.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6d343d2348b8a3f203dbe07234276369
+_md5_=08739ed656ab29095a5e2fd48bae604f
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.5.0.4 b/metadata/md5-cache/dev-java/zstd-jni-1.5.0.4
index 24ceaf61a908..74875b10cb6c 100644
--- a/metadata/md5-cache/dev-java/zstd-jni-1.5.0.4
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.5.0.4
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/luben/zstd-jni/archive/v1.5.0-4.tar.gz -> zstd-jni-1.5.0.4.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=20c3febfdc03f6e1e9b25d5b668e8a48
+_md5_=9de2c4d9e7fad72a0b41f93b0b96a583
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 9181d3f91f9f..79c4b46cab82 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/crystal-1.1.0 b/metadata/md5-cache/dev-lang/crystal-1.1.0
index d547e8cca37d..1fe817349b13 100644
--- a/metadata/md5-cache/dev-lang/crystal-1.1.0
+++ b/metadata/md5-cache/dev-lang/crystal-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/llvm:11 dev-libs/boehm-gc[static-libs,threads] dev-libs/libato
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/crystal-lang/crystal/archive/1.1.0.tar.gz -> crystal-1.1.0.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/1.1.0/crystal-1.1.0-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/1.1.0/crystal-1.1.0-1-linux-i686.tar.gz )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0743b552af2fde1a286de8bef917aa1
diff --git a/metadata/md5-cache/dev-lang/ispc-1.16.0 b/metadata/md5-cache/dev-lang/ispc-1.16.0
index c33f1f9eb449..9524c12dd41a 100644
--- a/metadata/md5-cache/dev-lang/ispc-1.16.0
+++ b/metadata/md5-cache/dev-lang/ispc-1.16.0
@@ -10,5 +10,5 @@ LICENSE=BSD BSD-2 UoI-NCSA
 RDEPEND=<sys-devel/clang-13:=
 SLOT=0
 SRC_URI=https://github.com/ispc/ispc/archive/v1.16.0.tar.gz -> ispc-1.16.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7d81b9d7ff9b75a630c33ea4df156955
diff --git a/metadata/md5-cache/dev-lang/ispc-9999 b/metadata/md5-cache/dev-lang/ispc-9999
index 64dde4cd4ea5..f8a4841607ef 100644
--- a/metadata/md5-cache/dev-lang/ispc-9999
+++ b/metadata/md5-cache/dev-lang/ispc-9999
@@ -9,5 +9,5 @@ LICENSE=BSD BSD-2 UoI-NCSA
 PROPERTIES=live
 RDEPEND=<sys-devel/clang-13:=
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7d81b9d7ff9b75a630c33ea4df156955
diff --git a/metadata/md5-cache/dev-lang/julia-1.5.3 b/metadata/md5-cache/dev-lang/julia-1.5.3
index c95030cc8f79..c8c6391b42b8 100644
--- a/metadata/md5-cache/dev-lang/julia-1.5.3
+++ b/metadata/md5-cache/dev-lang/julia-1.5.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0 >=dev-libs/libpcre2-10.23:0=[jit,unicode] dev-libs/mpfr:0= dev-libs/openspecfun net-libs/libssh2 >=net-libs/mbedtls-2.2 sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= sci-mathematics/z3 >=sys-libs/libunwind-1.1:0= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
 SLOT=0
 SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.5.3/julia-1.5.3.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/1fcc6d66f9df74189c74d3d390f02202bb7db953 -> julia-libuv-1fcc6d66f9df74189c74d3d390f02202bb7db953.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/0890a538bf8238cded9be0c81171f57e43f2c755 -> julia-utf8proc-0890a538bf8238cded9be0c81171f57e43f2c755.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz http://www.unicode.org/Public/13.0.0/ucd/UnicodeData.txt -> julia-UnicodeData-13.0.0.txt https://dev.gentoo.org/~tamiko/distfiles/Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz -> julia-Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz !system-llvm? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/llvm-9.0.1.src.tar.xz )
-_eclasses_=llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86e4c4ca08cc9b51d87ef0ff5b1c0658
diff --git a/metadata/md5-cache/dev-lang/julia-1.6.0 b/metadata/md5-cache/dev-lang/julia-1.6.0
index 54e0dc3023f5..831315f30c2c 100644
--- a/metadata/md5-cache/dev-lang/julia-1.6.0
+++ b/metadata/md5-cache/dev-lang/julia-1.6.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=system-llvm? ( sys-devel/llvm:11=[llvm_targets_NVPTX(-)] ) app-arch/p7zip dev-libs/gmp:0= dev-libs/libgit2:0 >=dev-libs/libpcre2-10.23:0=[jit,unicode] dev-libs/mpfr:0= dev-libs/libutf8proc:0= dev-util/patchelf >=net-libs/mbedtls-2.2 net-misc/curl[http2,ssh] sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= >=sci-mathematics/dsfmt-2.2.4 >=sys-libs/libunwind-1.1:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
 SLOT=0
 SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.6.0/julia-1.6.0.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/fb3e3364c33ae48c827f6b103e05c3f0e78b79a9 -> julia-libuv-fb3e3364c33ae48c827f6b103e05c3f0e78b79a9.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz !system-llvm? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/llvm-11.0.1.src.tar.xz )
-_eclasses_=llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea313845df9c7bbe72d6730a83163384
diff --git a/metadata/md5-cache/dev-lang/mercury-20.06-r1 b/metadata/md5-cache/dev-lang/mercury-20.06-r1
index 2e7c74332732..8b6e4e015198 100644
--- a/metadata/md5-cache/dev-lang/mercury-20.06-r1
+++ b/metadata/md5-cache/dev-lang/mercury-20.06-r1
@@ -9,6 +9,6 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.8:* ) mono? ( dev-lang/mono ) doc? ( sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-SRC_URI=https://dl.mercurylang.org/release-20.06/mercury-srcdist-20.06.tar.gz https://dev.gentoo.org/~keri/distfiles/mercury/mercury-20.06-gentoo-patchset-1.tar.gz
+SRC_URI=https://dl.mercurylang.org/release-20.06/mercury-srcdist-20.06.tar.gz https://dev.gentoo.org/~keri/distfiles/mercury/mercury-20.06-gentoo-patchset-2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0ec3770a93ca3e62aa942d8c3c93ee15
+_md5_=39e28bc38eb7913e3d1044f53f8329e1
diff --git a/metadata/md5-cache/dev-lang/php-7.4.22 b/metadata/md5-cache/dev-lang/php-7.4.22
new file mode 100644
index 000000000000..b3768b61f13d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.4.22
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://www.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=7.4
+SRC_URI=https://www.php.net/distributions/php-7.4.22.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a590f4e9b639d6bceac9327e7a4a0217
diff --git a/metadata/md5-cache/dev-lang/php-8.0.9 b/metadata/md5-cache/dev-lang/php-8.0.9
new file mode 100644
index 000000000000..5a5ae0369a76
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.0.9
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://www.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=8.0
+SRC_URI=https://www.php.net/distributions/php-8.0.9.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=75c562d07f7cf89461718e412a39cf5f
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18_p11 b/metadata/md5-cache/dev-lang/python-2.7.18_p11
index ca231d0470ab..c137d62c7e65 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18_p11
+++ b/metadata/md5-cache/dev-lang/python-2.7.18_p11
@@ -10,5 +10,5 @@ LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( dev-libs/openssl:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types ) !<=dev-lang/python-exec-2.4.6-r1
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18_p11.tar.xz verify-sig? ( https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=45861cb91c3d8525dc4e007eed93475b
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4890e38b7d56b2dfc99ce92ade01411a
diff --git a/metadata/md5-cache/dev-lang/python-3.10.0_beta4 b/metadata/md5-cache/dev-lang/python-3.10.0_beta4
index 8c81c101b708..ad0319fad87e 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.0_beta4
+++ b/metadata/md5-cache/dev-lang/python-3.10.0_beta4
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.0/Python-3.10.0b4.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0b4.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.0/Python-3.10.0b4.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=965a05f681df42d3acf8ca56b3dae3f6
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e7673cbde5c73a0e11d0e5224f7a5161
diff --git a/metadata/md5-cache/dev-lang/python-3.6.13_p5 b/metadata/md5-cache/dev-lang/python-3.6.13_p5
index 36228affb758..5d925c8427b8 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.13_p5
+++ b/metadata/md5-cache/dev-lang/python-3.6.13_p5
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.13_p5.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eecf4b5bd31c99ef4f7ca5ed697616b9
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=176f9bb0adb5933bc349c2b033824835
diff --git a/metadata/md5-cache/dev-lang/python-3.6.14 b/metadata/md5-cache/dev-lang/python-3.6.14
index 3a30386f6cb6..251cf3c7ae26 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.14
+++ b/metadata/md5-cache/dev-lang/python-3.6.14
@@ -5,11 +5,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test +threads tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( dev-libs/openssl:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.14/Python-3.6.14.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.14.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.6.14/Python-3.6.14.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=894c02d14782f0b143eafbe834c2213f
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=05f88deea0b13f18af9a080b059f21a5
diff --git a/metadata/md5-cache/dev-lang/python-3.7.10_p6 b/metadata/md5-cache/dev-lang/python-3.7.10_p6
index 9378e01de7c7..0e82e11e3de8 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.10_p6
+++ b/metadata/md5-cache/dev-lang/python-3.7.10_p6
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.10_p6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d7ee28d14d8e0e4ba6d86149c719f752
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b09a99439df1014111d191dc96c576c8
diff --git a/metadata/md5-cache/dev-lang/python-3.7.11 b/metadata/md5-cache/dev-lang/python-3.7.11
index 15f58920a38c..cca3f78fe079 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.11
+++ b/metadata/md5-cache/dev-lang/python-3.7.11
@@ -5,11 +5,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.11/Python-3.7.11.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.11.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.11/Python-3.7.11.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=536622f68bb75fc4e6ab2db787f1890c
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a9336ffe68e45b63c6b9f52dbc7522c2
diff --git a/metadata/md5-cache/dev-lang/python-3.8.10_p2 b/metadata/md5-cache/dev-lang/python-3.8.10_p2
index f3c47f923a84..f820c9ce2071 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.10_p2
+++ b/metadata/md5-cache/dev-lang/python-3.8.10_p2
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.10_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=44282e2e62add02b6d0b24a4a4b40410
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d627944e173c44e2ab19a4e5b63928c6
diff --git a/metadata/md5-cache/dev-lang/python-3.8.11 b/metadata/md5-cache/dev-lang/python-3.8.11
index 374dc7dc568b..417bac11a13f 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.11
+++ b/metadata/md5-cache/dev-lang/python-3.8.11
@@ -5,11 +5,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.11.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c62c394266086fb317f08923c23c01b0
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=313a724d69b24467012f54b5ff05269e
diff --git a/metadata/md5-cache/dev-lang/python-3.9.5_p2 b/metadata/md5-cache/dev-lang/python-3.9.5_p2
index d3a4ed9b8a7d..90b3ac12ad09 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.5_p2
+++ b/metadata/md5-cache/dev-lang/python-3.9.5_p2
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.5_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=24d4eb0bf0c56d7bacffd6cccd0b4eda
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2fea652f287fce4f3805c2903c5be5d5
diff --git a/metadata/md5-cache/dev-lang/python-3.9.6 b/metadata/md5-cache/dev-lang/python-3.9.6
index 98bdbfa4f998..b43eeadbd922 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.6
+++ b/metadata/md5-cache/dev-lang/python-3.9.6
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ff9995c26f02361620b82fadf2b6ebb7
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6c05c8fad50fed98148d0fd343877326
diff --git a/metadata/md5-cache/dev-lang/python-exec-2.4.8 b/metadata/md5-cache/dev-lang/python-exec-2.4.8
index 6bc8543ca63e..4942d4e52c1c 100644
--- a/metadata/md5-cache/dev-lang/python-exec-2.4.8
+++ b/metadata/md5-cache/dev-lang/python-exec-2.4.8
@@ -4,11 +4,11 @@ DESCRIPTION=Python script wrapper
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/python-exec/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +native-symlinks test
-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
+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
 LICENSE=BSD-2
 RDEPEND=dev-lang/python-exec-conf !<=dev-lang/python-2.7.18-r3:2.7
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/mgorny/python-exec/releases/download/v2.4.8/python-exec-2.4.8.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e6b7c60ff2088428c580ff839e3f777b
+_md5_=b0d7241b1b9e0db57ced71d81b6bdb63
diff --git a/metadata/md5-cache/dev-lang/rust-1.52.1 b/metadata/md5-cache/dev-lang/rust-1.52.1
index 6b3ef0ca8cb5..7029dd0b6bc6 100644
--- a/metadata/md5-cache/dev-lang/rust-1.52.1
+++ b/metadata/md5-cache/dev-lang/rust-1.52.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.52
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.52.1-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.52.1-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.51.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.51.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.51.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.51.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.51.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.51.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.51.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.51.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.51.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1201b7c569aa90206713efd457cffc0c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=207cb5e5ec7adfb853b13b86fdde5477
diff --git a/metadata/md5-cache/dev-lang/rust-1.53.0 b/metadata/md5-cache/dev-lang/rust-1.53.0
index af3093c37c3b..95b7ff8c1ad1 100644
--- a/metadata/md5-cache/dev-lang/rust-1.53.0
+++ b/metadata/md5-cache/dev-lang/rust-1.53.0
@@ -5,12 +5,12 @@ DESCRIPTION=Systems programming language from Mozilla
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org/
 IUSE=clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rls rustfmt system-bootstrap system-llvm test wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:12[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:12[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:12[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:12[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:12[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:12[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:12[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:12[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:12[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:12[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:12[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:12[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:12[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:12[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:12[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:12[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:12[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-13:= wasm? ( sys-devel/lld ) ) app-eselect/eselect-rust !<dev-lang/rust-1.47.0-r1 !<dev-lang/rust-bin-1.47.0-r1
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) test? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 RESTRICT=test
 SLOT=stable/1.53
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.53.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.53.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.52.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.52.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.52.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.52.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=26523526fcd653b75e91c197157d4b74
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=445f960f04471c9573ac12c59670e77c
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.52.1 b/metadata/md5-cache/dev-lang/rust-bin-1.52.1
index 09873b0ca0cb..b69617765e6e 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.52.1
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.52.1
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.52.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.52.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.52.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.52.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.52.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.52.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.52.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.52.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.52.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.52.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.52.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=5ddcf5e8ac1aa288b3b82e751ab54d21
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=432f46ad9db29e11d95cea160bfd65ff
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.53.0 b/metadata/md5-cache/dev-lang/rust-bin-1.53.0
index 09f2260c2339..8d99805179e2 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.53.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.53.0
@@ -4,11 +4,11 @@ DESCRIPTION=Systems programming language from Mozilla
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org/
 IUSE=clippy cpu_flags_x86_sse2 doc prefix rls rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=app-eselect/eselect-rust-20190311
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.53.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.53.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.53.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.53.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=8a620a05d3da6414e57fd3d743cd4246
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=e215e919b259b522fd97321af79138f6
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.10.1 b/metadata/md5-cache/dev-lang/spidermonkey-78.10.1
index 447284669000..708271f52547 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-78.10.1
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.10.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/icu-67.1:= >=dev-libs/nspr-4.25 sys-libs/readline:0= >=sys-li
 RESTRICT=!test? ( test )
 SLOT=78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.10.1esr/source/firefox-78.10.1esr.source.tar.xz -> firefox-78.10.1esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-13.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-13.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-13.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ab68193d0c9335fb2418e15273e4937c
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.11.0 b/metadata/md5-cache/dev-lang/spidermonkey-78.11.0
index a72a701b433d..7954d49fa704 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-78.11.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.11.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/icu-67.1:= >=dev-libs/nspr-4.25 sys-libs/readline:0= >=sys-li
 RESTRICT=!test? ( test )
 SLOT=78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/source/firefox-78.11.0esr.source.tar.xz -> firefox-78.11.0esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6724f482f208f38d8f0d0ed95597b565
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.12.0 b/metadata/md5-cache/dev-lang/spidermonkey-78.12.0
index 427ad3ea5b0e..293de3714212 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-78.12.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.12.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/icu-67.1:= >=dev-libs/nspr-4.25 sys-libs/readline:0= >=sys-li
 RESTRICT=!test? ( test )
 SLOT=78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/source/firefox-78.12.0esr.source.tar.xz -> firefox-78.12.0esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8d8edc8b400deb1f3d8cb6a437321f20
diff --git a/metadata/md5-cache/dev-lang/zig-0.7.1 b/metadata/md5-cache/dev-lang/zig-0.7.1
index ee1a685423e3..272f270be943 100644
--- a/metadata/md5-cache/dev-lang/zig-0.7.1
+++ b/metadata/md5-cache/dev-lang/zig-0.7.1
@@ -11,5 +11,5 @@ RDEPEND=sys-devel/clang:11 >=sys-devel/lld-11.0.0 <sys-devel/lld-12.0.0 sys-deve
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ziglang/zig/archive/0.7.1.tar.gz -> zig-0.7.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=53f68bf5a6a28c005ba8ae8cec321f38
diff --git a/metadata/md5-cache/dev-lang/zig-0.8.0 b/metadata/md5-cache/dev-lang/zig-0.8.0
index 034c2a3e627a..9e8bdf3678ee 100644
--- a/metadata/md5-cache/dev-lang/zig-0.8.0
+++ b/metadata/md5-cache/dev-lang/zig-0.8.0
@@ -11,5 +11,5 @@ RDEPEND=sys-devel/clang:12 >=sys-devel/lld-12.0.0 <sys-devel/lld-13.0.0 sys-deve
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ziglang/zig/archive/0.8.0.tar.gz -> zig-0.8.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fa29441bd93d4e273fa3e6633f28c73a
diff --git a/metadata/md5-cache/dev-lang/zig-9999 b/metadata/md5-cache/dev-lang/zig-9999
index 81d8648d2ada..b2dc6f1d309c 100644
--- a/metadata/md5-cache/dev-lang/zig-9999
+++ b/metadata/md5-cache/dev-lang/zig-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-devel/clang:12 >=sys-devel/lld-12.0.0 <sys-devel/lld-13.0.0 sys-devel/llvm:12 !experimental? ( sys-devel/llvm:12[llvm_targets_AArch64,llvm_targets_AMDGPU,llvm_targets_ARM,llvm_targets_AVR,llvm_targets_BPF,llvm_targets_Hexagon,llvm_targets_Lanai,llvm_targets_Mips,llvm_targets_MSP430,llvm_targets_NVPTX,llvm_targets_PowerPC,llvm_targets_RISCV,llvm_targets_Sparc,llvm_targets_SystemZ,llvm_targets_WebAssembly,llvm_targets_X86,llvm_targets_XCore] )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fa29441bd93d4e273fa3e6633f28c73a
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 7c1103a8439f..b7edb2e56f74 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/apr-1.7.0-r2 b/metadata/md5-cache/dev-libs/apr-1.7.0-r2
index 4b12e82eb211..cfadf544c554 100644
--- a/metadata/md5-cache/dev-libs/apr-1.7.0-r2
+++ b/metadata/md5-cache/dev-libs/apr-1.7.0-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Apache Portable Runtime Library
 EAPI=7
 HOMEPAGE=https://apr.apache.org/
 IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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 ~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
 LICENSE=Apache-2.0
 RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-base-policy )
 SLOT=1/1.7
 SRC_URI=mirror://apache/apr/apr-1.7.0.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1524f41219f991edcaca791dc6ccc068
+_md5_=afde4a43daca4f6c73b6626e85e20233
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r7 b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r7
index f73b1ce1de81..bd2dafd4e58e 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r7
+++ b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r7
@@ -5,10 +5,10 @@ DESCRIPTION=Apache Portable Runtime Utility Library
 EAPI=7
 HOMEPAGE=https://apr.apache.org/
 IUSE=berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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 ~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
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.6.2:1= dev-libs/expat virtual/libcrypt:= berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) mysql? ( || ( dev-db/mariadb-connector-c >=dev-db/mysql-connector-c-8 ) ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-util-1.6.1.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a7eaa66ceaded615f3219882ece522ab
+_md5_=e1b3014fd3f09c5412af02d9ef41a075
diff --git a/metadata/md5-cache/dev-libs/atf-0.21-r2 b/metadata/md5-cache/dev-libs/atf-0.21-r2
index 762fe2a955d6..65c647278b66 100644
--- a/metadata/md5-cache/dev-libs/atf-0.21-r2
+++ b/metadata/md5-cache/dev-libs/atf-0.21-r2
@@ -1,10 +1,10 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
 DESCRIPTION=Libraries to write tests in C, C++ and shell
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/jmmv/atf
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=https://github.com/jmmv/atf/releases/download/atf-0.21/atf-0.21.tar.gz
-_md5_=92c71ac22d456d859b1d511851ea3838
+_md5_=2ddcb8dc15d66c6f43be92b681d57993
diff --git a/metadata/md5-cache/dev-libs/botan-2.18.1-r1 b/metadata/md5-cache/dev-libs/botan-2.18.1-r1
index 90c82f1eaabe..a410ec2fecb6 100644
--- a/metadata/md5-cache/dev-libs/botan-2.18.1-r1
+++ b/metadata/md5-cache/dev-libs/botan-2.18.1-r1
@@ -11,5 +11,5 @@ RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) l
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=2/2.18
 SRC_URI=https://botan.randombit.net/releases/Botan-2.18.1.tar.xz verify-sig? ( https://botan.randombit.net/releases/Botan-2.18.1.tar.xz.asc )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=60c839d22024a91f2d8cb257682e786c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=b5eb004215cb498efef4accb3499a792
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.21.0 b/metadata/md5-cache/dev-libs/c-blosc-1.21.0
index 053ef2616b3b..bfc155973aab 100644
--- a/metadata/md5-cache/dev-libs/c-blosc-1.21.0
+++ b/metadata/md5-cache/dev-libs/c-blosc-1.21.0
@@ -5,11 +5,11 @@ DESCRIPTION=Blocking, shuffling and lossless compression library
 EAPI=7
 HOMEPAGE=https://www.blosc.org/
 IUSE=+lz4 +snappy test zlib zstd
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.21.0.tar.gz -> c-blosc-1.21.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=163ab31ae22ac71faa52b311124a0067
+_md5_=be533e97b1ea80af1113911fae2f7501
diff --git a/metadata/md5-cache/dev-libs/crypto++-8.5.0 b/metadata/md5-cache/dev-libs/crypto++-8.5.0
index 8a14e5697148..87e369ece128 100644
--- a/metadata/md5-cache/dev-libs/crypto++-8.5.0
+++ b/metadata/md5-cache/dev-libs/crypto++-8.5.0
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x64-macos
 LICENSE=Boost-1.0
 SLOT=0/8.5
 SRC_URI=https://www.cryptopp.com/cryptopp850.zip verify-sig? ( https://cryptopp.com/cryptopp850.zip.sig )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=67e1fa3f3e2ce92c4e3cd4bbd783a213
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=04e17534502feac040fa500c169fd2a1
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
index b1234b065cdc..0c718b862033 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
@@ -12,4 +12,4 @@ REQUIRED_USE=ldapdb? ( openldap )
 SLOT=2
 SRC_URI=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9e880a8da0c033bf07b274f64e1de1e4
+_md5_=905f9653360e1907b2e7a023c8edbcb5
diff --git a/metadata/md5-cache/dev-libs/fstrm-0.6.1 b/metadata/md5-cache/dev-libs/fstrm-0.6.1
index 7428cf00c6c8..8ddcbd962b99 100644
--- a/metadata/md5-cache/dev-libs/fstrm-0.6.1
+++ b/metadata/md5-cache/dev-libs/fstrm-0.6.1
@@ -5,10 +5,10 @@ DESCRIPTION=Frame Streams implementation in C
 EAPI=7
 HOMEPAGE=https://github.com/farsightsec/fstrm
 IUSE=utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=utils? ( dev-libs/libevent:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/farsightsec/fstrm/archive/v0.6.1.tar.gz -> fstrm-0.6.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d3089fbdb9c5f22490d752e8860f810d
+_md5_=bf48c7c7785000a2e48f725698c329c6
diff --git a/metadata/md5-cache/dev-libs/imath-3.0.5-r1 b/metadata/md5-cache/dev-libs/imath-3.0.5-r1
index 31ad6f52d4c0..54ac9ec337f1 100644
--- a/metadata/md5-cache/dev-libs/imath-3.0.5-r1
+++ b/metadata/md5-cache/dev-libs/imath-3.0.5-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Imath basic math package
 EAPI=7
 HOMEPAGE=https://imath.readthedocs.io
 IUSE=doc large-stack python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!dev-libs/imath:0 sys-libs/zlib python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3/28
 SRC_URI=https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.0.5.tar.gz -> imath-3.0.5.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d32222a1b51bbdadcda320bd516f1526
+_md5_=6aed4e1ca0d437028de82cec465e27e9
diff --git a/metadata/md5-cache/dev-libs/imath-3.1.1 b/metadata/md5-cache/dev-libs/imath-3.1.1
new file mode 100644
index 000000000000..6905b78603b7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/imath-3.1.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_8? ( dev-python/breathe[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/breathe[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/breathe[python_targets_python3_10(-)] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!dev-libs/imath:0 sys-libs/zlib python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) )
+DESCRIPTION=Imath basic math package
+EAPI=7
+HOMEPAGE=https://imath.readthedocs.io
+IUSE=doc large-stack python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!dev-libs/imath:0 sys-libs/zlib python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=!test? ( test )
+SLOT=3/29
+SRC_URI=https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.1.tar.gz -> imath-3.1.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f65f9d93b1102c4380a36be6fbd11e0d
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.1-r1 b/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
index c876a18d1ebc..4426386fb07c 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
@@ -11,5 +11,5 @@ RDEPEND=<sys-devel/llvm-11:= || ( sys-devel/llvm:8[llvm_targets_AArch64?,llvm_ta
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.1.tar.gz -> keystone-0.9.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=758eeabfb1175bb0886296cfd9f670b0
diff --git a/metadata/md5-cache/dev-libs/keystone-9999 b/metadata/md5-cache/dev-libs/keystone-9999
index b6a8396453a1..631241eff0f0 100644
--- a/metadata/md5-cache/dev-libs/keystone-9999
+++ b/metadata/md5-cache/dev-libs/keystone-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=<sys-devel/llvm-11:= || ( sys-devel/llvm:8[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] sys-devel/llvm:9[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] sys-devel/llvm:10[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] )
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_8 ) )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=758eeabfb1175bb0886296cfd9f670b0
diff --git a/metadata/md5-cache/dev-libs/kosmindoormap-21.04.3 b/metadata/md5-cache/dev-libs/kosmindoormap-21.04.3
deleted file mode 100644
index 276f690a5798..000000000000
--- a/metadata/md5-cache/dev-libs/kosmindoormap-21.04.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/kpublictransport-21.04.3:5 dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib test? ( >=dev-qt/qtwidgets-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Data Model and Extraction System for Travel Reservation information
-EAPI=7
-HOMEPAGE=https://invent.kde.org/libraries/kosmindoormap
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/kpublictransport-21.04.3:5 dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kosmindoormap-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=20b9189784b70b2a48dcb9772ca992a6
diff --git a/metadata/md5-cache/dev-libs/kosmindoormap-21.04.3-r1 b/metadata/md5-cache/dev-libs/kosmindoormap-21.04.3-r1
new file mode 100644
index 000000000000..c778d55e7582
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/kosmindoormap-21.04.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.80.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/kpublictransport-21.04.3:5 dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib openinghours? ( >=dev-libs/kopeninghours-21.04.3:5 ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Data Model and Extraction System for Travel Reservation information
+EAPI=7
+HOMEPAGE=https://invent.kde.org/libraries/kosmindoormap
+IUSE=+openinghours debug test
+KEYWORDS=~amd64
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/kpublictransport-21.04.3:5 dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib openinghours? ( >=dev-libs/kopeninghours-21.04.3:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kosmindoormap-21.04.3.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3d427c851c30dc8b339d43eaee1adb19
diff --git a/metadata/md5-cache/dev-libs/kpathsea-6.3.3_p20210325 b/metadata/md5-cache/dev-libs/kpathsea-6.3.3_p20210325
index fa21fd4a4887..d7583976bba1 100644
--- a/metadata/md5-cache/dev-libs/kpathsea-6.3.3_p20210325
+++ b/metadata/md5-cache/dev-libs/kpathsea-6.3.3_p20210325
@@ -10,4 +10,4 @@ RDEPEND=virtual/tmpfiles
 SLOT=0/6.3.3
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20210325-source.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/kpathsea-texmf.d-11.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpathsea-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpathsea.doc-2021.tar.xz )
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ba0b5235c8e20d219dbdb9a1ed4c218f
+_md5_=26871d35c3cae11e28f5ee11eb6fb963
diff --git a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001 b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001
index 4502d2e6be0a..f25eef001011 100644
--- a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001
+++ b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/libclc-0.2.0_pre20201001.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=233264485689ce3b78d6bd86d18c1d8c
diff --git a/metadata/md5-cache/dev-libs/libconfig-1.7.3 b/metadata/md5-cache/dev-libs/libconfig-1.7.3
index e36796a04efb..1ecc8b1a422f 100644
--- a/metadata/md5-cache/dev-libs/libconfig-1.7.3
+++ b/metadata/md5-cache/dev-libs/libconfig-1.7.3
@@ -5,9 +5,9 @@ DESCRIPTION=Libconfig is a simple library for manipulating structured configurat
 EAPI=7
 HOMEPAGE=http://www.hyperrealm.com/libconfig/libconfig.html https://github.com/hyperrealm/libconfig
 IUSE=+cxx static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0/11
 SRC_URI=https://github.com/hyperrealm/libconfig/archive/v1.7.3.tar.gz -> libconfig-1.7.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e8153d45dbc1aeaf41b521ae25b85dec
+_md5_=ff5c1ea41ef13e5db35f5d3279dc8a71
diff --git a/metadata/md5-cache/dev-libs/libffi-3.3-r2 b/metadata/md5-cache/dev-libs/libffi-3.3-r2
index bd23be21226f..5c4e130c1e40 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.3-r2
+++ b/metadata/md5-cache/dev-libs/libffi-3.3-r2
@@ -3,12 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=a portable, high level programming interface to various calling conventions
 EAPI=7
 HOMEPAGE=https://sourceware.org/libffi/
-IUSE=debug pax-kernel pax_kernel static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=debug pax-kernel static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 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
 LICENSE=MIT
-REQUIRED_USE=pax_kernel? ( pax-kernel )
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=34cde6ec71e9446318fadddf22786bfe
+_md5_=cc432c4db42fc4291c4fededdb776a83
diff --git a/metadata/md5-cache/dev-libs/libffi-3.4.2 b/metadata/md5-cache/dev-libs/libffi-3.4.2
index 4603a15274a6..130253ea1f62 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.4.2
+++ b/metadata/md5-cache/dev-libs/libffi-3.4.2
@@ -3,12 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=a portable, high level programming interface to various calling conventions
 EAPI=7
 HOMEPAGE=https://sourceware.org/libffi/
-IUSE=debug exec-static-trampoline pax-kernel pax_kernel static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=debug exec-static-trampoline pax-kernel static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 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
 LICENSE=MIT
-REQUIRED_USE=pax_kernel? ( pax-kernel )
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da07b99259dcf50cac63180932cd54fe
+_md5_=b22a588958104fed5bcfb78f8b169b95
diff --git a/metadata/md5-cache/dev-libs/libgnt-2.14.1 b/metadata/md5-cache/dev-libs/libgnt-2.14.1
index c6601095cd07..7a4660dc041d 100644
--- a/metadata/md5-cache/dev-libs/libgnt-2.14.1
+++ b/metadata/md5-cache/dev-libs/libgnt-2.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=Pidgin's GLib Ncurses Toolkit
 EAPI=7
 HOMEPAGE=https://keep.imfreedom.org/libgnt/libgnt
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!<net-im/pidgin-2.14.0 dev-libs/glib:2 dev-libs/libxml2 sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin/libgnt-2.14.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=978745deb24745bc7affcb360d7e9251
+_md5_=cd92bd8759144d5524d5e9c13d2ef498
diff --git a/metadata/md5-cache/dev-libs/libgnt-2.14.2 b/metadata/md5-cache/dev-libs/libgnt-2.14.2
new file mode 100644
index 000000000000..d271e6558217
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgnt-2.14.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=!<net-im/pidgin-2.14.0 dev-libs/glib:2 dev-libs/libxml2 sys-libs/ncurses:0=
+DESCRIPTION=Pidgin's GLib Ncurses Toolkit
+EAPI=7
+HOMEPAGE=https://keep.imfreedom.org/libgnt/libgnt
+IUSE=doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!<net-im/pidgin-2.14.0 dev-libs/glib:2 dev-libs/libxml2 sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/pidgin/libgnt-2.14.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=978745deb24745bc7affcb360d7e9251
diff --git a/metadata/md5-cache/dev-libs/libgudev-236-r1 b/metadata/md5-cache/dev-libs/libgudev-236-r1
new file mode 100644
index 000000000000..12a50a1aa0cc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgudev-236-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) test? ( dev-util/umockdev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=GObject bindings for libudev
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
+IUSE=introspection static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~mips ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+RESTRICT=!test? ( test )
+SLOT=0/0
+SRC_URI=https://download.gnome.org/sources/libgudev/236/libgudev-236.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2f53f685f832a8f64cd635e3daffce8e
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.18 b/metadata/md5-cache/dev-libs/libsodium-1.0.18
index 7daf3d384560..ef0db224507b 100644
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.18
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.18
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd
 LICENSE=ISC
 SLOT=0/23
 SRC_URI=https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz verify-sig? ( https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz.sig )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=ca5ee9b0edafcd965bab744c592946a4
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=ccfd9f56735bad5b4165e5445c1a4c3e
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210421 b/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210421
index bc70aac12cc9..abed745af8c4 100644
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210421
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210421
@@ -9,4 +9,4 @@ LICENSE=ISC
 SLOT=0/23
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/libsodium-1.0.18-stable-20210421.tar.gz -> libsodium-1.0.18_p20210421.tar.gz verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/libsodium-1.0.18-stable-20210421.tar.gz.minisig -> libsodium-1.0.18_p20210421.tar.gz.minisig )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c1e8977ad89a4d1ec92183bb7f06fb1f
+_md5_=b351d3d70f2111b501f728da42beaea8
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210617 b/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210617
index 424c24386bd2..8698e95b19f4 100644
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210617
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210617
@@ -9,4 +9,4 @@ LICENSE=ISC
 SLOT=0/23
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/libsodium-1.0.18-stable-20210617.tar.gz -> libsodium-1.0.18_p20210617.tar.gz verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/libsodium-1.0.18-stable-20210617.tar.gz.minisig -> libsodium-1.0.18_p20210617.tar.gz.minisig )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3efc0c9d65604008d09ef8c73366cd14
+_md5_=977337f709e94354ef9ae1b6a7bbd517
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.6.1 b/metadata/md5-cache/dev-libs/libutf8proc-2.6.1
index eaba3516082d..bd6924db2829 100644
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.6.1
+++ b/metadata/md5-cache/dev-libs/libutf8proc-2.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=A clean C Library for processing UTF-8 Unicode data
 EAPI=7
 HOMEPAGE=https://github.com/JuliaStrings/utf8proc
 IUSE=cjk static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2.6.1
 SRC_URI=https://github.com/JuliaStrings/utf8proc/archive/v2.6.1.tar.gz -> libutf8proc-2.6.1.tar.gz cjk? ( https://dev.gentoo.org/~hattya/distfiles/libutf8proc-EastAsianWidth-13.0.0-r1.xz )
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cb03659708db992f14e116fb404d64f4
+_md5_=9967849e9e59d4a98c573322e08bc53e
diff --git a/metadata/md5-cache/dev-libs/libuv-1.41.1 b/metadata/md5-cache/dev-libs/libuv-1.41.1
index ae2a672d7b8e..431132059d47 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.41.1
+++ b/metadata/md5-cache/dev-libs/libuv-1.41.1
@@ -4,9 +4,9 @@ DESCRIPTION=Cross-platform asychronous I/O
 EAPI=7
 HOMEPAGE=https://github.com/libuv/libuv
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~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 ~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
 LICENSE=BSD BSD-2 ISC MIT
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.41.1.tar.gz -> libuv-1.41.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=51139a8b02f030d1691e130d4ba472ab
+_md5_=aacdc182f8cdf6a6170f46480721ebd2
diff --git a/metadata/md5-cache/dev-libs/libvoikko-4.3.1 b/metadata/md5-cache/dev-libs/libvoikko-4.3.1
index c21c51dc4fe6..9e2b15f1877a 100644
--- a/metadata/md5-cache/dev-libs/libvoikko-4.3.1
+++ b/metadata/md5-cache/dev-libs/libvoikko-4.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.1.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.1.tar.gz.asc )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=a54a1c15766559b8f0d99e7ce62b9a22
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.12 b/metadata/md5-cache/dev-libs/libxml2-2.9.12
index 2109a5c65c71..2ec9a319cffc 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.12
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.12
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz ) verify-sig? ( ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=49acc40ce24902e62e534045646bcf19
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5459a176f01e3696a6347d1ca32382a6
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r2 b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r2
index 550c77f32a2b..9a5c055b4449 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r2
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.12-r2-patchset.tar.bz2 test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz ) verify-sig? ( ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e2af26a874f526ec1ed5e5f7e63e8ce4
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2f0c717adc27512c944f941bb7d783ff
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r3 b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r3
index d66ed3058033..d87e95222c5c 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r3
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.12-r3-patchset.tar.bz2 test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz ) verify-sig? ( ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=423495010e6a6f70ae82a859c85a5e3a
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=aadeb3e5b0c61a52178e9b006278bc65
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r4 b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r4
index 591d8aafec73..4a3d905025b0 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r4
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r4
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.12-r4-patchset.tar.bz2 test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz ) verify-sig? ( ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f2c923b6cd44c4fd4d23022091a80d5b
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=059ebc48daf2d9242d857d81c5c4f975
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1 b/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1
index a0279cdc5e92..d5f8a7ff6be4 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.34-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.10:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz verify-sig? ( ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz.asc )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=ce394b0465e0c4ce299ab33a11a023b6
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=1c568ea5850de19fd431a2d1db000c54
diff --git a/metadata/md5-cache/dev-libs/log4cplus-1.2.0 b/metadata/md5-cache/dev-libs/log4cplus-1.2.0
index ff153545160b..9cf5e147d89e 100644
--- a/metadata/md5-cache/dev-libs/log4cplus-1.2.0
+++ b/metadata/md5-cache/dev-libs/log4cplus-1.2.0
@@ -10,5 +10,4 @@ RDEPEND=iconv? ( virtual/libiconv ) qt5? ( dev-qt/qtcore:5 )
 REQUIRED_USE=?? ( iconv working-locale working-c-locale )
 SLOT=0/1.2-5
 SRC_URI=mirror://sourceforge/project/log4cplus/log4cplus-stable/1.2.0/log4cplus-1.2.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ab8da484d8db3aadeb9c0750329b9ecf
+_md5_=04be134e1ed0863892a5bca1f42ee63d
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1-r1 b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1-r1
index 57c192d2c153..d3b22d60722f 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1-r1
+++ b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/clang-10.0.1:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/spirv-llvm-translator:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=10
 SRC_URI=https://github.com/intel/opencl-clang/archive/v10.0.0-1.tar.gz -> opencl-clang-10.0.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=889574872c884c7f5fd28ff9a25edff7
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2-r1 b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2-r1
index 07a84cad0c46..3b4e18886f8c 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2-r1
+++ b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2-r1
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/clang-10.0.1:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/spirv-llvm-translator-10.0.0_p20200909:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=10
 SRC_URI=https://github.com/intel/opencl-clang/archive/v10.0.0-2.tar.gz -> opencl-clang-10.0.0.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0c04a100a7c06f0e6a9be219aac58951
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-11.1.0_pre20201222 b/metadata/md5-cache/dev-libs/opencl-clang-11.1.0_pre20201222
index 5a0f65fe757f..58b05fdc7f55 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-11.1.0_pre20201222
+++ b/metadata/md5-cache/dev-libs/opencl-clang-11.1.0_pre20201222
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=>=dev-util/spirv-llvm-translator-11.0.0:11=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/clang-11.1.0:11=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:11=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=11
 SRC_URI=https://github.com/intel/opencl-clang/archive/c67648d41df00ea8ee9d701d17299b86f86f0321.tar.gz -> opencl-clang-11.1.0_pre20201222.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=83c749cbbb048d741eb5bfb4b8fa0264
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-12.0.0 b/metadata/md5-cache/dev-libs/opencl-clang-12.0.0
index 6d90d55e7e9a..783e7166af04 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-12.0.0
+++ b/metadata/md5-cache/dev-libs/opencl-clang-12.0.0
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=>=dev-util/spirv-llvm-translator-12.0.0:12=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-12.0.0:12=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:12=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=12
 SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v12.0.0.tar.gz -> opencl-clang-12.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=eb41634e01133d64267b59fabb875365
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.0_beta2 b/metadata/md5-cache/dev-libs/openssl-3.0.0_beta2
new file mode 100644
index 000000000000..87b52f2691fe
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.0_beta2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/perl-5 dev-perl/Text-Template sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm cpu_flags_x86_sse2 elibc_musl ktls rfc3779 sctp static-libs test tls-compression vanilla kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=mirror://openssl/source/openssl-3.0.0-beta2.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=039460949327a22ea618bd9be91bf1be
diff --git a/metadata/md5-cache/dev-libs/pcc-libs-1.1.0 b/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
index cc593bbf2637..ecb5a3c70eb1 100644
--- a/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
+++ b/metadata/md5-cache/dev-libs/pcc-libs-1.1.0
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile
 DESCRIPTION=pcc compiler support libs
-EAPI=5
+EAPI=8
 HOMEPAGE=http://pcc.ludd.ltu.se
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc-releases/pcc-libs-1.1.0.tgz
-_md5_=de097444e874a8e47fa96d46fc634d52
+_md5_=813c9867f2edc459dd89b6cda392e66f
diff --git a/metadata/md5-cache/dev-libs/pcc-libs-9999 b/metadata/md5-cache/dev-libs/pcc-libs-9999
deleted file mode 100644
index fc58777d866e..000000000000
--- a/metadata/md5-cache/dev-libs/pcc-libs-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile unpack
-DEPEND=dev-vcs/cvs
-DESCRIPTION=pcc compiler support libs
-EAPI=5
-HOMEPAGE=http://pcc.ludd.ltu.se
-LICENSE=BSD
-PROPERTIES=live
-SLOT=0
-_eclasses_=cvs	8f8740beb4ce1deaae8393cfc28d2ed1
-_md5_=fa94f9728bf1258945bc8a668e5625e7
diff --git a/metadata/md5-cache/dev-libs/softhsm-2.6.1-r1 b/metadata/md5-cache/dev-libs/softhsm-2.6.1-r1
index c5cf24424a7a..95eea1cdd308 100644
--- a/metadata/md5-cache/dev-libs/softhsm-2.6.1-r1
+++ b/metadata/md5-cache/dev-libs/softhsm-2.6.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A software PKCS#11 implementation
 EAPI=7
 HOMEPAGE=https://www.opendnssec.org/
 IUSE=bindist gost migration-tool test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=migration-tool? ( dev-db/sqlite:3= ) dev-libs/openssl:0=[bindist(-)=] !~dev-libs/softhsm-2.0.0:0
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://www.opendnssec.org/files/source/softhsm-2.6.1.tar.gz
-_md5_=04b0b49797eceb018fc55b9574304233
+_md5_=36fd43ee72ff55809b03b4adb80e6e5a
diff --git a/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904 b/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904
index 968a8bd5912d..9a8cf393f545 100644
--- a/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904
+++ b/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904
@@ -11,5 +11,5 @@ RDEPEND=sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/intel/vc-intrinsics/archive/830067832d4af0fbd5710e9a45669a02fcfb7c3f.tar.gz -> vc-intrinsics-0_p20200904.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a5b9aff9177091ef0437b665eaa82fe3
diff --git a/metadata/md5-cache/dev-libs/voikko-fi-2.4 b/metadata/md5-cache/dev-libs/voikko-fi-2.4
index 726acb3aab80..0b3979785a24 100644
--- a/metadata/md5-cache/dev-libs/voikko-fi-2.4
+++ b/metadata/md5-cache/dev-libs/voikko-fi-2.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/foma dev-libs/libvoikko
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.4.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.4.tar.gz.asc )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=b3edca38932a240bfb8db2988069d267
diff --git a/metadata/md5-cache/dev-libs/yajl-2.1.0-r3 b/metadata/md5-cache/dev-libs/yajl-2.1.0-r3
index 45daa99498f7..d6870a5838ee 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.1.0-r3
+++ b/metadata/md5-cache/dev-libs/yajl-2.1.0-r3
@@ -4,9 +4,9 @@ DESCRIPTION=Small event-driven (SAX-style) JSON parser
 EAPI=7
 HOMEPAGE=https://lloyd.github.com/yajl/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC
 SLOT=0/2
 SRC_URI=https://github.com/lloyd/yajl/tarball/2.1.0 -> yajl-2.1.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c600e28b53cc1650835d5fe656180ec4
+_md5_=ecabd9ba5a4a5f5c5407d7bab0f91fd2
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index f7252f00eeee..bfb61a4808a2 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/c2ffi-12.0.0.20210615 b/metadata/md5-cache/dev-lisp/c2ffi-12.0.0.20210615
index 0c4dc3351ccd..0f6c03458e24 100644
--- a/metadata/md5-cache/dev-lisp/c2ffi-12.0.0.20210615
+++ b/metadata/md5-cache/dev-lisp/c2ffi-12.0.0.20210615
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-devel/clang:12= sys-devel/llvm:12=
 SLOT=0
 SRC_URI=https://github.com/rpav/c2ffi/archive/3a92064409d258e1688727266c3f023a502e8866.tar.gz -> c2ffi-12.0.0.20210615.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=83cc2077216bc09ba604e1d97c6ab3f8
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index d613db784089..6f7cb26339f1 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/lutok-0.4-r10 b/metadata/md5-cache/dev-lua/lutok-0.4-r10
index 931de9640ce6..f2c0f6276b25 100644
--- a/metadata/md5-cache/dev-lua/lutok-0.4-r10
+++ b/metadata/md5-cache/dev-lua/lutok-0.4-r10
@@ -5,7 +5,7 @@ DESCRIPTION=Lightweight C++ API library for Lua
 EAPI=7
 HOMEPAGE=https://github.com/jmmv/lutok
 IUSE=test lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmmv/lutok/releases/download/lutok-0.4/lutok-0.4.tar.gz
 _eclasses_=lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1568e156ac52d30aa872dfaf24237e43
+_md5_=e4d882ff49228ba0dddf20af2a3ce9d3
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index e1d5c4eef819..430c42729e60 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/camlp5-8.00.01 b/metadata/md5-cache/dev-ml/camlp5-8.00.01
index b724f8a5b493..32994aee6e8c 100644
--- a/metadata/md5-cache/dev-ml/camlp5-8.00.01
+++ b/metadata/md5-cache/dev-ml/camlp5-8.00.01
@@ -4,10 +4,10 @@ DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
 IUSE=doc +ocamlopt ocamlopt
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ppc ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.00.01
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel8.00.01.tar.gz -> camlp5-8.00.01.tar.gz
 _eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
-_md5_=bd3ad93b6580e689f90e77c79a712f4a
+_md5_=06db57b541f5880cabae70b7a6ec9a39
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
index 496a639512bf..5db113d7de0c 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/10.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5717c4e4571dc61b81766312579e4263
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-11.1.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-11.1.0
index a30742b9d49c..25fa8ddbbd7d 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-11.1.0
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-11.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/11.1.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e250b95094bd8fb74dd75eead9e2d48d
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0
index 8ff253c948ff..6b0a088fdf84 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/12.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0a083ccfbf7ad7e67a52b993fcb53c30
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1
index 26fe5b49edba..ef6a551c498e 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/12.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7511edd7975caf3cc37d7ffdf5de3327
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0.9999
index 92aec6d9683e..75c01fec7621 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-13.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE )
 RESTRICT=!test? ( test )
 SLOT=0/13.0.0.9999
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=70455fb3b56abab41b0b30eba95f80ab
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.0.9999
new file mode 100644
index 000000000000..3cd0714c5269
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.0.9999
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-14.0.0.9999:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_VE] ) !!sys-devel/llvm:0
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PROPERTIES=live
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-14.0.0.9999:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.0.9999[llvm_targets_VE] )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE )
+RESTRICT=!test? ( test )
+SLOT=0/14.0.0.9999
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=70455fb3b56abab41b0b30eba95f80ab
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r2 b/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r2
index eaf503588376..65479a25c2f1 100644
--- a/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r2
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r2
@@ -4,10 +4,10 @@ DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.8 dev-m
 DESCRIPTION=Core installer for opam packages
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.8 >=dev-lang/ocaml-4:=
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/releases/download/2.0.8/opam-full-2.0.8.tar.gz
 _eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=090e8da348450e4d469968bd9de07573
+_md5_=6a54a929ed36c8087f30d002e32e48e1
diff --git a/metadata/md5-cache/dev-ml/parmap-1.2.3 b/metadata/md5-cache/dev-ml/parmap-1.2.3
index ddd13728fd75..50a78f6ddeab 100644
--- a/metadata/md5-cache/dev-ml/parmap-1.2.3
+++ b/metadata/md5-cache/dev-ml/parmap-1.2.3
@@ -5,10 +5,10 @@ DESCRIPTION=Library to exploit multicore architectures for OCaml programs
 EAPI=7
 HOMEPAGE=https://www.dicosmo.org/code/parmap/
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~x86
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.2.3
 SRC_URI=https://github.com/rdicosmo/parmap/archive/1.2.3.tar.gz -> parmap-1.2.3.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=ea6123bd57ee3f5e38b21d956d824a25
+_md5_=c69b9259249ac1f6f24dd38f8b66e6c1
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2
index 2c51d68b2ffa..6c81c653f0a4 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2
@@ -5,10 +5,10 @@ DESCRIPTION=Support Library for type-driven code generators
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= <=dev-ml/ppxlib-0.20.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.2
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.2.tar.gz -> ppx_sexp_conv-0.14.2.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=ebd3f9adbadcbc4bb473fd82325319b6
+_md5_=cf40d2d952a0a8d35061c139d3836cf1
diff --git a/metadata/md5-cache/dev-perl/Alien-HDF4-0.50.0 b/metadata/md5-cache/dev-perl/Alien-HDF4-0.50.0
new file mode 100644
index 000000000000..3e7ef1ce6b02
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Alien-HDF4-0.50.0
@@ -0,0 +1,15 @@
+BDEPEND=sci-libs/hdf >=dev-perl/ExtUtils-Depends-0.402.0 dev-perl/IO-All dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-libs/hdf dev-lang/perl
+DESCRIPTION=Encapsulate install info for HDF4
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Alien-HDF4
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=sci-libs/hdf dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/Alien-HDF4-0.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=fc9159fef5765466a424fc7390adb3ea
diff --git a/metadata/md5-cache/dev-perl/Alien-Libxml2-0.170.0 b/metadata/md5-cache/dev-perl/Alien-Libxml2-0.170.0
index 6bd9ab59ca36..4b43eb314433 100644
--- a/metadata/md5-cache/dev-perl/Alien-Libxml2-0.170.0
+++ b/metadata/md5-cache/dev-perl/Alien-Libxml2-0.170.0
@@ -5,11 +5,11 @@ DESCRIPTION=Install the C libxml2 library on your system
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Alien-Libxml2
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Alien-Build-2.120.0 dev-libs/libxml2:2= dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.17.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=139eb910953c6d07d35a86bb2a5733ef
+_md5_=99be89cd5f61cc70011539b87a04f8a3
diff --git a/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.80.0 b/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.80.0
index f41b2f19c6b2..d178329dea56 100644
--- a/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.80.0
+++ b/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.80.0
@@ -5,11 +5,11 @@ DESCRIPTION=Interface to FITS headers
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Astro-FITS-Header
 IUSE=test
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~hppa ~mips ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GS/GSB/Astro-FITS-Header-3.08.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=9d32c9f1a35d7c0f3306cf25886a2d40
+_md5_=37393fb1f2802894c94c42658a88a052
diff --git a/metadata/md5-cache/dev-perl/Authen-Radius-0.320.0 b/metadata/md5-cache/dev-perl/Authen-Radius-0.320.0
index f0e2c7914c33..2f81e272e206 100644
--- a/metadata/md5-cache/dev-perl/Authen-Radius-0.320.0
+++ b/metadata/md5-cache/dev-perl/Authen-Radius-0.320.0
@@ -5,11 +5,11 @@ DESCRIPTION=Communicate with a Radius server from Perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Authen-Radius
 IUSE=test examples
-KEYWORDS=~amd64 ~hppa ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~sparc x86
 LICENSE=Artistic-2
 RDEPEND=>=virtual/perl-Data-Dumper-1.0.0 >=dev-perl/Data-HexDump-0.20.0 >=virtual/perl-Digest-MD5-2.200.0 >=virtual/perl-IO-1.120.0 >=dev-perl/Net-IP-1.260.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.32.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=2f429aba1a52de09261a45d8dbc56254
+_md5_=fd089c7aea87400d17d9ddb998b5b03d
diff --git a/metadata/md5-cache/dev-perl/Business-ISBN-Data-20210112.6.0 b/metadata/md5-cache/dev-perl/Business-ISBN-Data-20210112.6.0
index 3b233c3cb71f..dd05ef1e5189 100644
--- a/metadata/md5-cache/dev-perl/Business-ISBN-Data-20210112.6.0
+++ b/metadata/md5-cache/dev-perl/Business-ISBN-Data-20210112.6.0
@@ -5,11 +5,11 @@ DESCRIPTION=Data pack for Business::ISBN
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Business-ISBN-Data
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20210112.006.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=3ce294d6c9250c9c70b46f8c29c245c8
+_md5_=48c4a0acf357b0d1fa66ab2de4d76864
diff --git a/metadata/md5-cache/dev-perl/Business-ISMN-1.202.0 b/metadata/md5-cache/dev-perl/Business-ISMN-1.202.0
index 0785e683b277..aa5306ff6b47 100644
--- a/metadata/md5-cache/dev-perl/Business-ISMN-1.202.0
+++ b/metadata/md5-cache/dev-perl/Business-ISMN-1.202.0
@@ -5,11 +5,11 @@ DESCRIPTION=International Standard Music Numbers
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Business-ISMN
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/Tie-Cycle-1.210.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.202.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=e63f9f3e93d44725a1a58540c3c0d45e
+_md5_=9040c56fa3d96ef527e153d1bccd4bf1
diff --git a/metadata/md5-cache/dev-perl/Business-UPS-2.20.0 b/metadata/md5-cache/dev-perl/Business-UPS-2.20.0
index 787cb36aafd0..8ee09403a09f 100644
--- a/metadata/md5-cache/dev-perl/Business-UPS-2.20.0
+++ b/metadata/md5-cache/dev-perl/Business-UPS-2.20.0
@@ -5,10 +5,10 @@ DESCRIPTION=A UPS Interface Module
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Business-UPS
 IUSE=examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Business-UPS-2.02.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=4c0fc506d88dbf22cb1520e011b32b9c
+_md5_=ca28e88a0e0d56da47a8604ce15bc525
diff --git a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.104.200 b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.104.200
index 421966080d5b..99c8dfac4689 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.104.200
+++ b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.104.200
@@ -5,11 +5,11 @@ DESCRIPTION=Mapping Perl releases on CPAN to the location of the tarballs
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/CPAN-Perl-Releases
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20210420.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=442ee4a05c8d9b50a4bf83933480c637
+_md5_=1328d9c5bdef63e7ca75ef7255f97e94
diff --git a/metadata/md5-cache/dev-perl/CSS-Minifier-XS-0.130.0 b/metadata/md5-cache/dev-perl/CSS-Minifier-XS-0.130.0
index c21ee63ad4aa..ebc9eebe1195 100644
--- a/metadata/md5-cache/dev-perl/CSS-Minifier-XS-0.130.0
+++ b/metadata/md5-cache/dev-perl/CSS-Minifier-XS-0.130.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=XS based CSS minifier
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/CSS-Minifier-XS
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.13.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=1bc47998c74b754d30ef0da9dd152f8f
+_md5_=932a308f2dd8598b733e512f42261d6f
diff --git a/metadata/md5-cache/dev-perl/Cairo-1.109.0 b/metadata/md5-cache/dev-perl/Cairo-1.109.0
index a913e2b8f57b..d14d26ccec20 100644
--- a/metadata/md5-cache/dev-perl/Cairo-1.109.0
+++ b/metadata/md5-cache/dev-perl/Cairo-1.109.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl interface to the cairo library
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Cairo
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/cairo-1.0.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.109.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=a33d7cec26a2d962a0a56be1fb424bb4
+_md5_=38d0a5165eb3fc5164922693ca6f2f59
diff --git a/metadata/md5-cache/dev-perl/Calendar-Simple-2.0.1 b/metadata/md5-cache/dev-perl/Calendar-Simple-2.0.1
index 23430200f1fd..be7a5adc0f94 100644
--- a/metadata/md5-cache/dev-perl/Calendar-Simple-2.0.1
+++ b/metadata/md5-cache/dev-perl/Calendar-Simple-2.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension to create simple calendars
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Calendar-Simple
 IUSE=minimal test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Time-Local !minimal? ( dev-perl/DateTime ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Calendar-Simple-v2.0.1.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=4fb51dad1242d647b5a0f435d0601b34
+_md5_=bd0a780c52d7bfc84f4860b531d34b93
diff --git a/metadata/md5-cache/dev-perl/Carp-Assert-More-1.260.0 b/metadata/md5-cache/dev-perl/Carp-Assert-More-1.260.0
index 69e9c68557c5..eb23b2eb38db 100644
--- a/metadata/md5-cache/dev-perl/Carp-Assert-More-1.260.0
+++ b/metadata/md5-cache/dev-perl/Carp-Assert-More-1.260.0
@@ -5,11 +5,11 @@ DESCRIPTION=convenience wrappers around Carp::Assert
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Carp-Assert-More
 IUSE=test
-KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp dev-perl/Carp-Assert virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.26.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=2fd1b43162bb8be5ff91326bb6019c6a
+_md5_=25e2eb8c7658529fe8b1949b50fd6687
diff --git a/metadata/md5-cache/dev-perl/Class-C3-0.350.0 b/metadata/md5-cache/dev-perl/Class-C3-0.350.0
index 353beeecc29f..ebb0b850d9a9 100644
--- a/metadata/md5-cache/dev-perl/Class-C3-0.350.0
+++ b/metadata/md5-cache/dev-perl/Class-C3-0.350.0
@@ -5,11 +5,11 @@ DESCRIPTION=A pragma to use the C3 method resolution order algortihm
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Class-C3
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Algorithm-C3-0.70.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Class-C3-0.35.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=b453121db4449d31527fe95251091461
+_md5_=f85cc9fccc6f3dd8d18ac2380d06d17a
diff --git a/metadata/md5-cache/dev-perl/Class-Singleton-1.600.0 b/metadata/md5-cache/dev-perl/Class-Singleton-1.600.0
index 588aaecf6692..c5517c92417c 100644
--- a/metadata/md5-cache/dev-perl/Class-Singleton-1.600.0
+++ b/metadata/md5-cache/dev-perl/Class-Singleton-1.600.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Implementation of a Singleton class
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Class-Singleton
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.6.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=318130d319d06a78173f70452fa6dff3
+_md5_=7063c48219424a41f87ac35b261bbbb2
diff --git a/metadata/md5-cache/dev-perl/Clipboard-0.280.0 b/metadata/md5-cache/dev-perl/Clipboard-0.280.0
index b371c98c724d..af65201bf98d 100644
--- a/metadata/md5-cache/dev-perl/Clipboard-0.280.0
+++ b/metadata/md5-cache/dev-perl/Clipboard-0.280.0
@@ -5,11 +5,11 @@ DESCRIPTION=Copy and paste with any OS
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Clipboard
 IUSE=test test
-KEYWORDS=~amd64 ~arm ppc ppc64 ~x86
+KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/CGI virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/URI x11-misc/xclip dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.28.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=c6ea488c7030e8f9e1e8658c04f26858
+_md5_=99b2fd317b59c45a9de5e5c890255f57
diff --git a/metadata/md5-cache/dev-perl/Config-Tiny-2.260.0 b/metadata/md5-cache/dev-perl/Config-Tiny-2.260.0
index 812df551a99c..348178b83a54 100644
--- a/metadata/md5-cache/dev-perl/Config-Tiny-2.260.0
+++ b/metadata/md5-cache/dev-perl/Config-Tiny-2.260.0
@@ -5,11 +5,11 @@ DESCRIPTION=Read/Write .ini style files with as little code as possible
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Config-Tiny
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-3.300.0 >=virtual/perl-File-Temp-0.220.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.26.tgz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=412dbaf8432763d3c206c9092e19a590
+_md5_=6e0d06f601c4f998256942431d71c600
diff --git a/metadata/md5-cache/dev-perl/Convert-Binary-C-0.840.0 b/metadata/md5-cache/dev-perl/Convert-Binary-C-0.840.0
index 3cfa8f2fadf2..07ebe86d9992 100644
--- a/metadata/md5-cache/dev-perl/Convert-Binary-C-0.840.0
+++ b/metadata/md5-cache/dev-perl/Convert-Binary-C-0.840.0
@@ -5,10 +5,10 @@ DESCRIPTION=Binary Data Conversion using C Types
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Convert-Binary-C
 IUSE=examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-1+ Artistic ) BSD
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MH/MHX/Convert-Binary-C-0.84.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=4a26a48988bdfcb0fd6e9328e157a7f1
+_md5_=36f2a43b4587b5141eb2856ad4de36f7
diff --git a/metadata/md5-cache/dev-perl/Convert-UU-0.520.100 b/metadata/md5-cache/dev-perl/Convert-UU-0.520.100
new file mode 100644
index 000000000000..b36816f0e9e1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Convert-UU-0.520.100
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl replacement for uuencode
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Convert-UU
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AN/ANDK/Convert-UU-0.5201.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=9bb2a27dec9949e5dfd886d29ab62b1c
diff --git a/metadata/md5-cache/dev-perl/Convert-UUlib-1.800.0 b/metadata/md5-cache/dev-perl/Convert-UUlib-1.800.0
index 4802ef0660b3..f09df9363bc0 100644
--- a/metadata/md5-cache/dev-perl/Convert-UUlib-1.800.0
+++ b/metadata/md5-cache/dev-perl/Convert-UUlib-1.800.0
@@ -5,11 +5,11 @@ DESCRIPTION=decode uu/xx/b64/mime/yenc/etc-encoded data
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Convert-UUlib
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD CC0-1.0 GPL-1 GPL-2+
 RDEPEND=>=dev-perl/common-sense-3.740.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Convert-UUlib-1.8.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0e62230efa25ad408ff46ee7dde570a2
+_md5_=323077b9aaa8773c30083ba5fabfe239
diff --git a/metadata/md5-cache/dev-perl/Crypt-CBC-3.30.0 b/metadata/md5-cache/dev-perl/Crypt-CBC-3.30.0
index 9f7e154e738e..7372da98e40c 100644
--- a/metadata/md5-cache/dev-perl/Crypt-CBC-3.30.0
+++ b/metadata/md5-cache/dev-perl/Crypt-CBC-3.30.0
@@ -5,11 +5,11 @@ DESCRIPTION=Encrypt Data with Cipher Block Chaining Mode
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-CBC
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~mips ~ppc64 ~sparc
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~mips ~ppc64 ~sparc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/CryptX dev-perl/Crypt-PBKDF2 virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Math-BigInt dev-perl/Math-Int128 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-3.03.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=899a2a534e98ef6c43f4dd69d16c17e9
+_md5_=4daabe44268d5a49433f8bc2726fa687
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-DSA-0.200.0-r1 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-DSA-0.200.0-r1
index 99dcb6451821..6174fdc4eead 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-DSA-0.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-DSA-0.200.0-r1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/openssl:0= dev-lang/perl
 DESCRIPTION=Digital Signature Algorithm using OpenSSL
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-DSA
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/openssl:0= dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-DSA-0.20.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=096890f14b48fbacdc9cc68060b5b7f1
+_md5_=2483bbad0033d6c2ef71d8dceae45256
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.130.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.130.0
index 059998a230d8..eef7e743b2a2 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.130.0
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.130.0
@@ -5,11 +5,11 @@ DESCRIPTION=Guess OpenSSL include path
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-Guess
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec dev-libs/openssl:0= dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.13.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=434f76a783a653786cbc5c184ac350a3
+_md5_=11184cf3736487587b2628b26542f0f7
diff --git a/metadata/md5-cache/dev-perl/Crypt-PBKDF2-0.161.520 b/metadata/md5-cache/dev-perl/Crypt-PBKDF2-0.161.520
index 032f8f519f27..ad2aceb0db5f 100644
--- a/metadata/md5-cache/dev-perl/Crypt-PBKDF2-0.161.520
+++ b/metadata/md5-cache/dev-perl/Crypt-PBKDF2-0.161.520
@@ -5,11 +5,11 @@ DESCRIPTION=The PBKDF2 password hashing algorithm
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-PBKDF2
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Digest-1.160.0 >=dev-perl/Digest-HMAC-1.10.0 virtual/perl-Digest-SHA >=dev-perl/Digest-SHA3-0.220.0 virtual/perl-MIME-Base64 dev-perl/Module-Runtime >=dev-perl/Moo-2.0.0 virtual/perl-Scalar-List-Utils >=dev-perl/Try-Tiny-0.40.0 >=dev-perl/Type-Tiny-1.0.5 dev-perl/namespace-autoclean >=dev-perl/strictures-2.0.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AR/ARODLAND/Crypt-PBKDF2-0.161520.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=735bb2eb4ec4124b7924121d062ab20b
+_md5_=c64c5153036dce387323e0130281c7cf
diff --git a/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.410.0 b/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.410.0
index 6113adf13ab9..806086c9a8a3 100644
--- a/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.410.0
+++ b/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.410.0
@@ -5,11 +5,11 @@ DESCRIPTION=Provides interoperable MD5-based crypt() functions
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-PasswdMD5
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Digest-MD5-2.530.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.41.tgz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=7fb140d1eefbdebd1328f3bfbce5a371
+_md5_=0e833664dff95b5691cb91de0855c4a6
diff --git a/metadata/md5-cache/dev-perl/Crypt-RIPEMD160-0.80.0 b/metadata/md5-cache/dev-perl/Crypt-RIPEMD160-0.80.0
index e77b40321109..f96b47f7247b 100644
--- a/metadata/md5-cache/dev-perl/Crypt-RIPEMD160-0.80.0
+++ b/metadata/md5-cache/dev-perl/Crypt-RIPEMD160-0.80.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension for the RIPEMD-160 Hash function
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-RIPEMD160
 IUSE=test
-KEYWORDS=~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Crypt-RIPEMD160-0.08.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=22fc30f3a68fe607682678ff551ef6e8
+_md5_=c5db8708c280d4b9b44c3229b4a7ecb7
diff --git a/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.160.0 b/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.160.0
index 28a48b48d748..8c92d07704d2 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.160.0
+++ b/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.160.0
@@ -5,11 +5,11 @@ DESCRIPTION=Crypt::CBC compliant Rijndael encryption module
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-Rijndael
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.16.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=384789fb9d06eb4a6a1a2be1b9a53040
+_md5_=ef1855021413fe39bd30f76e63b6732e
diff --git a/metadata/md5-cache/dev-perl/Crypt-Twofish-2.180.0 b/metadata/md5-cache/dev-perl/Crypt-Twofish-2.180.0
index 71ddd5a1a5f1..4716ebe28f6a 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Twofish-2.180.0
+++ b/metadata/md5-cache/dev-perl/Crypt-Twofish-2.180.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=The Twofish Encryption Algorithm
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-Twofish
-KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~amd64 ~ia64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMS/Crypt-Twofish-2.18.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=cd403c4e4927b6c2d74092d882c8cf89
+_md5_=73c16438b10401344462c12c43c4710a
diff --git a/metadata/md5-cache/dev-perl/Crypt-X509-0.540.0 b/metadata/md5-cache/dev-perl/Crypt-X509-0.540.0
index 9493b9ed491c..fbc8bb7614e8 100644
--- a/metadata/md5-cache/dev-perl/Crypt-X509-0.540.0
+++ b/metadata/md5-cache/dev-perl/Crypt-X509-0.540.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parse a X.509 certificate
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-X509
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/Convert-ASN1-0.190.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-X509-0.54.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=0db059a823baaf5fe1aa9729b3112787
+_md5_=d0e0af4a3967408aa3622ebf05a2bce1
diff --git a/metadata/md5-cache/dev-perl/DBD-Pg-3.15.0 b/metadata/md5-cache/dev-perl/DBD-Pg-3.15.0
index e6736b76e01f..668a6cfafa7f 100644
--- a/metadata/md5-cache/dev-perl/DBD-Pg-3.15.0
+++ b/metadata/md5-cache/dev-perl/DBD-Pg-3.15.0
@@ -5,11 +5,11 @@ DESCRIPTION=PostgreSQL database driver for the DBI module
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DBD-Pg
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-version >=dev-perl/DBI-1.614.0 dev-db/postgresql:* dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.15.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=38e2223ccb6caeb59e4e326e7ac1996d
+_md5_=d8ca3ea68b2c4f5a022d15d24171c185
diff --git a/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.210.0 b/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.210.0
index df103e7e86e8..1364bce2bdbc 100644
--- a/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.210.0
+++ b/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.210.0
@@ -5,11 +5,11 @@ DESCRIPTION=Simple, transparent data interface, with caching
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Data-ObjectDriver
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-perl/Class-Trigger dev-perl/DBI virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SIXAPART/Data-ObjectDriver-0.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=09d83bed7de431cb3b331945cb46b8ea
+_md5_=80d86d4ac164f931c33ad4c504eb787c
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-IP-0.300.0 b/metadata/md5-cache/dev-perl/Data-Validate-IP-0.300.0
index e9ddb2ce4039..199a603d426e 100644
--- a/metadata/md5-cache/dev-perl/Data-Validate-IP-0.300.0
+++ b/metadata/md5-cache/dev-perl/Data-Validate-IP-0.300.0
@@ -5,11 +5,11 @@ DESCRIPTION=IPv4 and IPv6 validation methods
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Data-Validate-IP
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter >=dev-perl/NetAddr-IP-4 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.30.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=3c200805284ad3c5c6ce8cb46c4536ba
+_md5_=f992e286ac245684aae82d59f43db170
diff --git a/metadata/md5-cache/dev-perl/Date-Manip-6.850.0 b/metadata/md5-cache/dev-perl/Date-Manip-6.850.0
index f39e50eec866..89c3d50294c8 100644
--- a/metadata/md5-cache/dev-perl/Date-Manip-6.850.0
+++ b/metadata/md5-cache/dev-perl/Date-Manip-6.850.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl date manipulation routines
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Date-Manip
 IUSE=elibc_musl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode virtual/perl-File-Spec virtual/perl-IO virtual/perl-Storable elibc_musl? ( sys-libs/timezone-data ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.85.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=46991defc1c65413e117a0033618ea15
+_md5_=69210d001fb78c4a49a2321c9839b86f
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.540.0 b/metadata/md5-cache/dev-perl/DateTime-1.540.0
index 39dc162fdb4a..c74d22dbcc9b 100644
--- a/metadata/md5-cache/dev-perl/DateTime-1.540.0
+++ b/metadata/md5-cache/dev-perl/DateTime-1.540.0
@@ -5,11 +5,11 @@ DESCRIPTION=A date and time object
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=!<=dev-perl/DateTime-Format-Mail-0.402.0 virtual/perl-Carp >=dev-perl/DateTime-Locale-1.60.0 >=dev-perl/DateTime-TimeZone-2.440.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Params-ValidationCompiler-0.260.0 virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.180.0 dev-perl/Try-Tiny virtual/perl-XSLoader >=dev-perl/namespace-autoclean-0.190.0 virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.54.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=f4dd55e6c93c5025ab8915df92c6db70
+_md5_=02240cf69727097a891dec0851796db8
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0-r1
index adb15505a079..04a08eec3464 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Parse and format SQLite dates and times
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-SQLite
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86 ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.51 >=dev-perl/DateTime-Format-Builder-0.79.01 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/DateTime-Format-SQLite-0.11.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=49c785c311db4bf9dde581228dfc7258
+_md5_=6632e9c330f97e66dfdeabe15d096949
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.80.0 b/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.80.0
index 7d454a86fcde..5e0a27b2cf73 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.80.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.80.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parse and format W3CDTF datetime strings
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-W3CDTF
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.08.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=78a93e5226610dc66e0d6f8e1c2ceedb
+_md5_=e5ede20063c5442a5c7ae83abf6376fc
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-1.320.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-1.320.0
index 7e99810f1f30..77ad2bb88bb5 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Locale-1.320.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-1.320.0
@@ -5,11 +5,11 @@ DESCRIPTION=Localization support for DateTime
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Locale
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ ) unicode
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Exporter dev-perl/File-ShareDir virtual/perl-File-Spec >=dev-perl/Params-ValidationCompiler-0.130.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Specio-0.150.0 virtual/perl-Storable >=dev-perl/namespace-autoclean-0.190.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.32.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=e5797803e642030063040ac3555f84f9
+_md5_=cd0ee90785e617e78a9bfab796816360
diff --git a/metadata/md5-cache/dev-perl/Devel-Hide-0.1.400 b/metadata/md5-cache/dev-perl/Devel-Hide-0.1.400
index d18b10ede6c3..165ae4f66dc4 100644
--- a/metadata/md5-cache/dev-perl/Devel-Hide-0.1.400
+++ b/metadata/md5-cache/dev-perl/Devel-Hide-0.1.400
@@ -5,11 +5,11 @@ DESCRIPTION=Forces the unavailability of specified Perl modules (for testing)
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Devel-Hide
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-Hide-0.0014.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=83b2ef82870537e96a2fff3738475f24
+_md5_=0f5e6306e474fcb11246a3bdc207ba8f
diff --git a/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.7.0 b/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.7.0
index bfe121dde961..d16cca9243d4 100644
--- a/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.7.0
+++ b/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.7.0
@@ -5,11 +5,11 @@ DESCRIPTION=Introspect overloaded operators
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Devel-OverloadInfo
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 dev-perl/MRO-Compat >=dev-perl/Package-Stash-0.140.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.007.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ba19927b57edde912889dc71f57e1076
+_md5_=69e8ef58b23aed5c55dd16665541249f
diff --git a/metadata/md5-cache/dev-perl/Digest-CRC-0.230.0 b/metadata/md5-cache/dev-perl/Digest-CRC-0.230.0
index db0bc9836a09..a15df4689f3d 100644
--- a/metadata/md5-cache/dev-perl/Digest-CRC-0.230.0
+++ b/metadata/md5-cache/dev-perl/Digest-CRC-0.230.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Generic CRC functions
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Digest-CRC
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OL/OLIMAUL/Digest-CRC-0.23.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=d8972fbcea344d928c3140ad0c38bb1c
+_md5_=18ce088e4bb5edf41465e4f8a91c618b
diff --git a/metadata/md5-cache/dev-perl/Digest-HMAC-1.40.0 b/metadata/md5-cache/dev-perl/Digest-HMAC-1.40.0
index 7077af3a064a..70b692b9e272 100644
--- a/metadata/md5-cache/dev-perl/Digest-HMAC-1.40.0
+++ b/metadata/md5-cache/dev-perl/Digest-HMAC-1.40.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Keyed Hashing for Message Authentication
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Digest-HMAC
-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
+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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Digest-MD5-2.0.0 >=virtual/perl-Digest-SHA-1.0.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AR/ARODLAND/Digest-HMAC-1.04.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=5f36291c56ec78feeb9af66191963430
+_md5_=5139c51b1a16789eceb07e9a1b1b0e7f
diff --git a/metadata/md5-cache/dev-perl/Digest-SHA3-1.40.0 b/metadata/md5-cache/dev-perl/Digest-SHA3-1.40.0
index 9c6653d6d29e..27542044efd0 100644
--- a/metadata/md5-cache/dev-perl/Digest-SHA3-1.40.0
+++ b/metadata/md5-cache/dev-perl/Digest-SHA3-1.40.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Perl extension for SHA-3
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Digest-SHA3
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSHELOR/Digest-SHA3-1.04.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=1c6b9b9239dc800259b3ba39c3da7ffe
+_md5_=6c6cc162f65bb3a18dda3a52b8736daf
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0 b/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
index 608d6eda9be8..512d18cac0e2 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
+++ b/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parse a MIME Content-Type Header or Content-Disposition Header
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Email-MIME-ContentType
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ppc ppc64 ~x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Encode-2.870.0 >=virtual/perl-Exporter-5.570.0 dev-perl/Text-Unidecode dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.026.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ddfaa742b7917e6b0c180e590890be79
+_md5_=8a9656aaccba2d9b70d0ad6206cf165d
diff --git a/metadata/md5-cache/dev-perl/Event-1.280.0 b/metadata/md5-cache/dev-perl/Event-1.280.0
index 60e923ecbc51..0f4bc70fd375 100644
--- a/metadata/md5-cache/dev-perl/Event-1.280.0
+++ b/metadata/md5-cache/dev-perl/Event-1.280.0
@@ -5,11 +5,11 @@ DESCRIPTION=Fast, generic event loop
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Event
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ppc ppc64 sparc ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/Event-1.28.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=816f707fb96eaf953e1a200a3fdc43d4
+_md5_=9840a88ec0c6f985dd3f63d456823f48
diff --git a/metadata/md5-cache/dev-perl/Exception-Class-1.450.0 b/metadata/md5-cache/dev-perl/Exception-Class-1.450.0
index dc49be9b65f0..daea7485155e 100644
--- a/metadata/md5-cache/dev-perl/Exception-Class-1.450.0
+++ b/metadata/md5-cache/dev-perl/Exception-Class-1.450.0
@@ -5,11 +5,11 @@ DESCRIPTION=A module that allows you to declare real exception classes in Perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Exception-Class
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Devel-StackTrace-2.0.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.45.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=f582598bd9c4f61cffff94b32031bed6
+_md5_=97c771d5acdc4ffa757832f4ce053724
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.100 b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.100
index 00ba788f7f5c..547eac7ead8f 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.100
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.100
@@ -5,11 +5,11 @@ DESCRIPTION=Easily build XS extensions that depend on XS extensions
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/ExtUtils-Depends
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.8001.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=8e4cb318f7e9e210ff082cfd4aa77350
+_md5_=f39b74708b6ebd122f88fb0b7b1c34aa
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-F77-1.260.0 b/metadata/md5-cache/dev-perl/ExtUtils-F77-1.260.0
index c318b3c146ee..93995b1d08c9 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-F77-1.260.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-F77-1.260.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Simple interface to F77 libs
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/ExtUtils-F77
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-Which virtual/perl-Scalar-List-Utils virtual/perl-Text-ParseWords virtual/fortran dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-F77-1.26.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aeefd4c6e1ed52bdf62ef4641dc0204b
+_md5_=77ba903572dfea166e8f9f28be0fa273
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0 b/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
index db267268c942..ba4ebcaef43f 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
@@ -5,11 +5,11 @@ DESCRIPTION=Check for the presence of a compiler
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/ExtUtils-HasCompiler
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~sparc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-HasCompiler-0.023.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=c13b3aec0dc7e1ffb9488421443bce98
+_md5_=895b42ca16376cf5385ca85e34b98987
diff --git a/metadata/md5-cache/dev-perl/FFI-CheckLib-0.280.0 b/metadata/md5-cache/dev-perl/FFI-CheckLib-0.280.0
index ad386f36c65b..90af496b0324 100644
--- a/metadata/md5-cache/dev-perl/FFI-CheckLib-0.280.0
+++ b/metadata/md5-cache/dev-perl/FFI-CheckLib-0.280.0
@@ -5,11 +5,11 @@ DESCRIPTION=Check that a library is available for FFI
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/FFI-CheckLib
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.330.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.28.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=7a3a87d7bba2a3e25557a1d881b077f5
+_md5_=2d7bc522f45df1a83e8d02a8bcdd8656
diff --git a/metadata/md5-cache/dev-perl/File-Listing-6.140.0 b/metadata/md5-cache/dev-perl/File-Listing-6.140.0
index 118b7fc11786..e158502eb13a 100644
--- a/metadata/md5-cache/dev-perl/File-Listing-6.140.0
+++ b/metadata/md5-cache/dev-perl/File-Listing-6.140.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parse directory listings
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Listing
 IUSE=test
-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
+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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/HTTP-Date virtual/perl-Time-Local dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/File-Listing-6.14.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c01023cf78e7125eb17ac04aefc59ae5
+_md5_=8b679625423b87e4088c4b109aac277e
diff --git a/metadata/md5-cache/dev-perl/File-ReadBackwards-1.60.0 b/metadata/md5-cache/dev-perl/File-ReadBackwards-1.60.0
index 09c1620cac91..5638653a490a 100644
--- a/metadata/md5-cache/dev-perl/File-ReadBackwards-1.60.0
+++ b/metadata/md5-cache/dev-perl/File-ReadBackwards-1.60.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Read a file backwards by lines
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-ReadBackwards
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/File-ReadBackwards-1.06.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ff081913bc20aea125e501a94dd7c044
+_md5_=81e6a1043943ea8e6ed82596dabdab2a
diff --git a/metadata/md5-cache/dev-perl/File-Remove-1.600.0 b/metadata/md5-cache/dev-perl/File-Remove-1.600.0
index 2c13747129e2..2b8b20d75685 100644
--- a/metadata/md5-cache/dev-perl/File-Remove-1.600.0
+++ b/metadata/md5-cache/dev-perl/File-Remove-1.600.0
@@ -5,11 +5,11 @@ DESCRIPTION=Remove files and directories
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Remove
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ ) || ( CC0-1.0 public-domain MIT )
 RDEPEND=virtual/perl-File-Path >=virtual/perl-File-Spec-3.290.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.60.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=41e354fbc2fc4fe0bcd562a3a24c07af
+_md5_=3040fd5e4bcf40e2be66b2a2659a57fd
diff --git a/metadata/md5-cache/dev-perl/File-ShareDir-1.118.0 b/metadata/md5-cache/dev-perl/File-ShareDir-1.118.0
index 42dc0b18cf78..8f08a473d152 100644
--- a/metadata/md5-cache/dev-perl/File-ShareDir-1.118.0
+++ b/metadata/md5-cache/dev-perl/File-ShareDir-1.118.0
@@ -5,11 +5,11 @@ DESCRIPTION=Locate per-dist and per-module shared files
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-ShareDir
 IUSE=minimal test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/List-MoreUtils-0.428.0 >=dev-perl/Params-Util-1.70.0 ) virtual/perl-Carp >=dev-perl/Class-Inspector-1.120.0 >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.118.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=b1c2cfca7accf69f254182248c15347d
+_md5_=fdaba8ef573475b3c1ed41b67bcb6d64
diff --git a/metadata/md5-cache/dev-perl/File-Which-1.270.0 b/metadata/md5-cache/dev-perl/File-Which-1.270.0
index 171364423e5f..dd2c45022a72 100644
--- a/metadata/md5-cache/dev-perl/File-Which-1.270.0
+++ b/metadata/md5-cache/dev-perl/File-Which-1.270.0
@@ -5,7 +5,7 @@ DESCRIPTION=Perl implementation of the which utility as an API
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Which
 IUSE=test pwhich
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=pwhich? ( dev-perl/App-pwhich )
 RDEPEND=dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.27.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=0c9e1dab191ebb39e345f2beffcd094a
+_md5_=627b94083810151965c83707e9794d44
diff --git a/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.109.0 b/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.109.0
index f07139eb0b96..5b82c0d751ac 100644
--- a/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.109.0
+++ b/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.109.0
@@ -5,11 +5,11 @@ DESCRIPTION=Getopt::Long with usage text
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Getopt-Long-Descriptive
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/MooseX-Getopt-0.660.0 virtual/perl-Carp >=virtual/perl-Getopt-Long-2.330.0 >=dev-perl/Params-Validate-0.970.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-0.972.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.109.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=8f44dde90b9331067339d7b9ac4cdf45
+_md5_=3830a01cc0dff7fd7061c81159a84706
diff --git a/metadata/md5-cache/dev-perl/GooCanvas2-CairoTypes-0.1.0 b/metadata/md5-cache/dev-perl/GooCanvas2-CairoTypes-0.1.0
index 4311e003f928..6d9bbee81feb 100644
--- a/metadata/md5-cache/dev-perl/GooCanvas2-CairoTypes-0.1.0
+++ b/metadata/md5-cache/dev-perl/GooCanvas2-CairoTypes-0.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=Bridge between GooCanvas2 and Cairo types
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/GooCanvas2-CairoTypes
 IUSE=test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=x11-libs/goocanvas:2.0[introspection] dev-perl/Cairo dev-perl/glib-perl dev-perl/Gtk3 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AS/ASOKOLOV/GooCanvas2-CairoTypes-0.001.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ee8f7e33fa0283fc99ba93f3b1e24495
+_md5_=d88f03276a80ece311a98f25914aab7d
diff --git a/metadata/md5-cache/dev-perl/Gtk3-ImageView-9.0.0 b/metadata/md5-cache/dev-perl/Gtk3-ImageView-9.0.0
index ddce2f3d4113..647f7dff4a43 100644
--- a/metadata/md5-cache/dev-perl/Gtk3-ImageView-9.0.0
+++ b/metadata/md5-cache/dev-perl/Gtk3-ImageView-9.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Image viewer widget for Gtk3
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Gtk3-ImageView
 IUSE=test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Cairo >=dev-perl/glib-perl-1.210.0 dev-perl/Gtk3 dev-perl/Readonly dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AS/ASOKOLOV/Gtk3-ImageView-9.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=c616a3092fb2ce6daa1dbfb56b8af163
+_md5_=dfc06aac24e08413a353328dea154080
diff --git a/metadata/md5-cache/dev-perl/HTML-Clean-1.400.0 b/metadata/md5-cache/dev-perl/HTML-Clean-1.400.0
index 1e163676345b..d00c27646b79 100644
--- a/metadata/md5-cache/dev-perl/HTML-Clean-1.400.0
+++ b/metadata/md5-cache/dev-perl/HTML-Clean-1.400.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Cleans up HTML code for web browsers, not humans
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTML-Clean
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ppc ppc64 ~s390 sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<app-text/html-xml-utils-5.3 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AZ/AZJADFTRE/HTML-Clean-1.4.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=17a1373814c1c286e1db8920df08399a
+_md5_=852baa68d3405918f27ba8c3a423daf8
diff --git a/metadata/md5-cache/dev-perl/HTML-Form-6.70.0 b/metadata/md5-cache/dev-perl/HTML-Form-6.70.0
index e90efdc23229..e66d70db718a 100644
--- a/metadata/md5-cache/dev-perl/HTML-Form-6.70.0
+++ b/metadata/md5-cache/dev-perl/HTML-Form-6.70.0
@@ -5,11 +5,11 @@ DESCRIPTION=Class that represents an HTML form element
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTML-Form
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp >=virtual/perl-Encode-2 dev-perl/HTML-Parser >=dev-perl/HTTP-Message-6.30.0 >=dev-perl/URI-1.100.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.07.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=dd933676e78a206542f6794bc236ae9e
+_md5_=84063b7e1088bc6861ddaf10b8e988b4
diff --git a/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.210.0 b/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.210.0
index 77d431d3ee8e..35127de79d5a 100644
--- a/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.210.0
+++ b/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.210.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl interface to the htmldoc program for producing PDF-Files from H
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTML-HTMLDoc
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-text/htmldoc >=dev-perl/Devel-CheckBin-0.40.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EC/ECHERNOF/HTML-HTMLDoc-0.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c4e5dfd412a20bbc3f8c6c8499bfcea8
+_md5_=9790c253cfd88e8c11f463c89a79e3dc
diff --git a/metadata/md5-cache/dev-perl/HTML-Object-2.30 b/metadata/md5-cache/dev-perl/HTML-Object-2.30
index bd2ed0ffdc70..aa0435403482 100644
--- a/metadata/md5-cache/dev-perl/HTML-Object-2.30
+++ b/metadata/md5-cache/dev-perl/HTML-Object-2.30
@@ -5,10 +5,10 @@ DESCRIPTION=A HTML development and delivery Perl Module
 EAPI=7
 HOMEPAGE=http://htmlobject.sourceforge.net
 IUSE=examples
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-FormValidator dev-perl/Date-Manip dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://sourceforge/htmlobject/libhtmlobject-perl-2.30.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=67a951333e754471a680642fe7d34ca9
+_md5_=81b355f90cb00b590421ab64f4adcfea
diff --git a/metadata/md5-cache/dev-perl/HTML-Parser-3.760.0 b/metadata/md5-cache/dev-perl/HTML-Parser-3.760.0
index 352c0dccd805..b276feb5517d 100644
--- a/metadata/md5-cache/dev-perl/HTML-Parser-3.760.0
+++ b/metadata/md5-cache/dev-perl/HTML-Parser-3.760.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parse HTML documents
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTML-Parser
 IUSE=test
-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
+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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/HTML-Tagset dev-perl/HTTP-Message virtual/perl-IO dev-perl/URI virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTML-Parser-3.76.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=2a76944a8c627860f1c5e237a3624553
+_md5_=9ee407457e45f4a12101121ab89d5f7d
diff --git a/metadata/md5-cache/dev-perl/HTML-Scrubber-0.190.0 b/metadata/md5-cache/dev-perl/HTML-Scrubber-0.190.0
index 8e46237c329f..7d18dc1d25f9 100644
--- a/metadata/md5-cache/dev-perl/HTML-Scrubber-0.190.0
+++ b/metadata/md5-cache/dev-perl/HTML-Scrubber-0.190.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension for scrubbing/sanitizing html
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTML-Scrubber
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Parser-3.470.0 >=virtual/perl-Scalar-List-Utils-1.330.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NIGELM/HTML-Scrubber-0.19.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=bc95b5f1d062b6e7985800ffc55a59df
+_md5_=a7ce0fbd7c8db775837ff14e6eb15ef7
diff --git a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.310.0 b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.310.0
index 4a02677dce41..ed6731e1705f 100644
--- a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.310.0
+++ b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.310.0
@@ -5,11 +5,11 @@ DESCRIPTION=Determine Web browser, version, and platform from an HTTP user agent
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTTP-BrowserDetect
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~x86
+KEYWORDS=~amd64 ~hppa ~mips ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-BrowserDetect-3.31.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=4553e1e0e566c689541b9ffd1ab9f655
+_md5_=a9e3f81256af10bfa909085d4f454904
diff --git a/metadata/md5-cache/dev-perl/HTTP-Cookies-6.100.0 b/metadata/md5-cache/dev-perl/HTTP-Cookies-6.100.0
index f564fdb772e3..652187039b9f 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Cookies-6.100.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Cookies-6.100.0
@@ -5,11 +5,11 @@ DESCRIPTION=Storage of cookies
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTTP-Cookies
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/HTTP-Message-6.0.0 virtual/perl-Time-Local dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.10.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=df67026db0cff0e436d42d1958c3bb9f
+_md5_=cefba6d944838ed6b05f19b0e427d30c
diff --git a/metadata/md5-cache/dev-perl/HTTP-Date-6.50.0 b/metadata/md5-cache/dev-perl/HTTP-Date-6.50.0
index 9c71d81437fd..cb650821322c 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Date-6.50.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Date-6.50.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Date conversion for HTTP date formats
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTTP-Date
-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
+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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Exporter >=virtual/perl-Time-Local-1.280.0 dev-perl/TimeDate dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Date-6.05.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=828f7b344c0e0800e072b47519f96080
+_md5_=fa4821675aff6505381cac8dbe9a3ba3
diff --git a/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.250.0-r1 b/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.250.0-r1
index 373d5f1684db..bc6c9c969ac5 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.250.0-r1
+++ b/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.250.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=PSGI compliant HTTP Entity Parser
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/HTTP-Entity-Parser
 IUSE=+xs test examples
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ppc ppc64 sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode virtual/perl-File-Temp dev-perl/HTTP-MultiPartParser dev-perl/Hash-MultiValue >=dev-perl/JSON-MaybeXS-1.3.7 virtual/perl-Module-Load dev-perl/Stream-Buffered >=dev-perl/WWW-Form-UrlEncoded-0.230.0 xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.230.0 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.25.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=2cba09de1be0a909dcd8e07991abb21a
+_md5_=00befb60053bd30d086e2bcf11d08652
diff --git a/metadata/md5-cache/dev-perl/HTTP-Message-6.320.0 b/metadata/md5-cache/dev-perl/HTTP-Message-6.320.0
index f545e3038ab2..5dd0a88be606 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Message-6.320.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Message-6.320.0
@@ -5,11 +5,11 @@ DESCRIPTION=Base class for Request/Response
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/HTTP-Message
 IUSE=test test
-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
+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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp virtual/perl-Compress-Raw-Zlib >=virtual/perl-Encode-3.10.0 >=dev-perl/Encode-Locale-1.0.0 >=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec >=dev-perl/HTTP-Date-6.0.0 >=virtual/perl-IO-Compress-2.21.0 dev-perl/IO-HTML >=dev-perl/LWP-MediaTypes-6.0.0 >=virtual/perl-MIME-Base64-2.100.0 >=dev-perl/URI-1.100.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.32.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=a3e4bd6b8e99f064c0e38bc4d2071b50
+_md5_=26ab4ab6421bf7c6de9b4c0e4f12919c
diff --git a/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.500 b/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.500
index cb06b470bb2f..0094e635e664 100644
--- a/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.500
+++ b/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.500
@@ -5,11 +5,11 @@ DESCRIPTION=Capture STDOUT and STDERR from Perl code, subprocesses or XS
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-CaptureOutput
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-File-Temp-0.160.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/IO-CaptureOutput-1.1105.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=9f52990064c46bd60b2e08a70c392e48
+_md5_=555f490e5c642582712ebcaea1154e9a
diff --git a/metadata/md5-cache/dev-perl/IO-HTML-1.4.0 b/metadata/md5-cache/dev-perl/IO-HTML-1.4.0
index b8e854b5c938..2c5cef2f3d38 100644
--- a/metadata/md5-cache/dev-perl/IO-HTML-1.4.0
+++ b/metadata/md5-cache/dev-perl/IO-HTML-1.4.0
@@ -5,11 +5,11 @@ DESCRIPTION=Open an HTML file with automatic charset detection
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-HTML
 IUSE=test
-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
+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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Encode-2.100.0 >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.004.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=3ea8a21d744b9c76ad7295d92e138787
+_md5_=9e21a91528412fc4d5c7904a29db681b
diff --git a/metadata/md5-cache/dev-perl/IO-Interactive-1.23.0 b/metadata/md5-cache/dev-perl/IO-Interactive-1.23.0
index f9b65dc00002..0e751d4d1b66 100644
--- a/metadata/md5-cache/dev-perl/IO-Interactive-1.23.0
+++ b/metadata/md5-cache/dev-perl/IO-Interactive-1.23.0
@@ -5,11 +5,11 @@ DESCRIPTION=Utilities for interactive I/O
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Interactive
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~riscv ~x86
+KEYWORDS=~amd64 ppc ~riscv ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-version-0.780.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.023.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=6f0cdbfac1d608382169d40d9a4d3d15
+_md5_=c3379205e23cf43eb525ba9cc9582d77
diff --git a/metadata/md5-cache/dev-perl/IO-Pager-2.100.0 b/metadata/md5-cache/dev-perl/IO-Pager-2.100.0
index 535330d395c9..2749be0e2e26 100644
--- a/metadata/md5-cache/dev-perl/IO-Pager-2.100.0
+++ b/metadata/md5-cache/dev-perl/IO-Pager-2.100.0
@@ -5,11 +5,11 @@ DESCRIPTION=Select a pager, optionally pipe it output if destination is a TTY
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Pager
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-perl/File-Which virtual/perl-IO dev-perl/TermReadKey dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-2.10.tgz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=e71933e8c49efd660491134d1772ec62
+_md5_=9abdd70fd3037f99c5b9cc6800b0cfd3
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.71.0 b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.71.0
index 8d6586a68e75..2de8ab9860e4 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.71.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.71.0
@@ -5,11 +5,11 @@ DESCRIPTION=Nearly transparent SSL encapsulation for IO::Socket::INET
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Socket-SSL
 IUSE=idn test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Mozilla-CA >=dev-perl/Net-SSLeay-1.460.0 virtual/perl-Scalar-List-Utils idn? ( || ( >=dev-perl/URI-1.50 dev-perl/Net-LibIDN dev-perl/Net-IDN-Encode ) ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.071.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=d32853f02856dbf10d12208b339c6a94
+_md5_=ebf476b2715bc6ca9ca82e31aa869fe4
diff --git a/metadata/md5-cache/dev-perl/IO-Stty-0.40.0 b/metadata/md5-cache/dev-perl/IO-Stty-0.40.0
index cf3402eca110..e68f028c4821 100644
--- a/metadata/md5-cache/dev-perl/IO-Stty-0.40.0
+++ b/metadata/md5-cache/dev-perl/IO-Stty-0.40.0
@@ -5,11 +5,11 @@ DESCRIPTION=Change and print terminal line settings
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Stty
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IO-Stty-0.04.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=edbdb95637ed44276f6ccdac26160917
+_md5_=b2489b610f84ba18402f25f5fbfcc64e
diff --git a/metadata/md5-cache/dev-perl/IO-Tee-0.660.0 b/metadata/md5-cache/dev-perl/IO-Tee-0.660.0
index 0935faaceddc..880cf2c96bf5 100644
--- a/metadata/md5-cache/dev-perl/IO-Tee-0.660.0
+++ b/metadata/md5-cache/dev-perl/IO-Tee-0.660.0
@@ -5,11 +5,11 @@ DESCRIPTION=Multiplex output to multiple output handles
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Tee
 IUSE=test
-KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ia64 ppc sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/IO-Tee-0.66.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=946bfbbb5de0336985dee4dd5d5f7d62
+_md5_=f09c56687a76c998bddf7fb15f10fe11
diff --git a/metadata/md5-cache/dev-perl/IO-Tty-1.160.0 b/metadata/md5-cache/dev-perl/IO-Tty-1.160.0
index 0c32ad8637db..b7f7ad9634fb 100644
--- a/metadata/md5-cache/dev-perl/IO-Tty-1.160.0
+++ b/metadata/md5-cache/dev-perl/IO-Tty-1.160.0
@@ -5,11 +5,11 @@ DESCRIPTION=IO::Tty and IO::Pty modules for Perl
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Tty
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.16.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=ccc46f589e5fdc342c44a676709ad8e0
+_md5_=a7aec858620da2f158779fdfaefb3568
diff --git a/metadata/md5-cache/dev-perl/IPC-Run-20200505.0.0 b/metadata/md5-cache/dev-perl/IPC-Run-20200505.0.0
index b65033377cf3..1d2fe7db2589 100644
--- a/metadata/md5-cache/dev-perl/IPC-Run-20200505.0.0
+++ b/metadata/md5-cache/dev-perl/IPC-Run-20200505.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=system() and background procs w/ piping, redirs, ptys
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IPC-Run
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/IO-Tty-1.80.0 dev-perl/Readonly dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20200505.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=1737170f7dadbe1cf454568bb7b633d4
+_md5_=354ef7c17a70db9e4af836807afe55de
diff --git a/metadata/md5-cache/dev-perl/IPC-System-Simple-1.300.0 b/metadata/md5-cache/dev-perl/IPC-System-Simple-1.300.0
index dff1c518e9a0..e7ae6729f77c 100644
--- a/metadata/md5-cache/dev-perl/IPC-System-Simple-1.300.0
+++ b/metadata/md5-cache/dev-perl/IPC-System-Simple-1.300.0
@@ -5,11 +5,11 @@ DESCRIPTION=Run commands simply, with detailed diagnostics
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IPC-System-Simple
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.30.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=abe9b68e0346bbc3edc58ae2c92bca85
+_md5_=d804bab7fe8fc25f980266399a646a53
diff --git a/metadata/md5-cache/dev-perl/Image-Info-1.420.0 b/metadata/md5-cache/dev-perl/Image-Info-1.420.0
index 486ba4b0eb09..55a4c04d9bbc 100644
--- a/metadata/md5-cache/dev-perl/Image-Info-1.420.0
+++ b/metadata/md5-cache/dev-perl/Image-Info-1.420.0
@@ -5,11 +5,11 @@ DESCRIPTION=The Perl Image-Info Module
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Image-Info
 IUSE=test examples
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~hppa ppc ppc64 sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/IO-stringy-1.01 dev-perl/XML-LibXML dev-perl/XML-Simple dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.42.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=028a297bd882b284fb000341fd22cf90
+_md5_=43989cb1aa7f849cb63024b2905b905a
diff --git a/metadata/md5-cache/dev-perl/Importer-0.26.0 b/metadata/md5-cache/dev-perl/Importer-0.26.0
index 2afbc2019edb..7422fe7ed776 100644
--- a/metadata/md5-cache/dev-perl/Importer-0.26.0
+++ b/metadata/md5-cache/dev-perl/Importer-0.26.0
@@ -5,11 +5,11 @@ DESCRIPTION=Alternative interface to modules that export symbols
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Importer
 IUSE=test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Importer-0.026.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=9df6d617c9d051f0a136e0d2944e3f24
+_md5_=297f64375edcbbff9b44d060be26c188
diff --git a/metadata/md5-cache/dev-perl/Inline-Files-0.710.0 b/metadata/md5-cache/dev-perl/Inline-Files-0.710.0
index 53336d172632..43856ac60b47 100644
--- a/metadata/md5-cache/dev-perl/Inline-Files-0.710.0
+++ b/metadata/md5-cache/dev-perl/Inline-Files-0.710.0
@@ -5,11 +5,11 @@ DESCRIPTION=Multiple virtual files in a single file
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Inline-Files
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
+KEYWORDS=~alpha ~amd64 ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/Inline-Files-0.71.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=e915228c1bcacd55f4704bbe8e87ca51
+_md5_=a133b55b769c24864a27649e80e608ee
diff --git a/metadata/md5-cache/dev-perl/JSON-XS-4.30.0 b/metadata/md5-cache/dev-perl/JSON-XS-4.30.0
index 6634cdb7d8ac..47608c6b52cd 100644
--- a/metadata/md5-cache/dev-perl/JSON-XS-4.30.0
+++ b/metadata/md5-cache/dev-perl/JSON-XS-4.30.0
@@ -5,11 +5,11 @@ DESCRIPTION=JSON::XS - JSON serialising/deserialising, done correctly and fast
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/JSON-XS
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Types-Serialiser dev-perl/common-sense !<dev-perl/JSON-2.900.0 !<dev-perl/JSON-Any-1.310.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.03.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=411f9080ec87eea43a470046c0ea8464
+_md5_=d47db20d6379bad638b1369ccddce580
diff --git a/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.40.0 b/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.40.0
index 5d9967f6b288..74781294ff5c 100644
--- a/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.40.0
+++ b/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.40.0
@@ -5,11 +5,11 @@ DESCRIPTION=Media types and mailcap processing
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/LWP-MediaTypes
 IUSE=test
-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
+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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/LWP-MediaTypes-6.04.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=928182fec3da7dbf6a61243794c4da05
+_md5_=4e313e7b5b3fb3f061d8b2ba9a27f042
diff --git a/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.100.0 b/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.100.0
index 5fa0a8e40e02..f85c07da3370 100644
--- a/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.100.0
+++ b/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.100.0
@@ -5,11 +5,11 @@ DESCRIPTION=Provide https support for LWP::UserAgent
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/LWP-Protocol-https
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-misc/ca-certificates >=dev-perl/IO-Socket-SSL-1.540.0 >=dev-perl/libwww-perl-6.60.0 >=dev-perl/Net-HTTP-6 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.10.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=20912caa287f4b9a59a1f0957850eaee
+_md5_=5b8632132c25ddf9caf9a943f4f89dfd
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Driver-1.2.0 b/metadata/md5-cache/dev-perl/LaTeX-Driver-1.2.0
index 658f8f2ee3fd..e4135a409d7b 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Driver-1.2.0
+++ b/metadata/md5-cache/dev-perl/LaTeX-Driver-1.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl encapsulation of invoking the Latex programs
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/LaTeX-Driver
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny dev-perl/Class-Accessor dev-perl/Exception-Class dev-perl/File-Slurp virtual/perl-File-Spec >=virtual/perl-File-Temp-0.230.0 dev-perl/File-pushd virtual/perl-Getopt-Long dev-perl/Log-Any dev-perl/Readonly virtual/perl-parent virtual/latex-base dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EH/EHUELS/LaTeX-Driver-1.2.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=28296e99af5c26597d47a44807c66445
+_md5_=cf9111753c4191e9451dabb6cc3fd576
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.905.0 b/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.905.0
index d39f5077f3eb..5f273e03cb75 100644
--- a/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.905.0
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.905.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl module to pluralize English words
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Lingua-EN-Inflect
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.905.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=d88edc341339b106cc84f9bde3f8684b
+_md5_=aa6e2ce4f64947de04cf3a06b2f68480
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.380.0 b/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.380.0
index 5c60ef5587bf..e1bca61407b8 100644
--- a/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.380.0
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.380.0
@@ -5,11 +5,11 @@ DESCRIPTION=Routines for manipulating a person's name
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Lingua-EN-NameParse
 IUSE=test examples
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Parse-RecDescent-1 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KI/KIMRYAN/Lingua-EN-NameParse-1.38.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=bccac089ffdcc3fabb356de9f5421aaa
+_md5_=f4e82b26b0ad90efa2a72e70495f0a49
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.50.0 b/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.50.0
index 62bd641b0ab8..6d17c9fbcfdf 100644
--- a/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.50.0
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.50.0
@@ -5,11 +5,11 @@ DESCRIPTION=Convert cardinal numbers(3) to ordinal numbers(3rd)
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Lingua-EN-Numbers-Ordinate
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ppc sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-Numbers-Ordinate-1.05.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=7e01b2e8d6aea38b9fcb37a597b4278b
+_md5_=3a10a69631e9d20266c06ee563d78690
diff --git a/metadata/md5-cache/dev-perl/List-AllUtils-0.190.0 b/metadata/md5-cache/dev-perl/List-AllUtils-0.190.0
index b4aaa5b062af..9f350a2cace3 100644
--- a/metadata/md5-cache/dev-perl/List-AllUtils-0.190.0
+++ b/metadata/md5-cache/dev-perl/List-AllUtils-0.190.0
@@ -5,11 +5,11 @@ DESCRIPTION=Combines many List::* utility modules in one bite-sized package
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/List-AllUtils
 IUSE=test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/List-SomeUtils-0.580.0 >=virtual/perl-Scalar-List-Utils-1.560.0 >=dev-perl/List-UtilsBy-0.110.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.19.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=3d1a7cc4b8de21272f9b6fff684a91a7
+_md5_=e089b161742e41c5c782acaf7e2c2e71
diff --git a/metadata/md5-cache/dev-perl/List-SomeUtils-0.580.0 b/metadata/md5-cache/dev-perl/List-SomeUtils-0.580.0
index 1ec9b0fad114..df572fdb053d 100644
--- a/metadata/md5-cache/dev-perl/List-SomeUtils-0.580.0
+++ b/metadata/md5-cache/dev-perl/List-SomeUtils-0.580.0
@@ -5,11 +5,11 @@ DESCRIPTION=A colletion of List utilities missing from List::Util
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/List-SomeUtils
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/Module-Implementation >=dev-perl/List-SomeUtils-XS-0.550.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-0.58.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=dc1557fa3fae529de8e97313bd1ab69e
+_md5_=74dd879e09ca3181572c1663ba0d03cb
diff --git a/metadata/md5-cache/dev-perl/List-SomeUtils-XS-0.580.0 b/metadata/md5-cache/dev-perl/List-SomeUtils-XS-0.580.0
index 61b38774850b..0eae3a211732 100644
--- a/metadata/md5-cache/dev-perl/List-SomeUtils-XS-0.580.0
+++ b/metadata/md5-cache/dev-perl/List-SomeUtils-XS-0.580.0
@@ -5,11 +5,11 @@ DESCRIPTION=XS implementation for List::SomeUtils
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/List-SomeUtils-XS
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-XS-0.58.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=3599910b2e3766a6d2e4def5bc559b68
+_md5_=fa9410a754ea0ddcbceb31fa8628aa12
diff --git a/metadata/md5-cache/dev-perl/List-UtilsBy-0.110.0 b/metadata/md5-cache/dev-perl/List-UtilsBy-0.110.0
index 96a969410b7b..00d446faa9e2 100644
--- a/metadata/md5-cache/dev-perl/List-UtilsBy-0.110.0
+++ b/metadata/md5-cache/dev-perl/List-UtilsBy-0.110.0
@@ -5,11 +5,11 @@ DESCRIPTION=Higher-order list utility functions
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/List-UtilsBy
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.11.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=157b29a2dd29f88d104787a4561a966b
+_md5_=81c856840d8bde894087fa29ac7e02e1
diff --git a/metadata/md5-cache/dev-perl/Locale-Codes-3.670.0 b/metadata/md5-cache/dev-perl/Locale-Codes-3.670.0
index b25d85f86e1b..17ffbc430238 100644
--- a/metadata/md5-cache/dev-perl/Locale-Codes-3.670.0
+++ b/metadata/md5-cache/dev-perl/Locale-Codes-3.670.0
@@ -5,11 +5,11 @@ DESCRIPTION=A distribution of Perl modules to handle locale codes
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Locale-Codes
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.67.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=b695d84548cc8f908b164110037739fa
+_md5_=1a2530124b1caa8f4db7e1254d1d84c4
diff --git a/metadata/md5-cache/dev-perl/Log-Agent-1.5.0 b/metadata/md5-cache/dev-perl/Log-Agent-1.5.0
index aa8588854f07..ac4d475e7049 100644
--- a/metadata/md5-cache/dev-perl/Log-Agent-1.5.0
+++ b/metadata/md5-cache/dev-perl/Log-Agent-1.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=A general logging framework
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Log-Agent
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MR/MROGASKI/Log-Agent-1.005.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=38607409eceb80f405c5a4d339ed04ea
+_md5_=ade8d562ece598db349707a0874f657d
diff --git a/metadata/md5-cache/dev-perl/Log-Any-1.709.0 b/metadata/md5-cache/dev-perl/Log-Any-1.709.0
index f81863a033c3..a8fed2022bb4 100644
--- a/metadata/md5-cache/dev-perl/Log-Any-1.709.0
+++ b/metadata/md5-cache/dev-perl/Log-Any-1.709.0
@@ -5,11 +5,11 @@ DESCRIPTION=Bringing loggers and listeners together
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Log-Any
 IUSE=minimal test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-IO virtual/perl-Storable virtual/perl-Sys-Syslog virtual/perl-Test-Simple dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-1.709.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=922efb8fb4fb991603ecbf8fadd70f62
+_md5_=6305cfb4d53618000faafbe14337a501
diff --git a/metadata/md5-cache/dev-perl/Log-Dispatch-2.700.0 b/metadata/md5-cache/dev-perl/Log-Dispatch-2.700.0
index 3ad75a17a962..260e9997306e 100644
--- a/metadata/md5-cache/dev-perl/Log-Dispatch-2.700.0
+++ b/metadata/md5-cache/dev-perl/Log-Dispatch-2.700.0
@@ -5,11 +5,11 @@ DESCRIPTION=Dispatches messages to one or more outputs
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Log-Dispatch
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp dev-perl/Devel-GlobalDestruction >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Encode virtual/perl-Exporter virtual/perl-IO dev-perl/Module-Runtime dev-perl/Params-ValidationCompiler virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.320.0 >=virtual/perl-Sys-Syslog-0.280.0 dev-perl/Try-Tiny dev-perl/namespace-autoclean virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.70.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=564eb3d717c39a64bfcaa2ddfcc5a6cd
+_md5_=288fdb93b2cb37c26558ad17e04cf8b8
diff --git a/metadata/md5-cache/dev-perl/Log-Log4perl-1.540.0 b/metadata/md5-cache/dev-perl/Log-Log4perl-1.540.0
index 1675f4c8b429..10678a6a14ea 100644
--- a/metadata/md5-cache/dev-perl/Log-Log4perl-1.540.0
+++ b/metadata/md5-cache/dev-perl/Log-Log4perl-1.540.0
@@ -5,11 +5,11 @@ DESCRIPTION=Log4j implementation for Perl
 EAPI=8
 HOMEPAGE=http://log4perl.sourceforge.net/
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Path-2.70.0 >=virtual/perl-File-Spec-0.820.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/Log-Log4perl-1.54.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=03e72379f4dda8c21ff153d9e53749d5
+_md5_=2ed7ab04114f9e2d2ecef1589932ed0c
diff --git a/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.7.0 b/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.7.0
index beb3df588010..50fe7254c646 100644
--- a/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.7.0
+++ b/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.7.0
@@ -5,11 +5,11 @@ DESCRIPTION=Mail::Box connector via IMAP4
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-Box-IMAP4
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TimeDate dev-perl/Digest-HMAC virtual/perl-Digest-MD5 virtual/perl-File-Spec >=dev-perl/Mail-Box-3 dev-perl/Mail-IMAPClient >=dev-perl/Mail-Message-3 >=dev-perl/Mail-Transport-3 virtual/perl-Scalar-List-Utils !!<dev-perl/Mail-Box-3 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-IMAP4-3.007.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=d9324a6e140651c36482f2bb0540b0fd
+_md5_=84152475a385bc36c4afbe9700b4b588
diff --git a/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.5.0 b/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.5.0
index 961f7fc027bf..3936500ca345 100644
--- a/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.5.0
+++ b/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Mail::Box connector via POP3
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-Box-POP3
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 virtual/perl-File-Spec virtual/perl-IO >=dev-perl/Mail-Message-3 >=dev-perl/Mail-Box-3 virtual/perl-Scalar-List-Utils virtual/perl-Socket !!<dev-perl/Mail-Box-3 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-POP3-3.005.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=f4c7fd64f92b57d1b8862eeab3ec2879
+_md5_=a6aab799321bec4ad4e3941c8e472502
diff --git a/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.430.0 b/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.430.0
index e3d3d69e8738..bc225f0f5d35 100644
--- a/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.430.0
+++ b/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.430.0
@@ -5,11 +5,11 @@ DESCRIPTION=IMAP client module for Perl
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-IMAPClient
 IUSE=test ntlm md5 ssl zlib test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Temp >=virtual/perl-IO-1.260.0 virtual/perl-Scalar-List-Utils virtual/perl-MIME-Base64 >=dev-perl/Parse-RecDescent-1.940.0 ntlm? ( dev-perl/Authen-NTLM ) md5? ( dev-perl/Authen-SASL dev-perl/Digest-HMAC virtual/perl-Digest-MD5 ) ssl? ( dev-perl/IO-Socket-SSL ) zlib? ( virtual/perl-IO-Compress ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.43.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=1ab70b755951a6a0ec4983f42dec8fe9
+_md5_=140e7ea3a68f66ef1d703e560996849b
diff --git a/metadata/md5-cache/dev-perl/Mail-Mbox-MessageParser-1.511.100 b/metadata/md5-cache/dev-perl/Mail-Mbox-MessageParser-1.511.100
index 79af365f4954..57d4eb5ca815 100644
--- a/metadata/md5-cache/dev-perl/Mail-Mbox-MessageParser-1.511.100
+++ b/metadata/md5-cache/dev-perl/Mail-Mbox-MessageParser-1.511.100
@@ -5,11 +5,11 @@ DESCRIPTION=A fast and simple mbox folder reader
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-Mbox-MessageParser
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/FileHandle-Unget virtual/perl-Storable dev-perl/File-Slurper dev-perl/URI dev-perl/Text-Diff dev-perl/UNIVERSAL-require dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCOPPIT/Mail-Mbox-MessageParser-1.5111.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=8ef467c3854a9219bb9fc8943aa9b8b3
+_md5_=0aaf903521f9e9e0c3d05adb454c785b
diff --git a/metadata/md5-cache/dev-perl/Mail-Message-3.10.0 b/metadata/md5-cache/dev-perl/Mail-Message-3.10.0
index df823301b650..8f3d3e0c1e62 100644
--- a/metadata/md5-cache/dev-perl/Mail-Message-3.10.0
+++ b/metadata/md5-cache/dev-perl/Mail-Message-3.10.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-perl/TimeDate >=virtual/perl-Encode-2.260.0 >=virtual/perl-File-Spec-0.700.0 virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.4.0 >=dev-perl/MailTools-2.170.0 >=virtual/perl-Scalar-List-Utils-1.130.0 >=dev-perl/URI-1.230.0 >=dev-perl/User-Identity-1.0.0 !!<dev-perl/Mail-Box-3 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+BDEPEND=dev-perl/TimeDate >=virtual/perl-Encode-2.260.0 >=virtual/perl-File-Spec-0.700.0 dev-perl/IO-stringy virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.4.0 >=dev-perl/MailTools-2.170.0 >=virtual/perl-Scalar-List-Utils-1.130.0 >=dev-perl/URI-1.230.0 >=dev-perl/User-Identity-1.0.0 !!<dev-perl/Mail-Box-3 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-lang/perl
 DESCRIPTION=General Message Object for MIME Messsage Handling
@@ -7,9 +7,9 @@ HOMEPAGE=https://metacpan.org/release/Mail-Message
 IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/TimeDate >=virtual/perl-Encode-2.260.0 >=virtual/perl-File-Spec-0.700.0 virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.4.0 >=dev-perl/MailTools-2.170.0 >=virtual/perl-Scalar-List-Utils-1.130.0 >=dev-perl/URI-1.230.0 >=dev-perl/User-Identity-1.0.0 !!<dev-perl/Mail-Box-3 dev-lang/perl:=
+RDEPEND=dev-perl/TimeDate >=virtual/perl-Encode-2.260.0 >=virtual/perl-File-Spec-0.700.0 dev-perl/IO-stringy virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.4.0 >=dev-perl/MailTools-2.170.0 >=virtual/perl-Scalar-List-Utils-1.130.0 >=dev-perl/URI-1.230.0 >=dev-perl/User-Identity-1.0.0 !!<dev-perl/Mail-Box-3 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.010.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=61013e503b4acb544f773b0ca63dce22
+_md5_=53c812b7474e344b629eba9d3d5ad3d7
diff --git a/metadata/md5-cache/dev-perl/Mail-Transport-3.5.0 b/metadata/md5-cache/dev-perl/Mail-Transport-3.5.0
index f2d3a4c086a0..ec16506e69a1 100644
--- a/metadata/md5-cache/dev-perl/Mail-Transport-3.5.0
+++ b/metadata/md5-cache/dev-perl/Mail-Transport-3.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Base class for Email Message Exchange
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-Transport
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-File-Spec-0.700.0 virtual/perl-IO >=dev-perl/Mail-Message-3 virtual/perl-Scalar-List-Utils virtual/perl-libnet !!<dev-perl/Mail-Box-3 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.005.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=e11e314f6290396cb0f4a536fc7b6153
+_md5_=697e6e809f81f824814cfd886127d7e6
diff --git a/metadata/md5-cache/dev-perl/MailTools-2.210.0 b/metadata/md5-cache/dev-perl/MailTools-2.210.0
index 5f8c1675934c..2208956fbf70 100644
--- a/metadata/md5-cache/dev-perl/MailTools-2.210.0
+++ b/metadata/md5-cache/dev-perl/MailTools-2.210.0
@@ -5,11 +5,11 @@ DESCRIPTION=Manipulation of electronic mail addresses
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/MailTools
 IUSE=test examples
-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 ~x64-solaris ~x86-solaris
+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 ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TimeDate virtual/perl-IO >=virtual/perl-libnet-1.50.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=7d0d88bf2f1c7d0cd40e233b167613e7
+_md5_=8c9a62babfdaeb9cb99affad71d79e89
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 82a3e32021a7..d683b88a26da 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Math-Int128-0.220.0 b/metadata/md5-cache/dev-perl/Math-Int128-0.220.0
index bb88c6258e50..12e87b252e87 100644
--- a/metadata/md5-cache/dev-perl/Math-Int128-0.220.0
+++ b/metadata/md5-cache/dev-perl/Math-Int128-0.220.0
@@ -5,11 +5,11 @@ DESCRIPTION=Manipulate 128 bits integers in Perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Math-Int128
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 -arm ~arm64 ~ia64 ~mips -ppc ~ppc64 ~sparc -x86
+KEYWORDS=~alpha amd64 -arm ~arm64 ~ia64 ~mips -ppc ~ppc64 ~sparc -x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter >=dev-perl/Math-Int64-0.510.0 virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Math-Int128-0.22.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=7d8056ac6a64c8ccb8dfcaf28d9708ed
+_md5_=9cb85ec17906b6b990dc45ac51691bac
diff --git a/metadata/md5-cache/dev-perl/Math-Int64-0.540.0 b/metadata/md5-cache/dev-perl/Math-Int64-0.540.0
index 665583b58b71..1ca41e735e1a 100644
--- a/metadata/md5-cache/dev-perl/Math-Int64-0.540.0
+++ b/metadata/md5-cache/dev-perl/Math-Int64-0.540.0
@@ -5,11 +5,11 @@ DESCRIPTION=Manipulate 64 bits integers in Perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Math-Int64
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Math-Int64-0.54.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=8ae5411c59b835698423429509376ae7
+_md5_=ff3f131f6c3f69da16dadff54306d006
diff --git a/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0-r1 b/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0-r1
deleted file mode 100644
index cd7c28f1b98d..000000000000
--- a/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Perl extension for merging IPv4 or IPv6 CIDR addresses
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Net-CIDR-Lite
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DO/DOUGW/Net-CIDR-Lite-0.21.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=0a376368ef59ffbf81356e8978d5fb81
diff --git a/metadata/md5-cache/dev-perl/PDL-2.54.0 b/metadata/md5-cache/dev-perl/PDL-2.54.0
new file mode 100644
index 000000000000..2cb095c56810
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PDL-2.54.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-libs/ncurses:0= app-arch/sharutils dev-perl/Astro-FITS-Header dev-perl/Convert-UU >=virtual/perl-Data-Dumper-2.121.0 >=dev-perl/File-Map-0.570.0 >=virtual/perl-Filter-Simple-0.880.0 dev-perl/Filter >=dev-perl/Inline-0.830.0 >=dev-perl/Inline-C-0.620.0 >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Module-Compile >=dev-perl/OpenGL-0.700.0 >=dev-perl/TermReadKey-2.340.0 || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) >=virtual/perl-Data-Dumper-2.121.0 dev-perl/Pod-Parser virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Filter-Simple virtual/perl-Storable >=virtual/perl-Text-Balanced-1.890.0 fortran? ( >=dev-perl/ExtUtils-F77-1.260.0 ) gd? ( media-libs/gd ) gsl? ( sci-libs/gsl ) hdf? ( sci-libs/hdf dev-perl/Alien-HDF4 ) netpbm? ( media-libs/netpbm media-video/ffmpeg ) pdl2? ( >=dev-perl/Devel-REPL-1.3.11 || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) ) pgplot? ( dev-perl/PGPLOT ) >=virtual/perl-Carp-1.200.0 >=dev-perl/Devel-CheckLib-1.10.0 >=dev-perl/ExtUtils-Depends-0.402.0 >=virtual/perl-ExtUtils-MakeMaker-7.120.0 >=virtual/perl-ExtUtils-ParseXS-3.10.0 virtual/perl-File-Path fortran? ( >=dev-perl/ExtUtils-F77-1.130.0 ) test? ( dev-perl/Test-Exception dev-perl/Test-Warn dev-perl/Test-Deep ) dev-lang/perl test? ( virtual/perl-Test-Simple ) fortran? ( virtual/fortran )
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=sys-libs/ncurses:0= app-arch/sharutils dev-perl/Astro-FITS-Header dev-perl/Convert-UU >=virtual/perl-Data-Dumper-2.121.0 >=dev-perl/File-Map-0.570.0 >=virtual/perl-Filter-Simple-0.880.0 dev-perl/Filter >=dev-perl/Inline-0.830.0 >=dev-perl/Inline-C-0.620.0 >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Module-Compile >=dev-perl/OpenGL-0.700.0 >=dev-perl/TermReadKey-2.340.0 || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) >=virtual/perl-Data-Dumper-2.121.0 dev-perl/Pod-Parser virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Filter-Simple virtual/perl-Storable >=virtual/perl-Text-Balanced-1.890.0 fortran? ( >=dev-perl/ExtUtils-F77-1.260.0 ) gd? ( media-libs/gd ) gsl? ( sci-libs/gsl ) hdf? ( sci-libs/hdf dev-perl/Alien-HDF4 ) netpbm? ( media-libs/netpbm media-video/ffmpeg ) pdl2? ( >=dev-perl/Devel-REPL-1.3.11 || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) ) pgplot? ( dev-perl/PGPLOT ) dev-lang/perl fortran? ( virtual/fortran )
+DESCRIPTION=Perl Data Language for scientific computing
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PDL
+IUSE=+badval doc fortran gd gsl hdf netpbm pdl2 pgplot threads test test examples
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ ) public-domain PerlDL
+RDEPEND=sys-libs/ncurses:0= app-arch/sharutils dev-perl/Astro-FITS-Header dev-perl/Convert-UU >=virtual/perl-Data-Dumper-2.121.0 >=dev-perl/File-Map-0.570.0 >=virtual/perl-Filter-Simple-0.880.0 dev-perl/Filter >=dev-perl/Inline-0.830.0 >=dev-perl/Inline-C-0.620.0 >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Module-Compile >=dev-perl/OpenGL-0.700.0 >=dev-perl/TermReadKey-2.340.0 || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) >=virtual/perl-Data-Dumper-2.121.0 dev-perl/Pod-Parser virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Filter-Simple virtual/perl-Storable >=virtual/perl-Text-Balanced-1.890.0 fortran? ( >=dev-perl/ExtUtils-F77-1.260.0 ) gd? ( media-libs/gd ) gsl? ( sci-libs/gsl ) hdf? ( sci-libs/hdf dev-perl/Alien-HDF4 ) netpbm? ( media-libs/netpbm media-video/ffmpeg ) pdl2? ( >=dev-perl/Devel-REPL-1.3.11 || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) ) pgplot? ( dev-perl/PGPLOT ) dev-lang/perl:= fortran? ( virtual/fortran )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/PDL-2.054.tar.gz
+_eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=75dc3c480ba0141af6b6d1a33605d57d
diff --git a/metadata/md5-cache/dev-perl/PDL-Graphics-Gnuplot-2.16.0 b/metadata/md5-cache/dev-perl/PDL-Graphics-Gnuplot-2.16.0
deleted file mode 100644
index a7978aeefd49..000000000000
--- a/metadata/md5-cache/dev-perl/PDL-Graphics-Gnuplot-2.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-perl/Alien-Gnuplot virtual/perl-IO dev-perl/IPC-Run virtual/perl-Scalar-List-Utils dev-perl/PDL dev-perl/PDL-Transform-Color dev-perl/Safe-Isa virtual/perl-Storable virtual/perl-Time-HiRes || ( sci-visualization/gnuplot[X] sci-visualization/gnuplot[qt4(-)] ) >=virtual/perl-ExtUtils-MakeMaker-6.480.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Gnuplot-based plotting for PDL
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/PDL-Graphics-Gnuplot
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Alien-Gnuplot virtual/perl-IO dev-perl/IPC-Run virtual/perl-Scalar-List-Utils dev-perl/PDL dev-perl/PDL-Transform-Color dev-perl/Safe-Isa virtual/perl-Storable virtual/perl-Time-HiRes || ( sci-visualization/gnuplot[X] sci-visualization/gnuplot[qt4(-)] ) dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/PDL-Graphics-Gnuplot-2.016.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=7e009e8f17c52498853adb33d410635e
diff --git a/metadata/md5-cache/dev-perl/PDL-Transform-Color-1.5.0 b/metadata/md5-cache/dev-perl/PDL-Transform-Color-1.5.0
new file mode 100644
index 000000000000..5f217e065be7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PDL-Transform-Color-1.5.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/PDL dev-perl/Safe-Isa virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Useful color system conversions for PDL
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PDL-Transform-Color
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/PDL dev-perl/Safe-Isa dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/PDL-Transform-Color-1.005.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=5022c9916932e3f12037e239dfe0df99
diff --git a/metadata/md5-cache/dev-perl/PGPLOT-2.270.0 b/metadata/md5-cache/dev-perl/PGPLOT-2.270.0
new file mode 100644
index 000000000000..6b9edda19145
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PGPLOT-2.270.0
@@ -0,0 +1,15 @@
+BDEPEND=sci-libs/pgplot >=dev-perl/Devel-CheckLib-1.140.0 >=dev-perl/ExtUtils-F77-1.130.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-libs/pgplot dev-lang/perl
+DESCRIPTION=allow subroutines in the PGPLOT graphics library to be called from Perl
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PGPLOT
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=sci-libs/pgplot dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/PGPLOT-2.27.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=e458d54e42fa49a3af0a0ee05c62301e
diff --git a/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1 b/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1
deleted file mode 100644
index b96e679e5053..000000000000
--- a/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Convert PHP's serialize() into the equivalent Perl structure, and vice versa
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/PHP-Serialization
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b3d9d4681873c68883cd8433abbca100
diff --git a/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r2 b/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r2
new file mode 100644
index 000000000000..572c79eaef68
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Convert PHP's serialize() into the equivalent Perl structure, and vice versa
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PHP-Serialization
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=a8b4eeed8ac64f2239b9e8e427f3f14d
diff --git a/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1 b/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1
deleted file mode 100644
index 4b9d75056c14..000000000000
--- a/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Devel-Size >=dev-perl/POE-1.311.0 >=virtual/perl-ExtUtils-MakeMaker-6.31 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Peek into the internals of a running POE env
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/POE-API-Peek
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-perl/Devel-Size >=dev-perl/POE-1.311.0 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/POE-API-Peek-2.20.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=07107d5880ddffd1bbb0ee2f1a24a614
diff --git a/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r2 b/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r2
new file mode 100644
index 000000000000..31ccac123c6c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Devel-Size >=dev-perl/POE-1.311.0 >=virtual/perl-ExtUtils-MakeMaker-6.310.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Peek into the internals of a running POE env
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/POE-API-Peek
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-perl/Devel-Size >=dev-perl/POE-1.311.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/POE-API-Peek-2.20.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=10f08b575fd3ba4a48a2f54548319422
diff --git a/metadata/md5-cache/dev-perl/POE-Component-Client-DNS-1.54.0 b/metadata/md5-cache/dev-perl/POE-Component-Client-DNS-1.54.0
deleted file mode 100644
index 9dc88beda766..000000000000
--- a/metadata/md5-cache/dev-perl/POE-Component-Client-DNS-1.54.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Net-DNS-0.650.0 >=dev-perl/POE-1.294.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.960.0 >=dev-perl/Test-NoWarnings-1.20.0 ) dev-lang/perl
-DESCRIPTION=Non-blocking, parallel DNS client
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/POE-Component-Client-DNS
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Net-DNS-0.650.0 >=dev-perl/POE-1.294.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Component-Client-DNS-1.054.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=2b09be55fd43afcfc350237468e5c382
diff --git a/metadata/md5-cache/dev-perl/POE-Component-Client-DNS-1.54.0-r1 b/metadata/md5-cache/dev-perl/POE-Component-Client-DNS-1.54.0-r1
new file mode 100644
index 000000000000..226fef1b1992
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/POE-Component-Client-DNS-1.54.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Net-DNS-0.650.0 >=dev-perl/POE-1.294.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.960.0 >=dev-perl/Test-NoWarnings-1.20.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Non-blocking, parallel DNS client
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/POE-Component-Client-DNS
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Net-DNS-0.650.0 >=dev-perl/POE-1.294.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Component-Client-DNS-1.054.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=0b2bbdadfea1b9faf715fc06dbed7e76
diff --git a/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0 b/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0
deleted file mode 100644
index 82ab2a8c768b..000000000000
--- a/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Net-IP-Minimal-0.20.0 >=dev-perl/POE-1.311.0 >=dev-perl/POE-Component-Resolver-0.917.0 >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Manage connections, with keep-alive
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/POE-Component-Client-Keepalive
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Net-IP-Minimal-0.20.0 >=dev-perl/POE-1.311.0 >=dev-perl/POE-Component-Resolver-0.917.0 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Component-Client-Keepalive-0.272.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6a75a75b03d406a7f232ef56bfa4fd31
diff --git a/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0-r1 b/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0-r1
new file mode 100644
index 000000000000..e3e20dd66a40
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Net-IP-Minimal-0.20.0 >=dev-perl/POE-1.311.0 >=dev-perl/POE-Component-Resolver-0.917.0 >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Manage connections, with keep-alive
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/POE-Component-Client-Keepalive
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Net-IP-Minimal-0.20.0 >=dev-perl/POE-1.311.0 >=dev-perl/POE-Component-Resolver-0.917.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Component-Client-Keepalive-0.272.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=a78ac2ea2ae50c42037ecf5d45262b67
diff --git a/metadata/md5-cache/dev-perl/POE-Component-IKC-0.240.200 b/metadata/md5-cache/dev-perl/POE-Component-IKC-0.240.200
deleted file mode 100644
index da74e2f5dc58..000000000000
--- a/metadata/md5-cache/dev-perl/POE-Component-IKC-0.240.200
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Data-Dump-1.0.0 >=dev-perl/Devel-Size-0.770.0 >=dev-perl/POE-1.311.0 >=virtual/perl-Scalar-List-Utils-1.0.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.600.0 ) dev-lang/perl
-DESCRIPTION=Inter-Kernel Communication for POE
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/POE-Component-IKC
-IUSE=test examples
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Data-Dump-1.0.0 >=dev-perl/Devel-Size-0.770.0 >=dev-perl/POE-1.311.0 >=virtual/perl-Scalar-List-Utils-1.0.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GW/GWYN/POE-Component-IKC-0.2402.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=1b50ea8e2b1be0a3d798c7f05ff04c7b
diff --git a/metadata/md5-cache/dev-perl/POE-Component-IKC-0.240.200-r1 b/metadata/md5-cache/dev-perl/POE-Component-IKC-0.240.200-r1
new file mode 100644
index 000000000000..c024618be4d4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/POE-Component-IKC-0.240.200-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Data-Dump-1.0.0 >=dev-perl/Devel-Size-0.770.0 >=dev-perl/POE-1.311.0 >=virtual/perl-Scalar-List-Utils-1.0.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.600.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Inter-Kernel Communication for POE
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/POE-Component-IKC
+IUSE=examples test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Data-Dump-1.0.0 >=dev-perl/Devel-Size-0.770.0 >=dev-perl/POE-1.311.0 >=virtual/perl-Scalar-List-Utils-1.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GW/GWYN/POE-Component-IKC-0.2402.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=e206bbcf9487e8131a446c1a324efd57
diff --git a/metadata/md5-cache/dev-perl/POE-Component-PreforkDispatch-0.101.0-r2 b/metadata/md5-cache/dev-perl/POE-Component-PreforkDispatch-0.101.0-r2
deleted file mode 100644
index 6920ab91a611..000000000000
--- a/metadata/md5-cache/dev-perl/POE-Component-PreforkDispatch-0.101.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Error dev-perl/IO-Capture dev-perl/Params-Validate dev-perl/POE dev-perl/Module-Build dev-lang/perl
-DESCRIPTION=Preforking task dispatcher
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/POE-Component-PreforkDispatch
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Error dev-perl/IO-Capture dev-perl/Params-Validate dev-perl/POE dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/EW/EWATERS/POE-Component-PreforkDispatch-0.101.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=84b22bcfb7b67b515b7ad065e4f041fe
diff --git a/metadata/md5-cache/dev-perl/POE-Component-PreforkDispatch-0.101.0-r3 b/metadata/md5-cache/dev-perl/POE-Component-PreforkDispatch-0.101.0-r3
new file mode 100644
index 000000000000..fe5b32bf1afe
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/POE-Component-PreforkDispatch-0.101.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Error dev-perl/IO-Capture dev-perl/Params-Validate dev-perl/POE dev-perl/Module-Build dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Preforking task dispatcher
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/POE-Component-PreforkDispatch
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Error dev-perl/IO-Capture dev-perl/Params-Validate dev-perl/POE dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/EW/EWATERS/POE-Component-PreforkDispatch-0.101.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=f20381e0bb1cb659b31a14518c05e2f2
diff --git a/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0 b/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0
deleted file mode 100644
index e779345b824c..000000000000
--- a/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/POE-1.311.0 >=virtual/perl-Scalar-List-Utils-1.230.0 >=virtual/perl-Socket-2.1.0 >=virtual/perl-Storable-2.180.0 >=virtual/perl-Test-Simple-0.96 >=virtual/perl-Time-HiRes-1.971.100 >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/perl:=[-build(-)]
-DESCRIPTION=A non-blocking getaddrinfo() resolver
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/POE-Component-Resolver
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/POE-1.311.0 >=virtual/perl-Scalar-List-Utils-1.230.0 >=virtual/perl-Socket-2.1.0 >=virtual/perl-Storable-2.180.0 >=virtual/perl-Test-Simple-0.96 >=virtual/perl-Time-HiRes-1.971.100 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Component-Resolver-0.921.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2d579710e023b99216780d6eedcffb9f
diff --git a/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0-r1 b/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0-r1
new file mode 100644
index 000000000000..03d5554ed88e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/POE-1.311.0 >=virtual/perl-Scalar-List-Utils-1.230.0 >=virtual/perl-Socket-2.1.0 >=virtual/perl-Storable-2.180.0 >=virtual/perl-Test-Simple-0.96 >=virtual/perl-Time-HiRes-1.971.100 >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A non-blocking getaddrinfo() resolver
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/POE-Component-Resolver
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/POE-1.311.0 >=virtual/perl-Scalar-List-Utils-1.230.0 >=virtual/perl-Socket-2.1.0 >=virtual/perl-Storable-2.180.0 >=virtual/perl-Test-Simple-0.96 >=virtual/perl-Time-HiRes-1.971.100 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Component-Resolver-0.921.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=05205568262834517e62d5ded554a48d
diff --git a/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0 b/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0
deleted file mode 100644
index b2f2f7fc80cc..000000000000
--- a/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Reusable tests for POE::Loop authors
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/POE-Test-Loops
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Test-Loops-1.360.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5a41aaf749741fa8ff6ed581c281d1d5
diff --git a/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0-r1 b/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0-r1
new file mode 100644
index 000000000000..5bc070e6e625
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Reusable tests for POE::Loop authors
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/POE-Test-Loops
+IUSE=test
+KEYWORDS=amd64 ppc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Test-Loops-1.360.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=4f7b4d1e41b6218066e37ed5912622ad
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0 b/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0
deleted file mode 100644
index 289c6911d6b6..000000000000
--- a/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/POE-1.287 >=dev-perl/POE-Test-Loops-1.033 dev-lang/perl:=[-build(-)]
-DESCRIPTION=An XS implementation of POE::Loop, using Linux epoll(2)
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/POE-XS-Loop-EPoll
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/POE-1.287 >=dev-perl/POE-Test-Loops-1.033 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Loop-EPoll-1.003.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=608165a9343a051c0ac0d2233a7d0d8f
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0-r1 b/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0-r1
new file mode 100644
index 000000000000..4a54b2236a42
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/POE-1.287.0 >=dev-perl/POE-Test-Loops-1.33.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=An XS implementation of POE::Loop, using Linux epoll(2)
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/POE-XS-Loop-EPoll
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/POE-1.287.0 >=dev-perl/POE-Test-Loops-1.33.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Loop-EPoll-1.003.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=de0aa771c63d4fdf34a9bd83531fdcee
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1 b/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
deleted file mode 100644
index 3315d72ce8a1..000000000000
--- a/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/POE-1.287 >=dev-perl/POE-Test-Loops-1.033 dev-lang/perl:=[-build(-)]
-DESCRIPTION=An XS implementation of POE::Loop, using poll(2)
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/POE-XS-Loop-Poll
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/POE-1.287 >=dev-perl/POE-Test-Loops-1.033 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Loop-Poll-1.000.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bd4864fdc9193df11c9fccc91221240b
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r2 b/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r2
new file mode 100644
index 000000000000..ba644bfb604f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/POE-1.287.0 >=dev-perl/POE-Test-Loops-1.33.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=An XS implementation of POE::Loop, using poll(2)
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/POE-XS-Loop-Poll
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/POE-1.287.0 >=dev-perl/POE-Test-Loops-1.33.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Loop-Poll-1.000.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=5987ad9d573aa023b51b900e27848c7e
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1 b/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1
deleted file mode 100644
index 68d27d2ed29f..000000000000
--- a/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/POE dev-lang/perl:=[-build(-)]
-DESCRIPTION=An XS implementation of POE::Queue::Array
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/POE-XS-Queue-Array
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/POE dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Queue-Array-0.006.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=58b6fb101a2b61256e8cdcdfa36687db
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r2 b/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r2
new file mode 100644
index 000000000000..5d30ae08160c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/POE dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=An XS implementation of POE::Queue::Array
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/POE-XS-Queue-Array
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/POE dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Queue-Array-0.006.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=8ceafae0cc023f3862192933ad2b81f3
diff --git a/metadata/md5-cache/dev-perl/POSIX-strftime-Compiler-0.440.0 b/metadata/md5-cache/dev-perl/POSIX-strftime-Compiler-0.440.0
new file mode 100644
index 000000000000..eacbf307c6ac
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/POSIX-strftime-Compiler-0.440.0
@@ -0,0 +1,15 @@
+BDEPEND=!minimal? ( dev-perl/Time-TZOffset ) virtual/perl-Carp virtual/perl-Exporter virtual/perl-Time-Local >=dev-perl/Module-Build-Tiny-0.35.0 virtual/perl-CPAN-Meta test? ( >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=GNU C library compatible strftime for loggers and servers
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/POSIX-strftime-Compiler
+IUSE=minimal test examples
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!minimal? ( dev-perl/Time-TZOffset ) virtual/perl-Carp virtual/perl-Exporter virtual/perl-Time-Local dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/POSIX-strftime-Compiler-0.44.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=3a8f08091ba74dfaea4e4de40b3392de
diff --git a/metadata/md5-cache/dev-perl/PPI-1.270.0 b/metadata/md5-cache/dev-perl/PPI-1.270.0
deleted file mode 100644
index 32aeb322be3d..000000000000
--- a/metadata/md5-cache/dev-perl/PPI-1.270.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp >=dev-perl/Clone-0.300.0 >=virtual/perl-Digest-MD5-2.350.0 virtual/perl-Exporter virtual/perl-File-Spec >=dev-perl/IO-String-1.70.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Params-Util-1.000.0 >=virtual/perl-Storable-2.170.0 dev-perl/Task-Weaken virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Class-Inspector-1.220.0 virtual/perl-Encode >=dev-perl/File-Remove-1.420.0 virtual/perl-File-Temp dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-NoWarnings >=dev-perl/Test-Object-0.70.0 >=dev-perl/Test-SubCalls-1.70.0 ) dev-lang/perl
-DESCRIPTION=Parse, Analyze and Manipulate Perl (without perl)
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/PPI
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp >=dev-perl/Clone-0.300.0 >=virtual/perl-Digest-MD5-2.350.0 virtual/perl-Exporter virtual/perl-File-Spec >=dev-perl/IO-String-1.70.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Params-Util-1.000.0 >=virtual/perl-Storable-2.170.0 dev-perl/Task-Weaken dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.270.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=5bbede680a99ec8026c9c8b13029042b
diff --git a/metadata/md5-cache/dev-perl/PPI-1.270.0-r1 b/metadata/md5-cache/dev-perl/PPI-1.270.0-r1
new file mode 100644
index 000000000000..96750547b90c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PPI-1.270.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/Clone-0.300.0 >=virtual/perl-Digest-MD5-2.350.0 virtual/perl-Exporter virtual/perl-File-Spec >=dev-perl/IO-String-1.70.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Params-Util-1.000.0 >=virtual/perl-Storable-2.170.0 dev-perl/Task-Weaken virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Class-Inspector-1.220.0 virtual/perl-Encode >=dev-perl/File-Remove-1.420.0 virtual/perl-File-Temp dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-NoWarnings >=dev-perl/Test-Object-0.70.0 >=dev-perl/Test-SubCalls-1.70.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Parse, Analyze and Manipulate Perl (without perl)
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PPI
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=dev-perl/Clone-0.300.0 >=virtual/perl-Digest-MD5-2.350.0 virtual/perl-Exporter virtual/perl-File-Spec >=dev-perl/IO-String-1.70.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Params-Util-1.000.0 >=virtual/perl-Storable-2.170.0 dev-perl/Task-Weaken dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.270.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=ecae6004f1848cf5c7de5d0296266278
diff --git a/metadata/md5-cache/dev-perl/PPI-HTML-1.80.0 b/metadata/md5-cache/dev-perl/PPI-HTML-1.80.0
deleted file mode 100644
index 4847d989f2ce..000000000000
--- a/metadata/md5-cache/dev-perl/PPI-HTML-1.80.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/CSS-Tiny-1.100.0 >=dev-perl/PPI-0.990.0 >=dev-perl/Params-Util-0.50.0 >=virtual/perl-ExtUtils-MakeMaker-6.420.0 >=virtual/perl-File-Spec-0.800.0 test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
-DESCRIPTION=Generate syntax-hightlighted HTML for Perl using PPI
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/PPI-HTML
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/CSS-Tiny-1.100.0 >=dev-perl/PPI-0.990.0 >=dev-perl/Params-Util-0.50.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/PPI-HTML-1.08.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=6576a6023ff2ae5a4d37c4572677f056
diff --git a/metadata/md5-cache/dev-perl/PPI-HTML-1.80.0-r1 b/metadata/md5-cache/dev-perl/PPI-HTML-1.80.0-r1
new file mode 100644
index 000000000000..bd2698287c5e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PPI-HTML-1.80.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/CSS-Tiny-1.100.0 >=dev-perl/PPI-0.990.0 >=dev-perl/Params-Util-0.50.0 >=virtual/perl-ExtUtils-MakeMaker-6.420.0 >=virtual/perl-File-Spec-0.800.0 test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Generate syntax-hightlighted HTML for Perl using PPI
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PPI-HTML
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/CSS-Tiny-1.100.0 >=dev-perl/PPI-0.990.0 >=dev-perl/Params-Util-0.50.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/PPI-HTML-1.08.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=ea29e4c840741fcaffe9f61f1a4c4e5c
diff --git a/metadata/md5-cache/dev-perl/PPI-PowerToys-0.140.0 b/metadata/md5-cache/dev-perl/PPI-PowerToys-0.140.0
deleted file mode 100644
index 6a3c01e654c0..000000000000
--- a/metadata/md5-cache/dev-perl/PPI-PowerToys-0.140.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/File-Find-Rule-0.32 >=dev-perl/File-Find-Rule-Perl-1.10 >=dev-perl/Test-Script-1.70.0 >=dev-perl/Probe-Perl-0.01 dev-perl/PPI dev-perl/IPC-Run3 dev-lang/perl
-DESCRIPTION=A handy collection of small PPI-based utilities
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/PPI-PowerToys
-KEYWORDS=~amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/File-Find-Rule-0.32 >=dev-perl/File-Find-Rule-Perl-1.10 >=dev-perl/Test-Script-1.70.0 >=dev-perl/Probe-Perl-0.01 dev-perl/PPI dev-perl/IPC-Run3 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/PPI-PowerToys-0.14.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=9852275caafa6f8fb4c75d5bfa550b13
diff --git a/metadata/md5-cache/dev-perl/PPI-PowerToys-0.140.0-r1 b/metadata/md5-cache/dev-perl/PPI-PowerToys-0.140.0-r1
new file mode 100644
index 000000000000..d13ef0f48da2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PPI-PowerToys-0.140.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/File-Find-Rule-0.32 >=dev-perl/File-Find-Rule-Perl-1.10 >=dev-perl/Test-Script-1.70.0 >=dev-perl/Probe-Perl-0.01 dev-perl/PPI dev-perl/IPC-Run3 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A handy collection of small PPI-based utilities
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PPI-PowerToys
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/File-Find-Rule-0.32 >=dev-perl/File-Find-Rule-Perl-1.10 >=dev-perl/Test-Script-1.70.0 >=dev-perl/Probe-Perl-0.01 dev-perl/PPI dev-perl/IPC-Run3 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/PPI-PowerToys-0.14.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=8ac66a3edc838cf01e0c1aedd4d868ba
diff --git a/metadata/md5-cache/dev-perl/PPIx-EditorTools-0.210.0 b/metadata/md5-cache/dev-perl/PPIx-EditorTools-0.210.0
new file mode 100644
index 000000000000..476d5d2f6f5e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PPIx-EditorTools-0.210.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/Class-XSAccessor-1.20.0 virtual/perl-File-Spec >=dev-perl/PPI-1.203.0 dev-perl/Try-Tiny virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Temp virtual/perl-IO dev-perl/Test-Differences dev-perl/Test-Exception dev-perl/Test-Most virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Utility methods and base class for manipulating Perl via PPI
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PPIx-EditorTools
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=dev-perl/Class-XSAccessor-1.20.0 virtual/perl-File-Spec >=dev-perl/PPI-1.203.0 dev-perl/Try-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Y/YA/YANICK/PPIx-EditorTools-0.21.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=3f385cc9551d24ff8d7d9e70789427ec
diff --git a/metadata/md5-cache/dev-perl/PPIx-Regexp-0.80.0 b/metadata/md5-cache/dev-perl/PPIx-Regexp-0.80.0
index 103d6222b979..fd0a3d584698 100644
--- a/metadata/md5-cache/dev-perl/PPIx-Regexp-0.80.0
+++ b/metadata/md5-cache/dev-perl/PPIx-Regexp-0.80.0
@@ -5,11 +5,11 @@ DESCRIPTION=Represent a regular expression of some sort
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/PPIx-Regexp
 IUSE=test examples examples
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter dev-perl/List-MoreUtils >=dev-perl/PPI-1.117.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.080.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=0df9d2d260baa8c97aed4de7d7bef53e
+_md5_=5ee51d6c65f5feb02d7f353959398bc0
diff --git a/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1 b/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
deleted file mode 100644
index f643fca2111d..000000000000
--- a/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/PPI-1.208 dev-perl/Exception-Class dev-perl/Readonly virtual/perl-Scalar-List-Utils dev-perl/Module-Build test? ( dev-perl/Test-Deep ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Extensions to PPI
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/PPIx-Utilities
-IUSE=test
-KEYWORDS=~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/PPI-1.208 dev-perl/Exception-Class dev-perl/Readonly virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-1.001000.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4a7c10992df5f0ef232696bdc9a55497
diff --git a/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r2 b/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r2
new file mode 100644
index 000000000000..2f6fed181f18
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/PPI-1.208 dev-perl/Exception-Class dev-perl/Readonly virtual/perl-Scalar-List-Utils dev-perl/Module-Build test? ( dev-perl/Test-Deep ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Extensions to PPI
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PPIx-Utilities
+IUSE=test
+KEYWORDS=~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/PPI-1.208 dev-perl/Exception-Class dev-perl/Readonly virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-1.001000.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=1a43833acd5e47618cfaee57cac45978
diff --git a/metadata/md5-cache/dev-perl/PPIx-Utils-0.3.0 b/metadata/md5-cache/dev-perl/PPIx-Utils-0.3.0
new file mode 100644
index 000000000000..246c6a01d918
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PPIx-Utils-0.3.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/B-Keywords-1.90.0 virtual/perl-Exporter >=dev-perl/PPI-1.250.0 virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Data-Dumper virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Utility functions for PPI
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PPIx-Utils
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/B-Keywords-1.90.0 virtual/perl-Exporter >=dev-perl/PPI-1.250.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DB/DBOOK/PPIx-Utils-0.003.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=f003d5fd04a913ccca6fe91b2a97742e
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-0.390.0 b/metadata/md5-cache/dev-perl/Package-Stash-0.390.0
index 2285aba28cf7..613af599797b 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-0.390.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-0.390.0
@@ -5,11 +5,11 @@ DESCRIPTION=Routines for manipulating stashes
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Package-Stash
 IUSE=minimal test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~sparc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Getopt-Long >=dev-perl/Module-Implementation-0.60.0 virtual/perl-Scalar-List-Utils !minimal? ( >=dev-perl/Package-Stash-XS-0.260.0 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.39.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=cba1ac10cf92c9cdc9f0062c4f952858
+_md5_=54c16c1b2143e222e2074d9cbdaa5ea4
diff --git a/metadata/md5-cache/dev-perl/Pegex-0.750.0 b/metadata/md5-cache/dev-perl/Pegex-0.750.0
index 331c8b65d56e..2cf4622cf8c2 100644
--- a/metadata/md5-cache/dev-perl/Pegex-0.750.0
+++ b/metadata/md5-cache/dev-perl/Pegex-0.750.0
@@ -5,11 +5,11 @@ DESCRIPTION=Acmeist PEG Parser Framework
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Pegex
 IUSE=test test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/File-ShareDir-Install virtual/perl-JSON-PP virtual/perl-Scalar-List-Utils >=dev-perl/XXX-0.350.0 >=dev-perl/YAML-PP-0.19.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Pegex-0.75.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=23087b1d8c5e0fcee90b54ba4c9fdb97
+_md5_=23fff88c2157a0d4816d3069f1a62afa
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Deprecated-1.119.0 b/metadata/md5-cache/dev-perl/Perl-Critic-Deprecated-1.119.0
deleted file mode 100644
index 9243152978cc..000000000000
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Deprecated-1.119.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp >=dev-perl/Perl-Critic-1.118.0 dev-perl/Readonly >=dev-perl/Module-Build-0.400.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Perl::Critic policies which have been superseded by others
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Perl-Critic-Deprecated
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp >=dev-perl/Perl-Critic-1.118.0 dev-perl/Readonly dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-Deprecated-1.119.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=4117bf1d3fbe0712c9cca116b4ab32de
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Deprecated-1.119.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-Deprecated-1.119.0-r1
new file mode 100644
index 000000000000..66bdf028be12
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Deprecated-1.119.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/Perl-Critic-1.118.0 dev-perl/Readonly >=dev-perl/Module-Build-0.400.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl::Critic policies which have been superseded by others
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Perl-Critic-Deprecated
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=dev-perl/Perl-Critic-1.118.0 dev-perl/Readonly dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-Deprecated-1.119.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=1473ce3ac4ee19c4bf76bddd0b26285d
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0-r3 b/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0-r3
deleted file mode 100644
index 39f7107b169d..000000000000
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Perl-Critic >=dev-perl/Devel-Symdump-2.08 dev-perl/Readonly dev-perl/Module-Build test? ( dev-perl/CGI ) dev-lang/perl
-DESCRIPTION=Base class for dynamic Policies
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Perl-Critic-Dynamic
-IUSE=test
-KEYWORDS=~alpha amd64 ppc ~ppc64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Perl-Critic >=dev-perl/Devel-Symdump-2.08 dev-perl/Readonly dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-Dynamic-0.05.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=52ab665244e8fe5b3a660a32418dac4f
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0-r4 b/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0-r4
new file mode 100644
index 000000000000..a1788d196af6
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0-r4
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Perl-Critic >=dev-perl/Devel-Symdump-2.08 dev-perl/Readonly dev-perl/Module-Build test? ( dev-perl/CGI ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Base class for dynamic Policies
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Perl-Critic-Dynamic
+IUSE=test
+KEYWORDS=~alpha amd64 ppc ~ppc64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Perl-Critic >=dev-perl/Devel-Symdump-2.08 dev-perl/Readonly dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-Dynamic-0.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=db5bda6c3663f6e7e146a0a446a96611
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
deleted file mode 100644
index a749334f56f2..000000000000
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/Perl-Critic dev-perl/Readonly ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=policies of nits I like to pick
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Perl-Critic-Nits
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-perl/Perl-Critic dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KC/KCOWGILL/Perl-Critic-Nits-v1.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3ecb307a1b3f805f382f0007d99d84d7
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r2 b/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r2
new file mode 100644
index 000000000000..a1383f5b4f45
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Perl-Critic test? ( dev-perl/Readonly ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=policies of nits I like to pick
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Perl-Critic-Nits
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Perl-Critic dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KC/KCOWGILL/Perl-Critic-Nits-v1.0.0.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=c970925ba918db08ee866d1ecfb94d50
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
deleted file mode 100644
index a781abadeb5e..000000000000
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/indirect-0.250.0 dev-perl/Perl-Critic-Dynamic dev-perl/Perl-Critic test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl::Critic policy against indirect method calls
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Perl-Critic-Policy-Dynamic-NoIndirect
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/indirect-0.250.0 dev-perl/Perl-Critic-Dynamic dev-perl/Perl-Critic dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/Perl-Critic-Policy-Dynamic-NoIndirect-0.06.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b7ae41024a1aa4faa50d227a54f800db
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r2 b/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r2
new file mode 100644
index 000000000000..95fe2fcd1158
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/indirect-0.250.0 dev-perl/Perl-Critic-Dynamic dev-perl/Perl-Critic test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl::Critic policy against indirect method calls
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Perl-Critic-Policy-Dynamic-NoIndirect
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/indirect-0.250.0 dev-perl/Perl-Critic-Dynamic dev-perl/Perl-Critic dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/Perl-Critic-Policy-Dynamic-NoIndirect-0.06.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=7dfb692cfc91eab54c5db0b477ce529d
diff --git a/metadata/md5-cache/dev-perl/Perl-MinimumVersion-1.400.0 b/metadata/md5-cache/dev-perl/Perl-MinimumVersion-1.400.0
new file mode 100644
index 000000000000..f1557acd3f75
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perl-MinimumVersion-1.400.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/File-Find-Rule dev-perl/File-Find-Rule-Perl virtual/perl-File-Spec virtual/perl-Getopt-Long >=virtual/perl-Scalar-List-Utils-1.200.0 >=dev-perl/PPI-1.215.0 >=dev-perl/PPIx-Regexp-0.33.0 dev-perl/PPIx-Utils >=dev-perl/Params-Util-0.250.0 >=dev-perl/Perl-Critic-1.104.0 >=virtual/perl-version-0.760.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Find a minimum required version of perl for Perl code
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Perl-MinimumVersion
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/File-Find-Rule dev-perl/File-Find-Rule-Perl virtual/perl-File-Spec virtual/perl-Getopt-Long >=virtual/perl-Scalar-List-Utils-1.200.0 >=dev-perl/PPI-1.215.0 >=dev-perl/PPIx-Regexp-0.33.0 dev-perl/PPIx-Utils >=dev-perl/Params-Util-0.250.0 >=dev-perl/Perl-Critic-1.104.0 >=virtual/perl-version-0.760.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DB/DBOOK/Perl-MinimumVersion-1.40.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=60aad47686d42580ce448b9a046d4cf8
diff --git a/metadata/md5-cache/dev-perl/Perl-PrereqScanner-1.24.0 b/metadata/md5-cache/dev-perl/Perl-PrereqScanner-1.24.0
new file mode 100644
index 000000000000..201883c1a9e4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perl-PrereqScanner-1.24.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-CPAN-Meta-Requirements-2.124.0 virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Getopt-Long-Descriptive >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Module-Path dev-perl/Moose >=dev-perl/PPI-1.215.0 dev-perl/Params-Util >=dev-perl/String-RewritePrefix-0.5.0 dev-perl/namespace-autoclean virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) virtual/perl-File-Temp >=virtual/perl-Test-Simple-0.960.0 dev-perl/Try-Tiny ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=a tool to scan your Perl code for its prerequisites
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Perl-PrereqScanner
+IUSE=minimal test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-CPAN-Meta-Requirements-2.124.0 virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Getopt-Long-Descriptive >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Module-Path dev-perl/Moose >=dev-perl/PPI-1.215.0 dev-perl/Params-Util >=dev-perl/String-RewritePrefix-0.5.0 dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.024.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=b35875bc776c2c9aaacefc6a38552667
diff --git a/metadata/md5-cache/dev-perl/Perl-Tags-0.320.0-r1 b/metadata/md5-cache/dev-perl/Perl-Tags-0.320.0-r1
deleted file mode 100644
index e1545d99887b..000000000000
--- a/metadata/md5-cache/dev-perl/Perl-Tags-0.320.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/File-Find-Rule virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/Module-Locate dev-perl/Path-Tiny virtual/perl-parent !minimal? ( dev-perl/PPI ) >=virtual/perl-ExtUtils-MakeMaker-6.360.0 test? ( dev-perl/Capture-Tiny dev-perl/Test-Exception dev-perl/Test-LongString >=virtual/perl-Test-Simple-0.420.0 !minimal? ( app-editors/vim[perl] ) ) dev-lang/perl
-DESCRIPTION=Generate (possibly exuberant) Ctags style tags for Perl sourcecode
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Perl-Tags
-IUSE=test minimal
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/File-Find-Rule virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/Module-Locate dev-perl/Path-Tiny virtual/perl-parent !minimal? ( dev-perl/PPI ) dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OS/OSFAMERON/Perl-Tags-0.32.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=95f08348cc0ea0b190b20f0bed5d3427
diff --git a/metadata/md5-cache/dev-perl/Perl-Tags-0.320.0-r2 b/metadata/md5-cache/dev-perl/Perl-Tags-0.320.0-r2
new file mode 100644
index 000000000000..a6aab025c7ad
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perl-Tags-0.320.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/File-Find-Rule virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/Module-Locate dev-perl/Path-Tiny virtual/perl-parent !minimal? ( dev-perl/PPI ) >=virtual/perl-ExtUtils-MakeMaker-6.360.0 test? ( dev-perl/Capture-Tiny dev-perl/Test-Exception dev-perl/Test-LongString >=virtual/perl-Test-Simple-0.420.0 !minimal? ( app-editors/vim[perl] ) ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Generate (possibly exuberant) Ctags style tags for Perl sourcecode
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Perl-Tags
+IUSE=minimal test
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/File-Find-Rule virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/Module-Locate dev-perl/Path-Tiny virtual/perl-parent !minimal? ( dev-perl/PPI ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/O/OS/OSFAMERON/Perl-Tags-0.32.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=2a093eecaab03f3740414e3a33967e6a
diff --git a/metadata/md5-cache/dev-perl/Perl-Tidy-20171214.0.0 b/metadata/md5-cache/dev-perl/Perl-Tidy-20171214.0.0
deleted file mode 100644
index 0255ce4abbf6..000000000000
--- a/metadata/md5-cache/dev-perl/Perl-Tidy-20171214.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Perl script indenter and beautifier
-EAPI=6
-HOMEPAGE=http://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Tidy
-IUSE=examples
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20171214.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=78e7fc919ddf84c801f5378abb8490c0
diff --git a/metadata/md5-cache/dev-perl/Perl-Tidy-20210717.0.0 b/metadata/md5-cache/dev-perl/Perl-Tidy-20210717.0.0
new file mode 100644
index 000000000000..b9497e41dea8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perl-Tidy-20210717.0.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl script indenter and beautifier
+EAPI=8
+HOMEPAGE=http://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Tidy
+IUSE=test examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20210717.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=a72c394ed5f825890f66621cadd26f57
diff --git a/metadata/md5-cache/dev-perl/Perl-Unsafe-Signals-0.30.0-r1 b/metadata/md5-cache/dev-perl/Perl-Unsafe-Signals-0.30.0-r1
deleted file mode 100644
index 85925faea4e5..000000000000
--- a/metadata/md5-cache/dev-perl/Perl-Unsafe-Signals-0.30.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Allow unsafe handling of signals in selected blocks
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Perl-Unsafe-Signals
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Perl-Unsafe-Signals-0.03.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=e36ea176916a4014b4a9ec29e0541dc4
diff --git a/metadata/md5-cache/dev-perl/Perl-Unsafe-Signals-0.30.0-r2 b/metadata/md5-cache/dev-perl/Perl-Unsafe-Signals-0.30.0-r2
new file mode 100644
index 000000000000..7862fd85cac5
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perl-Unsafe-Signals-0.30.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Allow unsafe handling of signals in selected blocks
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Perl-Unsafe-Signals
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Perl-Unsafe-Signals-0.03.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=4f626a0904e3db4597756aa4e1891f38
diff --git a/metadata/md5-cache/dev-perl/Perl-Version-1.13.0 b/metadata/md5-cache/dev-perl/Perl-Version-1.13.0
deleted file mode 100644
index f3b03ff60a30..000000000000
--- a/metadata/md5-cache/dev-perl/Perl-Version-1.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/File-Slurp-Tiny >=virtual/perl-Getopt-Long-2.340.0 virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Parse and manipulate Perl version strings
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Perl-Version
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/File-Slurp-Tiny >=virtual/perl-Getopt-Long-2.340.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Perl-Version-1.013.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=fb781b1763d29e57ffb6b58e1d153e7c
diff --git a/metadata/md5-cache/dev-perl/Perl-Version-1.13.0-r1 b/metadata/md5-cache/dev-perl/Perl-Version-1.13.0-r1
new file mode 100644
index 000000000000..15662fc3eca9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perl-Version-1.13.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/File-Slurp-Tiny >=virtual/perl-Getopt-Long-2.340.0 virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Parse and manipulate Perl version strings
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Perl-Version
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/File-Slurp-Tiny >=virtual/perl-Getopt-Long-2.340.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Perl-Version-1.013.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=99318defcb89982d724480fdff1f9efe
diff --git a/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0 b/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0
deleted file mode 100644
index abbad1ccd8f2..000000000000
--- a/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl6 style Junction operators in Perl5
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Perl6-Junction
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CF/CFRANKS/Perl6-Junction-1.60000.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b16dd03557f491f3a12192e1102357bc
diff --git a/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0-r1 b/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0-r1
new file mode 100644
index 000000000000..91820706e13b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl6 style Junction operators in Perl5
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Perl6-Junction
+IUSE=test
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CF/CFRANKS/Perl6-Junction-1.60000.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=b58534b18bca715fb667b22b323aeba5
diff --git a/metadata/md5-cache/dev-perl/PerlIO-Layers-0.12.0 b/metadata/md5-cache/dev-perl/PerlIO-Layers-0.12.0
new file mode 100644
index 000000000000..ea4805f0f176
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PerlIO-Layers-0.12.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils virtual/perl-XSLoader >=dev-perl/Module-Build-0.360.100 test? ( virtual/perl-Data-Dumper virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.820.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Querying your filehandle's capabilities
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PerlIO-Layers
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.012.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=9143ef32236c60c1537d00d5e771f823
diff --git a/metadata/md5-cache/dev-perl/PerlIO-eol-0.170.0 b/metadata/md5-cache/dev-perl/PerlIO-eol-0.170.0
new file mode 100644
index 000000000000..0cc256061fc9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PerlIO-eol-0.170.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Exporter virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=PerlIO layer for normalizing line endings
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PerlIO-eol
+IUSE=test
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/PerlIO-eol-0.17.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=0152cd90e6c4a4b95571f167ea85f853
diff --git a/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0 b/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0
deleted file mode 100644
index d366db258ced..000000000000
--- a/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib dev-lang/perl
-DESCRIPTION=PerlIO layer to gzip/gunzip
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/PerlIO-gzip
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=sys-libs/zlib virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/PerlIO-gzip-0.20.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=9a3b171c81809889ce8c51e32362f871
diff --git a/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0-r1 b/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0-r1
new file mode 100644
index 000000000000..70d29ec1201d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-libs/zlib virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib dev-lang/perl
+DESCRIPTION=PerlIO layer to gzip/gunzip
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PerlIO-gzip
+IUSE=test
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=sys-libs/zlib dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/PerlIO-gzip-0.20.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=feeff436e8caa8d5391ffd516174bdcd
diff --git a/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.8.0 b/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.8.0
new file mode 100644
index 000000000000..384986995f26
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.8.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-IO dev-perl/Test-Exception >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Fast and correct UTF-8 IO
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PerlIO-utf8_strict
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.008.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=517e2d8fb768c06aa6c1db8649f94796
diff --git a/metadata/md5-cache/dev-perl/PerlIO-via-Timeout-0.320.0 b/metadata/md5-cache/dev-perl/PerlIO-via-Timeout-0.320.0
deleted file mode 100644
index 7657a1fff71e..000000000000
--- a/metadata/md5-cache/dev-perl/PerlIO-via-Timeout-0.320.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Module-Build-Tiny-0.39.0 >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-File-Spec virtual/perl-IO virtual/perl-Test-Simple dev-perl/Test-TCP ) dev-lang/perl
-DESCRIPTION=PerlIO layer that adds read & write timeout to a handle
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/PerlIO-via-Timeout
-IUSE=test
-KEYWORDS=amd64 ~arm ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAMS/PerlIO-via-Timeout-0.32.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=6f78397282c2e7ff940a37dbb42fb799
diff --git a/metadata/md5-cache/dev-perl/PerlIO-via-Timeout-0.320.0-r1 b/metadata/md5-cache/dev-perl/PerlIO-via-Timeout-0.320.0-r1
new file mode 100644
index 000000000000..cbe11fb86332
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PerlIO-via-Timeout-0.320.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Module-Build-Tiny-0.39.0 >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-File-Spec virtual/perl-IO virtual/perl-Test-Simple dev-perl/Test-TCP ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=PerlIO layer that adds read & write timeout to a handle
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PerlIO-via-Timeout
+IUSE=test
+KEYWORDS=amd64 ~arm ppc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAMS/PerlIO-via-Timeout-0.32.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=9f8289d404d240c8cbf23ee4bd74fc6a
diff --git a/metadata/md5-cache/dev-perl/PerlIO-via-dynamic-0.140.0-r1 b/metadata/md5-cache/dev-perl/PerlIO-via-dynamic-0.140.0-r1
deleted file mode 100644
index ac9e1a7cc91e..000000000000
--- a/metadata/md5-cache/dev-perl/PerlIO-via-dynamic-0.140.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-File-Temp-0.14 dev-lang/perl
-DESCRIPTION=Dynamic PerlIO layers
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/PerlIO-via-dynamic
-KEYWORDS=~alpha amd64 ~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-File-Temp-0.14 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/PerlIO-via-dynamic-0.14.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=cf422e160472b52c38beb649c5d138ab
diff --git a/metadata/md5-cache/dev-perl/PerlIO-via-dynamic-0.140.0-r2 b/metadata/md5-cache/dev-perl/PerlIO-via-dynamic-0.140.0-r2
new file mode 100644
index 000000000000..c5c5212995cb
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PerlIO-via-dynamic-0.140.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-File-Temp-0.14 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Dynamic PerlIO layers
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PerlIO-via-dynamic
+IUSE=test
+KEYWORDS=~alpha amd64 ~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-File-Temp-0.14 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/PerlIO-via-dynamic-0.14.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=b4ee4d7d4d2fbe23d70d43797a3d7136
diff --git a/metadata/md5-cache/dev-perl/Perlbal-1.800.0-r2 b/metadata/md5-cache/dev-perl/Perlbal-1.800.0-r2
deleted file mode 100644
index acb17d1db7a0..000000000000
--- a/metadata/md5-cache/dev-perl/Perlbal-1.800.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-perl/libwww-perl dev-perl/HTTP-Date dev-perl/Sys-Syscall >=dev-perl/Danga-Socket-1.440.0 dev-perl/HTTP-Message dev-perl/BSD-Resource dev-perl/IO-AIO dev-lang/perl
-DESCRIPTION=Reverse-proxy load balancer and webserver
-EAPI=6
-HOMEPAGE=http://www.danga.com/perlbal/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/libwww-perl dev-perl/HTTP-Date dev-perl/Sys-Syscall >=dev-perl/Danga-Socket-1.440.0 dev-perl/HTTP-Message dev-perl/BSD-Resource dev-perl/IO-AIO dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/Perlbal-1.80.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=8b2927ceb69f86cc9531798bbd772206
diff --git a/metadata/md5-cache/dev-perl/Perlbal-1.800.0-r3 b/metadata/md5-cache/dev-perl/Perlbal-1.800.0-r3
new file mode 100644
index 000000000000..55f19a5a799b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Perlbal-1.800.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/libwww-perl dev-perl/HTTP-Date dev-perl/Sys-Syscall >=dev-perl/Danga-Socket-1.440.0 dev-perl/HTTP-Message dev-perl/BSD-Resource dev-perl/IO-AIO dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Reverse-proxy load balancer and webserver
+EAPI=8
+HOMEPAGE=http://www.danga.com/perlbal/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/libwww-perl dev-perl/HTTP-Date dev-perl/Sys-Syscall >=dev-perl/Danga-Socket-1.440.0 dev-perl/HTTP-Message dev-perl/BSD-Resource dev-perl/IO-AIO dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/Perlbal-1.80.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=d275009e38250d809c9c11a2a4b0b197
diff --git a/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1 b/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
index 4f001422bd54..4fde3a948710 100644
--- a/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
@@ -1,12 +1,15 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Perlbal dev-lang/perl:=[-build(-)]
+BDEPEND=dev-perl/Perlbal dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
 DESCRIPTION=XS acceleration for Perlbal header processing
-EAPI=5
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/Perlbal-XS-HTTPHeaders
+IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Perlbal dev-lang/perl:=[-build(-)]
+RDEPEND=dev-perl/Perlbal dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/Perlbal-XS-HTTPHeaders-0.20.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b937f3d731855aea137b9a39fd125874
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=036f2d2c6d263ece42edf217ce855538
diff --git a/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r3 b/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r3
deleted file mode 100644
index 09a1ff1846d5..000000000000
--- a/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-Storable-1.0.7 >=dev-perl/Net-Daemon-0.34 dev-lang/perl
-DESCRIPTION=The Perl RPC Module
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/PlRPC
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Storable-1.0.7 >=dev-perl/Net-Daemon-0.34 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MN/MNOONING/PlRPC/PlRPC-0.2020.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ec2173824225c6845981911cd01004b4
diff --git a/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r4 b/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r4
new file mode 100644
index 000000000000..2c95c3e78aa6
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r4
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Storable-1.0.7 >=dev-perl/Net-Daemon-0.34 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=The Perl RPC Module
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PlRPC
+IUSE=test
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Storable-1.0.7 >=dev-perl/Net-Daemon-0.34 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MN/MNOONING/PlRPC/PlRPC-0.2020.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=346394fc2537188d163a7d90fad0e2b5
diff --git a/metadata/md5-cache/dev-perl/Plack-1.4.800 b/metadata/md5-cache/dev-perl/Plack-1.4.800
new file mode 100644
index 000000000000..004be9abbbe3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Plack-1.4.800
@@ -0,0 +1,15 @@
+BDEPEND=!minimal? ( dev-perl/CGI-Compile dev-perl/CGI-Emulate-PSGI dev-perl/FCGI dev-perl/FCGI-ProcManager >=dev-perl/libwww-perl-5.814.0 >=dev-perl/Log-Dispatch-2.250.0 dev-perl/Log-Log4perl dev-perl/Module-Refresh ) >=dev-perl/Apache-LogFormat-Compiler-0.330.0 >=dev-perl/Cookie-Baker-0.70.0 >=dev-perl/Devel-StackTrace-1.230.0 >=dev-perl/Devel-StackTrace-AsHTML-0.110.0 >=dev-perl/File-ShareDir-1.0.0 dev-perl/Filesys-Notify-Simple >=dev-perl/HTTP-Entity-Parser-0.250.0 >=dev-perl/HTTP-Headers-Fast-0.180.0 >=dev-perl/HTTP-Message-5.814.0 >=virtual/perl-HTTP-Tiny-0.34.0 >=dev-perl/Hash-MultiValue-0.50.0 >=dev-perl/Pod-Parser-1.360.0 >=dev-perl/Stream-Buffered-0.20.0 >=dev-perl/Test-TCP-2.150.0 dev-perl/Try-Tiny >=dev-perl/URI-1.590.0 >=dev-perl/WWW-Form-UrlEncoded-0.230.0 virtual/perl-parent virtual/perl-ExtUtils-MakeMaker >=dev-perl/File-ShareDir-Install-0.60.0 test? ( !minimal? ( dev-perl/Authen-Simple-Passwd dev-perl/HTTP-Request-AsCGI dev-perl/HTTP-Server-Simple-PSGI dev-perl/Log-Dispatch-Array dev-perl/LWP-Protocol-http10 dev-perl/MIME-Types >=dev-perl/Test-MockTime-HiRes-0.60.0 ) dev-perl/Test-Requires >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Plack
+IUSE=minimal test examples
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!minimal? ( dev-perl/CGI-Compile dev-perl/CGI-Emulate-PSGI dev-perl/FCGI dev-perl/FCGI-ProcManager >=dev-perl/libwww-perl-5.814.0 >=dev-perl/Log-Dispatch-2.250.0 dev-perl/Log-Log4perl dev-perl/Module-Refresh ) >=dev-perl/Apache-LogFormat-Compiler-0.330.0 >=dev-perl/Cookie-Baker-0.70.0 >=dev-perl/Devel-StackTrace-1.230.0 >=dev-perl/Devel-StackTrace-AsHTML-0.110.0 >=dev-perl/File-ShareDir-1.0.0 dev-perl/Filesys-Notify-Simple >=dev-perl/HTTP-Entity-Parser-0.250.0 >=dev-perl/HTTP-Headers-Fast-0.180.0 >=dev-perl/HTTP-Message-5.814.0 >=virtual/perl-HTTP-Tiny-0.34.0 >=dev-perl/Hash-MultiValue-0.50.0 >=dev-perl/Pod-Parser-1.360.0 >=dev-perl/Stream-Buffered-0.20.0 >=dev-perl/Test-TCP-2.150.0 dev-perl/Try-Tiny >=dev-perl/URI-1.590.0 >=dev-perl/WWW-Form-UrlEncoded-0.230.0 virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0048.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=5fb7b82a4108f274607f7b1cc4417e78
diff --git a/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2 b/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
deleted file mode 100644
index 939057537b06..000000000000
--- a/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Bit-Vector-Minimal-1.0.0 virtual/perl-Carp >=dev-perl/Class-Accessor-0.180.0 >=dev-perl/Class-Virtual-0.30.0 virtual/perl-Encode virtual/perl-File-Spec virtual/perl-IO dev-perl/Lingua-Stem >=virtual/perl-Scalar-List-Utils-1.130.0 >=virtual/perl-Memoize-1.10.0 >=dev-perl/Tie-Array-Sorted-1.100.0 virtual/perl-Time-Piece dev-perl/Encode-compat dev-perl/File-Slurp dev-perl/IO-stringy >=dev-perl/Module-Build-0.280.0 test? ( >=virtual/perl-Test-Harness-2.300.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Plucene - the Perl lucene port
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Plucene
-IUSE=test
-KEYWORDS=amd64 ~ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Bit-Vector-Minimal-1.0.0 virtual/perl-Carp >=dev-perl/Class-Accessor-0.180.0 >=dev-perl/Class-Virtual-0.30.0 virtual/perl-Encode virtual/perl-File-Spec virtual/perl-IO dev-perl/Lingua-Stem >=virtual/perl-Scalar-List-Utils-1.130.0 >=virtual/perl-Memoize-1.10.0 >=dev-perl/Tie-Array-Sorted-1.100.0 virtual/perl-Time-Piece dev-perl/Encode-compat dev-perl/File-Slurp dev-perl/IO-stringy dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Plucene-1.25.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=720fe1c3bb923e34a7068bf0cee7b39c
diff --git a/metadata/md5-cache/dev-perl/Plucene-1.250.0-r3 b/metadata/md5-cache/dev-perl/Plucene-1.250.0-r3
new file mode 100644
index 000000000000..b2cc84ce2747
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Plucene-1.250.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Bit-Vector-Minimal-1.0.0 virtual/perl-Carp >=dev-perl/Class-Accessor-0.180.0 >=dev-perl/Class-Virtual-0.30.0 virtual/perl-Encode virtual/perl-File-Spec virtual/perl-IO dev-perl/Lingua-Stem >=virtual/perl-Scalar-List-Utils-1.130.0 >=virtual/perl-Memoize-1.10.0 >=dev-perl/Tie-Array-Sorted-1.100.0 virtual/perl-Time-Piece dev-perl/Encode-compat dev-perl/File-Slurp dev-perl/IO-stringy >=dev-perl/Module-Build-0.280.0 test? ( >=virtual/perl-Test-Harness-2.300.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Plucene - the Perl lucene port
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Plucene
+IUSE=test examples
+KEYWORDS=amd64 ~ppc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Bit-Vector-Minimal-1.0.0 virtual/perl-Carp >=dev-perl/Class-Accessor-0.180.0 >=dev-perl/Class-Virtual-0.30.0 virtual/perl-Encode virtual/perl-File-Spec virtual/perl-IO dev-perl/Lingua-Stem >=virtual/perl-Scalar-List-Utils-1.130.0 >=virtual/perl-Memoize-1.10.0 >=dev-perl/Tie-Array-Sorted-1.100.0 virtual/perl-Time-Piece dev-perl/Encode-compat dev-perl/File-Slurp dev-perl/IO-stringy dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Plucene-1.25.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=49c174f4f0f2b4e85ec1808622168a0a
diff --git a/metadata/md5-cache/dev-perl/Pod-Elemental-0.103.5 b/metadata/md5-cache/dev-perl/Pod-Elemental-0.103.5
new file mode 100644
index 000000000000..8df1ed6420a1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pod-Elemental-0.103.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Class-Load virtual/perl-Encode virtual/perl-Scalar-List-Utils dev-perl/Mixin-Linewise dev-perl/Moose dev-perl/MooseX-Types >=dev-perl/Pod-Eventual-0.4.0 dev-perl/String-RewritePrefix dev-perl/String-Truncate dev-perl/Sub-Exporter dev-perl/Sub-Exporter-ForMethods dev-perl/namespace-autoclean virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Data-Dumper virtual/perl-File-Spec dev-perl/Test-Deep dev-perl/Test-Differences >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Work with nestable Pod elements
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Pod-Elemental
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Class-Load virtual/perl-Encode virtual/perl-Scalar-List-Utils dev-perl/Mixin-Linewise dev-perl/Moose dev-perl/MooseX-Types >=dev-perl/Pod-Eventual-0.4.0 dev-perl/String-RewritePrefix dev-perl/String-Truncate dev-perl/Sub-Exporter dev-perl/Sub-Exporter-ForMethods dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103005.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=a4009861260f423b6f0440da0f3b82c1
diff --git a/metadata/md5-cache/dev-perl/Pod-Elemental-PerlMunger-0.200.6 b/metadata/md5-cache/dev-perl/Pod-Elemental-PerlMunger-0.200.6
deleted file mode 100644
index c80ad76b9afd..000000000000
--- a/metadata/md5-cache/dev-perl/Pod-Elemental-PerlMunger-0.200.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Encode virtual/perl-Scalar-List-Utils dev-perl/Moose dev-perl/PPI dev-perl/Params-Util >=dev-perl/Pod-Elemental-0.103.0 dev-perl/namespace-autoclean virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
-DESCRIPTION=A thing that takes a string of Perl and rewrites its documentation
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Pod-Elemental-PerlMunger
-IUSE=test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Encode virtual/perl-Scalar-List-Utils dev-perl/Moose dev-perl/PPI dev-perl/Params-Util >=dev-perl/Pod-Elemental-0.103.0 dev-perl/namespace-autoclean dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200006.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=e5477f953d24046e34f32e1cd43165db
diff --git a/metadata/md5-cache/dev-perl/Pod-Elemental-PerlMunger-0.200.6-r1 b/metadata/md5-cache/dev-perl/Pod-Elemental-PerlMunger-0.200.6-r1
new file mode 100644
index 000000000000..b5efc59d59b5
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pod-Elemental-PerlMunger-0.200.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Encode virtual/perl-Scalar-List-Utils dev-perl/Moose dev-perl/PPI dev-perl/Params-Util >=dev-perl/Pod-Elemental-0.103.0 dev-perl/namespace-autoclean virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A thing that takes a string of Perl and rewrites its documentation
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Pod-Elemental-PerlMunger
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Encode virtual/perl-Scalar-List-Utils dev-perl/Moose dev-perl/PPI dev-perl/Params-Util >=dev-perl/Pod-Elemental-0.103.0 dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200006.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=4c24e407b2a9a15350909a34c899dbb4
diff --git a/metadata/md5-cache/dev-perl/Pod-Eventual-0.94.2 b/metadata/md5-cache/dev-perl/Pod-Eventual-0.94.2
new file mode 100644
index 000000000000..d92ebf540244
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pod-Eventual-0.94.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/Mixin-Linewise-0.102.0 >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( >=virtual/perl-Test-Simple-0.960.0 dev-perl/Test-Deep ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=read a POD document as a series of trivial events
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Pod-Eventual
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=dev-perl/Mixin-Linewise-0.102.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.094002.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=1d491b1ce1e432621cde3cfa8fab5502
diff --git a/metadata/md5-cache/dev-perl/Pod-Markdown-3.300.0 b/metadata/md5-cache/dev-perl/Pod-Markdown-3.300.0
new file mode 100644
index 000000000000..c8255f19e18f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pod-Markdown-3.300.0
@@ -0,0 +1,15 @@
+BDEPEND=!minimal? ( dev-perl/HTML-Parser ) virtual/perl-Encode virtual/perl-Getopt-Long >=virtual/perl-Pod-Simple-3.270.0 dev-perl/URI virtual/perl-parent virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO dev-perl/Test-Differences >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Convert POD to Markdown
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Pod-Markdown
+IUSE=minimal test
+KEYWORDS=~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!minimal? ( dev-perl/HTML-Parser ) virtual/perl-Encode virtual/perl-Getopt-Long >=virtual/perl-Pod-Simple-3.270.0 dev-perl/URI virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.300.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=eb3b33af7adfdb4ae4ecc60fd4f3fbce
diff --git a/metadata/md5-cache/dev-perl/Pod-POM-2.10.0 b/metadata/md5-cache/dev-perl/Pod-POM-2.10.0
deleted file mode 100644
index d0f955ef1ccc..000000000000
--- a/metadata/md5-cache/dev-perl/Pod-POM-2.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=dev-perl/YAML-0.67 dev-perl/File-Slurper dev-perl/Test-Differences ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=POD Object Model
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Pod-POM
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-parent dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Pod-POM-2.01.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5367c2c15560b52605108a3a6e56dbbe
diff --git a/metadata/md5-cache/dev-perl/Pod-POM-2.10.0-r1 b/metadata/md5-cache/dev-perl/Pod-POM-2.10.0-r1
new file mode 100644
index 000000000000..bb874ef10dd1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pod-POM-2.10.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-perl/YAML-0.67 dev-perl/File-Slurper dev-perl/Test-Differences ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=POD Object Model
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Pod-POM
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Pod-POM-2.01.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=b8eb36160f5fb9a931c604dcb116be4c
diff --git a/metadata/md5-cache/dev-perl/Pod-POM-View-Restructured-1.0.3 b/metadata/md5-cache/dev-perl/Pod-POM-View-Restructured-1.0.3
new file mode 100644
index 000000000000..90f626c426a0
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pod-POM-View-Restructured-1.0.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-perl/Pod-POM virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=View for Pod::POM that outputs reStructuredText
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Pod-POM-View-Restructured
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-perl/Pod-POM dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AL/ALEXM/Pod-POM-View-Restructured-1.000003.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=a94f3f2644d9b50035375d54c48cd081
diff --git a/metadata/md5-cache/dev-perl/Pod-Simple-LaTeX-0.60.0 b/metadata/md5-cache/dev-perl/Pod-Simple-LaTeX-0.60.0
deleted file mode 100644
index 6ad7eba6ac54..000000000000
--- a/metadata/md5-cache/dev-perl/Pod-Simple-LaTeX-0.60.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-Pod-Simple-0.10.0 dev-lang/perl
-DESCRIPTION=format Pod as LaTeX
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Pod-Simple-LaTeX
-IUSE=test
-KEYWORDS=amd64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Pod-Simple-0.10.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JG/JGOFF/Pod-Simple-LaTeX-0.06.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=382f39a1ee27c914fcb470e08885e0e3
diff --git a/metadata/md5-cache/dev-perl/Pod-Simple-LaTeX-0.60.0-r1 b/metadata/md5-cache/dev-perl/Pod-Simple-LaTeX-0.60.0-r1
new file mode 100644
index 000000000000..992f1fd5e081
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pod-Simple-LaTeX-0.60.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Pod-Simple-0.10.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=format Pod as LaTeX
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Pod-Simple-LaTeX
+IUSE=test
+KEYWORDS=amd64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Pod-Simple-0.10.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JG/JGOFF/Pod-Simple-LaTeX-0.06.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=504985516f3ccff5fd87687beb3bb323
diff --git a/metadata/md5-cache/dev-perl/Pod-Strip-1.100.0 b/metadata/md5-cache/dev-perl/Pod-Strip-1.100.0
new file mode 100644
index 000000000000..881d9467bfaa
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pod-Strip-1.100.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Module-Build-0.280.0 test? ( virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Remove POD from Perl code
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Pod-Strip
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.100.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=874e995d6123195a7590dc153aeb6186
diff --git a/metadata/md5-cache/dev-perl/Pod-Tests-1.200.0 b/metadata/md5-cache/dev-perl/Pod-Tests-1.200.0
new file mode 100644
index 000000000000..ed52d5f2ff69
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pod-Tests-1.200.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-File-Spec dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Extracts embedded tests and code examples from POD
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Pod-Tests
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Pod-Tests-1.20.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=7187ef5e29b86015239a2f6397a1e14a
diff --git a/metadata/md5-cache/dev-perl/Pod-Weaver-4.18.0 b/metadata/md5-cache/dev-perl/Pod-Weaver-4.18.0
new file mode 100644
index 000000000000..04fab617a1b2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Pod-Weaver-4.18.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Config-MVP-2.0.0 dev-perl/Config-MVP-Reader-INI dev-perl/DateTime virtual/perl-File-Spec dev-perl/List-MoreUtils >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Log-Dispatchouli-1.100.710 >=dev-perl/Mixin-Linewise-0.103.0 dev-perl/Module-Runtime dev-perl/Moose dev-perl/Params-Util >=dev-perl/Pod-Elemental-0.100.220 >=dev-perl/String-Flogger-1.0.0 >=dev-perl/String-Formatter-0.100.680 dev-perl/String-RewritePrefix dev-perl/Text-Template virtual/perl-Text-Tabs+Wrap dev-perl/namespace-autoclean virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/PPI dev-perl/Software-License dev-perl/Test-Differences >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Weave together a Pod document from an outline
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Pod-Weaver
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Config-MVP-2.0.0 dev-perl/Config-MVP-Reader-INI dev-perl/DateTime virtual/perl-File-Spec dev-perl/List-MoreUtils >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Log-Dispatchouli-1.100.710 >=dev-perl/Mixin-Linewise-0.103.0 dev-perl/Module-Runtime dev-perl/Moose dev-perl/Params-Util >=dev-perl/Pod-Elemental-0.100.220 >=dev-perl/String-Flogger-1.0.0 >=dev-perl/String-Formatter-0.100.680 dev-perl/String-RewritePrefix dev-perl/Text-Template virtual/perl-Text-Tabs+Wrap dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.018.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=09adbec8698a35e74ea206b9591c4437
diff --git a/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1 b/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1
deleted file mode 100644
index dad3a1d2e263..000000000000
--- a/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=An object that may be used to construct a block of text in PostScript
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/PostScript
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHAWNPW/PostScript-0.06.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0849b8e6f23071b8405068bcc57530c0
diff --git a/metadata/md5-cache/dev-perl/PostScript-0.60.0-r2 b/metadata/md5-cache/dev-perl/PostScript-0.60.0-r2
new file mode 100644
index 000000000000..c938e36b6fb7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PostScript-0.60.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=An object that may be used to construct a block of text in PostScript
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PostScript
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHAWNPW/PostScript-0.06.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=5b0855a1f792fc857bf53a7fa8e94f42
diff --git a/metadata/md5-cache/dev-perl/PostScript-Simple-0.90.0 b/metadata/md5-cache/dev-perl/PostScript-Simple-0.90.0
deleted file mode 100644
index 23305b537b3d..000000000000
--- a/metadata/md5-cache/dev-perl/PostScript-Simple-0.90.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.180.0 ) dev-lang/perl
-DESCRIPTION=Allows you to have a simple method of writing PostScript files from Perl
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/PostScript-Simple
-IUSE=test examples
-KEYWORDS=amd64 ~hppa ~ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MC/MCNEWTON/PostScript-Simple-0.09.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=003ca947bf0839c3a588fc00473195c1
diff --git a/metadata/md5-cache/dev-perl/PostScript-Simple-0.90.0-r1 b/metadata/md5-cache/dev-perl/PostScript-Simple-0.90.0-r1
new file mode 100644
index 000000000000..8e8395641117
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PostScript-Simple-0.90.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.180.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Allows you to have a simple method of writing PostScript files from Perl
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/PostScript-Simple
+IUSE=test examples
+KEYWORDS=amd64 ~hppa ~ia64 ppc sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MC/MCNEWTON/PostScript-Simple-0.09.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=12ef5aa5a893060231b28703eb171057
diff --git a/metadata/md5-cache/dev-perl/Probe-Perl-0.30.0 b/metadata/md5-cache/dev-perl/Probe-Perl-0.30.0
deleted file mode 100644
index e9e336561a1d..000000000000
--- a/metadata/md5-cache/dev-perl/Probe-Perl-0.30.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-File-Spec >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-Test ) dev-lang/perl
-DESCRIPTION=Information about the currently running perl
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Probe-Perl
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KW/KWILLIAMS/Probe-Perl-0.03.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=d321c9ba6f45ffb5e7c6faf6f3b62089
diff --git a/metadata/md5-cache/dev-perl/Probe-Perl-0.30.0-r1 b/metadata/md5-cache/dev-perl/Probe-Perl-0.30.0-r1
new file mode 100644
index 000000000000..ffa5e381514b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Probe-Perl-0.30.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-File-Spec >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-Test ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Information about the currently running perl
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Probe-Perl
+IUSE=test
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KW/KWILLIAMS/Probe-Perl-0.03.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=d7adf7a983e5903ace3b79847da7580f
diff --git a/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1 b/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1
deleted file mode 100644
index 2c19275c8a24..000000000000
--- a/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Generic interface to background process management
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Proc-Background
-KEYWORDS=~amd64 ~x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BZ/BZAJAC/Proc-Background-1.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2571eb80c782b76d3f304237d708c9fd
diff --git a/metadata/md5-cache/dev-perl/Proc-Background-1.220.0 b/metadata/md5-cache/dev-perl/Proc-Background-1.220.0
new file mode 100644
index 000000000000..6d996719b424
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Proc-Background-1.220.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Generic interface to background process management
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Proc-Background
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NE/NERDVANA/Proc-Background-1.22.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=a0ddb1d15739e4d10a540e8504ec33d5
diff --git a/metadata/md5-cache/dev-perl/Proc-Daemon-0.230.0 b/metadata/md5-cache/dev-perl/Proc-Daemon-0.230.0
deleted file mode 100644
index d5d9ef88fdd8..000000000000
--- a/metadata/md5-cache/dev-perl/Proc-Daemon-0.230.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!minimal? ( dev-perl/Proc-ProcessTable ) >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/perl
-DESCRIPTION=Run Perl program as a daemon process
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Proc-Daemon
-IUSE=minimal
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!minimal? ( dev-perl/Proc-ProcessTable ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AK/AKREAL/Proc-Daemon-0.23.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=05dd9721c722fef7eb89481e281053ac
diff --git a/metadata/md5-cache/dev-perl/Proc-Daemon-0.230.0-r1 b/metadata/md5-cache/dev-perl/Proc-Daemon-0.230.0-r1
new file mode 100644
index 000000000000..f5526a48bd83
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Proc-Daemon-0.230.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=!minimal? ( dev-perl/Proc-ProcessTable ) >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Run Perl program as a daemon process
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Proc-Daemon
+IUSE=minimal test
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!minimal? ( dev-perl/Proc-ProcessTable ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AK/AKREAL/Proc-Daemon-0.23.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=2a2ef9b6030cbf7aa58e09aab334b817
diff --git a/metadata/md5-cache/dev-perl/Proc-Guard-0.70.0 b/metadata/md5-cache/dev-perl/Proc-Guard-0.70.0
deleted file mode 100644
index 2873977ce7fb..000000000000
--- a/metadata/md5-cache/dev-perl/Proc-Guard-0.70.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Class-Accessor-Lite-0.50.0 >=virtual/perl-Exporter-5.630.0 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 >=dev-perl/Module-Build-0.380.0 test? ( dev-perl/File-Which dev-perl/Test-TCP dev-perl/Test-Requires dev-perl/Test-SharedFork >=virtual/perl-Test-Simple-0.940.0 ) dev-lang/perl
-DESCRIPTION=process runner with RAII pattern
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Proc-Guard
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Class-Accessor-Lite-0.50.0 >=virtual/perl-Exporter-5.630.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Proc-Guard-0.07.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=9ec623e417140ab890ea0a669057fb17
diff --git a/metadata/md5-cache/dev-perl/Proc-Guard-0.70.0-r1 b/metadata/md5-cache/dev-perl/Proc-Guard-0.70.0-r1
new file mode 100644
index 000000000000..97451c753dfd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Proc-Guard-0.70.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Class-Accessor-Lite-0.50.0 >=virtual/perl-Exporter-5.630.0 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 >=dev-perl/Module-Build-0.380.0 test? ( dev-perl/File-Which dev-perl/Test-TCP dev-perl/Test-Requires dev-perl/Test-SharedFork >=virtual/perl-Test-Simple-0.940.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=process runner with RAII pattern
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Proc-Guard
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Class-Accessor-Lite-0.50.0 >=virtual/perl-Exporter-5.630.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Proc-Guard-0.07.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=8f07f446db14e20ad72170bc6de254ab
diff --git a/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.590.0 b/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.590.0
new file mode 100644
index 000000000000..c864c77626f0
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.590.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Storable virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Unix process table information
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Proc-ProcessTable
+IUSE=examples test examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.59.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=ba394cbd3ee316037fcdd3d53c251068
diff --git a/metadata/md5-cache/dev-perl/Proc-Simple-1.320.0 b/metadata/md5-cache/dev-perl/Proc-Simple-1.320.0
deleted file mode 100644
index 6132cb129348..000000000000
--- a/metadata/md5-cache/dev-perl/Proc-Simple-1.320.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Launch and control background processes
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Proc-Simple
-IUSE=test examples
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-IO dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSCHILLI/Proc-Simple-1.32.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=7aef8dfb586fac7a1f5f9963f71c4cce
diff --git a/metadata/md5-cache/dev-perl/Proc-Simple-1.320.0-r1 b/metadata/md5-cache/dev-perl/Proc-Simple-1.320.0-r1
new file mode 100644
index 000000000000..765974a48e5d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Proc-Simple-1.320.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Launch and control background processes
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Proc-Simple
+IUSE=test examples
+KEYWORDS=amd64 ppc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-IO dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSCHILLI/Proc-Simple-1.32.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=d3adc9c91d84b302b2b1129a6558fcde
diff --git a/metadata/md5-cache/dev-perl/Proc-Wait3-0.50.0 b/metadata/md5-cache/dev-perl/Proc-Wait3-0.50.0
deleted file mode 100644
index 03f8707c0125..000000000000
--- a/metadata/md5-cache/dev-perl/Proc-Wait3-0.50.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Perl extension for wait3 system call
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Proc-Wait3
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CT/CTILMES/Proc-Wait3-0.05.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=7daa7f17922bc471eed40f6d495b6dd3
diff --git a/metadata/md5-cache/dev-perl/Proc-Wait3-0.50.0-r1 b/metadata/md5-cache/dev-perl/Proc-Wait3-0.50.0-r1
new file mode 100644
index 000000000000..13ba03d554b0
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Proc-Wait3-0.50.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl extension for wait3 system call
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Proc-Wait3
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CT/CTILMES/Proc-Wait3-0.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=5e2c2406f829b13b06e903f0c4dc69c1
diff --git a/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1 b/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1
deleted file mode 100644
index 262fa7f0e5f0..000000000000
--- a/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/IPC-Signal dev-lang/perl:=[-build(-)]
-DESCRIPTION=Interpret and act on wait() status values
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Proc-WaitStat
-KEYWORDS=amd64 ~ia64 ppc ~sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/IPC-Signal dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/Proc-WaitStat-1.00.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a52a0dac822a3d5affaae6f2ffe0dc43
diff --git a/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r2 b/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r2
new file mode 100644
index 000000000000..ff109586ceb9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/IPC-Signal dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Interpret and act on wait() status values
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Proc-WaitStat
+IUSE=test
+KEYWORDS=amd64 ~ia64 ppc ~sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/IPC-Signal dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/Proc-WaitStat-1.00.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=b1b1f2b22c5bca201a2191d802f5cda8
diff --git a/metadata/md5-cache/dev-perl/Sereal-Decoder-4.18.0 b/metadata/md5-cache/dev-perl/Sereal-Decoder-4.18.0
index 16b0fa9375bc..b02a056d2184 100644
--- a/metadata/md5-cache/dev-perl/Sereal-Decoder-4.18.0
+++ b/metadata/md5-cache/dev-perl/Sereal-Decoder-4.18.0
@@ -5,11 +5,11 @@ DESCRIPTION=Fast, compact, powerful binary deserialization
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Sereal-Decoder
 IUSE=test
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~ia64 ppc ppc64 sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader app-arch/zstd:= dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.018.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=93d7e7a56ff70d5718fb9c38297cbe93
+_md5_=051d0202fb40290f4f13bd57daaeef54
diff --git a/metadata/md5-cache/dev-perl/String-Format-1.180.0 b/metadata/md5-cache/dev-perl/String-Format-1.180.0
index 0523125bfa25..d4557ab969a3 100644
--- a/metadata/md5-cache/dev-perl/String-Format-1.180.0
+++ b/metadata/md5-cache/dev-perl/String-Format-1.180.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=sprintf-like string formatting capabilities with arbitrary format definitions
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/String-Format
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/String-Format-1.18.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=6c7df3153716572dfe3c55e4229fe536
+_md5_=8eafaf26b993cbec4fd5df56dd397dce
diff --git a/metadata/md5-cache/dev-perl/Sub-Quote-2.6.6 b/metadata/md5-cache/dev-perl/Sub-Quote-2.6.6
index b6f883709736..33c566287e03 100644
--- a/metadata/md5-cache/dev-perl/Sub-Quote-2.6.6
+++ b/metadata/md5-cache/dev-perl/Sub-Quote-2.6.6
@@ -4,11 +4,11 @@ DESCRIPTION=Efficient generation of subroutines via string eval
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Sub-Quote
 IUSE=test minimal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Moo-2.3.0 !minimal? ( >=dev-perl/Sub-Name-0.80.0 ) virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.006006.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=730dd05d6caceb6ffa1e3fb6c51d7bba
+_md5_=a0ac726eb1265564af9efbbb3dce915f
diff --git a/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.420.0-r1 b/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.420.0-r1
index 2c80e2f9592e..b0d8941d4d51 100644
--- a/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.420.0-r1
+++ b/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.420.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Perl extension for the GNU Readline/History Library
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Term-ReadLine-Gnu
 IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sys-libs/readline-6.2:0= sys-libs/ncurses:0= dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.42.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=910164a90c86d5201de04d792ac54572
+_md5_=4fc7d0e47b7d68688ea2a98d0e7f89ec
diff --git a/metadata/md5-cache/dev-perl/Term-Table-0.15.0 b/metadata/md5-cache/dev-perl/Term-Table-0.15.0
index efc72ba4b8fa..24230413c4cb 100644
--- a/metadata/md5-cache/dev-perl/Term-Table-0.15.0
+++ b/metadata/md5-cache/dev-perl/Term-Table-0.15.0
@@ -5,11 +5,11 @@ DESCRIPTION=Format a header and rows into a table
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Term-Table
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.015.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=07b70ba49026fd56d14ddae376754c11
+_md5_=b061a97864232c0d0d6b78a34710a7d3
diff --git a/metadata/md5-cache/dev-perl/Test-Needs-0.2.9 b/metadata/md5-cache/dev-perl/Test-Needs-0.2.9
index cfc5aa81d93f..0034647900fc 100644
--- a/metadata/md5-cache/dev-perl/Test-Needs-0.2.9
+++ b/metadata/md5-cache/dev-perl/Test-Needs-0.2.9
@@ -5,11 +5,11 @@ DESCRIPTION=Skip tests when modules not available
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Needs
 IUSE=test
-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
+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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Test-Needs-0.002009.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=85a9f2bf56d47652fa3f0c36320cd6b5
+_md5_=4223ea80d5bada329b60e8eff6f58b22
diff --git a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.140 b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.140
index 59ebcd55aad4..fc1c28fcec84 100644
--- a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.140
+++ b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.140
@@ -5,11 +5,11 @@ DESCRIPTION=A rich set of tools built upon the Test2 framework
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Test2-Suite
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Exporter >=dev-perl/Importer-0.24.0 >=dev-perl/Module-Pluggable-2.700.0 virtual/perl-Scalar-List-Utils dev-perl/Scope-Guard >=dev-perl/Sub-Info-0.2.0 >=dev-perl/Term-Table-0.13.0 >=virtual/perl-Test-Simple-1.302.176 virtual/perl-Time-HiRes dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000140.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=d94ca23e95e457103ae8bc65ee9151fd
+_md5_=279f6b9f295ce09228fc759fabd4d1f9
diff --git a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r3 b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r3
index 5db4576bdc0c..951c75c3d205 100644
--- a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r3
+++ b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Manipulate the mouse cursor programmatically
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Tk-CursorControl
 IUSE=test
-KEYWORDS=~amd64 ~ia64 ~sparc ~x86
+KEYWORDS=amd64 ~ia64 sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Tk dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNNIGANJ/Tk-CursorControl-0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=8e8ee0db7ee2fcefe07888222657229d
+_md5_=00a674bf32f34fd9a461e8b9fa175f5b
diff --git a/metadata/md5-cache/dev-perl/User-Identity-1.0.0 b/metadata/md5-cache/dev-perl/User-Identity-1.0.0
index f90dacd70562..bc6d9ff8865e 100644
--- a/metadata/md5-cache/dev-perl/User-Identity-1.0.0
+++ b/metadata/md5-cache/dev-perl/User-Identity-1.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Maintains info about a physical person
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/User-Identity
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Geography-Countries-1.400.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-1.00.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=63631f7bc200216e021ae00ecf11e6ae
+_md5_=619dd4f19531904572edcec152d1ebc5
diff --git a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.910.0 b/metadata/md5-cache/dev-perl/WWW-Mechanize-1.910.0
index a0664f2c4eb7..23a666b58c38 100644
--- a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.910.0
+++ b/metadata/md5-cache/dev-perl/WWW-Mechanize-1.910.0
@@ -4,11 +4,11 @@ DESCRIPTION=Handy web browsing in a Perl object
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/WWW-Mechanize
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Getopt-Long dev-perl/HTML-Form >=dev-perl/HTML-Parser-3.340.0 >=dev-perl/HTML-Tree-5 dev-perl/HTTP-Cookies dev-perl/HTTP-Message >=dev-perl/libwww-perl-5.827.0 >=virtual/perl-Scalar-List-Utils-1.140.0 virtual/perl-Tie-RefHash >=dev-perl/URI-1.360.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.91.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=b884226e188f30df8132907f2ce533ec
+_md5_=1f241132cd207717fac1ac837acb22f4
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-2.460.0 b/metadata/md5-cache/dev-perl/XML-Parser-2.460.0
index 464c6c3cf989..e7261a96a18d 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-2.460.0
+++ b/metadata/md5-cache/dev-perl/XML-Parser-2.460.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/expat-1.95.1-r1 dev-perl/libwww-perl dev-lang/perl
 DESCRIPTION=A perl module for parsing XML documents
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/XML-Parser
-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
+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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-libs/expat-1.95.1-r1 dev-perl/libwww-perl dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e682410516ef4c88db79caa483ea6171
+_md5_=7764fca3f22eefd93c789aefa4b04cab
diff --git a/metadata/md5-cache/dev-perl/XXX-0.370.0 b/metadata/md5-cache/dev-perl/XXX-0.370.0
index 4b8aea8824a9..3c684e17efa9 100644
--- a/metadata/md5-cache/dev-perl/XXX-0.370.0
+++ b/metadata/md5-cache/dev-perl/XXX-0.370.0
@@ -5,11 +5,11 @@ DESCRIPTION=See Your Data in the Nude
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/XXX
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/YAML-PP-0.18.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/XXX-0.37.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=375c8e368870a9d398fa97aa0edc6fe3
+_md5_=552a1584d016bbc35b8ae8ab03b8c85a
diff --git a/metadata/md5-cache/dev-perl/YAML-PP-0.27.0 b/metadata/md5-cache/dev-perl/YAML-PP-0.27.0
index d3dc4febd599..0e03982ceaa6 100644
--- a/metadata/md5-cache/dev-perl/YAML-PP-0.27.0
+++ b/metadata/md5-cache/dev-perl/YAML-PP-0.27.0
@@ -5,11 +5,11 @@ DESCRIPTION=YAML 1.2 processor in perl
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/YAML-PP
 IUSE=test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode virtual/perl-Exporter virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Module-Load >=virtual/perl-Scalar-List-Utils-1.70.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.027.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=254137d062385f42876b844549b596f0
+_md5_=1ebb966501f96db9b483c9a09a0ee2e7
diff --git a/metadata/md5-cache/dev-perl/pcsc-perl-1.4.14 b/metadata/md5-cache/dev-perl/pcsc-perl-1.4.14
deleted file mode 100644
index a54103b2ac92..000000000000
--- a/metadata/md5-cache/dev-perl/pcsc-perl-1.4.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-apps/pcsc-lite-1.6.0 dev-lang/perl
-DESCRIPTION=A Perl Module for PC/SC SmartCard access
-EAPI=6
-HOMEPAGE=http://ludovic.rousseau.free.fr/softwares/pcsc-perl/
-KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:=
-RESTRICT=test
-SLOT=0
-SRC_URI=http://ludovic.rousseau.free.fr/softwares/pcsc-perl/pcsc-perl-1.4.14.tar.bz2
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=e113c316aeb0787d67f4a4bc140289ad
diff --git a/metadata/md5-cache/dev-perl/pcsc-perl-1.4.14-r1 b/metadata/md5-cache/dev-perl/pcsc-perl-1.4.14-r1
new file mode 100644
index 000000000000..af2e4e10968a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/pcsc-perl-1.4.14-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-apps/pcsc-lite-1.6.0 dev-lang/perl
+DESCRIPTION=A Perl Module for PC/SC SmartCard access
+EAPI=8
+HOMEPAGE=http://ludovic.rousseau.free.fr/softwares/pcsc-perl/
+IUSE=test
+KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl:=
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=http://ludovic.rousseau.free.fr/softwares/pcsc-perl/pcsc-perl-1.4.14.tar.bz2
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=cd4a1f753a59ecc23655652c44acf770
diff --git a/metadata/md5-cache/dev-perl/perl-headers-0.0.1 b/metadata/md5-cache/dev-perl/perl-headers-0.0.1
deleted file mode 100644
index cb22d3dbc0c3..000000000000
--- a/metadata/md5-cache/dev-perl/perl-headers-0.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=dev-lang/perl:= sys-kernel/linux-headers
-DESCRIPTION=Generated .ph equivalents of system headers
-EAPI=6
-HOMEPAGE=https://github.com/gentoo-perl/perl-headers
-IUSE=+debug +sizeof-warning
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=https://github.com/gentoo-perl/perl-headers/archive/0.0.1.tar.gz -> perl-headers-0.0.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1f2728767c903a03983fa6e899593636
diff --git a/metadata/md5-cache/dev-perl/perl-headers-0.0.1-r1 b/metadata/md5-cache/dev-perl/perl-headers-0.0.1-r1
new file mode 100644
index 000000000000..94d98c86cf76
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/perl-headers-0.0.1-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/perl:= sys-kernel/linux-headers
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Generated .ph equivalents of system headers
+EAPI=8
+HOMEPAGE=https://github.com/gentoo-perl/perl-headers
+IUSE=+debug +sizeof-warning
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=https://github.com/gentoo-perl/perl-headers/archive/0.0.1.tar.gz -> perl-headers-0.0.1.tar.gz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=279c911ffbe1e065a4b3257206d9f0c7
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 52620b9b841f..df7178fe6dbd 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/igbinary-3.2.3 b/metadata/md5-cache/dev-php/igbinary-3.2.3
deleted file mode 100644
index daeacc30d413..000000000000
--- a/metadata/md5-cache/dev-php/igbinary-3.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DESCRIPTION=A fast drop-in replacement for the standard PHP serialize
-EAPI=7
-HOMEPAGE=https://github.com/igbinary/igbinary
-IUSE=php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
-SLOT=0
-SRC_URI=https://github.com/igbinary/igbinary/archive/3.2.3.tar.gz -> igbinary-3.2.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=142b11a4cd3b74df28ad64e832013326
diff --git a/metadata/md5-cache/dev-php/igbinary-3.2.4 b/metadata/md5-cache/dev-php/igbinary-3.2.4
new file mode 100644
index 000000000000..f735c75bfc0a
--- /dev/null
+++ b/metadata/md5-cache/dev-php/igbinary-3.2.4
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DESCRIPTION=A fast drop-in replacement for the standard PHP serialize
+EAPI=7
+HOMEPAGE=https://github.com/igbinary/igbinary
+IUSE=php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+SLOT=0
+SRC_URI=https://github.com/igbinary/igbinary/archive/3.2.4.tar.gz -> igbinary-3.2.4.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=142b11a4cd3b74df28ad64e832013326
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 93404d5e4d7f..4b2dec4d6b05 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/aesara-2.1.3 b/metadata/md5-cache/dev-python/aesara-2.1.3
new file mode 100644
index 000000000000..d2fcdbcbacca
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aesara-2.1.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
+EAPI=7
+HOMEPAGE=https://github.com/aesara-devs/aesara
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aesara-devs/aesara/archive/rel-2.1.3.tar.gz -> aesara-rel-2.1.3.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=68a4fadb4bfeef3895f4cfefed45df28
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.7.4-r1 b/metadata/md5-cache/dev-python/aiohttp-3.7.4-r1
index f59f8f96f0e4..35e0fee86816 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.7.4-r1
+++ b/metadata/md5-cache/dev-python/aiohttp-3.7.4-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( !!dev-python/pytest-aiohttp app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/async_generator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] www-servers/gunicorn[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/re-assert[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/async_timeout-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/multidict-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/yarl-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_9(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_9(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_9(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_9(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_8(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_8(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_8(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( !!dev-python/pytest-aiohttp app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/async_generator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/gunicorn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/re-assert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/async_timeout-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/multidict-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/yarl-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_10(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_10(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_10(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_10(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_9(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_9(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_9(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_9(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_8(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_8(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_8(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=http client/server for asyncio
 EAPI=7
 HOMEPAGE=https://pypi.org/project/aiohttp/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/async_timeout-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/multidict-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/yarl-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/async_timeout-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/multidict-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/yarl-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.7.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7769f149b388c6f26c4275d0b4a38a4e
+_md5_=7cc69378e5edaa106754040bda629cbe
diff --git a/metadata/md5-cache/dev-python/aiohttp-jinja2-1.4.2 b/metadata/md5-cache/dev-python/aiohttp-jinja2-1.4.2
index c8ac9aea99e2..48295f973a6e 100644
--- a/metadata/md5-cache/dev-python/aiohttp-jinja2-1.4.2
+++ b/metadata/md5-cache/dev-python/aiohttp-jinja2-1.4.2
@@ -1,16 +1,15 @@
-BDEPEND=test? ( >=dev-python/aiohttp-2.3.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/pytest-aiohttp-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aiohttp-2.3.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/aiohttp-2.3.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-aiohttp-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 DESCRIPTION=jinja2 template renderer for aiohttp.web
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/aiohttp-jinja2
-IUSE=doc test test python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aiohttp-2.3.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+RDEPEND=>=dev-python/aiohttp-2.3.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp-jinja2/aiohttp-jinja2-1.4.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cde66bff7a8ed3c63ecb52fa678d3791
+_md5_=a33261c4a1ee7a99da51ffcdb223f8e5
diff --git a/metadata/md5-cache/dev-python/apispec-5.0.0 b/metadata/md5-cache/dev-python/apispec-5.0.0
new file mode 100644
index 000000000000..522fdbdb9814
--- /dev/null
+++ b/metadata/md5-cache/dev-python/apispec-5.0.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/bottle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/marshmallow-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A pluggable API specification generator.
+EAPI=8
+HOMEPAGE=https://github.com/marshmallow-code/apispec/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/marshmallow-code/apispec/archive/5.0.0.tar.gz -> apispec-5.0.0.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d1d52c981f07c90962ac6fbb90b2c919
diff --git a/metadata/md5-cache/dev-python/asgiref-3.3.4 b/metadata/md5-cache/dev-python/asgiref-3.3.4
deleted file mode 100644
index 018b6d98b4fe..000000000000
--- a/metadata/md5-cache/dev-python/asgiref-3.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=ASGI utilities (successor to WSGI)
-EAPI=7
-HOMEPAGE=https://asgi.readthedocs.io/en/latest/ https://github.com/django/asgiref/ https://pypi.org/project/asgiref/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/asgiref/asgiref-3.3.4.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=364d512968d6bc92325223bd673115c5
diff --git a/metadata/md5-cache/dev-python/asgiref-3.4.0 b/metadata/md5-cache/dev-python/asgiref-3.4.0
deleted file mode 100644
index c530ebabf277..000000000000
--- a/metadata/md5-cache/dev-python/asgiref-3.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=ASGI utilities (successor to WSGI)
-EAPI=7
-HOMEPAGE=https://asgi.readthedocs.io/en/latest/ https://github.com/django/asgiref/ https://pypi.org/project/asgiref/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/asgiref/asgiref-3.4.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7f99332f362a149ca34fdab9ef6b895a
diff --git a/metadata/md5-cache/dev-python/asgiref-3.4.1 b/metadata/md5-cache/dev-python/asgiref-3.4.1
index 8a5562d4adb7..04bd7d7fe900 100644
--- a/metadata/md5-cache/dev-python/asgiref-3.4.1
+++ b/metadata/md5-cache/dev-python/asgiref-3.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=ASGI utilities (successor to WSGI)
 EAPI=8
 HOMEPAGE=https://asgi.readthedocs.io/en/latest/ https://github.com/django/asgiref/ https://pypi.org/project/asgiref/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/asgiref/asgiref-3.4.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=003393e8a9a8fb454039cc15e14f5206
+_md5_=2245fafe932f2157e81eca15054526fb
diff --git a/metadata/md5-cache/dev-python/astroid-2.5.8 b/metadata/md5-cache/dev-python/astroid-2.5.8
deleted file mode 100644
index 14afd9a60601..000000000000
--- a/metadata/md5-cache/dev-python/astroid-2.5.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Abstract Syntax Tree for logilab packages
-EAPI=7
-HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyCQA/astroid/archive/v2.5.8.tar.gz -> astroid-2.5.8.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ec4e812a29d6b874c3103fc9fc8e80c2
diff --git a/metadata/md5-cache/dev-python/astroid-2.6.2 b/metadata/md5-cache/dev-python/astroid-2.6.2
index 61511437b67b..d124abe17683 100644
--- a/metadata/md5-cache/dev-python/astroid-2.6.2
+++ b/metadata/md5-cache/dev-python/astroid-2.6.2
@@ -4,7 +4,7 @@ DESCRIPTION=Abstract Syntax Tree for logilab packages
 EAPI=8
 HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/astroid/archive/v2.6.2.tar.gz -> astroid-2.6.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=42e91d6229fe6d7e4d9fd02a8e973aa3
+_md5_=5c1e976e251950769f55f3de5b99bf33
diff --git a/metadata/md5-cache/dev-python/astroid-2.6.4 b/metadata/md5-cache/dev-python/astroid-2.6.4
deleted file mode 100644
index 9e57de4eb9d8..000000000000
--- a/metadata/md5-cache/dev-python/astroid-2.6.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Abstract Syntax Tree for logilab packages
-EAPI=8
-HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyCQA/astroid/archive/v2.6.4.tar.gz -> astroid-2.6.4.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9c487407c6242f7c3b2de88239d05c23
diff --git a/metadata/md5-cache/dev-python/async_timeout-3.0.1 b/metadata/md5-cache/dev-python/async_timeout-3.0.1
index dc50e3f6a2f9..02b77b3a840c 100644
--- a/metadata/md5-cache/dev-python/async_timeout-3.0.1
+++ b/metadata/md5-cache/dev-python/async_timeout-3.0.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Timeout context manager for asyncio programs
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/async-timeout
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_timeout/async-timeout-3.0.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3a8453e7f1510ac68b5962dcabf7ff4d
+_md5_=d5126a279bbc59db0213a88c31bd5163
diff --git a/metadata/md5-cache/dev-python/backports-entry_points_selectable-1.1.0 b/metadata/md5-cache/dev-python/backports-entry_points_selectable-1.1.0
index 322aa883fd5b..0c6ea1821cd6 100644
--- a/metadata/md5-cache/dev-python/backports-entry_points_selectable-1.1.0
+++ b/metadata/md5-cache/dev-python/backports-entry_points_selectable-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Compatibility shim providing selectable entry points
 EAPI=8
 HOMEPAGE=https://github.com/jaraco/backports.entry_points_selectable/ https://pypi.org/project/backports.entry-points-selectable/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaraco/backports.entry_points_selectable/archive/v1.1.0.tar.gz -> backports.entry_points_selectable-1.1.0.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b56e32b410a22f5b3e0863e3f0d0fbf8
+_md5_=d1b5204a305f4b33c990438a67ca12b3
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.9.3 b/metadata/md5-cache/dev-python/beautifulsoup-4.9.3
index 22f02875a120..2af946a1a4f6 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.9.3
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.9.3
@@ -4,7 +4,7 @@ DESCRIPTION=Pythonic idioms for iterating, searching, and modifying an HTML/XML
 EAPI=7
 HOMEPAGE=https://www.crummy.com/software/BeautifulSoup/bs4/
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.9.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2f08914da7da18ce6cfd992636a62f4e
+_md5_=cad3049f4b143926c55ba05917c09a8d
diff --git a/metadata/md5-cache/dev-python/betamax-0.8.1 b/metadata/md5-cache/dev-python/betamax-0.8.1
index 6dfc78fd9f64..5907c9aea99a 100644
--- a/metadata/md5-cache/dev-python/betamax-0.8.1
+++ b/metadata/md5-cache/dev-python/betamax-0.8.1
@@ -5,7 +5,7 @@ DESCRIPTION=python-requests HTTP exchanges recorder
 EAPI=7
 HOMEPAGE=https://github.com/betamaxpy/betamax
 IUSE=test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/betamax/betamax-0.8.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b7bbf20bb0981a176ac8e70c2ec36890
+_md5_=030552f50bb54d3f196d87467ae85e35
diff --git a/metadata/md5-cache/dev-python/bitarray-2.2.4 b/metadata/md5-cache/dev-python/bitarray-2.2.4
new file mode 100644
index 000000000000..b363e37884a1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bitarray-2.2.4
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Efficient arrays of booleans -- C extension
+EAPI=8
+HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=PSF-2
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/bitarray/bitarray-2.2.4.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=83c3618eca0c3f422984662fe0f911ef
diff --git a/metadata/md5-cache/dev-python/bleach-3.3.1 b/metadata/md5-cache/dev-python/bleach-3.3.1
index 9255b269d5b3..be13394cb343 100644
--- a/metadata/md5-cache/dev-python/bleach-3.3.1
+++ b/metadata/md5-cache/dev-python/bleach-3.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=An easy whitelist-based HTML-sanitizing tool
 EAPI=8
 HOMEPAGE=https://github.com/mozilla/bleach/ https://pypi.org/project/bleach/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-3.3.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b558099959f812915ae6b8cd82840e14
+_md5_=8dac19f72a75e51ebd55aaa25cd6a788
diff --git a/metadata/md5-cache/dev-python/blosc-1.10.4 b/metadata/md5-cache/dev-python/blosc-1.10.4
index 21e242f9fac3..027d4de6be24 100644
--- a/metadata/md5-cache/dev-python/blosc-1.10.4
+++ b/metadata/md5-cache/dev-python/blosc-1.10.4
@@ -5,7 +5,7 @@ DESCRIPTION=High performance compressor optimized for binary data
 EAPI=7
 HOMEPAGE=http://python-blosc.blosc.org
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/c-blosc-1.19.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blosc/blosc-1.10.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0ba6db53e7c2ef2a9f8cf656ac068419
+_md5_=540cb01dbe89982631d4526d09fd3df7
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.10 b/metadata/md5-cache/dev-python/boto3-1.18.10
new file mode 100644
index 000000000000..ad2a113a9bbf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.10.tar.gz -> boto3-1.18.10.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.11 b/metadata/md5-cache/dev-python/boto3-1.18.11
new file mode 100644
index 000000000000..9012d6417029
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.11
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.11.tar.gz -> boto3-1.18.11.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.9 b/metadata/md5-cache/dev-python/boto3-1.18.9
new file mode 100644
index 000000000000..4314a2ce4c73
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.9
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.9.tar.gz -> boto3-1.18.9.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.10 b/metadata/md5-cache/dev-python/botocore-1.21.10
new file mode 100644
index 000000000000..0266008c10ba
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.10.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.11 b/metadata/md5-cache/dev-python/botocore-1.21.11
new file mode 100644
index 000000000000..3dc4c24c4c1d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.11
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.11.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.9 b/metadata/md5-cache/dev-python/botocore-1.21.9
new file mode 100644
index 000000000000..fe11661a89e0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.9
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.9.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.3 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
index cba5df6e0ee9..529974177819 100644
--- a/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
+++ b/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=The Real First Universal Charset Detector
 EAPI=8
 HOMEPAGE=https://pypi.org/project/charset-normalizer/ https://github.com/ousret/charset_normalizer/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ousret/charset_normalizer/archive/2.0.3.tar.gz -> charset_normalizer-2.0.3.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0d4316c7100c3cbef0ac719a5f24c8e0
+_md5_=07a2cee6558cee437fe9e05336c55a7d
diff --git a/metadata/md5-cache/dev-python/clang-python-10.0.1 b/metadata/md5-cache/dev-python/clang-python-10.0.1
index 651b0c6900a0..96640f06b74f 100644
--- a/metadata/md5-cache/dev-python/clang-python-10.0.1
+++ b/metadata/md5-cache/dev-python/clang-python-10.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83171234b2091b77b1e5f1197fdfbb8c
diff --git a/metadata/md5-cache/dev-python/clang-python-11.1.0 b/metadata/md5-cache/dev-python/clang-python-11.1.0
index d38cf1d8f5a4..b2323e5d4ca8 100644
--- a/metadata/md5-cache/dev-python/clang-python-11.1.0
+++ b/metadata/md5-cache/dev-python/clang-python-11.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9009cb8ea57148122e0da77b4dfb409
diff --git a/metadata/md5-cache/dev-python/clang-python-12.0.0 b/metadata/md5-cache/dev-python/clang-python-12.0.0
index 591ae5c163e1..a487e04f5cd7 100644
--- a/metadata/md5-cache/dev-python/clang-python-12.0.0
+++ b/metadata/md5-cache/dev-python/clang-python-12.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9009cb8ea57148122e0da77b4dfb409
diff --git a/metadata/md5-cache/dev-python/clang-python-12.0.1 b/metadata/md5-cache/dev-python/clang-python-12.0.1
index 3dd01da2915c..8f3da75099bd 100644
--- a/metadata/md5-cache/dev-python/clang-python-12.0.1
+++ b/metadata/md5-cache/dev-python/clang-python-12.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6a328146d67691e7e22fbb8cefe19338
diff --git a/metadata/md5-cache/dev-python/clang-python-13.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-13.0.0.9999
index c3db968878e3..900bf8a2efcd 100644
--- a/metadata/md5-cache/dev-python/clang-python-13.0.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-13.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/clang-13.0.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !s
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=41d28ae1bc14f42321dece68538d0222
diff --git a/metadata/md5-cache/dev-python/clang-python-14.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-14.0.0.9999
new file mode 100644
index 000000000000..8db84f3528bc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-14.0.0.9999
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=install prepare test unpack
+DEPEND=>=sys-devel/clang-14.0.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PROPERTIES=live
+RDEPEND=>=sys-devel/clang-14.0.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=41d28ae1bc14f42321dece68538d0222
diff --git a/metadata/md5-cache/dev-python/cppy-1.1.0 b/metadata/md5-cache/dev-python/cppy-1.1.0
index 33caf1e0b70b..99818a45d2cd 100644
--- a/metadata/md5-cache/dev-python/cppy-1.1.0
+++ b/metadata/md5-cache/dev-python/cppy-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=C++ header library which makes it easier to write Python extension m
 EAPI=7
 HOMEPAGE=https://pypi.org/project/cppy
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cppy/cppy-1.1.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=92b1a9aaf974eabfba9832d75a119bda
+_md5_=50114ec6ea7f1d9f872d4846f2023bc5
diff --git a/metadata/md5-cache/dev-python/cycler-0.10.0-r1 b/metadata/md5-cache/dev-python/cycler-0.10.0-r1
index bb524f7ea4c9..286cd3ea726b 100644
--- a/metadata/md5-cache/dev-python/cycler-0.10.0-r1
+++ b/metadata/md5-cache/dev-python/cycler-0.10.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Composable style cycles
 EAPI=7
 HOMEPAGE=https://matplotlib.org/cycler/ https://pypi.org/project/Cycler/ https://github.com/matplotlib/cycler
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matplotlib/cycler/archive/v0.10.0.tar.gz -> cycler-0.10.0.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d2967d9b36d76b14c82a0b062876ffd9
+_md5_=36d240cb6beb93e184abf890876fffe3
diff --git a/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.0 b/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.0
index a39bdec70aa9..a76f214cc37e 100644
--- a/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.0
+++ b/metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=A trivial extension that just raises an exception (for testing)
 EAPI=7
 HOMEPAGE=https://pypi.org/project/cython-test-exception-raiser/ https://github.com/twisted/cython-test-exception-raiser/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/twisted/cython-test-exception-raiser/archive/v1.0.0.tar.gz -> cython-test-exception-raiser-1.0.0.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c6e0cfa2fd1fd870b323db6777d3fa69
+_md5_=ef52e717aa5ed1ca647ad7eec65f85de
diff --git a/metadata/md5-cache/dev-python/dask-2021.7.2 b/metadata/md5-cache/dev-python/dask-2021.7.2
new file mode 100644
index 000000000000..45c3ddadd35a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dask-2021.7.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numexpr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-rerunfailures[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
+EAPI=8
+HOMEPAGE=https://dask.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/dask/dask-2021.7.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c9e3709f57b8d785aafff9ed52288ec0
diff --git a/metadata/md5-cache/dev-python/distro-1.6.0 b/metadata/md5-cache/dev-python/distro-1.6.0
new file mode 100644
index 000000000000..3355ded77350
--- /dev/null
+++ b/metadata/md5-cache/dev-python/distro-1.6.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Reliable machine-readable Linux distribution information for Python
+EAPI=7
+HOMEPAGE=https://distro.readthedocs.io/en/latest/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/distro/distro-1.6.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7ad89284cc3a038de0d3276e959b414b
diff --git a/metadata/md5-cache/dev-python/django-2.2.24 b/metadata/md5-cache/dev-python/django-2.2.24
index a314b07d61e1..e0abf132c9eb 100644
--- a/metadata/md5-cache/dev-python/django-2.2.24
+++ b/metadata/md5-cache/dev-python/django-2.2.24
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/2.2/Django-2.2.24.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-2.2.24.checksum.txt )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=aa460f2d5d13ca216f9e16564ab083be
diff --git a/metadata/md5-cache/dev-python/django-3.1.13 b/metadata/md5-cache/dev-python/django-3.1.13
index 61cfe6b800b0..7007dbeb4e12 100644
--- a/metadata/md5-cache/dev-python/django-3.1.13
+++ b/metadata/md5-cache/dev-python/django-3.1.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/3.1/Django-3.1.13.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.1.13.checksum.txt )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=ef6e6af8165fbaeeef1ba5c1b940881c
diff --git a/metadata/md5-cache/dev-python/django-3.2.5 b/metadata/md5-cache/dev-python/django-3.2.5
index 8edbefa25ad4..0fbe388d18bd 100644
--- a/metadata/md5-cache/dev-python/django-3.2.5
+++ b/metadata/md5-cache/dev-python/django-3.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/3.2/Django-3.2.5.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.2.5.checksum.txt )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=214b9422c81b0f038163bbe0ecef783a
diff --git a/metadata/md5-cache/dev-python/emoji-1.4.2 b/metadata/md5-cache/dev-python/emoji-1.4.2
new file mode 100644
index 000000000000..978dd496ab71
--- /dev/null
+++ b/metadata/md5-cache/dev-python/emoji-1.4.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Emoji for Python
+EAPI=8
+HOMEPAGE=https://github.com/carpedm20/emoji/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/carpedm20/emoji/archive/refs/tags/v.1.4.2.tar.gz -> emoji-1.4.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=882a8bfdb3069eb77e6a9c9433f766a9
diff --git a/metadata/md5-cache/dev-python/et_xmlfile-1.1.0 b/metadata/md5-cache/dev-python/et_xmlfile-1.1.0
index 641239a0448d..87429a0f7410 100644
--- a/metadata/md5-cache/dev-python/et_xmlfile-1.1.0
+++ b/metadata/md5-cache/dev-python/et_xmlfile-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=An implementation of lxml.xmlfile for the standard library
 EAPI=7
 HOMEPAGE=https://pypi.org/project/et-xmlfile/ https://foss.heptapod.net/openpyxl/et_xmlfile/
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/openpyxl/et_xmlfile/-/archive/1.1/et_xmlfile-1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c3fe08cb7e28666c7b5ecb2b399b1a18
+_md5_=ea671db6dd76901f0020eb56b30d8e6a
diff --git a/metadata/md5-cache/dev-python/executing-0.8.0 b/metadata/md5-cache/dev-python/executing-0.8.0
new file mode 100644
index 000000000000..ec3e801db97d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/executing-0.8.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Get information about what a Python frame is currently doing
+EAPI=8
+HOMEPAGE=https://github.com/alexmojaki/executing/ https://pypi.org/project/executing/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/alexmojaki/executing/archive/v0.8.0.tar.gz -> executing-0.8.0.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1d4c5c2e61ee56a31f47ca9db134e288
diff --git a/metadata/md5-cache/dev-python/flit-3.3.0 b/metadata/md5-cache/dev-python/flit-3.3.0
new file mode 100644
index 000000000000..8fb828f85df7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flit-3.3.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep sys-apps/findutils test? ( dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/pygments-github-lexers[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/pygments-github-lexers[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] dev-python/pygments-github-lexers[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-)] dev-python/pygments-github-lexers[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-15[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simplified packaging of Python modules
+EAPI=8
+HOMEPAGE=https://github.com/takluyver/flit https://flit.readthedocs.io/
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/flit/flit-3.3.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a2915f551eb968363acf491cbeec42a4
diff --git a/metadata/md5-cache/dev-python/flit_core-3.3.0 b/metadata/md5-cache/dev-python/flit_core-3.3.0
new file mode 100644
index 000000000000..db03cd096cec
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flit_core-3.3.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pyproject2setuppy-11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-15[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simplified packaging of Python modules (core module)
+EAPI=8
+HOMEPAGE=https://pypi.org/project/flit-core/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/flit_core/flit_core-3.3.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c0e218f7334700a2664c4cae8dac53dd
diff --git a/metadata/md5-cache/dev-python/fsspec-2021.05.0 b/metadata/md5-cache/dev-python/fsspec-2021.05.0
deleted file mode 100644
index 72b2274b2695..000000000000
--- a/metadata/md5-cache/dev-python/fsspec-2021.05.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A specification that python filesystems should adhere to
-EAPI=7
-HOMEPAGE=https://github.com/intake/filesystem_spec/ https://pypi.org/project/fsspec/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/intake/filesystem_spec/archive/2021.05.0.tar.gz -> filesystem_spec-2021.05.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9fa9ab3550cd045d5fda3bcbd420123
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.5 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.5
new file mode 100644
index 000000000000..89706d1545d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google Authentication Library
+EAPI=8
+HOMEPAGE=https://pypi.org/project/google-auth-oauthlib/ https://github.com/googleapis/google-auth-library-python-oauthlib
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v0.4.5.tar.gz -> google-auth-library-python-oauthlib-0.4.5.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d4f76d464ca2b993ee8ad0032f090ec3
diff --git a/metadata/md5-cache/dev-python/httpx-0.18.2 b/metadata/md5-cache/dev-python/httpx-0.18.2
index ab901165b6d3..046ce511c31b 100644
--- a/metadata/md5-cache/dev-python/httpx-0.18.2
+++ b/metadata/md5-cache/dev-python/httpx-0.18.2
@@ -4,7 +4,7 @@ DESCRIPTION=Fully-featured HTTP client which provides sync and async APIs
 EAPI=7
 HOMEPAGE=https://www.python-httpx.org/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sniffio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/httpcore-0.13*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rfc3986-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/rfc3986-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/httpx/archive/0.18.2.tar.gz -> httpx-0.18.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8ea021d15473069b16502ed34d2eec4f
+_md5_=b21948cdda622f6d3b95202525676180
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-4.6.2 b/metadata/md5-cache/dev-python/importlib_metadata-4.6.2
new file mode 100644
index 000000000000..8a5395f6b736
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_metadata-4.6.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/jaraco-packaging[python_targets_python3_10(-)] dev-python/rst-linker[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-)] dev-python/rst-linker[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-)] ) ) ) test? ( python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read metadata from Python packages
+EAPI=8
+HOMEPAGE=https://github.com/python/importlib_metadata
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-4.6.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=734bd07cfb02a7e0e20d58f30c8e2a71
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-4.6.3 b/metadata/md5-cache/dev-python/importlib_metadata-4.6.3
new file mode 100644
index 000000000000..fbb3164dc24f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_metadata-4.6.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/jaraco-packaging[python_targets_python3_10(-)] dev-python/rst-linker[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-)] dev-python/rst-linker[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-)] ) ) ) test? ( python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read metadata from Python packages
+EAPI=8
+HOMEPAGE=https://github.com/python/importlib_metadata
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-4.6.3.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=734bd07cfb02a7e0e20d58f30c8e2a71
diff --git a/metadata/md5-cache/dev-python/importlib_resources-5.2.1 b/metadata/md5-cache/dev-python/importlib_resources-5.2.1
new file mode 100644
index 000000000000..6ee77ac8b999
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_resources-5.2.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools_scm-3.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] test? ( python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read resources from Python packages
+EAPI=8
+HOMEPAGE=https://github.com/python/importlib_resources
+IUSE=test doc python_targets_pypy3 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-5.2.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4048fad37da8ba9a89b026663743c0f5
diff --git a/metadata/md5-cache/dev-python/importlib_resources-5.2.2 b/metadata/md5-cache/dev-python/importlib_resources-5.2.2
new file mode 100644
index 000000000000..e5cc57782108
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_resources-5.2.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools_scm-3.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] test? ( python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read resources from Python packages
+EAPI=8
+HOMEPAGE=https://github.com/python/importlib_resources
+IUSE=test doc python_targets_pypy3 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-5.2.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4048fad37da8ba9a89b026663743c0f5
diff --git a/metadata/md5-cache/dev-python/isort-5.9.3 b/metadata/md5-cache/dev-python/isort-5.9.3
new file mode 100644
index 000000000000..196c56f6872b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/isort-5.9.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pylama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) test? ( dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A python utility/library to sort imports
+EAPI=8
+HOMEPAGE=https://pypi.org/project/isort/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/isort/archive/5.9.3.tar.gz -> isort-5.9.3.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a3fc16489c1e35639babe27c873b0465
diff --git a/metadata/md5-cache/dev-python/jaraco-classes-3.2.1 b/metadata/md5-cache/dev-python/jaraco-classes-3.2.1
index 03415fc5ed0a..4ecae0518e7d 100644
--- a/metadata/md5-cache/dev-python/jaraco-classes-3.2.1
+++ b/metadata/md5-cache/dev-python/jaraco-classes-3.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Classes used by other projects by developer jaraco
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.classes
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.classes/jaraco.classes-3.2.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4fdf99ed7f4f389d81efe2a1710b66dd
+_md5_=697ff5df80d7843578a5de44d2b65d66
diff --git a/metadata/md5-cache/dev-python/jaraco-envs-2.1.1 b/metadata/md5-cache/dev-python/jaraco-envs-2.1.1
index a1e2a1b9928f..bb1fb1d06918 100644
--- a/metadata/md5-cache/dev-python/jaraco-envs-2.1.1
+++ b/metadata/md5-cache/dev-python/jaraco-envs-2.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Classes for orchestrating Python (virtual) environments.
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.envs
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.envs/jaraco.envs-2.1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3b22d8cd093ffa82e8ffd92bca717e7f
+_md5_=4ca99a0c37b52e589f86304c2c00e123
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-3.3.0 b/metadata/md5-cache/dev-python/jaraco-functools-3.3.0
index 965873a88753..033419df9a9a 100644
--- a/metadata/md5-cache/dev-python/jaraco-functools-3.3.0
+++ b/metadata/md5-cache/dev-python/jaraco-functools-3.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Additional functions used by other projects by developer jaraco
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.functools
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-3.3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2e777835bf3dd107624326728e8e106a
+_md5_=e8f7bb210818106bdfd6ecf2fda8afa3
diff --git a/metadata/md5-cache/dev-python/jaraco-path-3.3.1 b/metadata/md5-cache/dev-python/jaraco-path-3.3.1
index ab07eeeb111d..2353a93547e6 100644
--- a/metadata/md5-cache/dev-python/jaraco-path-3.3.1
+++ b/metadata/md5-cache/dev-python/jaraco-path-3.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=Miscellaneous path functions
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.path/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.path/jaraco.path-3.3.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a8a5d6bcd52ca173f225321bd48a7a38
+_md5_=bc327c5f9bca4ccbfeabc815d084b3b5
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.0.0 b/metadata/md5-cache/dev-python/libvirt-python-7.0.0
index 85d2bda3af8f..9f73015ad331 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-7.0.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.0.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.0.0.tar.gz.asc )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=95a355042668a88d9e0b2e7e060206ce
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=1df427d5652d99f21188d030a8445189
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.1.0 b/metadata/md5-cache/dev-python/libvirt-python-7.1.0
index c0ea7c50dacc..6cb04e5aca68 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-7.1.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.1.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.1.0.tar.gz.asc )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=2bc7c38ebf3539e4594270d97188bc19
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=eed9b74cb2d5785d1739fcf1b9536791
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.2.0 b/metadata/md5-cache/dev-python/libvirt-python-7.2.0
index 5d177c63516c..754019dc50b1 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-7.2.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.2.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.2.0.tar.gz.asc )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=2bc7c38ebf3539e4594270d97188bc19
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=eed9b74cb2d5785d1739fcf1b9536791
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.3.0 b/metadata/md5-cache/dev-python/libvirt-python-7.3.0
index c4c5b896ca55..cede15bfd8ae 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-7.3.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.3.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.3.0.tar.gz.asc )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=3a97c2b01f330753bf21d272e40a23fb
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=c05aba5c0f551123c7c72fdc5c9c913f
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.4.0 b/metadata/md5-cache/dev-python/libvirt-python-7.4.0
index 21ef59379d54..fa9a1a941fa6 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-7.4.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.4.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.4.0.tar.gz.asc )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=6d19a6426da1789d1095c2b7566ee84d
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=9f41c13decaf177050dcc18e1950b811
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.5.0 b/metadata/md5-cache/dev-python/libvirt-python-7.5.0
index c44859960658..723a5ff4ec9d 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-7.5.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.5.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.5.0.tar.gz.asc )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=6d19a6426da1789d1095c2b7566ee84d
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=9f41c13decaf177050dcc18e1950b811
diff --git a/metadata/md5-cache/dev-python/libvirt-python-9999 b/metadata/md5-cache/dev-python/libvirt-python-9999
index cfc7e5b28e25..be7b45f80bb4 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-9999
+++ b/metadata/md5-cache/dev-python/libvirt-python-9999
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/libvirt:=[-python(-)] python_targets_python3_8? ( dev-lang
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=6d19a6426da1789d1095c2b7566ee84d
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=9f41c13decaf177050dcc18e1950b811
diff --git a/metadata/md5-cache/dev-python/lit-10.0.1 b/metadata/md5-cache/dev-python/lit-10.0.1
index 32210f379ead..aa8c3bc021bb 100644
--- a/metadata/md5-cache/dev-python/lit-10.0.1
+++ b/metadata/md5-cache/dev-python/lit-10.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c0e6b953776c78466294364e7772ca6
diff --git a/metadata/md5-cache/dev-python/lit-11.1.0 b/metadata/md5-cache/dev-python/lit-11.1.0
index 66f430bb51e2..235dbe17f714 100644
--- a/metadata/md5-cache/dev-python/lit-11.1.0
+++ b/metadata/md5-cache/dev-python/lit-11.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee4f5cdb01bb3ba49e38903725e3ad88
diff --git a/metadata/md5-cache/dev-python/lit-12.0.0 b/metadata/md5-cache/dev-python/lit-12.0.0
index 05260f1560a2..ad1d3b567f88 100644
--- a/metadata/md5-cache/dev-python/lit-12.0.0
+++ b/metadata/md5-cache/dev-python/lit-12.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f6a46cc0b8eb1afee2f725ba22bc6361
diff --git a/metadata/md5-cache/dev-python/lit-12.0.1 b/metadata/md5-cache/dev-python/lit-12.0.1
index e10020ad7258..1fba2749a168 100644
--- a/metadata/md5-cache/dev-python/lit-12.0.1
+++ b/metadata/md5-cache/dev-python/lit-12.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26d5a8028365bd3f1219b503572d455a
diff --git a/metadata/md5-cache/dev-python/lit-13.0.0.9999 b/metadata/md5-cache/dev-python/lit-13.0.0.9999
index 86114ea3293a..9339ecd52bbe 100644
--- a/metadata/md5-cache/dev-python/lit-13.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-13.0.0.9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=462a67dde2b631dd12fbe4721da9f2f8
diff --git a/metadata/md5-cache/dev-python/lit-14.0.0.9999 b/metadata/md5-cache/dev-python/lit-14.0.0.9999
new file mode 100644
index 000000000000..9339ecd52bbe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-14.0.0.9999
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/llvm ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A stand-alone install of the LLVM suite testing tool
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PROPERTIES=live
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=462a67dde2b631dd12fbe4721da9f2f8
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.36.0 b/metadata/md5-cache/dev-python/llvmlite-0.36.0
index 0f103f1da451..082c14ee9dd9 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.36.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.36.0
@@ -11,5 +11,5 @@ RDEPEND=sys-devel/llvm:10 sys-libs/zlib:0= python_targets_python3_8? ( dev-lang/
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/numba/llvmlite/archive/v0.36.0.tar.gz -> llvmlite-0.36.0.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d2ba261203aef5cce01f50197f7f94b
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.2.1 b/metadata/md5-cache/dev-python/miniupnpc-2.2.1
index 0ca894ab4016..05f512312703 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.2.1
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/miniupnpc-2.2.1:0= python_targets_pypy3? ( >=dev-python/pypy3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.1.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.1.tar.gz.sig )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=0879fd9f105cb0bf581815d0ed4d21ab
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.2.2 b/metadata/md5-cache/dev-python/miniupnpc-2.2.2
index 7d33172d1e27..f8e06968dcc6 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.2.2
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/miniupnpc-2.2.2:0= python_targets_pypy3? ( >=dev-python/pypy3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.2.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.2.tar.gz.sig )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=0879fd9f105cb0bf581815d0ed4d21ab
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-7.2.1 b/metadata/md5-cache/dev-python/mkdocs-material-7.2.1
new file mode 100644
index 000000000000..1dbd2f0957dd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-material-7.2.1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Material Design theme for MkDocs
+EAPI=8
+HOMEPAGE=https://github.com/squidfunk/mkdocs-material https://pypi.org/project/mkdocs-material
+IUSE=python_targets_python3_8 python_targets_python3_9 doc
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pymdown-extensions-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-material-extensions-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/7.2.1.tar.gz -> mkdocs-material-7.2.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8850e85cff2c423a89fa284be49a58f8
diff --git a/metadata/md5-cache/dev-python/munch-2.5.0-r1 b/metadata/md5-cache/dev-python/munch-2.5.0-r1
index 5eee45087552..ef13510346a2 100644
--- a/metadata/md5-cache/dev-python/munch-2.5.0-r1
+++ b/metadata/md5-cache/dev-python/munch-2.5.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A dot-accessible dictionary (a la JavaScript objects)
 EAPI=7
 HOMEPAGE=https://github.com/Infinidat/munch
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/munch/munch-2.5.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bfd0a4e72521b8d1c77c943db2e88887
+_md5_=f945df7fc8bdfecf9977a8c3e1ff1c37
diff --git a/metadata/md5-cache/dev-python/namespace-paste-1-r1 b/metadata/md5-cache/dev-python/namespace-paste-1-r1
index ba8275d6eb4d..d662c479b0a1 100644
--- a/metadata/md5-cache/dev-python/namespace-paste-1-r1
+++ b/metadata/md5-cache/dev-python/namespace-paste-1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Namespace package declaration for paste
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5c6dff408eeced9c5cc992c8d1c69fd6
+_md5_=af6a3342f12250532c7ec8f6c5c20797
diff --git a/metadata/md5-cache/dev-python/numexpr-2.7.3 b/metadata/md5-cache/dev-python/numexpr-2.7.3
index f757df5fefb6..62f5ba3c1119 100644
--- a/metadata/md5-cache/dev-python/numexpr-2.7.3
+++ b/metadata/md5-cache/dev-python/numexpr-2.7.3
@@ -4,11 +4,11 @@ DESCRIPTION=Fast numerical array expression evaluator for Python and NumPy
 EAPI=7
 HOMEPAGE=https://github.com/pydata/numexpr
 IUSE=mkl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/numpy-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mkl? ( sci-libs/mkl ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/pydata/numexpr/archive/v2.7.3.tar.gz -> numexpr-2.7.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=854e8bc4cb45bd39d4480c9fbf8fe578
+_md5_=cef19207736bd161a13514cd1ae5bee5
diff --git a/metadata/md5-cache/dev-python/numpy-1.21.1 b/metadata/md5-cache/dev-python/numpy-1.21.1
index 630c3cb23fa4..6f66a91e17ba 100644
--- a/metadata/md5-cache/dev-python/numpy-1.21.1
+++ b/metadata/md5-cache/dev-python/numpy-1.21.1
@@ -5,7 +5,7 @@ DESCRIPTION=Fast array and numerical python library
 EAPI=7
 HOMEPAGE=https://numpy.org/
 IUSE=doc lapack test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.21.1.zip doc? ( https://numpy.org/doc/1.21/numpy-html.zip -> numpy-html-1.21.1.zip https://numpy.org/doc/1.21/numpy-ref.pdf -> numpy-ref-1.21.1.pdf https://numpy.org/doc/1.21/numpy-user.pdf -> numpy-user-1.21.1.pdf )
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=587e58e2d3829b0cdb52c026cf65e308
+_md5_=55a95faf87b063070f6da3f671ec61d6
diff --git a/metadata/md5-cache/dev-python/opt-einsum-3.3.0 b/metadata/md5-cache/dev-python/opt-einsum-3.3.0
index b8b2e306d2bd..53f4bfa0ba12 100644
--- a/metadata/md5-cache/dev-python/opt-einsum-3.3.0
+++ b/metadata/md5-cache/dev-python/opt-einsum-3.3.0
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/numpy[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Optimized Einsum: A tensor contraction order optimizer
 EAPI=7
 HOMEPAGE=https://pypi.org/project/opt-einsum/
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/o/opt-einsum/opt_einsum-3.3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=50fc12e85406bc887f79f4c75c95b489
+_md5_=ad7d7154f8985c85bf57aa69aaba89fb
diff --git a/metadata/md5-cache/dev-python/osrf_pycommon-1.0.0 b/metadata/md5-cache/dev-python/osrf_pycommon-1.0.0
new file mode 100644
index 000000000000..45b6368522b5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/osrf_pycommon-1.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Commonly needed Python modules used by Python software developed at OSRF
+EAPI=8
+HOMEPAGE=https://github.com/osrf/osrf_pycommon
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/osrf/osrf_pycommon/archive/1.0.0.tar.gz -> osrf_pycommon-1.0.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9ce8ac4c0338eddcbc7b42fc9e5f4e4d
diff --git a/metadata/md5-cache/dev-python/paste-3.5.0 b/metadata/md5-cache/dev-python/paste-3.5.0
index bd8303b4a458..11f2f4c9acbc 100644
--- a/metadata/md5-cache/dev-python/paste-3.5.0
+++ b/metadata/md5-cache/dev-python/paste-3.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Tools for using a Web Server Gateway Interface stack
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Paste/
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paste/Paste-3.5.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=93d2303867826d9caa6329c9a165a9d1
+_md5_=9600ee0db26d8528d117ffba4bba218d
diff --git a/metadata/md5-cache/dev-python/pastedeploy-2.1.1 b/metadata/md5-cache/dev-python/pastedeploy-2.1.1
index 7d90d13f5555..2e2dcc409818 100644
--- a/metadata/md5-cache/dev-python/pastedeploy-2.1.1
+++ b/metadata/md5-cache/dev-python/pastedeploy-2.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Load, configure, and compose WSGI applications and servers
 EAPI=7
 HOMEPAGE=https://pypi.org/project/PasteDeploy/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pylons/pastedeploy/archive/2.1.1.tar.gz -> pastedeploy-2.1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c071cbbe1fe61c3fb1e6e4e99ea3d1b4
+_md5_=360111d4dc74a954acfea85fbdbe7844
diff --git a/metadata/md5-cache/dev-python/pip-21.1.2-r1 b/metadata/md5-cache/dev-python/pip-21.1.2-r1
deleted file mode 100644
index 431110e38070..000000000000
--- a/metadata/md5-cache/dev-python/pip-21.1.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Installs python packages -- replacement for easy_install
-EAPI=7
-HOMEPAGE=https://pip.pypa.io/en/stable/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
-IUSE=test vanilla python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/pip/archive/21.1.2.tar.gz -> pip-21.1.2.tar.gz test? ( https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-56.0.0-py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.36.2-py2.py3-none-any.whl https://github.com/pypa/virtualenv/archive/16.7.10.tar.gz -> virtualenv-16.7.10.tar.gz )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b9910d2a658b9702277ce1692cb54ba1
diff --git a/metadata/md5-cache/dev-python/pip-21.1.3 b/metadata/md5-cache/dev-python/pip-21.1.3
index e2c95ad26950..ae0ecdb5f53d 100644
--- a/metadata/md5-cache/dev-python/pip-21.1.3
+++ b/metadata/md5-cache/dev-python/pip-21.1.3
@@ -4,7 +4,7 @@ DESCRIPTION=Installs python packages -- replacement for easy_install
 EAPI=7
 HOMEPAGE=https://pip.pypa.io/en/stable/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
 IUSE=test vanilla python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/21.1.3.tar.gz -> pip-21.1.3.tar.gz test? ( https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-57.4.0-py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.36.2-py2.py3-none-any.whl https://github.com/pypa/virtualenv/archive/16.7.11.tar.gz -> virtualenv-16.7.11.tar.gz )
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=66525dfc551992232403652cafcd7a39
+_md5_=83fa30080f318113bca29650842b51ae
diff --git a/metadata/md5-cache/dev-python/pip-21.2.2 b/metadata/md5-cache/dev-python/pip-21.2.2
new file mode 100644
index 000000000000..616f98b3fc98
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pip-21.2.2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Installs python packages -- replacement for easy_install
+EAPI=7
+HOMEPAGE=https://pip.pypa.io/en/stable/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
+IUSE=test vanilla python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/pip/archive/21.2.2.tar.gz -> pip-21.2.2.tar.gz test? ( https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-57.4.0-py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.36.2-py2.py3-none-any.whl https://github.com/pypa/virtualenv/archive/16.7.11.tar.gz -> virtualenv-16.7.11.tar.gz )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=66525dfc551992232403652cafcd7a39
diff --git a/metadata/md5-cache/dev-python/platformdirs-2.0.2 b/metadata/md5-cache/dev-python/platformdirs-2.0.2
index 3ef0995d085d..b1704539d4a1 100644
--- a/metadata/md5-cache/dev-python/platformdirs-2.0.2
+++ b/metadata/md5-cache/dev-python/platformdirs-2.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=A small Python module for determining appropriate platform-specific
 EAPI=8
 HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/platformdirs/platformdirs/archive/2.0.2.tar.gz -> platformdirs-2.0.2.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4da065c4850a50412045b2940d1b87d1
+_md5_=4973a071cf39639b20e5ae2fa1b56743
diff --git a/metadata/md5-cache/dev-python/portend-2.7.1 b/metadata/md5-cache/dev-python/portend-2.7.1
index ad3f3e2b54ef..6f571c514f97 100644
--- a/metadata/md5-cache/dev-python/portend-2.7.1
+++ b/metadata/md5-cache/dev-python/portend-2.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=TCP port monitoring utilities
 EAPI=7
 HOMEPAGE=https://pypi.org/project/portend/ https://github.com/jaraco/portend
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portend/portend-2.7.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=96aba912ed0fae43c63ad49b3602922e
+_md5_=a4c051e2780f5ea7f776ed75f08525ae
diff --git a/metadata/md5-cache/dev-python/priority-2.0.0 b/metadata/md5-cache/dev-python/priority-2.0.0
index e35967278d77..b8815a7364ce 100644
--- a/metadata/md5-cache/dev-python/priority-2.0.0
+++ b/metadata/md5-cache/dev-python/priority-2.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=A pure-Python implementation of the HTTP/2 priority tree
 EAPI=7
 HOMEPAGE=https://python-hyper.org/priority/en/latest/ https://github.com/python-hyper/priority https://pypi.org/project/priority/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/priority/priority-2.0.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=569bff20038a0814dbd4c3c21a95946c
+_md5_=31f7fc40c473df5a50778167c38dda33
diff --git a/metadata/md5-cache/dev-python/progress-1.6 b/metadata/md5-cache/dev-python/progress-1.6
new file mode 100644
index 000000000000..9263a36f4b9a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/progress-1.6
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Easy to use progress bars
+EAPI=8
+HOMEPAGE=https://pypi.org/project/progress/ https://github.com/verigak/progress/
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=ISC
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/p/progress/progress-1.6.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=753d19bdea9244457f76ce45ecc918a1
diff --git a/metadata/md5-cache/dev-python/pybtex-docutils-1.0.1 b/metadata/md5-cache/dev-python/pybtex-docutils-1.0.1
new file mode 100644
index 000000000000..74e6e4611220
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pybtex-docutils-1.0.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A docutils backend for pybtex
+EAPI=8
+HOMEPAGE=https://github.com/mcmtroffaes/pybtex-docutils
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pybtex-docutils/pybtex-docutils-1.0.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c2959961d7282105cda6bd4f227242c7
diff --git a/metadata/md5-cache/dev-python/pycdio-2.1.1 b/metadata/md5-cache/dev-python/pycdio-2.1.1
new file mode 100644
index 000000000000..f0c41a9ec517
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycdio-2.1.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/swig test? ( >=dev-libs/libcdio-2.0.0 >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libcdio-2.0.0
+DESCRIPTION=Python OO interface to libcdio (CD Input and Control library)
+EAPI=8
+HOMEPAGE=https://savannah.gnu.org/projects/libcdio/ https://pypi.org/project/pycdio/
+IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/libcdio-2.0.0 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pycdio/pycdio-2.1.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=59e9a3231fd5696d237c1c806d5a7a2b
diff --git a/metadata/md5-cache/dev-python/pydyf-0.0.3 b/metadata/md5-cache/dev-python/pydyf-0.0.3
new file mode 100644
index 000000000000..f69a3d5ebf81
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydyf-0.0.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-text/ghostscript-gpl dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A low-level PDF generator
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pydyf/ https://github.com/CourtBouillon/pydyf/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/CourtBouillon/pydyf/archive/v0.0.3.tar.gz -> pydyf-0.0.3.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fd23dc08e7ae253cb0c004dcf95738c5
diff --git a/metadata/md5-cache/dev-python/pyenchant-3.2.1 b/metadata/md5-cache/dev-python/pyenchant-3.2.1
index c8f56beb3360..768a8354e4b9 100644
--- a/metadata/md5-cache/dev-python/pyenchant-3.2.1
+++ b/metadata/md5-cache/dev-python/pyenchant-3.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for the Enchant spellchecking system
 EAPI=7
 HOMEPAGE=https://github.com/pyenchant/pyenchant https://pypi.org/project/pyenchant/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/enchant:* python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyenchant/pyenchant/archive/v3.2.1.tar.gz -> pyenchant-3.2.1.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c80cf86b3c3eabc73921ac890c89a7b0
+_md5_=09c1db9423a775c5fc1b2ea5ded8d56e
diff --git a/metadata/md5-cache/dev-python/pylint-2.8.2 b/metadata/md5-cache/dev-python/pylint-2.8.2
deleted file mode 100644
index 5f725efb0167..000000000000
--- a/metadata/md5-cache/dev-python/pylint-2.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( dev-python/sphinx ) test? ( <dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.5.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python code static checker
-EAPI=7
-HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint/
-IUSE=examples doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2
-RDEPEND=<dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.5.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pycqa/pylint/archive/v2.8.2.tar.gz -> pylint-2.8.2.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=441fccdfa20833ff95aa0b156dcdc216
diff --git a/metadata/md5-cache/dev-python/pylint-2.9.0 b/metadata/md5-cache/dev-python/pylint-2.9.0
deleted file mode 100644
index d05f3b276305..000000000000
--- a/metadata/md5-cache/dev-python/pylint-2.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx ) test? ( <dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python code static checker
-EAPI=8
-HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint/
-IUSE=examples doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=<dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pycqa/pylint/archive/v2.9.0.tar.gz -> pylint-2.9.0.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4ac589349c4fc5b7903ffd8c38702278
diff --git a/metadata/md5-cache/dev-python/pylint-2.9.1 b/metadata/md5-cache/dev-python/pylint-2.9.1
deleted file mode 100644
index 69487c7420ed..000000000000
--- a/metadata/md5-cache/dev-python/pylint-2.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx ) test? ( <dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python code static checker
-EAPI=8
-HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint/
-IUSE=examples doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=<dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pycqa/pylint/archive/v2.9.1.tar.gz -> pylint-2.9.1.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b3f8c236849213db9226bbba45ddecfa
diff --git a/metadata/md5-cache/dev-python/pylint-2.9.3 b/metadata/md5-cache/dev-python/pylint-2.9.3
index 47c872406445..ee1d7ab6e7ca 100644
--- a/metadata/md5-cache/dev-python/pylint-2.9.3
+++ b/metadata/md5-cache/dev-python/pylint-2.9.3
@@ -4,7 +4,7 @@ DESCRIPTION=Python code static checker
 EAPI=8
 HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint/
 IUSE=examples doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=<dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pycqa/pylint/archive/v2.9.3.tar.gz -> pylint-2.9.3.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dbe36edbd599a8e2dff99250437fae4c
+_md5_=5f394843fac279e6e99b75c4c57eee46
diff --git a/metadata/md5-cache/dev-python/pylint-2.9.4 b/metadata/md5-cache/dev-python/pylint-2.9.4
deleted file mode 100644
index d72e7dffec6e..000000000000
--- a/metadata/md5-cache/dev-python/pylint-2.9.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx ) test? ( <dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python code static checker
-EAPI=8
-HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint/
-IUSE=examples doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=<dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pycqa/pylint/archive/v2.9.4.tar.gz -> pylint-2.9.4.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=09450d1f0b100996dc38f2db457c20b1
diff --git a/metadata/md5-cache/dev-python/pylint-2.9.5 b/metadata/md5-cache/dev-python/pylint-2.9.5
deleted file mode 100644
index 7b39b5548910..000000000000
--- a/metadata/md5-cache/dev-python/pylint-2.9.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx ) test? ( <dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python code static checker
-EAPI=8
-HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint/
-IUSE=examples doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=<dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pycqa/pylint/archive/v2.9.5.tar.gz -> pylint-2.9.5.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da0e5bbe8ed2e25a28fc8028a9318e30
diff --git a/metadata/md5-cache/dev-python/pylint-2.9.6 b/metadata/md5-cache/dev-python/pylint-2.9.6
new file mode 100644
index 000000000000..f5d395ebe37f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylint-2.9.6
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx ) test? ( <dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python code static checker
+EAPI=8
+HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint/
+IUSE=examples doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=<dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astroid-2.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pycqa/pylint/archive/v2.9.6.tar.gz -> pylint-2.9.6.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=da0e5bbe8ed2e25a28fc8028a9318e30
diff --git a/metadata/md5-cache/dev-python/pymysql-1.0.2 b/metadata/md5-cache/dev-python/pymysql-1.0.2
index 55a33f90b47d..77f319a83783 100644
--- a/metadata/md5-cache/dev-python/pymysql-1.0.2
+++ b/metadata/md5-cache/dev-python/pymysql-1.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Pure-Python MySQL Driver
 EAPI=7
 HOMEPAGE=https://github.com/PyMySQL/PyMySQL
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyMySQL/PyMySQL/archive/v1.0.2.tar.gz -> pymysql-1.0.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=95e522cd4d334752b1244e6c0e3f317f
+_md5_=93f73c01a01ecef749716febce2aa28b
diff --git a/metadata/md5-cache/dev-python/pyotherside-1.5.9 b/metadata/md5-cache/dev-python/pyotherside-1.5.9
index 056aa44513f5..ae76a781d1f2 100644
--- a/metadata/md5-cache/dev-python/pyotherside-1.5.9
+++ b/metadata/md5-cache/dev-python/pyotherside-1.5.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5
 DESCRIPTION=Asynchronous Python 3 Bindings for Qt 5
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/thp/pyotherside https://thp.io/2011/pyotherside/
-IUSE=python_single_target_python3_8 python_single_target_python3_9
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64
 LICENSE=ISC
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/thp/pyotherside/archive/1.5.9.tar.gz -> pyotherside-1.5.9.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8e08fd7d2bd56e152fbb5b35386c6668
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=79a528af29c2478ce13bd9f686505f10
diff --git a/metadata/md5-cache/dev-python/pyphen-0.11.0 b/metadata/md5-cache/dev-python/pyphen-0.11.0
deleted file mode 100644
index 1b53c3815384..000000000000
--- a/metadata/md5-cache/dev-python/pyphen-0.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pyproject2setuppy-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module for hyphenation using hunspell dictionaries
-EAPI=7
-HOMEPAGE=https://github.com/Kozea/Pyphen
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+ MPL-1.1
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Kozea/Pyphen/archive/0.11.0.tar.gz -> Pyphen-0.11.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bac0b04c98cae5892fbd80d264c3f834
diff --git a/metadata/md5-cache/dev-python/pyphen-0.11.0-r1 b/metadata/md5-cache/dev-python/pyphen-0.11.0-r1
new file mode 100644
index 000000000000..6331b1af6a47
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyphen-0.11.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python module for hyphenation using hunspell dictionaries
+EAPI=7
+HOMEPAGE=https://github.com/Kozea/Pyphen
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+ MPL-1.1
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Kozea/Pyphen/archive/0.11.0.tar.gz -> Pyphen-0.11.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=912b898c068ff090c801418654626fee
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-18 b/metadata/md5-cache/dev-python/pyproject2setuppy-18
new file mode 100644
index 000000000000..059152e18dbf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyproject2setuppy-18
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Cheap setup.py hack to install flit & poetry-based projects
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/pyproject2setuppy
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD-2
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mgorny/pyproject2setuppy/archive/v18.tar.gz -> pyproject2setuppy-18.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=eaee79367605c7be244b4d686ff87fe9
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.5 b/metadata/md5-cache/dev-python/pypy-7.3.5
new file mode 100644
index 000000000000..9c4a0c07bc80
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-7.3.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=|| ( >=dev-python/pypy-exe-7.3.5:7.3.5[bzip2?,ncurses?] >=dev-python/pypy-exe-bin-7.3.5:7.3.5 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
+DESCRIPTION=A fast, compliant alternative implementation of the Python language
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+IUSE=bzip2 gdbm +jit ncurses sqlite tk
+LICENSE=MIT
+RDEPEND=|| ( >=dev-python/pypy-exe-7.3.5:7.3.5[bzip2?,ncurses?] >=dev-python/pypy-exe-bin-7.3.5:7.3.5 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
+SLOT=0/73
+SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.5-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.5.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=815b67056bfa6c020d1b8220c5865f77
diff --git a/metadata/md5-cache/dev-python/pypy-exe-7.3.5 b/metadata/md5-cache/dev-python/pypy-exe-7.3.5
new file mode 100644
index 000000000000..dd4868b35626
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-exe-7.3.5
@@ -0,0 +1,13 @@
+BDEPEND=!low-memory? ( || ( dev-python/pypy dev-lang/python:2.7 ) )
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.5
+DESCRIPTION=PyPy executable (build from source)
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.5
+SLOT=7.3.5
+SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.5-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.5.tar.xz
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=800dfe76216bf7e48ed245ae2d45130b
diff --git a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.4 b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.4
deleted file mode 100644
index cb92ca9df621..000000000000
--- a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=PyPy executable (pre-built version)
-EAPI=7
-HOMEPAGE=https://www.pypy.org/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.1.3:0/1 dev-libs/libffi:0/7 virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.4
-SLOT=7.3.4
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/pypy-exe-7.3.4-1.xpak -> pypy-exe-7.3.4-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/pypy-exe-7.3.4-1.xpak -> pypy-exe-7.3.4-1.x86.xpak )
-_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
-_md5_=6d676afd85c6245b4e13eaf4068689b1
diff --git a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.4-r1 b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.4-r1
new file mode 100644
index 000000000000..b9008e91ad22
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.4-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy executable (pre-built version)
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0/1 || ( dev-libs/libffi-compat:7 dev-libs/libffi:0/7 ) virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.4
+SLOT=7.3.4
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/pypy-exe-7.3.4-1.xpak -> pypy-exe-7.3.4-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/pypy-exe-7.3.4-1.xpak -> pypy-exe-7.3.4-1.x86.xpak )
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
+_md5_=9733d8dff0ab46a29b17781df3c5c519
diff --git a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.5 b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.5
new file mode 100644
index 000000000000..59ff89751822
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy executable (pre-built version)
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0/1 || ( dev-libs/libffi-compat:7 dev-libs/libffi:0/7 ) virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.5
+SLOT=7.3.5
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/pypy-exe-7.3.5-1.xpak -> pypy-exe-7.3.5-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/pypy-exe-7.3.5-1.xpak -> pypy-exe-7.3.5-1.x86.xpak )
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
+_md5_=6c3a5223aea693224adf8398e58819ea
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.5 b/metadata/md5-cache/dev-python/pypy3-7.3.5
new file mode 100644
index 000000000000..a20d98766b63
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( >=dev-python/pypy3-exe-7.3.5:7.3.5[bzip2?,ncurses?] >=dev-python/pypy3-exe-bin-7.3.5:7.3.5 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0 test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) !!dev-python/pytest-forked )
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.7) language
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+IUSE=bzip2 gdbm +jit ncurses sqlite test tk
+LICENSE=MIT
+RDEPEND=|| ( >=dev-python/pypy3-exe-7.3.5:7.3.5[bzip2?,ncurses?] >=dev-python/pypy3-exe-bin-7.3.5:7.3.5 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0
+RESTRICT=test
+SLOT=0/pypy37-pp73
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.7-v7.3.5-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.7-gentoo-patches-7.3.5.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=afc3d4c025bb1c09e49f65e50909fa29
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.5 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.5
new file mode 100644
index 000000000000..03821607ef34
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-7.3.5
@@ -0,0 +1,13 @@
+BDEPEND=low-memory? ( dev-python/pypy ) !low-memory? ( || ( dev-python/pypy dev-lang/python:2.7 ) )
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.5
+DESCRIPTION=PyPy3 executable (build from source)
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.5
+SLOT=7.3.5
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.7-v7.3.5-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.7-gentoo-patches-7.3.5.tar.xz
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ad46932b3913e6cf879b67610836e2f0
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.4 b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.4
deleted file mode 100644
index 999a87ffb321..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=PyPy3 executable (pre-built version)
-EAPI=7
-HOMEPAGE=https://www.pypy.org/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.1.3:0/1 dev-libs/libffi:0/7 virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.4
-SLOT=7.3.4
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.4-1.xpak -> pypy3-exe-7.3.4-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.4-1.xpak -> pypy3-exe-7.3.4-1.x86.xpak )
-_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
-_md5_=2902606f83345e042df4fb563a608b53
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.4-r1 b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.4-r1
new file mode 100644
index 000000000000..1fe050460dec
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.4-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy3 executable (pre-built version)
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0/1 || ( dev-libs/libffi-compat:7 dev-libs/libffi:0/7 ) virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.4
+SLOT=7.3.4
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.4-1.xpak -> pypy3-exe-7.3.4-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.4-1.xpak -> pypy3-exe-7.3.4-1.x86.xpak )
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
+_md5_=22a8424c1a67cb315e6dae2f102e8622
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.5 b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.5
new file mode 100644
index 000000000000..ad530ee8c3d1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy3 executable (pre-built version)
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0/1 || ( dev-libs/libffi-compat:7 dev-libs/libffi:0/7 ) virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.5
+SLOT=7.3.5
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.5-1.xpak -> pypy3-exe-7.3.5-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.5-1.xpak -> pypy3-exe-7.3.5-1.x86.xpak )
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
+_md5_=32e04e98216f9a902db10cac48b624c5
diff --git a/metadata/md5-cache/dev-python/pysvn-1.9.15 b/metadata/md5-cache/dev-python/pysvn-1.9.15
new file mode 100644
index 000000000000..f854783a7da7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pysvn-1.9.15
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pycxx-7.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/subversion-1.9
+DESCRIPTION=Object-oriented python bindings for subversion
+EAPI=7
+HOMEPAGE=https://pysvn.sourceforge.io/
+IUSE=doc examples python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=Apache-1.1
+RDEPEND=>=dev-python/pycxx-7.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/subversion-1.9 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/pysvn/pysvn/V1.9.15/pysvn-1.9.15.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=46b36ae6728ad1387f3cd5a11c568910
diff --git a/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1 b/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
index bd2da13e5271..0b70ed5a50a1 100644
--- a/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=pytest plugin for aiohttp support
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/pytest-aiohttp/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pytest-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/aiohttp-0.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/pytest-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/aiohttp-0.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-aiohttp/pytest-aiohttp-0.3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e9dca9be99d140260400bac74cf5eafe
+_md5_=bf747ff42af30226ff39166d6680c2fd
diff --git a/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1 b/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1
index af79861b8256..bb9951d59ec5 100644
--- a/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Virtualenv fixture for py.test
 EAPI=7
 HOMEPAGE=https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-fixture-config/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-python/pytest-virtualenv-1.7.0-r1[python_targets_python2_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-fixture-config/pytest-fixture-config-1.7.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1d949112c664e4faf44e559a974d3c98
+_md5_=64c272a2e213610d57379a1eac73cbde
diff --git a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r2 b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r2
index 8b90f44450e9..70a3bbe5c828 100644
--- a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r2
+++ b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A goodie-bag of unix shell and environment tools for py.test
 EAPI=8
 HOMEPAGE=https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-shutil/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-python/pytest-virtualenv-1.7.0-r1[python_targets_python2_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-shutil/pytest-shutil-1.7.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=63f0b39c9bf04dfd5ec947f1d64c174d
+_md5_=8c2c17f3821dfc684a616a44aef0c0ad
diff --git a/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1 b/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
index 51b19fe43b86..f671737c2988 100644
--- a/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Virtualenv fixture for py.test
 EAPI=7
 HOMEPAGE=https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-virtualenv/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-shutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-virtualenv/pytest-virtualenv-1.7.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=16a557695073f12b55847bfb54cefeac
+_md5_=8fc8859931aa2f501a2b959175b44497
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-0.18.1 b/metadata/md5-cache/dev-python/pytest-xprocess-0.18.1
new file mode 100644
index 000000000000..6c3a1d6c7c37
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-0.18.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Manage external processes across test runs
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-xprocess/pytest-xprocess-0.18.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=43cac80df447c22da219ae1158b05894
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.39 b/metadata/md5-cache/dev-python/python-debian-0.1.39
deleted file mode 100644
index dde64ca71f69..000000000000
--- a/metadata/md5-cache/dev-python/python-debian-0.1.39
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-arch/dpkg ) test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python modules to work with Debian-related data formats
-EAPI=7
-HOMEPAGE=https://salsa.debian.org/python-debian-team/python-debian
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-2 GPL-3
-RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.39.tar.xz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d9e85e02ac3c578b8d87f4436fc3f2a5
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.40 b/metadata/md5-cache/dev-python/python-debian-0.1.40
index 17a1cb977abf..f105064c7408 100644
--- a/metadata/md5-cache/dev-python/python-debian-0.1.40
+++ b/metadata/md5-cache/dev-python/python-debian-0.1.40
@@ -4,7 +4,7 @@ DESCRIPTION=Python modules to work with Debian-related data formats
 EAPI=8
 HOMEPAGE=https://salsa.debian.org/python-debian-team/python-debian
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 arm x86
 LICENSE=GPL-2 GPL-3
 RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.40.tar.xz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a65771edcc2e967d329038d814784485
+_md5_=89cf01850c605e332167df9512d6b25b
diff --git a/metadata/md5-cache/dev-python/python-docs-3.6.14 b/metadata/md5-cache/dev-python/python-docs-3.6.14
index 0a80b227de09..daa18943f958 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.6.14
+++ b/metadata/md5-cache/dev-python/python-docs-3.6.14
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86
 LICENSE=PSF-2
 SLOT=3.6
 SRC_URI=https://www.python.org/ftp/python/doc/3.6.14/python-3.6.14-docs-html.tar.bz2
-_md5_=1944a732928c6304b50f0a9353a5357b
+_md5_=41cfed63b0c57b1b01d02622768e7278
diff --git a/metadata/md5-cache/dev-python/python-docs-3.7.11 b/metadata/md5-cache/dev-python/python-docs-3.7.11
index 3d2c28b8791c..7702c90ad1c2 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.7.11
+++ b/metadata/md5-cache/dev-python/python-docs-3.7.11
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86
 LICENSE=PSF-2
 SLOT=3.7
 SRC_URI=https://www.python.org/ftp/python/doc/3.7.11/python-3.7.11-docs-html.tar.bz2
-_md5_=b274f617f5f62536bcab24cdd86afa2e
+_md5_=41cfed63b0c57b1b01d02622768e7278
diff --git a/metadata/md5-cache/dev-python/python-docs-3.8.11 b/metadata/md5-cache/dev-python/python-docs-3.8.11
index 95ce6498c600..27b65f3ca1cb 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.8.11
+++ b/metadata/md5-cache/dev-python/python-docs-3.8.11
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86
 LICENSE=PSF-2
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/doc/3.8.11/python-3.8.11-docs-html.tar.bz2
-_md5_=cd52d95235a10ba3f776a2f0d9dff2fd
+_md5_=41cfed63b0c57b1b01d02622768e7278
diff --git a/metadata/md5-cache/dev-python/python-dotenv-0.18.0-r1 b/metadata/md5-cache/dev-python/python-dotenv-0.18.0-r1
index 1fdbab0c6589..3b85494e74bd 100644
--- a/metadata/md5-cache/dev-python/python-dotenv-0.18.0-r1
+++ b/metadata/md5-cache/dev-python/python-dotenv-0.18.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Manage .env files
 EAPI=7
 HOMEPAGE=https://github.com/theskumar/python-dotenv
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dotenv/python-dotenv-0.18.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=38414d07b3a615caf9224c528efe793b
+_md5_=14c99e104d5a0fd2deb5539e97cd5447
diff --git a/metadata/md5-cache/dev-python/python3-lxc-3.0.4 b/metadata/md5-cache/dev-python/python3-lxc-3.0.4
index 2bcd94a67834..8f8783c3235d 100644
--- a/metadata/md5-cache/dev-python/python3-lxc-3.0.4
+++ b/metadata/md5-cache/dev-python/python3-lxc-3.0.4
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/lxc python_targets_python3_8? ( dev-lang/python:3.8 ) pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/python3-lxc-3.0.4.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/python3-lxc-3.0.4.tar.gz.asc )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=3dfcc6822146f88d73cca2e829a8444d
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.11.6 b/metadata/md5-cache/dev-python/qscintilla-python-2.11.6
index 6da668353bbd..e4a327918d9c 100644
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.11.6
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.11.6
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for QScintilla
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
 IUSE=debug python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PyQt5-5.12[gui,printsupport,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.6:=
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.6/QScintilla-2.11.6.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d8dabf4df92661166470f793a3d28a16
+_md5_=7ed73d539851c577452bb99cef8e5c7d
diff --git a/metadata/md5-cache/dev-python/qstylizer-0.2.1 b/metadata/md5-cache/dev-python/qstylizer-0.2.1
new file mode 100644
index 000000000000..515082b236dc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qstylizer-0.2.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/tinycss2-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/tinycss2-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/inflection-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/inflection-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Stylesheet Generator for PyQt5/PySide2
+EAPI=8
+HOMEPAGE=https://github.com/blambright/qstylizer
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/tinycss2-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/tinycss2-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/inflection-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/inflection-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/blambright/qstylizer/archive/refs/tags/0.2.1.tar.gz -> qstylizer-0.2.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fbcffeaec96a923f9749e30d1bad6eb5
diff --git a/metadata/md5-cache/dev-python/readme_renderer-29.0 b/metadata/md5-cache/dev-python/readme_renderer-29.0
index 6f31e9c4f849..f9904aff9f55 100644
--- a/metadata/md5-cache/dev-python/readme_renderer-29.0
+++ b/metadata/md5-cache/dev-python/readme_renderer-29.0
@@ -4,7 +4,7 @@ DESCRIPTION=a library for rendering "readme" descriptions for Warehouse
 EAPI=7
 HOMEPAGE=https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/readme_renderer/readme_renderer-29.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=31c9e1ae3294d56289a5db1ba08db667
+_md5_=a0ab22fb26df41c48c784e6ea425df79
diff --git a/metadata/md5-cache/dev-python/requests-2.26.0 b/metadata/md5-cache/dev-python/requests-2.26.0
index 5bf70a3231d7..14711647fabc 100644
--- a/metadata/md5-cache/dev-python/requests-2.26.0
+++ b/metadata/md5-cache/dev-python/requests-2.26.0
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library for human beings
 EAPI=8
 HOMEPAGE=https://requests.readthedocs.io/
 IUSE=socks5 test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/certifi-2017.4.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/idna-4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/urllib3-1.27[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.26.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5d10aed71ee66686912f5f1fd13b0fc5
+_md5_=968b13268d6a917d3276486a10a4afbd
diff --git a/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1 b/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
index 4cd7a9d9bb26..3ab59740e76a 100644
--- a/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
+++ b/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
@@ -5,7 +5,7 @@ DESCRIPTION=A utility belt for advanced users of python-requests
 EAPI=7
 HOMEPAGE=https://toolbelt.readthedocs.org/
 IUSE=test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/requests-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-toolbelt/requests-toolbelt-0.9.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e9bf6d595a1e01c6f98ad61cc0300405
+_md5_=9cd7c9cc1753f7980716edfedcc81546
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.5.0 b/metadata/md5-cache/dev-python/rfc3986-1.5.0
index d5d842e76c35..6f2951cb104c 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.5.0
+++ b/metadata/md5-cache/dev-python/rfc3986-1.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Validating URI References per RFC 3986
 EAPI=7
 HOMEPAGE=https://tools.ietf.org/html/rfc3986 https://github.com/python-hyper/rfc3986 https://rfc3986.rtfd.org
 IUSE=idna test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.5.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=05d321bbb12461040f13253dc09a04f5
+_md5_=ab36acee8101452ef45243952ee3a8f2
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.17.10 b/metadata/md5-cache/dev-python/ruamel-yaml-0.17.10
index ee0312652738..5519ef44c0c3 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.17.10
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.17.10
@@ -4,7 +4,7 @@ DESCRIPTION=YAML parser/emitter that supports roundtrip comment preservation
 EAPI=7
 HOMEPAGE=https://pypi.org/project/ruamel.yaml/ https://sourceforge.net/p/ruamel-yaml/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/namespace-ruamel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml-clib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruamel-dl-tagged-releases/ruamel.yaml-0.17.10.tar.xz -> ruamel-yaml-0.17.10.tar.xz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ce757ac2aa3019e1cb37e930744c4b1d
+_md5_=fbd9c8e5f579d5f76fe8bcd2080678ba
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.17.9 b/metadata/md5-cache/dev-python/ruamel-yaml-0.17.9
deleted file mode 100644
index bc8a0e3eb3fd..000000000000
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.17.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/ruamel-std-pathlib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/namespace-ruamel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml-clib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=YAML parser/emitter that supports roundtrip comment preservation
-EAPI=7
-HOMEPAGE=https://pypi.org/project/ruamel.yaml/ https://sourceforge.net/p/ruamel-yaml/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/namespace-ruamel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml-clib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ruamel-dl-tagged-releases/ruamel.yaml-0.17.9.tar.xz -> ruamel-yaml-0.17.9.tar.xz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fbd9c8e5f579d5f76fe8bcd2080678ba
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.6 b/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.6
index b8ebe53aa74e..9b2c6af62229 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.6
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.6
@@ -4,11 +4,11 @@ DESCRIPTION=C-based reader/scanner and emitter for dev-python/ruamel-yaml
 EAPI=8
 HOMEPAGE=https://pypi.org/project/ruamel.yaml.clib/ https://sourceforge.net/p/ruamel-yaml-clib/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ruamel.yaml.clib/ruamel.yaml.clib-0.2.6.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eeaefea102622688f5e57e132253e384
+_md5_=1e8c229219a1dcd72f0c57d125f821f5
diff --git a/metadata/md5-cache/dev-python/scikit-build-0.11.1 b/metadata/md5-cache/dev-python/scikit-build-0.11.1
index f53eabcb5491..333ee8195c2b 100644
--- a/metadata/md5-cache/dev-python/scikit-build-0.11.1
+++ b/metadata/md5-cache/dev-python/scikit-build-0.11.1
@@ -5,7 +5,7 @@ DESCRIPTION=Improved build system generator for Python C/C++/Fortran/Cython exte
 EAPI=7
 HOMEPAGE=https://github.com/scikit-build/scikit-build
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-build/scikit-build-0.11.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d7a4dbddfe298f18c4a210c1be1b19d4
+_md5_=8a356070993c2349b31ea9e2f6803fb4
diff --git a/metadata/md5-cache/dev-python/sh-1.14.2 b/metadata/md5-cache/dev-python/sh-1.14.2
index 288ca85b1ee6..907a10975449 100644
--- a/metadata/md5-cache/dev-python/sh-1.14.2
+++ b/metadata/md5-cache/dev-python/sh-1.14.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python subprocess interface
 EAPI=7
 HOMEPAGE=https://github.com/amoffat/sh
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sh/sh-1.14.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3fba77cddbc68bdd750057191958d8ec
+_md5_=3c1f1bc3274c165595870d8e11a6c4fa
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.1-r1 b/metadata/md5-cache/dev-python/shiboken2-5.15.1-r1
index 360d3d455f17..749bcefe767a 100644
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.1-r1
+++ b/metadata/md5-cache/dev-python/shiboken2-5.15.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.1-src/pyside-setup-opensource-src-5.15.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fec3219acffe2a65d99eeee209b7045c
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1 b/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
index 883e4c7ca145..29c436a4e0d7 100644
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
+++ b/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ec61e2c150168e681f41eb13c13d2d99
diff --git a/metadata/md5-cache/dev-python/soupsieve-2.2.1 b/metadata/md5-cache/dev-python/soupsieve-2.2.1
index 163e8242c1c2..3a32152e42ab 100644
--- a/metadata/md5-cache/dev-python/soupsieve-2.2.1
+++ b/metadata/md5-cache/dev-python/soupsieve-2.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=A modern CSS selector implementation for BeautifulSoup
 EAPI=7
 HOMEPAGE=https://github.com/facelessuser/soupsieve/ https://pypi.org/project/soupsieve/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/soupsieve/archive/2.2.1.tar.gz -> soupsieve-2.2.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7e76a5a1073d7c17b6e76b0183088808
+_md5_=e235e88b63b0d10806b463915b97d5e0
diff --git a/metadata/md5-cache/dev-python/tempora-4.1.1 b/metadata/md5-cache/dev-python/tempora-4.1.1
index 466b15d79286..c6338c2c70d9 100644
--- a/metadata/md5-cache/dev-python/tempora-4.1.1
+++ b/metadata/md5-cache/dev-python/tempora-4.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Objects and routines pertaining to date and time
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/tempora
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-4.1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5a41baa285d1f527832a6edcb3214914
+_md5_=066c39485360987930c342169206852e
diff --git a/metadata/md5-cache/dev-python/termcolor-1.1.0-r2 b/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
index 546f4abdd5f8..2f418cc4111a 100644
--- a/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
+++ b/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=ANSII Color formatting for output in terminal
 EAPI=7
 HOMEPAGE=https://pypi.org/project/termcolor/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/termcolor/termcolor-1.1.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c353623bcf778b63d919ba798891e3b2
+_md5_=a716893b2696f064791db5aae4bb544f
diff --git a/metadata/md5-cache/dev-python/toolz-0.11.1 b/metadata/md5-cache/dev-python/toolz-0.11.1
index 1c617cf325a8..92cc2ce3d18f 100644
--- a/metadata/md5-cache/dev-python/toolz-0.11.1
+++ b/metadata/md5-cache/dev-python/toolz-0.11.1
@@ -4,7 +4,7 @@ DESCRIPTION=List processing tools and functional utilities
 EAPI=7
 HOMEPAGE=https://pypi.org/project/toolz/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/toolz/toolz-0.11.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da1d0e7950f993103d8b546ef3202fd0
+_md5_=e4bf769bfa156adbf5338bb89f2da494
diff --git a/metadata/md5-cache/dev-python/tox-3.24.1 b/metadata/md5-cache/dev-python/tox-3.24.1
new file mode 100644
index 000000000000..e8d559ba8007
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-3.24.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flaky-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/freezegun-0.3.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=virtualenv-based automation of test activities
+EAPI=8
+HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tox-dev/tox/archive/3.24.1.tar.gz -> tox-3.24.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=149e574070fa6a160c70f4f1116e46bd
diff --git a/metadata/md5-cache/dev-python/tqdm-4.61.2 b/metadata/md5-cache/dev-python/tqdm-4.61.2
index c9efde26bf46..30d0f51769b3 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.61.2
+++ b/metadata/md5-cache/dev-python/tqdm-4.61.2
@@ -4,7 +4,7 @@ DESCRIPTION=Add a progress meter to your loops in a second
 EAPI=8
 HOMEPAGE=https://github.com/tqdm/tqdm
 IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tqdm/tqdm-4.61.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d0b053a1c44479754249919694137b90
+_md5_=371002b80430ed56ae171cdeed4ede93
diff --git a/metadata/md5-cache/dev-python/tqdm-4.62.0 b/metadata/md5-cache/dev-python/tqdm-4.62.0
new file mode 100644
index 000000000000..1061bc1d45ae
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tqdm-4.62.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Add a progress meter to your loops in a second
+EAPI=8
+HOMEPAGE=https://github.com/tqdm/tqdm
+IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tqdm/tqdm-4.62.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=371002b80430ed56ae171cdeed4ede93
diff --git a/metadata/md5-cache/dev-python/trustme-0.8.0 b/metadata/md5-cache/dev-python/trustme-0.8.0
index 25a126b554b3..3064592d02f0 100644
--- a/metadata/md5-cache/dev-python/trustme-0.8.0
+++ b/metadata/md5-cache/dev-python/trustme-0.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=#1 quality TLS certs while you wait, for the discerning tester
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/trustme
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/trustme/trustme-0.8.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9395637836f571fca1576f4f06bc2d7b
+_md5_=8d6f864becd19ec446e44f52332e0fd2
diff --git a/metadata/md5-cache/dev-python/twine-3.4.2 b/metadata/md5-cache/dev-python/twine-3.4.2
index a90d24bfc96b..1ebd762c7086 100644
--- a/metadata/md5-cache/dev-python/twine-3.4.2
+++ b/metadata/md5-cache/dev-python/twine-3.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of utilities for publishing packages on PyPI
 EAPI=8
 HOMEPAGE=https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pkginfo-1.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/readme_renderer-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tqdm-4.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/twine/archive/3.4.2.tar.gz -> twine-3.4.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0572c8b0a285debbd0e35c2b973ba6fe
+_md5_=0c2a70faca593d0cec2ad89a616bd382
diff --git a/metadata/md5-cache/dev-python/twisted-19.10.0 b/metadata/md5-cache/dev-python/twisted-19.10.0
deleted file mode 100644
index 139080ce43b0..000000000000
--- a/metadata/md5-cache/dev-python/twisted-19.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/bcrypt >=dev-python/incremental-16.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyserial[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/constantly-15.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/openssh )
-DESCRIPTION=An asynchronous networking framework written in Python
-EAPI=7
-HOMEPAGE=https://www.twistedmatrix.com/trac/
-IUSE=conch crypt http2 serial test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-python/attrs-17.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/automat-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/constantly-15.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/hyperlink-17.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/incremental-16.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyhamcrest-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] conch? ( dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) serial? ( >=dev-python/pyserial-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) http2? ( >=dev-python/hyper-h2-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/hyper-h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/priority-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/priority-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !dev-python/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://twistedmatrix.com/Releases/Twisted/19.10/Twisted-19.10.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=0682975fe0d52b3f269a1c7b7011979d
diff --git a/metadata/md5-cache/dev-python/twisted-20.3.0 b/metadata/md5-cache/dev-python/twisted-20.3.0
deleted file mode 100644
index 615f279876cf..000000000000
--- a/metadata/md5-cache/dev-python/twisted-20.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/bcrypt >=dev-python/incremental-16.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyserial[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/constantly-15.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/openssh )
-DESCRIPTION=An asynchronous networking framework written in Python
-EAPI=7
-HOMEPAGE=https://www.twistedmatrix.com/trac/
-IUSE=conch crypt http2 serial test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/automat-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/constantly-15.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/hyperlink-17.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/incremental-16.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyhamcrest-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] conch? ( dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) serial? ( >=dev-python/pyserial-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) http2? ( >=dev-python/hyper-h2-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/hyper-h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/priority-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/priority-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !dev-python/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://twistedmatrix.com/Releases/Twisted/20.3/Twisted-20.3.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=2dc11df783fd1e8ab72b7da62122a078
diff --git a/metadata/md5-cache/dev-python/twisted-21.2.0-r1 b/metadata/md5-cache/dev-python/twisted-21.2.0-r1
index 3fc307831d0b..23d9642f08ca 100644
--- a/metadata/md5-cache/dev-python/twisted-21.2.0-r1
+++ b/metadata/md5-cache/dev-python/twisted-21.2.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An asynchronous networking framework written in Python
 EAPI=7
 HOMEPAGE=https://www.twistedmatrix.com/trac/
 IUSE=conch crypt http2 serial test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/automat-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/constantly-15.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperlink-17.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/incremental-16.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyhamcrest-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] conch? ( >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) serial? ( >=dev-python/pyserial-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) http2? ( >=dev-python/hyper-h2-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/hyper-h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/priority-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/priority-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !dev-python/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twisted/twisted/archive/twisted-21.2.0.tar.gz https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=7e83262139dd2bf5fe1c633e15c39308
+_md5_=3b04e764f20e7c6ac82cdc6161f695bf
diff --git a/metadata/md5-cache/dev-python/twisted-21.7.0 b/metadata/md5-cache/dev-python/twisted-21.7.0
new file mode 100644
index 000000000000..77f236228fa0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-21.7.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/incremental-21.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/constantly-15.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cython-test-exception-raiser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyserial[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/openssh ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=An asynchronous networking framework written in Python
+EAPI=7
+HOMEPAGE=https://www.twistedmatrix.com/trac/
+IUSE=conch crypt http2 serial test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/automat-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/constantly-15.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperlink-17.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/incremental-21.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyhamcrest-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] conch? ( >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) serial? ( >=dev-python/pyserial-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) http2? ( >=dev-python/hyper-h2-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/hyper-h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/priority-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/priority-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !dev-python/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/twisted/twisted/archive/twisted-21.7.0.tar.gz https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_md5_=fdac8012642eb848b3b97152f4b2943f
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.5 b/metadata/md5-cache/dev-python/urllib3-1.26.5
deleted file mode 100644
index 52f5ecfb1b93..000000000000
--- a/metadata/md5-cache/dev-python/urllib3-1.26.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/trustme-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/trustme-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/trustme-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=7
-HOMEPAGE=https://github.com/urllib3/urllib3
-IUSE=brotli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.5.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ba420b0acccc8767b88da4b1caade917
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.6 b/metadata/md5-cache/dev-python/urllib3-1.26.6
index 94e4afefa416..09915fea006b 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.26.6
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.6
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and mor
 EAPI=7
 HOMEPAGE=https://github.com/urllib3/urllib3
 IUSE=brotli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.6.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3edf89b1a89b7ffb4514c7b822a4b4eb
+_md5_=c44a81af048162bf08d99207cf20be8c
diff --git a/metadata/md5-cache/dev-python/uvicorn-0.14.0-r1 b/metadata/md5-cache/dev-python/uvicorn-0.14.0-r1
index ac7175375e3c..a5563cbc535d 100644
--- a/metadata/md5-cache/dev-python/uvicorn-0.14.0-r1
+++ b/metadata/md5-cache/dev-python/uvicorn-0.14.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Lightning-fast ASGI server implementation
 EAPI=7
 HOMEPAGE=https://www.uvicorn.org/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/h11-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/uvicorn/archive/0.14.0.tar.gz -> uvicorn-0.14.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dbca6ef61a8787916800f918369d1e15
+_md5_=d80d2ebaea528f9e8784134bad9189f7
diff --git a/metadata/md5-cache/dev-python/uvloop-0.15.3 b/metadata/md5-cache/dev-python/uvloop-0.15.3
index 50b0aceac2f1..d0ed38274d0f 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.15.3
+++ b/metadata/md5-cache/dev-python/uvloop-0.15.3
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-libs/libuv-1.11.0:= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-libs/libuv-1.11.0:= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libuv-1.11.0:=
 DESCRIPTION=Ultra-fast implementation of asyncio event loop on top of libuv
 EAPI=8
 HOMEPAGE=https://github.com/magicstack/uvloop
-IUSE=doc examples test python_targets_python3_8 python_targets_python3_9
+IUSE=doc examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.15.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c6b93e66149c9343759d930ba1fb4dc9
+_md5_=c1f7ccd575cd27744d14f1810450ee89
diff --git a/metadata/md5-cache/dev-python/uvloop-0.15.3-r1 b/metadata/md5-cache/dev-python/uvloop-0.15.3-r1
new file mode 100644
index 000000000000..5a00748736d8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uvloop-0.15.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-libs/libuv-1.11.0:= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libuv-1.11.0:=
+DESCRIPTION=Ultra-fast implementation of asyncio event loop on top of libuv
+EAPI=8
+HOMEPAGE=https://github.com/magicstack/uvloop
+IUSE=doc examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64
+LICENSE=MIT
+RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/uvloop/uvloop-0.15.3.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=22be2897703422313e086825da8ca32b
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.6.0 b/metadata/md5-cache/dev-python/virtualenv-20.6.0
index b8a7876cbb01..ebf2be1e6cc0 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.6.0
+++ b/metadata/md5-cache/dev-python/virtualenv-20.6.0
@@ -4,7 +4,7 @@ DESCRIPTION=Virtual Python Environment builder
 EAPI=8
 HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=~amd64 ~hppa ~mips ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/backports-entry_points_selectable-1.0.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.6.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ccbab438c5f815d997a3043df52090ee
+_md5_=603fc08a4fb8b6ba67117701176dfdd2
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.7.0 b/metadata/md5-cache/dev-python/virtualenv-20.7.0
new file mode 100644
index 000000000000..ae820d35188d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-20.7.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pip-20.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-freezegun-0.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-mock-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-timeout-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/backports-entry_points_selectable-1.0.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Virtual Python Environment builder
+EAPI=8
+HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/backports-entry_points_selectable-1.0.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.7.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=87c8fc64d09aa6c04a79bc55438d1a42
diff --git a/metadata/md5-cache/dev-python/weasyprint-53.0 b/metadata/md5-cache/dev-python/weasyprint-53.0
new file mode 100644
index 000000000000..0d090b7e07cd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/weasyprint-53.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( media-fonts/ahem ) test? ( >=dev-python/cffi-0.6:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pillow-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydyf-0.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/pango >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Visual rendering engine for HTML and CSS that can export to PDF
+EAPI=8
+HOMEPAGE=https://weasyprint.org https://github.com/Kozea/WeasyPrint
+IUSE=jpeg tiff test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/cffi-0.6:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pillow-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydyf-0.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/pango python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/w/weasyprint/weasyprint-53.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a260e6fb1b6a3a7c8c8d73888c5f3136
diff --git a/metadata/md5-cache/dev-python/webob-1.8.7 b/metadata/md5-cache/dev-python/webob-1.8.7
index 2ab537794389..f2560ee5db8b 100644
--- a/metadata/md5-cache/dev-python/webob-1.8.7
+++ b/metadata/md5-cache/dev-python/webob-1.8.7
@@ -4,7 +4,7 @@ DESCRIPTION=WSGI request and response object
 EAPI=7
 HOMEPAGE=https://webob.org/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebOb/WebOb-1.8.7.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b5acaa291409cd3fcc530441c06a6470
+_md5_=9b697c5601f5ab02f98237ad47697b56
diff --git a/metadata/md5-cache/dev-python/wxpython-4.0.7-r1 b/metadata/md5-cache/dev-python/wxpython-4.0.7-r1
index f31e41e83bae..77d906b49579 100644
--- a/metadata/md5-cache/dev-python/wxpython-4.0.7-r1
+++ b/metadata/md5-cache/dev-python/wxpython-4.0.7-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A blending of the wxWindows C++ class library with Python
 EAPI=7
 HOMEPAGE=https://www.wxpython.org/
 IUSE=test webkit python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm ~arm64 ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=wxWinLL-3
 RDEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg:0 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=4.0
 SRC_URI=mirror://pypi/w/wxPython/wxPython-4.0.7.post2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
-_md5_=82a75d7844ce15e982968fde663d6524
+_md5_=3481d9b48ae40e4586b041892594fbfc
diff --git a/metadata/md5-cache/dev-python/xcffib-0.11.1 b/metadata/md5-cache/dev-python/xcffib-0.11.1
index d67807e465e0..1b6c67566677 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.11.1
+++ b/metadata/md5-cache/dev-python/xcffib-0.11.1
@@ -5,7 +5,7 @@ DESCRIPTION=A drop in replacement for xpyb, an XCB python binding
 EAPI=7
 HOMEPAGE=https://github.com/tych0/xcffib
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/libxcb python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.11.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=316a06943521719032eadd2d9a5da8d4
+_md5_=48224668d55554bf405f84f814bbd5d0
diff --git a/metadata/md5-cache/dev-python/xlrd-2.0.1 b/metadata/md5-cache/dev-python/xlrd-2.0.1
index 48c70da8222b..da549c814eb6 100644
--- a/metadata/md5-cache/dev-python/xlrd-2.0.1
+++ b/metadata/md5-cache/dev-python/xlrd-2.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Library to extract data from Microsoft Excel spreadsheets
 EAPI=7
 HOMEPAGE=https://www.python-excel.org/ https://github.com/python-excel/xlrd/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-excel/xlrd/archive/2.0.1.tar.gz -> xlrd-2.0.1.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ae8ded00ea60528acd037d547bb16ab5
+_md5_=d55bb41d84128da7ebdfd8f035d5663e
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-1.4.4 b/metadata/md5-cache/dev-python/xlsxwriter-1.4.4
index 4774a8c28b7c..1ba55625c863 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-1.4.4
+++ b/metadata/md5-cache/dev-python/xlsxwriter-1.4.4
@@ -4,7 +4,7 @@ DESCRIPTION=Python module for creating Excel XLSX files
 EAPI=8
 HOMEPAGE=https://github.com/jmcnamara/XlsxWriter
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_1.4.4.tar.gz -> XlsxWriter-RELEASE_1.4.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dbe18eba566b1269289003a3b10c48eb
+_md5_=bba6cdf607a13fd5b752d89cbc8abcde
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-1.4.5 b/metadata/md5-cache/dev-python/xlsxwriter-1.4.5
new file mode 100644
index 000000000000..c8153be1cb11
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xlsxwriter-1.4.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python module for creating Excel XLSX files
+EAPI=8
+HOMEPAGE=https://github.com/jmcnamara/XlsxWriter
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_1.4.5.tar.gz -> XlsxWriter-RELEASE_1.4.5.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bba6cdf607a13fd5b752d89cbc8abcde
diff --git a/metadata/md5-cache/dev-python/xlwt-1.3.0-r1 b/metadata/md5-cache/dev-python/xlwt-1.3.0-r1
index a75a1fe648be..d63fff06b980 100644
--- a/metadata/md5-cache/dev-python/xlwt-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/xlwt-1.3.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python library to create spreadsheet files compatible with Excel
 EAPI=7
 HOMEPAGE=https://pypi.org/project/xlwt/
 IUSE=examples doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlwt/xlwt-1.3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1c7deccaff2b4df265da30ea22ed27b0
+_md5_=25049eddb03a3a82f3b1a00174c5f6f1
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.33.2 b/metadata/md5-cache/dev-python/zeroconf-0.33.2
new file mode 100644
index 000000000000..ae2e4bfa317a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zeroconf-0.33.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
+EAPI=8
+HOMEPAGE=https://github.com/jstasiak/python-zeroconf/ https://pypi.org/project/zeroconf/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jstasiak/python-zeroconf/archive/0.33.2.tar.gz -> python-zeroconf-0.33.2.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=917603d492a586a6c96c04118b573d6c
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index cceddb79b98e..84a103413e0c 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qt-creator-4.15.1 b/metadata/md5-cache/dev-qt/qt-creator-4.15.1
index 2b7d736bcc23..38a1f8f1fe13 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-4.15.1
+++ b/metadata/md5-cache/dev-qt/qt-creator-4.15.1
@@ -12,5 +12,5 @@ REQUIRED_USE=boot2qt? ( remotelinux ) clang? ( test? ( qbs ) ) mcu? ( cmake ) py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qtcreator/4.15/4.15.1/qt-creator-opensource-src-4.15.1.tar.xz
-_eclasses_=llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3c6a22bb9124b1a0064fff4e5e9f0fa7
diff --git a/metadata/md5-cache/dev-qt/qt-creator-9999 b/metadata/md5-cache/dev-qt/qt-creator-9999
index 1ab03beb46fc..fe0f4a42042f 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-9999
+++ b/metadata/md5-cache/dev-qt/qt-creator-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.14:5 >=dev-qt/qtcore-5.14:5 >=dev-qt/qtdeclarati
 REQUIRED_USE=boot2qt? ( remotelinux ) clang? ( test? ( qbs ) ) mcu? ( cmake ) python? ( lsp ) qmldesigner? ( qmljs ) qnx? ( remotelinux )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3c6a22bb9124b1a0064fff4e5e9f0fa7
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 910187c5af7a..1aadbbc17ee7 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.4 b/metadata/md5-cache/dev-ruby/builder-3.2.4
index b22f5fba0ee3..dd07195dcfb8 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.4
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.4
@@ -5,7 +5,7 @@ DESCRIPTION=A builder to facilitate programatic generation of XML markup
 EAPI=7
 HOMEPAGE=http://onestepback.org/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://rubygems.org/gems/builder-3.2.4.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ae5eeadc1672bd06be284ee286447a4f
+_md5_=017b23daef30d4b99bba80e9e17074b2
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.10.0 b/metadata/md5-cache/dev-ruby/css_parser-1.10.0
new file mode 100644
index 000000000000..d0549757366a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/addressable[ruby_targets_ruby27(-)] virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/addressable[ruby_targets_ruby30(-)] virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/maxitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/maxitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/maxitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Sass-based Stylesheet Framework
+EAPI=8
+HOMEPAGE=https://github.com/premailer/css_parser/
+IUSE=doc test test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/addressable[ruby_targets_ruby27(-)] virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/addressable[ruby_targets_ruby30(-)] virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/premailer/css_parser/archive/v1.10.0.tar.gz -> css_parser-1.10.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a27a693fc987f6290f83b19104261a5e
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.3.1 b/metadata/md5-cache/dev-ruby/did_you_mean-1.3.1
deleted file mode 100644
index b9c2149251cb..000000000000
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION='did you mean?'experience in Ruby
-EAPI=7
-HOMEPAGE=https://github.com/yuki24/did_you_mean
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2.6
-SRC_URI=https://rubygems.org/gems/did_you_mean-1.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eaba2c28b60a81b9af74a06e9e75bb6f
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20180417 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20180417
deleted file mode 100644
index fd585eaa66dd..000000000000
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20180417
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby25(-)] dev-ruby/shoulda[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby26(-)] dev-ruby/shoulda[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Domain Name manipulation library for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/knu/ruby-domain_name
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/domain_name-0.5.20180417.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=488eb33b7f29736408070cfb4541b3bb
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
index 8005ce49573b..44f88e95f8ee 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
@@ -4,7 +4,7 @@ DESCRIPTION=Domain Name manipulation library for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/knu/ruby-domain_name
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/domain_name-0.5.20190701.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d4700603c4510d0a3a1a8eeb2e5d83d8
+_md5_=6ec210d13b116a9c269e7df1bcc89933
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.14.0 b/metadata/md5-cache/dev-ruby/gruff-0.14.0
new file mode 100644
index 000000000000..bc59156a6569
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/gruff-0.14.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/histogram[ruby_targets_ruby26(-)] dev-ruby/rmagick:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/histogram[ruby_targets_ruby27(-)] dev-ruby/rmagick:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Beautiful graphs for one or multiple datasets
+EAPI=8
+HOMEPAGE=https://github.com/topfunky/gruff
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby26? ( dev-ruby/histogram[ruby_targets_ruby26(-)] dev-ruby/rmagick:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/histogram[ruby_targets_ruby27(-)] dev-ruby/rmagick:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/topfunky/gruff/archive/v0.14.0.tar.gz -> gruff-0.14.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=db752292d608676cce29e73dbcf2b657
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.10.0 b/metadata/md5-cache/dev-ruby/loofah-2.10.0
index a6b86f9ff9ea..522f27af76b4 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.10.0
+++ b/metadata/md5-cache/dev-ruby/loofah-2.10.0
@@ -5,7 +5,7 @@ DESCRIPTION=Library for manipulating and transforming HTML/XML documents and fra
 EAPI=7
 HOMEPAGE=https://github.com/flavorjones/loofah
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( =dev-ruby/crass-1.0*[ruby_targets_ruby25(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/crass-1.0*[ruby_targets_ruby26(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/crass-1.0*[ruby_targets_ruby27(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/crass-1.0*[ruby_targets_ruby30(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flavorjones/loofah/archive/v2.10.0.tar.gz -> loofah-2.10.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5d80aa4552b4f4069583c9d585a1f5b3
+_md5_=03461b252513ade8c8db79daf8030326
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.11.0 b/metadata/md5-cache/dev-ruby/loofah-2.11.0
new file mode 100644
index 000000000000..c3471eb3f7d3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/loofah-2.11.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( =dev-ruby/crass-1.0*[ruby_targets_ruby26(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/crass-1.0*[ruby_targets_ruby27(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/crass-1.0*[ruby_targets_ruby30(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Library for manipulating and transforming HTML/XML documents and fragments.
+EAPI=8
+HOMEPAGE=https://github.com/flavorjones/loofah
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( =dev-ruby/crass-1.0*[ruby_targets_ruby26(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/crass-1.0*[ruby_targets_ruby27(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/crass-1.0*[ruby_targets_ruby30(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/flavorjones/loofah/archive/v2.11.0.tar.gz -> loofah-2.11.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2d26e06afaf1d459a80b8d8af39c7c11
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.8.0 b/metadata/md5-cache/dev-ruby/loofah-2.8.0
deleted file mode 100644
index 3280e8db6e8b..000000000000
--- a/metadata/md5-cache/dev-ruby/loofah-2.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( =dev-ruby/crass-1.0*[ruby_targets_ruby25(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/crass-1.0*[ruby_targets_ruby26(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/crass-1.0*[ruby_targets_ruby27(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rr-1.1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Library for manipulating and transforming HTML/XML documents and fragments.
-EAPI=7
-HOMEPAGE=https://github.com/flavorjones/loofah
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( =dev-ruby/crass-1.0*[ruby_targets_ruby25(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/crass-1.0*[ruby_targets_ruby26(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/crass-1.0*[ruby_targets_ruby27(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/flavorjones/loofah/archive/v2.8.0.tar.gz -> loofah-2.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=56e2397db1cd8263f8c732296c35d8f1
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.11.3 b/metadata/md5-cache/dev-ruby/minitest-5.11.3
deleted file mode 100644
index 4b2646a0037b..000000000000
--- a/metadata/md5-cache/dev-ruby/minitest-5.11.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
-EAPI=6
-HOMEPAGE=https://github.com/seattlerb/minitest
-IUSE=doc test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=https://rubygems.org/gems/minitest-5.11.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b9c3963e7ab953efb5e5df04e6bcb27d
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.1.5 b/metadata/md5-cache/dev-ruby/power_assert-1.1.5
deleted file mode 100644
index 0270b4453bc3..000000000000
--- a/metadata/md5-cache/dev-ruby/power_assert-1.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/test-unit[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Shows each value of variables and method calls in the expression
-EAPI=7
-HOMEPAGE=https://github.com/k-tsj/power_assert
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Ruby BSD-2 )
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.1.5.tar.gz -> power_assert-1.1.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b01c7376d047a656c1f9f137fdf2b8c7
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.16-r1 b/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
index dfe6d9fc55a2..91937194823c 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A LALR(1) parser generator for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/tenderlove/racc
 IUSE=doc test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.4.16.tar.gz -> racc-1.4.16.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75d5f5ec6de4d93be7b0c14c47fa4969
+_md5_=5e91b887ea08e7e3c6840cc56ca18922
diff --git a/metadata/md5-cache/dev-ruby/rake-12.3.3 b/metadata/md5-cache/dev-ruby/rake-12.3.3
deleted file mode 100644
index bc57710136d7..000000000000
--- a/metadata/md5-cache/dev-ruby/rake-12.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/gzip ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Make-like scripting in Ruby
-EAPI=6
-HOMEPAGE=https://github.com/ruby/rake
-IUSE=doc ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ruby/rake/archive/v12.3.3.tar.gz -> rake-12.3.3.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bbe8563a0c284f95683fa2e4a2b8d94f
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.3 b/metadata/md5-cache/dev-ruby/rake-13.0.3
deleted file mode 100644
index c1d2767502f0..000000000000
--- a/metadata/md5-cache/dev-ruby/rake-13.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/gzip ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Make-like scripting in Ruby
-EAPI=7
-HOMEPAGE=https://github.com/ruby/rake
-IUSE=doc ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ruby/rake/archive/v13.0.3.tar.gz -> rake-13.0.3.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3495429eafaea9354af5494d4f08761b
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1 b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
index 74537d2e4d8e..86cb555c52a1 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
@@ -5,7 +5,7 @@ DESCRIPTION=Provide a standard and simplified way to build and package Ruby exte
 EAPI=7
 HOMEPAGE=https://github.com/luislavena/rake-compiler
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.1.tar.gz -> rake-compiler-1.1.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=30802dcc60af54d998e12dcba08fd8bf
+_md5_=4941672202debaefd24f2e3244743d5f
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.1.2 b/metadata/md5-cache/dev-ruby/rdoc-6.1.2
deleted file mode 100644
index 5fa23e8e9bb7..000000000000
--- a/metadata/md5-cache/dev-ruby/rdoc-6.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby25(-)] >dev-ruby/racc-1.4.10[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby26(-)] >dev-ruby/racc-1.4.10[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
-EAPI=7
-HOMEPAGE=https://github.com/ruby/rdoc/
-IUSE=doc ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Ruby MIT
-RDEPEND=>=app-eselect/eselect-ruby-20181225 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ruby/rdoc/archive/v6.1.2.tar.gz -> rdoc-6.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3a1058b1dfb69386f346455df85b5601
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.3.3 b/metadata/md5-cache/dev-ruby/test-unit-3.3.3
deleted file mode 100644
index bbb58649c4a3..000000000000
--- a/metadata/md5-cache/dev-ruby/test-unit-3.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/power_assert[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/power_assert[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=An xUnit family unit testing framework for Ruby
-EAPI=6
-HOMEPAGE=https://rubygems.org/gems/test-unit
-IUSE=doc test test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Ruby GPL-2 ) PSF-2
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/power_assert[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/power_assert[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://rubygems.org/gems/test-unit-3.3.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bfb88acb57b1464270bced5d078afca0
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.5 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
deleted file mode 100644
index a46fe724a23b..000000000000
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-libs/timezone-data ) test? ( ruby_targets_ruby25? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Daylight-savings aware timezone library
-EAPI=6
-HOMEPAGE=https://tzinfo.github.io/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=sys-libs/timezone-data ruby_targets_ruby25? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://rubygems.org/gems/tzinfo-1.2.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=15bcf5011a1c1414d8aad08ba9223433
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.8 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.8
index 8c5954a4981b..40c7bc7b170f 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.8
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.8
@@ -5,7 +5,7 @@ DESCRIPTION=Daylight-savings aware timezone library
 EAPI=7
 HOMEPAGE=https://tzinfo.github.io/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=sys-libs/timezone-data ruby_targets_ruby25? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/tzinfo-1.2.8.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a95d4a141eecf9f491932865c4defa7c
+_md5_=05e06b48c46b0fb7fb03636301875c07
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.9 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.9
new file mode 100644
index 000000000000..cb4d87c244a0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( sys-libs/timezone-data ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Daylight-savings aware timezone library
+EAPI=8
+HOMEPAGE=https://tzinfo.github.io/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=sys-libs/timezone-data ruby_targets_ruby26? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://rubygems.org/gems/tzinfo-1.2.9.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17000b2c3f9fe9e2259671276b73fcdc
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-2.0.4 b/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
index 667a3b31a40a..d8278dfc10cb 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
+++ b/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
@@ -5,7 +5,7 @@ DESCRIPTION=Daylight-savings aware timezone library
 EAPI=7
 HOMEPAGE=https://tzinfo.github.io/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=sys-libs/timezone-data ruby_targets_ruby25? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/tzinfo/tzinfo/archive/v2.0.4.tar.gz -> tzinfo-2.0.4.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ee20bae644af9062ca4f0c9f96c0bc27
+_md5_=c2790dac91a04c7620ec67c6167a5d50
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.5 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.5
deleted file mode 100644
index 0c8fce972af3..000000000000
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Unicode Normalization Form support library for CRuby
-EAPI=6
-HOMEPAGE=https://github.com/knu/ruby-unf_ext
-IUSE=doc test ruby_targets_ruby25 ruby_targets_ruby26 doc test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/unf_ext-0.0.7.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=54781da30103f8f4889c25847413679f
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
index f424d7fa044d..c96479709629 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Unicode Normalization Form support library for CRuby
 EAPI=7
 HOMEPAGE=https://github.com/knu/ruby-unf_ext
 IUSE=doc test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf_ext-0.0.7.7.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a9dc855e2ba2335da1d9a7ee6b563b13
+_md5_=270fd6c959a98f7a14fff312605d70ab
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 4eebdff3a645..1026757ca691 100644
--- a/metadata/md5-cache/dev-tcltk/Manifest.gz
+++ b/metadata/md5-cache/dev-tcltk/Manifest.gz
diff --git a/metadata/md5-cache/dev-tcltk/tablelist-6.13 b/metadata/md5-cache/dev-tcltk/tablelist-6.13
index 1b2ab082a66a..617c7785fce0 100644
--- a/metadata/md5-cache/dev-tcltk/tablelist-6.13
+++ b/metadata/md5-cache/dev-tcltk/tablelist-6.13
@@ -3,9 +3,9 @@ DESCRIPTION=Multi-Column Listbox Package
 EAPI=7
 HOMEPAGE=http://www.nemethi.de/tablelist/index.html
 IUSE=examples doc
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=tablelist
 RDEPEND=dev-lang/tcl:0
 SLOT=0
 SRC_URI=http://www.nemethi.de/tablelist/tablelist6.13.tar.gz
-_md5_=3bd4daf96ffede0763c527c6ecd8fcaf
+_md5_=7bd562b9e34842448ef958b5db50c3a0
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index f77584e1aaa4..d1c1f4a2953f 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/dvi2gr-0.4-r1 b/metadata/md5-cache/dev-tex/dvi2gr-0.4-r1
deleted file mode 100644
index 27d3bce0877f..000000000000
--- a/metadata/md5-cache/dev-tex/dvi2gr-0.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( sci-visualization/grace ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=install postinst prepare test
-DEPEND=media-libs/t1lib
-DESCRIPTION=DVI to Grace translator
-EAPI=7
-HOMEPAGE=https://plasma-gate.weizmann.ac.il/Grace/
-IUSE=examples test test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/t1lib
-RESTRICT=test
-SLOT=0
-SRC_URI=ftp://plasma-gate.weizmann.ac.il/pub/grace/src/devel/dvi2gr-0.4.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=18dffb1f43e03367c06200b0d71c43fe
diff --git a/metadata/md5-cache/dev-tex/dvi2gr-0.4-r2 b/metadata/md5-cache/dev-tex/dvi2gr-0.4-r2
new file mode 100644
index 000000000000..be1b8dbfc88c
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/dvi2gr-0.4-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( sci-visualization/grace ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=install postinst prepare test
+DEPEND=media-libs/t1lib
+DESCRIPTION=DVI to Grace translator
+EAPI=7
+HOMEPAGE=https://plasma-gate.weizmann.ac.il/Grace/
+IUSE=examples test test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/t1lib
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://plasma-gate.weizmann.ac.il/pub/grace/src/devel/dvi2gr-0.4.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_md5_=4c9e9089bda6eab121ba50da8239a95b
diff --git a/metadata/md5-cache/dev-tex/latex2html-2021.2 b/metadata/md5-cache/dev-tex/latex2html-2021.2
index 8a64b252dd31..2c0777e29562 100644
--- a/metadata/md5-cache/dev-tex/latex2html-2021.2
+++ b/metadata/md5-cache/dev-tex/latex2html-2021.2
@@ -4,9 +4,9 @@ DESCRIPTION=Convertor written in Perl that converts LaTeX documents to HTML
 EAPI=7
 HOMEPAGE=https://www.latex2html.org/
 IUSE=gif png
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl virtual/latex-base media-libs/netpbm dev-lang/perl gif? ( media-libs/giflib ) png? ( media-libs/libpng:0 )
 SLOT=0
 SRC_URI=https://github.com/latex2html/latex2html/archive/v2021.2.tar.gz -> latex2html-2021.2.tar.gz
-_md5_=18baf6de970239d912834bf0f3af996b
+_md5_=3956cda4341ae81dd74cb8075a7508b9
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c2b771c75ede..5eb3e3a3de1a 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/bats-1.2.1 b/metadata/md5-cache/dev-util/bats-1.2.1
deleted file mode 100644
index fe22318888aa..000000000000
--- a/metadata/md5-cache/dev-util/bats-1.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst test
-DEPEND=app-shells/bash:*
-DESCRIPTION=Bats-core: Bash Automated Testing System
-EAPI=7
-HOMEPAGE=https://github.com/bats-core/bats-core/
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=MIT
-RDEPEND=app-shells/bash:*
-SLOT=0
-SRC_URI=https://github.com/bats-core/bats-core/archive/v1.2.1.tar.gz -> bats-1.2.1.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
-_md5_=c94069883696f70c5aed7b188a14e6f8
diff --git a/metadata/md5-cache/dev-util/bats-1.4.1 b/metadata/md5-cache/dev-util/bats-1.4.1
new file mode 100644
index 000000000000..e7839298d16f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bats-1.4.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst test
+DEPEND=app-shells/bash:*
+DESCRIPTION=Bats-core: Bash Automated Testing System
+EAPI=7
+HOMEPAGE=https://github.com/bats-core/bats-core/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=app-shells/bash:*
+SLOT=0
+SRC_URI=https://github.com/bats-core/bats-core/archive/v1.4.1.tar.gz -> bats-1.4.1.tar.gz
+_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_md5_=865b84af7e2aa0309f1294fa213fb261
diff --git a/metadata/md5-cache/dev-util/bcc-0.19.0-r1 b/metadata/md5-cache/dev-util/bcc-0.19.0-r1
index 0c29f24a3a37..80b08daaf21d 100644
--- a/metadata/md5-cache/dev-util/bcc-0.19.0-r1
+++ b/metadata/md5-cache/dev-util/bcc-0.19.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) lua? ( ^^
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.19.0.tar.gz -> bcc-0.19.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2500b9bc7c78a8fa6c22f66fcf51a487
diff --git a/metadata/md5-cache/dev-util/bcc-0.20.0-r1 b/metadata/md5-cache/dev-util/bcc-0.20.0-r1
index 5224aedc3038..ff9346654b32 100644
--- a/metadata/md5-cache/dev-util/bcc-0.20.0-r1
+++ b/metadata/md5-cache/dev-util/bcc-0.20.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) lua? ( ^^
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.20.0.tar.gz -> bcc-0.20.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ec8a1354063214a97300edc2a1ca48b5
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.12.1-r1 b/metadata/md5-cache/dev-util/bpftrace-0.12.1-r1
index 0eaa50286fd2..d7117db5e6cc 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.12.1-r1
+++ b/metadata/md5-cache/dev-util/bpftrace-0.12.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libbpf:= >=dev-util/bcc-0.13.0:= dev-util/systemtap >=sys-devel
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.12.1.tar.gz -> bpftrace-0.12.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5b87e4aa3decaec4d3d16f4dbc0f6d22
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.13.0-r1 b/metadata/md5-cache/dev-util/bpftrace-0.13.0-r1
index bb97fd31b1a0..f7dc8470c476 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.13.0-r1
+++ b/metadata/md5-cache/dev-util/bpftrace-0.13.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libbpf:= >=dev-util/bcc-0.13.0:= dev-util/systemtap >=sys-devel
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.13.0.tar.gz -> bpftrace-0.13.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4844e202adec073e502f55f7710d2c30
diff --git a/metadata/md5-cache/dev-util/catfish-4.16.2 b/metadata/md5-cache/dev-util/catfish-4.16.2
new file mode 100644
index 000000000000..de3a4eb97b16
--- /dev/null
+++ b/metadata/md5-cache/dev-util/catfish-4.16.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/python-distutils-extra[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/apps/catfish/start
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.42 dev-libs/gobject-introspection dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gdk-pixbuf[introspection] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/pango[introspection] >=xfce-base/xfconf-4.14[introspection] virtual/freedesktop-icon-theme python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/catfish/4.16/catfish-4.16.2.tar.bz2
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=661de835272d7d113e7e04896eae85dd
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.20.0 b/metadata/md5-cache/dev-util/cbindgen-0.20.0
new file mode 100644
index 000000000000..d17ec5de09da
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cbindgen-0.20.0
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=A tool for generating C bindings to Rust code
+EAPI=8
+HOMEPAGE=https://github.com/eqrion/cbindgen/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT MPL-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cbindgen/0.20.0/download -> cbindgen-0.20.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.16/download -> hermit-abi-0.1.16.crate https://crates.io/api/v1/crates/indexmap/1.6.0/download -> indexmap-1.6.0.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.77/download -> libc-0.2.77.crate https://crates.io/api/v1/crates/lock_api/0.3.4/download -> lock_api-0.3.4.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/parking_lot/0.10.2/download -> parking_lot-0.10.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.7.2/download -> parking_lot_core-0.7.2.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.9/download -> ppv-lite86-0.2.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.21/download -> proc-macro2-1.0.21.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.116/download -> serde-1.0.116.crate https://crates.io/api/v1/crates/serde_derive/1.0.116/download -> serde_derive-1.0.116.crate https://crates.io/api/v1/crates/serde_json/1.0.57/download -> serde_json-1.0.57.crate https://crates.io/api/v1/crates/serial_test/0.5.0/download -> serial_test-0.5.0.crate https://crates.io/api/v1/crates/serial_test_derive/0.5.0/download -> serial_test_derive-0.5.0.crate https://crates.io/api/v1/crates/smallvec/1.4.2/download -> smallvec-1.4.2.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.41/download -> syn-1.0.41.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c0235a2a4c64172bb6af1317babfbbd3
diff --git a/metadata/md5-cache/dev-util/clazy-1.10 b/metadata/md5-cache/dev-util/clazy-1.10
new file mode 100644
index 000000000000..0f4aa39301a7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/clazy-1.10
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-devel/clang-8.0:= >=sys-devel/llvm-8.0:=
+DESCRIPTION=Compiler plugin which allows clang to understand Qt semantics
+EAPI=7
+HOMEPAGE=https://apps.kde.org/clazy
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=sys-devel/clang-8.0:= >=sys-devel/llvm-8.0:=
+SLOT=0
+SRC_URI=mirror://kde/stable/clazy/1.10/src/clazy-1.10.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1f5b2e1970de2457f379e52de1308a91
diff --git a/metadata/md5-cache/dev-util/cucumber-7.0.0 b/metadata/md5-cache/dev-util/cucumber-7.0.0
new file mode 100644
index 000000000000..44575d92f76c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-7.0.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby26(-)] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby26(-)] dev-ruby/json[ruby_targets_ruby26(-)] >=dev-util/cucumber-3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby27(-)] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby27(-)] dev-ruby/json[ruby_targets_ruby27(-)] >=dev-util/cucumber-3[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby26? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby26(-)] >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-create-meta-6.0.1:6[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-gherkin-20.0.1:20[ruby_targets_ruby26(-)] >=dev-util/cucumber-html-formatter-16.0.1:16[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby26(-)] >=dev-util/cucumber-wire-6.0.1:6[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby26(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby27(-)] >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-create-meta-6.0.1:6[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-gherkin-20.0.1:20[ruby_targets_ruby27(-)] >=dev-util/cucumber-html-formatter-16.0.1:16[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby27(-)] >=dev-util/cucumber-wire-6.0.1:6[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby27(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Executable feature scenarios
+EAPI=8
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=examples test test ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby26(-)] >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-create-meta-6.0.1:6[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-gherkin-20.0.1:20[ruby_targets_ruby26(-)] >=dev-util/cucumber-html-formatter-16.0.1:16[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby26(-)] >=dev-util/cucumber-wire-6.0.1:6[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby26(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby27(-)] >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-create-meta-6.0.1:6[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-gherkin-20.0.1:20[ruby_targets_ruby27(-)] >=dev-util/cucumber-html-formatter-16.0.1:16[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby27(-)] >=dev-util/cucumber-wire-6.0.1:6[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby27(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v7.0.0.tar.gz -> cucumber-7.0.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=280c1d984a9e784dee1c5120f6473c70
diff --git a/metadata/md5-cache/dev-util/cucumber-core-10.0.1 b/metadata/md5-cache/dev-util/cucumber-core-10.0.1
index 96b4ad6e04da..9bed7f46139b 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-10.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-10.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Executable feature scenarios
 EAPI=8
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-gherkin-20.0.1:20[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-gherkin-20.0.1:20[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-gherkin-20.0.1:20[ruby_targets_ruby30(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v10.0.1.tar.gz -> cucumber-core-10.0.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b10d085129e530d145a50d1d56d7a98f
+_md5_=6c3f74981c0a19bcf96f5db92b56f3a0
diff --git a/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1 b/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1
index c36fab7a4106..ec5af6494124 100644
--- a/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=HTML formatter for Cucumber
 EAPI=8
 HOMEPAGE=https://cucumber.io/
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/cucumber-create-meta-6.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9e6275c3cb8b91ca45555d4d30663b6d
+_md5_=24b7affaf3f393e1b77be5f062c535c5
diff --git a/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1 b/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1
index 151ebabefae2..fcf3ad6a3772 100644
--- a/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Fast Gherkin lexer and parser
 EAPI=8
 HOMEPAGE=https://github.com/cucumber/gherkin
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=20
 SRC_URI=https://github.com/cucumber/common/archive/gherkin/v20.0.1.tar.gz -> cucumber-gherkin-20.0.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=29a4006013c37da4f84930ff319eccd4
+_md5_=a1f3ce5cdd7fddc09537aed90dcb7c09
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-13.0.0-r2 b/metadata/md5-cache/dev-util/cucumber-html-formatter-13.0.0-r2
index 04b78b19cde5..9c787f7ab161 100644
--- a/metadata/md5-cache/dev-util/cucumber-html-formatter-13.0.0-r2
+++ b/metadata/md5-cache/dev-util/cucumber-html-formatter-13.0.0-r2
@@ -5,7 +5,7 @@ DESCRIPTION=HTML formatter for Cucumber
 EAPI=8
 HOMEPAGE=https://cucumber.io/
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=13
 SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-13.0.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0a2f055c94b5fcedb293bfe12a1c5e05
+_md5_=62415a87e97c79d2c466fe6ca6d51751
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r1 b/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r1
index c0f047376d69..aee9f14aa2cb 100644
--- a/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r1
+++ b/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=HTML formatter for Cucumber
 EAPI=8
 HOMEPAGE=https://cucumber.io/
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16
 SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-16.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d1374b55b487928055bf52a55ee879ef
+_md5_=fd1d86a67cd700db7e0b791aa4eb528b
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-17.0.1 b/metadata/md5-cache/dev-util/cucumber-messages-17.0.1
index 0d98d70a37a4..4aae1aad6feb 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-17.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-messages-17.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Protocol Buffer messages for Cucumber's inter-process communication
 EAPI=8
 HOMEPAGE=https://github.com/cucumber/cucumber-messages-ruby#readme
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://rubygems.org/gems/cucumber-messages-17.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cf3e17cce46ba78d12ceaafdb5f41fdf
+_md5_=4254b5e2514bc60c32778f7a41e6d62e
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-6.0.1 b/metadata/md5-cache/dev-util/cucumber-wire-6.0.1
index fb437015415a..84b210462e78 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-6.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-6.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Executable feature scenarios
 EAPI=8
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/cucumber-wire-6.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dc003724797d5fed3fdda5ea3dcdffc7
+_md5_=bdef42b11d6830eb07a1346b50e64f94
diff --git a/metadata/md5-cache/dev-util/cvise-2.3.0 b/metadata/md5-cache/dev-util/cvise-2.3.0
index 522e283ef207..4ec6f3d81530 100644
--- a/metadata/md5-cache/dev-util/cvise-2.3.0
+++ b/metadata/md5-cache/dev-util/cvise-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marxin/cvise/archive/v2.3.0.tar.gz -> cvise-2.3.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d0ff9ff5990ab96cbadc3f0287bee6ca
diff --git a/metadata/md5-cache/dev-util/diffoscope-179 b/metadata/md5-cache/dev-util/diffoscope-179
new file mode 100644
index 000000000000..f67adb146364
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-179
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( app-text/docx2txt media-libs/libcaca )
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=8
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-179.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=aba545bcd4e9fb26bfe167f70618ba55
diff --git a/metadata/md5-cache/dev-util/dput-ng-1.32 b/metadata/md5-cache/dev-util/dput-ng-1.32
index 2a22389d4a5a..62a548a166de 100644
--- a/metadata/md5-cache/dev-util/dput-ng-1.32
+++ b/metadata/md5-cache/dev-util/dput-ng-1.32
@@ -5,7 +5,7 @@ DESCRIPTION=Next generation Debian package upload tool
 EAPI=7
 HOMEPAGE=https://people.debian.org/~paultag/dput-ng/
 IUSE=test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_8? ( dev-python/python-debian[python_targets_python3_8(-)] dev-python/paramiko[python_targets_python3_8(-)] dev-util/distro-info[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-debian[python_targets_python3_9(-)] dev-python/paramiko[python_targets_python3_9(-)] dev-util/distro-info[python,python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dput-ng/dput-ng_1.32.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=880be8f2b66c7e22eb19c66ffd5c4345
+_md5_=45356c381a02a31742b5fb4093ef2ffd
diff --git a/metadata/md5-cache/dev-util/edi-0.8.0-r1 b/metadata/md5-cache/dev-util/edi-0.8.0-r1
index 683fd22068d9..3e9b434f4f73 100644
--- a/metadata/md5-cache/dev-util/edi-0.8.0-r1
+++ b/metadata/md5-cache/dev-util/edi-0.8.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1-with-linking-exception
 RDEPEND=|| ( dev-libs/efl[X] dev-libs/efl[wayland] ) >=dev-libs/efl-1.22.0[eet] clang? ( dev-util/bear sys-devel/clang:= )
 SLOT=0
 SRC_URI=https://github.com/Enlightenment/edi/archive/v0.8.0.tar.gz -> edi-0.8.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	19c0cdeff39b0e08d1454df31b588316	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=aa17a2f768d27c2e141359f5cd816d2a
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.40.2 b/metadata/md5-cache/dev-util/gnome-builder-3.40.2
index 36af9e173a91..25a217d36d54 100644
--- a/metadata/md5-cache/dev-util/gnome-builder-3.40.2
+++ b/metadata/md5-cache/dev-util/gnome-builder-3.40.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-builder/3.40/gnome-builder-3.40.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	llvm	19c0cdeff39b0e08d1454df31b588316	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b9e1cdbb836eac09d92184240b9e99bf
diff --git a/metadata/md5-cache/dev-util/idea-community-2021.1.2.211.7442.40 b/metadata/md5-cache/dev-util/idea-community-2021.1.2.211.7442.40
deleted file mode 100644
index f0083bef2b89..000000000000
--- a/metadata/md5-cache/dev-util/idea-community-2021.1.2.211.7442.40
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=install prepare unpack
-DEPEND=|| ( >=dev-java/openjdk-11.0.11_p9-r1:11 >=dev-java/openjdk-bin-11.0.11_p9-r1:11 )
-DESCRIPTION=A complete toolset for web, mobile and enterprise development
-EAPI=7
-HOMEPAGE=https://www.jetbrains.com/idea
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
-RDEPEND=|| ( >=dev-java/openjdk-11.0.11_p9-r1:11 >=dev-java/openjdk-bin-11.0.11_p9-r1:11 ) dev-java/jansi-native dev-libs/libdbusmenu media-libs/harfbuzz =dev-util/lldb-10*
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://download.jetbrains.com/idea/ideaIC-2021.1.2-no-jbr.tar.gz?_ga=2.23517177.257203969.1622674002-682219170.1619910833 -> ideaIC-1.2.211.7442.40.tar.gz amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-11_0_10-linux-x64-b1304.4.tar.gz -> jbr-11_0_10-linux-x64-b1304.4.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f310489323ef070a1a9f729c369cb723
diff --git a/metadata/md5-cache/dev-util/idea-community-2021.2.212.4746.92 b/metadata/md5-cache/dev-util/idea-community-2021.2.212.4746.92
new file mode 100644
index 000000000000..740a38b27a2e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/idea-community-2021.2.212.4746.92
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install prepare unpack
+DEPEND=|| ( >=dev-java/openjdk-11.0.11_p9-r1:11 >=dev-java/openjdk-bin-11.0.11_p9-r1:11 )
+DESCRIPTION=A complete toolset for web, mobile and enterprise development
+EAPI=7
+HOMEPAGE=https://www.jetbrains.com/idea
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
+RDEPEND=|| ( >=dev-java/openjdk-11.0.11_p9-r1:11 >=dev-java/openjdk-bin-11.0.11_p9-r1:11 ) dev-java/jansi-native dev-libs/libdbusmenu media-libs/harfbuzz =dev-util/lldb-10*
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://download.jetbrains.com/idea/ideaIC-2021.2-no-jbr.tar.gz?_ga=2.8475829.1475113311.1627561399-1267779196.1624449062 -> ideaIC-2.212.4746.92.tar.gz amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-11_0_11-linux-x64-b1504.12.tar.gz -> jbr-11_0_11-linux-x64-b1504.12.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e579f6f1080ff8704859671bbbe5d360
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-11.0-r1 b/metadata/md5-cache/dev-util/include-what-you-use-11.0-r1
index f76c92458a17..3e1d5da722a5 100644
--- a/metadata/md5-cache/dev-util/include-what-you-use-11.0-r1
+++ b/metadata/md5-cache/dev-util/include-what-you-use-11.0-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-devel/clang:11= python_single_target_python3_8? ( dev-lang/python:3.
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/0.15.tar.gz -> include-what-you-use-11.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b748c153e11cc921df2668c4f5808c53
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-12.0 b/metadata/md5-cache/dev-util/include-what-you-use-12.0
index afcb113f195e..fb210c89aec2 100644
--- a/metadata/md5-cache/dev-util/include-what-you-use-12.0
+++ b/metadata/md5-cache/dev-util/include-what-you-use-12.0
@@ -11,5 +11,5 @@ RDEPEND=sys-devel/clang:12= python_single_target_python3_8? ( dev-lang/python:3.
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/0.16.tar.gz -> include-what-you-use-12.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f798757a26a248aa250d6193d17e0aed
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4111 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4111
index fdd7fb34037b..436ea69a40ed 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4111
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4111
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=<=sys-devel/llvm-10.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <=dev-libs/opencl-clang-10.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.4111.tar.gz -> intel-graphics-compiler-1.0.4111.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9670e81173d52eea1ae807959294a9fe
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4944 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4944
index 4fd3ad15e3d9..c72060feafb0 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4944
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4944
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=<=sys-devel/llvm-10.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <=dev-libs/opencl-clang-10.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/opencl-clang-10.0.0.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.4944.tar.gz -> intel-graphics-compiler-1.0.4944.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c4d697ce7ea96ad122424c6adc64fbcf
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.5353 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.5353
index 6b2cd5fe1549..899be6e97733 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.5353
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.5353
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=<=sys-devel/llvm-11.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <=dev-libs/opencl-clang-11.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/opencl-clang-11.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.5353.tar.gz -> intel-graphics-compiler-1.0.5353.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d752ef703fbb411e5755c0543125c0b7
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.289.3 b/metadata/md5-cache/dev-util/jenkins-bin-2.289.3
new file mode 100644
index 000000000000..de399799c8da
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.289.3
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=acct-group/jenkins acct-user/jenkins
+DESCRIPTION=Extensible continuous integration server
+EAPI=7
+HOMEPAGE=https://jenkins.io/
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=acct-group/jenkins acct-user/jenkins media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.289.3/jenkins.war -> jenkins-bin-2.289.3.war
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ff2f0680668098ae1b7b812d1ead1070
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.304 b/metadata/md5-cache/dev-util/jenkins-bin-2.304
new file mode 100644
index 000000000000..71928e0bd324
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.304
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=acct-group/jenkins acct-user/jenkins
+DESCRIPTION=Extensible continuous integration server
+EAPI=7
+HOMEPAGE=https://jenkins.io/
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=acct-group/jenkins acct-user/jenkins media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
+SLOT=0
+SRC_URI=http://mirrors.jenkins-ci.org/war/2.304/jenkins.war -> jenkins-bin-2.304.war
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b51f20fcd16bfca3654a5f33605e7c07
diff --git a/metadata/md5-cache/dev-util/kyua-0.13-r2 b/metadata/md5-cache/dev-util/kyua-0.13-r2
index 6a94a9d39940..3162b7a2af94 100644
--- a/metadata/md5-cache/dev-util/kyua-0.13-r2
+++ b/metadata/md5-cache/dev-util/kyua-0.13-r2
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig test? ( dev-libs/atf )
 DEFINED_PHASES=install
-DEPEND=dev-db/sqlite:3 dev-libs/atf dev-lua/lutok virtual/pkgconfig test? ( dev-libs/atf )
+DEPEND=dev-db/sqlite:3 dev-libs/atf dev-lua/lutok
 DESCRIPTION=Testing framework for infrastructure software
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/jmmv/kyua
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-db/sqlite:3 dev-libs/atf dev-lua/lutok
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jmmv/kyua/releases/download/kyua-0.13/kyua-0.13.tar.gz
-_md5_=d964188f6f9dfdaddd1da04fbd16f4a8
+_md5_=fe97994bba94701829a6b45bb6c9400f
diff --git a/metadata/md5-cache/dev-util/lldb-10.0.1 b/metadata/md5-cache/dev-util/lldb-10.0.1
index c571c3a765f5..091503b34441 100644
--- a/metadata/md5-cache/dev-util/lldb-10.0.1
+++ b/metadata/md5-cache/dev-util/lldb-10.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=412f6d6707067ac077c2c1d7be53fb7f
diff --git a/metadata/md5-cache/dev-util/lldb-11.1.0 b/metadata/md5-cache/dev-util/lldb-11.1.0
index 6bd7a8a03cb4..dc77f973cac4 100644
--- a/metadata/md5-cache/dev-util/lldb-11.1.0
+++ b/metadata/md5-cache/dev-util/lldb-11.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=96368732b2ef7bad8eec52ac1ff6775f
diff --git a/metadata/md5-cache/dev-util/lldb-12.0.0 b/metadata/md5-cache/dev-util/lldb-12.0.0
index bbed0ec9432f..b29281fabe86 100644
--- a/metadata/md5-cache/dev-util/lldb-12.0.0
+++ b/metadata/md5-cache/dev-util/lldb-12.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7619db5a184d5a9d4627ef6286417248
diff --git a/metadata/md5-cache/dev-util/lldb-12.0.1 b/metadata/md5-cache/dev-util/lldb-12.0.1
index 2dfe84947187..c70c072a20f0 100644
--- a/metadata/md5-cache/dev-util/lldb-12.0.1
+++ b/metadata/md5-cache/dev-util/lldb-12.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f2559662519c6e08e2130a976db0ca8b
diff --git a/metadata/md5-cache/dev-util/lldb-13.0.0.9999 b/metadata/md5-cache/dev-util/lldb-13.0.0.9999
index 44e819f70dc3..41fb312cd87d 100644
--- a/metadata/md5-cache/dev-util/lldb-13.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-13.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=99a26fa58ac93518c816f8979e3d9794
diff --git a/metadata/md5-cache/dev-util/lldb-14.0.0.9999 b/metadata/md5-cache/dev-util/lldb-14.0.0.9999
new file mode 100644
index 000000000000..c0f82964d366
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-14.0.0.9999
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_8? ( ~dev-python/lit-14.0.0.9999[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-14.0.0.9999[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-14.0.0.9999[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) sys-devel/lld ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) ~sys-devel/clang-14.0.0.9999[xml] ~sys-devel/llvm-14.0.0.9999 !<sys-devel/llvm-4.0 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM debugger
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+libedit lzma ncurses +python test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PROPERTIES=live
+RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) ~sys-devel/clang-14.0.0.9999[xml] ~sys-devel/llvm-14.0.0.9999 !<sys-devel/llvm-4.0
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=99a26fa58ac93518c816f8979e3d9794
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88-r1
index 43e529ad96e6..693138d49168 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88-r1
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-8[cxx] >=x11-drivers/nvidia-drivers-396.26 debugger? ( sy
 RESTRICT=bindist mirror
 SLOT=0/9.2.88
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=ca2cec901adb39d17fe7d12910b88d28
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=725271bf80c37b9d0cb342004ead88a1
diff --git a/metadata/md5-cache/dev-util/ostree-2019.5 b/metadata/md5-cache/dev-util/ostree-2019.5
index 07c9cf33e252..a1794d930e9e 100644
--- a/metadata/md5-cache/dev-util/ostree-2019.5
+++ b/metadata/md5-cache/dev-util/ostree-2019.5
@@ -4,7 +4,7 @@ DEPEND=archive? ( app-arch/libarchive ) app-crypt/gpgme app-arch/xz-utils curl?
 DESCRIPTION=Operating system and container binary deployment and upgrades
 EAPI=7
 HOMEPAGE=https://ostree.readthedocs.io/en/latest/
-IUSE=archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl soup systemd zeroconf
+IUSE=archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl +soup systemd zeroconf
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
 RDEPEND=archive? ( app-arch/libarchive ) app-crypt/gpgme app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup ) dev-libs/libassuan dev-libs/libgpg-error dev-libs/glib:2 dracut? ( sys-kernel/dracut ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2019.5/libostree-2019.5.tar.xz -> ostree-2019.5.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=803a595b7bbd681f735e595b1182f943
+_md5_=fd6f4bb44f6e350aae298d707f558b6c
diff --git a/metadata/md5-cache/dev-util/ostree-2020.6 b/metadata/md5-cache/dev-util/ostree-2020.6
index de02305cebab..5e038078f8d2 100644
--- a/metadata/md5-cache/dev-util/ostree-2020.6
+++ b/metadata/md5-cache/dev-util/ostree-2020.6
@@ -4,7 +4,7 @@ DEPEND=archive? ( app-arch/libarchive ) app-crypt/gpgme app-arch/xz-utils curl?
 DESCRIPTION=Operating system and container binary deployment and upgrades
 EAPI=7
 HOMEPAGE=https://ostree.readthedocs.io/en/latest/
-IUSE=archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl soup systemd zeroconf
+IUSE=archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl +soup systemd zeroconf
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
 RDEPEND=archive? ( app-arch/libarchive ) app-crypt/gpgme app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup ) dev-libs/libassuan dev-libs/libgpg-error dev-libs/glib:2 dracut? ( sys-kernel/dracut ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2020.6/libostree-2020.6.tar.xz -> ostree-2020.6.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0a29f08b30ff2367a6bbd1fbcaec579f
+_md5_=d630c9a3e04301b5d00a2004462ba33d
diff --git a/metadata/md5-cache/dev-util/ostree-2020.7 b/metadata/md5-cache/dev-util/ostree-2020.7
index 1c1e9e9a9474..2d9652139686 100644
--- a/metadata/md5-cache/dev-util/ostree-2020.7
+++ b/metadata/md5-cache/dev-util/ostree-2020.7
@@ -4,7 +4,7 @@ DEPEND=archive? ( app-arch/libarchive ) app-arch/xz-utils curl? ( net-misc/curl
 DESCRIPTION=Operating system and container binary deployment and upgrades
 EAPI=7
 HOMEPAGE=https://ostreedev.github.io/ostree/
-IUSE=archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl soup systemd zeroconf
+IUSE=archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2+
 RDEPEND=archive? ( app-arch/libarchive ) app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup ) dev-libs/libassuan dev-libs/glib:2 dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14 ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2020.7/libostree-2020.7.tar.xz -> ostree-2020.7.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dfff12f0049bf68e5c9e17952464b448
+_md5_=1b8ae2c7164277c8fac2f51a3979f78a
diff --git a/metadata/md5-cache/dev-util/ostree-2020.8 b/metadata/md5-cache/dev-util/ostree-2020.8
index 686cd2a4b888..cbc07fd76264 100644
--- a/metadata/md5-cache/dev-util/ostree-2020.8
+++ b/metadata/md5-cache/dev-util/ostree-2020.8
@@ -4,7 +4,7 @@ DEPEND=archive? ( app-arch/libarchive ) app-arch/xz-utils curl? ( net-misc/curl
 DESCRIPTION=Operating system and container binary deployment and upgrades
 EAPI=7
 HOMEPAGE=https://ostreedev.github.io/ostree/
-IUSE=archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl soup systemd zeroconf
+IUSE=archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=archive? ( app-arch/libarchive ) app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup ) dev-libs/libassuan dev-libs/glib:2 dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14 ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2020.8/libostree-2020.8.tar.xz -> ostree-2020.8.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0ded23d8760e57ed70501b5dcbafa3f2
+_md5_=71c126f698231119fe834c0d925fd707
diff --git a/metadata/md5-cache/dev-util/perf-5.10.16 b/metadata/md5-cache/dev-util/perf-5.10.16
index 537c5748d568..467ee5ed7afd 100644
--- a/metadata/md5-cache/dev-util/perf-5.10.16
+++ b/metadata/md5-cache/dev-util/perf-5.10.16
@@ -11,5 +11,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.16.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ff4b008c649a90f3a3d164f677b6eee8
diff --git a/metadata/md5-cache/dev-util/perf-5.11 b/metadata/md5-cache/dev-util/perf-5.11
index bd7382857b03..f6c1900414cc 100644
--- a/metadata/md5-cache/dev-util/perf-5.11
+++ b/metadata/md5-cache/dev-util/perf-5.11
@@ -11,5 +11,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6110d2d7d91e7826e6f35c8f19015eb
diff --git a/metadata/md5-cache/dev-util/perf-5.12 b/metadata/md5-cache/dev-util/perf-5.12
index a2c121ea6479..fc322c8388e1 100644
--- a/metadata/md5-cache/dev-util/perf-5.12
+++ b/metadata/md5-cache/dev-util/perf-5.12
@@ -11,5 +11,5 @@ RDEPEND=audit? ( sys-process/audit ) babeltrace? ( dev-util/babeltrace ) crypt?
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7c0f66e8a3035d0ba2344ad69a88e0b8
diff --git a/metadata/md5-cache/dev-util/perf-5.8 b/metadata/md5-cache/dev-util/perf-5.8
index 4d0e59df66d9..0c3a3719ca2c 100644
--- a/metadata/md5-cache/dev-util/perf-5.8
+++ b/metadata/md5-cache/dev-util/perf-5.8
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c24843544e3419ec451e83f497a3db5
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.3 b/metadata/md5-cache/dev-util/pkgcheck-0.10.3
index d054ab5a7300..2deaf5b03a79 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.3
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.3
@@ -4,7 +4,7 @@ DESCRIPTION=pkgcore-based QA utility for ebuild repos
 EAPI=7
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos
 LICENSE=BSD MIT
 RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=419a1119b0e3342c96aa35f86f87934a
+_md5_=11d8c4f42fd4b7390987c49f2513ac9b
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.7.4 b/metadata/md5-cache/dev-util/pkgconf-1.7.4
index 079bdc6367d9..10430398de50 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.7.4
+++ b/metadata/md5-cache/dev-util/pkgconf-1.7.4
@@ -4,11 +4,11 @@ DESCRIPTION=pkg-config compatible replacement with no dependencies other than AN
 EAPI=7
 HOMEPAGE=https://git.sr.ht/~kaniini/pkgconf
 IUSE=+pkg-config test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~ppc-macos ~x64-macos
 LICENSE=ISC
 RDEPEND=pkg-config? ( !dev-util/pkgconfig )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://distfiles.dereferenced.org/pkgconf/pkgconf-1.7.4.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=30f3ef39fe72ace862663c5bbc08b95d
+_md5_=83dea30a3ddb415bf82e83abb3120d9a
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.1.2 b/metadata/md5-cache/dev-util/pkgdev-0.1.2
deleted file mode 100644
index c5ffb66edb86..000000000000
--- a/metadata/md5-cache/dev-util/pkgdev-0.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/pkgcheck-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of tools for Gentoo development
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgdev
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/pkgcheck-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.1.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=affada62d539ef476156c0bf8189b06a
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.1.5 b/metadata/md5-cache/dev-util/pkgdev-0.1.5
deleted file mode 100644
index 8f70830eee71..000000000000
--- a/metadata/md5-cache/dev-util/pkgdev-0.1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of tools for Gentoo development
-EAPI=7
-HOMEPAGE=https://github.com/pkgcore/pkgdev
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.1.5.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=992a658f5d7426dd21a09b5fd1ffadf3
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.1.9 b/metadata/md5-cache/dev-util/pkgdev-0.1.9
new file mode 100644
index 000000000000..2b0a8368685f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgdev-0.1.9
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of tools for Gentoo development
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/pkgdev
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~ppc64 ~riscv ~sparc ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.1.9.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c800e52c41eaf363b2cb57bdb8873f66
diff --git a/metadata/md5-cache/dev-util/pkgdev-9999 b/metadata/md5-cache/dev-util/pkgdev-9999
index d69f1cd8fd71..5a6bfccd90b2 100644
--- a/metadata/md5-cache/dev-util/pkgdev-9999
+++ b/metadata/md5-cache/dev-util/pkgdev-9999
@@ -1,14 +1,14 @@
-BDEPEND=test? ( dev-python/pytest ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( ~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-util/pkgcheck-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~sys-apps/pkgcore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/pytest ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( ~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/pkgcheck-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~sys-apps/pkgcore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Collection of tools for Gentoo development
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/pkgcore/pkgdev
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=BSD MIT
 PROPERTIES=live
-RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-util/pkgcheck-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~sys-apps/pkgcore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/pkgcheck-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~sys-apps/pkgcore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=613186e803aa34520168ea32e1e0dee4
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c800e52c41eaf363b2cb57bdb8873f66
diff --git a/metadata/md5-cache/dev-util/rbtools-1.0.3 b/metadata/md5-cache/dev-util/rbtools-1.0.3
deleted file mode 100644
index 39e27d83fdbf..000000000000
--- a/metadata/md5-cache/dev-util/rbtools-1.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.8.0[python_targets_python3_8(-)?] dev-python/tqdm[python_targets_python3_8(-)?] dev-python/texttable[python_targets_python3_8(-)?] dev-python/colorama[python_targets_python3_8(-)?] dev-python/setuptools[python_targets_python3_8(-)?]
-DESCRIPTION=Command line tools for use with Review Board
-EAPI=7
-HOMEPAGE=https://www.reviewboard.org/
-IUSE=python_targets_python3_8
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/six-1.8.0[python_targets_python3_8(-)?] dev-python/tqdm[python_targets_python3_8(-)?] dev-python/texttable[python_targets_python3_8(-)?] dev-python/colorama[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://downloads.reviewboard.org/releases/RBTools/1.0/RBTools-1.0.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=703b45ae155095bfdef03ce8a6cb0e42
diff --git a/metadata/md5-cache/dev-util/rbtools-2.0.1 b/metadata/md5-cache/dev-util/rbtools-2.0.1
new file mode 100644
index 000000000000..b883f1d77824
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rbtools-2.0.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/six-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/six-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=Command line tools for use with Review Board
+EAPI=8
+HOMEPAGE=https://www.reviewboard.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/six-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.reviewboard.org/releases/RBTools/2.0/RBTools-2.0.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=02521e9bab71da77fe9173cf31c41c6f
diff --git a/metadata/md5-cache/dev-util/re2c-2.2 b/metadata/md5-cache/dev-util/re2c-2.2
new file mode 100644
index 000000000000..86490a387b70
--- /dev/null
+++ b/metadata/md5-cache/dev-util/re2c-2.2
@@ -0,0 +1,13 @@
+BDEPEND=test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install setup
+DESCRIPTION=tool for generating C-based recognizers from regular expressions
+EAPI=8
+HOMEPAGE=http://re2c.org/
+IUSE=debug test
+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
+LICENSE=public-domain
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/skvadrik/re2c/releases/download/2.2/re2c-2.2.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2208abdcc80a5413c22669bacafd5da1
diff --git a/metadata/md5-cache/dev-util/schroot-1.6.10_p12-r1 b/metadata/md5-cache/dev-util/schroot-1.6.10_p12-r1
deleted file mode 100644
index 8e0913432a67..000000000000
--- a/metadata/md5-cache/dev-util/schroot-1.6.10_p12-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=dev-libs/boost-1.42.0:= >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) zfs? ( sys-fs/zfs ) app-arch/xz-utils sys-apps/groff doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( >=app-text/po4a-0.40 sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 )
-DESCRIPTION=Utility to execute commands in a chroot environment
-EAPI=7
-HOMEPAGE=https://packages.debian.org/source/sid/schroot
-IUSE=btrfs +dchroot debug doc lvm nls pam test zfs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.42.0:= >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) zfs? ( sys-fs/zfs ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl ) virtual/tmpfiles
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.6.10.orig.tar.xz mirror://debian/pool/main/s/schroot/schroot_1.6.10-12.debian.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7831e98a07c39ce3092351d8d90d788e
diff --git a/metadata/md5-cache/dev-util/schroot-1.6.10_p12-r2 b/metadata/md5-cache/dev-util/schroot-1.6.10_p12-r2
new file mode 100644
index 000000000000..12a325dce88d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/schroot-1.6.10_p12-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=dev-libs/boost-1.42.0:= >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) zfs? ( sys-fs/zfs ) app-arch/xz-utils sys-apps/groff doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( >=app-text/po4a-0.40 sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 )
+DESCRIPTION=Utility to execute commands in a chroot environment
+EAPI=7
+HOMEPAGE=https://packages.debian.org/source/sid/schroot
+IUSE=btrfs +dchroot debug doc lvm nls pam test zfs
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.42.0:= >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) zfs? ( sys-fs/zfs ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl ) virtual/tmpfiles
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.6.10.orig.tar.xz mirror://debian/pool/main/s/schroot/schroot_1.6.10-12.debian.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3f99b2cf555b175e9d1162bbc271f0c4
diff --git a/metadata/md5-cache/dev-util/scons-4.2.0-r1 b/metadata/md5-cache/dev-util/scons-4.2.0-r1
new file mode 100644
index 000000000000..746409969b85
--- /dev/null
+++ b/metadata/md5-cache/dev-util/scons-4.2.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-libs/libxml2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Extensible Python-based build utility
+EAPI=8
+HOMEPAGE=https://www.scons.org/
+IUSE=doc test python_targets_python3_8 python_targets_python3_9
+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 ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/scons/scons/4.2.0/scons-4.2.0.tar.gz doc? ( https://www.scons.org/doc/4.2.0/PDF/scons-user.pdf -> scons-4.2.0-user.pdf https://www.scons.org/doc/4.2.0/HTML/scons-user.html -> scons-4.2.0-user.html ) test? ( https://github.com/scons/scons/archive/4.2.0.tar.gz -> scons-4.2.0.gh.tar.gz )
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=edb47783edfd80161c56da4c833d2dc0
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0 b/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0
index 7700470a3f83..3709ea68e216 100644
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v10.0.0.tar.gz -> spirv-llvm-translator-10.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9a568572aa2f50096adf39144bfbe927
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0_p20200909 b/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0_p20200909
index 27085d06976c..0148016dbd17 100644
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0_p20200909
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0_p20200909
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=test
 SLOT=10
 SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/4f1a3270f2431aa98f1bff30d1a32c9d8f4729bf.tar.gz -> spirv-llvm-translator-10.0.0_p20200909.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=bcb41517ded20932fe9eb029489bfcd1
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-11.0.0 b/metadata/md5-cache/dev-util/spirv-llvm-translator-11.0.0
index f09fb428caa0..ac92dd54bead 100644
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-11.0.0
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-11.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=test
 SLOT=11
 SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/d6dc999eee381158a26f048a333467c9ce7e77f2.tar.gz -> spirv-llvm-translator-11.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8c2fe4b87f335b734a3afe12bc2496f9
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-11.1.0_pre20210212 b/metadata/md5-cache/dev-util/spirv-llvm-translator-11.1.0_pre20210212
index b4148630ed58..15fb7d51f280 100644
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-11.1.0_pre20210212
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-11.1.0_pre20210212
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=test
 SLOT=11
 SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/677b40cdab276a0b15e048f4d6c7d20d8968dfac.tar.gz -> spirv-llvm-translator-11.1.0_pre20210212.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=060dea635b490f5ff81470a12bd60ca2
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-12.0.0 b/metadata/md5-cache/dev-util/spirv-llvm-translator-12.0.0
index fc02b2cb2103..a75cb0f97dca 100644
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-12.0.0
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-12.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v12.0.0.tar.gz -> spirv-llvm-translator-12.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=689bf3dd84b530aa910f4d002f01e1e9
diff --git a/metadata/md5-cache/dev-util/uftrace-0.10 b/metadata/md5-cache/dev-util/uftrace-0.10
deleted file mode 100644
index e935163861d5..000000000000
--- a/metadata/md5-cache/dev-util/uftrace-0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=sys-libs/ncurses:= virtual/libelf:= capstone? ( dev-libs/capstone:0= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) )
-DESCRIPTION=Function (graph) tracer for user-space
-EAPI=7
-HOMEPAGE=https://github.com/namhyung/uftrace
-IUSE=bash-completion capstone lua +lua_single_target_luajit
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:= virtual/libelf:= capstone? ( dev-libs/capstone:0= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/namhyung/uftrace/archive/v0.10.tar.gz -> uftrace-0.10.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=69a7259bae43476a52f90027e0638aa1
diff --git a/metadata/md5-cache/dev-util/uftrace-0.10-r1 b/metadata/md5-cache/dev-util/uftrace-0.10-r1
new file mode 100644
index 000000000000..d8e70d33e824
--- /dev/null
+++ b/metadata/md5-cache/dev-util/uftrace-0.10-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=sys-libs/ncurses:= virtual/libelf:= capstone? ( dev-libs/capstone:0= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) )
+DESCRIPTION=Function (graph) tracer for user-space
+EAPI=7
+HOMEPAGE=https://github.com/namhyung/uftrace
+IUSE=capstone lua +lua_single_target_luajit
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:= virtual/libelf:= capstone? ( dev-libs/capstone:0= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/namhyung/uftrace/archive/v0.10.tar.gz -> uftrace-0.10.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=390c3c1a6530e5608134ce8a9062dbd3
diff --git a/metadata/md5-cache/dev-util/umockdev-0.16.1-r1 b/metadata/md5-cache/dev-util/umockdev-0.16.1-r1
new file mode 100644
index 000000000000..f727fe38bc4c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/umockdev-0.16.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) app-arch/xz-utils virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gobject-introspection-1.32:= test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-libs/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Mock hardware devices for creating unit tests
+EAPI=7
+HOMEPAGE=https://github.com/martinpitt/umockdev/
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gobject-introspection-1.32:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/martinpitt/umockdev/releases/download/0.16.1/umockdev-0.16.1.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=954fb30a55ce09b773263d7189df74d5
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 3da5f47590c3..b37e453417d3 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r14 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r14
index e9c038ef9086..a93009f24848 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r14
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r14
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare unpack
 DEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( sys-libs/pam ) server? ( virtual/libcrypt:= )
 DESCRIPTION=Concurrent Versions System - source code revision control tools
-EAPI=6
+EAPI=7
 HOMEPAGE=http://cvs.nongnu.org/
 IUSE=crypt doc kerberos nls pam server
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( sys-libs/pam ) server? ( virtual/libcrypt:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3fbd318eefa0d9f4282fea9742fea71e
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a9ae29697498de932f028654ab1db3dc
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.14.1 b/metadata/md5-cache/dev-vcs/subversion-1.14.1
index 22ea2d183eb4..b77de4056ca7 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.14.1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.14.1
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced version control system
 EAPI=6
 HOMEPAGE=https://subversion.apache.org/
 IUSE=apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl ruby sasl test apache2 elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 BSD MIT BSD-2 FSFAP unicode
 RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.5:1 >=dev-libs/apr-util-1.5:1 dev-libs/expat dev-libs/libutf8proc:= >=net-libs/serf-1.3.4 sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) gnome-keyring? ( dev-libs/glib:2 app-crypt/libsecret sys-apps/dbus ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) ruby? ( || ( dev-lang/ruby:2.6 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( acct-group/apache acct-user/apache www-servers/apache[apache2_modules_dav] ) !apache2? ( acct-group/svnusers acct-user/svn ) java? ( >=virtual/jre-1.8 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.14.1.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	db-use	063d3e7add942762a8203b52ec3066c2	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4f4c0c8e5e76193f7a33a8986addd220
+_md5_=276c787a6b3eb6201cf430cb601153eb
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 03185be88f4a..6fc88e75eb53 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/minecraft-launcher-928-r2 b/metadata/md5-cache/games-action/minecraft-launcher-928-r2
deleted file mode 100644
index 2e101c9e552a..000000000000
--- a/metadata/md5-cache/games-action/minecraft-launcher-928-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An open-world game whose gameplay revolves around breaking and placing blocks
-EAPI=7
-HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* ~amd64
-LICENSE=Mojang
-RDEPEND=>=x11-libs/gtk+-2.24.32-r1[X(+)] app-crypt/libsecret dev-libs/nss dev-libs/libbsd dev-libs/libffi:0/7 dev-libs/libpcre media-libs/alsa-lib media-libs/openal net-libs/gnutls[idn] net-print/cups sys-apps/dbus virtual/jre:1.8 virtual/opengl x11-apps/xrandr x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_928.tar.gz -> minecraft-launcher-928.tar.gz https://launcher.mojang.com/download/minecraft-launcher.svg
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=138a01cda8349f841242b8fbe63e3226
diff --git a/metadata/md5-cache/games-action/minecraft-launcher-928-r3 b/metadata/md5-cache/games-action/minecraft-launcher-928-r3
new file mode 100644
index 000000000000..4433258fefd8
--- /dev/null
+++ b/metadata/md5-cache/games-action/minecraft-launcher-928-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An open-world game whose gameplay revolves around breaking and placing blocks
+EAPI=7
+HOMEPAGE=https://www.minecraft.net/
+KEYWORDS=-* ~amd64
+LICENSE=Mojang
+RDEPEND=>=x11-libs/gtk+-2.24.32-r1[X(+)] app-crypt/libsecret dev-libs/nss dev-libs/libbsd || ( dev-libs/libffi-compat:7 dev-libs/libffi:0/7 ) dev-libs/libpcre media-libs/alsa-lib media-libs/openal net-libs/gnutls[idn] net-print/cups sys-apps/dbus virtual/jre:1.8 virtual/opengl x11-apps/xrandr x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_928.tar.gz -> minecraft-launcher-928.tar.gz https://launcher.mojang.com/download/minecraft-launcher.svg
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=98e833b1a096831bf09058c1923c91d2
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 5ff17cfeafab..1fabec0e8f5f 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r2 b/metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r2
deleted file mode 100644
index 6bd449a8cd2e..000000000000
--- a/metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
-DESCRIPTION=Space invaders clone, using ncurses library
-EAPI=6
-HOMEPAGE=https://packages.gentoo.org/package/games-arcade/ascii-invaders
-KEYWORDS=~alpha ~amd64 ~mips ~ppc64 ~x86 ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=mirror://gentoo/invaders0.1b.tgz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3bd4c9d091de3522119edeb47a15b27e
diff --git a/metadata/md5-cache/games-arcade/supertux-0.6.2-r1 b/metadata/md5-cache/games-arcade/supertux-0.6.2-r1
deleted file mode 100644
index 613aaced873e..000000000000
--- a/metadata/md5-cache/games-arcade/supertux-0.6.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/make dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!=media-libs/libsdl2-2.0.14-r0 >=dev-games/physfs-3.0 dev-libs/boost:= media-libs/freetype media-libs/glew:= media-libs/libpng:0= >=media-libs/libsdl2-2.0.1[joystick,video] media-libs/libvorbis media-libs/openal >=media-libs/sdl2-image-2.0.0[png,jpeg] >=net-misc/curl-7.21.7 virtual/opengl
-DESCRIPTION=A game similar to Super Mario Bros.
-EAPI=7
-HOMEPAGE=https://supertux.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0
-RDEPEND=!=media-libs/libsdl2-2.0.14-r0 >=dev-games/physfs-3.0 dev-libs/boost:= media-libs/freetype media-libs/glew:= media-libs/libpng:0= >=media-libs/libsdl2-2.0.1[joystick,video] media-libs/libvorbis media-libs/openal >=media-libs/sdl2-image-2.0.0[png,jpeg] >=net-misc/curl-7.21.7 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/SuperTux/supertux/releases/download/v0.6.2/SuperTux-v0.6.2-Source.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e1a94e09d2b9b36879ec914e95b9dc6d
diff --git a/metadata/md5-cache/games-arcade/supertux-0.6.2-r2 b/metadata/md5-cache/games-arcade/supertux-0.6.2-r2
new file mode 100644
index 000000000000..42bf02788e89
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/supertux-0.6.2-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/make dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!=media-libs/libsdl2-2.0.14-r0 >=dev-games/physfs-3.0 dev-libs/boost:=[nls] media-libs/freetype media-libs/glew:= media-libs/libpng:0= >=media-libs/libsdl2-2.0.1[joystick,video] media-libs/libvorbis media-libs/openal >=media-libs/sdl2-image-2.0.0[png,jpeg] >=net-misc/curl-7.21.7 virtual/opengl
+DESCRIPTION=A game similar to Super Mario Bros.
+EAPI=7
+HOMEPAGE=https://supertux.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0
+RDEPEND=!=media-libs/libsdl2-2.0.14-r0 >=dev-games/physfs-3.0 dev-libs/boost:=[nls] media-libs/freetype media-libs/glew:= media-libs/libpng:0= >=media-libs/libsdl2-2.0.1[joystick,video] media-libs/libvorbis media-libs/openal >=media-libs/sdl2-image-2.0.0[png,jpeg] >=net-misc/curl-7.21.7 virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/SuperTux/supertux/releases/download/v0.6.2/SuperTux-v0.6.2-Source.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8570c32da831c9b08918915191278524
diff --git a/metadata/md5-cache/games-arcade/tuxanci-20110429-r1 b/metadata/md5-cache/games-arcade/tuxanci-20110429-r1
deleted file mode 100644
index ca155f3f96e9..000000000000
--- a/metadata/md5-cache/games-arcade/tuxanci-20110429-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dedicated? ( >=media-libs/fontconfig-2.7.0 media-libs/libsdl[X,opengl?] >=media-libs/sdl-image-1.2.10[png] media-libs/sdl-ttf[X] sound? ( >=media-libs/sdl-mixer-1.2.11[vorbis] ) ) physfs? ( dev-games/physfs[zip] ) !physfs? ( >=dev-libs/libzip-0.9 )
-DESCRIPTION=First Tux shooter multi-player network game inspired by Bulanci
-EAPI=7
-HOMEPAGE=https://repo.or.cz/w/tuxanci.git
-IUSE=debug dedicated +ipv6 nls opengl physfs +sound
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!dedicated? ( >=media-libs/fontconfig-2.7.0 media-libs/libsdl[X,opengl?] >=media-libs/sdl-image-1.2.10[png] media-libs/sdl-ttf[X] sound? ( >=media-libs/sdl-mixer-1.2.11[vorbis] ) ) physfs? ( dev-games/physfs[zip] ) !physfs? ( >=dev-libs/libzip-0.9 )
-SLOT=0
-SRC_URI=mirror://gentoo/tuxanci-20110429.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f023e1096e650777ba252c5d98edcbc2
diff --git a/metadata/md5-cache/games-arcade/tuxanci-20110429-r2 b/metadata/md5-cache/games-arcade/tuxanci-20110429-r2
new file mode 100644
index 000000000000..5b48c02d43e0
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/tuxanci-20110429-r2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!dedicated? ( media-libs/fontconfig media-libs/libsdl[opengl?,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf opengl? ( virtual/opengl ) ) physfs? ( dev-games/physfs[zip] ) !physfs? ( dev-libs/libzip:= )
+DESCRIPTION=First Tux shooter multi-player network game inspired by Bulanci
+EAPI=7
+HOMEPAGE=https://repo.or.cz/w/tuxanci.git
+IUSE=dedicated opengl physfs
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!dedicated? ( media-libs/fontconfig media-libs/libsdl[opengl?,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf opengl? ( virtual/opengl ) ) physfs? ( dev-games/physfs[zip] ) !physfs? ( dev-libs/libzip:= )
+SLOT=0
+SRC_URI=mirror://gentoo/tuxanci-20110429.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2b73bdff370e39db78767fc3ae69a12b
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index eb6ccd80debe..477a66259e64 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/dolphin-9999 b/metadata/md5-cache/games-emulation/dolphin-9999
index 9ad1bd840aba..9f4276473c0d 100644
--- a/metadata/md5-cache/games-emulation/dolphin-9999
+++ b/metadata/md5-cache/games-emulation/dolphin-9999
@@ -4,10 +4,10 @@ DEPEND=dev-libs/hidapi:0= >=dev-libs/libfmt-7.1:0= dev-libs/lzo:2= dev-libs/pugi
 DESCRIPTION=Gamecube and Wii game emulator
 EAPI=7
 HOMEPAGE=https://www.dolphin-emu.org/
-IUSE=alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile pulseaudio +qt5 systemd upnp vulkan
+IUSE=alsa bluetooth discord-presence doc +evdev ffmpeg log lto mgba profile pulseaudio +qt5 systemd upnp vulkan
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/hidapi:0= >=dev-libs/libfmt-7.1:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) vulkan? ( media-libs/vulkan-loader )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c9fb9abe15a9b5ca4cdef64415f6fbba
+_md5_=b3dc4435bcdb10b3a5d7c1e18bafb408
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 3a79b70042f8..647c261b2855 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/openmw-9999 b/metadata/md5-cache/games-engines/openmw-9999
index a1155f14151e..c169930c792f 100644
--- a/metadata/md5-cache/games-engines/openmw-9999
+++ b/metadata/md5-cache/games-engines/openmw-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[doc] dev-python/sphinx ) test? ( dev-cpp/gtest ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) app-arch/lz4 dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml:=[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) dev-cpp/sol2
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) app-arch/lz4 dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml:=[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) dev-cpp/sol2
 DESCRIPTION=Open source reimplementation of TES III: Morrowind
 EAPI=7
 HOMEPAGE=https://openmw.org/ https://gitlab.com/OpenMW/openmw
 IUSE=doc devtools +osg-fork test +qt5 lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 LICENSE=GPL-3 MIT BitstreamVera ZLIB
 PROPERTIES=live
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) app-arch/lz4 dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml:=[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) app-arch/lz4 dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml:=[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dfed34cf9253be36491965250bdbb26c
+_md5_=8bf13ee73774f4951821e134a608fc36
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 6419098a1bba..826e119fcca1 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/chocolate-doom-3.0.1 b/metadata/md5-cache/games-fps/chocolate-doom-3.0.1
deleted file mode 100644
index 29ab330970e2..000000000000
--- a/metadata/md5-cache/games-fps/chocolate-doom-3.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=bash-completion? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) ) doc? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[midi?,vorbis?] media-libs/sdl2-net libsamplerate? ( media-libs/libsamplerate ) png? ( media-libs/libpng:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A Doom source port that is minimalist and historically accurate
-EAPI=7
-HOMEPAGE=https://www.chocolate-doom.org
-IUSE=bash-completion doc libsamplerate +midi png vorbis
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2+
-RDEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[midi?,vorbis?] media-libs/sdl2-net libsamplerate? ( media-libs/libsamplerate ) png? ( media-libs/libpng:= )
-SLOT=0
-SRC_URI=https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-3.0.1.tar.gz https://gist.githubusercontent.com/vilhelmgray/28d4713cb6387ad62ab76cfac1443355/raw/f7600d93ca45a5102969b8f89974a3c36a3563f5/chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8b0725a5853e3db368fbcc6b8d6fc557
diff --git a/metadata/md5-cache/games-fps/chocolate-doom-3.0.1-r1 b/metadata/md5-cache/games-fps/chocolate-doom-3.0.1-r1
new file mode 100644
index 000000000000..db0bb8c59444
--- /dev/null
+++ b/metadata/md5-cache/games-fps/chocolate-doom-3.0.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[midi?,vorbis?] media-libs/sdl2-net libsamplerate? ( media-libs/libsamplerate ) png? ( media-libs/libpng:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A Doom source port that is minimalist and historically accurate
+EAPI=7
+HOMEPAGE=https://www.chocolate-doom.org
+IUSE=doc libsamplerate +midi png vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2+
+RDEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[midi?,vorbis?] media-libs/sdl2-net libsamplerate? ( media-libs/libsamplerate ) png? ( media-libs/libpng:= )
+SLOT=0
+SRC_URI=https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-3.0.1.tar.gz https://gist.githubusercontent.com/vilhelmgray/28d4713cb6387ad62ab76cfac1443355/raw/f7600d93ca45a5102969b8f89974a3c36a3563f5/chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3997d3d3001807416e4a9c638921d066
diff --git a/metadata/md5-cache/games-fps/freedm-0.12.1 b/metadata/md5-cache/games-fps/freedm-0.12.1
index 68f7fe8af46e..9746df89a745 100644
--- a/metadata/md5-cache/games-fps/freedm-0.12.1
+++ b/metadata/md5-cache/games-fps/freedm-0.12.1
@@ -4,6 +4,6 @@ EAPI=7
 HOMEPAGE=https://freedoom.github.io
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=metapackage
-RDEPEND=~games-fps/freedm-data-0.12.1 || ( games-fps/gzdoom[nonfree(+)] games-engines/odamex games-fps/doomsday games-fps/prboom-plus )
+RDEPEND=~games-fps/freedm-data-0.12.1 || ( games-fps/gzdoom[nonfree(+)] games-engines/odamex games-fps/chocolate-doom games-fps/doomsday games-fps/prboom-plus )
 SLOT=0
-_md5_=680bdcffbe53e24244b7983c97e86fff
+_md5_=bb8c84006211f875037935873aca900b
diff --git a/metadata/md5-cache/games-fps/freedm-data-0.12.1 b/metadata/md5-cache/games-fps/freedm-data-0.12.1
deleted file mode 100644
index c46729487dac..000000000000
--- a/metadata/md5-cache/games-fps/freedm-data-0.12.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.10 dev-python/pillow[python_targets_python3_10(-),zlib] ) ( dev-lang/python:3.9 dev-python/pillow[python_targets_python3_9(-),zlib] ) ( dev-lang/python:3.8 dev-python/pillow[python_targets_python3_8(-),zlib] ) ) app-text/asciidoc games-util/deutex
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Game resources for FreeDM
-EAPI=7
-HOMEPAGE=https://freedoom.github.io
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/freedoom/freedoom/archive/v0.12.1.tar.gz -> freedoom-0.12.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=613450109d64c290af229a475014fa62
diff --git a/metadata/md5-cache/games-fps/freedm-data-0.12.1-r1 b/metadata/md5-cache/games-fps/freedm-data-0.12.1-r1
new file mode 100644
index 000000000000..bee6d8509c36
--- /dev/null
+++ b/metadata/md5-cache/games-fps/freedm-data-0.12.1-r1
@@ -0,0 +1,12 @@
+BDEPEND=|| ( ( dev-lang/python:3.10 dev-python/pillow[python_targets_python3_10(-),zlib] ) ( dev-lang/python:3.9 dev-python/pillow[python_targets_python3_9(-),zlib] ) ( dev-lang/python:3.8 dev-python/pillow[python_targets_python3_8(-),zlib] ) ) app-text/asciidoc games-util/deutex[png]
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Game resources for FreeDM
+EAPI=7
+HOMEPAGE=https://freedoom.github.io
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/freedoom/freedoom/archive/v0.12.1.tar.gz -> freedoom-0.12.1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ec8e25153fccff064ce1d815dc2c78dc
diff --git a/metadata/md5-cache/games-fps/freedoom-0.12.1 b/metadata/md5-cache/games-fps/freedoom-0.12.1
index 35f3ec352dd4..660476f2e31f 100644
--- a/metadata/md5-cache/games-fps/freedoom-0.12.1
+++ b/metadata/md5-cache/games-fps/freedoom-0.12.1
@@ -4,6 +4,6 @@ EAPI=7
 HOMEPAGE=https://freedoom.github.io
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=metapackage
-RDEPEND=~games-fps/freedoom-data-0.12.1 || ( games-fps/gzdoom[nonfree(+)] games-engines/odamex games-fps/doomsday games-fps/prboom-plus )
+RDEPEND=~games-fps/freedoom-data-0.12.1 || ( games-fps/gzdoom[nonfree(+)] games-engines/odamex games-fps/chocolate-doom games-fps/doomsday games-fps/prboom-plus )
 SLOT=0
-_md5_=3ef30a8f244f92b8700a31cfc46b0f7b
+_md5_=b17bd966168914b421c03174067cdacb
diff --git a/metadata/md5-cache/games-fps/freedoom-data-0.12.1 b/metadata/md5-cache/games-fps/freedoom-data-0.12.1
deleted file mode 100644
index 820a2fa44285..000000000000
--- a/metadata/md5-cache/games-fps/freedoom-data-0.12.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.10 dev-python/pillow[python_targets_python3_10(-),zlib] ) ( dev-lang/python:3.9 dev-python/pillow[python_targets_python3_9(-),zlib] ) ( dev-lang/python:3.8 dev-python/pillow[python_targets_python3_8(-),zlib] ) ) app-text/asciidoc games-util/deutex
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Game resources for Freedoom: Phase 1+2
-EAPI=7
-HOMEPAGE=https://freedoom.github.io
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/freedoom/freedoom/archive/v0.12.1.tar.gz -> freedoom-0.12.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=36513b31ed183ce3ed6a9456c8d59095
diff --git a/metadata/md5-cache/games-fps/freedoom-data-0.12.1-r1 b/metadata/md5-cache/games-fps/freedoom-data-0.12.1-r1
new file mode 100644
index 000000000000..8666bc68d9ae
--- /dev/null
+++ b/metadata/md5-cache/games-fps/freedoom-data-0.12.1-r1
@@ -0,0 +1,12 @@
+BDEPEND=|| ( ( dev-lang/python:3.10 dev-python/pillow[python_targets_python3_10(-),zlib] ) ( dev-lang/python:3.9 dev-python/pillow[python_targets_python3_9(-),zlib] ) ( dev-lang/python:3.8 dev-python/pillow[python_targets_python3_8(-),zlib] ) ) app-text/asciidoc games-util/deutex[png]
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Game resources for Freedoom: Phase 1+2
+EAPI=7
+HOMEPAGE=https://freedoom.github.io
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/freedoom/freedoom/archive/v0.12.1.tar.gz -> freedoom-0.12.1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=03397ca9c048b62daa0f49211466ddf3
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 3644947eb0be..6c94903f7775 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/lpairs-1.0.4-r1 b/metadata/md5-cache/games-puzzle/lpairs-1.0.4-r1
deleted file mode 100644
index e820394d13d3..000000000000
--- a/metadata/md5-cache/games-puzzle/lpairs-1.0.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsdl[sound?,video] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=A classical memory game
-EAPI=6
-HOMEPAGE=http://lgames.sourceforge.net/LPairs/
-IUSE=nls sound
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/libsdl[sound?,video] nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/lgames/lpairs-1.0.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=779780f0046420930872d322047081d6
diff --git a/metadata/md5-cache/games-puzzle/lpairs-1.0.5 b/metadata/md5-cache/games-puzzle/lpairs-1.0.5
new file mode 100644
index 000000000000..74ba3c4c835c
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/lpairs-1.0.5
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsdl[sound?,video] virtual/libintl
+DESCRIPTION=Classic memory game
+EAPI=8
+HOMEPAGE=http://lgames.sourceforge.net/LPairs/
+IUSE=+sound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[sound?,video] virtual/libintl
+SLOT=0
+SRC_URI=mirror://sourceforge/lgames/lpairs-1.0.5.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=55c6011296f4e8f7b22309de7bf99f8c
diff --git a/metadata/md5-cache/games-puzzle/tanglet-1.5.3 b/metadata/md5-cache/games-puzzle/tanglet-1.5.3
deleted file mode 100644
index bde7a3e911ca..000000000000
--- a/metadata/md5-cache/games-puzzle/tanglet-1.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Single player word finding game based on Boggle
-EAPI=7
-HOMEPAGE=https://gottcode.org/tanglet/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib
-SLOT=0
-SRC_URI=https://gottcode.org/tanglet/tanglet-1.5.3-src.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f433cfba4142da8626d37bf7c1a63861
diff --git a/metadata/md5-cache/games-puzzle/tanglet-1.6.1.1 b/metadata/md5-cache/games-puzzle/tanglet-1.6.1.1
new file mode 100644
index 000000000000..41dfc7f98e2e
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/tanglet-1.6.1.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Single player word finding game based on Boggle
+EAPI=7
+HOMEPAGE=https://gottcode.org/tanglet/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib
+SLOT=0
+SRC_URI=https://gottcode.org/tanglet/tanglet-1.6.1.1-src.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=78d97d25ffec28507642cf41cae8567e
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 939fd32c2398..692358095ae4 100644
--- a/metadata/md5-cache/games-roguelike/Manifest.gz
+++ b/metadata/md5-cache/games-roguelike/Manifest.gz
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.26.0 b/metadata/md5-cache/games-roguelike/stone-soup-0.26.0
deleted file mode 100644
index 4f9e2fd1810d..000000000000
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) app-arch/unzip dev-lang/perl || ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.9 dev-python/pyyaml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pyyaml[python_targets_python3_8(-)] ) ) sys-devel/flex tiles? ( sys-libs/ncurses:0 ) virtual/pkgconfig virtual/yacc
-DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
-EAPI=7
-HOMEPAGE=https://crawl.develz.org
-IUSE=debug ncurses sound test +tiles lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
-RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl )
-RESTRICT=test
-SLOT=0.26
-SRC_URI=https://github.com/crawl/crawl/releases/download/0.26.0/stone_soup-0.26.0.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.26.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.26.svg
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3a31515cd43418550d7c25f16cb516ef
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.27.0 b/metadata/md5-cache/games-roguelike/stone-soup-0.27.0
new file mode 100644
index 000000000000..bb609d0b9a53
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.27.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) app-arch/unzip dev-lang/perl || ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.9 dev-python/pyyaml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pyyaml[python_targets_python3_8(-)] ) ) sys-devel/flex tiles? ( sys-libs/ncurses:0 ) virtual/pkgconfig virtual/yacc
+DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
+EAPI=7
+HOMEPAGE=https://crawl.develz.org
+IUSE=debug ncurses sound test +tiles lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl )
+RESTRICT=test
+SLOT=0.27
+SRC_URI=https://github.com/crawl/crawl/releases/download/0.27.0/stone_soup-0.27.0.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.27.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.27.svg
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6606b0ec5a1081232ec1fc6516cd82ca
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 6d39cc6a8dca..b1af75253c65 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/freeciv-2.6.4 b/metadata/md5-cache/games-strategy/freeciv-2.6.4
index e6cdd87c35ec..50552e14371a 100644
--- a/metadata/md5-cache/games-strategy/freeciv-2.6.4
+++ b/metadata/md5-cache/games-strategy/freeciv-2.6.4
@@ -12,4 +12,4 @@ REQUIRED_USE=system-lua? ( ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/freeciv/freeciv-2.6.4.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9c2b3ff4c98aee155c2aae76fc800f85
+_md5_=dadc51d9f533f3360218f66620344202
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index b96fd2b30c17..331ec5d44405 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/deutex-5.2.2 b/metadata/md5-cache/games-util/deutex-5.2.2
index d433f79d6a1b..31053ebe8a46 100644
--- a/metadata/md5-cache/games-util/deutex-5.2.2
+++ b/metadata/md5-cache/games-util/deutex-5.2.2
@@ -4,11 +4,11 @@ DEPEND=png? ( media-libs/libpng:0= )
 DESCRIPTION=WAD composer for Doom, Heretic, Hexen, and Strife
 EAPI=7
 HOMEPAGE=https://github.com/Doom-Utils/deutex
-IUSE=man png
+IUSE=man +png
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+ LGPL-2+ HPND
 RDEPEND=png? ( media-libs/libpng:0= )
 SLOT=0
 SRC_URI=https://github.com/Doom-Utils/deutex/releases/download/v5.2.2/deutex-5.2.2.tar.zst
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=a4c2599374827ce4fc7abcc650e32b8b
+_md5_=2796453f6947f8c135fe961e9deb83fe
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 79be3c6b40c8..846430504c3e 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.48.1 b/metadata/md5-cache/gnome-base/gvfs-1.48.1
deleted file mode 100644
index ef8a39a8b464..000000000000
--- a/metadata/md5-cache/gnome-base/gvfs-1.48.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig dev-util/gdbus-codegen test? ( dev-libs/libgdata ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.65.1:2 >=gnome-base/gsettings-desktop-schemas-3.33.0 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-2.58.0:2.4 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) udev? ( >=dev-libs/libgudev-147:= ) fuse? ( >=sys-fs/fuse-3.0.0:3 ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( virtual/libusb:1 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8 ) net-misc/openssh dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Virtual filesystem implementation for GIO
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
-IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.65.1:2 >=gnome-base/gsettings-desktop-schemas-3.33.0 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-2.58.0:2.4 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) udev? ( >=dev-libs/libgudev-147:= ) fuse? ( >=sys-fs/fuse-3.0.0:3 ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( virtual/libusb:1 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8 ) net-misc/openssh
-REQUIRED_USE=?? ( elogind systemd ) cdda? ( udev ) google? ( gnome-online-accounts ) gphoto2? ( udev ) mtp? ( udev ) udisks? ( udev )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gvfs/1.48/gvfs-1.48.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4a812fed88eb1d4d22f7fa0103823645
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.48.1-r1 b/metadata/md5-cache/gnome-base/gvfs-1.48.1-r1
new file mode 100644
index 000000000000..80b550e8ed77
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gvfs-1.48.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig dev-util/gdbus-codegen test? ( dev-libs/libgdata ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.65.1:2 >=gnome-base/gsettings-desktop-schemas-3.33.0 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-2.58.0:2.4 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) udev? ( >=dev-libs/libgudev-147:= ) fuse? ( >=sys-fs/fuse-3.0.0:3 virtual/tmpfiles ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( virtual/libusb:1 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8 ) net-misc/openssh dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Virtual filesystem implementation for GIO
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
+IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.65.1:2 >=gnome-base/gsettings-desktop-schemas-3.33.0 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-2.58.0:2.4 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) udev? ( >=dev-libs/libgudev-147:= ) fuse? ( >=sys-fs/fuse-3.0.0:3 virtual/tmpfiles ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( virtual/libusb:1 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8 ) net-misc/openssh
+REQUIRED_USE=?? ( elogind systemd ) cdda? ( udev ) google? ( gnome-online-accounts ) gphoto2? ( udev ) mtp? ( udev ) udisks? ( udev )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gvfs/1.48/gvfs-1.48.1.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e3b1b6d956a0f175076c74cf4c6e7015
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 770dc0868d8c..eb37c67efadc 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-5.0.4 b/metadata/md5-cache/gnome-extra/cinnamon-5.0.4
deleted file mode 100644
index 6af9798b422e..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-5.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0 >=gnome-extra/cjs-5.0[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.0[introspection] gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon
-IUSE=+gstreamer gtk-doc +nls +networkmanager python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0 >=gnome-extra/cjs-5.0[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.0[introspection] gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) >=app-accessibility/caribou-0.3 dev-libs/keybinder:3[introspection] dev-libs/libtimezonemap python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pexpect[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] dev-python/pypam[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/tinycss2[python_targets_python3_8(-)] >=dev-python/xapp-2.2.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/pexpect[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] dev-python/pypam[python_targets_python3_9(-)] dev-python/pytz[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/tinycss2[python_targets_python3_9(-)] >=dev-python/xapp-2.2.0[python_targets_python3_9(-)] ) >=gnome-base/dconf-0.4.1 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-base/libgnomekbd-2.91.4 >=gnome-extra/cinnamon-control-center-5.0[networkmanager=] >=gnome-extra/cinnamon-screensaver-5.0 >=gnome-extra/cinnamon-session-5.0 >=gnome-extra/cinnamon-settings-daemon-5.0 >=gnome-extra/nemo-5.0 gnome-extra/polkit-gnome net-misc/wget sys-apps/accountsservice[introspection] sys-power/upower[introspection] >=x11-libs/xapps-2.2.0[introspection] x11-misc/xdg-utils x11-themes/adwaita-icon-theme x11-themes/gnome-themes-standard nls? ( >=gnome-extra/cinnamon-translations-5.0 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon/archive/5.0.4.tar.gz -> cinnamon-5.0.4.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=63b6cf8f1ad40d5623848524be8355b2
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-5.0.5 b/metadata/md5-cache/gnome-extra/cinnamon-5.0.5
new file mode 100644
index 000000000000..7dd0b6408092
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-5.0.5
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0 >=gnome-extra/cjs-5.0[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.0[introspection] gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon
+IUSE=+gstreamer gtk-doc +nls +networkmanager python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0 >=gnome-extra/cjs-5.0[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.0[introspection] gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) >=app-accessibility/caribou-0.3 dev-libs/keybinder:3[introspection] dev-libs/libtimezonemap python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pexpect[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] dev-python/pypam[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/tinycss2[python_targets_python3_8(-)] >=dev-python/xapp-2.2.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/pexpect[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] dev-python/pypam[python_targets_python3_9(-)] dev-python/pytz[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/tinycss2[python_targets_python3_9(-)] >=dev-python/xapp-2.2.0[python_targets_python3_9(-)] ) >=gnome-base/dconf-0.4.1 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-base/libgnomekbd-2.91.4 >=gnome-extra/cinnamon-control-center-5.0[networkmanager=] >=gnome-extra/cinnamon-screensaver-5.0 >=gnome-extra/cinnamon-session-5.0 >=gnome-extra/cinnamon-settings-daemon-5.0 >=gnome-extra/nemo-5.0 gnome-extra/polkit-gnome net-misc/wget sys-apps/accountsservice[introspection] sys-power/upower[introspection] >=x11-libs/xapps-2.2.0[introspection] x11-misc/xdg-utils x11-themes/adwaita-icon-theme x11-themes/gnome-themes-standard nls? ( >=gnome-extra/cinnamon-translations-5.0 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon/archive/5.0.5.tar.gz -> cinnamon-5.0.5.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=63b6cf8f1ad40d5623848524be8355b2
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-5.0.0 b/metadata/md5-cache/gnome-extra/cinnamon-session-5.0.0
deleted file mode 100644
index 6a33df7e6c52..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-session-5.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/gdbus-codegen >=dev-util/intltool-0.40.6 virtual/pkgconfig doc? ( app-text/xmlto dev-libs/libxslt ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/glib-2.37.3:2 media-libs/libcanberra[pulseaudio] virtual/opengl x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] >=x11-libs/xapps-2.2.0 systemd? ( >=sys-apps/systemd-183 ) !systemd? ( sys-auth/elogind[policykit] )
-DESCRIPTION=Cinnamon session manager
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-session
-IUSE=doc ipv6 systemd
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.37.3:2 media-libs/libcanberra[pulseaudio] virtual/opengl x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] >=x11-libs/xapps-2.2.0 systemd? ( >=sys-apps/systemd-183 ) !systemd? ( sys-auth/elogind[policykit] ) >=gnome-extra/cinnamon-desktop-5.0:0=
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/5.0.0.tar.gz -> cinnamon-session-5.0.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fc68e71276fe08ad653d813e87ded8f0
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-5.0.1 b/metadata/md5-cache/gnome-extra/cinnamon-session-5.0.1
new file mode 100644
index 000000000000..e96f3ed886c8
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-session-5.0.1
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/gdbus-codegen >=dev-util/intltool-0.40.6 virtual/pkgconfig doc? ( app-text/xmlto dev-libs/libxslt ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/glib-2.37.3:2 media-libs/libcanberra[pulseaudio] virtual/opengl x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] >=x11-libs/xapps-2.2.0 systemd? ( >=sys-apps/systemd-183 ) !systemd? ( sys-auth/elogind[policykit] )
+DESCRIPTION=Cinnamon session manager
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-session
+IUSE=doc ipv6 systemd
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.37.3:2 media-libs/libcanberra[pulseaudio] virtual/opengl x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] >=x11-libs/xapps-2.2.0 systemd? ( >=sys-apps/systemd-183 ) !systemd? ( sys-auth/elogind[policykit] ) >=gnome-extra/cinnamon-desktop-5.0:0=
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/5.0.1.tar.gz -> cinnamon-session-5.0.1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fc68e71276fe08ad653d813e87ded8f0
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.3 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.3
deleted file mode 100644
index be993bd0ccf8..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/glib-utils dev-util/gdbus-codegen >=dev-util/intltool-0.37.1 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgudev:= >=gnome-base/libgnomekbd-3.6 >=gnome-extra/cinnamon-desktop-5.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3,pulseaudio] >=media-sound/pulseaudio-0.9.16[glib] >=sys-apps/dbus-1.1.2 dev-libs/dbus-glib >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi >=x11-libs/libxklavier-5.0 >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-base/librsvg-2.36.2 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= ) dev-libs/libxml2:2 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Cinnamon's settings daemon
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon
-IUSE=+colord cups input_devices_wacom smartcard systemd
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgudev:= >=gnome-base/libgnomekbd-3.6 >=gnome-extra/cinnamon-desktop-5.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3,pulseaudio] >=media-sound/pulseaudio-0.9.16[glib] >=sys-apps/dbus-1.1.2 dev-libs/dbus-glib >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi >=x11-libs/libxklavier-5.0 >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-base/librsvg-2.36.2 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/5.0.3.tar.gz -> cinnamon-settings-daemon-5.0.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f8ff3aa67870fe853d0d87fba31ee205
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.4 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.4
new file mode 100644
index 000000000000..cdc4d9dd1479
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.4
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/glib-utils dev-util/gdbus-codegen >=dev-util/intltool-0.37.1 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgudev:= >=gnome-base/libgnomekbd-3.6 >=gnome-extra/cinnamon-desktop-5.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3,pulseaudio] >=media-sound/pulseaudio-0.9.16[glib] >=sys-apps/dbus-1.1.2 dev-libs/dbus-glib >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi >=x11-libs/libxklavier-5.0 >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-base/librsvg-2.36.2 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= ) dev-libs/libxml2:2 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cinnamon's settings daemon
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon
+IUSE=+colord cups input_devices_wacom smartcard systemd
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgudev:= >=gnome-base/libgnomekbd-3.6 >=gnome-extra/cinnamon-desktop-5.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3,pulseaudio] >=media-sound/pulseaudio-0.9.16[glib] >=sys-apps/dbus-1.1.2 dev-libs/dbus-glib >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi >=x11-libs/libxklavier-5.0 >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-base/librsvg-2.36.2 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/5.0.4.tar.gz -> cinnamon-settings-daemon-5.0.4.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f8ff3aa67870fe853d0d87fba31ee205
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-40.3 b/metadata/md5-cache/gnome-extra/gnome-boxes-40.3
new file mode 100644
index 000000000000..5ac184d1504b
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-40.3
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) net-libs/gtk-vnc[vala] sys-libs/libosinfo[vala] app-crypt/libsecret[vala] net-libs/libsoup:2.4[vala] app-emulation/libvirt-glib[vala] net-misc/spice-gtk[vala] x11-libs/vte:2.91[vala] dev-libs/appstream-glib rdp? ( x11-libs/gtk+:3[introspection] ) dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] x11-libs/gtksourceview:4 >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=gui-libs/libhandy-1.0.0:1= >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple GNOME application to access remote or virtual systems
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
+IUSE=rdp kernel_linux
+KEYWORDS=~amd64
+LICENSE=LGPL-2+ CC-BY-2.0
+RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] x11-libs/gtksourceview:4 >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=gui-libs/libhandy-1.0.0:1= >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) app-cdr/cdrtools app-misc/tracker-miners:3[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools sys-auth/polkit
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-boxes/40/gnome-boxes-40.3.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0a56ec9f9b1bdaa47bf702c29add9dfc
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603
index ad557e6db10b..287a8bbd5881 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603
@@ -9,4 +9,4 @@ RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40.1
 SLOT=0
 SRC_URI=https://github.com/pop-os/shell/archive/f7cbe060e8d293bfe3b0b759032a85773b542645.tar.gz -> gnome-shell-extension-pop-shell-1.2.0_p20210603.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fa47218855234cb114913a0ee4c3e866
+_md5_=0e0e0929d28647bde0668bfa1181af37
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210727 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210727
new file mode 100644
index 000000000000..11900a11fbf1
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210727
@@ -0,0 +1,12 @@
+BDEPEND=dev-lang/typescript
+DEFINED_PHASES=install postinst
+DESCRIPTION=Keyboard-driven layer for GNOME Shell with tiling support
+EAPI=7
+HOMEPAGE=https://github.com/pop-os/shell
+KEYWORDS=~amd64 ~ppc64
+LICENSE=GPL-3
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40.1 sys-apps/fd
+SLOT=0
+SRC_URI=https://github.com/pop-os/shell/archive/475b49dc02386e26fbe6b91a559c77515d96caaf.tar.gz -> gnome-shell-extension-pop-shell-1.2.0_p20210727.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4240fedb8f4dc07f19e12985c69c0729
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index d6cb038ec315..4dbde8103d77 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/swayidle-1.6 b/metadata/md5-cache/gui-apps/swayidle-1.6
index 1e0f751a63e0..c79a94a8d8f2 100644
--- a/metadata/md5-cache/gui-apps/swayidle-1.6
+++ b/metadata/md5-cache/gui-apps/swayidle-1.6
@@ -4,7 +4,7 @@ DEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd?
 DESCRIPTION=Idle management daemon for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swayidle
-IUSE=elogind fish-completion +man systemd zsh-completion
+IUSE=elogind +man systemd
 KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd? ( >=sys-apps/systemd-237[policykit] )
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/swayidle/archive/1.6.tar.gz -> swayidle-1.6.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f1e7afa4ac0963d5245f7e9bd3692a24
+_md5_=cd8191bab3eb578b2f2792d09bac6b77
diff --git a/metadata/md5-cache/gui-apps/swayidle-9999 b/metadata/md5-cache/gui-apps/swayidle-9999
index 433a2696f0c8..889b73514c36 100644
--- a/metadata/md5-cache/gui-apps/swayidle-9999
+++ b/metadata/md5-cache/gui-apps/swayidle-9999
@@ -4,11 +4,11 @@ DEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd?
 DESCRIPTION=Idle management daemon for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swayidle
-IUSE=elogind fish-completion +man systemd zsh-completion
+IUSE=elogind +man systemd
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd? ( >=sys-apps/systemd-237[policykit] )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fdc5e92bb5ee020cab30fb6deed4c25d
+_md5_=694eabe2de1c9aecf67df84b29ab06c4
diff --git a/metadata/md5-cache/gui-apps/swaylock-1.3 b/metadata/md5-cache/gui-apps/swaylock-1.3
deleted file mode 100644
index 1dd697193439..000000000000
--- a/metadata/md5-cache/gui-apps/swaylock-1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-libs/wayland-protocols-1.14 virtual/pkgconfig man? ( app-text/scdoc ) filecaps? ( sys-libs/libcap ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam )
-DESCRIPTION=Screen locker for Wayland
-EAPI=7
-HOMEPAGE=https://github.com/swaywm/swaylock
-IUSE=fish-completion +gdk-pixbuf +man +pam zsh-completion +filecaps
-KEYWORDS=amd64 arm64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam ) !<=gui-libs/sway-1.0_beta2[swaylock] filecaps? ( sys-libs/libcap )
-SLOT=0
-SRC_URI=https://github.com/swaywm/swaylock/archive/1.3.tar.gz -> swaylock-1.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8196096243bbd814af7f9659c002e2ea
diff --git a/metadata/md5-cache/gui-apps/swaylock-1.3-r1 b/metadata/md5-cache/gui-apps/swaylock-1.3-r1
new file mode 100644
index 000000000000..c7dc390d2f74
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/swaylock-1.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-libs/wayland-protocols-1.14 virtual/pkgconfig man? ( app-text/scdoc ) filecaps? ( sys-libs/libcap ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam )
+DESCRIPTION=Screen locker for Wayland
+EAPI=7
+HOMEPAGE=https://github.com/swaywm/swaylock
+IUSE=+gdk-pixbuf +man +pam +filecaps
+KEYWORDS=amd64 arm64 x86
+LICENSE=MIT
+RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam ) !<=gui-libs/sway-1.0_beta2[swaylock] filecaps? ( sys-libs/libcap )
+SLOT=0
+SRC_URI=https://github.com/swaywm/swaylock/archive/1.3.tar.gz -> swaylock-1.3.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e5e089c692966591cada851c4cd0f22c
diff --git a/metadata/md5-cache/gui-apps/swaylock-1.5 b/metadata/md5-cache/gui-apps/swaylock-1.5
deleted file mode 100644
index 3f92d1e6b384..000000000000
--- a/metadata/md5-cache/gui-apps/swaylock-1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-libs/wayland-protocols-1.14 virtual/pkgconfig man? ( app-text/scdoc ) filecaps? ( sys-libs/libcap ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam )
-DESCRIPTION=Screen locker for Wayland
-EAPI=7
-HOMEPAGE=https://github.com/swaywm/swaylock
-IUSE=fish-completion +gdk-pixbuf +man +pam zsh-completion +filecaps
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam ) filecaps? ( sys-libs/libcap )
-SLOT=0
-SRC_URI=https://github.com/swaywm/swaylock/archive/1.5.tar.gz -> swaylock-1.5.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5c5e855f8e8e30defb976fc035855625
diff --git a/metadata/md5-cache/gui-apps/swaylock-1.5-r1 b/metadata/md5-cache/gui-apps/swaylock-1.5-r1
new file mode 100644
index 000000000000..4999f2ea3f7f
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/swaylock-1.5-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-libs/wayland-protocols-1.14 virtual/pkgconfig man? ( app-text/scdoc ) filecaps? ( sys-libs/libcap ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam )
+DESCRIPTION=Screen locker for Wayland
+EAPI=7
+HOMEPAGE=https://github.com/swaywm/swaylock
+IUSE=+gdk-pixbuf +man +pam +filecaps
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
+LICENSE=MIT
+RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam ) filecaps? ( sys-libs/libcap )
+SLOT=0
+SRC_URI=https://github.com/swaywm/swaylock/archive/1.5.tar.gz -> swaylock-1.5.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=751c8c89477c068a3fc19ac01df6e062
diff --git a/metadata/md5-cache/gui-apps/swaylock-9999 b/metadata/md5-cache/gui-apps/swaylock-9999
index 336e1ad7ab40..f0bdff3c28d4 100644
--- a/metadata/md5-cache/gui-apps/swaylock-9999
+++ b/metadata/md5-cache/gui-apps/swaylock-9999
@@ -4,10 +4,10 @@ DEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-l
 DESCRIPTION=Screen locker for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swaylock
-IUSE=fish-completion +gdk-pixbuf +man +pam zsh-completion +filecaps
+IUSE=+gdk-pixbuf +man +pam +filecaps
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam ) filecaps? ( sys-libs/libcap )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ceb549221daafcc71d45ff0cfa19ad7f
+_md5_=172b75e66c9eee9a6353691b2fa0ec04
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index d33f848fe6c4..9e366298f102 100644
--- a/metadata/md5-cache/gui-wm/Manifest.gz
+++ b/metadata/md5-cache/gui-wm/Manifest.gz
diff --git a/metadata/md5-cache/gui-wm/sway-1.6 b/metadata/md5-cache/gui-wm/sway-1.6
deleted file mode 100644
index 88cf6a7f88e8..000000000000
--- a/metadata/md5-cache/gui-wm/sway-1.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.53.0 virtual/pkgconfig man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239[policykit] ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.13:=[elogind=,seatd=,systemd=,X=] <gui-libs/wlroots-0.14:=[elogind=,seatd=,systemd=,X=]
-DESCRIPTION=i3-compatible Wayland window manager
-EAPI=7
-HOMEPAGE=https://swaywm.org
-IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=MIT
-RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239[policykit] ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.13:=[elogind=,seatd=,systemd=,X=] <gui-libs/wlroots-0.14:=[elogind=,seatd=,systemd=,X=]
-REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind seatd systemd ) )
-SLOT=0
-SRC_URI=https://github.com/swaywm/sway/archive/1.6.tar.gz -> sway-1.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a11227fae8953732fc0f293be58b009a
diff --git a/metadata/md5-cache/gui-wm/sway-1.6-r1 b/metadata/md5-cache/gui-wm/sway-1.6-r1
new file mode 100644
index 000000000000..a9f543cbfce9
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/sway-1.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.53.0 virtual/pkgconfig man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239[policykit] ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.13:=[elogind=,seatd=,systemd=,X=] <gui-libs/wlroots-0.14:=[elogind=,seatd=,systemd=,X=]
+DESCRIPTION=i3-compatible Wayland window manager
+EAPI=7
+HOMEPAGE=https://swaywm.org
+IUSE=elogind +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X
+KEYWORDS=amd64 arm64 ~ppc64 x86
+LICENSE=MIT
+RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239[policykit] ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.13:=[elogind=,seatd=,systemd=,X=] <gui-libs/wlroots-0.14:=[elogind=,seatd=,systemd=,X=]
+REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind seatd systemd ) )
+SLOT=0
+SRC_URI=https://github.com/swaywm/sway/archive/1.6.tar.gz -> sway-1.6.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=07dedc3909fc180fe49311a6413e192b
diff --git a/metadata/md5-cache/gui-wm/sway-1.6.1 b/metadata/md5-cache/gui-wm/sway-1.6.1
deleted file mode 100644
index ddb3edba9882..000000000000
--- a/metadata/md5-cache/gui-wm/sway-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.53.0 virtual/pkgconfig man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.14:=[X=] <gui-libs/wlroots-0.15:=[X=]
-DESCRIPTION=i3-compatible Wayland window manager
-EAPI=7
-HOMEPAGE=https://swaywm.org
-IUSE=fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X zsh-completion
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.14:=[X=] <gui-libs/wlroots-0.15:=[X=]
-SLOT=0
-SRC_URI=https://github.com/swaywm/sway/archive/1.6.1.tar.gz -> sway-1.6.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f735935e521d19c471421a6e51b6dda4
diff --git a/metadata/md5-cache/gui-wm/sway-1.6.1-r1 b/metadata/md5-cache/gui-wm/sway-1.6.1-r1
new file mode 100644
index 000000000000..1ca629de0673
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/sway-1.6.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.53.0 virtual/pkgconfig man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.14:=[X=] <gui-libs/wlroots-0.15:=[X=]
+DESCRIPTION=i3-compatible Wayland window manager
+EAPI=7
+HOMEPAGE=https://swaywm.org
+IUSE=+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
+LICENSE=MIT
+RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.14:=[X=] <gui-libs/wlroots-0.15:=[X=]
+SLOT=0
+SRC_URI=https://github.com/swaywm/sway/archive/1.6.1.tar.gz -> sway-1.6.1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0b63b8226e57d657bd50850507807727
diff --git a/metadata/md5-cache/gui-wm/sway-9999 b/metadata/md5-cache/gui-wm/sway-9999
index 2f93030a381b..c6dcb6fe1f48 100644
--- a/metadata/md5-cache/gui-wm/sway-9999
+++ b/metadata/md5-cache/gui-wm/sway-9999
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= d
 DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
 HOMEPAGE=https://swaywm.org
-IUSE=fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X zsh-completion
+IUSE=+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[X=]
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=486f657cc9d267b68046976395c2590a
+_md5_=2481149f56011714e13fac935ed1927f
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 901825167c2b..fec77ad15ae8 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/kdenlive-21.04.3 b/metadata/md5-cache/kde-apps/kdenlive-21.04.3
deleted file mode 100644
index cdeb830c60a9..000000000000
--- a/metadata/md5-cache/kde-apps/kdenlive-21.04.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtnetworkauth-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/mlt-6.26.0[ffmpeg,frei0r,qt5,sdl,xml] semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.80.0:5 ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) v4l? ( media-libs/libv4l ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Non-linear video editing suite by KDE
-EAPI=7
-HOMEPAGE=https://kdenlive.org/en/
-IUSE=gles2-only semantic-desktop share v4l test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtnetworkauth-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/mlt-6.26.0[ffmpeg,frei0r,qt5,sdl,xml] semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.80.0:5 ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtquickcontrols-5.15.2:5 media-video/ffmpeg[encode,sdl,X] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdenlive-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0234e6f327c201c110405dc3db02dc1e
diff --git a/metadata/md5-cache/kde-apps/kdenlive-21.04.3-r1 b/metadata/md5-cache/kde-apps/kdenlive-21.04.3-r1
new file mode 100644
index 000000000000..e91d316a38f1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenlive-21.04.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtnetworkauth-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/mlt-6.26.0[ffmpeg,frei0r,qt5,sdl,xml] <media-libs/mlt-7 semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.80.0:5 ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) v4l? ( media-libs/libv4l ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Non-linear video editing suite by KDE
+EAPI=7
+HOMEPAGE=https://kdenlive.org/en/
+IUSE=gles2-only semantic-desktop share v4l test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtnetworkauth-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/mlt-6.26.0[ffmpeg,frei0r,qt5,sdl,xml] <media-libs/mlt-7 semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.80.0:5 ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtquickcontrols-5.15.2:5 media-video/ffmpeg[encode,sdl,X] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdenlive-21.04.3.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4b7f34bb06128f3cc2e701a22c8d04d0
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index f5976502d0bf..bf861da3d13d 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.84.0 b/metadata/md5-cache/kde-frameworks/solid-5.84.0
deleted file mode 100644
index 515026163809..000000000000
--- a/metadata/md5-cache/kde-frameworks/solid-5.84.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.84:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-apps/util-linux sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=ios nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-apps/util-linux sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.84
-SRC_URI=mirror://kde/stable/frameworks/5.84/solid-5.84.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=994d31cd9879131c9857f9dcf9e12077
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.84.0-r1 b/metadata/md5-cache/kde-frameworks/solid-5.84.0-r1
new file mode 100644
index 000000000000..acac7d6d5bbf
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/solid-5.84.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.84:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-apps/util-linux sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=ios nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-apps/util-linux sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.84
+SRC_URI=mirror://kde/stable/frameworks/5.84/solid-5.84.0.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9b81e8de963f81e716fcbfad7e84d73c
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 38c2ad7575dc..b48b8162b314 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.14 b/metadata/md5-cache/kde-misc/rsibreak-0.12.14
index 35e3a0e47627..851336284d16 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12.14
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.14
@@ -5,11 +5,11 @@ DESCRIPTION=Small utility which bothers you at certain intervals
 EAPI=7
 HOMEPAGE=https://apps.kde.org/rsibreak/ https://userbase.kde.org/RSIBreak
 IUSE=test debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/frameworkintegration-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.14.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f94854d06fd29ab75b9416d1d31fff21
+_md5_=17880f6afa0a686beb2886482384483f
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 014b0c45b13c..fe8eacce6d00 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.22.3 b/metadata/md5-cache/kde-plasma/bluedevil-5.22.3
deleted file mode 100644
index 4686dd7346bc..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Bluetooth stack for KDE Plasma
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/bluedevil
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-plasma/kde-cli-tools-5.22.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/bluedevil-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1ea98fa9eaaa1cdd3e79cf337c9f40da
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.22.3 b/metadata/md5-cache/kde-plasma/breeze-5.22.3
deleted file mode 100644
index 34991c7c4655..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-plasma/kdecoration-5.22.3:5 X? ( x11-libs/libxcb ) >=kde-frameworks/kpackage-5.82.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Breeze visual style for the Plasma desktop
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/breeze
-IUSE=X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.82.0:5 >=kde-plasma/kde-cli-tools-5.22.3:5
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-plasma/kdecoration-5.22.3:5 X? ( x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/breeze-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1c3d8834d04547937e58e5d924c0e92a
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.22.3 b/metadata/md5-cache/kde-plasma/breeze-grub-5.22.3
deleted file mode 100644
index 703d986c1c17..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.22.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch prepare unpack
-DESCRIPTION=Breeze theme for GRUB
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3+
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/breeze-grub-5.22.3.tar.xz
-_eclasses_=kde.org	6e4d9db9698dba71a2c9085b861e29b5
-_md5_=0e3a4688990878e76dae032eb33e94ef
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.22.3 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.22.3
deleted file mode 100644
index 0bd681c6dc93..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/sassc || ( ( dev-lang/python:3.10 dev-python/pycairo[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pycairo[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pycairo[python_targets_python3_8(-)] ) ) >=dev-util/cmake-3.16 >=kde-plasma/breeze-5.22.3:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/breeze-gtk-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b6de31623797d0f3be3ba4a897510b78
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.22.3 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.22.3
deleted file mode 100644
index a5156bec7ce6..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.22.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.82.0:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=sys-boot/plymouth
-DESCRIPTION=Breeze theme for Plymouth
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=sys-boot/plymouth
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/breeze-plymouth-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9c80fc745d870e20f647de218ea13eb7
diff --git a/metadata/md5-cache/kde-plasma/discover-5.22.3 b/metadata/md5-cache/kde-plasma/discover-5.22.3
deleted file mode 100644
index a61b92ee3934..000000000000
--- a/metadata/md5-cache/kde-plasma/discover-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.12.8:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma resources management GUI
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/Discover
-IUSE=+firmware flatpak telemetry test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.12.8:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/discover-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f0b60e01f30c014eb5d962c50413847a
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.22.3 b/metadata/md5-cache/kde-plasma/drkonqi-5.22.3
deleted file mode 100644
index 98cab44a6681..000000000000
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/syntax-highlighting-5.82.0:5 >=dev-qt/qtconcurrent-5.15.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/syntax-highlighting-5.82.0:5 || ( sys-devel/gdb dev-util/lldb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/drkonqi-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2f03bdce232887328334168008c47542
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.22.3 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.22.3
deleted file mode 100644
index 24e3359250ad..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kactivitymanagerd-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=86fc57e8f9e46658b740916106104da6
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.22.3 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.22.3
deleted file mode 100644
index 49ff39162b37..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.22.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-plasma/libkworkspace-5.22.3:5 kdesu? ( >=kde-frameworks/kdesu-5.82.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
-IUSE=kdesu X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-plasma/libkworkspace-5.22.3:5 kdesu? ( >=kde-frameworks/kdesu-5.82.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=kdesu? ( X )
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kde-cli-tools-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=019b4d9d1ed28434a4e8234b2fb5f08b
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.22.3 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.22.3
deleted file mode 100644
index 099910660d48..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/sassc dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-plasma/kdecoration-5.22.3:5 x11-libs/gtk+:2 x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=GTK2 and GTK3 configurator for KDE Plasma
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
-IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-plasma/kdecoration-5.22.3:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.22.3:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kde-gtk-config-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a985172981d2ad438847109cfecc5436
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.22.3 b/metadata/md5-cache/kde-plasma/kdecoration-5.22.3
deleted file mode 100644
index 8585954cb368..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/ki18n-5.82.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugin based library to create window decorations
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/ki18n-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kdecoration-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ff592ec0759a346073db78c2d1b30251
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.22.3 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.22.3
deleted file mode 100644
index 404014f198fe..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kholidays-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kunitconversion-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/sonnet-5.82.0:5 comic? ( >=kde-frameworks/kross-5.82.0:5 ) share? ( >=kde-frameworks/purpose-5.82.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Extra Plasma applets and engines
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=comic share webengine test debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kholidays-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kunitconversion-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/sonnet-5.82.0:5 comic? ( >=kde-frameworks/kross-5.82.0:5 ) share? ( >=kde-frameworks/purpose-5.82.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-plasma/plasma-workspace-5.22.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kdeplasma-addons-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=42df799bf202a063f32643a3b3f69c43
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.22.3 b/metadata/md5-cache/kde-plasma/kgamma-5.22.3
deleted file mode 100644
index bbb943a56d5f..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Screen gamma values kcontrol module
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kgamma5-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f16cd807995c6b0fd6e785bafd689de4
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.22.3 b/metadata/md5-cache/kde-plasma/khotkeys-5.22.3
deleted file mode 100644
index a7dc212840d8..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdelibs4support-5.82.0:5[X] >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-plasma/libkworkspace-5.22.3:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma workspace hotkey module
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdelibs4support-5.82.0:5[X] >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-plasma/libkworkspace-5.22.3:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.82.0:5 >=kde-plasma/kde-cli-tools-5.22.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/khotkeys-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d99796f08edb4230cb0f7c8089c7bc26
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.22.3 b/metadata/md5-cache/kde-plasma/kinfocenter-5.22.3
deleted file mode 100644
index 78f5ed35cbf3..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.14.3 dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) usb? ( virtual/libusb:1 ) wayland? ( >=kde-frameworks/kwayland-5.82.0:5 media-libs/mesa[egl] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Utility providing information about the computer hardware
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/KInfoCenter
-IUSE=gles2-only ieee1394 +opengl +pci usb wayland debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) usb? ( virtual/libusb:1 ) wayland? ( >=kde-frameworks/kwayland-5.82.0:5 media-libs/mesa[egl] ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-plasma/kde-cli-tools-5.22.3:5 >=kde-plasma/systemsettings-5.22.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kinfocenter-5.22.3.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3de6baaa41749b969284a4952730613f
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.22.4 b/metadata/md5-cache/kde-plasma/kinfocenter-5.22.4
index d7e2b2f707eb..36b91e620856 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.22.4
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.22.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/cmake-3.14.3 dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) usb? ( virtual/libusb:1 ) wayland? ( >=kde-frameworks/kwayland-5.82.0:5 media-libs/mesa[egl] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) usb? ( virtual/libusb:1 ) wayland? ( >=kde-frameworks/kwayland-5.82.0:5 media-libs/mesa[egl(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Utility providing information about the computer hardware
 EAPI=7
 HOMEPAGE=https://userbase.kde.org/KInfoCenter
 IUSE=gles2-only ieee1394 +opengl +pci usb wayland debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) usb? ( virtual/libusb:1 ) wayland? ( >=kde-frameworks/kwayland-5.82.0:5 media-libs/mesa[egl] ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-plasma/kde-cli-tools-5.22.4:5 >=kde-plasma/systemsettings-5.22.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) usb? ( virtual/libusb:1 ) wayland? ( >=kde-frameworks/kwayland-5.82.0:5 media-libs/mesa[egl(+)] ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-plasma/kde-cli-tools-5.22.4:5 >=kde-plasma/systemsettings-5.22.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.22.4/kinfocenter-5.22.4.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3de6baaa41749b969284a4952730613f
+_md5_=e1314a6646e1aa17361f184fdb48b669
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.22.3 b/metadata/md5-cache/kde-plasma/kmenuedit-5.22.3
deleted file mode 100644
index 28399af8ed0b..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/sonnet-5.82.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma menu editor
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/sonnet-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kmenuedit-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e85a83defdf044c2e45b3752540366eb
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.22.3 b/metadata/md5-cache/kde-plasma/kscreen-5.22.3
deleted file mode 100644
index 77ee3f5b5b24..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/libkscreen-5.22.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma screen management
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kscreen
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/libkscreen-5.22.3:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-plasma/kde-cli-tools-5.22.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kscreen-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=69c509e92e5f76fad9cc3d03203cbf48
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.22.3 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.22.3
deleted file mode 100644
index 16f54442ce90..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.22.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/wayland-scanner dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 >=kde-plasma/layer-shell-qt-5.22.3:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library and components for secure lock screen architecture
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=+pam test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.22.3:5
-RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 >=kde-plasma/layer-shell-qt-5.22.3:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kscreenlocker-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b94ecede4c18aacbe37c39d23fd150bf
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.22.3 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.22.3
deleted file mode 100644
index c637fb9ea98b..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Implementation of ssh-askpass with KDE Wallet integration
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop https://invent.kde.org/plasma/ksshaskpass
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/ksshaskpass-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=709ccb6858fdd98cb4171afa02352a5b
diff --git a/metadata/md5-cache/kde-plasma/ksystemstats-5.22.3 b/metadata/md5-cache/kde-plasma/ksystemstats-5.22.3
deleted file mode 100644
index c7067bb8dda8..000000000000
--- a/metadata/md5-cache/kde-plasma/ksystemstats-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 >=kde-plasma/libksysguard-5.22.3:5 net-libs/libpcap sys-libs/libcap virtual/libudev:= lm-sensors? ( sys-apps/lm-sensors:= ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.82.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugin-based system monitoring daemon
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=lm-sensors networkmanager test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 >=kde-plasma/libksysguard-5.22.3:5 net-libs/libpcap sys-libs/libcap virtual/libudev:= lm-sensors? ( sys-apps/lm-sensors:= ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.82.0:5 ) !<kde-plasma/ksysguard-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/ksystemstats-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ee6b61a75c3a233cbc998b87608821e7
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.22.3 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.22.3
deleted file mode 100644
index b90d6d2490b6..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.82.0:5 sys-libs/pam dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=PAM module to not enter KWallet password again after login
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.82.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kwallet-pam-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a5d6bcab29f5a500ddbf112a2d694309
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.22.3 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.22.3
deleted file mode 100644
index 0f259240d95f..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kwayland-integration-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7b2cde316257a36e9d171085e83a1ba0
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.22.3 b/metadata/md5-cache/kde-plasma/kwayland-server-5.22.3
deleted file mode 100644
index 0f70c8e386c2..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-server-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/wayland-scanner dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.82.0:5 media-libs/mesa[egl] >=dev-libs/plasma-wayland-protocols-1.3.0 >=dev-libs/wayland-protocols-1.18 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Wayland Server Components built on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/kwayland-server
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.82.0:5 media-libs/mesa[egl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kwayland-server-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f74ec8f23016a3052e4b188f308b5d5e
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.22.4 b/metadata/md5-cache/kde-plasma/kwayland-server-5.22.4
index bddd0f7bf4ac..ad6487141f99 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-server-5.22.4
+++ b/metadata/md5-cache/kde-plasma/kwayland-server-5.22.4
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/wayland-scanner dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.82.0:5 media-libs/mesa[egl] >=dev-libs/plasma-wayland-protocols-1.3.0 >=dev-libs/wayland-protocols-1.18 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.82.0:5 media-libs/mesa[egl(+)] >=dev-libs/plasma-wayland-protocols-1.3.0 >=dev-libs/wayland-protocols-1.18 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Wayland Server Components built on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kwayland-server
 IUSE=debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.82.0:5 media-libs/mesa[egl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RDEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.82.0:5 media-libs/mesa[egl(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.22.4/kwayland-server-5.22.4.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f74ec8f23016a3052e4b188f308b5d5e
+_md5_=5409141ca7d8fdd108ccdd3607526542
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.22.3 b/metadata/md5-cache/kde-plasma/kwin-5.22.3
deleted file mode 100644
index b8b8a33a18e3..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.22.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.22.3:5 >=kde-plasma/kdecoration-5.22.3:5 >=kde-plasma/kscreenlocker-5.22.3:5 >=kde-plasma/kwayland-server-5.22.3:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.82.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 x11-base/xorg-proto test? ( >=dev-libs/wayland-protocols-1.19 >=dev-qt/qtwayland-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.22.3:5
-RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.22.3:5 >=kde-plasma/kdecoration-5.22.3:5 >=kde-plasma/kscreenlocker-5.22.3:5 >=kde-plasma/kwayland-server-5.22.3:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.82.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtvirtualkeyboard-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5[qml] multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kwin-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6c0a1813594170e4785dac60130830ae
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.22.4 b/metadata/md5-cache/kde-plasma/kwin-5.22.4
index b85a2e76da0c..9bd06903b5c4 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.22.4
+++ b/metadata/md5-cache/kde-plasma/kwin-5.22.4
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.22.4:5 >=kde-plasma/kdecoration-5.22.4:5 >=kde-plasma/kscreenlocker-5.22.4:5 >=kde-plasma/kwayland-server-5.22.4:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.82.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 x11-base/xorg-proto test? ( >=dev-libs/wayland-protocols-1.19 >=dev-qt/qtwayland-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.22.4:5 >=kde-plasma/kdecoration-5.22.4:5 >=kde-plasma/kscreenlocker-5.22.4:5 >=kde-plasma/kwayland-server-5.22.4:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/mesa[egl(+),gbm(+),wayland,X(+)] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.82.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 x11-base/xorg-proto test? ( >=dev-libs/wayland-protocols-1.19 >=dev-qt/qtwayland-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
@@ -8,9 +8,9 @@ IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +hand
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
 PDEPEND=>=kde-plasma/kde-cli-tools-5.22.4:5
-RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.22.4:5 >=kde-plasma/kdecoration-5.22.4:5 >=kde-plasma/kscreenlocker-5.22.4:5 >=kde-plasma/kwayland-server-5.22.4:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.82.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtvirtualkeyboard-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5[qml] multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.22.4:5 >=kde-plasma/kdecoration-5.22.4:5 >=kde-plasma/kscreenlocker-5.22.4:5 >=kde-plasma/kwayland-server-5.22.4:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/mesa[egl(+),gbm(+),wayland,X(+)] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.82.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtvirtualkeyboard-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5[qml] multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.22.4/kwin-5.22.4.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6c0a1813594170e4785dac60130830ae
+_md5_=ce8a067c9c1295356e9a0b384aac38cb
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.22.3 b/metadata/md5-cache/kde-plasma/kwrited-5.22.3
deleted file mode 100644
index 996991a61271..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpty-5.82.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma daemon listening for wall and write messages
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpty-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/kwrited-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1c1f21286baadfe89303b5357c350317
diff --git a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.3 b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.3
deleted file mode 100644
index eb9779aef60f..000000000000
--- a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/wayland-scanner virtual/pkgconfig dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[X] >=dev-qt/qtwayland-5.15.2:5 x11-libs/libxkbcommon >=dev-libs/plasma-wayland-protocols-1.1.1 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Qt component to allow applications make use of Wayland wl-layer-shell protocol
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[X] >=dev-qt/qtwayland-5.15.2:5 x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/layer-shell-qt-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=62bc1b08518634783c783a26533d8f2a
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.22.3 b/metadata/md5-cache/kde-plasma/libkscreen-5.22.3
deleted file mode 100644
index b6bb436d647f..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma screen management library
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.22.3/libkscreen-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ce8f24da062f48434e272c658abf0210
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.22.3 b/metadata/md5-cache/kde-plasma/libksysguard-5.22.3
deleted file mode 100644
index 921e5c476924..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 net-libs/libpcap sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.82.0:5 X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Task management and system monitoring library
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=webengine X test debug designer test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 net-libs/libpcap sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) !<kde-plasma/ksysguard-5.21.90:5 !<kde-plasma/plasma-workspace-5.18.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/9
-SRC_URI=mirror://kde/stable/plasma/5.22.3/libksysguard-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=130c90cab43cfc54bfd2b5e7ad9e83b0
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.22.3 b/metadata/md5-cache/kde-plasma/libkworkspace-5.22.3
deleted file mode 100644
index 96e3c480f36b..000000000000
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-plasma/kscreenlocker-5.22.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-frameworks/kinit-5.82.0:5 >=kde-plasma/kwin-5.22.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Workspace library to interact with the Plasma session manager
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-plasma/kscreenlocker-5.22.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-workspace-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=77cbbf24a270f54d917eecba1a99e68b
diff --git a/metadata/md5-cache/kde-plasma/milou-5.22.3 b/metadata/md5-cache/kde-plasma/milou-5.22.3
deleted file mode 100644
index 7f9d4021ffb4..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Dedicated search application built on top of Baloo
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/milou
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/milou-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=48a7db827e0de79abcf8116cc3af4f7e
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.22.3 b/metadata/md5-cache/kde-plasma/oxygen-5.22.3
deleted file mode 100644
index a8cc44815120..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-plasma/kdecoration-5.22.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.82.0:5 ) >=kde-frameworks/kservice-5.82.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Oxygen visual style for the Plasma desktop
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/oxygen
-IUSE=wayland debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.22.3:5
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-plasma/kdecoration-5.22.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.82.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/oxygen-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=56355ada59c68aa2d301c1c47c1be3c0
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.22.3 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.22.3
deleted file mode 100644
index 988f8b30ce74..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kfilemetadata-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/purpose-5.82.0:5 >=kde-plasma/plasma-workspace-5.22.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop https://community.kde.org/Plasma/Browser_Integration
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kfilemetadata-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/purpose-5.82.0:5 >=kde-plasma/plasma-workspace-5.22.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-browser-integration-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=09413da3f87f9d6536d6056350c40929
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.22.3 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.22.3
deleted file mode 100644
index 677d5c88961e..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.82.0:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kactivities-stats-5.82.0:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kbookmarks-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcodecs-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kded-5.82.0:5 >=kde-frameworks/kdelibs4support-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/knotifyconfig-5.82.0:5 >=kde-frameworks/kparts-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 >=kde-frameworks/sonnet-5.82.0:5 >=kde-plasma/kwin-5.22.3:5 >=kde-plasma/libksysguard-5.22.3:5 >=kde-plasma/libkworkspace-5.22.3:5 >=kde-plasma/plasma-workspace-5.22.3:5 >=media-libs/phonon-4.11.0 virtual/libcrypt:= x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.82.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.82.0:5 ) dev-libs/boost x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma desktop
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=emoji ibus +kaccounts +policykit scim +semantic-desktop test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.82.0:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kactivities-stats-5.82.0:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kbookmarks-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcodecs-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kded-5.82.0:5 >=kde-frameworks/kdelibs4support-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/knotifyconfig-5.82.0:5 >=kde-frameworks/kparts-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 >=kde-frameworks/sonnet-5.82.0:5 >=kde-plasma/kwin-5.22.3:5 >=kde-plasma/libksysguard-5.22.3:5 >=kde-plasma/libkworkspace-5.22.3:5 >=kde-plasma/plasma-workspace-5.22.3:5 >=media-libs/phonon-4.11.0 virtual/libcrypt:= x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.82.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.82.0:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/qqc2-desktop-style-5.82.0:5 >=kde-plasma/kde-cli-tools-5.22.3:5 >=kde-plasma/oxygen-5.22.3:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-desktop-5.22.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7631f15d24f7e26e8d3b3b797dd94110
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.22.3 b/metadata/md5-cache/kde-plasma/plasma-disks-5.22.3
deleted file mode 100644
index e84e76a5eef7..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-disks-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 sys-apps/smartmontools dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Monitors S.M.A.R.T. capable devices for imminent failure
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plasma-disks
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-3 GPL-2 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 sys-apps/smartmontools kde-plasma/kinfocenter:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-disks-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=de1f1fc4818062aad6b7f7aedc125607
diff --git a/metadata/md5-cache/kde-plasma/plasma-firewall-5.22.3 b/metadata/md5-cache/kde-plasma/plasma-firewall-5.22.3
deleted file mode 100644
index 27a8123bc025..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-firewall-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma frontend for Firewalld or UFW
-EAPI=7
-HOMEPAGE=https://invent.kde.org/network/plasma-firewall
-IUSE=firewalld +ufw debug python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) firewalld? ( net-firewall/firewalld ) ufw? ( net-firewall/ufw ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( firewalld ufw )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-firewall-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=93c24b52eb066a74b52db128cbcc34db
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.22.3 b/metadata/md5-cache/kde-plasma/plasma-integration-5.22.3
deleted file mode 100644
index bdc954518317..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-plasma/breeze-5.22.3:5 x11-libs/libXcursor x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-plasma/breeze-5.22.3:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-integration-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bc60a723799ddefca5767fa8c2c58230
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.22.3 b/metadata/md5-cache/kde-plasma/plasma-meta-5.22.3
deleted file mode 100644
index de7f4e9bc41d..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.22.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop/
-IUSE=accessibility bluetooth +browser-integration colord +crash-handler crypt +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.22.3:5 >=kde-plasma/kactivitymanagerd-5.22.3:5 >=kde-plasma/kde-cli-tools-5.22.3:5 >=kde-plasma/kdecoration-5.22.3:5 >=kde-plasma/kdeplasma-addons-5.22.3:5 >=kde-plasma/kgamma-5.22.3:5 >=kde-plasma/khotkeys-5.22.3:5 >=kde-plasma/kinfocenter-5.22.3:5 >=kde-plasma/kmenuedit-5.22.3:5 >=kde-plasma/kscreen-5.22.3:5 >=kde-plasma/kscreenlocker-5.22.3:5 >=kde-plasma/ksshaskpass-5.22.3:5 >=kde-plasma/ksystemstats-5.22.3:5 >=kde-plasma/kwayland-integration-5.22.3:5 >=kde-plasma/kwayland-server-5.22.3:5 >=kde-plasma/kwin-5.22.3:5 >=kde-plasma/kwrited-5.22.3:5 >=kde-plasma/layer-shell-qt-5.22.3:5 >=kde-plasma/libkscreen-5.22.3:5 >=kde-plasma/libksysguard-5.22.3:5 >=kde-plasma/milou-5.22.3:5 >=kde-plasma/oxygen-5.22.3:5 >=kde-plasma/plasma-desktop-5.22.3:5 >=kde-plasma/plasma-integration-5.22.3:5 >=kde-plasma/plasma-systemmonitor-5.22.3:5 >=kde-plasma/plasma-workspace-5.22.3:5 >=kde-plasma/polkit-kde-agent-5.22.3:5 >=kde-plasma/powerdevil-5.22.3:5 >=kde-plasma/systemsettings-5.22.3:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.22.3:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.22.3:5 ) colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-5.22.3:5 ) crypt? ( >=kde-plasma/plasma-vault-5.22.3:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.22.3:5 ) discover? ( >=kde-plasma/discover-5.22.3:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.22.3:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) grub? ( >=kde-plasma/breeze-grub-5.22.3:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.22.3:5 >=kde-plasma/kde-gtk-config-5.22.3:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.22.3:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.22.3:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.22.3:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.22.3:5 >=kde-plasma/plymouth-kcm-5.22.3:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.22.3:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.22.3:5 ) smart? ( >=kde-plasma/plasma-disks-5.22.3:5 ) systemd? ( sys-apps/systemd[pam] firewall? ( >=kde-plasma/plasma-firewall-5.22.3:5 ) ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.22.3:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.22.3:5 ) accessibility? ( app-accessibility/orca )
-REQUIRED_USE=^^ ( elogind systemd )
-SLOT=5
-_md5_=da37d594dded3a9d2c909e4ea5ab255a
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.22.3 b/metadata/md5-cache/kde-plasma/plasma-nm-5.22.3
deleted file mode 100644
index b41b1b9cdebc..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/networkmanager-qt-5.82.0:5[teamd=] >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.82.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma applet for NetworkManager
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=modemmanager openconnect teamd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/networkmanager-qt-5.82.0:5[teamd=] >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.82.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-plasma/kde-cli-tools-5.22.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-nm-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=29e488db6662bbfaef9d79a0ed166d85
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.22.3 b/metadata/md5-cache/kde-plasma/plasma-pa-5.22.3
deleted file mode 100644
index ceadcf6ca24c..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 media-libs/libcanberra media-sound/pulseaudio dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma applet for audio volume management using PulseAudio
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-pa-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=40aa7add1fe96ccfc7b1375b220f4262
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.22.3 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.22.3
deleted file mode 100644
index aa8cb78d6f2f..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktexteditor-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Useful applications for Plasma development
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktexteditor-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-sdk-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b68e46288944de41acff69d6e2e9c06a
diff --git a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.22.3 b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.22.3
deleted file mode 100644
index aec47306414e..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-plasma/libksysguard-5.22.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Monitor system sensors, process information and other system resources
-EAPI=7
-HOMEPAGE=https://apps.kde.org/plasma-systemmonitor/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-3 GPL-2 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-plasma/libksysguard-5.22.3:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5[qml] >=kde-frameworks/kquickcharts-5.82.0:5 >=kde-plasma/ksystemstats-5.22.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-systemmonitor-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3c92162ad30ba1e424d206579cf19dea
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.22.3 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.22.3
deleted file mode 100644
index 998577987142..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.22.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma integration for controlling Thunderbolt devices
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3+ )
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 sys-apps/bolt || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-thunderbolt-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=208d15d3945d8e1524c73e8c5d3a76f6
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.22.3 b/metadata/md5-cache/kde-plasma/plasma-vault-5.22.3
deleted file mode 100644
index 1f198d179f56..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kcodecs-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-plasma/libksysguard-5.22.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.82.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma applet and services for creating encrypted vaults
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
-IUSE=networkmanager debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kcodecs-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-plasma/libksysguard-5.22.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.82.0:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-vault-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=356f92629c9531b633230a8a923f9691
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.3
deleted file mode 100644
index 17ef6ee376ec..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.14 virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kactivities-stats-5.82.0:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kbookmarks-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kded-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kinit-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/knotifyconfig-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kpeople-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktexteditor-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kunitconversion-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/prison-5.82.0:5[qml] >=kde-frameworks/solid-5.82.0:5 >=kde-plasma/breeze-5.22.3:5 >=kde-plasma/kscreenlocker-5.22.3:5 >=kde-plasma/kwin-5.22.3:5 >=kde-plasma/layer-shell-qt-5.22.3:5 >=kde-plasma/libkscreen-5.22.3:5 >=kde-plasma/libksysguard-5.22.3:5 >=kde-plasma/libkworkspace-5.22.3:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.82.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.82.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.82.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma workspace
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=appstream +calculator +calendar +fontconfig geolocation gps screencast +semantic-desktop systemd telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.22.3:5
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kactivities-stats-5.82.0:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kbookmarks-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kded-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kinit-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/knotifyconfig-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kpeople-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktexteditor-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kunitconversion-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/prison-5.82.0:5[qml] >=kde-frameworks/solid-5.82.0:5 >=kde-plasma/breeze-5.22.3:5 >=kde-plasma/kscreenlocker-5.22.3:5 >=kde-plasma/kwin-5.22.3:5 >=kde-plasma/layer-shell-qt-5.22.3:5 >=kde-plasma/libkscreen-5.22.3:5 >=kde-plasma/libksysguard-5.22.3:5 >=kde-plasma/libkworkspace-5.22.3:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.82.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.82.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.82.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtpaths-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5[widgets] >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kdesu-5.82.0:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kquickcharts-5.82.0:5 >=kde-plasma/milou-5.22.3:5 >=kde-plasma/plasma-integration-5.22.3:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-workspace-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a8f549eabfe70b7388a84908e68c2e74
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.22.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.22.3
deleted file mode 100644
index a03a9cf07d0e..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.22.3
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DESCRIPTION=Wallpapers for the Plasma workspace
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-workspace-wallpapers-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=563ca45e0047e986ceb4116bf7f9be47
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.22.3 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.22.3
deleted file mode 100644
index 4677abd8677b..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 sys-boot/plymouth dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma control module for Plymouth
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.22.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plymouth-kcm-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c750d5e0cfed16f86d65a5a4104857b5
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.22.3 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.22.3
deleted file mode 100644
index 9d5d63c39063..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=sys-auth/polkit-qt-0.113.0 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=PolKit agent module for KDE Plasma
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/polkit-kde-agent-1-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9c2bb90cd9dcfc513967b1ab7c717753
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.22.3 b/metadata/md5-cache/kde-plasma/powerdevil-5.22.3
deleted file mode 100644
index 35e82e75df5b..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5[policykit] >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/knotifyconfig-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 >=kde-plasma/libkscreen-5.22.3:5 >=kde-plasma/libkworkspace-5.22.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.82.0:5 >=kde-frameworks/networkmanager-qt-5.82.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/powerdevil
-IUSE=brightness-control caps +wireless debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5[policykit] >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/knotifyconfig-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 >=kde-plasma/libkscreen-5.22.3:5 >=kde-plasma/libkworkspace-5.22.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.82.0:5 >=kde-frameworks/networkmanager-qt-5.82.0:5 ) >=kde-plasma/kde-cli-tools-5.22.3:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/powerdevil-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=28aca2e38b57011f6f3b5e414710c057
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.22.3 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.22.3
deleted file mode 100644
index edf003d22e29..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma control module for SDDM
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5[qml] >=kde-plasma/kde-cli-tools-5.22.3:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/sddm-kcm-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=71963ce6a4caef9d32dae59e40ca6031
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.22.3 b/metadata/md5-cache/kde-plasma/systemsettings-5.22.3
deleted file mode 100644
index 82562a84b2f8..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kactivities-stats-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-plasma/libkworkspace-5.22.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Control Center to configure KDE Plasma desktop
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kactivities-stats-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-plasma/libkworkspace-5.22.3:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/systemsettings-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9d92450515e9799cb2cf3fc0ffad4db9
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.22.3 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.22.3
deleted file mode 100644
index 57ac26ed125c..000000000000
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.22.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 >=kde-frameworks/kwayland-5.82.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 sys-apps/xdg-desktop-portal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/xdg-desktop-portal-kde-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6d4dc88585dbbf1470b4d838c95da06c
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.22.3 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.22.3
deleted file mode 100644
index b65cee4a2483..000000000000
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.22.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image
-DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
-EAPI=7
-HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !kde-plasma/xembed-sni-proxy:0
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.3/plasma-workspace-5.22.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=04d56752490933b79bc7aec3350e1410
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 45396cd06836..89f06b112a7d 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/thunderbird-78.12.0 b/metadata/md5-cache/mail-client/thunderbird-78.12.0
index 7fb8c687e97b..0af9fcd19e50 100644
--- a/metadata/md5-cache/mail-client/thunderbird-78.12.0
+++ b/metadata/md5-cache/mail-client/thunderbird-78.12.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >
 REQUIRED_USE=wifi? ( dbus )
 SLOT=0/78
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/source/thunderbird-78.12.0.source.tar.xz -> thunderbird-78.12.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-15.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/af.xpi -> thunderbird-78.12.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ar.xpi -> thunderbird-78.12.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ast.xpi -> thunderbird-78.12.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/be.xpi -> thunderbird-78.12.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/bg.xpi -> thunderbird-78.12.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/br.xpi -> thunderbird-78.12.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ca.xpi -> thunderbird-78.12.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/cak.xpi -> thunderbird-78.12.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/cs.xpi -> thunderbird-78.12.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/cy.xpi -> thunderbird-78.12.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/da.xpi -> thunderbird-78.12.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/de.xpi -> thunderbird-78.12.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.12.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/el.xpi -> thunderbird-78.12.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.12.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.12.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.12.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.12.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/et.xpi -> thunderbird-78.12.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/eu.xpi -> thunderbird-78.12.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/fa.xpi -> thunderbird-78.12.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/fi.xpi -> thunderbird-78.12.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/fr.xpi -> thunderbird-78.12.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.12.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.12.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/gd.xpi -> thunderbird-78.12.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/gl.xpi -> thunderbird-78.12.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/he.xpi -> thunderbird-78.12.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/hr.xpi -> thunderbird-78.12.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.12.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/hu.xpi -> thunderbird-78.12.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.12.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/id.xpi -> thunderbird-78.12.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/is.xpi -> thunderbird-78.12.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/it.xpi -> thunderbird-78.12.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ja.xpi -> thunderbird-78.12.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ka.xpi -> thunderbird-78.12.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/kab.xpi -> thunderbird-78.12.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/kk.xpi -> thunderbird-78.12.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ko.xpi -> thunderbird-78.12.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/lt.xpi -> thunderbird-78.12.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ms.xpi -> thunderbird-78.12.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.12.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/nl.xpi -> thunderbird-78.12.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.12.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.12.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/pl.xpi -> thunderbird-78.12.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.12.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.12.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/rm.xpi -> thunderbird-78.12.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ro.xpi -> thunderbird-78.12.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ru.xpi -> thunderbird-78.12.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/si.xpi -> thunderbird-78.12.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sk.xpi -> thunderbird-78.12.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sl.xpi -> thunderbird-78.12.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sq.xpi -> thunderbird-78.12.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sr.xpi -> thunderbird-78.12.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.12.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/th.xpi -> thunderbird-78.12.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/tr.xpi -> thunderbird-78.12.0-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/uz.xpi -> thunderbird-78.12.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/vi.xpi -> thunderbird-78.12.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.12.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.12.0-zh-TW.xpi )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d92485b1778eed2cb58e8008e6c0625a
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 68acb6416912..620e413476da 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6.1 b/metadata/md5-cache/mail-mta/postfix-3.6.1
index 784866ec91ed..fac62a54f360 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.6.1
+++ b/metadata/md5-cache/mail-mta/postfix-3.6.1
@@ -5,11 +5,11 @@ DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=7
 HOMEPAGE=http://www.postfix.org/
 IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.6.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=890a90590ce5f5f437be137f719e0c7d
+_md5_=84f573fcc62575b003e7368507732907
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6.2 b/metadata/md5-cache/mail-mta/postfix-3.6.2
new file mode 100644
index 000000000000..d316044b17b3
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.6.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=7
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=|| ( IBM EPL-2.0 )
+RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.6.2.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3e6d20a9e05b553e674d587de121b0b4
diff --git a/metadata/md5-cache/mail-mta/postfix-3.7_pre20210707 b/metadata/md5-cache/mail-mta/postfix-3.7_pre20210707
deleted file mode 100644
index a2f021046071..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.7_pre20210707
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=7
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.7-20210707.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b32ca1f47a2bb7fe26d241853a0161e7
diff --git a/metadata/md5-cache/mail-mta/postfix-3.7_pre20210717 b/metadata/md5-cache/mail-mta/postfix-3.7_pre20210717
new file mode 100644
index 000000000000..9db4e2d5789d
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.7_pre20210717
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=7
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=|| ( IBM EPL-2.0 )
+RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.7-20210717.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b32ca1f47a2bb7fe26d241853a0161e7
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index eb13c32d293c..254a680fff4a 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.27.4 b/metadata/md5-cache/media-gfx/exiv2-0.27.4
index 15448ec4377e..9882b7e2468f 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.27.4
+++ b/metadata/md5-cache/media-gfx/exiv2-0.27.4
@@ -5,11 +5,11 @@ DESCRIPTION=EXIF, IPTC and XMP metadata C++ library and command line utility
 EAPI=7
 HOMEPAGE=https://www.exiv2.org/
 IUSE=doc examples nls +png test webready +xmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( dev-cpp/gtest ) webready? ( >net-libs/libssh-0.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/27
 SRC_URI=https://exiv2.org/builds/exiv2-0.27.4-Source.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4cb67e99eb16db3ec5b8123224be314f
+_md5_=55ddf56cc5b0c8c38b8a89b7026a9a30
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.36 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.36
index 4e3446d985f5..0cf25b7cd7cf 100644
--- a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.36
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.36
@@ -5,10 +5,10 @@ DESCRIPTION=Collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=http://www.graphicsmagick.org/ http://hg.code.sf.net/p/graphicsmagick/code/
 IUSE=bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma openmp perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
 SLOT=0/1.3
 SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.36.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3446fea4fc5c1f2095da8a600ba3aad8
+_md5_=48cae14b2b011f71de4a975725c02e57
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index f432ea79931e..769773d1c968 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/glfw-3.3.3 b/metadata/md5-cache/media-libs/glfw-3.3.3
deleted file mode 100644
index ce46aad89dc0..000000000000
--- a/metadata/md5-cache/media-libs/glfw-3.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=wayland? ( kde-frameworks/extra-cmake-modules ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libxkbcommon !wayland? ( virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] ) !wayland? ( x11-libs/libXi ) wayland? ( dev-libs/wayland-protocols )
-DESCRIPTION=The Portable OpenGL FrameWork
-EAPI=7
-HOMEPAGE=https://www.glfw.org/
-IUSE=wayland
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 x86
-LICENSE=ZLIB
-RDEPEND=x11-libs/libxkbcommon !wayland? ( virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] )
-SLOT=0
-SRC_URI=https://github.com/glfw/glfw/archive/3.3.3.tar.gz -> glfw-3.3.3.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5e56744a2cbc96096fbb6a3ab50a76da
diff --git a/metadata/md5-cache/media-libs/glfw-3.3.4 b/metadata/md5-cache/media-libs/glfw-3.3.4
deleted file mode 100644
index 7392349a8092..000000000000
--- a/metadata/md5-cache/media-libs/glfw-3.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=wayland? ( kde-frameworks/extra-cmake-modules ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libxkbcommon !wayland? ( virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] ) !wayland? ( x11-libs/libXi ) wayland? ( dev-libs/wayland-protocols )
-DESCRIPTION=The Portable OpenGL FrameWork
-EAPI=7
-HOMEPAGE=https://www.glfw.org/
-IUSE=wayland
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 x86
-LICENSE=ZLIB
-RDEPEND=x11-libs/libxkbcommon !wayland? ( virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] )
-SLOT=0
-SRC_URI=https://github.com/glfw/glfw/archive/3.3.4.tar.gz -> glfw-3.3.4.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5e56744a2cbc96096fbb6a3ab50a76da
diff --git a/metadata/md5-cache/media-libs/glfw-3.3.4-r1 b/metadata/md5-cache/media-libs/glfw-3.3.4-r1
deleted file mode 100644
index a5abd4cafffe..000000000000
--- a/metadata/md5-cache/media-libs/glfw-3.3.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=wayland? ( dev-util/wayland-scanner kde-frameworks/extra-cmake-modules ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libxkbcommon[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !wayland? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[egl,wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !wayland? ( x11-base/xorg-proto x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland-protocols )
-DESCRIPTION=The Portable OpenGL FrameWork
-EAPI=7
-HOMEPAGE=https://www.glfw.org/
-IUSE=wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=ZLIB
-RDEPEND=x11-libs/libxkbcommon[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !wayland? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[egl,wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/glfw/glfw/archive/3.3.4.tar.gz -> glfw-3.3.4.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1f7c2c3ec1ef2df7ffa49ef011a5233c
diff --git a/metadata/md5-cache/media-libs/glfw-3.3.4-r2 b/metadata/md5-cache/media-libs/glfw-3.3.4-r2
new file mode 100644
index 000000000000..e5746488c181
--- /dev/null
+++ b/metadata/md5-cache/media-libs/glfw-3.3.4-r2
@@ -0,0 +1,14 @@
+BDEPEND=wayland? ( kde-frameworks/extra-cmake-modules ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/libxkbcommon !wayland? ( virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm ) wayland? ( dev-libs/wayland media-libs/mesa[egl(+),wayland] ) !wayland? ( x11-libs/libXi ) wayland? ( dev-libs/wayland-protocols )
+DESCRIPTION=The Portable OpenGL FrameWork
+EAPI=7
+HOMEPAGE=https://www.glfw.org/
+IUSE=wayland
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 x86
+LICENSE=ZLIB
+RDEPEND=x11-libs/libxkbcommon !wayland? ( virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm ) wayland? ( dev-libs/wayland media-libs/mesa[egl(+),wayland] )
+SLOT=0
+SRC_URI=https://github.com/glfw/glfw/archive/3.3.4.tar.gz -> glfw-3.3.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=468c1b245c312e70b74ce6abea450cc2
diff --git a/metadata/md5-cache/media-libs/glfw-3.3.4-r3 b/metadata/md5-cache/media-libs/glfw-3.3.4-r3
new file mode 100644
index 000000000000..d4264006a32d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/glfw-3.3.4-r3
@@ -0,0 +1,14 @@
+BDEPEND=wayland-only? ( dev-util/wayland-scanner kde-frameworks/extra-cmake-modules ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/libxkbcommon[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland-only? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[egl(+),wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !wayland-only? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland-only? ( dev-libs/wayland-protocols ) !wayland-only? ( x11-base/xorg-proto x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Portable OpenGL FrameWork
+EAPI=7
+HOMEPAGE=https://www.glfw.org/
+IUSE=wayland-only abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=ZLIB
+RDEPEND=x11-libs/libxkbcommon[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland-only? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[egl(+),wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !wayland-only? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://github.com/glfw/glfw/archive/3.3.4.tar.gz -> glfw-3.3.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=deeab03164979a0f95dfdbb6f4e1b285
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.18.4 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.18.4
deleted file mode 100644
index 9ab2b7c0d5b5..000000000000
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.18.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP nls? ( >=sys-devel/gettext-0.17 ) test? ( media-libs/gstreamer[test] )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/gstreamer-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl?,introspection?,gles2=,opengl=] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vnc? ( X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.4 ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Less plugins for GStreamer
-EAPI=7
-HOMEPAGE=https://gstreamer.freedesktop.org/
-IUSE=X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2
-RDEPEND=>=media-libs/gstreamer-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl?,introspection?,gles2=,opengl=] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vnc? ( X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.4 ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=1.0
-SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6f0e0da3468178080b476ffeb264f518
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.18.4-r1 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.18.4-r1
new file mode 100644
index 000000000000..e501ed6fa687
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.18.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP nls? ( >=sys-devel/gettext-0.17 ) test? ( media-libs/gstreamer[test] )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!media-plugins/gst-transcoder >=media-libs/gstreamer-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl?,introspection?,gles2=,opengl=] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vnc? ( X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.4 ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Less plugins for GStreamer
+EAPI=7
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=!media-plugins/gst-transcoder >=media-libs/gstreamer-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl?,introspection?,gles2=,opengl=] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vnc? ( X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.4 ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=12025efa12f9595df172c4f78282d2f8
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.18.4 b/metadata/md5-cache/media-libs/gst-plugins-base-1.18.4
index 667345bccee0..9805eaea45d8 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.18.4
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.18.4
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP nls? ( >=sys-devel/gettext-0.17 ) test? ( media-libs/gstreamer[test] )
 DEFINED_PHASES=compile configure install test
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.15.0:1.0 dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 X? ( x11-base/xorg-proto ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.15.0:1.0 dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 X? ( x11-base/xorg-proto ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
-RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.15.0:1.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.15.0:1.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a342268c262236ad14273a3cbbe6577c
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.18.4 b/metadata/md5-cache/media-libs/gst-plugins-good-1.18.4
index f767efceb38b..71f7cdaa442d 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.18.4
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP nls? ( >=sys-devel/gettext-0.17 ) test? ( media-libs/gstreamer[test] )
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.12 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.12 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Basepack of plugins for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=40877d754ee13cc4fdb0f272007f18b8
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.18.4 b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.18.4
index 9d7b74a1c7ae..d144adad82fc 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.18.4
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP nls? ( >=sys-devel/gettext-0.17 ) test? ( media-libs/gstreamer[test] )
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/gtk-doc-am-1.12 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/gtk-doc-am-1.12 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=orc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=78d830a53cb4646d685166c95110072a
diff --git a/metadata/md5-cache/media-libs/gst-rtsp-server-1.18.4 b/metadata/md5-cache/media-libs/gst-rtsp-server-1.18.4
index 69191afbd5f1..885ff811f562 100644
--- a/metadata/md5-cache/media-libs/gst-rtsp-server-1.18.4
+++ b/metadata/md5-cache/media-libs/gst-rtsp-server-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP nls? ( >=sys-devel/gettext-0.17 ) test? ( media-libs/gstreamer[test] )
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-srtp-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) >=dev-util/gtk-doc-am-1.12 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-srtp-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) >=dev-util/gtk-doc-am-1.12 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=A GStreamer based RTSP server
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html
 IUSE=examples +introspection static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-srtp-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-srtp-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fd19eb5697c0e57cc38925e2a4b07c7c
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.18.4 b/metadata/md5-cache/media-libs/gstreamer-1.18.4
index 119cd633d3ed..dac08b4fff9e 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.18.4
+++ b/metadata/md5-cache/media-libs/gstreamer-1.18.4
@@ -11,5 +11,5 @@ RDEPEND=caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d0e8785d881b9409fdd48bc541a711f8
diff --git a/metadata/md5-cache/media-libs/libhdhomerun-20200521 b/metadata/md5-cache/media-libs/libhdhomerun-20200521
index 8e0919b906ef..59b5a0da759a 100644
--- a/metadata/md5-cache/media-libs/libhdhomerun-20200521
+++ b/metadata/md5-cache/media-libs/libhdhomerun-20200521
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=SiliconDust HDHomeRun Utilties
 EAPI=7
 HOMEPAGE=https://www.silicondust.com/support/linux/
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://download.silicondust.com/hdhomerun/libhdhomerun_20200521.tgz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=392886d3128ec05d66657165e12f1d09
+_md5_=b00b83c7791d8f77a8b74b33b51be50a
diff --git a/metadata/md5-cache/media-libs/libheif-1.12.0 b/metadata/md5-cache/media-libs/libheif-1.12.0
index 834cdcc277b9..0e9d48a01af8 100644
--- a/metadata/md5-cache/media-libs/libheif-1.12.0
+++ b/metadata/md5-cache/media-libs/libheif-1.12.0
@@ -5,7 +5,7 @@ DESCRIPTION=ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
 EAPI=7
 HOMEPAGE=https://github.com/strukturag/libheif
 IUSE=+aom gdk-pixbuf go libde265 rav1e test +threads x265 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=media-libs/dav1d:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aom? ( >=media-libs/libaom-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go ) libde265? ( media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( media-video/rav1e:= ) x265? ( media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( go libde265 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.12
 SRC_URI=https://github.com/strukturag/libheif/releases/download/v1.12.0/libheif-1.12.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ca7d16176ca85957996c860c14b4f30f
+_md5_=c18d9b8b56fbda1c88460e257adaad2d
diff --git a/metadata/md5-cache/media-libs/libmediaart-1.9.4 b/metadata/md5-cache/media-libs/libmediaart-1.9.4
index 82b14c1b44be..f8d8f8369b8d 100644
--- a/metadata/md5-cache/media-libs/libmediaart-1.9.4
+++ b/metadata/md5-cache/media-libs/libmediaart-1.9.4
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( gtk qt5 ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/libmediaart/1.9/libmediaart-1.9.4.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=088afc47a542f1bcfe788984bfe0f3df
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8bb67ff8d2c6248de7fe14ae4681b291
diff --git a/metadata/md5-cache/media-libs/mesa-21.1.4 b/metadata/md5-cache/media-libs/mesa-21.1.4
index 527546309c14..d7fd45406c77 100644
--- a/metadata/md5-cache/media-libs/mesa-21.1.4
+++ b/metadata/md5-cache/media-libs/mesa-21.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r60
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-21.1.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed9a7ebfda1c90f48fa2d62fc0d38369
diff --git a/metadata/md5-cache/media-libs/mesa-21.1.5 b/metadata/md5-cache/media-libs/mesa-21.1.5
index c92441bf0986..585c739d37c3 100644
--- a/metadata/md5-cache/media-libs/mesa-21.1.5
+++ b/metadata/md5-cache/media-libs/mesa-21.1.5
@@ -12,5 +12,5 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r60
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-21.1.5.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8f8184f75367677c0999642b0428df02
diff --git a/metadata/md5-cache/media-libs/mesa-21.2.0_rc2 b/metadata/md5-cache/media-libs/mesa-21.2.0_rc2
index 82aa1773c6d0..3a1a1010ae6f 100644
--- a/metadata/md5-cache/media-libs/mesa-21.2.0_rc2
+++ b/metadata/md5-cache/media-libs/mesa-21.2.0_rc2
@@ -12,5 +12,5 @@ REQUIRED_USE=d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 vid
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-21.2.0-rc2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e24b415d3cc2980a34921ee2f5876e34
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 397b56849278..83a0ae3c9839 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 REQUIRED_USE=d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) osmesa? ( gallium ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e24b415d3cc2980a34921ee2f5876e34
diff --git a/metadata/md5-cache/media-libs/openimageio-2.2.15.1 b/metadata/md5-cache/media-libs/openimageio-2.2.15.1
index 36899d8eb628..aabc16034cd2 100644
--- a/metadata/md5-cache/media-libs/openimageio-2.2.15.1
+++ b/metadata/md5-cache/media-libs/openimageio-2.2.15.1
@@ -5,7 +5,7 @@ DESCRIPTION=A library for reading and writing images
 EAPI=7
 HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
 IUSE=dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/2.2
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-2.2.15.1.tar.gz -> openimageio-2.2.15.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	font	0667878c2b594871023dd1833d05996f	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=de8ff93619388138ed34bc6e57437467
+_md5_=fb3981f861e50a01f6362ea95ce1136f
diff --git a/metadata/md5-cache/media-libs/osl-1.10.13 b/metadata/md5-cache/media-libs/osl-1.10.13
index e421dae02cd9..6f7b1d6c67c0 100644
--- a/metadata/md5-cache/media-libs/osl-1.10.13
+++ b/metadata/md5-cache/media-libs/osl-1.10.13
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-libs/pugixml media-libs/openexr:= media-libs/openim
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.10.13.tar.gz -> osl-1.10.13.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=bb9d3703764d6c42fe38edde2fe90b08
diff --git a/metadata/md5-cache/media-libs/osl-1.11.9.0 b/metadata/md5-cache/media-libs/osl-1.11.9.0
index 1d1f6bee0bff..ccd915b50165 100644
--- a/metadata/md5-cache/media-libs/osl-1.11.9.0
+++ b/metadata/md5-cache/media-libs/osl-1.11.9.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-libs/pugixml media-libs/openexr:= media-libs/openim
 RESTRICT=test
 SLOT=0/11
 SRC_URI=https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.11.9.0.tar.gz -> osl-1.11.9.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c9d93c1a7881e4639550eee7c522d0bc
diff --git a/metadata/md5-cache/media-libs/osl-1.12.0.2 b/metadata/md5-cache/media-libs/osl-1.12.0.2
index 6322c29f6b4d..56f51ac992f8 100644
--- a/metadata/md5-cache/media-libs/osl-1.12.0.2
+++ b/metadata/md5-cache/media-libs/osl-1.12.0.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-libs/pugixml media-libs/openexr:= media-libs/openim
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.12.0.2-dev.tar.gz -> osl-1.12.0.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fb05a7fc2b82c77dbb0b7cf92a342f55
diff --git a/metadata/md5-cache/media-libs/qhull-2020.2-r3 b/metadata/md5-cache/media-libs/qhull-2020.2-r3
index 797ceac7bfdb..ffd376adb997 100644
--- a/metadata/md5-cache/media-libs/qhull-2020.2-r3
+++ b/metadata/md5-cache/media-libs/qhull-2020.2-r3
@@ -4,9 +4,9 @@ DESCRIPTION=Geometry library
 EAPI=7
 HOMEPAGE=http://www.qhull.org
 IUSE=doc static-libs
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 SLOT=0/8
 SRC_URI=https://github.com/qhull/qhull/archive/2020.2.tar.gz -> qhull-2020.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=843f2ca86ae7078777aea5fcd5c2feee
+_md5_=9cc7e6927f8f933560b5b3cc5a15ab8c
diff --git a/metadata/md5-cache/media-libs/quesoglc-0.7.2-r1 b/metadata/md5-cache/media-libs/quesoglc-0.7.2-r1
new file mode 100644
index 000000000000..3a8635f2a59f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/quesoglc-0.7.2-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latexextra virtual/latex-base )
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/fribidi media-libs/fontconfig media-libs/freetype:2 virtual/glu virtual/opengl
+DESCRIPTION=Free implementation of the OpenGL Character Renderer (GLC)
+EAPI=8
+HOMEPAGE=http://quesoglc.sourceforge.net/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/fribidi media-libs/fontconfig media-libs/freetype:2 virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/quesoglc/quesoglc-0.7.2-free.tar.bz2
+_md5_=ebe66ca6bc22083b74b8ccb3096ca6aa
diff --git a/metadata/md5-cache/media-libs/raptor-2.0.15-r4 b/metadata/md5-cache/media-libs/raptor-2.0.15-r4
index a0ab9bbcc2dc..0a70f919e930 100644
--- a/metadata/md5-cache/media-libs/raptor-2.0.15-r4
+++ b/metadata/md5-cache/media-libs/raptor-2.0.15-r4
@@ -5,10 +5,10 @@ DESCRIPTION=The RDF Parser Toolkit
 EAPI=7
 HOMEPAGE=http://librdf.org/raptor/
 IUSE=+curl debug json static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) json? ( dev-libs/yajl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/raptor:0
 SLOT=2
 SRC_URI=http://download.librdf.org/source/raptor2-2.0.15.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fc81813fc345d72faa201439563ec1ca
+_md5_=8efe58a7082b4ba59d373ddab092c6e9
diff --git a/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2 b/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2
new file mode 100644
index 000000000000..9b48cdc1cce0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/libsdl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Simple Direct Media Layer Network Support Library
+EAPI=8
+HOMEPAGE=https://www.libsdl.org/projects/SDL_net/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=ZLIB
+RDEPEND=media-libs/libsdl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8192112ee1284aa67c2966cc77092d68
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 32e88530e4e1..eb72714d6a59 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.18.4
index fb4c8b852b91..d60542aa140e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=ATSC A/52 audio decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=bc635a9c0833d6250458a006a370bf25
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.18.4
index 2fb687e74ea5..48508b4caae0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=AMRNB encoder/decoder and AMRWB decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c195982975b1434c4172041ae068704b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-aom-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-aom-1.18.4
new file mode 100644
index 000000000000..d110b92ab51d
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-aom-1.18.4
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/libaom:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/gst-plugins-base-1.18.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Alliance for Open Media AV1 plugin for GStreamer
+EAPI=7
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=+introspection +orc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libaom:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/gst-plugins-base-1.18.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ad9751c78fa608ef80ca84d7149ce717
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.18.4
index 098e2a18b99c..38af53c156ea 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=ASS/SSA rendering with effects support plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=94253ce61a7e5977a8d3ff9c73247b99
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.18.4
index 0268261531c4..2c657de6cb49 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=net-wireless/bluez-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/gdbus-codegen >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=net-wireless/bluez-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/gdbus-codegen >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=AVDTP source/sink and A2DP sink plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=net-wireless/bluez-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=net-wireless/bluez-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a2bd5da415c1e557b80483fc56c2d735
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.18.4
index 83e466192122..8cfb8d0407ba 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=media-libs/libbs2b[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=media-libs/libbs2b[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=bs2b elements for Gstreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-libs/libbs2b[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=media-libs/libbs2b[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=90b1d46d25a97514e57baa7fc0cc8cd2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cairo-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-cairo-1.18.4
index 0adcecd0f471..b8ab57dd6995 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cairo-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cairo-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=x11-libs/cairo-1.10[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=x11-libs/cairo-1.10[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Video overlay plugin based on cairo for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/cairo-1.10[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=x11-libs/cairo-1.10[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f9ccd60c7db11e41ec62a84a8f9ded8f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.18.4
index 65dac8563fb5..225dac065626 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=CD Audio Source (cdda) plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5075f67db260e4b7d68abaefb0ac359d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.18.4
index 6d1061e3951d..94bcc45fcf53 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=CD Audio Source (cdda) plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f21c9c8abc74dc99511f3dd36b6e689e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.18.4
index 1273c5d5146f..72f0e528d4f6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=media-libs/chromaprint[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=media-libs/chromaprint[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Calculate Chromaprint fingerprint from audio files for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=media-libs/chromaprint[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=media-libs/chromaprint[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=07e8334da2825dc1ae55f7f7a3c58550
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.18.4
index fbf9cac91ab6..513a59b9b7d5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/lcms-2.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/lcms-2.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Color management correction GStreamer plugins
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=media-libs/lcms-2.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/lcms-2.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=536d0891538592bf12989caed825df48
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.18.4
index 9bef0702c96c..bc31a7421b99 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=MPEG-DASH plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d9435d27ecdb5589a9c8a152369ea7e4
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.18.4
index 0e4d9f711298..a450770cb43f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/openssl-1.0.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=dev-libs/openssl-1.0.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=DTLS encoder/decoder with SRTP support plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/openssl-1.0.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=dev-libs/openssl-1.0.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=252d1983bbf5a24d2ad37ad52c52e42f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.18.4
index fa2d33c793a7..a17944cd5d0a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=DTS audio decoder plugin for Gstreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=213aa62d8ae29d409c62b56f43dae689
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.18.4
index 07d7ef00c47d..21ce7eeb1280 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=DV demuxer and decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=513e088ea77184ebd3eb28c8d31a7426
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.18.4
index 53fd8850306a..c394818aa6aa 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/os-headers >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=virtual/os-headers >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=plugin for gstreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=42c65fba2c87d3092e33c011541387f3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.18.4
index 8eff51e57ad7..2abefa4aae7b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libdvdread-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libdvdread-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=DVD read plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libdvdread-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libdvdread-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=67f9efea5e9b4e0357dba918733a0847
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.18.4
index b5e3ee566afa..d88f2d9672de 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=AAC audio encoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ab479021458c94584e3f8de0e6b342fd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.18.4
index 55c01120b06a..58b0dc9a665b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=AAC audio decoder plugin.
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9f9c3eea75bb741a3c60f014995af61d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.18.4
index b81fc7eb40e4..5d3cd8557525 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=FLAC encoder/decoder/tagger plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cbb330ff5a1c8e1b7f470dd3237d1190
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.18.4
index e95d52fec056..1c1733993ae3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=plugin for gstreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=03378017d844e00149e793742c7f1678
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.18.4
index 1fb2f261e559..aa3a5bd012a7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl=,gles2=,opengl=,wayland=,X=] >=x11-libs/gtk+-3.15:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gles2? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl=,gles2=,opengl=,wayland=,X=] >=x11-libs/gtk+-3.15:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gles2? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Video sink plugin for GStreamer that renders to a GtkWidget
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+egl gles2 +opengl wayland +X test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl=,gles2=,opengl=,wayland=,X=] >=x11-libs/gtk+-3.15:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gles2? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl=,gles2=,opengl=,wayland=,X=] >=x11-libs/gtk+-3.15:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gles2? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=611ac467ea2a7514ac20a678f244aec4
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.18.4
index fdbc35348df5..bdb76c9aa63b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=HTTP live streaming plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=095204d3fdf79e8ea5a148bba7cea7f0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.18.4
index 045c95d3b8ba..a168b1cd08c9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=plugin for gstreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a3791540b78493fef0a7d30892398e0a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.18.4
index d502feaba7c7..db8fd94f7aae 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=JPEG image encoder/decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=825de4f049f36a8e15924c9399d852c1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-kate-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-kate-1.18.4
index 362bf0422a90..5cf093dba0a8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-kate-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-kate-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libkate-0.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libtiger-0.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libkate-0.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libtiger-0.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Kate overlay codec suppport plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libkate-0.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libtiger-0.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libkate-0.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libtiger-0.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ecc034d6d254999a81d934f1bd5d9c85
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.18.4
index 9eb348213e16..3e3736680b0b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/liblrdf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/liblrdf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Ladspa elements for Gstreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/liblrdf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/liblrdf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a8ddedf6861130ea1ecdac67ad6677a4
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.18.4
index 27280feba54c..34bd5da7c06c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=MP3 encoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c445ea250167cf5c10d662cd99663c97
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.18.4
index e7672ef395e1..7613824534cc 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP nls? ( >=sys-devel/gettext-0.17 ) test? ( media-libs/gstreamer[test] )
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-video/ffmpeg-4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/gtk-doc-am-1.12 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-video/ffmpeg-4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/gtk-doc-am-1.12 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=FFmpeg based gstreamer plugin
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-libav.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-video/ffmpeg-4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-video/ffmpeg-4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ed40ba8fc9923b6a8b36c37f31781ca5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.18.4
index 392a70e2c397..367f554bb076 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libde265-0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libde265-0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=H.265 decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libde265-0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libde265-0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8a16743e7f809b3814d45b82a2425e34
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.18.4
index 29f8e7aef0ac..fefa0288035b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Microsoft Multi Media Server source plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dc814b947ab12969e8768122ccef1984
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.18.4
index 0c38aa9fa4c2..fcf7bcf98eb1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=PNG image encoder/decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=808fd4f8413dd14a4f8dd2278a0b5ef2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.18.4
index 0de3a886981e..c91519b97c49 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/libvisual-plugins-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/libvisual-plugins-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Visualization elements for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/libvisual-plugins-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/libvisual-plugins-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3cced425542a227b137f5f82d95e9249
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.18.4
index d8a7332ad057..7fb5dde34782 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lilv-0.24.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lilv-0.24.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Lv2 elements for Gstreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lilv-0.24.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lilv-0.24.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=91fe0bf8eafff79b4bc4c823e444fb5e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.18.4
index b0846c6e14d9..06134e9d19d3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=MOD audio decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=88878c55dfbf00e829ea94ea6a427c35
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.18.4
index 8df4c525cd5c..871155c8c4ee 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=MPEG2 decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=51c968c92bb3b4eeb17115e9523f71ad
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.18.4
index 773dd8e15761..d319744b2f04 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=MPEG-1/2 video encoding plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1d8cd9bedc64d860bc71b8dd4a3c10df
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.18.4
index 3a97f6edfb44..b5a6d6fdbcea 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=MP3 decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b99515e8ee72869d14001b455e4baaf6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.18.4
index c1daef8cf305..34a321e5cc7d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ce77b8c1cca437400d8477807f04c5a5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.18.4
index 70ca1c92d4f5..0d49838d1f5c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=net-libs/neon-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <=net-libs/neon-0.31.99[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=net-libs/neon-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <=net-libs/neon-0.31.99[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=HTTP client source plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=net-libs/neon-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <=net-libs/neon-0.31.99[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=net-libs/neon-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <=net-libs/neon-0.31.99[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=09758a20b330d9413bcf6c9fc974940c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.18.4
index 916c8fb96a95..e74c020783c6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=MusicIP audio fingerprinting plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4affca28acc2148efe87b4a792293747
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.18.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.18.4-r1
index d259a7666611..a93f979cd69c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.18.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.18.4-r1
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/opencv-4.1.2-r3:=[contrib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <media-libs/opencv-4.6.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/opencv-4.1.2-r3:=[contrib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <media-libs/opencv-4.6.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=OpenCV elements for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/opencv-4.1.2-r3:=[contrib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <media-libs/opencv-4.6.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/opencv-4.1.2-r3:=[contrib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <media-libs/opencv-4.6.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e14978e4fd81d47a22294edc4b0e9cd2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.18.4
index b397cef393dc..ddadda0388b1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/openh264-1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/openh264-1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=H.264 encoder/decoder plugin for GStreamer.
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/openh264-1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/openh264-1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=147c53a81ace82a43e0dca86e6e9cd29
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.18.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.18.4-r1
deleted file mode 100644
index 61379c1564f1..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.18.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Opus audio parser plugin for GStreamer
-EAPI=7
-HOMEPAGE=https://gstreamer.freedesktop.org/
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-opusparse-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,ogg] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=1.0
-SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=944eaf201fd0be749d36f72690717b9d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.18.4-r2 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.18.4-r2
new file mode 100644
index 000000000000..2ab382602c5f
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.18.4-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Opus audio parser plugin for GStreamer
+EAPI=7
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-plugins/gst-plugins-opusparse >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,ogg] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.4.tar.xz https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a9809a7d2b7b7d3f18e787ddeff88d36
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opusparse-1.18.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-opusparse-1.18.4-r1
deleted file mode 100644
index 2ef7e7b2ba0b..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-opusparse-1.18.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
-DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Opus audio parser plugin for GStreamer
-EAPI=7
-HOMEPAGE=https://gstreamer.freedesktop.org/
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,ogg] !<media-plugins/gst-plugins-opus-1.18.4-r1 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=1.0
-SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=81b25ecdbd84d97bdbaa2b597879ccac
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.18.4
index 9b87a062b0e6..344098432300 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=virtual/os-headers >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=virtual/os-headers >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=OSS (Open Sound System) support plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=36d2c1d6e5ad3aceb0bd46f33a8a18cf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.18.4
index 808f9384f2dc..2094d3468bbd 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=PulseAudio sound server plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7f6e590eaee8d148fd148aedc5862003
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.18.4
index feb94d69e45a..677b1c9ae69f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Fiwewire DV/HDV capture plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1987e1db2a6e35d4873988a7ae97d9bd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.18.4
index 4402eb08e128..0db806464f5d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libdvdnav-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libdvdread-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libdvdnav-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libdvdread-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=DVD playback support plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libdvdnav-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libdvdread-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libdvdnav-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libdvdread-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=99dc4fbe35ba1b96b4873eefcf126a78
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.18.4
index b3c0529baf89..8c852c2af434 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=RTMP source/sink plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=deff296eebde5f6488a0212b9082ddef
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.18.4
index 4f453d77d73f..6129c846ca5a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Icecast server sink plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c218c57bfb73a42bc5649b36f6678958
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.18.4
index c1acf9ce1ac0..db5b5849d48c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Sid decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=aab8a7f4c74b4168538aa3f06dddc583
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.18.4
index 527b21ca47e2..34d4d9e0069c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Smooth Streaming plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=31a3644f20e427620b751be351de4eb0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.18.4
index 29a86efa6517..bb0af6b447e8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libsoundtouch-1.7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libsoundtouch-1.7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Beats-per-minute detection and pitch controlling plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libsoundtouch-1.7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libsoundtouch-1.7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0213ddb7901b93cd42cce8fdc8b099a8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.18.4
index 9ce38782f8f7..20d19ca134a6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=HTTP client source/sink plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
 LICENSE=GPL-2
-RDEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1799d0fb040b79a428860ce3af76cce3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.18.4
index 59f39103219a..3048982bb770 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Speex encoder/decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8301a5da98309a48188c539bc1983bc8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-srt-1.18.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-srt-1.18.4-r1
index c2de57fbc8c1..7a2b9e445f54 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-srt-1.18.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-srt-1.18.4-r1
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=net-libs/srt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=net-libs/srt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Secure reliable transport (SRT) transfer plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=net-libs/srt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=net-libs/srt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0ebcd326b9e49beef0e3a81e38ad23e5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.18.4
index 1923c334752c..3af52b2a8116 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/glib-utils >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/glib-utils >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=SRTP encoder/decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e55c632cf147d88d0ac1e599f6e0f9b2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.18.4
index 3ff68f4494d9..f2b1210d34ac 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=ID3v2/APEv2 tagger plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f1a356aadd3f0421564d8ebf9f9cb100
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.18.4
index bd3344cc7b8a..d754aaad741b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=MPEG2 encoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=61d6a2983d6703ef6d17d348ec31096b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.18.4
index 0eb25a1e0406..fec73e07992d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=dev-libs/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=UVC compliant H264 encoding cameras plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=dev-libs/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3e9496eb351cefce2e95ffc5555a32ee
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.18.4
index cd4465510c2e..d238fdca6598 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( >=dev-libs/libgudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/os-headers >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( >=dev-libs/libgudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/os-headers >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=plugin for gstreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=udev test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( >=dev-libs/libgudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( >=dev-libs/libgudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4c770c50326ccfcf0911c9f1c2b415d7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.18.4
index 62b32db3f8ac..ec467be7af0e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.18.4
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP nls? ( >=sys-devel/gettext-0.17 ) test? ( media-libs/gstreamer[test] )
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] drm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/gst-plugins-base-1.18.4:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/gst-plugins-base-1.18.4:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.12 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] drm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/gst-plugins-base-1.18.4:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/gst-plugins-base-1.18.4:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.12 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Hardware accelerated video decoding through VA-API plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi
 IUSE=+drm +egl gles2 +opengl wayland +X test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] drm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/gst-plugins-base-1.18.4:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/gst-plugins-base-1.18.4:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] drm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/gst-plugins-base-1.18.4:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/gst-plugins-base-1.18.4:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=|| ( drm gles2 opengl wayland X ) gles2? ( egl ) opengl? ( || ( egl X ) )
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1fd43a9c691248f04e9792a709b0b6a7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.18.4
index 7c4ae4a85672..924479c5a19c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=AAC encoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5c2467dc667138c83e8b950b9ead4c86
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.18.4
index d85d709aceea..6797fb62e38a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=AMR-WB audio encoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b6a4afbc1b35593ec0d89ba97b62b986
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.18.4
index fc1203e53d49..22b2a545ac53 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libvpx-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/libvpx-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=VP8/VP9 video encoder/decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libvpx-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/libvpx-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6f223b7c5266c77cb7b708d9ee777f02
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.18.4
index 307e11cc1908..37144507eddf 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Wavpack audio encoder/decoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=73206a0932f34636d4b414d6abc26e9f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.18.4
index 00974b792c5a..5ea1bbd1b95a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/webrtc-audio-processing-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <media-libs/webrtc-audio-processing-0.4 >=net-libs/libnice-0.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/webrtc-audio-processing-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <media-libs/webrtc-audio-processing-0.4 >=net-libs/libnice-0.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=WebRTC plugins for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/webrtc-audio-processing-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <media-libs/webrtc-audio-processing-0.4 >=net-libs/libnice-0.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/webrtc-audio-processing-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <media-libs/webrtc-audio-processing-0.4 >=net-libs/libnice-0.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=13211b6778cbdde10015526293ed1e50
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.18.4
index 3feade3d59ce..3c22f23ad9e9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=H.264 encoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9811bd41fc13cb3ecbe677527ea58bad
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.18.4
index a8770627be6d..27b704880bb6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=H.265 encoder plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d37a7592939dd76b31fd1d8260cc661a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.18.4
index 70229bd9eae8..ff79f4ca487f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=X11 video capture stream plugin for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-libs/gst-plugins-base-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a926f368dfc7f1c5af12d7817e001472
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.18.4
index 56ad5998f093..81595a85a547 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.18.4
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=sys-apps/sed-4 virtual/pkgconfig virtual/perl-JSON-PP
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-gfx/zbar-0.10_p20121015-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=media-gfx/zbar-0.10_p20121015-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Bar codes detection in video streams for GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=media-gfx/zbar-0.10_p20121015-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=media-gfx/zbar-0.10_p20121015-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	aa02d934b190656e3d1d3a882c9edbbb	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dc6a2643d3cd50002661f7a82626e1cc
diff --git a/metadata/md5-cache/media-plugins/gst-transcoder-1.14.1 b/metadata/md5-cache/media-plugins/gst-transcoder-1.14.1
deleted file mode 100644
index 6d2a33a888a1..000000000000
--- a/metadata/md5-cache/media-plugins/gst-transcoder-1.14.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/gobject-introspection:= dev-libs/glib:2 >=media-libs/gstreamer-1.14.1:1.0[introspection] >=media-libs/gst-plugins-base-1.14.1:1.0[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GStreamer Transcoding API
-EAPI=7
-HOMEPAGE=https://github.com/pitivi/gst-transcoder
-IUSE=gtk-doc
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/gobject-introspection:= dev-libs/glib:2 >=media-libs/gstreamer-1.14.1:1.0[introspection] >=media-libs/gst-plugins-base-1.14.1:1.0[introspection]
-SLOT=0
-SRC_URI=https://github.com/pitivi/gst-transcoder/archive/1.14.1.tar.gz -> gst-transcoder-1.14.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2e8ffb79e372f48615fc7473f434e8e6
diff --git a/metadata/md5-cache/media-plugins/gst-transcoder-1.14.1-r1 b/metadata/md5-cache/media-plugins/gst-transcoder-1.14.1-r1
new file mode 100644
index 000000000000..88af09b06b69
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-transcoder-1.14.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/gobject-introspection:= dev-libs/glib:2 >=media-libs/gstreamer-1.14.1:1.0[introspection] >=media-libs/gst-plugins-base-1.14.1:1.0[introspection] !>media-libs/gst-plugins-bad-1.18 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GStreamer Transcoding API
+EAPI=7
+HOMEPAGE=https://github.com/pitivi/gst-transcoder
+IUSE=gtk-doc
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/gobject-introspection:= dev-libs/glib:2 >=media-libs/gstreamer-1.14.1:1.0[introspection] >=media-libs/gst-plugins-base-1.14.1:1.0[introspection] !>media-libs/gst-plugins-bad-1.18
+SLOT=0
+SRC_URI=https://github.com/pitivi/gst-transcoder/archive/1.14.1.tar.gz -> gst-transcoder-1.14.1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d615319c2c0d5668cb3afbc03436792a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.6 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.6
new file mode 100644
index 000000000000..94721a8a238e
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.6
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
+DESCRIPTION=Kodi's NextPVR client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/8.2.6-Matrix.tar.gz -> kodi-pvr-nextpvr-8.2.6.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ca4c53900186dc3ef139139d913d7f48
diff --git a/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1 b/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
index 1ab8b4243edf..241b7610c8a3 100644
--- a/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.7.23 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.7.23 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: control an linear or horizon actuator attached trough the parallel port
 EAPI=7
 HOMEPAGE=http://ventoso.org/luca/vdr/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://ventoso.org/luca/vdr/vdr-actuator-1.2.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a52498708a6f023c62f06526f56c871c
diff --git a/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025 b/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
index 627ab2451ef0..22475dd442c7 100644
--- a/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
+++ b/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: control an hor. or ver. actuator attached trough the parallel port
 EAPI=7
 HOMEPAGE=http://ventoso.org/luca/vdr/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/olivluca/vdr-actuator-plugin/archive/c810abffbf6dc6f1f354b0c545abe65311203fd8.tar.gz -> vdr-actuator-2.4.1_pre20181025.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d5c2273d0a3bb037fd5387a7e43fec4b
diff --git a/metadata/md5-cache/media-plugins/vdr-avards-0.2.4 b/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
index 832d9630c689..d9c5424430b9 100644
--- a/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Automatic Video Aspect Ratio Detection and Signaling
 EAPI=7
 HOMEPAGE=http://firefly.vdr-developer.org/avards/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/avards/vdr-avards-0.2.4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3918630bcee92ecdb62bb02ffd0dcd5e
diff --git a/metadata/md5-cache/media-plugins/vdr-avards-0.2.6 b/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
index 3743bc3b1d6a..6497cd71030a 100644
--- a/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
+++ b/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Automatic Video Aspect Ratio Detection and Signaling
 EAPI=7
 HOMEPAGE=http://firefly.vdr-developer.org/avards/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/avards/vdr-avards-0.2.6.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a93235141234334e07961e07725632bb
diff --git a/metadata/md5-cache/media-plugins/vdr-beep-0.1.2 b/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
index 67cae13d964f..8bb2684dd3eb 100644
--- a/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: Use the PC speaker to signalize some events (shutdown, cut done ...)
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-beep/vdr-beep-0.1.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c467feb10e2a2e79f1c51b0f445917a1
diff --git a/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r2 b/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r2
index 265974b0f184..d41376d6316d 100644
--- a/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r2
+++ b/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r2
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/gd[png,truetype,jpeg] media-video/vdr >=dev-libs/boost-1.32.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-libs/gd[png,truetype,jpeg] media-video/vdr >=dev-libs/boost-1.32.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: burn records on DVD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-burn
 IUSE=dvdarchive
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-libs/gd[png,truetype,jpeg] media-video/vdr dvdarchive? ( media-video/vdrtools-genindex ) >=app-cdr/dvd+rw-tools-5.21 >=dev-libs/libcdio-0.71 media-fonts/corefonts >=media-video/dvdauthor-0.6.14 >=media-video/mjpegtools-1.6.2[png] >=media-video/projectx-0.90.4.00_p32 media-video/transcode sys-apps/util-linux >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-libs/gd[png,truetype,jpeg] media-video/vdr dvdarchive? ( media-video/vdrtools-genindex ) >=app-cdr/dvd+rw-tools-5.21 >=dev-libs/libcdio-0.71 media-fonts/corefonts >=media-video/dvdauthor-0.6.14 >=media-video/mjpegtools-1.6.2[png] >=media-video/projectx-0.90.4.00_p32 media-video/transcode sys-apps/util-linux media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1252/vdr-burn-0.2.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=871bf156cbfb94a49ab878421a7fa8f7
diff --git a/metadata/md5-cache/media-plugins/vdr-burn-0.3.0-r2 b/metadata/md5-cache/media-plugins/vdr-burn-0.3.0-r2
index e6d9aba1cc1e..1359d23bb0a6 100644
--- a/metadata/md5-cache/media-plugins/vdr-burn-0.3.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-burn-0.3.0-r2
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/gd[png,truetype,jpeg] media-video/vdr dev-libs/boost >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-libs/gd[png,truetype,jpeg] media-video/vdr dev-libs/boost media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: burn records on DVD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-burn
 IUSE=dvdarchive
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-libs/gd[png,truetype,jpeg] media-video/vdr app-cdr/dvd+rw-tools dev-libs/libcdio media-fonts/corefonts media-video/dvdauthor media-video/mjpegtools[png] media-video/projectx media-video/transcode sys-apps/util-linux >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-libs/gd[png,truetype,jpeg] media-video/vdr app-cdr/dvd+rw-tools dev-libs/libcdio media-fonts/corefonts media-video/dvdauthor media-video/mjpegtools[png] media-video/projectx media-video/transcode sys-apps/util-linux media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2028/vdr-burn-0.3.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c8dc44dca734aaf9adca0204a2c35c4a
diff --git a/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5 b/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
index 23ec90cd87bc..fa11998284a2 100644
--- a/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
+++ b/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.3.7 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: OSD Calculator
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.3.7 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-calc/vdr-calc-0[1].0.1-rc5.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5e349da83a3e807360ff13f652bce0c6
diff --git a/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2 b/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
index c1448a4b0590..b970abbd74eb 100644
--- a/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 >=dev-libs/libcdio-0.8.0 >=media-libs/libcddb-1.3.0 cdparanoia? ( >=dev-libs/libcdio-paranoia-0.90 ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2 >=dev-libs/libcdio-0.8.0 >=media-libs/libcddb-1.3.0 cdparanoia? ( >=dev-libs/libcdio-paranoia-0.90 ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: CD-PLAYER
 EAPI=7
 HOMEPAGE=https://www.uli-eckhardt.de/vdr/cdplayer.en.shtml
 IUSE=cdparanoia
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2 >=dev-libs/libcdio-0.8.0 >=media-libs/libcddb-1.3.0 cdparanoia? ( >=dev-libs/libcdio-paranoia-0.90 ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2 >=dev-libs/libcdio-0.8.0 >=media-libs/libcddb-1.3.0 cdparanoia? ( >=dev-libs/libcdio-paranoia-0.90 ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://www.uli-eckhardt.de/vdr/download/vdr-cdplayer-1.2.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f4d776e9daba5a695c1f4268ea00bf70
diff --git a/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5 b/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
index 489c9aaa8d87..f0ecac37d370 100644
--- a/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Show black bars to hide station logo
 EAPI=7
 HOMEPAGE=http://www.egal-vdr.de/plugins/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.egal-vdr.de/plugins/vdr-cinebars-0.0.5.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=572a26682e3fe2cb7afaebefd9dd2952
diff --git a/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2 b/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2
index 3ba826c0e096..7df17e49edfc 100644
--- a/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.5.9 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Tea clock, clock
 EAPI=7
 HOMEPAGE=https://github.com/madmartin/vdr-clock
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.5.9 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/madmartin/vdr-clock/archive/v1.0.0.tar.gz -> vdr-clock-1.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f3cf0ce18bf07a3cd0fe5f87c9ad028c
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4 b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
index f8a7d5b9707d..78c54fcdc501 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR plugin: DDCI2 - Digital Devices CI support
 EAPI=6
 HOMEPAGE=https://github.com/jasmin-j/vdr-plugin-ddci2
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/jasmin-j/vdr-plugin-ddci2/archive/1.0.4.tar.gz -> vdr-ddci2-1.0.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=053eee2b0d77291590ef1e55e41d9ace
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5 b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
index 56958ac551b1..8a74eabc8c5e 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR plugin: DDCI2 - Digital Devices CI support
 EAPI=6
 HOMEPAGE=https://github.com/jasmin-j/vdr-plugin-ddci2
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/jasmin-j/vdr-plugin-ddci2/archive/1.0.5.tar.gz -> vdr-ddci2-1.0.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=053eee2b0d77291590ef1e55e41d9ace
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-9999 b/metadata/md5-cache/media-plugins/vdr-ddci2-9999
index 7fbdc820b30f..f5490e7e8767 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-9999
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=VDR plugin: DDCI2 - Digital Devices CI support
 EAPI=6
 HOMEPAGE=https://github.com/jasmin-j/vdr-plugin-ddci2
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.1.7 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=053eee2b0d77291590ef1e55e41d9ace
diff --git a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1 b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1
index c026b9e48935..78c2f6cbb5d0 100644
--- a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: display the usage status of the available DVB devices
 EAPI=7
 HOMEPAGE=http://www.u32.de/vdr.html
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.u32.de/download/vdr-devstatus-0.4.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cca7fd28653d27963e02687a38aca3b2
diff --git a/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0 b/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
index 8731565fd162..1bd114978e63 100644
--- a/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: dummy output device ,for recording server without any output devices
 EAPI=7
 HOMEPAGE=http://phivdr.dyndns.org/vdr/vdr-dummydevice/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-dummydevice/vdr-dummydevice-2.0.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b81bbfe0ffc0059cf0922dd983d94380
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5 b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
index 58d46143dfba..8cd7f2ece866 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: show duplicated records
 EAPI=5
 HOMEPAGE=http://www.tolleri.net/vdr/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.0.5.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5ae02aa4c2678a5b5cfdd52c1dba48a5
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1 b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1
index 34b9b21ad30a..179c4753d706 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: show duplicated records
 EAPI=5
 HOMEPAGE=http://www.tolleri.net/vdr/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.0.5.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d623b9858fe94f0c46c969990cb51799
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0 b/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0
index 94b66886c2bb..9d1f2601d807 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: show duplicated records
 EAPI=5
 HOMEPAGE=http://www.tolleri.net/vdr/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.1.0.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=336c949700287f44f0c51d4cc30ed0e3
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1 b/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
index b538217e5046..96cc7c401b74 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: show duplicated records
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-duplicates/repository
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-duplicates.git/snapshot/vdr-plugin-duplicates-68739fd72beb9745b3e47b9e466311ef23a8ca97.tar.gz -> vdr-duplicates-1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7561edb06967a092efd0ddc0c5fcc46c
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4 b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4
index d06266158162..9e90895ef142 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.1.4 dvbcsa? ( media-libs/libdvbcsa ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.1.4 dvbcsa? ( media-libs/libdvbcsa ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: allows connect VDR to OScam
 EAPI=6
 HOMEPAGE=https://github.com/manio/vdr-plugin-dvbapi
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dvbcsa
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=media-video/vdr-2.1.4 dvbcsa? ( media-libs/libdvbcsa ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.1.4 dvbcsa? ( media-libs/libdvbcsa ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/manio/vdr-plugin-dvbapi/archive/v2.2.4.tar.gz -> vdr-plugin-dvbapi-2.2.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a5613cd0ef745356be93f322aa40bd8
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5 b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5
index 03c81fc6e962..b26647130d2e 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5
+++ b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.1 dvbcsa? ( media-libs/libdvbcsa ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.1 dvbcsa? ( media-libs/libdvbcsa ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: allows connect VDR to OScam
 EAPI=7
 HOMEPAGE=https://github.com/manio/vdr-plugin-dvbapi
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dvbcsa
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=media-video/vdr-2.4.1 dvbcsa? ( media-libs/libdvbcsa ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.4.1 dvbcsa? ( media-libs/libdvbcsa ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/manio/vdr-plugin-dvbapi/archive/v2.2.5.tar.gz -> vdr-plugin-dvbapi-2.2.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d24b3936d584fb40bed134ca55bd12c
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115 b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
index d990ca1b4cde..bb37f358e47b 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
+++ b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.7.39 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.7.39 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: output device for the 'Full Featured' TechnoTrend S2-6400 DVB Card
 EAPI=7
 HOMEPAGE=https://bitbucket.org/powARman/dvbhddevice
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.7.39 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.7.39 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/dvbhddevice/get/60c58ae453d0.tar.gz -> dvbhddevice-2.1.3_p20140115.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c9d4e09c84b87bf99157cf9c875ece78
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420-r1 b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420-r1
index abbefedff54e..8f1f9852a09d 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420-r1
+++ b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: output device for the 'Full Featured' TechnoTrend S2-6400 DVB Card
 EAPI=7
 HOMEPAGE=https://bitbucket.org/powARman/dvbhddevice
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/dvbhddevice/get/6a3e75484d90.tar.bz2 -> vdr-dvbhddevice-2.2.0_p20180420.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=72e7a48e265b569b05971a29e748619b
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0 b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0
index c312bae8c1eb..33fcf0a2d11a 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: output device for the 'Full Featured' SD DVB Card
 EAPI=5
 HOMEPAGE=http://www.tvdr.de/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-dvbsddevice-2.2.0.tar.gz https://dev.gentoo.org/~hd_brummy/distfiles/vdr-dvbsddevice-2.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e551fa51923b8da1fe86baeac32c8551
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0-r2 b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0-r2
index 3e7b5f651441..c570ea67c153 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0-r2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: output device for the 'Full Featured' SD DVB Card
 EAPI=7
 HOMEPAGE=http://www.tvdr.de/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://ftp.tvdr.de/Plugins/vdr-dvbsddevice-2.2.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=15256986f1bd287f05a18db16a654983
diff --git a/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1 b/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1
index 6f9c6ac0bd21..448cd50cc870 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1
+++ b/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: DVD-Player
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/dvdplugin
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-dvd-cvs-20090106.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=478da0e8a903f7fc165d7d85541e3d29
diff --git a/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r4 b/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r4
index 58c9943c7e21..d3d76decbae2 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r4
+++ b/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r4
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: DVD-Player
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/dvdplugin
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-dvd-cvs-20090106.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=46606d4f07bb7be016ea4aca709dda4b
diff --git a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2 b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
index c5422c48bb77..d6b951d1b5ca 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: to play dvds and dvd file structures
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-dvdswitch
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=media-plugins/vdr-dvd >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-plugins/vdr-dvd media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1323/vdr-dvdswitch-0.2.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2b4723259b88f85c33dfffa4675a3851
diff --git a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3 b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
index 257c4eb40ce3..9036419f5755 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
+++ b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: to play dvds and dvd file structures
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-dvdswitch
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=media-plugins/vdr-dvd >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-plugins/vdr-dvd media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2084/vdr-dvdswitch-0.2.3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2bdb61208ef1e0be8d2fe32381d7e902
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0 b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0
index 0c309a1353c7..504c93271ea4 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND==media-video/vdr-2.2* pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND==media-video/vdr-2.2* pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: create timers from epg content based on saved search expressions
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git
 IUSE=+conflictcheckonly +epgsearchonly pcre +quicksearch tre
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND==media-video/vdr-2.2* pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND==media-video/vdr-2.2* pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 REQUIRED_USE=?? ( pcre tre )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-2.2.0.tar.gz -> vdr-epgsearch-2.2.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c4099808efaf0b6c2a1c1b485ff4f7a0
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20200402-r1 b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20200402-r1
index 1da24fc75671..061a4c0e4b34 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20200402-r1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20200402-r1
@@ -1,15 +1,15 @@
-BDEPEND=sys-apps/groff dev-lang/perl
+BDEPEND=sys-apps/groff dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: create timers from epg content based on saved search expressions
 EAPI=7
 HOMEPAGE=http://winni.vdr-developer.org/epgsearch/index_eng.html
 IUSE=conflictcheckonly epgsearchonly pcre quicksearch tre
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 REQUIRED_USE=?? ( pcre tre )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-d8cff1a251ef2b54f1de3f8e6ea55a838eeb73c3.tar.gz -> vdr-epgsearch-2.4.0_p20200402.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bb32d9860cb7fdb213cf654abc178810
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.1 b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.1
index b41b8f260c0e..da4f0edf8eab 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.1
@@ -1,15 +1,15 @@
-BDEPEND=sys-apps/groff dev-lang/perl
+BDEPEND=sys-apps/groff dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: create timers from epg content based on saved search expressions
 EAPI=7
 HOMEPAGE=http://winni.vdr-developer.org/epgsearch/index_eng.html
 IUSE=conflictcheckonly epgsearchonly pcre quicksearch tre
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 REQUIRED_USE=?? ( pcre tre )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-cff8dfe58853aa0cc4f6e9a8896104a920b98730.tar.gz -> vdr-epgsearch-2.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b5c7d5ae8a89c898cf2f86388743cda8
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1 b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
index 6ef69267ebcb..a7df18c1f2b1 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Import the EPG of another VDR via vdr-svdrpservice
 EAPI=7
 HOMEPAGE=http://vdr.schmirler.de/
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/epgsync/vdr-epgsync-1.0.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5649f1e552057b9150247450f26d0711
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1 b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
index 7820fa0521ed..24b8310a3080 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Import the EPG of another VDR via vdr-svdrpservice
 EAPI=7
 HOMEPAGE=http://vdr.schmirler.de/
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/epgsync/vdr-epgsync-1.0.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b359a6edf2c06b5932898dd379d99d59
diff --git a/metadata/md5-cache/media-plugins/vdr-exec-0.0.3 b/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
index e6428bccefcc..8e333c8e9aa5 100644
--- a/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: Exec commands like timers at defined times
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-exec/vdr-exec-0.0.3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7be1624275e12c5e7f5348e96491781
diff --git a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4 b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4
index 94b3e647c6bf..de3d364fea70 100644
--- a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: Extended recordings menu
 EAPI=5
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-extrecmenu
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1783/vdr-extrecmenu-1.2.4.tgz mirror://gentoo/dvdarchive-2.3-beta.sh.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=80fad907d5c2cfcd14b468e4ab6dc3c6
diff --git a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r2 b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r2
index ea11d3ab00a9..fee41bf21c2f 100644
--- a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r2
+++ b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Extended recordings menu
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-extrecmenu
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-extrecmenu.git/snapshot/vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b.tar.gz -> vdr-extrecmenu-1.2.4-r2.tar.gz mirror://gentoo/dvdarchive-2.3-beta.sh.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a148c9e848d60aba8925154ea4c0aad1
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.0.4 b/metadata/md5-cache/media-plugins/vdr-femon-2.0.4
index 1b797320258e..1dc07da538ec 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.0.4
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: DVB Frontend Status Monitor (signal strengt/noise)
 EAPI=5
 HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/femon/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.0.4.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0391a4a7a3d5f401a95086212dc4d51d
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.0.4-r1 b/metadata/md5-cache/media-plugins/vdr-femon-2.0.4-r1
index 733610cfbac2..74004ff97a8c 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.0.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.0.4-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: DVB Frontend Status Monitor (signal strength/noise)
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-femon
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-femon/archive/v2.0.4.tar.gz -> vdr-femon-2.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=81b9f5351eb717734c80c714d0c20457
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.4.0 b/metadata/md5-cache/media-plugins/vdr-femon-2.4.0
index bc8c38eaf41a..cff7a2e180c8 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.4.0
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: DVB Frontend Status Monitor (signal strength/noise)
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-femon
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=>=media-video/vdr-2.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.4.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-femon/archive/v2.4.0.tar.gz -> vdr-femon-2.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=13134e833112e52956c78df0ee3aa5e3
diff --git a/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2 b/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
index 6530226a865e..b2215b40e14f 100644
--- a/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: Output device which offers OSD via VNC and Video as raw mpeg over network
 EAPI=6
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-ffnetdev
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.6.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/837/vdr-ffnetdev-0.1.2.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bbd0fc3f9138f4edaa0a339f9affaccc
diff --git a/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1 b/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
index 2f6195619e8d..5b2a8fa4c20f 100644
--- a/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.4.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: file manager plugin for moving or renaming files in VDR
 EAPI=7
 HOMEPAGE=http://vdr.nasenbaeren.net/filebrowser/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.4.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.nasenbaeren.net/filebrowser/vdr-filebrowser-0.2.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=646e2fe3919c76e58e27204b8280f153
diff --git a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3 b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3
index 0ea9cf36e167..a306b350e1b7 100644
--- a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3
+++ b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR plugin: play 'Freecell' on the On Screen Display
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-freecell/vdr-freecell-0.0.2.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=61940d4f16a8247bb2fa83517c2a2b76
diff --git a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4 b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
index 954b0662b88f..9969b4ea97ba 100644
--- a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
+++ b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: play 'Freecell' on the On Screen Display
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-freecell/vdr-freecell-0.0.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a78ca9d81ec713d0abf535cadb312a07
diff --git a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r2 b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r2
index 422ea16e43f2..c7c352858ddb 100644
--- a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r2
+++ b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=dev-libs/libgcrypt:= dev-libs/boost:=[threads(+)] >=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=dev-libs/libgcrypt:= dev-libs/boost:=[threads(+)] >=media-video/vdr-1.7.34 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: Inform about incoming phone-calls and use the fritz!box phonebook
 EAPI=6
 HOMEPAGE=https://github.com/jowi24/vdr-fritz
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libgcrypt:= dev-libs/boost:=[threads(+)] >=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=dev-libs/libgcrypt:= dev-libs/boost:=[threads(+)] >=media-video/vdr-1.7.34 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-fritz/releases/download/1.5.3/vdr-fritzbox-1.5.3.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=88f4519ab87e6b9621a49cf18f46ca04
diff --git a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r4 b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r4
index 37e5d8e5d303..d53b59a60b68 100644
--- a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r4
+++ b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r4
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=dev-libs/libgcrypt:= dev-libs/boost:=[threads(+)] media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=dev-libs/libgcrypt:= dev-libs/boost:=[threads(+)] media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Inform about incoming phone-calls and use the fritz!box phonebook
 EAPI=7
 HOMEPAGE=https://github.com/jowi24/vdr-fritz
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libgcrypt:= dev-libs/boost:=[threads(+)] media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=dev-libs/libgcrypt:= dev-libs/boost:=[threads(+)] media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-fritz/releases/download/1.5.3/vdr-fritzbox-1.5.3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=49e17f43eaf8f9e6440cee971398a9fa
diff --git a/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1-r2 b/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1-r2
index d2205937fe84..0d51f83e69a2 100644
--- a/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1-r2
+++ b/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1-r2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm preinst prepare setup unpack
-DEPEND=>=app-misc/graphlcd-base-1.0.1 media-fonts/corefonts media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=app-misc/graphlcd-base-1.0.1 media-fonts/corefonts media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: support output on Graphical LCD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-graphlcd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-misc/graphlcd-base-1.0.1 media-fonts/corefonts media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=app-misc/graphlcd-base-1.0.1 media-fonts/corefonts media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-graphlcd.git/snapshot/vdr-plugin-graphlcd-1.0.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f3aa6a327510190b3ead2070ddd4a948
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2 b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
index c4a45cefcc3a..eb55ebbf2fa0 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
@@ -1,14 +1,14 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=media-libs/freetype virtual/udev media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-libs/freetype virtual/udev media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: shows information about the current state of VDR on iMON LCD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-imonlcd/wiki
 IUSE=kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=media-libs/freetype virtual/udev >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-libs/freetype virtual/udev media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/attachments/download/2086/vdr-imonlcd-1.0.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d0eeb9945a351e83ba54588853c10281
diff --git a/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1 b/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
index 948203b1e396..d6628a025f18 100644
--- a/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.1.6 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.1.6 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: Add a logical device capable of receiving IPTV
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-iptv
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=media-video/vdr-2.1.6 net-misc/curl >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.1.6 net-misc/curl media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-iptv/archive/v2.2.1.tar.gz -> vdr-iptv-2.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5756a47a862b8fc8f0b9e2f84c0e2313
diff --git a/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0 b/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0
index 60d6d116640b..5fe67fa0dde1 100644
--- a/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: Add a logical device capable of receiving IPTV
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-iptv
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=media-video/vdr-2.4.0 net-misc/curl >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.4.0 net-misc/curl media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-iptv/archive/v2.4.0.tar.gz -> vdr-iptv-2.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8177d715d8f60f27cb1a9feff6801e38
diff --git a/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3 b/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
index 545acae856a3..479f054017be 100644
--- a/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: allows using a joystick as a remote control for VDR
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-joystick/vdr-joystick-0.0.3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a785b4793ccfd4e8e989b4618b53a60
diff --git a/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4-r1 b/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4-r1
index 769e316fe06f..3f0c4e89210c 100644
--- a/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.3.7 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: launch other plugins - even when their menu-entry is hidden
 EAPI=7
 HOMEPAGE=http://winni.vdr-developer.org/launcher/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.3.7 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/launcher/downloads/vdr-launcher-0.0.4.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9473456b9c65a0d9523f136225f95acc
diff --git a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9 b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
index 41872c759c67..d32f53601f7d 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
+++ b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6 >=app-misc/lcdproc-0.4.3 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6 >=app-misc/lcdproc-0.4.3 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: use LCD device for additional output
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-lcdproc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.6 >=app-misc/lcdproc-0.4.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.6 >=app-misc/lcdproc-0.4.3 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/932/vdr-lcdproc-0.0.10-jw9.tgz -> vdr-lcdproc-0.0.10.9.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=84b08e03f15c4aef814090b4807bc583
diff --git a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1 b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1
index f10ad14c8820..68a5e904080a 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1
+++ b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=app-misc/lcdproc-0.4.3 >=media-video/vdr-2.4 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=app-misc/lcdproc-0.4.3 >=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: use LCD device for additional output
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-lcdproc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/932/vdr-lcdproc-0.0.10-jw9.tgz -> vdr-lcdproc-0.0.10.9.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1dc0729a56f74523f679e8fe554f660d
diff --git a/metadata/md5-cache/media-plugins/vdr-live-3.0.6 b/metadata/md5-cache/media-plugins/vdr-live-3.0.6
index aaca252f376c..c110886e0a10 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-3.0.6
+++ b/metadata/md5-cache/media-plugins/vdr-live-3.0.6
@@ -1,14 +1,14 @@
-BDEPEND=ssl? ( dev-libs/openssl:0 )
+BDEPEND=ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=dev-libs/tntnet-3[ssl=] >=dev-libs/cxxtools-3 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr >=dev-libs/tntnet-3[ssl=] >=dev-libs/cxxtools-3 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Web Access To Settings
 EAPI=7
 HOMEPAGE=https://github.com/MarkusEh/vdr-plugin-live
 IUSE=pcre ssl ssl
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0 GPL-2+ RSA
-RDEPEND=media-video/vdr >=dev-libs/tntnet-3[ssl=] >=dev-libs/cxxtools-3 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr >=dev-libs/tntnet-3[ssl=] >=dev-libs/cxxtools-3 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/MarkusEh/vdr-plugin-live/archive/v3.0.6.tar.gz -> vdr-live-3.0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c629840c3acb36c1b7bd716c965df245
diff --git a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7 b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7
index 705a1ed84652..adf0103f15f1 100644
--- a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7
+++ b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR : Loadepg Plugin; Canal+ group (Mediahighway)
 EAPI=7
 HOMEPAGE=http://lukkinosat.altervista.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://lukkinosat.altervista.org/vdr-loadepg-0.2.7.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e137549efc924879edd9d85bd91874b5
diff --git a/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1-r1 b/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1-r1
index 1ff405ed925a..985fca6cf99b 100644
--- a/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm:2 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm:2 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: make osd menu configurable via config-file
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-menuorg
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm:2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0.0[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm:2 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1312/vdr-menuorg-0.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7f0352d11e655a5739d4aecf63616e71
diff --git a/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2 b/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
index ae66f00312b7..749d872394e6 100644
--- a/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: Show a history of the last OSD message
 EAPI=7
 HOMEPAGE=https://github.com/jowi24/vdr-mlist
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-mlist/archive/1.0.2.tar.gz -> vdr-mlist-1.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=10f13e3882336f65f9da2b59123e52b2
diff --git a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r5 b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r5
index 53fd7671c733..6a8f820efd2e 100644
--- a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r5
+++ b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r5
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-libs/imlib2 media-libs/libmad media-libs/libid3tag media-libs/libsndfile media-video/vdr sys-libs/zlib vorbis? ( media-libs/libvorbis ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-libs/imlib2 media-libs/libmad media-libs/libid3tag media-libs/libsndfile media-video/vdr sys-libs/zlib vorbis? ( media-libs/libvorbis ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: play mp3 and ogg on VDR
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=oss vorbis
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-mp3ng/vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz mirror://gentoo/vdr-mp3ng-pictures-0.0.1.tar.gz mirror://gentoo/vdr-mp3ng-0.0.1_pre4-span-0.0.3.diff.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e4fb21dd2779a34d813fecfe10e36a2f
diff --git a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2-r2 b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2-r2
index e9e03334873d..3af802ff8abe 100644
--- a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2-r2
+++ b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2-r2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.4.2 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.4.2 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Play video files not supported by VDR with mplayer (divx and more)
 EAPI=7
 HOMEPAGE=http://www.muempf.de/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.4.2 || ( media-video/mplay-sh >=media-video/mplayer-sh-0.8.6-r1 ) sys-apps/util-linux >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.4.2 || ( media-video/mplay-sh >=media-video/mplayer-sh-0.8.6-r1 ) sys-apps/util-linux media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.muempf.de/down/vdr-mp3-0.10.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=68adbf0a433ddff6f72dfef0b28d4ac1
diff --git a/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4 b/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
index 4071ba9ed71d..d35222e194d6 100644
--- a/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.2.6 net-misc/wget >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.2.6 net-misc/wget media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: Show rdf Newsticker on TV
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-newsticker/vdr-newsticker-0.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=24ce89394cbf3fe9bdb2206104dd0cf6
diff --git a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4 b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
index 38c5d24d2ae6..5f73259e7069 100644
--- a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: will replace the noepg-patch with the new cEpgHandler
 EAPI=7
 HOMEPAGE=https://github.com/flensrocker/vdr-plugin-noepg
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/flensrocker/vdr-plugin-noepg/archive/v0.0.4.tar.gz -> vdr-noepg-0.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=54e9303daec358a8d0ad12fc5ad9e5f4
diff --git a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5 b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5
index c174f2aef8a9..c24616d6ffae 100644
--- a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: will replace the noepg-patch with the new cEpgHandler
 EAPI=7
 HOMEPAGE=https://github.com/flensrocker/vdr-plugin-noepg
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/flensrocker/vdr-plugin-noepg/archive/v0.0.5.tar.gz -> vdr-noepg-0.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c7e6090a00034475769d8879da32bf37
diff --git a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3 b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
index 797f4237e82f..432407b33b8d 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.7.20 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.7.20 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: VDR OSD access for ext. programs through a TCP/IP socket connection
 EAPI=7
 HOMEPAGE=http://www.udo-richter.de/vdr/osdserver.en.html
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.udo-richter.de/vdr/files/vdr-osdserver-0.1.3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bc08194eaca137003b76d12a30cf4787
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7 b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7
index 68540f99fec2..9c1a645f8e23 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Osd-Teletext displays the teletext on the OSD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-osdteletext
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ public-domain
-RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/attachments/download/2161/vdr-osdteletext-0.9.7.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9951f9bbcbc864cefb068591843b1601
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.8 b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.8
index 998c0f8daec7..bb57cc5ee68c 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.8
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.8
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Osd-Teletext displays the teletext/videotext on the OSD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-osdteletext https://github.com/vdr-projects/vdr-plugin-osdteletext/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ public-domain
-RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v0.9.8.tar.gz -> vdr-osdteletext-0.9.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c88e4c08aeada3209253a38076395ebe
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-1.1.1 b/metadata/md5-cache/media-plugins/vdr-osdteletext-1.1.1
index 1cd3ae34c647..fffb894d9bb9 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-1.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-1.1.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Osd-Teletext displays the teletext/videotext on the OSD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-osdteletext https://github.com/vdr-projects/vdr-plugin-osdteletext/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ public-domain
-RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v1.1.1.tar.gz -> vdr-osdteletext-1.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c88e4c08aeada3209253a38076395ebe
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-2.1.1 b/metadata/md5-cache/media-plugins/vdr-osdteletext-2.1.1
index dda659e33546..93345975928f 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-2.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-2.1.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Osd-Teletext displays the teletext/videotext on the OSD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-osdteletext https://github.com/vdr-projects/vdr-plugin-osdteletext/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ public-domain
-RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v2.1.1.tar.gz -> vdr-osdteletext-2.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d29e12ea0263418d5ca5459c3356fe13
diff --git a/metadata/md5-cache/media-plugins/vdr-peer-0.0.1 b/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
index 64fe7730b636..c5b280d562c8 100644
--- a/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=~media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=~media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: peer-to-peer between multiple VDRs
 EAPI=7
 HOMEPAGE=http://vdr.schmirler.de/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/peer/vdr-peer-0.0.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=981a325c664bb04527f2a4ef38eb604b
diff --git a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1 b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
index 476030973cb3..85e4daaf713c 100644
--- a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=~media-video/vdr-2.2.0[permashift] >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=~media-video/vdr-2.2.0[permashift] media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: permanent timeshift by recording live TV on RAM
 EAPI=7
 HOMEPAGE=https://ein-eike.de/vdr-plugin-permashift-english/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=~media-video/vdr-2.2.0[permashift] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=~media-video/vdr-2.2.0[permashift] media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://ein-eike.de/wordpress/wp-content/uploads/2014/11/vdr-permashift-1.0.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1a5477e6ea526768d7f6c402a9483191
diff --git a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301 b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
index 6db31ffb8faf..721c81356904 100644
--- a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
+++ b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=|| ( ~media-video/vdr-2.2.0[permashift] >=media-video/vdr-2.4.1-r3[permashift] ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=|| ( ~media-video/vdr-2.2.0[permashift] >=media-video/vdr-2.4.1-r3[permashift] ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: permanent timeshift by recording live TV on RAM
 EAPI=7
 HOMEPAGE=https://ein-eike.de/vdr-plugin-permashift-english/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=|| ( ~media-video/vdr-2.2.0[permashift] >=media-video/vdr-2.4.1-r3[permashift] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=|| ( ~media-video/vdr-2.2.0[permashift] >=media-video/vdr-2.4.1-r3[permashift] ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/eikesauer/Permashift/archive/f3541d7c0e3e201daf06a49304db0a0d7d5f8dd1.tar.gz -> vdr-permashift-1.0.4_pre20200301.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5081546453d0db7f454ef2bb20cdabf
diff --git a/metadata/md5-cache/media-plugins/vdr-pin-0.1.14 b/metadata/md5-cache/media-plugins/vdr-pin-0.1.14
index b7d3d98a375a..0cf7d2ffc481 100644
--- a/metadata/md5-cache/media-plugins/vdr-pin-0.1.14
+++ b/metadata/md5-cache/media-plugins/vdr-pin-0.1.14
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.2-r1[pinplugin] >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.2-r1[pinplugin] media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: enable/disable parentalrating in records
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-pin
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.2-r1[pinplugin] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0.2-r1[pinplugin] media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1379/vdr-pin-0.1.14.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=825ac4fa81444d69991f628fe108f1fe
diff --git a/metadata/md5-cache/media-plugins/vdr-pin-0.1.17-r1 b/metadata/md5-cache/media-plugins/vdr-pin-0.1.17-r1
index e04a1ec549f8..131137c48a62 100644
--- a/metadata/md5-cache/media-plugins/vdr-pin-0.1.17-r1
+++ b/metadata/md5-cache/media-plugins/vdr-pin-0.1.17-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr[pinplugin] >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr[pinplugin] media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: enable/disable parentalrating in records
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-pin
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-video/vdr[pinplugin] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr[pinplugin] media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-pin.git/snapshot/vdr-plugin-pin-9f8fb2260b73971d69691962df472c992d94b123.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3057dd54c7581718c75d5fe973e2cd1b
diff --git a/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5 b/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
index 9107deec3f34..9d06fed3f092 100644
--- a/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR PLUGIN: support the Powermate device
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-powermate/vdr-powermate-0.0.5.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c8747200383bbccf81dd8e4b2d4ec787
diff --git a/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5 b/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
index 21fa7ee22b80..7eca04352e5e 100644
--- a/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
+++ b/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 media-sound/mpg123 media-sound/twolame media-libs/a52dec >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2 media-sound/mpg123 media-sound/twolame media-libs/a52dec media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: use a PVR350 as output device
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-pvr350
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2 media-sound/mpg123 media-sound/twolame media-libs/a52dec >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2 media-sound/mpg123 media-sound/twolame media-libs/a52dec media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1657/vdr-pvr350-1.7.5.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=34b7dd2c8af4e90909a4f3e7633ec5a5
diff --git a/metadata/md5-cache/media-plugins/vdr-radio-0.9.1 b/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
index de426f252e63..0040f8258de5 100644
--- a/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
+++ b/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: show background image for radio and decode RDS Text
 EAPI=7
 HOMEPAGE=http://www.vdr-portal.de/board/thread.php?threadid=58795
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.egal-vdr.de/plugins/vdr-radio-0.9.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=970102551be020ec37bc5076d99a172f
diff --git a/metadata/md5-cache/media-plugins/vdr-radio-1.1.0 b/metadata/md5-cache/media-plugins/vdr-radio-1.1.0
index b73768b6aeb4..5f1b7e05a9cf 100644
--- a/metadata/md5-cache/media-plugins/vdr-radio-1.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-radio-1.1.0
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: show background image for radio and decode RDS Text
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/vdr-plugin-radio
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-radio.git/snapshot/vdr-plugin-radio-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30b8ab5e53be5b7c3a6fb0aaec180159
diff --git a/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0 b/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
index 8d1a5ad7618f..3da4ce31e2fc 100644
--- a/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: Remote Control Unit consists mainly of an IR receiver, PIC 16C84
 EAPI=7
 HOMEPAGE=http://www.tvdr.de/remote.htm
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-rcu-2.2.0.tar.gz https://dev.gentoo.org/~hd_brummy/distfiles/vdr-rcu-2.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7b579ecc7b0a56a02ea744e6f199082e
diff --git a/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7 b/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7
index 96a78f5a153e..d25cbe94bd0a 100644
--- a/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7
+++ b/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Search through your recordings and find the one you are looking for
 EAPI=7
 HOMEPAGE=https://github.com/flensrocker/vdr-plugin-recsearch
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/flensrocker/vdr-plugin-recsearch/releases/download/v0.3.7/vdr-recsearch-0.3.7.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=46d96959df6abdd5f0cc3d73431af11e
diff --git a/metadata/md5-cache/media-plugins/vdr-remote-0.7.0 b/metadata/md5-cache/media-plugins/vdr-remote-0.7.0
index ac3a7132166f..bf36febeffea 100644
--- a/metadata/md5-cache/media-plugins/vdr-remote-0.7.0
+++ b/metadata/md5-cache/media-plugins/vdr-remote-0.7.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: use various devices for controlling vdr (keyboards, lirc, remotes bundled with tv-cards)
 EAPI=5
 HOMEPAGE=http://www.escape-edv.de/endriss/vdr/
 IUSE=systemd
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.escape-edv.de/endriss/vdr/vdr-remote-0.7.0.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1e01b47e15b102ea443f31719931fa1
diff --git a/metadata/md5-cache/media-plugins/vdr-remote-0.7.0-r1 b/metadata/md5-cache/media-plugins/vdr-remote-0.7.0-r1
index b60bd9cbdbd0..cf1a99f2512e 100644
--- a/metadata/md5-cache/media-plugins/vdr-remote-0.7.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-remote-0.7.0-r1
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: use various devices for controlling vdr (keyboards, lirc...)
 EAPI=7
 HOMEPAGE=http://www.escape-edv.de/endriss/vdr/
 IUSE=systemd
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.escape-edv.de/endriss/vdr/vdr-remote-0.7.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b7d8db54b54cb2325127cc3f4f2b4398
diff --git a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0 b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
index 6038981566bd..c2001c205504 100644
--- a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: server/client remoteosd
 EAPI=7
 HOMEPAGE=http://vdr.schmirler.de/
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remoteosd/vdr-remoteosd-1.0.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6ecb843ebab4af603a7b4b53fbd2ab12
diff --git a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1 b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
index 0d46338879b9..1172b49a1cdb 100644
--- a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: server/client remoteosd
 EAPI=7
 HOMEPAGE=http://vdr.schmirler.de/
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remoteosd/vdr-remoteosd-1.0.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1ee1ab0516aa94a4acba8ff9a44e378d
diff --git a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2 b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2
index 74b119c498fa..77100c28ca8d 100644
--- a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: edit timers on remote vdr instances
 EAPI=7
 HOMEPAGE=http://vdr.schmirler.de/
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remotetimers/vdr-remotetimers-1.0.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1742d4a653abdfa4a67188a662272fa
diff --git a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1 b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1
index 9cb117214998..eb3397eb16f0 100644
--- a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1
+++ b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=~media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=~media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: edit timers on remote vdr instances
 EAPI=7
 HOMEPAGE=http://vdr.schmirler.de/
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remotetimers/vdr-remotetimers-1.0.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=706c57ed7d50f20ffea951543854572f
diff --git a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3 b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
index 64df77abaa6f..1bda7d45cd4a 100644
--- a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-libs/raspberrypi-userland media-video/vdr media-video/ffmpeg >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-libs/raspberrypi-userland media-video/vdr media-video/ffmpeg media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Output Device for Raspberry Pi
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-rpihddevice
 KEYWORDS=~arm
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2045/vdr-rpihddevice-1.0.3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b2f851590f067995b300d79f5b60f6f4
diff --git a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5 b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5
index 932843462779..df0ea7c1b8c9 100644
--- a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-libs/raspberrypi-userland media-video/vdr media-video/ffmpeg >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-libs/raspberrypi-userland media-video/vdr media-video/ffmpeg media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Output Device for Raspberry Pi
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-rpihddevice
 KEYWORDS=~arm
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2193/vdr-rpihddevice-1.0.5.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b613abedfc81cf7316c95be5b8e712f0
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
index 4c6c8bb292b2..4da0a29b7ad9 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: RSS reader
 EAPI=5
 HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.2.1.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0c81d93b7f3eb659fb687aa8c353fcf
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r2 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r2
index 206733541b75..5936332f9066 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r2
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: RSS reader
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-rssreader
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-rssreader/archive/v2.2.1.tar.gz -> vdr-rssreader-2.2.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c6550692bdad503162d3d59411bccfa9
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0
index 14285597286b..806f8d004ec3 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: RSS reader
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-rssreader
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.4.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.4.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-rssreader/archive/refs/tags/v2.4.0.tar.gz -> vdr-rssreader-2.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2bfaa21bcf55eea1e35ebb7ab2edc395
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0-r1 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0-r1
index 154a42a52602..3a979fdc9117 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.4.0-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: RSS reader
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-rssreader
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.4.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.4.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-rssreader/archive/v2.4.0.tar.gz -> vdr-rssreader-2.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5d5cb24d5308aafe5b43d4cf7fc7c9c2
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.2.5 b/metadata/md5-cache/media-plugins/vdr-satip-2.2.5
index 19b70084f9b4..e700c6821a36 100644
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.2.5
+++ b/metadata/md5-cache/media-plugins/vdr-satip-2.2.5
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: integrates SAT>IP network devices seamlessly into VDR
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-satip
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-satip/archive/v2.2.5.tar.gz -> vdr-satip-2.2.5.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6c6d0f4c4260b98339c36c5782646ab9
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.4.1 b/metadata/md5-cache/media-plugins/vdr-satip-2.4.1
index ed825682b309..50fc9945e0bd 100644
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-satip-2.4.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: integrates SAT>IP network devices seamlessly into VDR
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-satip
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
-RDEPEND=>=media-video/vdr-2.4.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.4.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-satip/archive/v2.4.1.tar.gz -> vdr-satip-2.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ea2160f5fbce17bb86788a2c43e280b9
diff --git a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3 b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
index 94feb6a2aec1..f014fd8f912b 100644
--- a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.5.7 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: allows to control externel jobs from within VDR
 EAPI=7
 HOMEPAGE=http://winni.vdr-developer.org/scheduler/index.html
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/scheduler/downloads/vdr-scheduler-0.1.3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=550e7c47a800e0aca1a28ff157368f57
diff --git a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6 b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6
index 75b8acaf010b..606d2ff1ae8d 100644
--- a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6
+++ b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.3.5 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.3.5 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: allows to control externel jobs from within VDR
 EAPI=7
 HOMEPAGE=http://winni.vdr-developer.org/scheduler/index.html
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/scheduler/downloads/vdr-scheduler-0.1.6.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=95cd000862b37b6c2fa0c48a49f759b4
diff --git a/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15 b/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
index f9a82c7c41c5..3582eaf7b8d6 100644
--- a/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
+++ b/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: takes screenshots of the current video or tv screen
 EAPI=7
 HOMEPAGE=https://github.com/jowi24/vdr-screenshot
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-screenshot/archive/0.0.15.tar.gz -> vdr-screenshot-0.0.15.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc2b01283de4950c3d15214c46119126
diff --git a/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1 b/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
index 667c948a5bc0..47137759129c 100644
--- a/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
+++ b/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: attach some buttons with diodes to the serial port
 EAPI=7
 HOMEPAGE=http://www.lf-klueber.de/vdr.htm
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.lf-klueber.de/vdr-serial-0.0.6a.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d599ef5d713936af752b472819e5f035
diff --git a/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0 b/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
index ac85e83f72ee..853cf3363a40 100644
--- a/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=~media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=~media-video/vdr-2.2.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: show content of menu in a shell window
 EAPI=7
 HOMEPAGE=http://www.tvdr.de/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-skincurses-2.2.0.tar.gz https://dev.gentoo.org/~hd_brummy/distfiles/vdr-skincurses-2.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5619cb19cb2eb9df3b02bb91067c05cc
diff --git a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1 b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1
index 940e86cbb62e..f8f91ed896e7 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Skin Plugin: skinelchi
 EAPI=7
 HOMEPAGE=http://firefly.vdr-developer.org/skinelchi
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/skinelchi/vdr-skinelchi-0.3.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=934f9d106676d70dd913da91ffb1a3d9
diff --git a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2 b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2
index 27f7de582361..0a31dde4e027 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Skin Plugin: skinelchi
 EAPI=7
 HOMEPAGE=http://firefly.vdr-developer.org/skinelchi
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/skinelchi/vdr-skinelchi-0.3.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=874e907af68b311802ba93e5c0d7b5a0
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0
index 8c2a14032d37..0766fcf18c4f 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Skin Plugin: soppalusikka
 EAPI=5
 HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0.0 x11-themes/vdr-channel-logos media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.0.0.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4d5899362162c490c3f983524adafd9f
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0-r1 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0-r1
index 0dd0747a4695..080da8271107 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Skin Plugin: soppalusikka
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-skinsoppalusikka
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0.0 x11-themes/vdr-channel-logos media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-skinsoppalusikka/archive/v2.0.0.tar.gz -> vdr-skinsoppalusikka-2.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=876d7d6b14b339af258a39b3ecf6152f
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0
index bf6ced68a260..63804a322b07 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Skin Plugin: soppalusikka
 EAPI=7
 HOMEPAGE=https://github.com/rofafor/vdr-plugin-skinsoppalusikka
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=media-video/vdr-2.4.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.4.0 x11-themes/vdr-channel-logos media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-skinsoppalusikka/archive/v2.4.0.tar.gz -> vdr-skinsoppalusikka-2.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1a544799ae3e8da6de16c3194eb74845
diff --git a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6 b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
index 92b0964fd59e..fdc3bb1b2f71 100644
--- a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
+++ b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.2.6 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Sleeptimer
 EAPI=7
 HOMEPAGE=http://linvdr.org/download/vdr-sleeptimer
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://linvdr.org/download/vdr-sleeptimer/sleeptimer-0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=db7b6423b8d5ecfe68c06793f0cc0b2d
diff --git a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6-r1 b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6-r1
index 3a61c16dbc5c..ede5d28d372e 100644
--- a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6-r1
+++ b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.2.6 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Sleeptimer
 EAPI=7
 HOMEPAGE=http://linvdr.org/download/vdr-sleeptimer
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://linvdr.org/download/vdr-sleeptimer/sleeptimer-0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9938c5dfd162ddba87881c6ff9cdec9d
diff --git a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1 b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
index 1d5781a179ce..fffc9c603462 100644
--- a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.4.1 media-libs/alsa-lib >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.4.1 media-libs/alsa-lib media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: Control the vol level of diff controls of your soundcard
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-sndctl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.4.1 media-libs/alsa-lib >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.4.1 media-libs/alsa-lib media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-sndctl/vdr-sndctl-0.1.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=55c3ac7c4ee9265f5cbba150953967df
diff --git a/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3 b/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
index 3cecdf49bf3f..fbeffd6d130d 100644
--- a/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.3.25 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.3.25 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: Solitaire game
 EAPI=6
 HOMEPAGE=https://web.archive.org/web/20150928211126/http://www.djdagobert.com/vdr/solitaire/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://web.archive.org/web/20150928211126/http://www.djdagobert.com/vdr/solitaire/vdr-solitaire-0.0.3.tbz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dc07ffbd9d945180def7427aa33dda8e
diff --git a/metadata/md5-cache/media-plugins/vdr-span-0.0.7 b/metadata/md5-cache/media-plugins/vdr-span-0.0.7
index fccf64e74fbe..eb3fbd453bd9 100644
--- a/metadata/md5-cache/media-plugins/vdr-span-0.0.7
+++ b/metadata/md5-cache/media-plugins/vdr-span-0.0.7
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.5.7 >=sci-libs/fftw-3.0.1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.5.7 >=sci-libs/fftw-3.0.1 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: Spectrum Analyzer (SpAn)
 EAPI=7
 HOMEPAGE=http://lcr.vdr-developer.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.5.7 >=sci-libs/fftw-3.0.1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.5.7 >=sci-libs/fftw-3.0.1 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://lcr.vdr-developer.org/downloads/vdr-span-0.0.7.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c384c44b1a6671a0a6c8c920be18f49c
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1
index f860fd1f3317..35b254396886 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile config install postinst postrm preinst prepare setup unpack
-DEPEND=>=media-video/vdr-1.7.25 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.7.25 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: Client/Server and http streaming plugin
 EAPI=5
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-streamdev
 IUSE=client server
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.7.25 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.7.25 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1580/vdr-streamdev-0.6.1.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c660bc195bc4fcabe86923b44240396b
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320
index 796012a18b82..bfe99cd9f9cd 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile config install postinst postrm preinst prepare setup unpack
-DEPEND=>=media-video/vdr-1.7.25 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.7.25 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: Client/Server and http streaming plugin
 EAPI=6
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-streamdev
 IUSE=client server
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.7.25 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.7.25 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-674bb5b331240de3ba2a8beb63a1276003e64e3e.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=000f2f826ed51c439aedee8ca7b4ff1e
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
index ea4ad314b073..b6260b6f41a7 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.3 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.3 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Client/Server and http streaming plugin
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-streamdev
 IUSE=client server
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.3 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-e2a9b979d3fb92967c7a6a8221e674eb7e55c813.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5b0defa3bf660d2c8f6631e107d64943
diff --git a/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1-r1 b/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1-r1
index a93f1f3165bb..ba55ae0565fb 100644
--- a/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Show still image instead of live tv to safe cpu
 EAPI=7
 HOMEPAGE=http://phivdr.dyndns.org/vdr/vdr-suspendoutput/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-suspendoutput/vdr-suspendoutput-2.0.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e2d43ad9c54bd1e46c637a6b32ccc6dc
diff --git a/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0 b/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
index 319afa862c37..bf884f3084e0 100644
--- a/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: export OSD via TCP to vdr-remoteosd
 EAPI=7
 HOMEPAGE=http://vdr.schmirler.de/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/svdrpext/vdr-svdrposd-1.0.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=de14083fe23eb7fa879f850a0fb815af
diff --git a/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0 b/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0
index 62021643f5a9..05bd73429b95 100644
--- a/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: offers SVDRP connections as a service to other plugins
 EAPI=5
 HOMEPAGE=http://vdr.schmirler.de/
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/svdrpservice/vdr-svdrpservice-1.0.0.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=470c1b7e02b8fb15189d447035842db3
diff --git a/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0-r1 b/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0-r1
index 2229bfd3c567..704a34458fc7 100644
--- a/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: offers SVDRP connections as a service to other plugins
 EAPI=7
 HOMEPAGE=http://vdr.schmirler.de/
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-2.0.0 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/svdrpservice/vdr-svdrpservice-1.0.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b2841030c8740edffe8cf7d1e73cc57b
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4-r1 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4-r1
index 4892d90bd7ed..9fd44097f575 100644
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: systeminfo
 EAPI=7
 HOMEPAGE=http://firefly.vdr-developer.org/systeminfo/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-apps/lm-sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=sys-apps/lm-sensors app-admin/hddtemp media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cf6ea566982206573f7eec0c1b25b5af
diff --git a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0 b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0
index e93fecaf6ec2..3bd4b1bbf232 100644
--- a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0
+++ b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.7.38[ttxtsubs] >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.7.38[ttxtsubs] media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: displaying, recording and replaying teletext based subtitles
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-ttxtsubs
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=media-video/vdr-1.7.38[ttxtsubs] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.7.38[ttxtsubs] media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1281/vdr-ttxtsubs-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=130af98d96a141f59eb87782afffb20c
diff --git a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2 b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
index 466672bae3ac..bfdae248a303 100644
--- a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr[ttxtsubs] >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr[ttxtsubs] media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: displaying, recording and replaying teletext based subtitles
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-ttxtsubs
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=media-video/vdr[ttxtsubs] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr[ttxtsubs] media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1281/vdr-ttxtsubs-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b7ede07a9c442f041b9434819c8da022
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7 b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7
index 18ef65fd6cdf..1cb51775d842 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.5.7 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Recover deleted recordings of VDR
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-undelete
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.5.7 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1060/vdr-undelete-0.0.7.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ea2479542b1bbce9bd1d4c582f80e665
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1 b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1
index 643478ceac29..379e98e3ecc3 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.5.7 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Recover deleted recordings of VDR
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-undelete
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.5.7 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1060/vdr-undelete-0.0.7.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=861f7aec85e45d052e2d42af388bbdd1
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1 b/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
index a6c7de778ef0..314ffc148121 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Recover deleted recordings of VDR
 EAPI=7
 HOMEPAGE=http://phivdr.dyndns.org/vdr/
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-undelete/vdr-undelete-2.3.1-pre1.tgz -> vdr-undelete-2.3.0_pre1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=af628f6068126780a5b5768e6f41d06c
diff --git a/metadata/md5-cache/media-plugins/vdr-vaapidevice-1.0.0_p20190526 b/metadata/md5-cache/media-plugins/vdr-vaapidevice-1.0.0_p20190526
index 15e13535e8f7..395c59e71f9b 100644
--- a/metadata/md5-cache/media-plugins/vdr-vaapidevice-1.0.0_p20190526
+++ b/metadata/md5-cache/media-plugins/vdr-vaapidevice-1.0.0_p20190526
@@ -1,14 +1,14 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-video/ffmpeg[vaapi,X] x11-libs/libva[X] x11-libs/libva-intel-driver[X] x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-keysyms media-libs/alsa-lib >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-video/vdr media-video/ffmpeg[vaapi,X] x11-libs/libva[X] x11-libs/libva-intel-driver[X] x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-keysyms media-libs/alsa-lib media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: A VA-API output device plugin for VDR
 EAPI=7
 HOMEPAGE=https://github.com/pesintta/vdr-plugin-vaapidevice
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
-RDEPEND=media-video/vdr media-video/ffmpeg[vaapi,X] x11-libs/libva[X] x11-libs/libva-intel-driver[X] x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-keysyms media-libs/alsa-lib >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-video/vdr media-video/ffmpeg[vaapi,X] x11-libs/libva[X] x11-libs/libva-intel-driver[X] x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-keysyms media-libs/alsa-lib media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/pesintta/vdr-plugin-vaapidevice/archive/d19657bae399e79df107e316ca40922d21393f80.tar.gz -> vdr-vaapidevice-1.0.0_p20190526.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ae2ba3e47335c26e0aec874af91da9fe
diff --git a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3 b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
index c0efb910ff65..67ee8dc58881 100644
--- a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
+++ b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.5.9 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR plugin: play video cds
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.5.9 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-vcd/vdr-vcd-0.9.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b8aa6c7a7a03008104bf10adc7591760
diff --git a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4 b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
index 825d62af1618..55ffe9b15fa6 100644
--- a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
+++ b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.5.9 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR plugin: play video cds
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.5.9 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-vcd/vdr-vcd-0.9.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5996cdcb4e1ecdb8a202e8816aca538a
diff --git a/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14 b/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
index 0c2d52899cdf..939832846db1 100644
--- a/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
+++ b/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 ssl? ( dev-libs/openssl ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( dev-libs/openssl:0 )
+DEPEND=>=media-video/vdr-2 ssl? ( dev-libs/openssl ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=VDR Plugin: remote programming VDR using VDR-Manager running on Android devices
 EAPI=6
 HOMEPAGE=https://projects.vdr-developer.org/projects/vdr-manager/wiki
 IUSE=gzip +ssl stream zlib ssl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=stream? ( media-plugins/vdr-streamdev[server] ) zlib? ( sys-libs/zlib ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=stream? ( media-plugins/vdr-streamdev[server] ) zlib? ( sys-libs/zlib ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1971/vdr-vdrmanager-0.14.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4e0fd90a096fa4f408cdb94060036e76
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
index 007a0109c85f..c40dfa79a8a6 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.7.36-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.7.36-r1 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: server part for MediaMVP device
 EAPI=7
 HOMEPAGE=http://www.loggytronic.com/vomp.php
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.7.36-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.7.36-r1 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.4.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=25feac9640e4e9f7ac12714d18246ca6
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
index 009da7b9be2b..5d65f1abc39a 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.7.36-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.7.36-r1 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: server part for MediaMVP device
 EAPI=6
 HOMEPAGE=http://www.loggytronic.com/vomp.php
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.7.36-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.7.36-r1 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.4.1.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5c1c82cb2f04ab25955b2a6de3b6a61
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
index 63dfd3947c9b..f3f14321a07c 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4.1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4.1 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: server part for MediaMVP device
 EAPI=7
 HOMEPAGE=http://www.loggytronic.com/vomp.php
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.5.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=53e8eb7d65f3356f165dc7b972128e3c
diff --git a/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1 b/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
index c3b56d27ee71..f4bb94394b89 100644
--- a/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
+++ b/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-libs/imlib2[jpeg,gif] >=media-video/vdr-1.3.34 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=media-libs/imlib2[jpeg,gif] >=media-video/vdr-1.3.34 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: show weather for specified place
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=dxr3
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 stardock-images
-RDEPEND=media-libs/imlib2[jpeg,gif] >=media-video/vdr-1.3.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-libs/imlib2[jpeg,gif] >=media-video/vdr-1.3.34 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-weatherng/vdr-weatherng-0.0.8-pre3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dfcaec1b0b2e3bd9ff5a9d4e8872417c
diff --git a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1 b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
index ebb3cb58d250..ce9bcaac6f8c 100644
--- a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
+++ b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
@@ -1,13 +1,13 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Scan for channels on DVB-? and on PVR*-Cards
 EAPI=7
 HOMEPAGE=https://github.com/CvH/vdr-plugin-wirbelscan
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-0.0.7.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1e0bd1779b5f2329abb34d0890dd281b
diff --git a/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1 b/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1
index 569de89c89b6..615c41f40fcc 100644
--- a/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1
+++ b/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.4 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-2.4 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Scan for channels on DVB-? and on PVR*-Cards
 EAPI=7
 HOMEPAGE=https://github.com/CvH/vdr-plugin-wirbelscan
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/CvH/vdr-plugin-wirbelscan/archive/e1377b95312a138a41f93d7b06b3adb4ed4e7324.tar.gz -> vdr-wirbelscan-2018.11.04.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d115850927fa4b47d92b91d816ca1bc4
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
index d77555942b50..2c670c2f872d 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( virtual/jpeg:* ) opengl? ( virtual/opengl ) vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) virtual/pkgconfig sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( virtual/jpeg:* ) opengl? ( virtual/opengl ) vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) virtual/pkgconfig sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Xinelib PlugIn
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xineliboutput/
 IUSE=bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( virtual/jpeg:* ) opengl? ( virtual/opengl ) vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( virtual/jpeg:* ) opengl? ( virtual/opengl ) vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.2.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3752d33fbaf15f05157aa2da1532e9fd
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r4 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r4
index 58ff9469ddbb..567b8e7b73fa 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r4
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r4
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( virtual/jpeg:* ) opengl? ( virtual/opengl ) vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( virtual/jpeg:* ) opengl? ( virtual/opengl ) vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Xinelib PlugIn
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xineliboutput/
 IUSE=bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( virtual/jpeg:* ) opengl? ( virtual/opengl ) vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( virtual/jpeg:* ) opengl? ( virtual/opengl ) vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.2.0.tgz http://vdr.websitec.de/download/vdr-xineliboutput/vdr-xineliboutput-2.2.0_clang.patch.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3aaae7f988928da034c01ed185fcf655
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
index 6e78d9750184..7f8c30e415a9 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
@@ -1,13 +1,13 @@
-BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) jpeg? ( virtual/jpeg:* ) bluray? ( media-libs/libbluray ) opengl? ( virtual/opengl ) ) ) cec? ( dev-libs/libcec ) sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers )
+DEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) jpeg? ( virtual/jpeg:* ) bluray? ( media-libs/libbluray ) opengl? ( virtual/opengl ) ) ) cec? ( dev-libs/libcec ) sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) vdr? ( media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers )
 DESCRIPTION=VDR Plugin: Xinelib PlugIn
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xineliboutput/
 IUSE=bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama vdr
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) jpeg? ( virtual/jpeg:* ) bluray? ( media-libs/libbluray ) opengl? ( virtual/opengl ) ) ) cec? ( dev-libs/libcec ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2 )
+RDEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) jpeg? ( virtual/jpeg:* ) bluray? ( media-libs/libbluray ) opengl? ( virtual/opengl ) ) ) cec? ( dev-libs/libcec ) vdr? ( media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d094f34b1485356d0867be1baea97f34
diff --git a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5 b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
index 5e2511d633c8..e29d2f2c5dbc 100644
--- a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.7.34 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers virtual/pkgconfig
 DESCRIPTION=VDR Plugin: browse fast the EPG information without being to switch to a channel
 EAPI=5
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-zappilot
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.7.34 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1318/vdr-zappilot-0.0.5.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=999a122787a69c110b909b223a34ab2c
diff --git a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2 b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2
index 75beb61d3024..766619b67fcd 100644
--- a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2
+++ b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.7.34 media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: browse fast the EPG information without being to switch to a channel
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-zappilot
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=>=media-video/vdr-1.7.34 media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1318/vdr-zappilot-0.0.5.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	3266c6843c8e632580212a9387ca7fb6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=07528e62e2c305b0d29db5529b536c3e
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index e91d09a781da..dcdeaeef7ed2 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/tlf-1.4.1-r1 b/metadata/md5-cache/media-radio/tlf-1.4.1-r1
index 8276e0dea527..660dce6a5ad2 100644
--- a/metadata/md5-cache/media-radio/tlf-1.4.1-r1
+++ b/metadata/md5-cache/media-radio/tlf-1.4.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Console-mode amateur radio contest logger
 EAPI=7
 HOMEPAGE=http://home.iae.nl/users/reinc/TLF-0.2.html
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:= dev-libs/glib:2 media-libs/hamlib:= media-sound/sox dev-libs/xmlrpc-c[curl]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/tlf/tlf-1.4.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=30f71d998a7a69ca83d5d771b4f397ef
+_md5_=615420cb0a62e111f6d2724a3e038740
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index bf95a08b9554..43c0f12eadda 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/abcmidi-2021.06.27 b/metadata/md5-cache/media-sound/abcmidi-2021.06.27
index c6b7f1827d50..96bf8427b4f8 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2021.06.27
+++ b/metadata/md5-cache/media-sound/abcmidi-2021.06.27
@@ -4,9 +4,9 @@ DESCRIPTION=Programs for processing ABC music notation files
 EAPI=7
 HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
 IUSE=examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2021.06.27.zip
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f01d4794ae108c683e4a9cf066da292c
+_md5_=80bec0422105ee6283f6f982e22cad4e
diff --git a/metadata/md5-cache/media-sound/chuck-1.4.0.1-r1 b/metadata/md5-cache/media-sound/chuck-1.4.0.1-r1
deleted file mode 100644
index 3d3192875dea..000000000000
--- a/metadata/md5-cache/media-sound/chuck-1.4.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=app-eselect/eselect-chuck media-libs/libsndfile alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) sys-devel/bison sys-devel/flex
-DESCRIPTION=Strongly-timed, concurrent, and on-the-fly audio programming language
-EAPI=7
-HOMEPAGE=http://chuck.cs.princeton.edu/
-IUSE=+alsa jack examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-eselect/eselect-chuck media-libs/libsndfile alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
-REQUIRED_USE=|| ( alsa jack )
-SLOT=0
-SRC_URI=http://chuck.cs.princeton.edu/release/files/chuck-1.4.0.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=024e2564c710f3498d168d03ffbf7eee
diff --git a/metadata/md5-cache/media-sound/chuck-1.4.1.0 b/metadata/md5-cache/media-sound/chuck-1.4.1.0
index 2fb0c25b89b8..6e8d709b32ae 100644
--- a/metadata/md5-cache/media-sound/chuck-1.4.1.0
+++ b/metadata/md5-cache/media-sound/chuck-1.4.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Strongly-timed, concurrent, and on-the-fly audio programming languag
 EAPI=7
 HOMEPAGE=http://chuck.cs.princeton.edu/
 IUSE=+alsa jack examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-chuck media-libs/libsndfile alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
 REQUIRED_USE=|| ( alsa jack )
 SLOT=0
 SRC_URI=http://chuck.cs.princeton.edu/release/files/chuck-1.4.1.0.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a61f329b8b47a4d3934a96aaa868b2fa
+_md5_=024e2564c710f3498d168d03ffbf7eee
diff --git a/metadata/md5-cache/media-sound/drumstick-2.3.1 b/metadata/md5-cache/media-sound/drumstick-2.3.1
new file mode 100644
index 000000000000..9151cddb8fee
--- /dev/null
+++ b/metadata/md5-cache/media-sound/drumstick-2.3.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt dev-qt/linguist-tools:5 virtual/pkgconfig x11-misc/shared-mime-info doc? ( app-doc/doxygen[dot] app-text/docbook-xsl-stylesheets ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib fluidsynth? ( media-sound/fluidsynth ) network? ( dev-qt/qtnetwork:5 ) pulseaudio? ( media-sound/pulseaudio ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Qt/C++ wrapper for ALSA sequencer
+EAPI=7
+HOMEPAGE=https://drumstick.sourceforge.io/
+IUSE=doc fluidsynth network pulseaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib fluidsynth? ( media-sound/fluidsynth ) network? ( dev-qt/qtnetwork:5 ) pulseaudio? ( media-sound/pulseaudio )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/drumstick/drumstick-2.3.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=77fb4b118fc56d72795c5a3906cdacd6
diff --git a/metadata/md5-cache/media-sound/easyeffects-6.0.3 b/metadata/md5-cache/media-sound/easyeffects-6.0.3
index eba637832c05..569f4dc6267b 100644
--- a/metadata/md5-cache/media-sound/easyeffects-6.0.3
+++ b/metadata/md5-cache/media-sound/easyeffects-6.0.3
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-cpp/glibmm-2.68:2.68 >=dev-cpp/gtkmm-4.2.0:4.0 dev-cpp/nlohmann_json >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-3.0:3 media-libs/libbs2b media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.31 sci-libs/fftw:3.0 >=x11-libs/gtk+-4.2.1:4 gnome-extra/yelp >=media-libs/lsp-plugins-1.1.24[lv2] sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) zamaudio? ( media-plugins/zam-plugins )
 SLOT=0
 SRC_URI=https://github.com/wwmm/easyeffects/archive/v6.0.3.tar.gz -> easyeffects-6.0.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4e5cbd93be71b93c3d4f9acf78ecc137
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bb4ec69a9415bae9e07df945ec1358b1
diff --git a/metadata/md5-cache/media-sound/murmur-1.3.3 b/metadata/md5-cache/media-sound/murmur-1.3.3
index e69695087228..1325171f93b1 100644
--- a/metadata/md5-cache/media-sound/murmur-1.3.3
+++ b/metadata/md5-cache/media-sound/murmur-1.3.3
@@ -11,4 +11,4 @@ RDEPEND=acct-group/murmur acct-user/murmur >=dev-libs/openssl-1.0.0b:0= >=dev-li
 SLOT=0
 SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.3/mumble-1.3.3.tar.gz https://dl.mumble.info/mumble-1.3.3.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4e9d59656cd14a06943dda0837b83aa3
+_md5_=0689f2d371d60d1702a3a695ca537196
diff --git a/metadata/md5-cache/media-sound/murmur-1.3.4 b/metadata/md5-cache/media-sound/murmur-1.3.4
index f71eaf0ff8a5..aa910d484ebc 100644
--- a/metadata/md5-cache/media-sound/murmur-1.3.4
+++ b/metadata/md5-cache/media-sound/murmur-1.3.4
@@ -11,4 +11,4 @@ RDEPEND=acct-group/murmur acct-user/murmur >=dev-libs/openssl-1.0.0b:0= >=dev-li
 SLOT=0
 SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.4/mumble-1.3.4.tar.gz https://dl.mumble.info/mumble-1.3.4.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=81c1c6c879dc69c6534655e95839f753
+_md5_=01e6dfd6d69f85ab2ac729d3d1249144
diff --git a/metadata/md5-cache/media-sound/murmur-9999 b/metadata/md5-cache/media-sound/murmur-9999
index f4e02f853dce..57bc2c5d1b77 100644
--- a/metadata/md5-cache/media-sound/murmur-9999
+++ b/metadata/md5-cache/media-sound/murmur-9999
@@ -11,4 +11,4 @@ RDEPEND=acct-group/murmur acct-user/murmur >=dev-libs/openssl-1.0.0b:0= >=dev-li
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7ac412d9908d352d44fbdf7441ddd732
+_md5_=2291549f75b4da3dba3f85a4950b314a
diff --git a/metadata/md5-cache/media-sound/pulseaudio-13.0-r1 b/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
index 858ae3a7a44e..ecee0d40cca3 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=128ffbd8a7a0b3986566323db161549c
+_md5_=0c4b72bfde5cc826176ae2a08e821db5
diff --git a/metadata/md5-cache/media-sound/pulseaudio-14.99.2_pre1 b/metadata/md5-cache/media-sound/pulseaudio-14.99.2_pre1
deleted file mode 100644
index c33299fa122e..000000000000
--- a/metadata/md5-cache/media-sound/pulseaudio-14.99.2_pre1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext sys-devel/m4 virtual/libiconv virtual/libintl virtual/pkgconfig doc? ( app-doc/doxygen ) orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/speexdsp-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) daemon? ( dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) X? ( >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) dev-libs/libatomic_ops dev-libs/libpcre:* test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=A networked sound server with an advanced plugin system
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
-IUSE=+alsa +alsa-plugin +asyncns bluetooth dbus +daemon doc elogind equalizer forget-missing +gdbm gstreamer +glib gtk ipv6 jack lirc native-headset ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
-PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-RDEPEND=>=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/speexdsp-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) daemon? ( dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) X? ( >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) virtual/tmpfiles
-REQUIRED_USE=alsa-plugin? ( alsa ) bluetooth? ( dbus ) daemon? ( ?? ( elogind systemd ) ) !daemon? ( !alsa !alsa-plugin !bluetooth !equalizer !gdbm !gtk !jack !lirc !native-headset !ofono-headset !orc !oss !sox !ssl !system-wide !udev !webrtc-aec !zeroconf ) equalizer? ( dbus ) native-headset? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-14.99.2.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=42ac2a3df753525372442270c6cc0d1b
diff --git a/metadata/md5-cache/media-sound/pulseaudio-15.0 b/metadata/md5-cache/media-sound/pulseaudio-15.0
new file mode 100644
index 000000000000..3d384c726583
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseaudio-15.0
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gettext sys-devel/m4 virtual/libiconv virtual/libintl virtual/pkgconfig doc? ( app-doc/doxygen ) orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/speexdsp-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) daemon? ( dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) X? ( >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) dev-libs/libatomic_ops dev-libs/libpcre:* test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
+DESCRIPTION=A networked sound server with an advanced plugin system
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
+IUSE=+alsa +alsa-plugin +asyncns bluetooth dbus +daemon doc elogind equalizer +gdbm gstreamer +glib gtk ipv6 jack lirc native-headset ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
+PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RDEPEND=>=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/speexdsp-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) daemon? ( dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) X? ( >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) virtual/tmpfiles
+REQUIRED_USE=alsa-plugin? ( alsa ) bluetooth? ( dbus ) daemon? ( ?? ( elogind systemd ) ) !daemon? ( !alsa !alsa-plugin !bluetooth !equalizer !gdbm !gtk !jack !lirc !native-headset !ofono-headset !orc !oss !sox !ssl !system-wide !udev !webrtc-aec !zeroconf ) equalizer? ( dbus ) native-headset? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-15.0.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b851dbe8025a143542514be2688c1140
diff --git a/metadata/md5-cache/media-sound/qmidiroute-0.4.0 b/metadata/md5-cache/media-sound/qmidiroute-0.4.0
index 4f1dc22b7788..e2458f36ff4c 100644
--- a/metadata/md5-cache/media-sound/qmidiroute-0.4.0
+++ b/metadata/md5-cache/media-sound/qmidiroute-0.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 media-libs/alsa-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/alsamodular/qmidiroute-0.4.0.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=88a95e37750091ba0592926b24d06e44
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=608f8c808778eb5c44f8a8dcc10cf282
diff --git a/metadata/md5-cache/media-sound/snapcast-0.25.0 b/metadata/md5-cache/media-sound/snapcast-0.25.0
new file mode 100644
index 000000000000..cfdbea88700a
--- /dev/null
+++ b/metadata/md5-cache/media-sound/snapcast-0.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=client? ( acct-user/snapclient media-libs/alsa-lib ) expat? ( dev-libs/expat ) flac? ( media-libs/flac ) opus? ( media-libs/opus ) server? ( acct-group/snapserver acct-user/snapserver ) tremor? ( media-libs/tremor ) vorbis? ( media-libs/libvorbis ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-cpp/aixlog-1.2.1 >=dev-cpp/asio-1.12.1 >=dev-cpp/popl-1.2.0
+DESCRIPTION=Synchronous multi-room audio player
+EAPI=7
+HOMEPAGE=https://github.com/badaix/snapcast
+IUSE=+client +expat +flac +opus +server tremor +vorbis +zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=client? ( acct-user/snapclient media-libs/alsa-lib ) expat? ( dev-libs/expat ) flac? ( media-libs/flac ) opus? ( media-libs/opus ) server? ( acct-group/snapserver acct-user/snapserver ) tremor? ( media-libs/tremor ) vorbis? ( media-libs/libvorbis ) zeroconf? ( net-dns/avahi[dbus] )
+REQUIRED_USE=|| ( server client )
+SLOT=0
+SRC_URI=https://github.com/badaix/snapcast/archive/v0.25.0.tar.gz -> snapcast-0.25.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=96d1caef42626e6dc5a5948df4e83c65
diff --git a/metadata/md5-cache/media-sound/snapcast-9999 b/metadata/md5-cache/media-sound/snapcast-9999
deleted file mode 100644
index 2a67144966cc..000000000000
--- a/metadata/md5-cache/media-sound/snapcast-9999
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=client? ( acct-user/snapclient media-libs/alsa-lib ) expat? ( dev-libs/expat ) flac? ( media-libs/flac ) opus? ( media-libs/opus ) server? ( acct-group/snapserver acct-user/snapserver ) tremor? ( media-libs/tremor ) vorbis? ( media-libs/libvorbis ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-cpp/aixlog-1.2.1 >=dev-cpp/asio-1.12.1 >=dev-cpp/popl-1.2.0
-DESCRIPTION=Synchronous multi-room audio player
-EAPI=7
-HOMEPAGE=https://github.com/badaix/snapcast
-IUSE=+client +expat +flac +opus +server static-libs tremor +vorbis +zeroconf
-LICENSE=GPL-3+
-PROPERTIES=live
-RDEPEND=client? ( acct-user/snapclient media-libs/alsa-lib ) expat? ( dev-libs/expat ) flac? ( media-libs/flac ) opus? ( media-libs/opus ) server? ( acct-group/snapserver acct-user/snapserver ) tremor? ( media-libs/tremor ) vorbis? ( media-libs/libvorbis ) zeroconf? ( net-dns/avahi[dbus] )
-REQUIRED_USE=|| ( server client )
-SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a4459de948bcec05f16180789d020f3b
diff --git a/metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0-r1 b/metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0-r1
deleted file mode 100644
index 123884531e0c..000000000000
--- a/metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=media-sound/xmms2 net-misc/curl
-DESCRIPTION=XMMS2 AudioScrobbler client
-EAPI=7
-HOMEPAGE=https://code-monkey.de/pages/xmms2-scrobbler
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-sound/xmms2 net-misc/curl
-SLOT=0
-SRC_URI=ftp://ftp.code-monkey.de/pub/xmms2-scrobbler/xmms2-scrobbler-0.4.0.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aad8974a8cf46486c93f4a9558cb6423
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 12f702fd78da..a99668d84e1a 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430 b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
index d8a89374c937..7d393dab6b8f 100644
--- a/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
+++ b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
@@ -3,8 +3,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Digital TV scan tables in v3 and v5 format
 EAPI=7
 HOMEPAGE=https://linuxtv.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-2021-04-30-4181e93a30ab.tar.bz2
-_md5_=3c7bc0a2bcba41caa3e2ccb1db7da743
+_md5_=cb35bb8bb729d7b233ac69563c1c9120
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.23.5.4841 b/metadata/md5-cache/media-tv/plex-media-server-1.23.5.4841
deleted file mode 100644
index 0fd95d46f3d7..000000000000
--- a/metadata/md5-cache/media-tv/plex-media-server-1.23.5.4841
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst unpack
-DEPEND=acct-group/plex acct-user/plex
-DESCRIPTION=Free media library that is intended for use with a plex client
-EAPI=7
-HOMEPAGE=https://www.plex.tv/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=Plex
-RDEPEND=acct-group/plex acct-user/plex
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.23.5.4841-549599676/debian/plexmediaserver_1.23.5.4841-549599676_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.23.5.4841-549599676/debian/plexmediaserver_1.23.5.4841-549599676_i386.deb )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=6a7205a7174b3e78181ea6695c878fbb
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.23.6.4881 b/metadata/md5-cache/media-tv/plex-media-server-1.23.6.4881
new file mode 100644
index 000000000000..1ebff8e01e79
--- /dev/null
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.23.6.4881
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst unpack
+DEPEND=acct-group/plex acct-user/plex
+DESCRIPTION=Free media library that is intended for use with a plex client
+EAPI=7
+HOMEPAGE=https://www.plex.tv/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Plex
+RDEPEND=acct-group/plex acct-user/plex
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.23.6.4881-e2e58f321/debian/plexmediaserver_1.23.6.4881-e2e58f321_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.23.6.4881-e2e58f321/debian/plexmediaserver_1.23.6.4881-e2e58f321_i386.deb )
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=55966d15b8188372dc112a4cbc452fe6
diff --git a/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2 b/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
index 3724f56b39d9..640990153e00 100644
--- a/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
+++ b/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Tvheadend is a TV streaming server and digital video recorder
 EAPI=7
 HOMEPAGE=https://tvheadend.org/
 IUSE=+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf zlib kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) dvben50221? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( media-video/ffmpeg:0= ) hdhomerun? ( media-libs/libhdhomerun ) dev-libs/openssl:0= uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )
 REQUIRED_USE=dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )
 SLOT=0
 SRC_URI=https://github.com/tvheadend/tvheadend/archive/v4.2.8.tar.gz -> tvheadend-4.2.8.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=306e6ec0dd90593c341e75a33f7498b4
+_md5_=493e6143553324ce20aef0ea7e28a60a
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.20.0 b/metadata/md5-cache/media-tv/v4l-utils-1.20.0
index c790adf05e30..074fb38cfc99 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.20.0
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.20.0
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/libv4l-1.20.0[dvb?,jpeg] >=virtual/jpeg-0-r2:0= bpf? ( virt
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.20.0.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=19d853c6702218e1ef02733ecb171aab
+_md5_=29eb79118762d410da79a8cce898e23c
diff --git a/metadata/md5-cache/media-tv/xmltv-0.6.1 b/metadata/md5-cache/media-tv/xmltv-0.6.1
index a53c64c78f8a..84c562050812 100644
--- a/metadata/md5-cache/media-tv/xmltv-0.6.1
+++ b/metadata/md5-cache/media-tv/xmltv-0.6.1
@@ -5,10 +5,10 @@ DESCRIPTION=Set of utilities to manage TV listings stored in the XMLTV format
 EAPI=7
 HOMEPAGE=http://wiki.xmltv.org/index.php/XMLTVProject https://github.com/XMLTV/xmltv
 IUSE=ar ch-search dk dtvla eu-dotmedia eu-epgdata eu-xmltvse fi fi-sv fr huro il is it na-dd na-dtv na-tvmedia pt-meo pt-vodafone se-swedb se-tvzon tr tv-check tv-combiner tv-pick-cgi uk-bleb uk-tvguide zz-sdjson zz-sdjson-sqlite
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/File-Slurp dev-perl/JSON dev-perl/libwww-perl dev-perl/Lingua-Preferred dev-perl/PerlIO-gzip dev-perl/Term-ProgressBar dev-perl/TermReadKey dev-perl/XML-Parser dev-perl/XML-TreePP dev-perl/XML-Twig dev-perl/XML-Writer dev-perl/Unicode-String virtual/perl-Memoize virtual/perl-Storable virtual/perl-IO-Compress ar? ( dev-perl/DateTime dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/HTTP-Cookies ) ch-search? ( dev-perl/HTML-Tree dev-perl/HTML-Parser dev-perl/HTTP-Cookies dev-perl/URI ) dk? ( dev-perl/DateTime dev-perl/IO-stringy ) dtvla? ( dev-perl/DateTime dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/HTTP-Cookies ) eu-dotmedia? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy ) eu-epgdata? ( dev-perl/Archive-Zip dev-perl/DateTime dev-perl/DateTime-Format-Strptime dev-perl/HTML-Parser dev-perl/HTTP-Message ) eu-xmltvse? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy ) fi? ( dev-perl/HTML-Tree dev-perl/LWP-Protocol-https dev-perl/URI ) fi-sv? ( dev-perl/DateTime dev-perl/HTML-Tree dev-perl/IO-stringy ) fr? ( dev-perl/DateTime dev-perl/DateTime-TimeZone dev-perl/HTML-Parser dev-perl/HTML-Tree ) huro? ( dev-perl/HTML-Parser dev-perl/HTML-Tree ) il? ( dev-perl/DateTime ) is? ( dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/URI dev-perl/XML-DOM dev-perl/XML-LibXSLT ) it? ( dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/URI ) na-dd? ( dev-perl/SOAP-Lite ) na-dtv? ( dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/URI ) na-tvmedia? ( dev-perl/XML-LibXML ) pt-meo? ( dev-perl/DateTime dev-perl/XML-LibXML ) pt-vodafone? ( dev-perl/DateTime dev-perl/URI dev-perl/XML-LibXML ) se-swedb? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/XML-LibXML ) se-tvzon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent ) tr? ( dev-perl/DateTime dev-perl/HTTP-Cache-Transparent dev-perl/HTTP-Cookies dev-perl/URI ) uk-bleb? ( dev-perl/Archive-Zip dev-perl/IO-stringy ) uk-tvguide? ( dev-perl/DateTime dev-perl/HTML-Tree dev-perl/HTTP-Cache-Transparent dev-perl/HTTP-Cookies dev-perl/URI ) zz-sdjson? ( dev-lang/perl dev-perl/DateTime virtual/perl-Digest-SHA dev-perl/HTTP-Message dev-perl/LWP-Protocol-https dev-perl/Try-Tiny ) zz-sdjson-sqlite? ( dev-lang/perl dev-perl/DateTime dev-perl/DateTime-Format-ISO8601 dev-perl/DateTime-Format-SQLite dev-perl/DateTime-TimeZone dev-perl/DBD-SQLite dev-perl/DBI virtual/perl-Digest-SHA dev-perl/File-HomeDir dev-perl/File-Which dev-perl/List-MoreUtils dev-perl/LWP-UserAgent-Determined ) tv-check? ( dev-perl/Tk dev-perl/Tk-TableMatrix ) tv-combiner? ( dev-perl/XML-LibXML ) tv-pick-cgi? ( dev-perl/CGI ) dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/XMLTV/xmltv/archive/v0.6.1.tar.gz -> xmltv-0.6.1.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=8ad37d261f5f8fe468f658de05447b63
+_md5_=1fc8f29d3740f424518fa7e414005349
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 895e0862bd22..9d2cf4ec2b36 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/droidcam-1.7.3 b/metadata/md5-cache/media-video/droidcam-1.7.3
deleted file mode 100644
index 5a5812863d2d..000000000000
--- a/metadata/md5-cache/media-video/droidcam-1.7.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-pda/libplist app-pda/libusbmuxd dev-libs/glib dev-libs/libappindicator:3 dev-libs/libxml2 dev-util/android-tools media-libs/alsa-lib media-libs/libjpeg-turbo >=media-libs/speex-1.2.0-r1 media-video/ffmpeg gtk? ( dev-cpp/gtkmm:3.0 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Use your phone or tablet as webcam with a v4l device driver and app
-EAPI=7
-HOMEPAGE=https://www.dev47apps.com/droidcam/linux/
-IUSE=gtk kernel_linux kernel_linux dist-kernel
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=app-pda/libplist app-pda/libusbmuxd dev-libs/glib dev-libs/libappindicator:3 dev-libs/libxml2 dev-util/android-tools media-libs/alsa-lib media-libs/libjpeg-turbo >=media-libs/speex-1.2.0-r1 media-video/ffmpeg gtk? ( dev-cpp/gtkmm:3.0 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/dev47apps/droidcam/archive/v1.7.3.tar.gz -> droidcam-1.7.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0c1e65f40a16dc2b9f559fffe47320fe
diff --git a/metadata/md5-cache/media-video/droidcam-1.8.0 b/metadata/md5-cache/media-video/droidcam-1.8.0
new file mode 100644
index 000000000000..8cff2fcd52a8
--- /dev/null
+++ b/metadata/md5-cache/media-video/droidcam-1.8.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-pda/libplist app-pda/libusbmuxd dev-libs/glib dev-libs/libappindicator:3 dev-libs/libxml2 dev-util/android-tools media-libs/alsa-lib media-libs/libjpeg-turbo >=media-libs/speex-1.2.0-r1 media-video/ffmpeg gtk? ( dev-cpp/gtkmm:3.0 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Use your phone or tablet as webcam with a v4l device driver and app
+EAPI=7
+HOMEPAGE=https://www.dev47apps.com/droidcam/linux/
+IUSE=gtk kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=app-pda/libplist app-pda/libusbmuxd dev-libs/glib dev-libs/libappindicator:3 dev-libs/libxml2 dev-util/android-tools media-libs/alsa-lib media-libs/libjpeg-turbo >=media-libs/speex-1.2.0-r1 media-video/ffmpeg gtk? ( dev-cpp/gtkmm:3.0 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/dev47apps/droidcam/archive/v1.8.0.tar.gz -> droidcam-1.8.0.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f215efaa3953b91e0e4f07b50662cd1c
diff --git a/metadata/md5-cache/media-video/guvcview-2.0.6-r2 b/metadata/md5-cache/media-video/guvcview-2.0.6-r2
index c29c9479e093..f9a25409b36e 100644
--- a/metadata/md5-cache/media-video/guvcview-2.0.6-r2
+++ b/metadata/md5-cache/media-video/guvcview-2.0.6-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.10 media-libs/libpng:0= media-libs/libsdl2 media-libs/libv4l >=media-libs/portaudio-19_pre >=media-video/ffmpeg-2.8:0= virtual/libusb:1 virtual/udev gsl? ( >=sci-libs/gsl-1.15:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !qt5? ( >=x11-libs/gtk+-3.6:3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/guvcview/guvcview-src-2.0.6.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=186f0b7a587f8dc4601caa0c1e04056b
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f49db617736599676fc5224791cd7714
diff --git a/metadata/md5-cache/media-video/pitivi-0.999-r4 b/metadata/md5-cache/media-video/pitivi-0.999-r4
index 9d0066892df0..411265efcd16 100644
--- a/metadata/md5-cache/media-video/pitivi-0.999-r4
+++ b/metadata/md5-cache/media-video/pitivi-0.999-r4
@@ -1,16 +1,16 @@
 BDEPEND=app-text/yelp-tools dev-python/setuptools >=dev-util/intltool-0.35.5 dev-util/itstool sys-devel/gettext virtual/pkgconfig test? ( python_single_target_python3_8? ( dev-python/nose2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose2[python_targets_python3_9(-)] ) ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pycairo-1.10[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pycairo-1.10[python_targets_python3_9(-)] ) >=x11-libs/cairo-1.10 >=media-libs/gstreamer-1.14.2:1.0[introspection] >=media-plugins/gst-transcoder-1.14.1 >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_9(-)] ) gnome-base/librsvg:= >=media-libs/gsound-1.0 >=media-libs/gstreamer-editing-services-1.14.2:1.0[introspection] >=media-libs/gst-plugins-base-1.14.2:1.0[introspection,theora] >=media-libs/gst-plugins-bad-1.14.2:1.0 >=media-plugins/gst-plugins-gtk-1.14.2:1.0 >=media-libs/gst-plugins-good-1.14.2:1.0 >=media-plugins/gst-plugins-libav-1.14.2:1.0 >=media-plugins/gst-plugins-gdkpixbuf-1.14.2:1.0 >=x11-libs/libnotify-0.7[introspection] x11-libs/libwnck:3[introspection] >=x11-libs/gtk+-3.20.0:3[introspection] v4l? ( >=media-plugins/gst-plugins-v4l2-1.14.2:1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pycairo-1.10[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pycairo-1.10[python_targets_python3_9(-)] ) >=x11-libs/cairo-1.10 >=media-libs/gstreamer-1.14.2:1.0[introspection] || ( >media-libs/gst-plugins-bad-1.18 >=media-plugins/gst-transcoder-1.14.1 ) >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_9(-)] ) gnome-base/librsvg:= >=media-libs/gsound-1.0 >=media-libs/gstreamer-editing-services-1.14.2:1.0[introspection] >=media-libs/gst-plugins-base-1.14.2:1.0[introspection,theora] >=media-libs/gst-plugins-bad-1.14.2:1.0 >=media-plugins/gst-plugins-gtk-1.14.2:1.0 >=media-libs/gst-plugins-good-1.14.2:1.0 >=media-plugins/gst-plugins-libav-1.14.2:1.0 >=media-plugins/gst-plugins-gdkpixbuf-1.14.2:1.0 >=x11-libs/libnotify-0.7[introspection] x11-libs/libwnck:3[introspection] >=x11-libs/gtk+-3.20.0:3[introspection] v4l? ( >=media-plugins/gst-plugins-v4l2-1.14.2:1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A non-linear video editor using the GStreamer multimedia framework
 EAPI=7
 HOMEPAGE=http://www.pitivi.org
 IUSE=v4l test python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pycairo-1.10[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pycairo-1.10[python_targets_python3_9(-)] ) >=x11-libs/cairo-1.10 >=media-libs/gstreamer-1.14.2:1.0[introspection] >=media-plugins/gst-transcoder-1.14.1 >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_9(-)] ) gnome-base/librsvg:= >=media-libs/gsound-1.0 >=media-libs/gstreamer-editing-services-1.14.2:1.0[introspection] >=media-libs/gst-plugins-base-1.14.2:1.0[introspection,theora] >=media-libs/gst-plugins-bad-1.14.2:1.0 >=media-plugins/gst-plugins-gtk-1.14.2:1.0 >=media-libs/gst-plugins-good-1.14.2:1.0 >=media-plugins/gst-plugins-libav-1.14.2:1.0 >=media-plugins/gst-plugins-gdkpixbuf-1.14.2:1.0 >=x11-libs/libnotify-0.7[introspection] x11-libs/libwnck:3[introspection] >=x11-libs/gtk+-3.20.0:3[introspection] v4l? ( >=media-plugins/gst-plugins-v4l2-1.14.2:1.0 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pycairo-1.10[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pycairo-1.10[python_targets_python3_9(-)] ) >=x11-libs/cairo-1.10 >=media-libs/gstreamer-1.14.2:1.0[introspection] || ( >media-libs/gst-plugins-bad-1.18 >=media-plugins/gst-transcoder-1.14.1 ) >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_9(-)] ) gnome-base/librsvg:= >=media-libs/gsound-1.0 >=media-libs/gstreamer-editing-services-1.14.2:1.0[introspection] >=media-libs/gst-plugins-base-1.14.2:1.0[introspection,theora] >=media-libs/gst-plugins-bad-1.14.2:1.0 >=media-plugins/gst-plugins-gtk-1.14.2:1.0 >=media-libs/gst-plugins-good-1.14.2:1.0 >=media-plugins/gst-plugins-libav-1.14.2:1.0 >=media-plugins/gst-plugins-gdkpixbuf-1.14.2:1.0 >=x11-libs/libnotify-0.7[introspection] x11-libs/libwnck:3[introspection] >=x11-libs/gtk+-3.20.0:3[introspection] v4l? ( >=media-plugins/gst-plugins-v4l2-1.14.2:1.0 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pitivi/0.999/pitivi-0.999.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c69a3a3792e7722ea2fac8303dbf97b6
+_md5_=596f5b8a3f83f9177e570ffd34600312
diff --git a/metadata/md5-cache/media-video/rav1e-0.3.5 b/metadata/md5-cache/media-video/rav1e-0.3.5
deleted file mode 100644
index f0c42f349be6..000000000000
--- a/metadata/md5-cache/media-video/rav1e-0.3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=amd64? ( >=dev-lang/nasm-2.14 )
-DESCRIPTION=The fastest and safest AV1 encoder
-EAPI=7
-HOMEPAGE=https://github.com/xiph/rav1e/
-IUSE=+capi debug
-KEYWORDS=amd64 arm arm64 ppc64 x86
-LICENSE=BSD-2 Apache-2.0 MIT Unlicense
-RDEPEND=capi? ( dev-util/cargo-c )
-SLOT=0
-SRC_URI=https://github.com/xiph/rav1e/archive/v0.3.5.tar.gz -> rav1e-0.3.5.tar.gz https://crates.io/api/v1/crates/addr2line/0.14.1/download -> addr2line-0.14.1.crate https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/aom-sys/0.2.1/download -> aom-sys-0.2.1.crate https://crates.io/api/v1/crates/arbitrary/0.2.0/download -> arbitrary-0.2.0.crate https://crates.io/api/v1/crates/arg_enum_proc_macro/0.3.0/download -> arg_enum_proc_macro-0.3.0.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/assert_cmd/1.0.2/download -> assert_cmd-1.0.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.55/download -> backtrace-0.3.55.crate https://crates.io/api/v1/crates/bindgen/0.54.0/download -> bindgen-0.54.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitstream-io/0.8.5/download -> bitstream-io-0.8.5.crate https://crates.io/api/v1/crates/bstr/0.2.14/download -> bstr-0.2.14.crate https://crates.io/api/v1/crates/bumpalo/3.4.0/download -> bumpalo-3.4.0.crate https://crates.io/api/v1/crates/bytemuck/1.4.1/download -> bytemuck-1.4.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clang-sys/0.29.3/download -> clang-sys-0.29.3.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cmake/0.1.45/download -> cmake-0.1.45.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/console/0.11.3/download -> console-0.11.3.crate https://crates.io/api/v1/crates/const_fn/0.4.4/download -> const_fn-0.4.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/criterion/0.3.3/download -> criterion-0.3.3.crate https://crates.io/api/v1/crates/criterion-plot/0.4.3/download -> criterion-plot-0.4.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.1/download -> crossbeam-epoch-0.9.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/csv/1.1.5/download -> csv-1.1.5.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.17/download -> ctor-0.1.17.crate https://crates.io/api/v1/crates/dav1d-sys/0.3.2/download -> dav1d-sys-0.3.2.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/error-chain/0.10.0/download -> error-chain-0.10.0.crate https://crates.io/api/v1/crates/fern/0.6.0/download -> fern-0.6.0.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/gimli/0.23.0/download -> gimli-0.23.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/half/1.6.0/download -> half-1.6.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/image/0.23.12/download -> image-0.23.12.crate https://crates.io/api/v1/crates/interpolate_name/0.2.3/download -> interpolate_name-0.2.3.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/js-sys/0.3.46/download -> js-sys-0.3.46.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.81/download -> libc-0.2.81.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memoffset/0.6.1/download -> memoffset-0.6.1.crate https://crates.io/api/v1/crates/metadeps/1.1.2/download -> metadeps-1.1.2.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/nasm-rs/0.2.0/download -> nasm-rs-0.2.0.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/noop_proc_macro/0.2.1/download -> noop_proc_macro-0.2.1.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/num-derive/0.3.3/download -> num-derive-0.3.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/object/0.22.0/download -> object-0.22.0.crate https://crates.io/api/v1/crates/oorandom/11.1.3/download -> oorandom-11.1.3.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plotters/0.2.15/download -> plotters-0.2.15.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.6/download -> predicates-1.0.6.crate https://crates.io/api/v1/crates/predicates-core/1.0.1/download -> predicates-core-1.0.1.crate https://crates.io/api/v1/crates/predicates-tree/1.0.1/download -> predicates-tree-1.0.1.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.18/download -> rustc-demangle-0.1.18.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rust_hawktracer/0.7.0/download -> rust_hawktracer-0.7.0.crate https://crates.io/api/v1/crates/rust_hawktracer_normal_macro/0.4.1/download -> rust_hawktracer_normal_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_proc_macro/0.4.1/download -> rust_hawktracer_proc_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_sys/0.4.2/download -> rust_hawktracer_sys-0.4.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scan_fmt/0.2.5/download -> scan_fmt-0.2.5.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.118/download -> serde-1.0.118.crate https://crates.io/api/v1/crates/serde_cbor/0.11.1/download -> serde_cbor-0.11.1.crate https://crates.io/api/v1/crates/serde_derive/1.0.118/download -> serde_derive-1.0.118.crate https://crates.io/api/v1/crates/serde_json/1.0.61/download -> serde_json-1.0.61.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook-registry/1.3.0/download -> signal-hook-registry-1.3.0.crate https://crates.io/api/v1/crates/simd_helpers/0.1.0/download -> simd_helpers-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.56/download -> syn-1.0.56.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.15/download -> terminal_size-0.1.15.crate https://crates.io/api/v1/crates/termios/0.3.3/download -> termios-0.3.3.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.23/download -> thiserror-1.0.23.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.23/download -> thiserror-impl-1.0.23.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tinytemplate/1.1.0/download -> tinytemplate-1.1.0.crate https://crates.io/api/v1/crates/toml/0.2.1/download -> toml-0.2.1.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.69/download -> wasm-bindgen-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.69/download -> wasm-bindgen-backend-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.69/download -> wasm-bindgen-macro-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.69/download -> wasm-bindgen-macro-support-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.69/download -> wasm-bindgen-shared-0.2.69.crate https://crates.io/api/v1/crates/web-sys/0.3.46/download -> web-sys-0.3.46.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/y4m/0.5.3/download -> y4m-0.5.3.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2a54c73a163e199fd0de794eecc7e8e2
diff --git a/metadata/md5-cache/media-video/rav1e-0.4.0 b/metadata/md5-cache/media-video/rav1e-0.4.0
deleted file mode 100644
index 6bc4fcf87ac2..000000000000
--- a/metadata/md5-cache/media-video/rav1e-0.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=amd64? ( >=dev-lang/nasm-2.15 )
-DESCRIPTION=The fastest and safest AV1 encoder
-EAPI=7
-HOMEPAGE=https://github.com/xiph/rav1e/
-IUSE=+capi debug
-KEYWORDS=amd64 arm arm64 ppc64 x86
-LICENSE=BSD-2 Apache-2.0 MIT Unlicense
-RDEPEND=capi? ( dev-util/cargo-c )
-SLOT=0
-SRC_URI=https://github.com/xiph/rav1e/archive/v0.4.0.tar.gz -> rav1e-0.4.0.tar.gz https://crates.io/api/v1/crates/addr2line/0.14.1/download -> addr2line-0.14.1.crate https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/aom-sys/0.2.1/download -> aom-sys-0.2.1.crate https://crates.io/api/v1/crates/arbitrary/0.4.7/download -> arbitrary-0.4.7.crate https://crates.io/api/v1/crates/arg_enum_proc_macro/0.3.0/download -> arg_enum_proc_macro-0.3.0.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/assert_cmd/1.0.2/download -> assert_cmd-1.0.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/av-metrics/0.6.2/download -> av-metrics-0.6.2.crate https://crates.io/api/v1/crates/backtrace/0.3.55/download -> backtrace-0.3.55.crate https://crates.io/api/v1/crates/bindgen/0.54.0/download -> bindgen-0.54.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitstream-io/1.0.0/download -> bitstream-io-1.0.0.crate https://crates.io/api/v1/crates/bstr/0.2.14/download -> bstr-0.2.14.crate https://crates.io/api/v1/crates/bumpalo/3.4.0/download -> bumpalo-3.4.0.crate https://crates.io/api/v1/crates/bytemuck/1.4.1/download -> bytemuck-1.4.1.crate https://crates.io/api/v1/crates/byteorder/1.4.2/download -> byteorder-1.4.2.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clang-sys/0.29.3/download -> clang-sys-0.29.3.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cmake/0.1.45/download -> cmake-0.1.45.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/console/0.14.0/download -> console-0.14.0.crate https://crates.io/api/v1/crates/console_error_panic_hook/0.1.6/download -> console_error_panic_hook-0.1.6.crate https://crates.io/api/v1/crates/const_fn/0.4.5/download -> const_fn-0.4.5.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/criterion/0.3.3/download -> criterion-0.3.3.crate https://crates.io/api/v1/crates/criterion-plot/0.4.3/download -> criterion-plot-0.4.3.crate https://crates.io/api/v1/crates/crossbeam/0.8.0/download -> crossbeam-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.1/download -> crossbeam-epoch-0.9.1.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.1/download -> crossbeam-queue-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/csv/1.1.5/download -> csv-1.1.5.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.18/download -> ctor-0.1.18.crate https://crates.io/api/v1/crates/dav1d-sys/0.3.2/download -> dav1d-sys-0.3.2.crate https://crates.io/api/v1/crates/dcv-color-primitives/0.1.16/download -> dcv-color-primitives-0.1.16.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/error-chain/0.10.0/download -> error-chain-0.10.0.crate https://crates.io/api/v1/crates/fern/0.6.0/download -> fern-0.6.0.crate https://crates.io/api/v1/crates/getrandom/0.2.1/download -> getrandom-0.2.1.crate https://crates.io/api/v1/crates/gimli/0.23.0/download -> gimli-0.23.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/half/1.6.0/download -> half-1.6.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/image/0.23.12/download -> image-0.23.12.crate https://crates.io/api/v1/crates/interpolate_name/0.2.3/download -> interpolate_name-0.2.3.crate https://crates.io/api/v1/crates/itertools/0.10.0/download -> itertools-0.10.0.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/js-sys/0.3.46/download -> js-sys-0.3.46.crate https://crates.io/api/v1/crates/lab/0.8.2/download -> lab-0.8.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.82/download -> libc-0.2.82.crate https://crates.io/api/v1/crates/libfuzzer-sys/0.3.5/download -> libfuzzer-sys-0.3.5.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/log/0.4.13/download -> log-0.4.13.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memoffset/0.6.1/download -> memoffset-0.6.1.crate https://crates.io/api/v1/crates/metadeps/1.1.2/download -> metadeps-1.1.2.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/nasm-rs/0.2.0/download -> nasm-rs-0.2.0.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/noop_proc_macro/0.3.0/download -> noop_proc_macro-0.3.0.crate https://crates.io/api/v1/crates/num-derive/0.3.3/download -> num-derive-0.3.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/object/0.22.0/download -> object-0.22.0.crate https://crates.io/api/v1/crates/oorandom/11.1.3/download -> oorandom-11.1.3.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/paste/1.0.4/download -> paste-1.0.4.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plotters/0.2.15/download -> plotters-0.2.15.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.6/download -> predicates-1.0.6.crate https://crates.io/api/v1/crates/predicates-core/1.0.1/download -> predicates-core-1.0.1.crate https://crates.io/api/v1/crates/predicates-tree/1.0.1/download -> predicates-tree-1.0.1.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/rand/0.8.2/download -> rand-0.8.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.6.1/download -> rand_core-0.6.1.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/regex/1.4.3/download -> regex-1.4.3.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.22/download -> regex-syntax-0.6.22.crate https://crates.io/api/v1/crates/rust_hawktracer/0.7.0/download -> rust_hawktracer-0.7.0.crate https://crates.io/api/v1/crates/rust_hawktracer_normal_macro/0.4.1/download -> rust_hawktracer_normal_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_proc_macro/0.4.1/download -> rust_hawktracer_proc_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_sys/0.4.2/download -> rust_hawktracer_sys-0.4.2.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.18/download -> rustc-demangle-0.1.18.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustc_version/0.3.2/download -> rustc_version-0.3.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scan_fmt/0.2.5/download -> scan_fmt-0.2.5.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.119/download -> serde-1.0.119.crate https://crates.io/api/v1/crates/serde_cbor/0.11.1/download -> serde_cbor-0.11.1.crate https://crates.io/api/v1/crates/serde_derive/1.0.119/download -> serde_derive-1.0.119.crate https://crates.io/api/v1/crates/serde_json/1.0.61/download -> serde_json-1.0.61.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.3.3/download -> signal-hook-0.3.3.crate https://crates.io/api/v1/crates/signal-hook-registry/1.3.0/download -> signal-hook-registry-1.3.0.crate https://crates.io/api/v1/crates/simd_helpers/0.1.0/download -> simd_helpers-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.58/download -> syn-1.0.58.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.15/download -> terminal_size-0.1.15.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.23/download -> thiserror-1.0.23.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.23/download -> thiserror-impl-1.0.23.crate https://crates.io/api/v1/crates/thread_local/1.1.0/download -> thread_local-1.1.0.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinytemplate/1.2.0/download -> tinytemplate-1.2.0.crate https://crates.io/api/v1/crates/toml/0.2.1/download -> toml-0.2.1.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.10.1+wasi-snapshot-preview1/download -> wasi-0.10.1+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.69/download -> wasm-bindgen-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.69/download -> wasm-bindgen-backend-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.19/download -> wasm-bindgen-futures-0.4.19.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.69/download -> wasm-bindgen-macro-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.69/download -> wasm-bindgen-macro-support-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.69/download -> wasm-bindgen-shared-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-test/0.3.19/download -> wasm-bindgen-test-0.3.19.crate https://crates.io/api/v1/crates/wasm-bindgen-test-macro/0.3.19/download -> wasm-bindgen-test-macro-0.3.19.crate https://crates.io/api/v1/crates/web-sys/0.3.46/download -> web-sys-0.3.46.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/y4m/0.7.0/download -> y4m-0.7.0.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8db80257c817bef61c6c0c2c4698c0db
diff --git a/metadata/md5-cache/media-video/rav1e-0.4.1 b/metadata/md5-cache/media-video/rav1e-0.4.1
index 63b0f21d0e35..d15772dde285 100644
--- a/metadata/md5-cache/media-video/rav1e-0.4.1
+++ b/metadata/md5-cache/media-video/rav1e-0.4.1
@@ -1,14 +1,12 @@
-BDEPEND=>=virtual/rust-1.37.0
+BDEPEND=amd64? ( >=dev-lang/nasm-2.15 ) capi? ( dev-util/cargo-c ) >=virtual/rust-1.37.0
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=amd64? ( >=dev-lang/nasm-2.15 )
 DESCRIPTION=The fastest and safest AV1 encoder
 EAPI=7
 HOMEPAGE=https://github.com/xiph/rav1e/
 IUSE=+capi debug
 KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=BSD-2 Apache-2.0 MIT Unlicense
-RDEPEND=capi? ( dev-util/cargo-c )
 SLOT=0
 SRC_URI=https://github.com/xiph/rav1e/archive/v0.4.1.tar.gz -> rav1e-0.4.1.tar.gz https://crates.io/api/v1/crates/addr2line/0.14.1/download -> addr2line-0.14.1.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/aom-sys/0.2.2/download -> aom-sys-0.2.2.crate https://crates.io/api/v1/crates/arbitrary/0.4.7/download -> arbitrary-0.4.7.crate https://crates.io/api/v1/crates/arg_enum_proc_macro/0.3.1/download -> arg_enum_proc_macro-0.3.1.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/assert_cmd/1.0.3/download -> assert_cmd-1.0.3.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/av-metrics/0.6.2/download -> av-metrics-0.6.2.crate https://crates.io/api/v1/crates/backtrace/0.3.56/download -> backtrace-0.3.56.crate https://crates.io/api/v1/crates/bindgen/0.56.0/download -> bindgen-0.56.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitmaps/2.1.0/download -> bitmaps-2.1.0.crate https://crates.io/api/v1/crates/bitstream-io/1.0.0/download -> bitstream-io-1.0.0.crate https://crates.io/api/v1/crates/bstr/0.2.15/download -> bstr-0.2.15.crate https://crates.io/api/v1/crates/bumpalo/3.6.1/download -> bumpalo-3.6.1.crate https://crates.io/api/v1/crates/bytemuck/1.5.1/download -> bytemuck-1.5.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytesize/1.0.1/download -> bytesize-1.0.1.crate https://crates.io/api/v1/crates/cargo/0.51.0/download -> cargo-0.51.0.crate https://crates.io/api/v1/crates/cargo-platform/0.1.1/download -> cargo-platform-0.1.1.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cbindgen/0.18.0/download -> cbindgen-0.18.0.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clang-sys/1.1.1/download -> clang-sys-1.1.1.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cmake/0.1.45/download -> cmake-0.1.45.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/console/0.14.1/download -> console-0.14.1.crate https://crates.io/api/v1/crates/console_error_panic_hook/0.1.6/download -> console_error_panic_hook-0.1.6.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/crates-io/0.31.1/download -> crates-io-0.31.1.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/criterion/0.3.4/download -> criterion-0.3.4.crate https://crates.io/api/v1/crates/criterion-plot/0.4.3/download -> criterion-plot-0.4.3.crate https://crates.io/api/v1/crates/crossbeam/0.8.0/download -> crossbeam-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.3/download -> crossbeam-epoch-0.9.3.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.1/download -> crossbeam-queue-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.3/download -> crossbeam-utils-0.8.3.crate https://crates.io/api/v1/crates/crypto-hash/0.3.4/download -> crypto-hash-0.3.4.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.20/download -> ctor-0.1.20.crate https://crates.io/api/v1/crates/curl/0.4.35/download -> curl-0.4.35.crate https://crates.io/api/v1/crates/curl-sys/0.4.41+curl-7.75.0/download -> curl-sys-0.4.41+curl-7.75.0.crate https://crates.io/api/v1/crates/dav1d-sys/0.3.3/download -> dav1d-sys-0.3.3.crate https://crates.io/api/v1/crates/dcv-color-primitives/0.1.16/download -> dcv-color-primitives-0.1.16.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/env_logger/0.8.3/download -> env_logger-0.8.3.crate https://crates.io/api/v1/crates/fern/0.6.0/download -> fern-0.6.0.crate https://crates.io/api/v1/crates/filetime/0.2.14/download -> filetime-0.2.14.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fwdansi/1.1.0/download -> fwdansi-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/gimli/0.23.0/download -> gimli-0.23.0.crate https://crates.io/api/v1/crates/git2/0.13.17/download -> git2-0.13.17.crate https://crates.io/api/v1/crates/git2-curl/0.14.1/download -> git2-curl-0.14.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.6/download -> globset-0.4.6.crate https://crates.io/api/v1/crates/half/1.7.1/download -> half-1.7.1.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/idna/0.2.2/download -> idna-0.2.2.crate https://crates.io/api/v1/crates/ignore/0.4.17/download -> ignore-0.4.17.crate https://crates.io/api/v1/crates/im-rc/15.0.0/download -> im-rc-15.0.0.crate https://crates.io/api/v1/crates/image/0.23.14/download -> image-0.23.14.crate https://crates.io/api/v1/crates/indexmap/1.6.2/download -> indexmap-1.6.2.crate https://crates.io/api/v1/crates/interpolate_name/0.2.3/download -> interpolate_name-0.2.3.crate https://crates.io/api/v1/crates/itertools/0.10.0/download -> itertools-0.10.0.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/js-sys/0.3.50/download -> js-sys-0.3.50.crate https://crates.io/api/v1/crates/lab/0.8.2/download -> lab-0.8.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.92/download -> libc-0.2.92.crate https://crates.io/api/v1/crates/libfuzzer-sys/0.3.5/download -> libfuzzer-sys-0.3.5.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.18+1.1.0/download -> libgit2-sys-0.12.18+1.1.0.crate https://crates.io/api/v1/crates/libloading/0.7.0/download -> libloading-0.7.0.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.6+1.43.0/download -> libnghttp2-sys-0.1.6+1.43.0.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.21/download -> libssh2-sys-0.2.21.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memoffset/0.6.3/download -> memoffset-0.6.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/nasm-rs/0.2.0/download -> nasm-rs-0.2.0.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/noop_proc_macro/0.3.0/download -> noop_proc_macro-0.3.0.crate https://crates.io/api/v1/crates/num-derive/0.3.3/download -> num-derive-0.3.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/object/0.23.0/download -> object-0.23.0.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/oorandom/11.1.3/download -> oorandom-11.1.3.crate https://crates.io/api/v1/crates/opener/0.4.1/download -> opener-0.4.1.crate https://crates.io/api/v1/crates/openssl/0.10.33/download -> openssl-0.10.33.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-src/111.15.0+1.1.1k/download -> openssl-src-111.15.0+1.1.1k.crate https://crates.io/api/v1/crates/openssl-sys/0.9.61/download -> openssl-sys-0.9.61.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/paste/1.0.5/download -> paste-1.0.5.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plotters/0.3.0/download -> plotters-0.3.0.crate https://crates.io/api/v1/crates/plotters-backend/0.3.0/download -> plotters-backend-0.3.0.crate https://crates.io/api/v1/crates/plotters-svg/0.3.0/download -> plotters-svg-0.3.0.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.7/download -> predicates-1.0.7.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.2/download -> predicates-tree-1.0.2.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proc-macro2/1.0.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/rand_xoshiro/0.4.0/download -> rand_xoshiro-0.4.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/regex/1.4.5/download -> regex-1.4.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.23/download -> regex-syntax-0.6.23.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust_hawktracer/0.7.0/download -> rust_hawktracer-0.7.0.crate https://crates.io/api/v1/crates/rust_hawktracer_normal_macro/0.4.1/download -> rust_hawktracer_normal_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_proc_macro/0.4.1/download -> rust_hawktracer_proc_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_sys/0.4.2/download -> rust_hawktracer_sys-0.4.2.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.18/download -> rustc-demangle-0.1.18.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc-workspace-hack/1.0.0/download -> rustc-workspace-hack-1.0.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustc_version/0.3.3/download -> rustc_version-0.3.3.crate https://crates.io/api/v1/crates/rustfix/0.5.1/download -> rustfix-0.5.1.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scan_fmt/0.2.6/download -> scan_fmt-0.2.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.10.0/download -> semver-0.10.0.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.125/download -> serde-1.0.125.crate https://crates.io/api/v1/crates/serde_cbor/0.11.1/download -> serde_cbor-0.11.1.crate https://crates.io/api/v1/crates/serde_derive/1.0.125/download -> serde_derive-1.0.125.crate https://crates.io/api/v1/crates/serde_ignored/0.1.2/download -> serde_ignored-0.1.2.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/shell-escape/0.1.5/download -> shell-escape-0.1.5.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.3.7/download -> signal-hook-0.3.7.crate https://crates.io/api/v1/crates/signal-hook-registry/1.3.0/download -> signal-hook-registry-1.3.0.crate https://crates.io/api/v1/crates/simd_helpers/0.1.0/download -> simd_helpers-0.1.0.crate https://crates.io/api/v1/crates/sized-chunks/0.6.4/download -> sized-chunks-0.6.4.crate https://crates.io/api/v1/crates/socket2/0.3.19/download -> socket2-0.3.19.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/strum/0.20.0/download -> strum-0.20.0.crate https://crates.io/api/v1/crates/strum_macros/0.20.1/download -> strum_macros-0.20.1.crate https://crates.io/api/v1/crates/syn/1.0.67/download -> syn-1.0.67.crate https://crates.io/api/v1/crates/syn/1.0.68/download -> syn-1.0.68.crate https://crates.io/api/v1/crates/system-deps/2.0.3/download -> system-deps-2.0.3.crate https://crates.io/api/v1/crates/tar/0.4.33/download -> tar-0.4.33.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.16/download -> terminal_size-0.1.16.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.24/download -> thiserror-1.0.24.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.24/download -> thiserror-impl-1.0.24.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinytemplate/1.2.1/download -> tinytemplate-1.2.1.crate https://crates.io/api/v1/crates/tinyvec/1.1.1/download -> tinyvec-1.1.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version-compare/0.0.11/download -> version-compare-0.0.11.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.73/download -> wasm-bindgen-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.73/download -> wasm-bindgen-backend-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.23/download -> wasm-bindgen-futures-0.4.23.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.73/download -> wasm-bindgen-macro-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.73/download -> wasm-bindgen-macro-support-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.73/download -> wasm-bindgen-shared-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-test/0.3.23/download -> wasm-bindgen-test-0.3.23.crate https://crates.io/api/v1/crates/wasm-bindgen-test-macro/0.3.23/download -> wasm-bindgen-test-macro-0.3.23.crate https://crates.io/api/v1/crates/web-sys/0.3.50/download -> web-sys-0.3.50.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/y4m/0.7.0/download -> y4m-0.7.0.crate
 _eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9cd08baf5f332fcb5377b7b1e16e68fd
+_md5_=8d662cbc412f8b2bcf478cbcf39ccc69
diff --git a/metadata/md5-cache/media-video/rav1e-9999 b/metadata/md5-cache/media-video/rav1e-9999
index 2bcacd2e4b7c..7a0e3e9c9d7e 100644
--- a/metadata/md5-cache/media-video/rav1e-9999
+++ b/metadata/md5-cache/media-video/rav1e-9999
@@ -1,13 +1,11 @@
-BDEPEND=>=virtual/rust-1.37.0 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=amd64? ( >=dev-lang/nasm-2.14 ) capi? ( dev-util/cargo-c ) >=virtual/rust-1.37.0 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=amd64? ( >=dev-lang/nasm-2.14 )
 DESCRIPTION=The fastest and safest AV1 encoder
 EAPI=7
 HOMEPAGE=https://github.com/xiph/rav1e/
 IUSE=+capi debug
 LICENSE=BSD-2 Apache-2.0 MIT Unlicense
 PROPERTIES=live
-RDEPEND=capi? ( dev-util/cargo-c )
 SLOT=0
 _eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c3edfe6b4ed2818d0c64ec7fd156e70
+_md5_=86c07020368093ff8b1997feed6e4264
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index d1dfc7efa40a..f07858e97aff 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.11.2 b/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
index 66e007f28fd8..56e6b8262d9e 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/archive/0.11.2.tar.gz -> fail2ban-0.11.2.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=684b5d462fe0992a6db09da1e3cb546b
+_md5_=39cd6d2975ee31a1d9401830c30ca7b4
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-9999 b/metadata/md5-cache/net-analyzer/fail2ban-9999
index 6acb67448711..ef1a153baa5b 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-9999
+++ b/metadata/md5-cache/net-analyzer/fail2ban-9999
@@ -10,4 +10,4 @@ RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) syst
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=91c1d170ce60bae90ddbe08618c73e12
+_md5_=8b81c4c5572e92f03724f5d46ac01396
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.66-r1 b/metadata/md5-cache/net-analyzer/munin-2.0.66-r1
deleted file mode 100644
index 11b54b33a445..000000000000
--- a/metadata/md5-cache/net-analyzer/munin-2.0.66-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
-DEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Munin Server Monitoring Tool
-EAPI=7
-HOMEPAGE=http://munin-monitoring.org/
-IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.66.tar.gz -> munin-2.0.66.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.66-gentoo-1.tar.xz
-_eclasses_=java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=176754ba031f3218250df094c4a5c394
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.66-r3 b/metadata/md5-cache/net-analyzer/munin-2.0.66-r3
new file mode 100644
index 000000000000..f8b5c83ee8ce
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.66-r3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
+DEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Munin Server Monitoring Tool
+EAPI=7
+HOMEPAGE=http://munin-monitoring.org/
+IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.66.tar.gz -> munin-2.0.66.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.66-gentoo-1.tar.xz
+_eclasses_=java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=be505967ecbfb83d7d156783b23314f9
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.67-r2 b/metadata/md5-cache/net-analyzer/munin-2.0.67-r2
deleted file mode 100644
index 3a92afe6ceac..000000000000
--- a/metadata/md5-cache/net-analyzer/munin-2.0.67-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
-DEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.8 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Munin Server Monitoring Tool
-EAPI=7
-HOMEPAGE=http://munin-monitoring.org/
-IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.67.tar.gz -> munin-2.0.67.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.67-gentoo-1.tar.xz
-_eclasses_=java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d0270b7efa68c94d146b6f789a55f4a8
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.67-r3 b/metadata/md5-cache/net-analyzer/munin-2.0.67-r3
deleted file mode 100644
index dcbb990b0395..000000000000
--- a/metadata/md5-cache/net-analyzer/munin-2.0.67-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
-DEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.8 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Munin Server Monitoring Tool
-EAPI=7
-HOMEPAGE=https://munin-monitoring.org/
-IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.67.tar.gz -> munin-2.0.67.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.67-gentoo-1.tar.xz
-_eclasses_=java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e5c7ca374a9391ccea4a06609625ff5e
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.67-r6 b/metadata/md5-cache/net-analyzer/munin-2.0.67-r6
new file mode 100644
index 000000000000..a71368690c3c
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.67-r6
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
+DEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.8 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Munin Server Monitoring Tool
+EAPI=7
+HOMEPAGE=http://munin-monitoring.org/
+IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.67.tar.gz -> munin-2.0.67.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.67-gentoo-1.tar.xz
+_eclasses_=java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fb76f2f2760509e844770e2c42052ba6
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.67-r7 b/metadata/md5-cache/net-analyzer/munin-2.0.67-r7
new file mode 100644
index 000000000000..8e3b5d228650
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.67-r7
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
+DEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.8 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Munin Server Monitoring Tool
+EAPI=7
+HOMEPAGE=https://munin-monitoring.org/
+IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.67.tar.gz -> munin-2.0.67.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.67-gentoo-1.tar.xz
+_eclasses_=java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e7df2fe38fc75929b77638ddf9876cd3
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r1 b/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r1
new file mode 100644
index 000000000000..4df9ae64a89b
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Nagios plugin to execute multiple checks in parallel
+EAPI=7
+HOMEPAGE=https://github.com/clarkbox/check_multiple
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/clarkbox/check_multiple/archive/v0.0.1.tar.gz -> nagios-check_multiple-0.0.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f9fcdfd5d1cd5f661a26b2588948984a
diff --git a/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r2 b/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r2
new file mode 100644
index 000000000000..98c562ef6581
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Nagios plugin to check whether an OpenVPN server is alive
+EAPI=7
+HOMEPAGE=https://github.com/liquidat/nagios-icinga-openvpn
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/liquidat/nagios-icinga-openvpn/archive/0.0.1.tar.gz -> nagios-icinga-openvpn-0.0.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3a84946d89c44c4dd33df31adb4c9eb2
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.91-r2 b/metadata/md5-cache/net-analyzer/nmap-7.91-r2
index ba34c3b016d5..6569a042d3d1 100644
--- a/metadata/md5-cache/net-analyzer/nmap-7.91-r2
+++ b/metadata/md5-cache/net-analyzer/nmap-7.91-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-li
 REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://nmap.org/dist/nmap-7.91.tar.bz2 verify-sig? ( https://nmap.org/dist/sigs/nmap-7.91.tar.bz2.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=733a1c5294511f8dc74cd2b5ab54b47e
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=e267dbacfc83295f2014b45ea94a2310
diff --git a/metadata/md5-cache/net-analyzer/nmap-9999 b/metadata/md5-cache/net-analyzer/nmap-9999
index 6ba260ed4ba0..2ae7fb1a3194 100644
--- a/metadata/md5-cache/net-analyzer/nmap-9999
+++ b/metadata/md5-cache/net-analyzer/nmap-9999
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-li
 REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b39d441ff0f407af499b068d49ed743e
+_md5_=6cfc7bd43159a4e251c5a88da96bfbcd
diff --git a/metadata/md5-cache/net-analyzer/nrpe-4.0.3 b/metadata/md5-cache/net-analyzer/nrpe-4.0.3
index 1a91f1cbdb14..4cc0ca3df671 100644
--- a/metadata/md5-cache/net-analyzer/nrpe-4.0.3
+++ b/metadata/md5-cache/net-analyzer/nrpe-4.0.3
@@ -5,10 +5,10 @@ DESCRIPTION=Nagios Remote Plugin Executor
 EAPI=7
 HOMEPAGE=https://github.com/NagiosEnterprises/nrpe
 IUSE=command-args selinux ssl tcpd
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2+
 RDEPEND=acct-group/nagios acct-user/nagios tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:= ) || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) selinux? ( sec-policy/selinux-nagios )
 SLOT=0
 SRC_URI=https://github.com/NagiosEnterprises/nrpe/releases/download/nrpe-4.0.3/nrpe-4.0.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e579b6422efd0ccf79042806bd313066
+_md5_=b21865c14a9e018874f683a089fec39b
diff --git a/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0 b/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
index 91a4ddc3cf36..9700d3ca64eb 100644
--- a/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
+++ b/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
@@ -1,5 +1,5 @@
 BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?] virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Real time correlator of events received by Prelude Manager
 EAPI=7
 HOMEPAGE=https://www.prelude-siem.org
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/prelude-correlator-5.2.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=102da9ba831cd807eaba91570aebeff6
+_md5_=f1ee2a6a15e6bbef77562a3565bf29d5
diff --git a/metadata/md5-cache/net-analyzer/prelude-lml-5.1.0 b/metadata/md5-cache/net-analyzer/prelude-lml-5.1.0
index 9bc97eb62ee0..99cdb0f60a2a 100644
--- a/metadata/md5-cache/net-analyzer/prelude-lml-5.1.0
+++ b/metadata/md5-cache/net-analyzer/prelude-lml-5.1.0
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=configure install postinst prepare
 DEPEND=dev-libs/libpcre >=dev-libs/libprelude-5.1.0 <dev-libs/libprelude-6 icu? ( dev-libs/icu:= ) ssl? ( net-libs/gnutls:= )
 DESCRIPTION=The prelude log analyzer
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/libpcre >=dev-libs/libprelude-5.1.0 <dev-libs/libprelude-6 icu?
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.1.0/prelude-lml-5.1.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1e3eb5361365a799a2724bcbd97afa4a
+_md5_=5f7912fad7689205861864b54110372d
diff --git a/metadata/md5-cache/net-analyzer/smokeping-2.7.3-r1 b/metadata/md5-cache/net-analyzer/smokeping-2.7.3-r1
index 739fc0f46cac..6ab41daf7a14 100644
--- a/metadata/md5-cache/net-analyzer/smokeping-2.7.3-r1
+++ b/metadata/md5-cache/net-analyzer/smokeping-2.7.3-r1
@@ -1,5 +1,5 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=acct-group/smokeping acct-user/smokeping >=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/IO-Tty dev-perl/Net-DNS dev-perl/Net-OpenSSH dev-perl/Net-SNMP dev-perl/Net-Telnet dev-perl/libwww-perl dev-perl/perl-ldap virtual/perl-libnet dev-perl/CGI-Fast !apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) radius? ( dev-perl/Authen-Radius )
 DESCRIPTION=A powerful latency measurement tool
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=acct-group/smokeping acct-user/smokeping >=dev-lang/perl-5.8.8-r8 >=dev-
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/smokeping/pub/smokeping-2.7.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=03c847b6861f78d32038af4eb2b2da3d
+_md5_=be85e8c26c7a3c29a6a17b8ed405e776
diff --git a/metadata/md5-cache/net-analyzer/suricata-5.0.7 b/metadata/md5-cache/net-analyzer/suricata-5.0.7
index 887090d4c363..31662a752436 100644
--- a/metadata/md5-cache/net-analyzer/suricata-5.0.7
+++ b/metadata/md5-cache/net-analyzer/suricata-5.0.7
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-5.0.7.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=994842d8633481f88f7f6a0c2a7a73ff
+_md5_=03bae2fa11bdb8ef8bf018983e29422c
diff --git a/metadata/md5-cache/net-analyzer/suricata-6.0.3 b/metadata/md5-cache/net-analyzer/suricata-6.0.3
index 5b43e179e511..0a5bb4cb57d9 100644
--- a/metadata/md5-cache/net-analyzer/suricata-6.0.3
+++ b/metadata/md5-cache/net-analyzer/suricata-6.0.3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-6.0.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=73e8aed8a6b7c7074abb82620d1b1aa2
+_md5_=7ad08051277d9305741123aecf593c9a
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.99.0 b/metadata/md5-cache/net-analyzer/tcpdump-4.99.0
index ab65f5427a5b..b498ee8dd204 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.99.0
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.99.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( samba )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/tcpdump-4.99.0.tar.gz -> tcpdump-4.99.0-upstream.tar.gz verify-sig? ( https://www.tcpdump.org/release/tcpdump-4.99.0.tar.gz.sig -> tcpdump-4.99.0-upstream.tar.gz.sig )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=ffbfecdfe4e032cc5b5a888e1eee9809
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=9ebd480b8a0d4dc6eee2debd6223d039
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.99.1 b/metadata/md5-cache/net-analyzer/tcpdump-4.99.1
index 0c2621482f71..3b45a74229c5 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.99.1
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.99.1
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( samba )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/tcpdump-4.99.1.tar.gz -> tcpdump-4.99.1-upstream.tar.gz verify-sig? ( https://www.tcpdump.org/release/tcpdump-4.99.1.tar.gz.sig -> tcpdump-4.99.1-upstream.tar.gz.sig )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=fbecdff09867f6c0e920b8003f0862e3
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=1f24a89a802548ed789eddf91904fc07
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-9999 b/metadata/md5-cache/net-analyzer/tcpdump-9999
index fb9ab7373c63..f2998661cbe6 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-9999
+++ b/metadata/md5-cache/net-analyzer/tcpdump-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=test? ( samba )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=99aef35b6864a9771864851f0cc726ae
+_md5_=aaecd50be0fa8067d974af60b5ce9d5a
diff --git a/metadata/md5-cache/net-analyzer/tracebox-0.4.4-r100 b/metadata/md5-cache/net-analyzer/tracebox-0.4.4-r100
index 938daafcd039..5e4c694d75b8 100644
--- a/metadata/md5-cache/net-analyzer/tracebox-0.4.4-r100
+++ b/metadata/md5-cache/net-analyzer/tracebox-0.4.4-r100
@@ -1,8 +1,8 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815
 DEFINED_PHASES=configure prepare setup
 DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=net-libs/libcrafter-0.3_p20171019 dev-libs/json-c net-libs/libpcap curl? ( net-misc/curl ) sniffer? ( net-libs/libnetfilter_queue )
 DESCRIPTION=A Middlebox Detection Tool
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.tracebox.org/
 IUSE=curl sniffer lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~amd64 ~x86
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tracebox/tracebox/archive/v0.4.4.tar.gz -> tracebox-0.4.4.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=88e6f088ea3c393da9e17e1fd8c808a0
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5ff86494d30710060cde48385c38ddd4
diff --git a/metadata/md5-cache/net-analyzer/vnstat-1.17-r1 b/metadata/md5-cache/net-analyzer/vnstat-1.17-r1
index 663a1fa13f73..026425299bd4 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-1.17-r1
+++ b/metadata/md5-cache/net-analyzer/vnstat-1.17-r1
@@ -11,5 +11,5 @@ RDEPEND=gd? ( media-libs/gd[png] ) acct-group/vnstat acct-user/vnstat selinux? (
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://humdi.net/vnstat/vnstat-1.17.tar.gz verify-sig? ( https://humdi.net/vnstat/vnstat-1.17.tar.gz.asc )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=24060591cbebc3e610f293dab0a24fe5
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7325dc8502f549de2b8bfaf2e0cd9152
diff --git a/metadata/md5-cache/net-analyzer/vnstat-2.6-r1 b/metadata/md5-cache/net-analyzer/vnstat-2.6-r1
index 7b8eee496cf3..64abc1464213 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-2.6-r1
+++ b/metadata/md5-cache/net-analyzer/vnstat-2.6-r1
@@ -1,5 +1,5 @@
 BDEPEND=verify-sig? ( app-crypt/openpgp-keys-teemutoivola ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install postinst unpack
 DEPEND=dev-db/sqlite gd? ( media-libs/gd[png] ) test? ( dev-libs/check )
 DESCRIPTION=Console-based network traffic monitor that keeps statistics of network usage
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite gd? ( media-libs/gd[png] ) acct-group/vnstat acct-user/vns
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://humdi.net/vnstat/vnstat-2.6.tar.gz verify-sig? ( https://humdi.net/vnstat/vnstat-2.6.tar.gz.asc )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=7459194818d00cbab980305642de940c
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=35958b462395e876102197f6c84e50bb
diff --git a/metadata/md5-cache/net-analyzer/vnstat-2.7 b/metadata/md5-cache/net-analyzer/vnstat-2.7
index ee0bc28ba6e7..10e46f0f8a27 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-2.7
+++ b/metadata/md5-cache/net-analyzer/vnstat-2.7
@@ -1,5 +1,5 @@
 BDEPEND=verify-sig? ( app-crypt/openpgp-keys-teemutoivola ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install postinst unpack
 DEPEND=acct-group/vnstat acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png] ) test? ( dev-libs/check )
 DESCRIPTION=Console-based network traffic monitor that keeps statistics of network usage
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=acct-group/vnstat acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://humdi.net/vnstat/vnstat-2.7.tar.gz verify-sig? ( https://humdi.net/vnstat/vnstat-2.7.tar.gz.asc )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=18cb309851c3574b0e515abe989721df
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=d6ca4e74313f69ba2bbfa58195b8e722
diff --git a/metadata/md5-cache/net-analyzer/vnstat-9999 b/metadata/md5-cache/net-analyzer/vnstat-9999
index a1399b087f80..c4b34ecfd499 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-9999
+++ b/metadata/md5-cache/net-analyzer/vnstat-9999
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install postinst unpack
 DEPEND=acct-group/vnstat acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png] ) test? ( dev-libs/check )
 DESCRIPTION=Console-based network traffic monitor that keeps statistics of network usage
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=acct-group/vnstat acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3fbf5cce100b7fe6fb6aa69ba422e5e2
+_md5_=d2df1955c46956a75df44d3b40f68988
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.7 b/metadata/md5-cache/net-analyzer/wireshark-3.4.7
index 2e1b5994bd0c..53c67939d299 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.4.7
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.4.7
@@ -5,7 +5,7 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=7
 HOMEPAGE=https://www.wireshark.org/
 IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps lua_single_target_lua5-1 lua_single_target_lua5-2
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) plugin-ifdemo? ( plugins )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/3.4.7
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.7.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8e11ae04ad81eb5382e933cb3f09a83e
+_md5_=9d9f54fded9147abdf996a154c847168
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.31-r1 b/metadata/md5-cache/net-analyzer/zabbix-4.0.31-r1
index a0cfee079eb1..55e5d988d966 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.31-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.31-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( agent frontend proxy server ) ssl? ( ^^ ( gnutls mbedtls opens
 SLOT=0/4.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.31.tar.gz
 _eclasses_=java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=6915d69af8966179a97854b5733953d3
+_md5_=dc57729cdf7df3c3633c1220ccd67bbe
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.32 b/metadata/md5-cache/net-analyzer/zabbix-4.0.32
index 396a2bf89cc5..774eda02a34b 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.32
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.32
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( agent frontend proxy server ) ssl? ( ^^ ( gnutls mbedtls opens
 SLOT=0/4.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.32.tar.gz
 _eclasses_=java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=aee968834a31bec569929171b68dfba0
+_md5_=cccfbbad47c5feb6b4c7a6a6c8823756
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.12-r1 b/metadata/md5-cache/net-analyzer/zabbix-5.0.12-r1
index eb95e63dcd2f..5a7494bb1151 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.12-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.12-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.12.tar.gz agent2? ( mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190719114852-fd7a80b32e1f.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190719114852-fd7a80b32e1f.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.zip -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.zip mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.mod -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.zip mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.mod mirror://goproxy//github.com/godror/godror/@v/v0.20.1.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.zip mirror://goproxy//github.com/godror/godror/@v/v0.20.1.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.zip -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190420214824-7e0022ef6ba3.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190824142844-760dd75542eb.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190831204454-2fabfa3c18b7.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.4.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.1-0.20200601181101-fa742c524853.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.1-0.20200601181101-fa742c524853.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.mod mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.zip -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.zip mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.mod -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.mod mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190420180111-c116219b62db.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190420180111-c116219b62db.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190609003834-432c2951c711.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190609003834-432c2951c711.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4c03ce451f29.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.0.20190831210041-4c03ce451f29.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190421001408-4ed0de4755e0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190824184912-ab885b375b90.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190828014616-a8802b16cc59.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.2.0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200510190516-8cd94a14c75a.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200510190516-8cd94a14c75a.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200606141011-f6355165a91c.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200606141011-f6355165a91c.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.zip -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.zip mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190420224344-cc3461e65d96.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190421002000-1b8f0016e912.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-pre1.0.20190824185557-6972a5742186.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.5.0.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.5.0.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200510190926-94ba730bb1e9.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200510190926-94ba730bb1e9.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200606145419-4e5062306904.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200606145419-4e5062306904.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.zip -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.zip mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190413234325-e4ced69a3a2b.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190608224051-11cab39313c9.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.1.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.3.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.3.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.zip -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.zip -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.mod -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.zip -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.mod -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.zip -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.mod -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.13.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.15.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.15.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/zenazn/goji/@v/v0.9.0.mod -> github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190411191339-88737f569e3a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190411191339-88737f569e3a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200428200454-593003d681fa.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200428200454-593003d681fa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425163242-31fd60d6bfdc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425163242-31fd60d6bfdc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190823170909-c4a336ef6a2f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190823170909-c4a336ef6a2f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190513163551-3ee3066db522.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod -> gopkg.in%2Finconshreveable%2Flog15.v2%2F@v%2Fv2.0.0-20180818164646-67afb5ed74ec.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.mod mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.zip -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.mod -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod )
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=3e8722753017430ce6b853ddc2240232
+_md5_=51420380075dac38e60e0bda306e5303
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.13 b/metadata/md5-cache/net-analyzer/zabbix-5.0.13
index d4d21246dd9f..208a9012cbe1 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.13
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.13
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.13.tar.gz agent2? ( mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190719114852-fd7a80b32e1f.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190719114852-fd7a80b32e1f.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.zip -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.zip mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.mod -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.zip mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.mod mirror://goproxy//github.com/godror/godror/@v/v0.20.1.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.zip mirror://goproxy//github.com/godror/godror/@v/v0.20.1.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.zip -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190420214824-7e0022ef6ba3.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190824142844-760dd75542eb.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190831204454-2fabfa3c18b7.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.4.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.1-0.20200601181101-fa742c524853.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.1-0.20200601181101-fa742c524853.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.mod mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.zip -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.zip mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.mod -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.mod mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190420180111-c116219b62db.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190420180111-c116219b62db.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190609003834-432c2951c711.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190609003834-432c2951c711.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4c03ce451f29.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.0.20190831210041-4c03ce451f29.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190421001408-4ed0de4755e0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190824184912-ab885b375b90.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190828014616-a8802b16cc59.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.2.0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200510190516-8cd94a14c75a.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200510190516-8cd94a14c75a.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200606141011-f6355165a91c.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200606141011-f6355165a91c.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.zip -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.zip mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190420224344-cc3461e65d96.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190421002000-1b8f0016e912.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-pre1.0.20190824185557-6972a5742186.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.5.0.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.5.0.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200510190926-94ba730bb1e9.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200510190926-94ba730bb1e9.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200606145419-4e5062306904.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200606145419-4e5062306904.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.zip -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.zip mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190413234325-e4ced69a3a2b.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190608224051-11cab39313c9.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.1.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.3.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.3.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.zip -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.zip -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.mod -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.zip -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.mod -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.zip -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.mod -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.13.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.15.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.15.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/zenazn/goji/@v/v0.9.0.mod -> github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190411191339-88737f569e3a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190411191339-88737f569e3a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200428200454-593003d681fa.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200428200454-593003d681fa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425163242-31fd60d6bfdc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425163242-31fd60d6bfdc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190823170909-c4a336ef6a2f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190823170909-c4a336ef6a2f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190513163551-3ee3066db522.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod -> gopkg.in%2Finconshreveable%2Flog15.v2%2F@v%2Fv2.0.0-20180818164646-67afb5ed74ec.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.mod mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.zip -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.mod -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod )
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=61e4072c1299272c356a8120bce85f42
+_md5_=0d812e167c2958b63e3b9965764ba379
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.14 b/metadata/md5-cache/net-analyzer/zabbix-5.0.14
index e02c20f59012..7314de3fb107 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.14
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.14
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.14.tar.gz agent2? ( mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190719114852-fd7a80b32e1f.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190719114852-fd7a80b32e1f.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.zip -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.zip mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.mod -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.zip mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.mod mirror://goproxy//github.com/godror/godror/@v/v0.20.1.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.zip mirror://goproxy//github.com/godror/godror/@v/v0.20.1.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.zip -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190420214824-7e0022ef6ba3.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190824142844-760dd75542eb.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190831204454-2fabfa3c18b7.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.4.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.1-0.20200601181101-fa742c524853.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.1-0.20200601181101-fa742c524853.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.mod mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.zip -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.zip mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.mod -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.mod mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190420180111-c116219b62db.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190420180111-c116219b62db.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190609003834-432c2951c711.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190609003834-432c2951c711.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4c03ce451f29.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.0.20190831210041-4c03ce451f29.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190421001408-4ed0de4755e0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190824184912-ab885b375b90.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190828014616-a8802b16cc59.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.2.0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200510190516-8cd94a14c75a.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200510190516-8cd94a14c75a.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200606141011-f6355165a91c.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200606141011-f6355165a91c.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.zip -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.zip mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190420224344-cc3461e65d96.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190421002000-1b8f0016e912.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-pre1.0.20190824185557-6972a5742186.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.5.0.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.5.0.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200510190926-94ba730bb1e9.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200510190926-94ba730bb1e9.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200606145419-4e5062306904.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200606145419-4e5062306904.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.zip -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.zip mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190413234325-e4ced69a3a2b.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190608224051-11cab39313c9.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.1.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.3.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.3.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.zip -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.zip -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.mod -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.zip -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.mod -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.zip -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.mod -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.13.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.15.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.15.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/zenazn/goji/@v/v0.9.0.mod -> github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190411191339-88737f569e3a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190411191339-88737f569e3a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200428200454-593003d681fa.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200428200454-593003d681fa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200428200454-593003d681fa.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425163242-31fd60d6bfdc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425163242-31fd60d6bfdc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190823170909-c4a336ef6a2f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190823170909-c4a336ef6a2f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190513163551-3ee3066db522.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod -> gopkg.in%2Finconshreveable%2Flog15.v2%2F@v%2Fv2.0.0-20180818164646-67afb5ed74ec.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.mod mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.zip -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.mod -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod )
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=61e4072c1299272c356a8120bce85f42
+_md5_=0d812e167c2958b63e3b9965764ba379
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.4.1-r1 b/metadata/md5-cache/net-analyzer/zabbix-5.4.1-r1
index be7f4ac409bc..0a7a953e3e7d 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.4.1-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.4.1-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/5.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.4/zabbix-5.4.1.tar.gz agent2? ( mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.zip -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.mod -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/chromedp/cdproto/@v/v0.0.0-20210104223854-2cc87dae3ee3.zip -> github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.zip mirror://goproxy//github.com/chromedp/cdproto/@v/v0.0.0-20210104223854-2cc87dae3ee3.mod -> github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.mod mirror://goproxy//github.com/chromedp/chromedp/@v/v0.6.0.zip -> github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/chromedp/chromedp/@v/v0.6.0.mod -> github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/chromedp/sysutil/@v/v1.0.0.zip -> github.com%2Fchromedp%2Fsysutil%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/chromedp/sysutil/@v/v1.0.0.mod -> github.com%2Fchromedp%2Fsysutil%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190719114852-fd7a80b32e1f.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190719114852-fd7a80b32e1f.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.zip -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.zip mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.mod -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobwas/httphead/@v/v0.1.0.zip -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gobwas/httphead/@v/v0.1.0.mod -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobwas/pool/@v/v0.2.1.zip -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/gobwas/pool/@v/v0.2.1.mod -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/gobwas/ws/@v/v1.0.4.zip -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/gobwas/ws/@v/v1.0.4.mod -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.zip mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.mod mirror://goproxy//github.com/godror/godror/@v/v0.20.1.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.zip mirror://goproxy//github.com/godror/godror/@v/v0.20.1.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.zip -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190420214824-7e0022ef6ba3.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190824142844-760dd75542eb.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190831204454-2fabfa3c18b7.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.4.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.1-0.20200601181101-fa742c524853.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.1-0.20200601181101-fa742c524853.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.mod mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.zip -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.zip mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.mod -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.mod mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190420180111-c116219b62db.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190420180111-c116219b62db.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190609003834-432c2951c711.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190609003834-432c2951c711.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4c03ce451f29.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.0.20190831210041-4c03ce451f29.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190421001408-4ed0de4755e0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190824184912-ab885b375b90.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190828014616-a8802b16cc59.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.2.0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200510190516-8cd94a14c75a.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200510190516-8cd94a14c75a.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200606141011-f6355165a91c.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200606141011-f6355165a91c.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.zip -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.zip mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190420224344-cc3461e65d96.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190421002000-1b8f0016e912.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-pre1.0.20190824185557-6972a5742186.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.5.0.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.5.0.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200510190926-94ba730bb1e9.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200510190926-94ba730bb1e9.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200606145419-4e5062306904.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200606145419-4e5062306904.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.zip -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.zip mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190413234325-e4ced69a3a2b.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190608224051-11cab39313c9.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.1.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.mod mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.zip -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.mod -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.3.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.3.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.zip -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.zip -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.mod -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.zip -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.mod -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.zip -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.mod -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.13.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.15.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.15.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/zenazn/goji/@v/v0.9.0.mod -> github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190411191339-88737f569e3a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190411191339-88737f569e3a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425163242-31fd60d6bfdc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425163242-31fd60d6bfdc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190823170909-c4a336ef6a2f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190823170909-c4a336ef6a2f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190513163551-3ee3066db522.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod -> gopkg.in%2Finconshreveable%2Flog15.v2%2F@v%2Fv2.0.0-20180818164646-67afb5ed74ec.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.mod mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.zip -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.mod -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod )
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=a20034091edeade0e1339a1ac6705b0a
+_md5_=d9d1ac65be1d4fa2025c972bf7140aee
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.4.2 b/metadata/md5-cache/net-analyzer/zabbix-5.4.2
index b17328606dd9..44dc425626ea 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.4.2
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.4.2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/5.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.4/zabbix-5.4.2.tar.gz agent2? ( mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.zip -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.mod -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/chromedp/cdproto/@v/v0.0.0-20210104223854-2cc87dae3ee3.zip -> github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.zip mirror://goproxy//github.com/chromedp/cdproto/@v/v0.0.0-20210104223854-2cc87dae3ee3.mod -> github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.mod mirror://goproxy//github.com/chromedp/chromedp/@v/v0.6.0.zip -> github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/chromedp/chromedp/@v/v0.6.0.mod -> github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/chromedp/sysutil/@v/v1.0.0.zip -> github.com%2Fchromedp%2Fsysutil%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/chromedp/sysutil/@v/v1.0.0.mod -> github.com%2Fchromedp%2Fsysutil%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190719114852-fd7a80b32e1f.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190719114852-fd7a80b32e1f.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.zip -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.zip mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.mod -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobwas/httphead/@v/v0.1.0.zip -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gobwas/httphead/@v/v0.1.0.mod -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobwas/pool/@v/v0.2.1.zip -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/gobwas/pool/@v/v0.2.1.mod -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/gobwas/ws/@v/v1.0.4.zip -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/gobwas/ws/@v/v1.0.4.mod -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.zip mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.mod mirror://goproxy//github.com/godror/godror/@v/v0.20.1.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.zip mirror://goproxy//github.com/godror/godror/@v/v0.20.1.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.zip -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190420214824-7e0022ef6ba3.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190824142844-760dd75542eb.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190831204454-2fabfa3c18b7.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.4.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.1-0.20200601181101-fa742c524853.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.1-0.20200601181101-fa742c524853.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.mod mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.zip -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.zip mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.mod -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.mod mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190420180111-c116219b62db.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190420180111-c116219b62db.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190609003834-432c2951c711.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190609003834-432c2951c711.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4c03ce451f29.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.0.20190831210041-4c03ce451f29.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190421001408-4ed0de4755e0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190824184912-ab885b375b90.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190828014616-a8802b16cc59.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.2.0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200510190516-8cd94a14c75a.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200510190516-8cd94a14c75a.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200606141011-f6355165a91c.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200606141011-f6355165a91c.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.zip -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.zip mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190420224344-cc3461e65d96.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190421002000-1b8f0016e912.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-pre1.0.20190824185557-6972a5742186.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.5.0.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.5.0.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200510190926-94ba730bb1e9.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200510190926-94ba730bb1e9.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200606145419-4e5062306904.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200606145419-4e5062306904.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.zip -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.zip mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190413234325-e4ced69a3a2b.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190608224051-11cab39313c9.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.1.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.mod mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.zip -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.mod -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.3.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.3.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.zip -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.zip -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.mod -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.zip -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.mod -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.zip -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.mod -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.13.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.15.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.15.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/zenazn/goji/@v/v0.9.0.mod -> github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190411191339-88737f569e3a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190411191339-88737f569e3a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425163242-31fd60d6bfdc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425163242-31fd60d6bfdc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190823170909-c4a336ef6a2f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190823170909-c4a336ef6a2f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190513163551-3ee3066db522.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod -> gopkg.in%2Finconshreveable%2Flog15.v2%2F@v%2Fv2.0.0-20180818164646-67afb5ed74ec.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.mod mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.zip -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.mod -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod )
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=bcd259bc42f0193a6660fb4b84251219
+_md5_=a20079d0d3665f09233ba00d889800d3
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.4.3 b/metadata/md5-cache/net-analyzer/zabbix-5.4.3
index af8231995cca..379af2aff48a 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.4.3
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.4.3
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/5.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.4/zabbix-5.4.3.tar.gz agent2? ( mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.zip -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.mod -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/chromedp/cdproto/@v/v0.0.0-20210104223854-2cc87dae3ee3.zip -> github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.zip mirror://goproxy//github.com/chromedp/cdproto/@v/v0.0.0-20210104223854-2cc87dae3ee3.mod -> github.com%2Fchromedp%2Fcdproto%2F@v%2Fv0.0.0-20210104223854-2cc87dae3ee3.mod mirror://goproxy//github.com/chromedp/chromedp/@v/v0.6.0.zip -> github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/chromedp/chromedp/@v/v0.6.0.mod -> github.com%2Fchromedp%2Fchromedp%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/chromedp/sysutil/@v/v1.0.0.zip -> github.com%2Fchromedp%2Fsysutil%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/chromedp/sysutil/@v/v1.0.0.mod -> github.com%2Fchromedp%2Fsysutil%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190719114852-fd7a80b32e1f.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190719114852-fd7a80b32e1f.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.zip -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.zip mirror://goproxy//github.com/dustin/gomemcached/@v/v0.0.0-20160817010731-a2284a01c143.mod -> github.com%2Fdustin%2Fgomemcached%2F@v%2Fv0.0.0-20160817010731-a2284a01c143.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.0.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.3+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.3+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/modbus/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.zip -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/goburrow/serial/@v/v0.1.0.mod -> github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobwas/httphead/@v/v0.1.0.zip -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gobwas/httphead/@v/v0.1.0.mod -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobwas/pool/@v/v0.2.1.zip -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/gobwas/pool/@v/v0.2.1.mod -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/gobwas/ws/@v/v1.0.4.zip -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/gobwas/ws/@v/v1.0.4.mod -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.zip mirror://goproxy//github.com/godbus/dbus/@v/v4.1.0+incompatible.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv4.1.0+incompatible.mod mirror://goproxy//github.com/godror/godror/@v/v0.20.1.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.zip mirror://goproxy//github.com/godror/godror/@v/v0.20.1.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.20.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.zip -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/chunkreader/@v/v1.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.0.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/chunkreader/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fchunkreader%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190420214824-7e0022ef6ba3.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190420214824-7e0022ef6ba3.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190824142844-760dd75542eb.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190824142844-760dd75542eb.mod mirror://goproxy//github.com/jackc/pgconn/@v/v0.0.0-20190831204454-2fabfa3c18b7.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv0.0.0-20190831204454-2fabfa3c18b7.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.4.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.0.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.5.1-0.20200601181101-fa742c524853.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.5.1-0.20200601181101-fa742c524853.mod mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.zip -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.zip mirror://goproxy//github.com/jackc/pgconn/@v/v1.6.5-0.20200905181414-0d4f029683fc.mod -> github.com%2Fjackc%2Fpgconn%2F@v%2Fv1.6.5-0.20200905181414-0d4f029683fc.mod mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgio/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgio%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.zip -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.zip mirror://goproxy//github.com/jackc/pgmock/@v/v0.0.0-20190831213851-13a1b77aafa2.mod -> github.com%2Fjackc%2Fpgmock%2F@v%2Fv0.0.0-20190831213851-13a1b77aafa2.mod mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.zip -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jackc/pgpassfile/@v/v1.0.0.mod -> github.com%2Fjackc%2Fpgpassfile%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/pgproto3/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpgproto3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190420180111-c116219b62db.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190420180111-c116219b62db.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-alpha1.0.20190609003834-432c2951c711.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-alpha1.0.20190609003834-432c2951c711.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.0-rc3.0.20190831210041-4c03ce451f29.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.0-rc3.0.20190831210041-4c03ce451f29.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.1.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.zip -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/jackc/pgproto3/v2/@v/v2.0.4.mod -> github.com%2Fjackc%2Fpgproto3%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200307190119-3430c5407db8.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200307190119-3430c5407db8.mod mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.zip -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.zip mirror://goproxy//github.com/jackc/pgservicefile/@v/v0.0.0-20200714003250-2b9c44734f2b.mod -> github.com%2Fjackc%2Fpgservicefile%2F@v%2Fv0.0.0-20200714003250-2b9c44734f2b.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190421001408-4ed0de4755e0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190421001408-4ed0de4755e0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190824184912-ab885b375b90.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190824184912-ab885b375b90.mod mirror://goproxy//github.com/jackc/pgtype/@v/v0.0.0-20190828014616-a8802b16cc59.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv0.0.0-20190828014616-a8802b16cc59.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.2.0.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200510190516-8cd94a14c75a.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200510190516-8cd94a14c75a.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.3.1-0.20200606141011-f6355165a91c.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.3.1-0.20200606141011-f6355165a91c.mod mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.zip -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.zip mirror://goproxy//github.com/jackc/pgtype/@v/v1.4.3-0.20200905161353-e7d2b057a716.mod -> github.com%2Fjackc%2Fpgtype%2F@v%2Fv1.4.3-0.20200905161353-e7d2b057a716.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190420224344-cc3461e65d96.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190420224344-cc3461e65d96.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-20190421002000-1b8f0016e912.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-20190421002000-1b8f0016e912.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.0.0-pre1.0.20190824185557-6972a5742186.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.0.0-pre1.0.20190824185557-6972a5742186.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.5.0.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.5.0.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200510190926-94ba730bb1e9.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200510190926-94ba730bb1e9.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.6.1-0.20200606145419-4e5062306904.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.6.1-0.20200606145419-4e5062306904.mod mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.zip -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.zip mirror://goproxy//github.com/jackc/pgx/v4/@v/v4.8.2-0.20200910143026-040df1ccef85.mod -> github.com%2Fjackc%2Fpgx%2Fv4%2F@v%2Fv4.8.2-0.20200910143026-040df1ccef85.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190413234325-e4ced69a3a2b.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190413234325-e4ced69a3a2b.mod mirror://goproxy//github.com/jackc/puddle/@v/v0.0.0-20190608224051-11cab39313c9.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv0.0.0-20190608224051-11cab39313c9.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.0.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.1.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.zip -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.zip mirror://goproxy//github.com/jackc/puddle/@v/v1.1.2-0.20200821025810-91d0159cc97a.mod -> github.com%2Fjackc%2Fpuddle%2F@v%2Fv1.1.2-0.20200821025810-91d0159cc97a.mod mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.zip -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.mod -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.3.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.3.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v2.0.3+incompatible.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.zip -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.5.0.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.zip -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/memcachier/mc/v3/@v/v3.0.1.mod -> github.com%2Fmemcachier%2Fmc%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.zip -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//github.com/natefinch/npipe/@v/v0.0.0-20160621034901-c1b8fa8bdcce.mod -> github.com%2Fnatefinch%2Fnpipe%2F@v%2Fv0.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.zip -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/omeid/go-yarn/@v/v0.0.1.mod -> github.com%2Fomeid%2Fgo-yarn%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.13.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.15.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.15.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20200227202807-02e2044944cc.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200227202807-02e2044944cc.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/zenazn/goji/@v/v0.9.0.mod -> github.com%2Fzenazn%2Fgoji%2F@v%2Fv0.9.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190411191339-88737f569e3a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190411191339-88737f569e3a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200323165209-0ec3e9974c59.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425163242-31fd60d6bfdc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425163242-31fd60d6bfdc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190823170909-c4a336ef6a2f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190823170909-c4a336ef6a2f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190410155217-1f06c39b4373.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190410155217-1f06c39b4373.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190513163551-3ee3066db522.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190513163551-3ee3066db522.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.zip -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/inconshreveable/log15.v2/@v/v2.0.0-20180818164646-67afb5ed74ec.mod -> gopkg.in%2Finconshreveable%2Flog15.v2%2F@v%2Fv2.0.0-20180818164646-67afb5ed74ec.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20190816093944-a6b53ec6cb22.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20190816093944-a6b53ec6cb22.mod mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.zip -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.zip mirror://goproxy//gopkg.in/natefinch/npipe.v2/@v/v2.0.0-20160621034901-c1b8fa8bdcce.mod -> gopkg.in%2Fnatefinch%2Fnpipe.v2%2F@v%2Fv2.0.0-20160621034901-c1b8fa8bdcce.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod )
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=bcd259bc42f0193a6660fb4b84251219
+_md5_=a20079d0d3665f09233ba00d889800d3
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 8f3141210ba3..42b63023665d 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/moserial-3.0.20 b/metadata/md5-cache/net-dialup/moserial-3.0.20
new file mode 100644
index 000000000000..3de73e1cfbc7
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/moserial-3.0.20
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/intltool-0.35 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.16:2[dbus] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.2.0:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A clean and friendly gtk-based serial terminal
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Moserial https://gitlab.gnome.org/GNOME/moserial
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.16:2[dbus] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.2.0:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/moserial/3.0/moserial-3.0.20.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c82f37a7931178ac07b5780d6ff7c3e0
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.15 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.15
index 08ce8b303f54..88192d78ff17 100644
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.15
+++ b/metadata/md5-cache/net-dialup/xl2tpd-1.3.15
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install
+DEFINED_PHASES=compile install postinst
 DEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6
 DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 net-dialup/ppp virtual/t
 SLOT=0
 SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.15.tar.gz -> xl2tpd-1.3.15.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=06a629c386d5c802b9029dd63b488dd2
+_md5_=db339eb3a430e1cf455f761e4d7ba272
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.16 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.16
index 0bf2e5603604..a38796a59be7 100644
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.16
+++ b/metadata/md5-cache/net-dialup/xl2tpd-1.3.16
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install
+DEFINED_PHASES=compile install postinst
 DEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6
 DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 net-dialup/ppp virtual/t
 SLOT=0
 SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.16.tar.gz -> xl2tpd-1.3.16.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8144fac6e7375ded042bac83ab522f26
+_md5_=740a0c9edad12b0192224ab698a88f73
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index adfa8a259966..a9825dc6bf87 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/bind-9.16.15-r2 b/metadata/md5-cache/net-dns/bind-9.16.15-r2
index 3578efbcd543..ed78a16a72e1 100644
--- a/metadata/md5-cache/net-dns/bind-9.16.15-r2
+++ b/metadata/md5-cache/net-dns/bind-9.16.15-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.16.15/bind-9.16.15.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bf378f4553b90924dce01ebe6943f55f
+_md5_=f0e81c50812ccfd7bdcb6094a948a19f
diff --git a/metadata/md5-cache/net-dns/bind-9.16.18 b/metadata/md5-cache/net-dns/bind-9.16.18
index b66202da45b2..63a880d2335c 100644
--- a/metadata/md5-cache/net-dns/bind-9.16.18
+++ b/metadata/md5-cache/net-dns/bind-9.16.18
@@ -12,4 +12,4 @@ REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.16.18/bind-9.16.18.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=28e24cd68ba4c2340c2e37dfe477dada
+_md5_=6ef4bcc715ed72041c215b42145080c9
diff --git a/metadata/md5-cache/net-dns/coredns-1.8.3 b/metadata/md5-cache/net-dns/coredns-1.8.3
index 1ecd5b347185..c039bb126c06 100644
--- a/metadata/md5-cache/net-dns/coredns-1.8.3
+++ b/metadata/md5-cache/net-dns/coredns-1.8.3
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/coredns/coredns/archive/v1.8.3.tar.gz -> coredns-1.8.3.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.6.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.6.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.6.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.6.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.17.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.17.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.11.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.11.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.7.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.7.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.5.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.5.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.5.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod -> github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!vivid!cortex/gohistogram/@v/v1.0.0.mod -> github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/afex/hystrix-go/@v/v0.0.0-20180502004556-fa1af6a1f4f5.mod -> github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/apache/thrift/@v/v0.12.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/apache/thrift/@v/v0.13.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20170710044230-e206f873d14a.mod -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.13.3.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.10.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.10.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.10.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.10.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.18.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/casbin/casbin/v2/@v/v2.1.2.mod -> github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/clbanning/x2j/@v/v0.0.0-20191024224557-825249438eec.mod -> github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codahale/hdrhistogram/@v/v0.0.0-20161010025455-3a0bb77429bd.mod -> github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod mirror://goproxy//github.com/coredns/caddy/@v/v1.1.0.zip -> github.com%2Fcoredns%2Fcaddy%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/coredns/caddy/@v/v1.1.0.mod -> github.com%2Fcoredns%2Fcaddy%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/license-bill-of-materials/@v/v0.0.0-20190913234955-13baff47494e.mod -> github.com%2Fcoreos%2Flicense-bill-of-materials%2F@v%2Fv0.0.0-20190913234955-13baff47494e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dnstap/golang-dnstap/@v/v0.4.0.zip -> github.com%2Fdnstap%2Fgolang-dnstap%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/dnstap/golang-dnstap/@v/v0.4.0.mod -> github.com%2Fdnstap%2Fgolang-dnstap%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.6.9.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/farsightsec/golang-framestream/@v/v0.3.0.zip -> github.com%2Ffarsightsec%2Fgolang-framestream%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/farsightsec/golang-framestream/@v/v0.3.0.mod -> github.com%2Ffarsightsec%2Fgolang-framestream%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/franela/goblin/@v/v0.0.0-20200105215937-c9ffbefa60db.mod -> github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod mirror://goproxy//github.com/franela/goreq/@v/v0.0.0-20171204163338-bcd34c9993f8.mod -> github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-opentracing/@v/v0.0.0-20180507213350-8e809c8a8645.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-opentracing%2F@v%2Fv0.0.0-20180507213350-8e809c8a8645.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-opentracing/@v/v0.0.0-20180507213350-8e809c8a8645.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-opentracing%2F@v%2Fv0.0.0-20180507213350-8e809c8a8645.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hudl/fargo/@v/v1.3.0.mod -> github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.9.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.9.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/influxdata/influxdb1-client/@v/v0.0.0-20191209144304-8bf82d3c094d.mod -> github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod mirror://goproxy//github.com/infobloxopen/go-trees/@v/v0.0.0-20190313150506-2af4e13f9062.zip -> github.com%2Finfobloxopen%2Fgo-trees%2F@v%2Fv0.0.0-20190313150506-2af4e13f9062.zip mirror://goproxy//github.com/infobloxopen/go-trees/@v/v0.0.0-20190313150506-2af4e13f9062.mod -> github.com%2Finfobloxopen%2Fgo-trees%2F@v%2Fv0.0.0-20190313150506-2af4e13f9062.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/lyft/protoc-gen-validate/@v/v0.0.13.mod -> github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.31.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.38.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.38.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.38.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.38.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.0.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.2.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/nats-io/nats-server/v2/@v/v2.1.2.mod -> github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.0.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.3.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/oklog/oklog/@v/v0.3.2.mod -> github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.zip -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.zip mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.2.0.zip -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.2.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.zip -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.6.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.2.zip -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.2.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/pact-foundation/pact-go/@v/v1.0.4.mod -> github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/philhofer/fwd/@v/v1.0.0.zip -> github.com%2Fphilhofer%2Ffwd%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/philhofer/fwd/@v/v1.0.0.mod -> github.com%2Fphilhofer%2Ffwd%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pierrec/lz4/@v/v1.0.2-0.20190131084431-473cd7ce01a1.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v1.2.1.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.3.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.9.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.9.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.15.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.15.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.mod -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sony/gobreaker/@v/v0.4.1.mod -> github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod mirror://goproxy//github.com/streadway/handy/@v/v0.0.0-20190108123426-d5acb3125c2a.mod -> github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tinylib/msgp/@v/v1.1.2.zip -> github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/tinylib/msgp/@v/v1.1.2.mod -> github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200306183522-221f0cc107cb.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200306183522-221f0cc107cb.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200306183522-221f0cc107cb.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200306183522-221f0cc107cb.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.13.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.1.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191220142924-d4481acd189f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201214210602-f9fddec55a1e.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201214210602-f9fddec55a1e.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201214210602-f9fddec55a1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201214210602-f9fddec55a1e.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.zip mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/!data!dog/dd-trace-go.v1/@v/v1.28.0.zip -> gopkg.in%2F!data!dog%2Fdd-trace-go.v1%2F@v%2Fv1.28.0.zip mirror://goproxy//gopkg.in/!data!dog/dd-trace-go.v1/@v/v1.28.0.mod -> gopkg.in%2F!data!dog%2Fdd-trace-go.v1%2F@v%2Fv1.28.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.3.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//k8s.io/api/@v/v0.20.2.zip -> k8s.io%2Fapi%2F@v%2Fv0.20.2.zip mirror://goproxy//k8s.io/api/@v/v0.20.2.mod -> k8s.io%2Fapi%2F@v%2Fv0.20.2.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.20.2.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.2.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.20.2.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.2.mod mirror://goproxy//k8s.io/client-go/@v/v0.20.2.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.20.2.zip mirror://goproxy//k8s.io/client-go/@v/v0.20.2.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.20.2.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/appdash/@v/v0.0.0-20190731080439-ebfcffb1b5c0.mod -> sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod
 _eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8e046f790ec5c2009da1f9d457181e89
+_md5_=9025af59a230fb554d727f398ecdbdea
diff --git a/metadata/md5-cache/net-dns/getdns-1.7.0 b/metadata/md5-cache/net-dns/getdns-1.7.0
deleted file mode 100644
index 2e9ad2489a67..000000000000
--- a/metadata/md5-cache/net-dns/getdns-1.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake filecaps? ( sys-libs/libcap ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/libbsd dev-libs/libyaml dev-libs/openssl:= idn? ( net-dns/libidn2:= ) gnutls? ( net-libs/gnutls:0=[dane,openssl] dev-libs/nettle:0= ) libev? ( dev-libs/libev:= ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) test? ( dev-libs/check ) >=net-dns/unbound-1.5.9:=
-DESCRIPTION=Modern asynchronous DNS API
-EAPI=7
-HOMEPAGE=https://getdnsapi.net/
-IUSE=doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby test +unbound +filecaps
-KEYWORDS=amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libbsd dev-libs/libyaml dev-libs/openssl:= idn? ( net-dns/libidn2:= ) gnutls? ( net-libs/gnutls:0=[dane,openssl] dev-libs/nettle:0= ) libev? ( dev-libs/libev:= ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) test? ( dev-libs/check ) >=net-dns/unbound-1.5.9:= stubby? ( acct-group/stubby acct-user/stubby sys-libs/libcap ) filecaps? ( sys-libs/libcap ) virtual/tmpfiles
-RESTRICT=test
-SLOT=0
-SRC_URI=https://getdnsapi.net/releases/getdns-1-7-0/getdns-1.7.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fd4001f79a2df1e7aa4420feab3c5923
diff --git a/metadata/md5-cache/net-dns/getdns-1.7.0-r1 b/metadata/md5-cache/net-dns/getdns-1.7.0-r1
new file mode 100644
index 000000000000..6c8ed60906a6
--- /dev/null
+++ b/metadata/md5-cache/net-dns/getdns-1.7.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake filecaps? ( sys-libs/libcap ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/libbsd dev-libs/libyaml dev-libs/openssl:= idn? ( net-dns/libidn2:= ) gnutls? ( net-libs/gnutls:0=[dane,openssl] dev-libs/nettle:0= ) libev? ( dev-libs/libev:= ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) test? ( dev-libs/check ) >=net-dns/unbound-1.5.9:=
+DESCRIPTION=Modern asynchronous DNS API
+EAPI=7
+HOMEPAGE=https://getdnsapi.net/
+IUSE=doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby test +unbound +filecaps
+KEYWORDS=amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/libbsd dev-libs/libyaml dev-libs/openssl:= idn? ( net-dns/libidn2:= ) gnutls? ( net-libs/gnutls:0=[dane,openssl] dev-libs/nettle:0= ) libev? ( dev-libs/libev:= ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) test? ( dev-libs/check ) >=net-dns/unbound-1.5.9:= stubby? ( acct-group/stubby acct-user/stubby sys-libs/libcap ) filecaps? ( sys-libs/libcap ) virtual/tmpfiles
+RESTRICT=test
+SLOT=0
+SRC_URI=https://getdnsapi.net/releases/getdns-1-7-0/getdns-1.7.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c23f01f397ec85f2c453b23e09ba3954
diff --git a/metadata/md5-cache/net-dns/libidn-1.37 b/metadata/md5-cache/net-dns/libidn-1.37
index 016587ebf6e8..b1e8bf10ae34 100644
--- a/metadata/md5-cache/net-dns/libidn-1.37
+++ b/metadata/md5-cache/net-dns/libidn-1.37
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/12
 SRC_URI=mirror://gnu/libidn/libidn-1.37.tar.gz verify-sig? ( mirror://gnu/libidn/libidn-1.37.tar.gz.sig )
-_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=940e0c00c341a3289362664a7e4cce6e
+_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=a5bdce35f94fb5b904818c9a63f25fa8
diff --git a/metadata/md5-cache/net-dns/libidn-1.38-r1 b/metadata/md5-cache/net-dns/libidn-1.38-r1
index c22a8e2bb208..765cb5bd5d55 100644
--- a/metadata/md5-cache/net-dns/libidn-1.38-r1
+++ b/metadata/md5-cache/net-dns/libidn-1.38-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/12
 SRC_URI=mirror://gnu/libidn/libidn-1.38.tar.gz verify-sig? ( mirror://gnu/libidn/libidn-1.38.tar.gz.sig )
-_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=db918873189dc08788e1e6accc00ac38
+_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=8185e7353774ce7c85a2c9e4888cb651
diff --git a/metadata/md5-cache/net-dns/libidn2-2.3.1 b/metadata/md5-cache/net-dns/libidn2-2.3.1
index 5b0c06cd0965..a7b903589dd4 100644
--- a/metadata/md5-cache/net-dns/libidn2-2.3.1
+++ b/metadata/md5-cache/net-dns/libidn2-2.3.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-3+
 RDEPEND=dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/2
 SRC_URI=mirror://gnu/libidn/libidn2-2.3.1.tar.gz verify-sig? ( mirror://gnu/libidn/libidn2-2.3.1.tar.gz.sig )
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=d3afc77c0b19dc2b878876a9c31cb53e
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=bab4c29684b44cf1a9f0a4163203a54a
diff --git a/metadata/md5-cache/net-dns/libidn2-2.3.2 b/metadata/md5-cache/net-dns/libidn2-2.3.2
index fb60de2938e4..ae91600bcec8 100644
--- a/metadata/md5-cache/net-dns/libidn2-2.3.2
+++ b/metadata/md5-cache/net-dns/libidn2-2.3.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-3+
 RDEPEND=dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/2
 SRC_URI=mirror://gnu/libidn/libidn2-2.3.2.tar.gz verify-sig? ( mirror://gnu/libidn/libidn2-2.3.2.tar.gz.sig )
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=897c9e25bfc4e4537875363fafd001cc
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=22e745cd1e251c7972b8350bbcf719ce
diff --git a/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r2 b/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r2
index 32cfe61d7a97..e768e0a1341f 100644
--- a/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r2
+++ b/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3be9d97c20f30a5e4d97788eb247b6e4
+_md5_=13d2f17349ca807598a555b5b3518258
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index ec2e4db9a7a2..4e06081ea597 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2 b/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2
index d4d073ad0c8f..43a08d93dc16 100644
--- a/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2
+++ b/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=nfqueue? ( server ) server? ( ^^ ( firewalld iptables ) ) udp-serve
 SLOT=0
 SRC_URI=https://www.cipherdyne.org/fwknop/download/fwknop-2.6.10.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=64e6a24c11b11030c67a3f9e4d47249c
+_md5_=29690a7e3c17286052b58be259a88d2b
diff --git a/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006 b/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006
deleted file mode 100644
index 53b20eab1e63..000000000000
--- a/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip sys-devel/libtool:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 || ( kde-plasma/kde-cli-tools[kdesu] x11-misc/ktsuss ) ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Privacy oriented firewall application
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/peerguardian/
-IUSE=cron dbus logrotate networkmanager qt5 zlib kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 || ( kde-plasma/kde-cli-tools[kdesu] x11-misc/ktsuss ) ) zlib? ( sys-libs/zlib ) net-firewall/iptables sys-apps/sysvinit cron? ( virtual/cron ) logrotate? ( app-admin/logrotate ) networkmanager? ( net-misc/networkmanager:= )
-REQUIRED_USE=qt5? ( dbus )
-SLOT=0
-SRC_URI=https://sourceforge.net/code-snapshots/git/p/pe/peerguardian/code.git/peerguardian-code-9d91ab6a8e6bc2b41e985aa698eb5c1eb364fea8.zip -> pglinux-2.3.1_p20171006.zip
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cce593c7860c97c19495868704d96639
diff --git a/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006-r1 b/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006-r1
new file mode 100644
index 000000000000..80a60c26f317
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip sys-devel/libtool:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 || ( kde-plasma/kde-cli-tools[kdesu] x11-misc/ktsuss ) ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Privacy oriented firewall application
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/peerguardian/
+IUSE=cron dbus networkmanager qt5 zlib kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 || ( kde-plasma/kde-cli-tools[kdesu] x11-misc/ktsuss ) ) zlib? ( sys-libs/zlib ) net-firewall/iptables sys-apps/sysvinit cron? ( virtual/cron ) networkmanager? ( net-misc/networkmanager:= )
+REQUIRED_USE=qt5? ( dbus )
+SLOT=0
+SRC_URI=https://sourceforge.net/code-snapshots/git/p/pe/peerguardian/code.git/peerguardian-code-9d91ab6a8e6bc2b41e985aa698eb5c1eb364fea8.zip -> pglinux-2.3.1_p20171006.zip
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=96fe10e244222633743b2ed3c6508ebc
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 095fa9dab131..78a3697c34f2 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/samba-4.13.10-r1 b/metadata/md5-cache/net-fs/samba-4.13.10-r1
index a75175620ea0..8cb17594a3df 100644
--- a/metadata/md5-cache/net-fs/samba-4.13.10-r1
+++ b/metadata/md5-cache/net-fs/samba-4.13.10-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.13.10.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ab200046db7ed4ac0f6fb8bc7e7d351e
+_md5_=afc034764fce9998c812a34b883f5a74
diff --git a/metadata/md5-cache/net-fs/samba-4.13.9-r2 b/metadata/md5-cache/net-fs/samba-4.13.9-r2
index 0f280b0f2a95..58c572c71e1e 100644
--- a/metadata/md5-cache/net-fs/samba-4.13.9-r2
+++ b/metadata/md5-cache/net-fs/samba-4.13.9-r2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.13.9.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a4763b94b5fa77317fd53e3f2848240b
+_md5_=b66ec76028b340a22cef3163a0a871ba
diff --git a/metadata/md5-cache/net-fs/samba-4.14.4-r2 b/metadata/md5-cache/net-fs/samba-4.14.4-r2
index 10caaa635ca9..b16121ba2d2b 100644
--- a/metadata/md5-cache/net-fs/samba-4.14.4-r2
+++ b/metadata/md5-cache/net-fs/samba-4.14.4-r2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.14.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5f9417407c257ad04e9c3b7cccf7b59a
+_md5_=dbb81cfb8a5b38a687dc16faca225cb9
diff --git a/metadata/md5-cache/net-fs/samba-4.14.5-r2 b/metadata/md5-cache/net-fs/samba-4.14.5-r2
index dc7384302d55..dadb7a0ad81e 100644
--- a/metadata/md5-cache/net-fs/samba-4.14.5-r2
+++ b/metadata/md5-cache/net-fs/samba-4.14.5-r2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.14.5.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=12e256498358eed42cc0aa41ee622fff
+_md5_=c584a5e306ac47ae820f7d975eeee93d
diff --git a/metadata/md5-cache/net-fs/samba-4.14.6-r1 b/metadata/md5-cache/net-fs/samba-4.14.6-r1
index ddf6db6b46ba..64508b7fda2f 100644
--- a/metadata/md5-cache/net-fs/samba-4.14.6-r1
+++ b/metadata/md5-cache/net-fs/samba-4.14.6-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.14.6.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5f9417407c257ad04e9c3b7cccf7b59a
+_md5_=dbb81cfb8a5b38a687dc16faca225cb9
diff --git a/metadata/md5-cache/net-fs/samba-4.15.0_rc1-r1 b/metadata/md5-cache/net-fs/samba-4.15.0_rc1-r1
index 3096c016e872..c35112502664 100644
--- a/metadata/md5-cache/net-fs/samba-4.15.0_rc1-r1
+++ b/metadata/md5-cache/net-fs/samba-4.15.0_rc1-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/rc/samba-4.15.0rc1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b80b2032da762519b4e30b559189e008
+_md5_=10d7ba5d6d2f17c308299c78ceade00b
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index ee9e2f51fc8c..2a9f25555014 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/ejabberd-20.04 b/metadata/md5-cache/net-im/ejabberd-20.04
index 23d929fc10d9..fe888b804464 100644
--- a/metadata/md5-cache/net-im/ejabberd-20.04
+++ b/metadata/md5-cache/net-im/ejabberd-20.04
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://static.process-one.net/ejabberd/downloads/20.04/ejabberd-20.04.tgz -> ejabberd-20.04.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rebar	f13843e18f4ec00f45f7158bd3f3d3bb	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=948d4f6da3af185569b78ff43eca21fb
+_md5_=728c7346bf5ec8e90cfcf6e7a5873916
diff --git a/metadata/md5-cache/net-im/ejabberd-21.04 b/metadata/md5-cache/net-im/ejabberd-21.04
index 27a775fccbdb..198f34ab06ae 100644
--- a/metadata/md5-cache/net-im/ejabberd-21.04
+++ b/metadata/md5-cache/net-im/ejabberd-21.04
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://static.process-one.net/ejabberd/downloads/21.04/ejabberd-21.04.tgz -> ejabberd-21.04.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rebar	f13843e18f4ec00f45f7158bd3f3d3bb	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0920db8dfacb8aa4014c6fa72611a026
+_md5_=17611cae448327cdfe79a461adfac353
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.11.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.11.0
new file mode 100644
index 000000000000..c106e1fcf11a
--- /dev/null
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-5.11.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
+EAPI=7
+HOMEPAGE=https://signal.org/ https://github.com/signalapp/Signal-Desktop
+IUSE=+sound
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/gdk-pixbuf x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.11.0_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e715e69f732d3fd9a6c58536297f7100
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.8.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.8.0
deleted file mode 100644
index 638c728d8a71..000000000000
--- a/metadata/md5-cache/net-im/signal-desktop-bin-5.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
-EAPI=7
-HOMEPAGE=https://signal.org/ https://github.com/signalapp/Signal-Desktop
-IUSE=+sound
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.8.0_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=81ff1563a12f5acbd8eb48b7b0c01af5
diff --git a/metadata/md5-cache/net-im/spectrum2-2.0.13-r2 b/metadata/md5-cache/net-im/spectrum2-2.0.13-r2
index 004a8c4ed965..599047f64160 100644
--- a/metadata/md5-cache/net-im/spectrum2-2.0.13-r2
+++ b/metadata/md5-cache/net-im/spectrum2-2.0.13-r2
@@ -1,5 +1,5 @@
 BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=acct-group/spectrum acct-user/spectrum dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= dev-libs/log4cxx dev-libs/jsoncpp:= dev-libs/openssl:0= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:0= >=net-im/swift-4.0.2-r2:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( dev-libs/libpqxx:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat ) doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
 DESCRIPTION=An open source instant messaging transport
 EAPI=7
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SpectrumIM/spectrum2/archive/2.0.13.tar.gz -> spectrum2-2.0.13.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8c3929863fae9ac90cd98f44933b3a36
+_md5_=94ff51472c830ddc55d088e9ee07edb7
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.1 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.1
deleted file mode 100644
index fab669a1277c..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.8.1.tar.gz -> tdesktop-2.8.1.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.8.1.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0f2a1870d0ca01b7e6428ced032e04ec
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.10 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.10
new file mode 100644
index 000000000000..136285d32cd5
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official desktop client for Telegram (binary package)
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3-with-openssl-exception
+RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib virtual/opengl x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.8.10.tar.gz -> tdesktop-2.8.10.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.8.10.tar.xz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d47dcd3608eb8afa4d0aff9ebac0c42e
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.9 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.9
deleted file mode 100644
index 6b3d0b561b9e..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib virtual/opengl x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.8.9.tar.gz -> tdesktop-2.8.9.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.8.9.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d47dcd3608eb8afa4d0aff9ebac0c42e
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.9.0 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.9.0
new file mode 100644
index 000000000000..3a09283d9f8a
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-2.9.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official desktop client for Telegram (binary package)
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3-with-openssl-exception
+RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib virtual/opengl x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.9.0.tar.gz -> tdesktop-2.9.0.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.9.0.tar.xz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d47dcd3608eb8afa4d0aff9ebac0c42e
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index a05ea926f64d..ab9b8bd7a8dc 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/ngircd-26.1-r1 b/metadata/md5-cache/net-irc/ngircd-26.1-r1
index fadd889a7295..a8647ea74133 100644
--- a/metadata/md5-cache/net-irc/ngircd-26.1-r1
+++ b/metadata/md5-cache/net-irc/ngircd-26.1-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/ngircd acct-group/ngircd irc-plus? ( virtual/libiconv ) ident?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://arthur.barton.de/pub/ngircd/ngircd-26.1.tar.gz verify-sig? ( https://arthur.barton.de/pub/ngircd/ngircd-26.1.tar.gz.sig )
-_eclasses_=verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=5a2ddee1afa9498daea2753f0257ec1c
+_eclasses_=verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=b812805a85cbb7a94be2cecfca0bace6
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index f0c3c334c2ff..5d8b243313b0 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libcrafter-1.0 b/metadata/md5-cache/net-libs/libcrafter-1.0
deleted file mode 100644
index a908d695f03f..000000000000
--- a/metadata/md5-cache/net-libs/libcrafter-1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/libpcap
-DESCRIPTION=A high level C++ network packet sniffing and crafting library
-EAPI=7
-HOMEPAGE=https://github.com/pellegre/libcrafter
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=https://github.com/pellegre/libcrafter/archive/version-1.0.tar.gz -> libcrafter-1.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a89d2b3cf25f93ef537a2a7bbccbd6f5
diff --git a/metadata/md5-cache/net-libs/libcrafter-1.0-r1 b/metadata/md5-cache/net-libs/libcrafter-1.0-r1
new file mode 100644
index 000000000000..40b93d361fc0
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libcrafter-1.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=install prepare
+DEPEND=net-libs/libpcap
+DESCRIPTION=A high level C++ network packet sniffing and crafting library
+EAPI=8
+HOMEPAGE=https://github.com/pellegre/libcrafter
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=net-libs/libpcap
+SLOT=0
+SRC_URI=https://github.com/pellegre/libcrafter/archive/version-1.0.tar.gz -> libcrafter-1.0.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=32d09b7bd7ee5e4ccb50d7015ced92c8
diff --git a/metadata/md5-cache/net-libs/libcrafter-9999 b/metadata/md5-cache/net-libs/libcrafter-9999
index 4445ea82ba80..b345f23042ad 100644
--- a/metadata/md5-cache/net-libs/libcrafter-9999
+++ b/metadata/md5-cache/net-libs/libcrafter-9999
@@ -1,13 +1,12 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare unpack
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=install prepare unpack
 DEPEND=net-libs/libpcap
 DESCRIPTION=A high level C++ network packet sniffing and crafting library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/pellegre/libcrafter
-IUSE=static-libs
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=net-libs/libpcap
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2ddc1c5827db633371f36b482877b9f0
+_md5_=929abcec4078394796aa0ed35abb5ed8
diff --git a/metadata/md5-cache/net-libs/libpcap-1.10.0-r1 b/metadata/md5-cache/net-libs/libpcap-1.10.0-r1
index bcddfc7704ce..6b6f83e2a0bb 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.10.0-r1
+++ b/metadata/md5-cache/net-libs/libpcap-1.10.0-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) remote? ( virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/libpcap-1.10.0.tar.gz -> libpcap-1.10.0-upstream.tar.gz verify-sig? ( https://www.tcpdump.org/release/libpcap-1.10.0.tar.gz.sig -> libpcap-1.10.0-upstream.tar.gz.sig )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=6d845addc71499951cbfc5d8f972fe4e
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=0ee73a35c480bb4038b0809369a65426
diff --git a/metadata/md5-cache/net-libs/libpcap-1.10.1-r1 b/metadata/md5-cache/net-libs/libpcap-1.10.1-r1
index 8d4a3e43a5c7..7439e768313b 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.10.1-r1
+++ b/metadata/md5-cache/net-libs/libpcap-1.10.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A system-independent library for user-level network packet capture
 EAPI=7
 HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap
 IUSE=bluetooth dbus netlink rdma remote static-libs usb yydebug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) remote? ( virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz -> libpcap-1.10.1-upstream.tar.gz verify-sig? ( https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz.sig -> libpcap-1.10.1-upstream.tar.gz.sig )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=0593c4d74e506ee1964685dd92e79602
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=370342041e1c159ce459148e568aa3f2
diff --git a/metadata/md5-cache/net-libs/libpcap-9999 b/metadata/md5-cache/net-libs/libpcap-9999
index 3f2b722e45fb..2b528770ee3f 100644
--- a/metadata/md5-cache/net-libs/libpcap-9999
+++ b/metadata/md5-cache/net-libs/libpcap-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) remote? ( virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1cc43e577eaaab4e717d5397666f9b19
+_md5_=03dd3cc16eeb2cf042b7734077569f4d
diff --git a/metadata/md5-cache/net-libs/libwebsockets-4.2.1 b/metadata/md5-cache/net-libs/libwebsockets-4.2.1
new file mode 100644
index 000000000000..5376636aebd8
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libwebsockets-4.2.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) http-proxy? ( net-libs/libhubbub ) libev? ( dev-libs/libev ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) sqlite3? ( dev-db/sqlite:= ) ssl? ( !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:= ) )
+DESCRIPTION=A flexible pure-C library for implementing network protocols
+EAPI=7
+HOMEPAGE=https://libwebsockets.org/
+IUSE=access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6 +lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5 sqlite3 ssl threads zip
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) http-proxy? ( net-libs/libhubbub ) libev? ( dev-libs/libev ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) sqlite3? ( dev-db/sqlite:= ) ssl? ( !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:= ) )
+REQUIRED_USE=access-log? ( http2 ) generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) mbedtls? ( ssl ) smtp? ( libuv ) socks5? ( client http-proxy ) ?? ( libev libevent )
+SLOT=0/18
+SRC_URI=https://github.com/warmcat/libwebsockets/archive/v4.2.1.tar.gz -> libwebsockets-4.2.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7b64b3d8490338515efd478fc40e4735
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.16.11 b/metadata/md5-cache/net-libs/mbedtls-2.16.11
new file mode 100644
index 000000000000..17c39d821c8e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/mbedtls-2.16.11
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl )
+DESCRIPTION=Cryptographic library for embedded systems
+EAPI=7
+HOMEPAGE=https://tls.mbed.org/
+IUSE=cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/3.12.0
+SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.16.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=03e99bf0198df8e3f0bb63772fffbf5a
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.27.0-r1 b/metadata/md5-cache/net-libs/mbedtls-2.27.0-r1
new file mode 100644
index 000000000000..1a9064341a63
--- /dev/null
+++ b/metadata/md5-cache/net-libs/mbedtls-2.27.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl )
+DESCRIPTION=Cryptographic library for embedded systems
+EAPI=7
+HOMEPAGE=https://tls.mbed.org/
+IUSE=cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/7.13.1
+SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.27.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=63015d224e7c8cd442a1e07a1b2acb0b
diff --git a/metadata/md5-cache/net-libs/mbedtls-3.0.0 b/metadata/md5-cache/net-libs/mbedtls-3.0.0
new file mode 100644
index 000000000000..cce8f8607f54
--- /dev/null
+++ b/metadata/md5-cache/net-libs/mbedtls-3.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=programs? ( dev-libs/openssl:0= ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl )
+DESCRIPTION=Cryptographic library for embedded systems
+EAPI=7
+HOMEPAGE=https://tls.mbed.org/
+IUSE=cpu_flags_x86_sse2 doc programs static-libs test threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=programs? ( dev-libs/openssl:0= )
+RESTRICT=!test? ( test )
+SLOT=0/10.16.4
+SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-3.0.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=71f7002f131fe14c88aa9411d4f156dc
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.2.1 b/metadata/md5-cache/net-libs/miniupnpc-2.2.1
index b2a7bb764a13..ec39add92460 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.2.1
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.2.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 SLOT=0/17
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.1.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.1.tar.gz.sig )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=d98cbdc5900f02aa7051ab2258226be4
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.2.2 b/metadata/md5-cache/net-libs/miniupnpc-2.2.2
index 08171472a682..8a41629f4eca 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.2.2
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.2.2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 SLOT=0/17
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.2.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.2.tar.gz.sig )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=adb1bb5ecbf936956351ff1217328512
diff --git a/metadata/md5-cache/net-libs/nodejs-12.22.4 b/metadata/md5-cache/net-libs/nodejs-12.22.4
new file mode 100644
index 000000000000..2a7247b11214
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-12.22.4
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0/12
+SRC_URI=https://nodejs.org/dist/v12.22.4/node-v12.22.4.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6490f008962dcda2d645fcbcb9aa5154
diff --git a/metadata/md5-cache/net-libs/nodejs-14.17.4 b/metadata/md5-cache/net-libs/nodejs-14.17.4
new file mode 100644
index 000000000000..f6f381bf369f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-14.17.4
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0/14
+SRC_URI=https://nodejs.org/dist/v14.17.4/node-v14.17.4.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=254d30f0c1f60d63a6131efe457e1ac9
diff --git a/metadata/md5-cache/net-libs/nodejs-16.5.0 b/metadata/md5-cache/net-libs/nodejs-16.5.0
deleted file mode 100644
index 12270eb9998a..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-16.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
-RESTRICT=!test? ( test )
-SLOT=0/16
-SRC_URI=https://nodejs.org/dist/v16.5.0/node-v16.5.0.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=953c89dfa0cdf683f31e97c0031ebc3b
diff --git a/metadata/md5-cache/net-libs/nodejs-16.6.0 b/metadata/md5-cache/net-libs/nodejs-16.6.0
new file mode 100644
index 000000000000..d1c32b00163e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-16.6.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0/16
+SRC_URI=https://nodejs.org/dist/v16.6.0/node-v16.6.0.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7a272437154753d69a2f8dcbb2fa0db4
diff --git a/metadata/md5-cache/net-libs/serf-1.3.9-r2 b/metadata/md5-cache/net-libs/serf-1.3.9-r2
index 59931601c6be..f0ee6e9d5f69 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.9-r2
+++ b/metadata/md5-cache/net-libs/serf-1.3.9-r2
@@ -5,11 +5,11 @@ DESCRIPTION=HTTP client library
 EAPI=7
 HOMEPAGE=https://serf.apache.org/
 IUSE=kerberos static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+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 ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.9.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f3c29079b8671df9a1874e3112945846
+_md5_=06ce5a6ecacb5a02bf82da5e057c37e1
diff --git a/metadata/md5-cache/net-libs/signond-8.60-r2 b/metadata/md5-cache/net-libs/signond-8.60-r2
index 97fa2ca63b52..e986700fddfa 100644
--- a/metadata/md5-cache/net-libs/signond-8.60-r2
+++ b/metadata/md5-cache/net-libs/signond-8.60-r2
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/signond/-/archive/VERSION_8.60/signond-VERSION_8.60.tar.gz -> signond-8.60.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a05c2f08d258172697179199e345d301
+_md5_=8fe755f6428f76f4dc127019baf5fac8
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.32.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.32.3
index 8427a6633b19..36c9622367e4 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.32.3
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.32.3
@@ -5,7 +5,7 @@ DESCRIPTION=Open source web browser engine
 EAPI=7
 HOMEPAGE=https://www.webkitgtk.org
 IUSE=aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc64 ~sparc x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
 REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.32.3.tar.xz
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a268d510d4a618327fb4fb745e302bd7
+_md5_=d19935ede2cf8199b199a5c7a5d1f58f
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 55916a253b7a..2416431ca752 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.16 b/metadata/md5-cache/net-mail/fetchmail-6.4.16
deleted file mode 100644
index b0bd626b63ec..000000000000
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext )
-DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
-EAPI=7
-HOMEPAGE=https://www.fetchmail.info/
-IUSE=ssl nls kerberos tk socks python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 public-domain
-RDEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) virtual/tmpfiles
-REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.16.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=abbdf187d845f4d7175549a4a482f51f
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.19 b/metadata/md5-cache/net-mail/fetchmail-6.4.19
index 7439576a887b..cb59e44d11ac 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.19
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.19
@@ -12,4 +12,4 @@ REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_8 python_single_target_pyth
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.19.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=48dd8f40fc2ef47f27d7731ee836785f
+_md5_=c02876407a3ccce760cdebda106ea9d7
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.20 b/metadata/md5-cache/net-mail/fetchmail-6.4.20
new file mode 100644
index 000000000000..24b8150a43ba
--- /dev/null
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.20
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext )
+DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
+EAPI=7
+HOMEPAGE=https://www.fetchmail.info/
+IUSE=ssl nls kerberos tk socks python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 public-domain
+RDEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) virtual/tmpfiles
+REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.20.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c02876407a3ccce760cdebda106ea9d7
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.8 b/metadata/md5-cache/net-mail/fetchmail-6.4.8
deleted file mode 100644
index 9b027bc45500..000000000000
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext )
-DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
-EAPI=7
-HOMEPAGE=https://www.fetchmail.info/
-IUSE=ssl nls kerberos tk socks +python_single_target_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 public-domain
-RDEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) ) virtual/tmpfiles
-REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_8 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.8.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8b046e94dff70dcc0e73ba14b3428c8e
diff --git a/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8 b/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8
index b0bcc737e041..ec49a5fc1cc8 100644
--- a/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8
+++ b/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8
@@ -12,4 +12,4 @@ REQUIRED_USE=tk? ( python ) python? ( ^^ ( python_single_target_python3_8 python
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-7.0.0-alpha8.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a8f1230dad51f12b8e2d9b5074b58f10
+_md5_=5ff3dcbbd90387fc205cb6b0a5c5121c
diff --git a/metadata/md5-cache/net-mail/mailutils-3.12-r3 b/metadata/md5-cache/net-mail/mailutils-3.12-r3
new file mode 100644
index 000000000000..f1369fd7e88a
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailutils-3.12-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup
+DEPEND=!mail-filter/libsieve !mail-client/mailx sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/libcrypt:= virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm:= ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring:= ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
+DESCRIPTION=A useful collection of mail servers, clients, and filters
+EAPI=7
+HOMEPAGE=https://mailutils.org/
+IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=!mail-filter/libsieve !mail-client/mailx sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/libcrypt:= virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm:= ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring:= ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) servers? ( tcpd ldap )
+SLOT=0
+SRC_URI=mirror://gnu/mailutils/mailutils-3.12.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=58c8076bc1554fdcc08bb148782d8eb4
diff --git a/metadata/md5-cache/net-mail/mu-1.6.1 b/metadata/md5-cache/net-mail/mu-1.6.1
new file mode 100644
index 000000000000..3b2b52e0b271
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mu-1.6.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure postinst postrm preinst
+DEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= sys-libs/readline emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
+DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
+EAPI=8
+HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
+IUSE=emacs guile mug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= sys-libs/readline emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
+SLOT=0
+SRC_URI=https://github.com/djcb/mu/releases/download/1.6.1/mu-1.6.1.tar.xz
+_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a
+_md5_=63859465cba69056beccd919f092463a
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 1761680c54b4..00ebba5f9362 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.3 b/metadata/md5-cache/net-misc/asterisk-13.38.3
index 08d640dee2e8..dbd233da33b1 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.38.3
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.3
@@ -12,4 +12,4 @@ REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_tar
 SLOT=0/13
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f8c3d0020422481708ef92ff868903a1
+_md5_=df16696a66729361e680f9ea7b2c9641
diff --git a/metadata/md5-cache/net-misc/asterisk-16.19.1 b/metadata/md5-cache/net-misc/asterisk-16.19.1
index 2770e5f5c829..26c7db8b98e3 100644
--- a/metadata/md5-cache/net-misc/asterisk-16.19.1
+++ b/metadata/md5-cache/net-misc/asterisk-16.19.1
@@ -12,4 +12,4 @@ REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_tar
 SLOT=0/16
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.19.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=50d1ca9063fad6265932be0dd903354d
+_md5_=75d4574a72e2eb3ad6165eb8f4bf870b
diff --git a/metadata/md5-cache/net-misc/asterisk-18.5.1 b/metadata/md5-cache/net-misc/asterisk-18.5.1
index 79bb5cb5fc55..12b687bfd90f 100644
--- a/metadata/md5-cache/net-misc/asterisk-18.5.1
+++ b/metadata/md5-cache/net-misc/asterisk-18.5.1
@@ -12,4 +12,4 @@ REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_tar
 SLOT=0/18
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-18.5.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=76c0bc13dc94cd65af2417b7b763ea52
+_md5_=782a72321f846da6511ee8b67f22ca7e
diff --git a/metadata/md5-cache/net-misc/chrony-4.0-r2 b/metadata/md5-cache/net-misc/chrony-4.0-r2
index 29bc4b3ac67a..c2349a0f25ad 100644
--- a/metadata/md5-cache/net-misc/chrony-4.0-r2
+++ b/metadata/md5-cache/net-misc/chrony-4.0-r2
@@ -11,5 +11,5 @@ RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) nts? ( net-libs/g
 REQUIRED_USE=sechash? ( || ( nettle nss libtomcrypt ) ) nettle? ( !nss ) nss? ( !nettle ) libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) ) nts? ( nettle )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/chrony/chrony-4.0.tar.gz verify-sig? ( https://download.tuxfamily.org/chrony/chrony-4.0-tar-gz-asc.txt -> chrony-4.0.tar.gz.asc )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=d08bca5ca10a39cdb08c932eaece23cc
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=d0d35ae6f08c185b25ce7d91d1b30a6e
diff --git a/metadata/md5-cache/net-misc/chrony-4.1-r1 b/metadata/md5-cache/net-misc/chrony-4.1-r1
index 8ef3d5b0c6fe..1246445b6ace 100644
--- a/metadata/md5-cache/net-misc/chrony-4.1-r1
+++ b/metadata/md5-cache/net-misc/chrony-4.1-r1
@@ -11,5 +11,5 @@ RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-li
 REQUIRED_USE=sechash? ( || ( nettle nss libtomcrypt ) ) nettle? ( !nss ) nss? ( !nettle ) libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/chrony/chrony-4.1.tar.gz verify-sig? ( https://download.tuxfamily.org/chrony/chrony-4.1-tar-gz-asc.txt -> chrony-4.1.tar.gz.asc )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=716e99ef0569d1dbf87381d81b0042eb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=10772ddd82b7cb040189cd1f40b3e882
diff --git a/metadata/md5-cache/net-misc/chrony-9999 b/metadata/md5-cache/net-misc/chrony-9999
index 1ccff68e17b4..49ef0ea50bf0 100644
--- a/metadata/md5-cache/net-misc/chrony-9999
+++ b/metadata/md5-cache/net-misc/chrony-9999
@@ -11,4 +11,4 @@ RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-li
 REQUIRED_USE=sechash? ( || ( nettle nss libtomcrypt ) ) nettle? ( !nss ) nss? ( !nettle ) libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) ) html
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=21715da36fdf7525203f5a729201a236
+_md5_=c86838bf30f4042e0ba2c42b2a5de51b
diff --git a/metadata/md5-cache/net-misc/connman-1.40 b/metadata/md5-cache/net-misc/connman-1.40
index c7face771231..a42545a3ca08 100644
--- a/metadata/md5-cache/net-misc/connman-1.40
+++ b/metadata/md5-cache/net-misc/connman-1.40
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( iptables nftables )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/connman/connman-1.40.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8fbfaaeaabd42436b93270909dbcaea6
+_md5_=ab8833c4da811a6d4134befb80271074
diff --git a/metadata/md5-cache/net-misc/connman-9999 b/metadata/md5-cache/net-misc/connman-9999
index c8172870c4a5..a69bf0e12ae8 100644
--- a/metadata/md5-cache/net-misc/connman-9999
+++ b/metadata/md5-cache/net-misc/connman-9999
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 sys-libs/readline:0= bluetoo
 REQUIRED_USE=^^ ( iptables nftables )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b47f1f8f736152b9779dc9a441c55d3c
+_md5_=faec4fbcce50f44f12885c6fcb42e720
diff --git a/metadata/md5-cache/net-misc/dhcp-4.4.2_p1-r1 b/metadata/md5-cache/net-misc/dhcp-4.4.2_p1-r1
index 06777593b61e..bfe8ca92bbd6 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.4.2_p1-r1
+++ b/metadata/md5-cache/net-misc/dhcp-4.4.2_p1-r1
@@ -11,4 +11,4 @@ RDEPEND=acct-group/dhcp acct-user/dhcp client? ( kernel_linux? ( ipv6? ( sys-app
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.4.2-P1.tar.gz ftp://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1f0e88d55ef6d743821e51bec027b92f
+_md5_=18da09b94feac8e61c7b5f26b798a017
diff --git a/metadata/md5-cache/net-misc/exabgp-4.2.11-r1 b/metadata/md5-cache/net-misc/exabgp-4.2.11-r1
index d7b2d69b9a68..34bfb3c5c446 100644
--- a/metadata/md5-cache/net-misc/exabgp-4.2.11-r1
+++ b/metadata/md5-cache/net-misc/exabgp-4.2.11-r1
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) virtual/pkgconfig python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=The BGP swiss army knife of networking
 EAPI=7
 HOMEPAGE=https://github.com/Exa-Networks/exabgp
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Exa-Networks/exabgp/archive/4.2.11.tar.gz -> exabgp-4.2.11.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6f428a88a5f0d91191614cd3bbd79670
+_md5_=3fe48b4caf26593b187af17edf210d90
diff --git a/metadata/md5-cache/net-misc/exabgp-4.2.11-r2 b/metadata/md5-cache/net-misc/exabgp-4.2.11-r2
index b2f05a546b8d..e54926999e1f 100644
--- a/metadata/md5-cache/net-misc/exabgp-4.2.11-r2
+++ b/metadata/md5-cache/net-misc/exabgp-4.2.11-r2
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) virtual/pkgconfig python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=The BGP swiss army knife of networking
 EAPI=7
 HOMEPAGE=https://github.com/Exa-Networks/exabgp
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Exa-Networks/exabgp/archive/4.2.11.tar.gz -> exabgp-4.2.11.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c87d56c9ee356590742f99b3b84b94bc
+_md5_=b9f06cbd8f76d3c05a38c2b9d75f34c4
diff --git a/metadata/md5-cache/net-misc/freerdp-2.3.2 b/metadata/md5-cache/net-misc/freerdp-2.3.2
index d0c6a12274f2..5f19d10f9ce7 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.3.2
+++ b/metadata/md5-cache/net-misc/freerdp-2.3.2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://pub.freerdp.com/releases/freerdp-2.3.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bd499a8068d97028c356b93edaf8c07c
+_md5_=c858dde604e72d2c5e24630892152ef3
diff --git a/metadata/md5-cache/net-misc/freerdp-2.4.0 b/metadata/md5-cache/net-misc/freerdp-2.4.0
new file mode 100644
index 000000000000..817366879063
--- /dev/null
+++ b/metadata/md5-cache/net-misc/freerdp-2.4.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig X? ( doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/openssl:0= sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ffmpeg? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo:0= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264:0= ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
+DESCRIPTION=Free implementation of the Remote Desktop Protocol
+EAPI=7
+HOMEPAGE=http://www.freerdp.com/
+IUSE=alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/openssl:0= sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ffmpeg? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo:0= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264:0= ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://pub.freerdp.com/releases/freerdp-2.4.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c858dde604e72d2c5e24630892152ef3
diff --git a/metadata/md5-cache/net-misc/freerdp-2.9999 b/metadata/md5-cache/net-misc/freerdp-2.9999
index 9beff48ed401..7283467ea98c 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.9999
+++ b/metadata/md5-cache/net-misc/freerdp-2.9999
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/openssl:0= sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups?
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bd499a8068d97028c356b93edaf8c07c
+_md5_=c858dde604e72d2c5e24630892152ef3
diff --git a/metadata/md5-cache/net-misc/icecast-2.4.4-r1 b/metadata/md5-cache/net-misc/icecast-2.4.4-r1
index 7e910ec4a2dd..d68bd7ff1523 100644
--- a/metadata/md5-cache/net-misc/icecast-2.4.4-r1
+++ b/metadata/md5-cache/net-misc/icecast-2.4.4-r1
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/icecast acct-user/icecast dev-libs/libxml2 dev-libs/libxslt media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl )
+DEPEND=acct-group/icecast acct-user/icecast dev-libs/libxml2 dev-libs/libxslt media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) speex? ( media-libs/speex ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl )
 DESCRIPTION=Opensource alternative to shoutcast that supports mp3, ogg and aac streaming
 EAPI=7
 HOMEPAGE=https://www.icecast.org/
-IUSE=kate logrotate +speex +ssl +theora +yp
+IUSE=kate +speex +ssl +theora +yp
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
-RDEPEND=acct-group/icecast acct-user/icecast dev-libs/libxml2 dev-libs/libxslt media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl )
+RDEPEND=acct-group/icecast acct-user/icecast dev-libs/libxml2 dev-libs/libxslt media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) speex? ( media-libs/speex ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/icecast/icecast-2.4.4.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7269fbf5607bcf134099ed99982c108f
+_md5_=c36db53b19363cc50904ed82f8271b26
diff --git a/metadata/md5-cache/net-misc/knock-0.8 b/metadata/md5-cache/net-misc/knock-0.8
index 957a25b4df47..6254b45c8055 100644
--- a/metadata/md5-cache/net-misc/knock-0.8
+++ b/metadata/md5-cache/net-misc/knock-0.8
@@ -4,9 +4,9 @@ DESCRIPTION=Simple port-knocking daemon
 EAPI=7
 HOMEPAGE=https://www.zeroflux.org/projects/knock
 IUSE=+server
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=server? ( net-libs/libpcap )
 SLOT=0
 SRC_URI=https://www.zeroflux.org/proj/knock/files/knock-0.8.tar.gz
-_md5_=4410849c0538c8967388adc37cffa141
+_md5_=a247f42403917f1bb9967f9acfecfd68
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.10-r1 b/metadata/md5-cache/net-misc/lldpd-1.0.10-r1
index 5222459ffd73..eb2f892d8867 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.10-r1
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.10-r1
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=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:= ) zsh-completion? ( app-shells/zsh ) test? ( dev-libs/check )
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=7
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.9.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.10.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=01efa62757f022209c31dbc740458db7
+_md5_=cdcf91f748ebf23dcd1131465e5bb776
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.11-r1 b/metadata/md5-cache/net-misc/lldpd-1.0.11-r1
index c9ab3dc251c4..5b2896b0c309 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.11-r1
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.11-r1
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=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:= ) zsh-completion? ( app-shells/zsh ) test? ( dev-libs/check )
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=7
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.9.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.11.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c7f6db3fd200a43ed43ea6f9c426898a
+_md5_=afd93bfc578fc70fa03b441f22c58af0
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.7-r1 b/metadata/md5-cache/net-misc/lldpd-1.0.7-r1
index 1d0ace4914b5..957a3a7b61f3 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.7-r1
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.7-r1
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=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:= ) zsh-completion? ( app-shells/zsh ) test? ( dev-libs/check )
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=7
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.9.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.7.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9bee5657aab113a3180cbea4c9a608f6
+_md5_=700b5657ff4040caac182b8fcce82441
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.9-r1 b/metadata/md5-cache/net-misc/lldpd-1.0.9-r1
index ce2898d4ab2e..5f7f09648d38 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.9-r1
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.9-r1
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=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:= ) zsh-completion? ( app-shells/zsh ) test? ( dev-libs/check )
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=7
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.9.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.9.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0d764fdfded33b38adec48426c02d2cd
+_md5_=649609920939c5693a658157a0ab65fd
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.5.20200928 b/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
index a9faa96d6930..5c3138144360 100644
--- a/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
+++ b/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libnfnetlink || ( net-misc/miniupnpd net-libs/miniupnpc )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/minissdpd-1.5.20200928.tar.gz verify-sig? ( http://miniupnp.free.fr/files/minissdpd-1.5.20200928.tar.gz.sig )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=50527fbe201e220319258d3da40367a8
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.2.0 b/metadata/md5-cache/net-misc/miniupnpd-2.2.0
index c34e6d613af5..d6dee88186f9 100644
--- a/metadata/md5-cache/net-misc/miniupnpd-2.2.0
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.2.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.2.0.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpd-2.2.0.tar.gz.sig )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=f6d96e5020680ff508f9d28051bcfc51
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.2.1 b/metadata/md5-cache/net-misc/miniupnpd-2.2.1
index f2a47d27c454..ea7e20b4b4b9 100644
--- a/metadata/md5-cache/net-misc/miniupnpd-2.2.1
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.2.1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.2.1.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpd-2.2.1.tar.gz.sig )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=f6d96e5020680ff508f9d28051bcfc51
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.2.2 b/metadata/md5-cache/net-misc/miniupnpd-2.2.2
index 346a195578dc..7994cf7ac648 100644
--- a/metadata/md5-cache/net-misc/miniupnpd-2.2.2
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.2.2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.2.2.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpd-2.2.2.tar.gz.sig )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=9aa5d401aed1bf1fe4085e2e08a2a768
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.6 b/metadata/md5-cache/net-misc/networkmanager-1.32.6
new file mode 100644
index 000000000000..3b299b6fdcd7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.32.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) >=sys-kernel/linux-headers-3.18 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.6.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c173e2a7ee8792e0d9976f27841f6936
diff --git a/metadata/md5-cache/net-misc/omniORB-4.2.4 b/metadata/md5-cache/net-misc/omniORB-4.2.4
index 6f051ed3f3e4..5e1ec78cd0c6 100644
--- a/metadata/md5-cache/net-misc/omniORB-4.2.4
+++ b/metadata/md5-cache/net-misc/omniORB-4.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=A robust, high-performance CORBA 2 ORB
 EAPI=7
 HOMEPAGE=http://omniorb.sourceforge.net/
 IUSE=doc ipv6 ssl python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2 GPL-2
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/omniorb/omniORB-4.2.4.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b12af1e7a990a7e3ef2e633b86664b6f
+_md5_=9896e4e426952b696fa9f21baab0585b
diff --git a/metadata/md5-cache/net-misc/openntpd-6.2_p3-r2 b/metadata/md5-cache/net-misc/openntpd-6.2_p3-r2
index b70246541b88..70a39c641d45 100644
--- a/metadata/md5-cache/net-misc/openntpd-6.2_p3-r2
+++ b/metadata/md5-cache/net-misc/openntpd-6.2_p3-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Lightweight NTP server ported from OpenBSD
 EAPI=7
 HOMEPAGE=http://www.openntpd.org/
 IUSE=selinux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=!net-misc/ntp[-openntpd] acct-group/openntpd acct-user/openntpd selinux? ( sec-policy/selinux-ntp )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenNTPD/openntpd-6.2p3.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=88d2aa96f790b98f298135dc1f99109e
+_md5_=88723535f1c7763faa5651cb655fd4ac
diff --git a/metadata/md5-cache/net-misc/openntpd-6.8_p1-r1 b/metadata/md5-cache/net-misc/openntpd-6.8_p1-r1
index 11815ad89b3a..686d120f4854 100644
--- a/metadata/md5-cache/net-misc/openntpd-6.8_p1-r1
+++ b/metadata/md5-cache/net-misc/openntpd-6.8_p1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Lightweight NTP server ported from OpenBSD
 EAPI=7
 HOMEPAGE=http://www.openntpd.org/
 IUSE=constraints selinux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD GPL-2
 RDEPEND=!net-misc/ntp[-openntpd] constraints? ( dev-libs/libretls:= ) acct-group/openntpd acct-user/openntpd selinux? ( sec-policy/selinux-ntp )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenNTPD/openntpd-6.8p1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=396ad873bb1fd1d3b5a7e5b98e8e3eda
+_md5_=16cf046345b891ad77595a5849ee08cd
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.14.1 b/metadata/md5-cache/net-misc/openvswitch-2.14.1
index 8d03f83d3031..ce985a0f782b 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.14.1
+++ b/metadata/md5-cache/net-misc/openvswitch-2.14.1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.14.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=419f6bbe15e36e4212355ac0129dd897
+_md5_=45c204259f53d9aaf2c1426a5c722bdd
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.15.0 b/metadata/md5-cache/net-misc/openvswitch-2.15.0
index 70bc67b40a95..de8e174a3105 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.15.0
+++ b/metadata/md5-cache/net-misc/openvswitch-2.15.0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.15.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cb04bd84c990d1377dff3139397d6cf3
+_md5_=64395503faf8c187dfdcc993daecd4c2
diff --git a/metadata/md5-cache/net-misc/plowshare-2.1.6 b/metadata/md5-cache/net-misc/plowshare-2.1.6
deleted file mode 100644
index 2099899b9920..000000000000
--- a/metadata/md5-cache/net-misc/plowshare-2.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare test
-DESCRIPTION=Command-line downloader and uploader for file-sharing websites
-EAPI=6
-HOMEPAGE=https://github.com/mcrapet/plowshare
-IUSE=bash-completion +javascript view-captcha
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-shells/bash-4 || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) dev-vcs/git net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
-SLOT=0
-SRC_URI=https://github.com/mcrapet/plowshare/archive/v2.1.6.tar.gz -> plowshare-2.1.6.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=788c9538bf926fc5e498de081e2619a5
diff --git a/metadata/md5-cache/net-misc/plowshare-2.1.6-r1 b/metadata/md5-cache/net-misc/plowshare-2.1.6-r1
new file mode 100644
index 000000000000..052f58ba0e23
--- /dev/null
+++ b/metadata/md5-cache/net-misc/plowshare-2.1.6-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst prepare test
+DESCRIPTION=Command-line downloader and uploader for file-sharing websites
+EAPI=7
+HOMEPAGE=https://github.com/mcrapet/plowshare
+IUSE=+javascript view-captcha
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-shells/bash-4 || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) dev-vcs/git net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
+SLOT=0
+SRC_URI=https://github.com/mcrapet/plowshare/archive/v2.1.6.tar.gz -> plowshare-2.1.6.tar.gz
+_md5_=5193bfc049cbd0a7cd419067d9756c04
diff --git a/metadata/md5-cache/net-misc/plowshare-2.1.7 b/metadata/md5-cache/net-misc/plowshare-2.1.7
deleted file mode 100644
index 091b7067c6b7..000000000000
--- a/metadata/md5-cache/net-misc/plowshare-2.1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare test
-DESCRIPTION=Command-line downloader and uploader for file-sharing websites
-EAPI=6
-HOMEPAGE=https://github.com/mcrapet/plowshare
-IUSE=bash-completion +javascript view-captcha
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-shells/bash-4 || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) dev-vcs/git net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
-SLOT=0
-SRC_URI=https://github.com/mcrapet/plowshare/archive/v2.1.7.tar.gz -> plowshare-2.1.7.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=788c9538bf926fc5e498de081e2619a5
diff --git a/metadata/md5-cache/net-misc/plowshare-2.1.7-r1 b/metadata/md5-cache/net-misc/plowshare-2.1.7-r1
new file mode 100644
index 000000000000..5fea2cac3e2a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/plowshare-2.1.7-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst prepare test
+DESCRIPTION=Command-line downloader and uploader for file-sharing websites
+EAPI=7
+HOMEPAGE=https://github.com/mcrapet/plowshare
+IUSE=+javascript view-captcha
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-shells/bash-4 || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) dev-vcs/git net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
+SLOT=0
+SRC_URI=https://github.com/mcrapet/plowshare/archive/v2.1.7.tar.gz -> plowshare-2.1.7.tar.gz
+_md5_=5193bfc049cbd0a7cd419067d9756c04
diff --git a/metadata/md5-cache/net-misc/plowshare-9999 b/metadata/md5-cache/net-misc/plowshare-9999
index c5aace3144e6..ed432b2595b4 100644
--- a/metadata/md5-cache/net-misc/plowshare-9999
+++ b/metadata/md5-cache/net-misc/plowshare-9999
@@ -1,12 +1,12 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Command-line downloader and uploader for file-sharing websites
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/mcrapet/plowshare
-IUSE=bash-completion +javascript view-captcha
+IUSE=+javascript view-captcha
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=app-shells/bash-4 || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) dev-vcs/git net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=97da2cdac07789df3d93ee5855978237
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
+_md5_=f1ef7b5e75fd4b7938a58992cdf0bcfb
diff --git a/metadata/md5-cache/net-misc/stunnel-5.58 b/metadata/md5-cache/net-misc/stunnel-5.58
index f08723c4f05b..75d9c3ea7d5e 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.58
+++ b/metadata/md5-cache/net-misc/stunnel-5.58
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.58.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.58.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.58.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.58.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.58.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.58.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.58.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=16cf88f4a9f582eac64aca3fc2d170ac
+_md5_=36b47fdedae491d48aac38e124d7b8fc
diff --git a/metadata/md5-cache/net-misc/stunnel-5.59 b/metadata/md5-cache/net-misc/stunnel-5.59
index d356050c7140..5a3b63df2489 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.59
+++ b/metadata/md5-cache/net-misc/stunnel-5.59
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.stunnel.org/downloads/stunnel-5.59.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.59.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.59.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.59.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.59.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.59.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.59.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.59.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fd2f8a593c9bdeaa80a1807fe398ce3d
+_md5_=a46a54e80b67444a9a7004b766f1ebf4
diff --git a/metadata/md5-cache/net-misc/teamviewer-15.15.5 b/metadata/md5-cache/net-misc/teamviewer-15.15.5
deleted file mode 100644
index 4170f5dca977..000000000000
--- a/metadata/md5-cache/net-misc/teamviewer-15.15.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
-EAPI=7
-HOMEPAGE=https://www.teamviewer.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=TeamViewer MIT
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/dbus !sys-auth/consolekit
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.15.5_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.15.5_i386.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=58a4acbeaeceab3419feb7baa273f561
diff --git a/metadata/md5-cache/net-misc/teamviewer-15.17.6-r1 b/metadata/md5-cache/net-misc/teamviewer-15.17.6-r1
deleted file mode 100644
index 2d446fb8ea8e..000000000000
--- a/metadata/md5-cache/net-misc/teamviewer-15.17.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
-EAPI=7
-HOMEPAGE=https://www.teamviewer.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=TeamViewer MIT
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/dbus !sys-auth/consolekit
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.17.6_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.17.6_i386.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c6fb8a8cc3fbba2fc45450acd486f40d
diff --git a/metadata/md5-cache/net-misc/teamviewer-15.18.5 b/metadata/md5-cache/net-misc/teamviewer-15.18.5
deleted file mode 100644
index 40d6b9b99b18..000000000000
--- a/metadata/md5-cache/net-misc/teamviewer-15.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
-EAPI=7
-HOMEPAGE=https://www.teamviewer.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=TeamViewer MIT
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/dbus !sys-auth/consolekit
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.18.5_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.18.5_i386.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a74cecebc8aa952558540b038cf6f129
diff --git a/metadata/md5-cache/net-misc/zerotier-1.6.3 b/metadata/md5-cache/net-misc/zerotier-1.6.3
index bd570e1ebe26..407d40d63761 100644
--- a/metadata/md5-cache/net-misc/zerotier-1.6.3
+++ b/metadata/md5-cache/net-misc/zerotier-1.6.3
@@ -10,5 +10,5 @@ LICENSE=BSL-1.1
 RDEPEND=dev-libs/json-glib net-libs/libnatpmp net-libs/miniupnpc:= clang? ( >=sys-devel/clang-6:* )
 SLOT=0
 SRC_URI=https://github.com/zerotier/ZeroTierOne/archive/1.6.3.tar.gz -> zerotier-1.6.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c3f918e2f6539bdf2c91cd07f8a2e8a7
diff --git a/metadata/md5-cache/net-misc/zerotier-1.6.4 b/metadata/md5-cache/net-misc/zerotier-1.6.4
index 8dc0ac61ad4f..30db8dfe230b 100644
--- a/metadata/md5-cache/net-misc/zerotier-1.6.4
+++ b/metadata/md5-cache/net-misc/zerotier-1.6.4
@@ -10,5 +10,5 @@ LICENSE=BSL-1.1
 RDEPEND=dev-libs/json-glib net-libs/libnatpmp net-libs/miniupnpc:= clang? ( >=sys-devel/clang-6:* )
 SLOT=0
 SRC_URI=https://github.com/zerotier/ZeroTierOne/archive/1.6.4.tar.gz -> zerotier-1.6.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c3f918e2f6539bdf2c91cd07f8a2e8a7
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 7e8a5a7e350e..aa2a109a3ccb 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.57-r1 b/metadata/md5-cache/net-nds/openldap-2.4.57-r1
index 88faece5c133..224da7190a0b 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.57-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.57-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.57.tgz http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/openldap-2.4.57.tgz http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.4.57.tgz http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.57.tgz mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=10b4fd62a0252b4aab5b085d797b406f
+_md5_=2e6522a6bec9b75a02b86492e9f42de5
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.58-r1 b/metadata/md5-cache/net-nds/openldap-2.4.58-r1
index 8697af55a15a..d62dd65c89d5 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.58-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.58-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.58.tgz http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/openldap-2.4.58.tgz http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.4.58.tgz http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.58.tgz mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=be93da8c90db00ecdeebfcf7915eaa74
+_md5_=e4114877226041aa8592c84255af0847
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.59-r1 b/metadata/md5-cache/net-nds/openldap-2.4.59-r1
index 58e4f93e7088..b561c558ce06 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.59-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.59-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.59.tgz http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/openldap-2.4.59.tgz http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.4.59.tgz http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.59.tgz mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=be93da8c90db00ecdeebfcf7915eaa74
+_md5_=e4114877226041aa8592c84255af0847
diff --git a/metadata/md5-cache/net-nds/openldap-2.5.4 b/metadata/md5-cache/net-nds/openldap-2.5.4
index a4cf4221b564..4eb57204480e 100644
--- a/metadata/md5-cache/net-nds/openldap-2.5.4
+++ b/metadata/md5-cache/net-nds/openldap-2.5.4
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.5.4.tgz http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/openldap-2.5.4.tgz http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.5.4.tgz http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.5.4.tgz mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c9a6f1dc3eb588aca118afabdc7d2328
+_md5_=ebf320c5a8bb9185d159681381e2e235
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index fcb9dc280835..22ba4cbc83ef 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-0.7.0 b/metadata/md5-cache/net-p2p/go-ipfs-0.7.0
deleted file mode 100644
index 629b0b27a669..000000000000
--- a/metadata/md5-cache/net-p2p/go-ipfs-0.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst test unpack
-DESCRIPTION=Main implementation of IPFS
-EAPI=7
-HOMEPAGE=https://ipfs.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0
-RDEPEND=!net-p2p/go-ipfs-bin acct-group/ipfs acct-user/ipfs sys-fs/fuse:0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/ipfs/go-ipfs/archive/v0.7.0.tar.gz -> go-ipfs-0.7.0.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200117225306-7b5117fecadc.zip -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200117225306-7b5117fecadc.zip mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200117225306-7b5117fecadc.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200117225306-7b5117fecadc.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.31.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.37.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.37.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//dmitri.shuralyov.com/app/changes/@v/v0.0.0-20180602232624-0a106ad413e3.mod -> dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//dmitri.shuralyov.com/html/belt/@v/v0.0.0-20180602232347-f7d459c86be0.mod -> dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod mirror://goproxy//dmitri.shuralyov.com/service/change/@v/v0.0.0-20181023043359-a85b471d5412.mod -> dmitri.shuralyov.com%2Fservice%2Fchange%2F@v%2Fv0.0.0-20181023043359-a85b471d5412.mod mirror://goproxy//dmitri.shuralyov.com/state/@v/v0.0.0-20180228185332-28bcc343414c.mod -> dmitri.shuralyov.com%2Fstate%2F@v%2Fv0.0.0-20180228185332-28bcc343414c.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.0.0-20180902110319-2566ecd5d999.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.0.0-20180902110319-2566ecd5d999.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20180913140656-343706a395b7.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20180913140656-343706a395b7.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190306092124-e2d15f34fcf9.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190306092124-e2d15f34fcf9.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190825152654-46b345b51c96.zip -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190825152654-46b345b51c96.zip mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190825152654-46b345b51c96.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190825152654-46b345b51c96.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!kubuxu/go-os-helper/@v/v0.0.1.zip -> github.com%2F!kubuxu%2Fgo-os-helper%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/!kubuxu/go-os-helper/@v/v0.0.1.mod -> github.com%2F!kubuxu%2Fgo-os-helper%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!stebalien/go-bitfield/@v/v0.0.0-20180330043415-076a62f9ce6e.mod -> github.com%2F!stebalien%2Fgo-bitfield%2F@v%2Fv0.0.0-20180330043415-076a62f9ce6e.mod mirror://goproxy//github.com/!stebalien/go-bitfield/@v/v0.0.1.zip -> github.com%2F!stebalien%2Fgo-bitfield%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/!stebalien/go-bitfield/@v/v0.0.1.mod -> github.com%2F!stebalien%2Fgo-bitfield%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/aead/siphash/@v/v1.0.1.mod -> github.com%2Faead%2Fsiphash%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alexbrainman/goissue34681/@v/v0.0.0-20191006012335-3fc7a47baff5.zip -> github.com%2Falexbrainman%2Fgoissue34681%2F@v%2Fv0.0.0-20191006012335-3fc7a47baff5.zip mirror://goproxy//github.com/alexbrainman/goissue34681/@v/v0.0.0-20191006012335-3fc7a47baff5.mod -> github.com%2Falexbrainman%2Fgoissue34681%2F@v%2Fv0.0.0-20191006012335-3fc7a47baff5.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.2.zip -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.2.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.zip -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/bren2010/proquint/@v/v0.0.0-20160323162903-38337c27106d.zip -> github.com%2Fbren2010%2Fproquint%2F@v%2Fv0.0.0-20160323162903-38337c27106d.zip mirror://goproxy//github.com/bren2010/proquint/@v/v0.0.0-20160323162903-38337c27106d.mod -> github.com%2Fbren2010%2Fproquint%2F@v%2Fv0.0.0-20160323162903-38337c27106d.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190213025234-306aecffea32.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190213025234-306aecffea32.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190523000118-16327141da8c.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190523000118-16327141da8c.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190605094302-a0d1e3e36d50.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190605094302-a0d1e3e36d50.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190824003749-130ea5bddde3.zip -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190824003749-130ea5bddde3.zip mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190824003749-130ea5bddde3.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190824003749-130ea5bddde3.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.20.1-beta.zip -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.zip mirror://goproxy//github.com/btcsuite/btcd/@v/v0.20.1-beta.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.mod mirror://goproxy//github.com/btcsuite/btclog/@v/v0.0.0-20170628155309-84c8d2346e9f.mod -> github.com%2Fbtcsuite%2Fbtclog%2F@v%2Fv0.0.0-20170628155309-84c8d2346e9f.mod mirror://goproxy//github.com/btcsuite/btcutil/@v/v0.0.0-20190207003914-4c204d697803.mod -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv0.0.0-20190207003914-4c204d697803.mod mirror://goproxy//github.com/btcsuite/btcutil/@v/v0.0.0-20190425235716-9e5f4b9a998d.mod -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv0.0.0-20190425235716-9e5f4b9a998d.mod mirror://goproxy//github.com/btcsuite/go-socks/@v/v0.0.0-20170105172521-4720035b7bfd.mod -> github.com%2Fbtcsuite%2Fgo-socks%2F@v%2Fv0.0.0-20170105172521-4720035b7bfd.mod mirror://goproxy//github.com/btcsuite/goleveldb/@v/v0.0.0-20160330041536-7834afc9e8cd.mod -> github.com%2Fbtcsuite%2Fgoleveldb%2F@v%2Fv0.0.0-20160330041536-7834afc9e8cd.mod mirror://goproxy//github.com/btcsuite/snappy-go/@v/v0.0.0-20151229074030-0bdef8d06723.mod -> github.com%2Fbtcsuite%2Fsnappy-go%2F@v%2Fv0.0.0-20151229074030-0bdef8d06723.mod mirror://goproxy//github.com/btcsuite/websocket/@v/v0.0.0-20150119174127-31079b680792.mod -> github.com%2Fbtcsuite%2Fwebsocket%2F@v%2Fv0.0.0-20150119174127-31079b680792.mod mirror://goproxy//github.com/btcsuite/winsvc/@v/v1.0.0.mod -> github.com%2Fbtcsuite%2Fwinsvc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20181115193947-bf1c66bbce23.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.zip -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.1-0.20180108230905-e214231b295a.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.1-0.20180108230905-e214231b295a.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/crackcomm/go-gitignore/@v/v0.0.0-20170627025303-887ab5e44cc3.zip -> github.com%2Fcrackcomm%2Fgo-gitignore%2F@v%2Fv0.0.0-20170627025303-887ab5e44cc3.zip mirror://goproxy//github.com/crackcomm/go-gitignore/@v/v0.0.0-20170627025303-887ab5e44cc3.mod -> github.com%2Fcrackcomm%2Fgo-gitignore%2F@v%2Fv0.0.0-20170627025303-887ab5e44cc3.mod mirror://goproxy//github.com/cskr/pubsub/@v/v1.0.2.zip -> github.com%2Fcskr%2Fpubsub%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/cskr/pubsub/@v/v1.0.2.mod -> github.com%2Fcskr%2Fpubsub%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20171005155431-ecdeabc65495.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20171005155431-ecdeabc65495.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/davidlazar/go-crypto/@v/v0.0.0-20170701192655-dcfb0a7ac018.zip -> github.com%2Fdavidlazar%2Fgo-crypto%2F@v%2Fv0.0.0-20170701192655-dcfb0a7ac018.zip mirror://goproxy//github.com/davidlazar/go-crypto/@v/v0.0.0-20170701192655-dcfb0a7ac018.mod -> github.com%2Fdavidlazar%2Fgo-crypto%2F@v%2Fv0.0.0-20170701192655-dcfb0a7ac018.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.5.5-0.20190226225317-8115aed38f8f.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.5.5-0.20190226225317-8115aed38f8f.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.0-rc1.zip -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0-rc1.zip mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.0-rc1.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0-rc1.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.0.zip -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.0.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.1.zip -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.1.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2.zip -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190104051053-3adb47b1fb0f.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190104051053-3adb47b1fb0f.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.zip -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elgris/jsondiff/@v/v0.0.0-20160530203242-765b5c24c302.zip -> github.com%2Felgris%2Fjsondiff%2F@v%2Fv0.0.0-20160530203242-765b5c24c302.zip mirror://goproxy//github.com/elgris/jsondiff/@v/v0.0.0-20160530203242-765b5c24c302.mod -> github.com%2Felgris%2Fjsondiff%2F@v%2Fv0.0.0-20160530203242-765b5c24c302.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/facebookgo/atomicfile/@v/v0.0.0-20151019160806-2de1f203e7d5.zip -> github.com%2Ffacebookgo%2Fatomicfile%2F@v%2Fv0.0.0-20151019160806-2de1f203e7d5.zip mirror://goproxy//github.com/facebookgo/atomicfile/@v/v0.0.0-20151019160806-2de1f203e7d5.mod -> github.com%2Ffacebookgo%2Fatomicfile%2F@v%2Fv0.0.0-20151019160806-2de1f203e7d5.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fd/go-nat/@v/v1.0.0.mod -> github.com%2Ffd%2Fgo-nat%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/flynn/noise/@v/v0.0.0-20180327030543-2492fe189ae6.zip -> github.com%2Fflynn%2Fnoise%2F@v%2Fv0.0.0-20180327030543-2492fe189ae6.zip mirror://goproxy//github.com/flynn/noise/@v/v0.0.0-20180327030543-2492fe189ae6.mod -> github.com%2Fflynn%2Fnoise%2F@v%2Fv0.0.0-20180327030543-2492fe189ae6.mod mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.zip -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.zip mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.mod -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/gabriel-vasile/mimetype/@v/v1.1.1.zip -> github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gabriel-vasile/mimetype/@v/v1.1.1.mod -> github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/go-bindata/go-bindata/v3/@v/v3.1.3.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2Fv3%2F@v%2Fv3.1.3.zip mirror://goproxy//github.com/go-bindata/go-bindata/v3/@v/v3.1.3.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20180628173108-788fd7840127.zip -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20180628173108-788fd7840127.zip mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20180628173108-788fd7840127.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20180628173108-788fd7840127.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191027212112-611e8accdfc9.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191027212112-611e8accdfc9.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gopacket/@v/v1.1.17.zip -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.17.zip mirror://goproxy//github.com/google/gopacket/@v/v1.1.17.mod -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.17.mod mirror://goproxy//github.com/google/gopacket/@v/v1.1.18.zip -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.18.zip mirror://goproxy//github.com/google/gopacket/@v/v1.1.18.mod -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.18.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.0+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.3.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190430165422-3e4dfb77656c.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190430165422-3e4dfb77656c.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190430165422-3e4dfb77656c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190430165422-3e4dfb77656c.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190812055157-5d271430af9f.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190812055157-5d271430af9f.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190812055157-5d271430af9f.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190812055157-5d271430af9f.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.5.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/gxed/hashland/keccakpg/@v/v0.0.1.mod -> github.com%2Fgxed%2Fhashland%2Fkeccakpg%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/gxed/hashland/murmur3/@v/v0.0.1.mod -> github.com%2Fgxed%2Fhashland%2Fmurmur3%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/gxed/pubsub/@v/v0.0.0-20180201040156-26ebdf44f824.mod -> github.com%2Fgxed%2Fpubsub%2F@v%2Fv0.0.0-20180201040156-26ebdf44f824.mod mirror://goproxy//github.com/hannahhoward/go-pubsub/@v/v0.0.0-20200423002714-8d62886cc36e.zip -> github.com%2Fhannahhoward%2Fgo-pubsub%2F@v%2Fv0.0.0-20200423002714-8d62886cc36e.zip mirror://goproxy//github.com/hannahhoward/go-pubsub/@v/v0.0.0-20200423002714-8d62886cc36e.mod -> github.com%2Fhannahhoward%2Fgo-pubsub%2F@v%2Fv0.0.0-20200423002714-8d62886cc36e.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huin/goupnp/@v/v0.0.0-20180415215157-1395d1447324.mod -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv0.0.0-20180415215157-1395d1447324.mod mirror://goproxy//github.com/huin/goupnp/@v/v1.0.0.zip -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/huin/goupnp/@v/v1.0.0.mod -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huin/goutil/@v/v0.0.0-20170803182201-1ca381bf3150.mod -> github.com%2Fhuin%2Fgoutil%2F@v%2Fv0.0.0-20170803182201-1ca381bf3150.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ipfs/bbloom/@v/v0.0.1.mod -> github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/bbloom/@v/v0.0.4.zip -> github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/ipfs/bbloom/@v/v0.0.4.mod -> github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.0.9.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.2.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.3.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.8.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.2.20.zip -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.2.20.zip mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.2.20.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.2.20.mod mirror://goproxy//github.com/ipfs/go-block-format/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-block-format/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-block-format/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.2.zip -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.2.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.3.zip -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.3.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.3.zip -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.4.zip -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.5.zip -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.6.zip -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.6.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.7.zip -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-cidutil/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-cidutil%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-cidutil/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-cidutil%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.1.1.zip -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.3.0.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.3.1.zip -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.3.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.0.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.4.zip -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.4.zip mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.4.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.4.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.5.zip -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.5.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/ipfs/go-detect-race/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-detect-race%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-detect-race/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-detect-race%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.5.zip -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.7.zip -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.1.zip -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.1.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.3.zip -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.3.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.4.zip -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.4.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/ipfs/go-ds-flatfs/@v/v0.4.5.zip -> github.com%2Fipfs%2Fgo-ds-flatfs%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/ipfs/go-ds-flatfs/@v/v0.4.5.mod -> github.com%2Fipfs%2Fgo-ds-flatfs%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.4.1.zip -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.4.1.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.4.2.zip -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.4.2.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/ipfs/go-ds-measure/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-ds-measure%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-ds-measure/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ds-measure%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-filestore/@v/v0.0.3.zip -> github.com%2Fipfs%2Fgo-filestore%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/ipfs/go-filestore/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-filestore%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-fs-lock/@v/v0.0.6.zip -> github.com%2Fipfs%2Fgo-fs-lock%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/ipfs/go-fs-lock/@v/v0.0.6.mod -> github.com%2Fipfs%2Fgo-fs-lock%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/ipfs/go-graphsync/@v/v0.1.1.zip -> github.com%2Fipfs%2Fgo-graphsync%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/ipfs/go-graphsync/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-graphsync%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.4.zip -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.4.mod -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/ipfs/go-ipfs-blocksutil/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-blocksutil%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-blocksutil/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-blocksutil%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-chunker/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-chunker/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-chunker/@v/v0.0.5.zip -> github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/ipfs/go-ipfs-chunker/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-ipfs-cmds/@v/v0.4.0.zip -> github.com%2Fipfs%2Fgo-ipfs-cmds%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/ipfs/go-ipfs-cmds/@v/v0.4.0.mod -> github.com%2Fipfs%2Fgo-ipfs-cmds%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-config/@v/v0.9.0.zip -> github.com%2Fipfs%2Fgo-ipfs-config%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/ipfs/go-ipfs-config/@v/v0.9.0.mod -> github.com%2Fipfs%2Fgo-ipfs-config%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-delay/@v/v0.0.0-20181109222059-70721b86a9a8.mod -> github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.0-20181109222059-70721b86a9a8.mod mirror://goproxy//github.com/ipfs/go-ipfs-delay/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-delay/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-ds-help/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-ds-help/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-ds-help/@v/v0.1.1.zip -> github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-ds-help/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-exchange-interface/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-exchange-interface%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-exchange-interface/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-exchange-interface%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-exchange-offline/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-exchange-offline%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-exchange-offline/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-exchange-offline%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-files/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipfs-files/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-ipfs-files/@v/v0.0.8.zip -> github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/ipfs/go-ipfs-files/@v/v0.0.8.mod -> github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/ipfs/go-ipfs-flags/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-flags%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-pinner/@v/v0.0.4.zip -> github.com%2Fipfs%2Fgo-ipfs-pinner%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/ipfs/go-ipfs-pinner/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-ipfs-pinner%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-ipfs-posinfo/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-posinfo%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-posinfo/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-posinfo%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-pq/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-pq%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-pq/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-ipfs-pq%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-ipfs-pq/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipfs-pq%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipfs-provider/@v/v0.4.3.zip -> github.com%2Fipfs%2Fgo-ipfs-provider%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/ipfs/go-ipfs-provider/@v/v0.4.3.mod -> github.com%2Fipfs%2Fgo-ipfs-provider%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/ipfs/go-ipfs-routing/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-routing/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-ipfs-routing/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-util/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-util/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-util/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-ipfs-util/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.3.zip -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.4.zip -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.2.0.zip -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.2.0.mod -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ipfs/go-ipld-git/@v/v0.0.3.zip -> github.com%2Fipfs%2Fgo-ipld-git%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/ipfs/go-ipld-git/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-ipld-git%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-ipns/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-ipns%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-ipns/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipns%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-log/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-log/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.1.zip -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.1.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.2.zip -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.2.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.3.zip -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.3.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.4.zip -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.4.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.1.zip -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.1.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.2.zip -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.2.zip mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.2.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.2.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.3.zip -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.3.zip mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.3.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.5.zip -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.5.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.1.1.zip -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.1.1.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.0.6.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.2.3.zip -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.2.3.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.0.zip -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.0.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.1.zip -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.1.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.2.zip -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.2.zip mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.2.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/ipfs/go-metrics-interface/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-metrics-interface%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-metrics-interface/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-metrics-interface%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-metrics-prometheus/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-metrics-prometheus%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-metrics-prometheus/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-metrics-prometheus%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-mfs/@v/v0.1.2.zip -> github.com%2Fipfs%2Fgo-mfs%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/ipfs/go-mfs/@v/v0.1.2.mod -> github.com%2Fipfs%2Fgo-mfs%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.7.zip -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.8.zip -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.8.mod -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.2.0.zip -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.2.0.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.2.4.zip -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.2.4.mod -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/ipfs/go-verifcid/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-verifcid%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-verifcid/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-verifcid%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/interface-go-ipfs-core/@v/v0.3.0.zip -> github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/ipfs/interface-go-ipfs-core/@v/v0.3.0.mod -> github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/ipfs/interface-go-ipfs-core/@v/v0.4.0.zip -> github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/ipfs/interface-go-ipfs-core/@v/v0.4.0.mod -> github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/ipld/go-car/@v/v0.1.1-0.20200429200904-c222d793c339.zip -> github.com%2Fipld%2Fgo-car%2F@v%2Fv0.1.1-0.20200429200904-c222d793c339.zip mirror://goproxy//github.com/ipld/go-car/@v/v0.1.1-0.20200429200904-c222d793c339.mod -> github.com%2Fipld%2Fgo-car%2F@v%2Fv0.1.1-0.20200429200904-c222d793c339.mod mirror://goproxy//github.com/ipld/go-ipld-prime/@v/v0.0.2-0.20200428162820-8b59dc292b8e.zip -> github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.0.2-0.20200428162820-8b59dc292b8e.zip mirror://goproxy//github.com/ipld/go-ipld-prime/@v/v0.0.2-0.20200428162820-8b59dc292b8e.mod -> github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.0.2-0.20200428162820-8b59dc292b8e.mod mirror://goproxy//github.com/ipld/go-ipld-prime-proto/@v/v0.0.0-20200428191222-c1ffdadc01e1.zip -> github.com%2Fipld%2Fgo-ipld-prime-proto%2F@v%2Fv0.0.0-20200428191222-c1ffdadc01e1.zip mirror://goproxy//github.com/ipld/go-ipld-prime-proto/@v/v0.0.0-20200428191222-c1ffdadc01e1.mod -> github.com%2Fipld%2Fgo-ipld-prime-proto%2F@v%2Fv0.0.0-20200428191222-c1ffdadc01e1.mod mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.4.mod -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.5.zip -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.5.mod -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.1.zip -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.1.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.zip -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/jbenet/go-cienv/@v/v0.0.0-20150120210510-1bb1476777ec.mod -> github.com%2Fjbenet%2Fgo-cienv%2F@v%2Fv0.0.0-20150120210510-1bb1476777ec.mod mirror://goproxy//github.com/jbenet/go-cienv/@v/v0.1.0.zip -> github.com%2Fjbenet%2Fgo-cienv%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jbenet/go-cienv/@v/v0.1.0.mod -> github.com%2Fjbenet%2Fgo-cienv%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jbenet/go-is-domain/@v/v1.0.5.zip -> github.com%2Fjbenet%2Fgo-is-domain%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/jbenet/go-is-domain/@v/v1.0.5.mod -> github.com%2Fjbenet%2Fgo-is-domain%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jbenet/go-random/@v/v0.0.0-20190219211222-123a90aedc0c.zip -> github.com%2Fjbenet%2Fgo-random%2F@v%2Fv0.0.0-20190219211222-123a90aedc0c.zip mirror://goproxy//github.com/jbenet/go-random/@v/v0.0.0-20190219211222-123a90aedc0c.mod -> github.com%2Fjbenet%2Fgo-random%2F@v%2Fv0.0.0-20190219211222-123a90aedc0c.mod mirror://goproxy//github.com/jbenet/go-temp-err-catcher/@v/v0.0.0-20150120210811-aac704a3f4f2.zip -> github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.0.0-20150120210811-aac704a3f4f2.zip mirror://goproxy//github.com/jbenet/go-temp-err-catcher/@v/v0.0.0-20150120210811-aac704a3f4f2.mod -> github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.0.0-20150120210811-aac704a3f4f2.mod mirror://goproxy//github.com/jbenet/go-temp-err-catcher/@v/v0.1.0.zip -> github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jbenet/go-temp-err-catcher/@v/v0.1.0.mod -> github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jbenet/goprocess/@v/v0.0.0-20160826012719-b497e2f366b8.mod -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.0.0-20160826012719-b497e2f366b8.mod mirror://goproxy//github.com/jbenet/goprocess/@v/v0.1.3.zip -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/jbenet/goprocess/@v/v0.1.3.mod -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/jbenet/goprocess/@v/v0.1.4.zip -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/jbenet/goprocess/@v/v0.1.4.mod -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v0.0.0-20141203071132-1679536dcc89.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv0.0.0-20141203071132-1679536dcc89.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jrick/logrotate/@v/v1.0.0.mod -> github.com%2Fjrick%2Flogrotate%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kami-zh/go-capturer/@v/v0.0.0-20171211120116-e492ea43421d.mod -> github.com%2Fkami-zh%2Fgo-capturer%2F@v%2Fv0.0.0-20171211120116-e492ea43421d.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.zip -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kkdai/bstream/@v/v0.0.0-20161212061736-f391b8402d23.mod -> github.com%2Fkkdai%2Fbstream%2F@v%2Fv0.0.0-20161212061736-f391b8402d23.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/koron/go-ssdp/@v/v0.0.0-20180514024734-4a0ed625a78b.zip -> github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20180514024734-4a0ed625a78b.zip mirror://goproxy//github.com/koron/go-ssdp/@v/v0.0.0-20180514024734-4a0ed625a78b.mod -> github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20180514024734-4a0ed625a78b.mod mirror://goproxy//github.com/koron/go-ssdp/@v/v0.0.0-20191105050749-2e1c40ed0b5d.zip -> github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20191105050749-2e1c40ed0b5d.zip mirror://goproxy//github.com/koron/go-ssdp/@v/v0.0.0-20191105050749-2e1c40ed0b5d.mod -> github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20191105050749-2e1c40ed0b5d.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-addr-util/@v/v0.0.1.zip -> github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/libp2p/go-addr-util/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-addr-util/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-addr-util/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-buffer-pool/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-buffer-pool%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-buffer-pool/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-buffer-pool%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-buffer-pool/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-buffer-pool%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-cidranger/@v/v1.1.0.zip -> github.com%2Flibp2p%2Fgo-cidranger%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/libp2p/go-cidranger/@v/v1.1.0.mod -> github.com%2Flibp2p%2Fgo-cidranger%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/libp2p/go-conn-security/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-conn-security%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-eventbus/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-eventbus/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-eventbus/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-eventbus/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.1.zip -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.3.zip -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.0.30.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.0.30.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.6.0.zip -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.6.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.6.1.zip -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.6.1.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.7.0.zip -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.7.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.7.4.zip -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.4.zip mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.7.4.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.4.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.8.1.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.8.3.zip -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.8.3.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.11.0.zip -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.11.0.zip mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.11.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.11.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-asn-util/@v/v0.0.0-20200825225859-85005c6cf052.zip -> github.com%2Flibp2p%2Fgo-libp2p-asn-util%2F@v%2Fv0.0.0-20200825225859-85005c6cf052.zip mirror://goproxy//github.com/libp2p/go-libp2p-asn-util/@v/v0.0.0-20200825225859-85005c6cf052.mod -> github.com%2Flibp2p%2Fgo-libp2p-asn-util%2F@v%2Fv0.0.0-20200825225859-85005c6cf052.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.1.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.3.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.3.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.3.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.1.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.1.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.1.6.zip -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.1.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.0.9.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.1.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.1.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.3.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.3.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-connmgr/@v/v0.2.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-connmgr%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-connmgr/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-connmgr%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.5.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.5.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.3.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.3.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.6.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.7.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.7.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.6.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.6.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.6.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.6.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.5.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.5.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-gostream/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-gostream%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-gostream/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-gostream%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-host/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-host%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-host/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-host%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-http/@v/v0.1.5.zip -> github.com%2Flibp2p%2Fgo-libp2p-http%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/libp2p/go-libp2p-http/@v/v0.1.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-http%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-connmgr/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-connmgr%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-connmgr/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-connmgr%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-connmgr/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-connmgr%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-pnet/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-pnet%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-kad-dht/@v/v0.9.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-kad-dht/@v/v0.9.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-kbucket/@v/v0.4.7.zip -> github.com%2Flibp2p%2Fgo-libp2p-kbucket%2F@v%2Fv0.4.7.zip mirror://goproxy//github.com/libp2p/go-libp2p-kbucket/@v/v0.4.7.mod -> github.com%2Flibp2p%2Fgo-libp2p-kbucket%2F@v%2Fv0.4.7.mod mirror://goproxy//github.com/libp2p/go-libp2p-loggables/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-loggables%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-loggables/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-loggables%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-loggables/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-loggables%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-metrics/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.5.zip -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.6.zip -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-net/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-net/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-net%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-netutil/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-netutil/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-netutil/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-noise/@v/v0.1.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-noise/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.6.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.6.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-pnet/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-pnet%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-pnet/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-pnet%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-protocol/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-protocol%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-protocol/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-protocol%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-pubsub/@v/v0.3.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-pubsub/@v/v0.3.5.zip -> github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.3.5.zip mirror://goproxy//github.com/libp2p/go-libp2p-pubsub/@v/v0.3.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-pubsub-router/@v/v0.3.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-pubsub-router%2F@v%2Fv0.3.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-pubsub-router/@v/v0.3.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-pubsub-router%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-quic-transport/@v/v0.8.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-quic-transport/@v/v0.8.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-routing/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-routing%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-routing-helpers/@v/v0.2.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-routing-helpers%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-routing-helpers/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-routing-helpers%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.8.zip -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.8.zip mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.8.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.8.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.1.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-tls/@v/v0.1.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-tls%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-tls/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-tls%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.1.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.5.zip -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.5.zip mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.7.zip -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.7.zip mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.7.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.7.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.8.zip -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.8.zip mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.8.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.8.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.0.5.zip -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.1.zip -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.2.zip -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.4.zip -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.6.zip -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.3.zip -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.4.zip -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.5.zip -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.2.zip -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.3.zip -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.3.zip -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.4.zip -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.5.zip -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.7.zip -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.7.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/libp2p/go-reuseport/@v/v0.0.1.zip -> github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/libp2p/go-reuseport/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-reuseport/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-reuseport/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.3.zip -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.4.zip -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-sockaddr/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-sockaddr/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-socket-activation/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-socket-activation%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-socket-activation/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-socket-activation%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-stream-muxer/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-stream-muxer%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-stream-muxer/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-stream-muxer%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.1.1.zip -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-testutil/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-testutil%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-testutil/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-testutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.3.1.zip -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.3.1.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.2.1.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.2.2.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.2.3.zip -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.2.3.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.0.zip -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.0.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.3.zip -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.3.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.5.zip -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.5.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.7.zip -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.7.zip mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.7.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.7.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.18.0.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.18.0.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/marten-seemann/qpack/@v/v0.2.0.mod -> github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.zip -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.0.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.0.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.1.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.12.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.12.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.12.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.12.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.28.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.28.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.28.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.28.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.31.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.31.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.mod mirror://goproxy//github.com/minio/blake2b-simd/@v/v0.0.0-20160723061019-3f5f724cb5b1.zip -> github.com%2Fminio%2Fblake2b-simd%2F@v%2Fv0.0.0-20160723061019-3f5f724cb5b1.zip mirror://goproxy//github.com/minio/blake2b-simd/@v/v0.0.0-20160723061019-3f5f724cb5b1.mod -> github.com%2Fminio%2Fblake2b-simd%2F@v%2Fv0.0.0-20160723061019-3f5f724cb5b1.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.0.0-20190131020904-2d45a736cd16.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.0.0-20190131020904-2d45a736cd16.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.0.0-20190328051042-05b4dd3047e5.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.0.0-20190328051042-05b4dd3047e5.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.0.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1-0.20190913151208-6de447530771.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1-0.20190913151208-6de447530771.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.0.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.1.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.2.zip -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.2.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.3.zip -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.3.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.2.0.zip -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/mr-tron/base58/@v/v1.2.0.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/multiformats/go-base32/@v/v0.0.3.zip -> github.com%2Fmultiformats%2Fgo-base32%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/multiformats/go-base32/@v/v0.0.3.mod -> github.com%2Fmultiformats%2Fgo-base32%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/multiformats/go-base36/@v/v0.1.0.zip -> github.com%2Fmultiformats%2Fgo-base36%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/multiformats/go-base36/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-base36%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.0.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.0.4.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.1.1.zip -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.1.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.1.zip -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.2.zip -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.1.zip -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.0.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.2.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr-fmt/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-fmt/@v/v0.1.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr-fmt/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.1.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.2.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.3.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.3.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.4.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.4.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.5.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.5.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.2.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.1.zip -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.2.zip -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.2.mod -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.3.zip -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.3.mod -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.5.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.7.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.8.zip -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.8.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.9.zip -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.9.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.10.zip -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.10.zip mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.10.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.13.zip -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.13.zip mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.13.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.14.zip -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.14.zip mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.14.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.14.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.0.4.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.0.zip -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.1.zip -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.1.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.2.zip -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.2.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.1.zip -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.2.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.5.zip -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.5.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.6.zip -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.6.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/neelance/astrewrite/@v/v0.0.0-20160511093645-99348263ae86.mod -> github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae86.mod mirror://goproxy//github.com/neelance/sourcemap/@v/v0.0.0-20151028013722-8c68805598ab.mod -> github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.zip -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.2.0.zip -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.2.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190221155625-df39d6c2d992.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190221155625-df39d6c2d992.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190408063855-01bf1e26dd14.zip -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190408063855-01bf1e26dd14.zip mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190408063855-01bf1e26dd14.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190408063855-01bf1e26dd14.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190807091052-3d65705ee9f1.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190807091052-3d65705ee9f1.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190809202753-05966cbd336a.zip -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190809202753-05966cbd336a.zip mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190809202753-05966cbd336a.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190809202753-05966cbd336a.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.8.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180801064454-c7de2306084e.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180725123919-05ee40e3a273.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/cors/@v/v1.7.0.zip -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/rs/cors/@v/v1.7.0.mod -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.mod -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/component/@v/v0.0.0-20170202220835-f88ec8f54cc4.mod -> github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod mirror://goproxy//github.com/shurcoo!l/events/@v/v0.0.0-20181021180414-410e4ca65f48.mod -> github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod mirror://goproxy//github.com/shurcoo!l/github_flavored_markdown/@v/v0.0.0-20181002035957-2122de532470.mod -> github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/gofontwoff/@v/v0.0.0-20180329035133-29b52fc0a18d.mod -> github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod mirror://goproxy//github.com/shurcoo!l/gopherjslib/@v/v0.0.0-20160914041154-feb6d3990c2c.mod -> github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod mirror://goproxy//github.com/shurcoo!l/highlight_diff/@v/v0.0.0-20170515013008-09bb4053de1b.mod -> github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod mirror://goproxy//github.com/shurcoo!l/highlight_go/@v/v0.0.0-20181028180052-98c3abbbae20.mod -> github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod mirror://goproxy//github.com/shurcoo!l/home/@v/v0.0.0-20181020052607-80b7ffcb30f9.mod -> github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod mirror://goproxy//github.com/shurcoo!l/htmlg/@v/v0.0.0-20170918183704-d01228ac9e50.mod -> github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod mirror://goproxy//github.com/shurcoo!l/httperror/@v/v0.0.0-20170206035902-86b7830d14cc.mod -> github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/httpgzip/@v/v0.0.0-20180522190206-b1c53ac65af9.mod -> github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod mirror://goproxy//github.com/shurcoo!l/issues/@v/v0.0.0-20181008053335-6292fdc1e191.mod -> github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod mirror://goproxy//github.com/shurcoo!l/issuesapp/@v/v0.0.0-20180602232740-048589ce2241.mod -> github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod mirror://goproxy//github.com/shurcoo!l/notifications/@v/v0.0.0-20181007000457-627ab5aea122.mod -> github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod mirror://goproxy//github.com/shurcoo!l/octicon/@v/v0.0.0-20181028054416-fa4f57f9efb2.mod -> github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod mirror://goproxy//github.com/shurcoo!l/reactions/@v/v0.0.0-20181006231557-f2e0b4ca5b82.mod -> github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v0.0.0-20170918181015-86672fcb3f95.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.mod mirror://goproxy//github.com/shurcoo!l/users/@v/v0.0.0-20180125191416-49c67e49c537.mod -> github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod mirror://goproxy//github.com/shurcoo!l/webdavfs/@v/v0.0.0-20170829043945-18c3829fa133.mod -> github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.1.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.1.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190222223459-a17d461953aa.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190222223459-a17d461953aa.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190731233626-505e41936337.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190731233626-505e41936337.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190731233626-505e41936337.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190731233626-505e41936337.mod mirror://goproxy//github.com/smola/gocompat/@v/v0.2.0.zip -> github.com%2Fsmola%2Fgocompat%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/smola/gocompat/@v/v0.2.0.mod -> github.com%2Fsmola%2Fgocompat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/sourcegraph/annotate/@v/v0.0.0-20160123013949-f4cad6c6324d.mod -> github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod mirror://goproxy//github.com/sourcegraph/syntaxhighlight/@v/v0.0.0-20170531221838-bd320f5d308e.mod -> github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod mirror://goproxy//github.com/spacemonkeygo/openssl/@v/v0.0.0-20181017203307-c2dcc5cca94a.mod -> github.com%2Fspacemonkeygo%2Fopenssl%2F@v%2Fv0.0.0-20181017203307-c2dcc5cca94a.mod mirror://goproxy//github.com/spacemonkeygo/spacelog/@v/v0.0.0-20180420211403-2296661a0572.zip -> github.com%2Fspacemonkeygo%2Fspacelog%2F@v%2Fv0.0.0-20180420211403-2296661a0572.zip mirror://goproxy//github.com/spacemonkeygo/spacelog/@v/v0.0.0-20180420211403-2296661a0572.mod -> github.com%2Fspacemonkeygo%2Fspacelog%2F@v%2Fv0.0.0-20180420211403-2296661a0572.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/src-d/envconfig/@v/v1.0.0.mod -> github.com%2Fsrc-d%2Fenvconfig%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.0.zip -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.0.mod -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/texttheater/golang-levenshtein/@v/v0.0.0-20180516184445-d188e65d659e.zip -> github.com%2Ftexttheater%2Fgolang-levenshtein%2F@v%2Fv0.0.0-20180516184445-d188e65d659e.zip mirror://goproxy//github.com/texttheater/golang-levenshtein/@v/v0.0.0-20180516184445-d188e65d659e.mod -> github.com%2Ftexttheater%2Fgolang-levenshtein%2F@v%2Fv0.0.0-20180516184445-d188e65d659e.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/viant/assertly/@v/v0.4.8.mod -> github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod mirror://goproxy//github.com/viant/toolbox/@v/v0.24.0.mod -> github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20180510122957-5ad1f5abf436.mod -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20180510122957-5ad1f5abf436.mod mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20190328234359-8b3e70f8e830.zip -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20190328234359-8b3e70f8e830.zip mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20190328234359-8b3e70f8e830.mod -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20190328234359-8b3e70f8e830.mod mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20200122115046-b9ea61034e4a.zip -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20200122115046-b9ea61034e4a.zip mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20200122115046-b9ea61034e4a.mod -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20200122115046-b9ea61034e4a.mod mirror://goproxy//github.com/whyrusleeping/base32/@v/v0.0.0-20170828182744-c30ac30633cc.zip -> github.com%2Fwhyrusleeping%2Fbase32%2F@v%2Fv0.0.0-20170828182744-c30ac30633cc.zip mirror://goproxy//github.com/whyrusleeping/base32/@v/v0.0.0-20170828182744-c30ac30633cc.mod -> github.com%2Fwhyrusleeping%2Fbase32%2F@v%2Fv0.0.0-20170828182744-c30ac30633cc.mod mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20200123233031-1cdf64d27158.zip -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200123233031-1cdf64d27158.zip mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20200123233031-1cdf64d27158.mod -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200123233031-1cdf64d27158.mod mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20200402171437-3d27c146c105.zip -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200402171437-3d27c146c105.zip mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20200402171437-3d27c146c105.mod -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200402171437-3d27c146c105.mod mirror://goproxy//github.com/whyrusleeping/chunker/@v/v0.0.0-20181014151217-fe64bd25879f.zip -> github.com%2Fwhyrusleeping%2Fchunker%2F@v%2Fv0.0.0-20181014151217-fe64bd25879f.zip mirror://goproxy//github.com/whyrusleeping/chunker/@v/v0.0.0-20181014151217-fe64bd25879f.mod -> github.com%2Fwhyrusleeping%2Fchunker%2F@v%2Fv0.0.0-20181014151217-fe64bd25879f.mod mirror://goproxy//github.com/whyrusleeping/go-keyspace/@v/v0.0.0-20160322163242-5b898ac5add1.zip -> github.com%2Fwhyrusleeping%2Fgo-keyspace%2F@v%2Fv0.0.0-20160322163242-5b898ac5add1.zip mirror://goproxy//github.com/whyrusleeping/go-keyspace/@v/v0.0.0-20160322163242-5b898ac5add1.mod -> github.com%2Fwhyrusleeping%2Fgo-keyspace%2F@v%2Fv0.0.0-20160322163242-5b898ac5add1.mod mirror://goproxy//github.com/whyrusleeping/go-logging/@v/v0.0.0-20170515211332-0457bb6b88fc.zip -> github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.0-20170515211332-0457bb6b88fc.zip mirror://goproxy//github.com/whyrusleeping/go-logging/@v/v0.0.0-20170515211332-0457bb6b88fc.mod -> github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.0-20170515211332-0457bb6b88fc.mod mirror://goproxy//github.com/whyrusleeping/go-logging/@v/v0.0.1.zip -> github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/whyrusleeping/go-logging/@v/v0.0.1.mod -> github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/whyrusleeping/go-notifier/@v/v0.0.0-20170827234753-097c5d47330f.zip -> github.com%2Fwhyrusleeping%2Fgo-notifier%2F@v%2Fv0.0.0-20170827234753-097c5d47330f.zip mirror://goproxy//github.com/whyrusleeping/go-notifier/@v/v0.0.0-20170827234753-097c5d47330f.mod -> github.com%2Fwhyrusleeping%2Fgo-notifier%2F@v%2Fv0.0.0-20170827234753-097c5d47330f.mod mirror://goproxy//github.com/whyrusleeping/go-smux-multiplex/@v/v3.0.16+incompatible.mod -> github.com%2Fwhyrusleeping%2Fgo-smux-multiplex%2F@v%2Fv3.0.16+incompatible.mod mirror://goproxy//github.com/whyrusleeping/go-smux-multistream/@v/v2.0.2+incompatible.mod -> github.com%2Fwhyrusleeping%2Fgo-smux-multistream%2F@v%2Fv2.0.2+incompatible.mod mirror://goproxy//github.com/whyrusleeping/go-smux-yamux/@v/v2.0.8+incompatible.mod -> github.com%2Fwhyrusleeping%2Fgo-smux-yamux%2F@v%2Fv2.0.8+incompatible.mod mirror://goproxy//github.com/whyrusleeping/go-smux-yamux/@v/v2.0.9+incompatible.mod -> github.com%2Fwhyrusleeping%2Fgo-smux-yamux%2F@v%2Fv2.0.9+incompatible.mod mirror://goproxy//github.com/whyrusleeping/go-sysinfo/@v/v0.0.0-20190219211824-4a357d4b90b1.zip -> github.com%2Fwhyrusleeping%2Fgo-sysinfo%2F@v%2Fv0.0.0-20190219211824-4a357d4b90b1.zip mirror://goproxy//github.com/whyrusleeping/go-sysinfo/@v/v0.0.0-20190219211824-4a357d4b90b1.mod -> github.com%2Fwhyrusleeping%2Fgo-sysinfo%2F@v%2Fv0.0.0-20190219211824-4a357d4b90b1.mod mirror://goproxy//github.com/whyrusleeping/mafmt/@v/v1.2.8.zip -> github.com%2Fwhyrusleeping%2Fmafmt%2F@v%2Fv1.2.8.zip mirror://goproxy//github.com/whyrusleeping/mafmt/@v/v1.2.8.mod -> github.com%2Fwhyrusleeping%2Fmafmt%2F@v%2Fv1.2.8.mod mirror://goproxy//github.com/whyrusleeping/mdns/@v/v0.0.0-20180901202407-ef14215e6b30.mod -> github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20180901202407-ef14215e6b30.mod mirror://goproxy//github.com/whyrusleeping/mdns/@v/v0.0.0-20190826153040-b9b60ed33aa9.zip -> github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20190826153040-b9b60ed33aa9.zip mirror://goproxy//github.com/whyrusleeping/mdns/@v/v0.0.0-20190826153040-b9b60ed33aa9.mod -> github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20190826153040-b9b60ed33aa9.mod mirror://goproxy//github.com/whyrusleeping/multiaddr-filter/@v/v0.0.0-20160516205228-e903e4adabd7.zip -> github.com%2Fwhyrusleeping%2Fmultiaddr-filter%2F@v%2Fv0.0.0-20160516205228-e903e4adabd7.zip mirror://goproxy//github.com/whyrusleeping/multiaddr-filter/@v/v0.0.0-20160516205228-e903e4adabd7.mod -> github.com%2Fwhyrusleeping%2Fmultiaddr-filter%2F@v%2Fv0.0.0-20160516205228-e903e4adabd7.mod mirror://goproxy//github.com/whyrusleeping/tar-utils/@v/v0.0.0-20180509141711-8c6c8ba81d5c.zip -> github.com%2Fwhyrusleeping%2Ftar-utils%2F@v%2Fv0.0.0-20180509141711-8c6c8ba81d5c.zip mirror://goproxy//github.com/whyrusleeping/tar-utils/@v/v0.0.0-20180509141711-8c6c8ba81d5c.mod -> github.com%2Fwhyrusleeping%2Ftar-utils%2F@v%2Fv0.0.0-20180509141711-8c6c8ba81d5c.mod mirror://goproxy//github.com/whyrusleeping/timecache/@v/v0.0.0-20160911033111-cfcb2f1abfee.zip -> github.com%2Fwhyrusleeping%2Ftimecache%2F@v%2Fv0.0.0-20160911033111-cfcb2f1abfee.zip mirror://goproxy//github.com/whyrusleeping/timecache/@v/v0.0.0-20160911033111-cfcb2f1abfee.mod -> github.com%2Fwhyrusleeping%2Ftimecache%2F@v%2Fv0.0.0-20160911033111-cfcb2f1abfee.mod mirror://goproxy//github.com/whyrusleeping/yamux/@v/v1.1.5.mod -> github.com%2Fwhyrusleeping%2Fyamux%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/x-cray/logrus-prefixed-formatter/@v/v0.5.2.mod -> github.com%2Fx-cray%2Flogrus-prefixed-formatter%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//go.opencensus.io/@v/v0.18.0.mod -> go.opencensus.io%2F@v%2Fv0.18.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.1.zip -> go.opencensus.io%2F@v%2Fv0.22.1.zip mirror://goproxy//go.opencensus.io/@v/v0.22.1.mod -> go.opencensus.io%2F@v%2Fv0.22.1.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.zip -> go.opencensus.io%2F@v%2Fv0.22.4.zip mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/dig/@v/v1.10.0.zip -> go.uber.org%2Fdig%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/dig/@v/v1.10.0.mod -> go.uber.org%2Fdig%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/fx/@v/v1.13.1.zip -> go.uber.org%2Ffx%2F@v%2Fv1.13.1.zip mirror://goproxy//go.uber.org/fx/@v/v1.13.1.mod -> go.uber.org%2Ffx%2F@v%2Fv1.13.1.mod mirror://goproxy//go.uber.org/goleak/@v/v0.10.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv0.10.0.zip mirror://goproxy//go.uber.org/goleak/@v/v0.10.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv0.10.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.4.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.4.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.1.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.15.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.15.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.15.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.15.0.mod mirror://goproxy//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//go4.org/@v/v0.0.0-20200411211856-f5505b9728dd.zip -> go4.org%2F@v%2Fv0.0.0-20200411211856-f5505b9728dd.zip mirror://goproxy//go4.org/@v/v0.0.0-20200411211856-f5505b9728dd.mod -> go4.org%2F@v%2Fv0.0.0-20200411211856-f5505b9728dd.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190111050920-041ab4dc3f9d.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20170930174604-9419663f5a44.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20170930174604-9419663f5a44.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181030102418-4d3f4d9ffa16.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190225124518-7f87c0fbb88b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190225124518-7f87c0fbb88b.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190426145343-a29dc8fdc734.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190513172903-22d7a77e9e5f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190618222545-ea8f1a30c443.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190618222545-ea8f1a30c443.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200115085410-6d4e4cb37c7d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200115085410-6d4e4cb37c7d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200117160349-530e935923ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200117160349-530e935923ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200423211502-4bdfaf469ed5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200423211502-4bdfaf469ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180524181706-dfa909b99c79.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180524181706-dfa909b99c79.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181029044818-c44066c5c816.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190227160552-c95aed5357e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190227160552-c95aed5357e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190313220215-9f648a60d977.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190611141213-3f473d35a33a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190611141213-3f473d35a33a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181017192945-9dcd33a902f4.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181029174526-d69651ed3497.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190219092855-153ac476189d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190219092855-153ac476189d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190228124157-a34e9553db1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190302025703-b6889370fb10.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190302025703-b6889370fb10.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190316082340-a2f829d7f35f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190524122548-abf6ff778158.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190524122548-abf6ff778158.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190524152521-dbbf3f1254d4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190524152521-dbbf3f1254d4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190526052359-791d8a0f4d09.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190526052359-791d8a0f4d09.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190610200419-93c9922d18ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190610200419-93c9922d18ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200509044756-6aff5f38e54f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200509044756-6aff5f38e54f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030000716-a0a13e073c7b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030000716-a0a13e073c7b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181130052023-1c3d964395ce.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181130052023-1c3d964395ce.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191030062658-86caa796c7ab.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191030062658-86caa796c7ab.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191114200427-caa0b0f7d508.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191114200427-caa0b0f7d508.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191114200427-caa0b0f7d508.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191114200427-caa0b0f7d508.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200522201501-cb1345f3a375.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200522201501-cb1345f3a375.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200522201501-cb1345f3a375.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200522201501-cb1345f3a375.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180910000450-7ca32eb868bf.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180910000450-7ca32eb868bf.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181030000543-1d582fd0359e.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181030000543-1d582fd0359e.mod mirror://goproxy//google.golang.org/api/@v/v0.1.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.1.0.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180831171423-11092d34479b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181029155118-b69ba1387ce2.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181029155118-b69ba1387ce2.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181202183823-bd91e49a0898.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181202183823-bd91e49a0898.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190306203927-b5d61aea6440.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190306203927-b5d61aea6440.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.28.zip -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.28.zip mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.28.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.28.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/src-d/go-cli.v0/@v/v0.0.0-20181105080154-d492247bbc0d.mod -> gopkg.in%2Fsrc-d%2Fgo-cli.v0%2F@v%2Fv0.0.0-20181105080154-d492247bbc0d.mod mirror://goproxy//gopkg.in/src-d/go-log.v1/@v/v1.0.1.mod -> gopkg.in%2Fsrc-d%2Fgo-log.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/go-diff/@v/v0.5.0.mod -> sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a2fe50281b42a04350baeeba76100494
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-0.9.1 b/metadata/md5-cache/net-p2p/go-ipfs-0.9.1
new file mode 100644
index 000000000000..cff6741121c9
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/go-ipfs-0.9.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst test unpack
+DESCRIPTION=Main implementation of IPFS
+EAPI=7
+HOMEPAGE=https://ipfs.io/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0
+RDEPEND=!net-p2p/go-ipfs-bin acct-group/ipfs acct-user/ipfs sys-fs/fuse:0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/ipfs/go-ipfs/archive/v0.9.1.tar.gz -> go-ipfs-0.9.1.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200117225306-7b5117fecadc.zip -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200117225306-7b5117fecadc.zip mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200117225306-7b5117fecadc.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200117225306-7b5117fecadc.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.31.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.37.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.37.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/prometheus/@v/v0.3.0.zip -> contrib.go.opencensus.io%2Fexporter%2Fprometheus%2F@v%2Fv0.3.0.zip mirror://goproxy//contrib.go.opencensus.io/exporter/prometheus/@v/v0.3.0.mod -> contrib.go.opencensus.io%2Fexporter%2Fprometheus%2F@v%2Fv0.3.0.mod mirror://goproxy//dmitri.shuralyov.com/app/changes/@v/v0.0.0-20180602232624-0a106ad413e3.mod -> dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//dmitri.shuralyov.com/html/belt/@v/v0.0.0-20180602232347-f7d459c86be0.mod -> dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod mirror://goproxy//dmitri.shuralyov.com/service/change/@v/v0.0.0-20181023043359-a85b471d5412.mod -> dmitri.shuralyov.com%2Fservice%2Fchange%2F@v%2Fv0.0.0-20181023043359-a85b471d5412.mod mirror://goproxy//dmitri.shuralyov.com/state/@v/v0.0.0-20180228185332-28bcc343414c.mod -> dmitri.shuralyov.com%2Fstate%2F@v%2Fv0.0.0-20180228185332-28bcc343414c.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.0.0-20180902110319-2566ecd5d999.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.0.0-20180902110319-2566ecd5d999.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20180913140656-343706a395b7.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20180913140656-343706a395b7.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190306092124-e2d15f34fcf9.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190306092124-e2d15f34fcf9.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190825152654-46b345b51c96.zip -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190825152654-46b345b51c96.zip mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190825152654-46b345b51c96.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190825152654-46b345b51c96.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod -> github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod mirror://goproxy//github.com/!kubuxu/go-os-helper/@v/v0.0.1.zip -> github.com%2F!kubuxu%2Fgo-os-helper%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/!kubuxu/go-os-helper/@v/v0.0.1.mod -> github.com%2F!kubuxu%2Fgo-os-helper%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stebalien/go-bitfield/@v/v0.0.1.zip -> github.com%2F!stebalien%2Fgo-bitfield%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/!stebalien/go-bitfield/@v/v0.0.1.mod -> github.com%2F!stebalien%2Fgo-bitfield%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/!vivid!cortex/gohistogram/@v/v1.0.0.mod -> github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aead/siphash/@v/v1.0.1.mod -> github.com%2Faead%2Fsiphash%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/afex/hystrix-go/@v/v0.0.0-20180502004556-fa1af6a1f4f5.mod -> github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alexbrainman/goissue34681/@v/v0.0.0-20191006012335-3fc7a47baff5.zip -> github.com%2Falexbrainman%2Fgoissue34681%2F@v%2Fv0.0.0-20191006012335-3fc7a47baff5.zip mirror://goproxy//github.com/alexbrainman/goissue34681/@v/v0.0.0-20191006012335-3fc7a47baff5.mod -> github.com%2Falexbrainman%2Fgoissue34681%2F@v%2Fv0.0.0-20191006012335-3fc7a47baff5.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/apache/thrift/@v/v0.12.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/apache/thrift/@v/v0.13.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20170710044230-e206f873d14a.mod -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.13.3.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.18.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.2.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.zip -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/blang/semver/v4/@v/v4.0.0.zip -> github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.zip mirror://goproxy//github.com/blang/semver/v4/@v/v4.0.0.mod -> github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190213025234-306aecffea32.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190213025234-306aecffea32.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190523000118-16327141da8c.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190523000118-16327141da8c.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190605094302-a0d1e3e36d50.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190605094302-a0d1e3e36d50.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.0.0-20190824003749-130ea5bddde3.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190824003749-130ea5bddde3.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.20.1-beta.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.mod mirror://goproxy//github.com/btcsuite/btcd/@v/v0.21.0-beta.zip -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.21.0-beta.zip mirror://goproxy//github.com/btcsuite/btcd/@v/v0.21.0-beta.mod -> github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.21.0-beta.mod mirror://goproxy//github.com/btcsuite/btclog/@v/v0.0.0-20170628155309-84c8d2346e9f.mod -> github.com%2Fbtcsuite%2Fbtclog%2F@v%2Fv0.0.0-20170628155309-84c8d2346e9f.mod mirror://goproxy//github.com/btcsuite/btcutil/@v/v0.0.0-20190207003914-4c204d697803.mod -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv0.0.0-20190207003914-4c204d697803.mod mirror://goproxy//github.com/btcsuite/btcutil/@v/v0.0.0-20190425235716-9e5f4b9a998d.mod -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv0.0.0-20190425235716-9e5f4b9a998d.mod mirror://goproxy//github.com/btcsuite/btcutil/@v/v1.0.2.mod -> github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/btcsuite/go-socks/@v/v0.0.0-20170105172521-4720035b7bfd.mod -> github.com%2Fbtcsuite%2Fgo-socks%2F@v%2Fv0.0.0-20170105172521-4720035b7bfd.mod mirror://goproxy//github.com/btcsuite/goleveldb/@v/v0.0.0-20160330041536-7834afc9e8cd.mod -> github.com%2Fbtcsuite%2Fgoleveldb%2F@v%2Fv0.0.0-20160330041536-7834afc9e8cd.mod mirror://goproxy//github.com/btcsuite/goleveldb/@v/v1.0.0.mod -> github.com%2Fbtcsuite%2Fgoleveldb%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/btcsuite/snappy-go/@v/v0.0.0-20151229074030-0bdef8d06723.mod -> github.com%2Fbtcsuite%2Fsnappy-go%2F@v%2Fv0.0.0-20151229074030-0bdef8d06723.mod mirror://goproxy//github.com/btcsuite/snappy-go/@v/v1.0.0.mod -> github.com%2Fbtcsuite%2Fsnappy-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/btcsuite/websocket/@v/v0.0.0-20150119174127-31079b680792.mod -> github.com%2Fbtcsuite%2Fwebsocket%2F@v%2Fv0.0.0-20150119174127-31079b680792.mod mirror://goproxy//github.com/btcsuite/winsvc/@v/v1.0.0.mod -> github.com%2Fbtcsuite%2Fwinsvc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20181115193947-bf1c66bbce23.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod mirror://goproxy//github.com/casbin/casbin/v2/@v/v2.1.2.mod -> github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.zip -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.29.zip -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.zip mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.29.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/clbanning/x2j/@v/v0.0.0-20191024224557-825249438eec.mod -> github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codahale/hdrhistogram/@v/v0.0.0-20161010025455-3a0bb77429bd.mod -> github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.1-0.20180108230905-e214231b295a.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.1-0.20180108230905-e214231b295a.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.1.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.1.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/crackcomm/go-gitignore/@v/v0.0.0-20170627025303-887ab5e44cc3.zip -> github.com%2Fcrackcomm%2Fgo-gitignore%2F@v%2Fv0.0.0-20170627025303-887ab5e44cc3.zip mirror://goproxy//github.com/crackcomm/go-gitignore/@v/v0.0.0-20170627025303-887ab5e44cc3.mod -> github.com%2Fcrackcomm%2Fgo-gitignore%2F@v%2Fv0.0.0-20170627025303-887ab5e44cc3.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/cskr/pubsub/@v/v1.0.2.zip -> github.com%2Fcskr%2Fpubsub%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/cskr/pubsub/@v/v1.0.2.mod -> github.com%2Fcskr%2Fpubsub%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20171005155431-ecdeabc65495.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20171005155431-ecdeabc65495.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/davidlazar/go-crypto/@v/v0.0.0-20170701192655-dcfb0a7ac018.mod -> github.com%2Fdavidlazar%2Fgo-crypto%2F@v%2Fv0.0.0-20170701192655-dcfb0a7ac018.mod mirror://goproxy//github.com/davidlazar/go-crypto/@v/v0.0.0-20200604182044-b73af7476f6c.zip -> github.com%2Fdavidlazar%2Fgo-crypto%2F@v%2Fv0.0.0-20200604182044-b73af7476f6c.zip mirror://goproxy//github.com/davidlazar/go-crypto/@v/v0.0.0-20200604182044-b73af7476f6c.mod -> github.com%2Fdavidlazar%2Fgo-crypto%2F@v%2Fv0.0.0-20200604182044-b73af7476f6c.mod mirror://goproxy//github.com/decred/dcrd/lru/@v/v1.0.0.mod -> github.com%2Fdecred%2Fdcrd%2Flru%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.5.5-0.20190226225317-8115aed38f8f.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.5.5-0.20190226225317-8115aed38f8f.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.0-rc1.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0-rc1.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.0.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.1.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.2.zip -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.2.zip mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.2.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2.zip -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190104051053-3adb47b1fb0f.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190104051053-3adb47b1fb0f.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.zip -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elgris/jsondiff/@v/v0.0.0-20160530203242-765b5c24c302.zip -> github.com%2Felgris%2Fjsondiff%2F@v%2Fv0.0.0-20160530203242-765b5c24c302.zip mirror://goproxy//github.com/elgris/jsondiff/@v/v0.0.0-20160530203242-765b5c24c302.mod -> github.com%2Felgris%2Fjsondiff%2F@v%2Fv0.0.0-20160530203242-765b5c24c302.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.6.9.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/facebookgo/atomicfile/@v/v0.0.0-20151019160806-2de1f203e7d5.zip -> github.com%2Ffacebookgo%2Fatomicfile%2F@v%2Fv0.0.0-20151019160806-2de1f203e7d5.zip mirror://goproxy//github.com/facebookgo/atomicfile/@v/v0.0.0-20151019160806-2de1f203e7d5.mod -> github.com%2Ffacebookgo%2Fatomicfile%2F@v%2Fv0.0.0-20151019160806-2de1f203e7d5.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/flynn/noise/@v/v0.0.0-20180327030543-2492fe189ae6.mod -> github.com%2Fflynn%2Fnoise%2F@v%2Fv0.0.0-20180327030543-2492fe189ae6.mod mirror://goproxy//github.com/flynn/noise/@v/v1.0.0.zip -> github.com%2Fflynn%2Fnoise%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/flynn/noise/@v/v1.0.0.mod -> github.com%2Fflynn%2Fnoise%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.zip -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.zip mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.mod -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod mirror://goproxy//github.com/franela/goblin/@v/v0.0.0-20200105215937-c9ffbefa60db.mod -> github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod mirror://goproxy//github.com/franela/goreq/@v/v0.0.0-20171204163338-bcd34c9993f8.mod -> github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/gabriel-vasile/mimetype/@v/v1.1.2.zip -> github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/gabriel-vasile/mimetype/@v/v1.1.2.mod -> github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/go-bindata/go-bindata/v3/@v/v3.1.3.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2Fv3%2F@v%2Fv3.1.3.zip mirror://goproxy//github.com/go-bindata/go-bindata/v3/@v/v3.1.3.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20180628173108-788fd7840127.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20180628173108-788fd7840127.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-task/slim-sprig/@v/v0.0.0-20210107165309-348f09dbbbc0.zip -> github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.zip mirror://goproxy//github.com/go-task/slim-sprig/@v/v0.0.0-20210107165309-348f09dbbbc0.mod -> github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191027212112-611e8accdfc9.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191027212112-611e8accdfc9.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/mock/@v/v1.6.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.6.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gopacket/@v/v1.1.17.mod -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.17.mod mirror://goproxy//github.com/google/gopacket/@v/v1.1.18.mod -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.18.mod mirror://goproxy//github.com/google/gopacket/@v/v1.1.19.zip -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.19.zip mirror://goproxy//github.com/google/gopacket/@v/v1.1.19.mod -> github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.19.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.0+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.3.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190430165422-3e4dfb77656c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190430165422-3e4dfb77656c.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190812055157-5d271430af9f.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190812055157-5d271430af9f.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190812055157-5d271430af9f.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190812055157-5d271430af9f.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.5.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/gxed/hashland/keccakpg/@v/v0.0.1.mod -> github.com%2Fgxed%2Fhashland%2Fkeccakpg%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/gxed/hashland/murmur3/@v/v0.0.1.mod -> github.com%2Fgxed%2Fhashland%2Fmurmur3%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hannahhoward/cbor-gen-for/@v/v0.0.0-20200817222906-ea96cece81f1.mod -> github.com%2Fhannahhoward%2Fcbor-gen-for%2F@v%2Fv0.0.0-20200817222906-ea96cece81f1.mod mirror://goproxy//github.com/hannahhoward/go-pubsub/@v/v0.0.0-20200423002714-8d62886cc36e.zip -> github.com%2Fhannahhoward%2Fgo-pubsub%2F@v%2Fv0.0.0-20200423002714-8d62886cc36e.zip mirror://goproxy//github.com/hannahhoward/go-pubsub/@v/v0.0.0-20200423002714-8d62886cc36e.mod -> github.com%2Fhannahhoward%2Fgo-pubsub%2F@v%2Fv0.0.0-20200423002714-8d62886cc36e.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hudl/fargo/@v/v1.3.0.mod -> github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/huin/goupnp/@v/v1.0.0.zip -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/huin/goupnp/@v/v1.0.0.mod -> github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huin/goutil/@v/v0.0.0-20170803182201-1ca381bf3150.mod -> github.com%2Fhuin%2Fgoutil%2F@v%2Fv0.0.0-20170803182201-1ca381bf3150.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/influxdata/influxdb1-client/@v/v0.0.0-20191209144304-8bf82d3c094d.mod -> github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod mirror://goproxy//github.com/ipfs/bbloom/@v/v0.0.1.mod -> github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/bbloom/@v/v0.0.4.zip -> github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/ipfs/bbloom/@v/v0.0.4.mod -> github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.0.9.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.2.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.3.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.1.8.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.3.4.zip -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/ipfs/go-bitswap/@v/v0.3.4.mod -> github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/ipfs/go-block-format/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-block-format/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-block-format/@v/v0.0.3.zip -> github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/ipfs/go-block-format/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.2.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.3.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.4.zip -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/ipfs/go-blockservice/@v/v0.1.4.mod -> github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.6.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.7.zip -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/ipfs/go-cid/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-cidutil/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-cidutil%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-cidutil/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-cidutil%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.3.0.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.3.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.0.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.1.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.4.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.4.mod mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.5.zip -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/ipfs/go-datastore/@v/v0.4.5.mod -> github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/ipfs/go-detect-race/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-detect-race%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-detect-race/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-detect-race%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.1.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.3.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.6.zip -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.6.zip mirror://goproxy//github.com/ipfs/go-ds-badger/@v/v0.2.6.mod -> github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.6.mod mirror://goproxy//github.com/ipfs/go-ds-flatfs/@v/v0.4.5.zip -> github.com%2Fipfs%2Fgo-ds-flatfs%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/ipfs/go-ds-flatfs/@v/v0.4.5.mod -> github.com%2Fipfs%2Fgo-ds-flatfs%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.4.1.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.4.2.zip -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/ipfs/go-ds-leveldb/@v/v0.4.2.mod -> github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/ipfs/go-ds-measure/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-ds-measure%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-ds-measure/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ds-measure%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-filestore/@v/v0.0.3.zip -> github.com%2Fipfs%2Fgo-filestore%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/ipfs/go-filestore/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-filestore%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-fs-lock/@v/v0.0.6.zip -> github.com%2Fipfs%2Fgo-fs-lock%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/ipfs/go-fs-lock/@v/v0.0.6.mod -> github.com%2Fipfs%2Fgo-fs-lock%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/ipfs/go-graphsync/@v/v0.8.0.zip -> github.com%2Fipfs%2Fgo-graphsync%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/ipfs/go-graphsync/@v/v0.8.0.mod -> github.com%2Fipfs%2Fgo-graphsync%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.4.mod -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.6.zip -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/ipfs/go-ipfs-blockstore/@v/v0.1.6.mod -> github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/ipfs/go-ipfs-blocksutil/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-blocksutil%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-blocksutil/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-blocksutil%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-chunker/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-chunker/@v/v0.0.5.zip -> github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/ipfs/go-ipfs-chunker/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-ipfs-cmds/@v/v0.6.0.zip -> github.com%2Fipfs%2Fgo-ipfs-cmds%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/ipfs/go-ipfs-cmds/@v/v0.6.0.mod -> github.com%2Fipfs%2Fgo-ipfs-cmds%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-config/@v/v0.14.0.zip -> github.com%2Fipfs%2Fgo-ipfs-config%2F@v%2Fv0.14.0.zip mirror://goproxy//github.com/ipfs/go-ipfs-config/@v/v0.14.0.mod -> github.com%2Fipfs%2Fgo-ipfs-config%2F@v%2Fv0.14.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-delay/@v/v0.0.0-20181109222059-70721b86a9a8.mod -> github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.0-20181109222059-70721b86a9a8.mod mirror://goproxy//github.com/ipfs/go-ipfs-delay/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-delay/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-ds-help/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-ds-help/@v/v0.1.1.zip -> github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-ds-help/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-exchange-interface/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-exchange-interface%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-exchange-interface/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-exchange-interface%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-exchange-offline/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-exchange-offline%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-exchange-offline/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-exchange-offline%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-files/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-ipfs-files/@v/v0.0.8.zip -> github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/ipfs/go-ipfs-files/@v/v0.0.8.mod -> github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/ipfs/go-ipfs-keystore/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-ipfs-keystore%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-ipfs-keystore/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipfs-keystore%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipfs-pinner/@v/v0.1.1.zip -> github.com%2Fipfs%2Fgo-ipfs-pinner%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-pinner/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-ipfs-pinner%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-posinfo/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-ipfs-posinfo%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-posinfo/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-posinfo%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-pq/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-pq%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-pq/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-ipfs-pq%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-ipfs-pq/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipfs-pq%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipfs-provider/@v/v0.5.1.zip -> github.com%2Fipfs%2Fgo-ipfs-provider%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/ipfs/go-ipfs-provider/@v/v0.5.1.mod -> github.com%2Fipfs%2Fgo-ipfs-provider%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-routing/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-routing/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-ipfs-routing/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-ipfs-util/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipfs-util/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-ipfs-util/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.3.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.5.zip -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/ipfs/go-ipld-cbor/@v/v0.0.5.mod -> github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.2.0.zip -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/ipfs/go-ipld-format/@v/v0.2.0.mod -> github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ipfs/go-ipld-git/@v/v0.0.4.zip -> github.com%2Fipfs%2Fgo-ipld-git%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/ipfs/go-ipld-git/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-ipld-git%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-ipns/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-ipns%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-ipns/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-ipns%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-ipns/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-ipns%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-log/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.1.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.2.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.3.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.4.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.5.zip -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/ipfs/go-log/@v/v1.0.5.mod -> github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.1.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.2.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.2.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.3.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.0.5.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.1.1.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.1.3.zip -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.1.3.zip mirror://goproxy//github.com/ipfs/go-log/v2/@v/v2.1.3.mod -> github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.1.3.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.0.6.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.2.3.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.0.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.1.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.2.zip -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.2.zip mirror://goproxy//github.com/ipfs/go-merkledag/@v/v0.3.2.mod -> github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/ipfs/go-metrics-interface/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-metrics-interface%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-metrics-interface/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-metrics-interface%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/go-metrics-prometheus/@v/v0.0.2.zip -> github.com%2Fipfs%2Fgo-metrics-prometheus%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/ipfs/go-metrics-prometheus/@v/v0.0.2.mod -> github.com%2Fipfs%2Fgo-metrics-prometheus%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/ipfs/go-mfs/@v/v0.1.2.zip -> github.com%2Fipfs%2Fgo-mfs%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/ipfs/go-mfs/@v/v0.1.2.mod -> github.com%2Fipfs%2Fgo-mfs%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/ipfs/go-namesys/@v/v0.3.0.zip -> github.com%2Fipfs%2Fgo-namesys%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/ipfs/go-namesys/@v/v0.3.0.mod -> github.com%2Fipfs%2Fgo-namesys%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.7.mod -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.9.zip -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/ipfs/go-path/@v/v0.0.9.mod -> github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.0.4.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.1.1.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.2.0.zip -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/ipfs/go-peertaskqueue/@v/v0.2.0.mod -> github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ipfs/go-pinning-service-http-client/@v/v0.1.0.zip -> github.com%2Fipfs%2Fgo-pinning-service-http-client%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/ipfs/go-pinning-service-http-client/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-pinning-service-http-client%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.1.0.mod -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.2.4.mod -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.2.5.zip -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.2.5.zip mirror://goproxy//github.com/ipfs/go-unixfs/@v/v0.2.5.mod -> github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.2.5.mod mirror://goproxy//github.com/ipfs/go-verifcid/@v/v0.0.1.zip -> github.com%2Fipfs%2Fgo-verifcid%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/go-verifcid/@v/v0.0.1.mod -> github.com%2Fipfs%2Fgo-verifcid%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipfs/interface-go-ipfs-core/@v/v0.4.0.zip -> github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/ipfs/interface-go-ipfs-core/@v/v0.4.0.mod -> github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/ipfs/tar-utils/@v/v0.0.1.zip -> github.com%2Fipfs%2Ftar-utils%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/ipfs/tar-utils/@v/v0.0.1.mod -> github.com%2Fipfs%2Ftar-utils%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/ipld/go-car/@v/v0.3.1.zip -> github.com%2Fipld%2Fgo-car%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/ipld/go-car/@v/v0.3.1.mod -> github.com%2Fipld%2Fgo-car%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/ipld/go-codec-dagpb/@v/v1.2.0.zip -> github.com%2Fipld%2Fgo-codec-dagpb%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/ipld/go-codec-dagpb/@v/v1.2.0.mod -> github.com%2Fipld%2Fgo-codec-dagpb%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/ipld/go-ipld-prime/@v/v0.9.0.mod -> github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/ipld/go-ipld-prime/@v/v0.9.1-0.20210324083106-dc342a9917db.zip -> github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.9.1-0.20210324083106-dc342a9917db.zip mirror://goproxy//github.com/ipld/go-ipld-prime/@v/v0.9.1-0.20210324083106-dc342a9917db.mod -> github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.9.1-0.20210324083106-dc342a9917db.mod mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.5.mod -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.1.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.zip -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/jbenet/go-cienv/@v/v0.0.0-20150120210510-1bb1476777ec.mod -> github.com%2Fjbenet%2Fgo-cienv%2F@v%2Fv0.0.0-20150120210510-1bb1476777ec.mod mirror://goproxy//github.com/jbenet/go-cienv/@v/v0.1.0.zip -> github.com%2Fjbenet%2Fgo-cienv%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jbenet/go-cienv/@v/v0.1.0.mod -> github.com%2Fjbenet%2Fgo-cienv%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jbenet/go-random/@v/v0.0.0-20190219211222-123a90aedc0c.zip -> github.com%2Fjbenet%2Fgo-random%2F@v%2Fv0.0.0-20190219211222-123a90aedc0c.zip mirror://goproxy//github.com/jbenet/go-random/@v/v0.0.0-20190219211222-123a90aedc0c.mod -> github.com%2Fjbenet%2Fgo-random%2F@v%2Fv0.0.0-20190219211222-123a90aedc0c.mod mirror://goproxy//github.com/jbenet/go-temp-err-catcher/@v/v0.0.0-20150120210811-aac704a3f4f2.mod -> github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.0.0-20150120210811-aac704a3f4f2.mod mirror://goproxy//github.com/jbenet/go-temp-err-catcher/@v/v0.1.0.zip -> github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jbenet/go-temp-err-catcher/@v/v0.1.0.mod -> github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jbenet/goprocess/@v/v0.0.0-20160826012719-b497e2f366b8.mod -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.0.0-20160826012719-b497e2f366b8.mod mirror://goproxy//github.com/jbenet/goprocess/@v/v0.1.3.mod -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/jbenet/goprocess/@v/v0.1.4.zip -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/jbenet/goprocess/@v/v0.1.4.mod -> github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v0.0.0-20141203071132-1679536dcc89.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv0.0.0-20141203071132-1679536dcc89.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jrick/logrotate/@v/v1.0.0.mod -> github.com%2Fjrick%2Flogrotate%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/kami-zh/go-capturer/@v/v0.0.0-20171211120116-e492ea43421d.mod -> github.com%2Fkami-zh%2Fgo-capturer%2F@v%2Fv0.0.0-20171211120116-e492ea43421d.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.zip -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kkdai/bstream/@v/v0.0.0-20161212061736-f391b8402d23.mod -> github.com%2Fkkdai%2Fbstream%2F@v%2Fv0.0.0-20161212061736-f391b8402d23.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.7.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.7.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.11.7.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.7.mod mirror://goproxy//github.com/klauspost/cpuid/v2/@v/v2.0.4.zip -> github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/klauspost/cpuid/v2/@v/v2.0.4.mod -> github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/koron/go-ssdp/@v/v0.0.0-20180514024734-4a0ed625a78b.mod -> github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20180514024734-4a0ed625a78b.mod mirror://goproxy//github.com/koron/go-ssdp/@v/v0.0.0-20191105050749-2e1c40ed0b5d.zip -> github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20191105050749-2e1c40ed0b5d.zip mirror://goproxy//github.com/koron/go-ssdp/@v/v0.0.0-20191105050749-2e1c40ed0b5d.mod -> github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20191105050749-2e1c40ed0b5d.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-addr-util/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-addr-util/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-addr-util/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-buffer-pool/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-buffer-pool%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-buffer-pool/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-buffer-pool%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-buffer-pool/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-buffer-pool%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-cidranger/@v/v1.1.0.zip -> github.com%2Flibp2p%2Fgo-cidranger%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/libp2p/go-cidranger/@v/v1.1.0.mod -> github.com%2Flibp2p%2Fgo-cidranger%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/libp2p/go-conn-security/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-conn-security%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-conn-security-multistream/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-doh-resolver/@v/v0.3.1.zip -> github.com%2Flibp2p%2Fgo-doh-resolver%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/libp2p/go-doh-resolver/@v/v0.3.1.mod -> github.com%2Flibp2p%2Fgo-doh-resolver%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/libp2p/go-eventbus/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-eventbus/@v/v0.2.1.zip -> github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libp2p/go-eventbus/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.3.zip -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/libp2p/go-flow-metrics/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.0.30.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.0.30.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.6.1.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.7.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.7.4.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.4.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.8.1.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.12.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.13.0.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.14.3.zip -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.14.3.zip mirror://goproxy//github.com/libp2p/go-libp2p/@v/v0.14.3.mod -> github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.14.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-asn-util/@v/v0.0.0-20200825225859-85005c6cf052.zip -> github.com%2Flibp2p%2Fgo-libp2p-asn-util%2F@v%2Fv0.0.0-20200825225859-85005c6cf052.zip mirror://goproxy//github.com/libp2p/go-libp2p-asn-util/@v/v0.0.0-20200825225859-85005c6cf052.mod -> github.com%2Flibp2p%2Fgo-libp2p-asn-util%2F@v%2Fv0.0.0-20200825225859-85005c6cf052.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.4.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-autonat/@v/v0.4.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.1.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-blankhost/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.0.9.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.1.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-circuit/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-connmgr/@v/v0.2.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-connmgr%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-connmgr/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-connmgr%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.2.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.3.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.5.7.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.6.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.6.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.7.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.8.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.8.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.8.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.8.5.zip -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.8.5.zip mirror://goproxy//github.com/libp2p/go-libp2p-core/@v/v0.8.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.8.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-crypto/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.5.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.5.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-discovery/@v/v0.5.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-gostream/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-gostream%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-gostream/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-gostream%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-host/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-host%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-host/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-host%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-http/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-http%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-http/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-http%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-connmgr/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-connmgr%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-connmgr/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-connmgr%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-connmgr/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-connmgr%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-interface-pnet/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-interface-pnet%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-kad-dht/@v/v0.11.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-kad-dht/@v/v0.12.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.12.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-kad-dht/@v/v0.12.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.12.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-kbucket/@v/v0.3.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-kbucket%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-kbucket/@v/v0.4.7.zip -> github.com%2Flibp2p%2Fgo-libp2p-kbucket%2F@v%2Fv0.4.7.zip mirror://goproxy//github.com/libp2p/go-libp2p-kbucket/@v/v0.4.7.mod -> github.com%2Flibp2p%2Fgo-libp2p-kbucket%2F@v%2Fv0.4.7.mod mirror://goproxy//github.com/libp2p/go-libp2p-loggables/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-loggables%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-loggables/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-loggables%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-loggables/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-loggables%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-metrics/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.4.1.zip -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/libp2p/go-libp2p-mplex/@v/v0.4.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.6.zip -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/libp2p/go-libp2p-nat/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-net/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-net/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-net%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-netutil/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-netutil/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-netutil/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-noise/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-noise/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-noise/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peer/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.1.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.7.zip -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.7.zip mirror://goproxy//github.com/libp2p/go-libp2p-peerstore/@v/v0.2.7.mod -> github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.7.mod mirror://goproxy//github.com/libp2p/go-libp2p-pnet/@v/v0.2.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-pnet%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-pnet/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-pnet%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-protocol/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-protocol%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-protocol/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-protocol%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-pubsub/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-pubsub/@v/v0.4.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-pubsub/@v/v0.4.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-pubsub-router/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-pubsub-router%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-pubsub-router/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-pubsub-router%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-quic-transport/@v/v0.10.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-quic-transport/@v/v0.11.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.11.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-quic-transport/@v/v0.11.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.11.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-record/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-routing/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-routing%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-routing-helpers/@v/v0.2.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-routing-helpers%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-routing-helpers/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-routing-helpers%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-secio/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.2.8.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.8.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.3.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.5.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-swarm/@v/v0.5.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.1.2-0.20200422005655-8775583591d8.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.2-0.20200422005655-8775583591d8.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-libp2p-testing/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-tls/@v/v0.1.3.zip -> github.com%2Flibp2p%2Fgo-libp2p-tls%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/libp2p/go-libp2p-tls/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-tls%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.4.2.zip -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/libp2p/go-libp2p-transport-upgrader/@v/v0.4.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-xor/@v/v0.0.0-20200501025846-71e284145d58.zip -> github.com%2Flibp2p%2Fgo-libp2p-xor%2F@v%2Fv0.0.0-20200501025846-71e284145d58.zip mirror://goproxy//github.com/libp2p/go-libp2p-xor/@v/v0.0.0-20200501025846-71e284145d58.mod -> github.com%2Flibp2p%2Fgo-libp2p-xor%2F@v%2Fv0.0.0-20200501025846-71e284145d58.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.2.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.5.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.5.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.7.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.7.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.2.8.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.8.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.5.0.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.5.1.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.5.4.zip -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/libp2p/go-libp2p-yamux/@v/v0.5.4.mod -> github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.1.0.zip -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/libp2p/go-maddr-filter/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-mplex/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.6.zip -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/libp2p/go-msgio/@v/v0.0.6.mod -> github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.5.zip -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/libp2p/go-nat/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.2.mod -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.3.mod -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.5.mod -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.6.zip -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/libp2p/go-netroute/@v/v0.1.6.mod -> github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.7.zip -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/libp2p/go-openssl/@v/v0.0.7.mod -> github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/libp2p/go-reuseport/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-reuseport/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-reuseport/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.3.mod -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.4.zip -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/libp2p/go-reuseport-transport/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-sockaddr/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-sockaddr/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-sockaddr/@v/v0.1.1.zip -> github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/libp2p/go-sockaddr/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-socket-activation/@v/v0.0.2.zip -> github.com%2Flibp2p%2Fgo-socket-activation%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/libp2p/go-socket-activation/@v/v0.0.2.mod -> github.com%2Flibp2p%2Fgo-socket-activation%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/libp2p/go-stream-muxer/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-stream-muxer%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-stream-muxer/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-stream-muxer%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.3.0.zip -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/libp2p/go-stream-muxer-multistream/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.0.4.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.1.1.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.1.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.3.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.4.zip -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/libp2p/go-tcp-transport/@v/v0.2.4.mod -> github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/libp2p/go-testutil/@v/v0.0.1.mod -> github.com%2Flibp2p%2Fgo-testutil%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/libp2p/go-testutil/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-testutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.0.5.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.1.0.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.2.0.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.3.0.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.3.1.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.4.0.zip -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/libp2p/go-ws-transport/@v/v0.4.0.mod -> github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.2.1.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.2.2.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.2.3.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.0.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.3.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.5.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.3.7.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.7.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.4.0.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.4.1.zip -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/libp2p/go-yamux/@v/v1.4.1.mod -> github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/libp2p/go-yamux/v2/@v/v2.0.0.mod -> github.com%2Flibp2p%2Fgo-yamux%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/libp2p/go-yamux/v2/@v/v2.2.0.zip -> github.com%2Flibp2p%2Fgo-yamux%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//github.com/libp2p/go-yamux/v2/@v/v2.2.0.mod -> github.com%2Flibp2p%2Fgo-yamux%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.19.3.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.21.2.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.21.2.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.21.2.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.21.2.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lyft/protoc-gen-validate/@v/v0.0.13.mod -> github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/marten-seemann/qpack/@v/v0.2.1.mod -> github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.1.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.4.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.5.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.5.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-16/@v/v0.1.4.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-16%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-16/@v/v0.1.4.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-16%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-17/@v/v0.1.0-rc.1.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0-rc.1.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-17/@v/v0.1.0-rc.1.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0-rc.1.mod mirror://goproxy//github.com/marten-seemann/tcp/@v/v0.0.0-20210406111302-dfbc87cc63fd.zip -> github.com%2Fmarten-seemann%2Ftcp%2F@v%2Fv0.0.0-20210406111302-dfbc87cc63fd.zip mirror://goproxy//github.com/marten-seemann/tcp/@v/v0.0.0-20210406111302-dfbc87cc63fd.mod -> github.com%2Fmarten-seemann%2Ftcp%2F@v%2Fv0.0.0-20210406111302-dfbc87cc63fd.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.1.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.12.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.12.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.28.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.28.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.31.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.mod mirror://goproxy//github.com/mikioh/tcp/@v/v0.0.0-20190314235350-803a9b46060c.zip -> github.com%2Fmikioh%2Ftcp%2F@v%2Fv0.0.0-20190314235350-803a9b46060c.zip mirror://goproxy//github.com/mikioh/tcp/@v/v0.0.0-20190314235350-803a9b46060c.mod -> github.com%2Fmikioh%2Ftcp%2F@v%2Fv0.0.0-20190314235350-803a9b46060c.mod mirror://goproxy//github.com/mikioh/tcpinfo/@v/v0.0.0-20190314235526-30a79bb1804b.zip -> github.com%2Fmikioh%2Ftcpinfo%2F@v%2Fv0.0.0-20190314235526-30a79bb1804b.zip mirror://goproxy//github.com/mikioh/tcpinfo/@v/v0.0.0-20190314235526-30a79bb1804b.mod -> github.com%2Fmikioh%2Ftcpinfo%2F@v%2Fv0.0.0-20190314235526-30a79bb1804b.mod mirror://goproxy//github.com/mikioh/tcpopt/@v/v0.0.0-20190314235656-172688c1accc.zip -> github.com%2Fmikioh%2Ftcpopt%2F@v%2Fv0.0.0-20190314235656-172688c1accc.zip mirror://goproxy//github.com/mikioh/tcpopt/@v/v0.0.0-20190314235656-172688c1accc.mod -> github.com%2Fmikioh%2Ftcpopt%2F@v%2Fv0.0.0-20190314235656-172688c1accc.mod mirror://goproxy//github.com/minio/blake2b-simd/@v/v0.0.0-20160723061019-3f5f724cb5b1.zip -> github.com%2Fminio%2Fblake2b-simd%2F@v%2Fv0.0.0-20160723061019-3f5f724cb5b1.zip mirror://goproxy//github.com/minio/blake2b-simd/@v/v0.0.0-20160723061019-3f5f724cb5b1.mod -> github.com%2Fminio%2Fblake2b-simd%2F@v%2Fv0.0.0-20160723061019-3f5f724cb5b1.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.0.0-20190131020904-2d45a736cd16.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.0.0-20190131020904-2d45a736cd16.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.0.0-20190328051042-05b4dd3047e5.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.0.0-20190328051042-05b4dd3047e5.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.0.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1-0.20190913151208-6de447530771.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1-0.20190913151208-6de447530771.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v1.0.0.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v1.0.0.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.0.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.1.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.2.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.1.3.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/mr-tron/base58/@v/v1.2.0.zip -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/mr-tron/base58/@v/v1.2.0.mod -> github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/multiformats/go-base32/@v/v0.0.3.zip -> github.com%2Fmultiformats%2Fgo-base32%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/multiformats/go-base32/@v/v0.0.3.mod -> github.com%2Fmultiformats%2Fgo-base32%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/multiformats/go-base36/@v/v0.1.0.zip -> github.com%2Fmultiformats%2Fgo-base36%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/multiformats/go-base36/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-base36%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.0.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.0.4.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.1.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.2.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.3.zip -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.3.zip mirror://goproxy//github.com/multiformats/go-multiaddr/@v/v0.3.3.mod -> github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.0.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.3.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.3.1.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.3.1.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.3.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-dns/@v/v0.3.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-fmt/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-fmt/@v/v0.1.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr-fmt/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.1.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.2.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.3.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.4.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.1.5.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.2.0.zip -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/multiformats/go-multiaddr-net/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.3.zip -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/multiformats/go-multibase/@v/v0.0.3.mod -> github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/multiformats/go-multicodec/@v/v0.2.0.zip -> github.com%2Fmultiformats%2Fgo-multicodec%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/multiformats/go-multicodec/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multicodec%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.5.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.8.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.9.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.10.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.13.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.14.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.14.mod mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.15.zip -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.15.zip mirror://goproxy//github.com/multiformats/go-multihash/@v/v0.0.15.mod -> github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.15.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.0.4.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.0.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.1.1.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.2.0.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.2.1.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.2.1.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.2.2.zip -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/multiformats/go-multistream/@v/v0.2.2.mod -> github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.1.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.2.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.5.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.6.zip -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/multiformats/go-varint/@v/v0.0.6.mod -> github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.0.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.2.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/nats-io/nats-server/v2/@v/v2.1.2.mod -> github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.0.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.3.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/neelance/astrewrite/@v/v0.0.0-20160511093645-99348263ae86.mod -> github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae86.mod mirror://goproxy//github.com/neelance/sourcemap/@v/v0.0.0-20151028013722-8c68805598ab.mod -> github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.mod mirror://goproxy//github.com/oklog/oklog/@v/v0.3.2.mod -> github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.2.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.2.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.4.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.4.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.13.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.13.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.2.0.zip -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.2.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.6.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.2.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/pact-foundation/pact-go/@v/v1.0.4.mod -> github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v1.0.2-0.20190131084431-473cd7ce01a1.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v1.2.1.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190221155625-df39d6c2d992.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190221155625-df39d6c2d992.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190408063855-01bf1e26dd14.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190408063855-01bf1e26dd14.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20190807091052-3d65705ee9f1.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190807091052-3d65705ee9f1.mod mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20201211092308-30ac6d18308e.zip -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20201211092308-30ac6d18308e.zip mirror://goproxy//github.com/polydawn/refmt/@v/v0.0.0-20201211092308-30ac6d18308e.mod -> github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20201211092308-30ac6d18308e.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.8.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.3.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.6.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.9.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.10.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.10.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180801064454-c7de2306084e.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.15.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.18.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.18.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180725123919-05ee40e3a273.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/statsd_exporter/@v/v0.20.0.zip -> github.com%2Fprometheus%2Fstatsd_exporter%2F@v%2Fv0.20.0.zip mirror://goproxy//github.com/prometheus/statsd_exporter/@v/v0.20.0.mod -> github.com%2Fprometheus%2Fstatsd_exporter%2F@v%2Fv0.20.0.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/cors/@v/v1.7.0.zip -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/rs/cors/@v/v1.7.0.mod -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.mod -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.mod -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/component/@v/v0.0.0-20170202220835-f88ec8f54cc4.mod -> github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod mirror://goproxy//github.com/shurcoo!l/events/@v/v0.0.0-20181021180414-410e4ca65f48.mod -> github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod mirror://goproxy//github.com/shurcoo!l/github_flavored_markdown/@v/v0.0.0-20181002035957-2122de532470.mod -> github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/gofontwoff/@v/v0.0.0-20180329035133-29b52fc0a18d.mod -> github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod mirror://goproxy//github.com/shurcoo!l/gopherjslib/@v/v0.0.0-20160914041154-feb6d3990c2c.mod -> github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod mirror://goproxy//github.com/shurcoo!l/highlight_diff/@v/v0.0.0-20170515013008-09bb4053de1b.mod -> github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod mirror://goproxy//github.com/shurcoo!l/highlight_go/@v/v0.0.0-20181028180052-98c3abbbae20.mod -> github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod mirror://goproxy//github.com/shurcoo!l/home/@v/v0.0.0-20181020052607-80b7ffcb30f9.mod -> github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod mirror://goproxy//github.com/shurcoo!l/htmlg/@v/v0.0.0-20170918183704-d01228ac9e50.mod -> github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod mirror://goproxy//github.com/shurcoo!l/httperror/@v/v0.0.0-20170206035902-86b7830d14cc.mod -> github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/httpgzip/@v/v0.0.0-20180522190206-b1c53ac65af9.mod -> github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod mirror://goproxy//github.com/shurcoo!l/issues/@v/v0.0.0-20181008053335-6292fdc1e191.mod -> github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod mirror://goproxy//github.com/shurcoo!l/issuesapp/@v/v0.0.0-20180602232740-048589ce2241.mod -> github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod mirror://goproxy//github.com/shurcoo!l/notifications/@v/v0.0.0-20181007000457-627ab5aea122.mod -> github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod mirror://goproxy//github.com/shurcoo!l/octicon/@v/v0.0.0-20181028054416-fa4f57f9efb2.mod -> github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod mirror://goproxy//github.com/shurcoo!l/reactions/@v/v0.0.0-20181006231557-f2e0b4ca5b82.mod -> github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v0.0.0-20170918181015-86672fcb3f95.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/users/@v/v0.0.0-20180125191416-49c67e49c537.mod -> github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod mirror://goproxy//github.com/shurcoo!l/webdavfs/@v/v0.0.0-20170829043945-18c3829fa133.mod -> github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.1.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.1.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190222223459-a17d461953aa.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190222223459-a17d461953aa.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/smola/gocompat/@v/v0.2.0.mod -> github.com%2Fsmola%2Fgocompat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sony/gobreaker/@v/v0.4.1.mod -> github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/sourcegraph/annotate/@v/v0.0.0-20160123013949-f4cad6c6324d.mod -> github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod mirror://goproxy//github.com/sourcegraph/syntaxhighlight/@v/v0.0.0-20170531221838-bd320f5d308e.mod -> github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod mirror://goproxy//github.com/spacemonkeygo/openssl/@v/v0.0.0-20181017203307-c2dcc5cca94a.mod -> github.com%2Fspacemonkeygo%2Fopenssl%2F@v%2Fv0.0.0-20181017203307-c2dcc5cca94a.mod mirror://goproxy//github.com/spacemonkeygo/spacelog/@v/v0.0.0-20180420211403-2296661a0572.zip -> github.com%2Fspacemonkeygo%2Fspacelog%2F@v%2Fv0.0.0-20180420211403-2296661a0572.zip mirror://goproxy//github.com/spacemonkeygo/spacelog/@v/v0.0.0-20180420211403-2296661a0572.mod -> github.com%2Fspacemonkeygo%2Fspacelog%2F@v%2Fv0.0.0-20180420211403-2296661a0572.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/src-d/envconfig/@v/v1.0.0.mod -> github.com%2Fsrc-d%2Fenvconfig%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod mirror://goproxy//github.com/streadway/handy/@v/v0.0.0-20190108123426-d5acb3125c2a.mod -> github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.0.zip -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.0.mod -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/texttheater/golang-levenshtein/@v/v0.0.0-20180516184445-d188e65d659e.zip -> github.com%2Ftexttheater%2Fgolang-levenshtein%2F@v%2Fv0.0.0-20180516184445-d188e65d659e.zip mirror://goproxy//github.com/texttheater/golang-levenshtein/@v/v0.0.0-20180516184445-d188e65d659e.mod -> github.com%2Ftexttheater%2Fgolang-levenshtein%2F@v%2Fv0.0.0-20180516184445-d188e65d659e.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.0.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/viant/assertly/@v/v0.4.8.mod -> github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod mirror://goproxy//github.com/viant/toolbox/@v/v0.24.0.mod -> github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod mirror://goproxy//github.com/wangjia184/sortedset/@v/v0.0.0-20160527075905-f5d03557ba30.mod -> github.com%2Fwangjia184%2Fsortedset%2F@v%2Fv0.0.0-20160527075905-f5d03557ba30.mod mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20180510122957-5ad1f5abf436.mod -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20180510122957-5ad1f5abf436.mod mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20190328234359-8b3e70f8e830.mod -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20190328234359-8b3e70f8e830.mod mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20200122115046-b9ea61034e4a.zip -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20200122115046-b9ea61034e4a.zip mirror://goproxy//github.com/warpfork/go-wish/@v/v0.0.0-20200122115046-b9ea61034e4a.mod -> github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20200122115046-b9ea61034e4a.mod mirror://goproxy//github.com/whyrusleeping/base32/@v/v0.0.0-20170828182744-c30ac30633cc.zip -> github.com%2Fwhyrusleeping%2Fbase32%2F@v%2Fv0.0.0-20170828182744-c30ac30633cc.zip mirror://goproxy//github.com/whyrusleeping/base32/@v/v0.0.0-20170828182744-c30ac30633cc.mod -> github.com%2Fwhyrusleeping%2Fbase32%2F@v%2Fv0.0.0-20170828182744-c30ac30633cc.mod mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20200123233031-1cdf64d27158.mod -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200123233031-1cdf64d27158.mod mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20200710004633-5379fc63235d.mod -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200710004633-5379fc63235d.mod mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20210219115102-f37d292932f2.zip -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20210219115102-f37d292932f2.zip mirror://goproxy//github.com/whyrusleeping/cbor-gen/@v/v0.0.0-20210219115102-f37d292932f2.mod -> github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20210219115102-f37d292932f2.mod mirror://goproxy//github.com/whyrusleeping/chunker/@v/v0.0.0-20181014151217-fe64bd25879f.zip -> github.com%2Fwhyrusleeping%2Fchunker%2F@v%2Fv0.0.0-20181014151217-fe64bd25879f.zip mirror://goproxy//github.com/whyrusleeping/chunker/@v/v0.0.0-20181014151217-fe64bd25879f.mod -> github.com%2Fwhyrusleeping%2Fchunker%2F@v%2Fv0.0.0-20181014151217-fe64bd25879f.mod mirror://goproxy//github.com/whyrusleeping/go-keyspace/@v/v0.0.0-20160322163242-5b898ac5add1.zip -> github.com%2Fwhyrusleeping%2Fgo-keyspace%2F@v%2Fv0.0.0-20160322163242-5b898ac5add1.zip mirror://goproxy//github.com/whyrusleeping/go-keyspace/@v/v0.0.0-20160322163242-5b898ac5add1.mod -> github.com%2Fwhyrusleeping%2Fgo-keyspace%2F@v%2Fv0.0.0-20160322163242-5b898ac5add1.mod mirror://goproxy//github.com/whyrusleeping/go-logging/@v/v0.0.0-20170515211332-0457bb6b88fc.mod -> github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.0-20170515211332-0457bb6b88fc.mod mirror://goproxy//github.com/whyrusleeping/go-logging/@v/v0.0.1.mod -> github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/whyrusleeping/go-notifier/@v/v0.0.0-20170827234753-097c5d47330f.mod -> github.com%2Fwhyrusleeping%2Fgo-notifier%2F@v%2Fv0.0.0-20170827234753-097c5d47330f.mod mirror://goproxy//github.com/whyrusleeping/go-sysinfo/@v/v0.0.0-20190219211824-4a357d4b90b1.zip -> github.com%2Fwhyrusleeping%2Fgo-sysinfo%2F@v%2Fv0.0.0-20190219211824-4a357d4b90b1.zip mirror://goproxy//github.com/whyrusleeping/go-sysinfo/@v/v0.0.0-20190219211824-4a357d4b90b1.mod -> github.com%2Fwhyrusleeping%2Fgo-sysinfo%2F@v%2Fv0.0.0-20190219211824-4a357d4b90b1.mod mirror://goproxy//github.com/whyrusleeping/mafmt/@v/v1.2.8.mod -> github.com%2Fwhyrusleeping%2Fmafmt%2F@v%2Fv1.2.8.mod mirror://goproxy//github.com/whyrusleeping/mdns/@v/v0.0.0-20180901202407-ef14215e6b30.mod -> github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20180901202407-ef14215e6b30.mod mirror://goproxy//github.com/whyrusleeping/mdns/@v/v0.0.0-20190826153040-b9b60ed33aa9.zip -> github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20190826153040-b9b60ed33aa9.zip mirror://goproxy//github.com/whyrusleeping/mdns/@v/v0.0.0-20190826153040-b9b60ed33aa9.mod -> github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20190826153040-b9b60ed33aa9.mod mirror://goproxy//github.com/whyrusleeping/multiaddr-filter/@v/v0.0.0-20160516205228-e903e4adabd7.zip -> github.com%2Fwhyrusleeping%2Fmultiaddr-filter%2F@v%2Fv0.0.0-20160516205228-e903e4adabd7.zip mirror://goproxy//github.com/whyrusleeping/multiaddr-filter/@v/v0.0.0-20160516205228-e903e4adabd7.mod -> github.com%2Fwhyrusleeping%2Fmultiaddr-filter%2F@v%2Fv0.0.0-20160516205228-e903e4adabd7.mod mirror://goproxy//github.com/whyrusleeping/timecache/@v/v0.0.0-20160911033111-cfcb2f1abfee.zip -> github.com%2Fwhyrusleeping%2Ftimecache%2F@v%2Fv0.0.0-20160911033111-cfcb2f1abfee.zip mirror://goproxy//github.com/whyrusleeping/timecache/@v/v0.0.0-20160911033111-cfcb2f1abfee.mod -> github.com%2Fwhyrusleeping%2Ftimecache%2F@v%2Fv0.0.0-20160911033111-cfcb2f1abfee.mod mirror://goproxy//github.com/x-cray/logrus-prefixed-formatter/@v/v0.5.2.mod -> github.com%2Fx-cray%2Flogrus-prefixed-formatter%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.opencensus.io/@v/v0.18.0.mod -> go.opencensus.io%2F@v%2Fv0.18.0.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.1.mod -> go.opencensus.io%2F@v%2Fv0.22.1.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/dig/@v/v1.10.0.zip -> go.uber.org%2Fdig%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/dig/@v/v1.10.0.mod -> go.uber.org%2Fdig%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/fx/@v/v1.13.1.zip -> go.uber.org%2Ffx%2F@v%2Fv1.13.1.zip mirror://goproxy//go.uber.org/fx/@v/v1.13.1.mod -> go.uber.org%2Ffx%2F@v%2Fv1.13.1.mod mirror://goproxy//go.uber.org/goleak/@v/v0.10.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv0.10.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.4.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.13.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.15.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.15.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.16.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.16.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.16.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.16.0.mod mirror://goproxy//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//go4.org/@v/v0.0.0-20200411211856-f5505b9728dd.zip -> go4.org%2F@v%2Fv0.0.0-20200411211856-f5505b9728dd.zip mirror://goproxy//go4.org/@v/v0.0.0-20200411211856-f5505b9728dd.mod -> go4.org%2F@v%2Fv0.0.0-20200411211856-f5505b9728dd.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190111050920-041ab4dc3f9d.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20170930174604-9419663f5a44.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20170930174604-9419663f5a44.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181030102418-4d3f4d9ffa16.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190225124518-7f87c0fbb88b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190225124518-7f87c0fbb88b.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190426145343-a29dc8fdc734.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190513172903-22d7a77e9e5f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190618222545-ea8f1a30c443.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190618222545-ea8f1a30c443.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200115085410-6d4e4cb37c7d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200115085410-6d4e4cb37c7d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200423211502-4bdfaf469ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200510223506-06a226fb4e37.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200602180216-279210d13fed.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200602180216-279210d13fed.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210506145944-38f3c27a63bf.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210506145944-38f3c27a63bf.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210506145944-38f3c27a63bf.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210506145944-38f3c27a63bf.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180719180050-a680a1efc54d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180719180050-a680a1efc54d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181029044818-c44066c5c816.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190227160552-c95aed5357e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190227160552-c95aed5357e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190313220215-9f648a60d977.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190611141213-3f473d35a33a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190611141213-3f473d35a33a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210423184538-5f58ad60dda6.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210423184538-5f58ad60dda6.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210428140749-89ef3d95e781.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210428140749-89ef3d95e781.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181017192945-9dcd33a902f4.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181029174526-d69651ed3497.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190219092855-153ac476189d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190219092855-153ac476189d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190228124157-a34e9553db1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190302025703-b6889370fb10.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190302025703-b6889370fb10.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190316082340-a2f829d7f35f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190524122548-abf6ff778158.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190524122548-abf6ff778158.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190524152521-dbbf3f1254d4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190524152521-dbbf3f1254d4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190526052359-791d8a0f4d09.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190526052359-791d8a0f4d09.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190610200419-93c9922d18ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190610200419-93c9922d18ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191220142924-d4481acd189f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200420163511-1957bb5e6d1f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201214210602-f9fddec55a1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201214210602-f9fddec55a1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210112080510-489259a85091.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210112080510-489259a85091.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210309074719-68d13333faf2.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210309074719-68d13333faf2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210317225723-c4fcb01b228e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210317225723-c4fcb01b228e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426080607-c94f62235c83.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426080607-c94f62235c83.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210511113859-b0526f3d8744.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210511113859-b0526f3d8744.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210511113859-b0526f3d8744.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210511113859-b0526f3d8744.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030000716-a0a13e073c7b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030000716-a0a13e073c7b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181130052023-1c3d964395ce.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181130052023-1c3d964395ce.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191030062658-86caa796c7ab.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191030062658-86caa796c7ab.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191114200427-caa0b0f7d508.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191114200427-caa0b0f7d508.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201224043029-2b0845dc783e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201224043029-2b0845dc783e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.1-0.20210225150353-54dc8c5edb56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.1-0.20210225150353-54dc8c5edb56.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.1.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.1.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.1.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.1.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180910000450-7ca32eb868bf.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180910000450-7ca32eb868bf.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181030000543-1d582fd0359e.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181030000543-1d582fd0359e.mod mirror://goproxy//google.golang.org/api/@v/v0.1.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.1.0.mod mirror://goproxy//google.golang.org/api/@v/v0.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180831171423-11092d34479b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181029155118-b69ba1387ce2.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181029155118-b69ba1387ce2.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181202183823-bd91e49a0898.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181202183823-bd91e49a0898.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190306203927-b5d61aea6440.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190306203927-b5d61aea6440.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.zip mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.3.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/src-d/go-cli.v0/@v/v0.0.0-20181105080154-d492247bbc0d.mod -> gopkg.in%2Fsrc-d%2Fgo-cli.v0%2F@v%2Fv0.0.0-20181105080154-d492247bbc0d.mod mirror://goproxy//gopkg.in/src-d/go-log.v1/@v/v1.0.1.mod -> gopkg.in%2Fsrc-d%2Fgo-log.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/appdash/@v/v0.0.0-20190731080439-ebfcffb1b5c0.mod -> sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod mirror://goproxy//sourcegraph.com/sourcegraph/go-diff/@v/v0.5.0.mod -> sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2dbe7fb596695b3a6756845ea477f46d
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index e364b1198550..3cc57a512f8c 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/tayga-0.9.2-r3 b/metadata/md5-cache/net-proxy/tayga-0.9.2-r3
index 25ecaa42c156..793988258149 100644
--- a/metadata/md5-cache/net-proxy/tayga-0.9.2-r3
+++ b/metadata/md5-cache/net-proxy/tayga-0.9.2-r3
@@ -3,9 +3,9 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=out-of-kernel stateless NAT64 implementation based on TUN
 EAPI=6
 HOMEPAGE=http://www.litech.org/tayga/
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.litech.org/tayga/tayga-0.9.2.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2e3c77a768064bf3cd15ef42868564b6
+_md5_=760ca6c90c1a63ced6000334e335e3f7
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 6c97deaae356..2f6e86200a37 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.32-r2 b/metadata/md5-cache/net-vpn/libreswan-3.32-r2
deleted file mode 100644
index 566c40e3d730..000000000000
--- a/metadata/md5-cache/net-vpn/libreswan-3.32-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
-DESCRIPTION=IPsec implementation for Linux, fork of Openswan
-EAPI=7
-HOMEPAGE=https://libreswan.org/
-IUSE=caps curl dnssec ldap pam seccomp selinux systemd test
-KEYWORDS=amd64 ~arm ~ppc x86
-LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.libreswan.org/libreswan-3.32.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3fe0497a84521c42373499e01636dbee
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.32-r3 b/metadata/md5-cache/net-vpn/libreswan-3.32-r3
deleted file mode 100644
index 60d92519344c..000000000000
--- a/metadata/md5-cache/net-vpn/libreswan-3.32-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
-DESCRIPTION=IPsec implementation for Linux, fork of Openswan
-EAPI=7
-HOMEPAGE=https://libreswan.org/
-IUSE=caps curl dnssec ldap pam seccomp selinux systemd test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.libreswan.org/libreswan-3.32.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e1b7961a271aa57b391157458373c24e
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.32-r4 b/metadata/md5-cache/net-vpn/libreswan-3.32-r4
new file mode 100644
index 000000000000..b3f7f381dd54
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/libreswan-3.32-r4
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DESCRIPTION=IPsec implementation for Linux, fork of Openswan
+EAPI=7
+HOMEPAGE=https://libreswan.org/
+IUSE=caps curl dnssec ldap pam seccomp selinux systemd test
+KEYWORDS=amd64 ~arm ~ppc x86
+LICENSE=GPL-2 BSD-4 RSA DES
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec ) virtual/tmpfiles
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.libreswan.org/libreswan-3.32.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d00e1aa162aa3afb0eb4bd3f53e6cc19
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.32-r5 b/metadata/md5-cache/net-vpn/libreswan-3.32-r5
new file mode 100644
index 000000000000..5628e868e9bf
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/libreswan-3.32-r5
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DESCRIPTION=IPsec implementation for Linux, fork of Openswan
+EAPI=7
+HOMEPAGE=https://libreswan.org/
+IUSE=caps curl dnssec ldap pam seccomp selinux systemd test
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 BSD-4 RSA DES
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec ) virtual/tmpfiles
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.libreswan.org/libreswan-3.32.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=01a9d57f7ca9b57edf181db8df43c8ab
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.2-r1 b/metadata/md5-cache/net-vpn/libreswan-4.2-r1
deleted file mode 100644
index 0b590dda5baf..000000000000
--- a/metadata/md5-cache/net-vpn/libreswan-4.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
-DESCRIPTION=IPsec implementation for Linux, fork of Openswan
-EAPI=7
-HOMEPAGE=https://libreswan.org/
-IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.libreswan.org/libreswan-4.2.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=025def8cf06ad842822646bd561f2136
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.2-r2 b/metadata/md5-cache/net-vpn/libreswan-4.2-r2
new file mode 100644
index 000000000000..d40e76e0b7f9
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/libreswan-4.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DESCRIPTION=IPsec implementation for Linux, fork of Openswan
+EAPI=7
+HOMEPAGE=https://libreswan.org/
+IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 BSD-4 RSA DES
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec ) virtual/tmpfiles
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.libreswan.org/libreswan-4.2.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=15d0afe674e81a448d26b2a71b88c779
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.3-r1 b/metadata/md5-cache/net-vpn/libreswan-4.3-r1
deleted file mode 100644
index b1407e12298e..000000000000
--- a/metadata/md5-cache/net-vpn/libreswan-4.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
-DESCRIPTION=IPsec implementation for Linux, fork of Openswan
-EAPI=7
-HOMEPAGE=https://libreswan.org/
-IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
-KEYWORDS=amd64 ~arm ~ppc x86
-LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.libreswan.org/libreswan-4.3.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2098b449ab9c65e70bc838256fcf0df2
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.3-r2 b/metadata/md5-cache/net-vpn/libreswan-4.3-r2
new file mode 100644
index 000000000000..d72ba2718bd7
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/libreswan-4.3-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DESCRIPTION=IPsec implementation for Linux, fork of Openswan
+EAPI=7
+HOMEPAGE=https://libreswan.org/
+IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
+KEYWORDS=amd64 ~arm ~ppc x86
+LICENSE=GPL-2 BSD-4 RSA DES
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec ) virtual/tmpfiles
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.libreswan.org/libreswan-4.3.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fb47bd63b92333f7fb73e6253ce49056
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.4-r2 b/metadata/md5-cache/net-vpn/libreswan-4.4-r2
deleted file mode 100644
index 4385b6212b23..000000000000
--- a/metadata/md5-cache/net-vpn/libreswan-4.4-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
-DESCRIPTION=IPsec implementation for Linux, fork of Openswan
-EAPI=7
-HOMEPAGE=https://libreswan.org/
-IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.libreswan.org/libreswan-4.4.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2263fbe4d9dfb697af73f68566961043
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.4-r3 b/metadata/md5-cache/net-vpn/libreswan-4.4-r3
deleted file mode 100644
index f998b1c4e3e5..000000000000
--- a/metadata/md5-cache/net-vpn/libreswan-4.4-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
-DESCRIPTION=IPsec implementation for Linux, fork of Openswan
-EAPI=7
-HOMEPAGE=https://libreswan.org/
-IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.libreswan.org/libreswan-4.4.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6c1cd0adf74ac9045fc12423d2cdff6f
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.4-r4 b/metadata/md5-cache/net-vpn/libreswan-4.4-r4
new file mode 100644
index 000000000000..d5434debf87c
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/libreswan-4.4-r4
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DESCRIPTION=IPsec implementation for Linux, fork of Openswan
+EAPI=7
+HOMEPAGE=https://libreswan.org/
+IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 BSD-4 RSA DES
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec ) virtual/tmpfiles
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.libreswan.org/libreswan-4.4.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a13eb575b5b38ebe4c5aeb9a03ed3891
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.4-r5 b/metadata/md5-cache/net-vpn/libreswan-4.4-r5
new file mode 100644
index 000000000000..d4172d9aed89
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/libreswan-4.4-r5
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DESCRIPTION=IPsec implementation for Linux, fork of Openswan
+EAPI=7
+HOMEPAGE=https://libreswan.org/
+IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 BSD-4 RSA DES
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec ) virtual/tmpfiles
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.libreswan.org/libreswan-4.4.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=36395fc3be976df0e51822df9526c52d
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.5.2 b/metadata/md5-cache/net-vpn/openvpn-2.5.2
deleted file mode 100644
index e76cdeb0f3e9..000000000000
--- a/metadata/md5-cache/net-vpn/openvpn-2.5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( >=dev-libs/openssl-0.9.8:0= ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) test? ( dev-util/cmocka )
-DESCRIPTION=Robust and highly flexible tunneling application compatible with many OSes
-EAPI=7
-HOMEPAGE=https://openvpn.net/
-IUSE=down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl pam pkcs11 +plugins selinux systemd test userland_BSD kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( >=dev-libs/openssl-0.9.8:0= ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) acct-group/openvpn acct-user/openvpn selinux? ( sec-policy/selinux-openvpn )
-REQUIRED_USE=^^ ( openssl mbedtls ) pkcs11? ( !mbedtls ) !plugins? ( !pam !down-root ) inotify? ( plugins )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://build.openvpn.net/downloads/releases/openvpn-2.5.2.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9dc15ba13dd73d1ca6e86ad004f1a7b5
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.5.2-r2 b/metadata/md5-cache/net-vpn/openvpn-2.5.2-r2
new file mode 100644
index 000000000000..e550cb406d00
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/openvpn-2.5.2-r2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( >=dev-libs/openssl-0.9.8:0= ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) test? ( dev-util/cmocka )
+DESCRIPTION=Robust and highly flexible tunneling application compatible with many OSes
+EAPI=7
+HOMEPAGE=https://openvpn.net/
+IUSE=down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl pam pkcs11 +plugins selinux systemd test userland_BSD kernel_linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( >=dev-libs/openssl-0.9.8:0= ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) acct-group/openvpn acct-user/openvpn selinux? ( sec-policy/selinux-openvpn ) virtual/tmpfiles
+REQUIRED_USE=^^ ( openssl mbedtls ) pkcs11? ( !mbedtls ) !plugins? ( !pam !down-root ) inotify? ( plugins )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://build.openvpn.net/downloads/releases/openvpn-2.5.2.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0e5f724b909c8a312d2332d4ed01ca0d
diff --git a/metadata/md5-cache/net-vpn/openvpn-9999 b/metadata/md5-cache/net-vpn/openvpn-9999
index 47c14729a7d6..02eac1d864b3 100644
--- a/metadata/md5-cache/net-vpn/openvpn-9999
+++ b/metadata/md5-cache/net-vpn/openvpn-9999
@@ -7,9 +7,9 @@ HOMEPAGE=https://openvpn.net/
 IUSE=down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl pam pkcs11 +plugins selinux systemd test userland_BSD kernel_linux
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( >=dev-libs/openssl-0.9.8:0= ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) acct-group/openvpn acct-user/openvpn selinux? ( sec-policy/selinux-openvpn )
+RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( >=dev-libs/openssl-0.9.8:0= ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) acct-group/openvpn acct-user/openvpn selinux? ( sec-policy/selinux-openvpn ) virtual/tmpfiles
 REQUIRED_USE=^^ ( openssl mbedtls ) pkcs11? ( !mbedtls ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c5e1e1487361b8cc09144b2691c38742
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4c66c6d6b2d55da2c790d297f0d1337b
diff --git a/metadata/md5-cache/net-vpn/tailscale-1.10.0 b/metadata/md5-cache/net-vpn/tailscale-1.10.0
index c666a7554af1..6cc2fc5b1739 100644
--- a/metadata/md5-cache/net-vpn/tailscale-1.10.0
+++ b/metadata/md5-cache/net-vpn/tailscale-1.10.0
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/tailscale/tailscale/archive/v1.10.0.tar.gz -> tailscale-1.10.0.tar.gz mirror://goproxy//4d63.com/gochecknoglobals/@v/v0.0.0-20201008074935-acfc0b28355a.zip -> 4d63.com%2Fgochecknoglobals%2F@v%2Fv0.0.0-20201008074935-acfc0b28355a.zip mirror://goproxy//4d63.com/gochecknoglobals/@v/v0.0.0-20201008074935-acfc0b28355a.mod -> 4d63.com%2Fgochecknoglobals%2F@v%2Fv0.0.0-20201008074935-acfc0b28355a.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!djarvur/go-err113/@v/v0.0.0-20200511133814-5174e21577d5.mod -> github.com%2F!djarvur%2Fgo-err113%2F@v%2Fv0.0.0-20200511133814-5174e21577d5.mod mirror://goproxy//github.com/!djarvur/go-err113/@v/v0.1.0.zip -> github.com%2F!djarvur%2Fgo-err113%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!djarvur/go-err113/@v/v0.1.0.mod -> github.com%2F!djarvur%2Fgo-err113%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.0.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.1.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.1.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.1.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.1.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.zip -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.zip mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!open!pee!dee!p/depguard/@v/v1.0.1.zip -> github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!open!pee!dee!p/depguard/@v/v1.0.1.mod -> github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/alcortesm/tgz/@v/v0.0.0-20161220082320-9c5fe88206d7.zip -> github.com%2Falcortesm%2Ftgz%2F@v%2Fv0.0.0-20161220082320-9c5fe88206d7.zip mirror://goproxy//github.com/alcortesm/tgz/@v/v0.0.0-20161220082320-9c5fe88206d7.mod -> github.com%2Falcortesm%2Ftgz%2F@v%2Fv0.0.0-20161220082320-9c5fe88206d7.mod mirror://goproxy//github.com/alecthomas/kingpin/@v/v2.2.6+incompatible.mod -> github.com%2Falecthomas%2Fkingpin%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20210105120005-909beea2cc74.zip -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20210105120005-909beea2cc74.zip mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20210105120005-909beea2cc74.mod -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20210105120005-909beea2cc74.mod mirror://goproxy//github.com/andybalholm/brotli/@v/v1.0.0.mod -> github.com%2Fandybalholm%2Fbrotli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20200514113438-38f4b401e2be.zip -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20200514113438-38f4b401e2be.zip mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20200514113438-38f4b401e2be.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20200514113438-38f4b401e2be.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.52.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.52.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.52.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.52.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.mod mirror://goproxy//github.com/bombsimon/wsl/v3/@v/v3.1.0.zip -> github.com%2Fbombsimon%2Fwsl%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/bombsimon/wsl/v3/@v/v3.1.0.mod -> github.com%2Fbombsimon%2Fwsl%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.zip -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.zip mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.mod -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.6.0.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.6.0.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/daixiang0/gci/@v/v0.2.4.mod -> github.com%2Fdaixiang0%2Fgci%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/daixiang0/gci/@v/v0.2.7.zip -> github.com%2Fdaixiang0%2Fgci%2F@v%2Fv0.2.7.zip mirror://goproxy//github.com/daixiang0/gci/@v/v0.2.7.mod -> github.com%2Fdaixiang0%2Fgci%2F@v%2Fv0.2.7.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denis-tingajkin/go-header/@v/v0.3.1.zip -> github.com%2Fdenis-tingajkin%2Fgo-header%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/denis-tingajkin/go-header/@v/v0.3.1.mod -> github.com%2Fdenis-tingajkin%2Fgo-header%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dvyukov/go-fuzz/@v/v0.0.0-20210103155950-6a8e9d1f2415.mod -> github.com%2Fdvyukov%2Fgo-fuzz%2F@v%2Fv0.0.0-20210103155950-6a8e9d1f2415.mod mirror://goproxy//github.com/emirpasic/gods/@v/v1.12.0.zip -> github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/emirpasic/gods/@v/v1.12.0.mod -> github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.10.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.10.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.13.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.13.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/github/fakeca/@v/v0.1.0.zip -> github.com%2Fgithub%2Ffakeca%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/github/fakeca/@v/v0.1.0.mod -> github.com%2Fgithub%2Ffakeca%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.3.2.zip -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.3.2.zip mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.3.2.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/go-critic/go-critic/@v/v0.5.2.zip -> github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/go-critic/go-critic/@v/v0.5.2.mod -> github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/go-git/gcfg/@v/v1.5.0.zip -> github.com%2Fgo-git%2Fgcfg%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-git/gcfg/@v/v1.5.0.mod -> github.com%2Fgo-git%2Fgcfg%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-git/go-billy/v5/@v/v5.0.0.zip -> github.com%2Fgo-git%2Fgo-billy%2Fv5%2F@v%2Fv5.0.0.zip mirror://goproxy//github.com/go-git/go-billy/v5/@v/v5.0.0.mod -> github.com%2Fgo-git%2Fgo-billy%2Fv5%2F@v%2Fv5.0.0.mod mirror://goproxy//github.com/go-git/go-git-fixtures/v4/@v/v4.0.2-0.20200613231340-f56387b50c12.zip -> github.com%2Fgo-git%2Fgo-git-fixtures%2Fv4%2F@v%2Fv4.0.2-0.20200613231340-f56387b50c12.zip mirror://goproxy//github.com/go-git/go-git-fixtures/v4/@v/v4.0.2-0.20200613231340-f56387b50c12.mod -> github.com%2Fgo-git%2Fgo-git-fixtures%2Fv4%2F@v%2Fv4.0.2-0.20200613231340-f56387b50c12.mod mirror://goproxy//github.com/go-git/go-git/v5/@v/v5.2.0.zip -> github.com%2Fgo-git%2Fgo-git%2Fv5%2F@v%2Fv5.2.0.zip mirror://goproxy//github.com/go-git/go-git/v5/@v/v5.2.0.mod -> github.com%2Fgo-git%2Fgo-git%2Fv5%2F@v%2Fv5.2.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.zip -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.mod -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-toolsmith/astcast/@v/v1.0.0.zip -> github.com%2Fgo-toolsmith%2Fastcast%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/go-toolsmith/astcast/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcast%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astcopy/@v/v1.0.0.zip -> github.com%2Fgo-toolsmith%2Fastcopy%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/go-toolsmith/astcopy/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcopy%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v1.0.0.zip -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/go-toolsmith/astequal/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v1.0.0.zip -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astinfo/@v/v0.0.0-20180906194353-9809ff7efb21.mod -> github.com%2Fgo-toolsmith%2Fastinfo%2F@v%2Fv0.0.0-20180906194353-9809ff7efb21.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v1.0.0.zip -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/go-toolsmith/astp/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v1.0.0.zip -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/strparse/@v/v1.0.0.zip -> github.com%2Fgo-toolsmith%2Fstrparse%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/go-toolsmith/strparse/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fstrparse%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/typep/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/typep/@v/v1.0.2.zip -> github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-toolsmith/typep/@v/v1.0.2.mod -> github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-xmlfmt/xmlfmt/@v/v0.0.0-20191208150333-d5b6f63a941b.zip -> github.com%2Fgo-xmlfmt%2Fxmlfmt%2F@v%2Fv0.0.0-20191208150333-d5b6f63a941b.zip mirror://goproxy//github.com/go-xmlfmt/xmlfmt/@v/v0.0.0-20191208150333-d5b6f63a941b.mod -> github.com%2Fgo-xmlfmt%2Fxmlfmt%2F@v%2Fv0.0.0-20191208150333-d5b6f63a941b.mod mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.zip -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.8.0.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.8.0.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/golangci/check/@v/v0.0.0-20180506172741-cfe4005ccda2.zip -> github.com%2Fgolangci%2Fcheck%2F@v%2Fv0.0.0-20180506172741-cfe4005ccda2.zip mirror://goproxy//github.com/golangci/check/@v/v0.0.0-20180506172741-cfe4005ccda2.mod -> github.com%2Fgolangci%2Fcheck%2F@v%2Fv0.0.0-20180506172741-cfe4005ccda2.mod mirror://goproxy//github.com/golangci/dupl/@v/v0.0.0-20180902072040-3e9179ac440a.zip -> github.com%2Fgolangci%2Fdupl%2F@v%2Fv0.0.0-20180902072040-3e9179ac440a.zip mirror://goproxy//github.com/golangci/dupl/@v/v0.0.0-20180902072040-3e9179ac440a.mod -> github.com%2Fgolangci%2Fdupl%2F@v%2Fv0.0.0-20180902072040-3e9179ac440a.mod mirror://goproxy//github.com/golangci/errcheck/@v/v0.0.0-20181223084120-ef45e06d44b6.zip -> github.com%2Fgolangci%2Ferrcheck%2F@v%2Fv0.0.0-20181223084120-ef45e06d44b6.zip mirror://goproxy//github.com/golangci/errcheck/@v/v0.0.0-20181223084120-ef45e06d44b6.mod -> github.com%2Fgolangci%2Ferrcheck%2F@v%2Fv0.0.0-20181223084120-ef45e06d44b6.mod mirror://goproxy//github.com/golangci/go-misc/@v/v0.0.0-20180628070357-927a3d87b613.zip -> github.com%2Fgolangci%2Fgo-misc%2F@v%2Fv0.0.0-20180628070357-927a3d87b613.zip mirror://goproxy//github.com/golangci/go-misc/@v/v0.0.0-20180628070357-927a3d87b613.mod -> github.com%2Fgolangci%2Fgo-misc%2F@v%2Fv0.0.0-20180628070357-927a3d87b613.mod mirror://goproxy//github.com/golangci/gocyclo/@v/v0.0.0-20180528144436-0a533e8fa43d.zip -> github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528144436-0a533e8fa43d.zip mirror://goproxy//github.com/golangci/gocyclo/@v/v0.0.0-20180528144436-0a533e8fa43d.mod -> github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528144436-0a533e8fa43d.mod mirror://goproxy//github.com/golangci/gofmt/@v/v0.0.0-20190930125516-244bba706f1a.zip -> github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20190930125516-244bba706f1a.zip mirror://goproxy//github.com/golangci/gofmt/@v/v0.0.0-20190930125516-244bba706f1a.mod -> github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20190930125516-244bba706f1a.mod mirror://goproxy//github.com/golangci/golangci-lint/@v/v1.33.0.zip -> github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.33.0.zip mirror://goproxy//github.com/golangci/golangci-lint/@v/v1.33.0.mod -> github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.33.0.mod mirror://goproxy//github.com/golangci/ineffassign/@v/v0.0.0-20190609212857-42439a7714cc.zip -> github.com%2Fgolangci%2Fineffassign%2F@v%2Fv0.0.0-20190609212857-42439a7714cc.zip mirror://goproxy//github.com/golangci/ineffassign/@v/v0.0.0-20190609212857-42439a7714cc.mod -> github.com%2Fgolangci%2Fineffassign%2F@v%2Fv0.0.0-20190609212857-42439a7714cc.mod mirror://goproxy//github.com/golangci/lint-1/@v/v0.0.0-20191013205115-297bf364a8e0.zip -> github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20191013205115-297bf364a8e0.zip mirror://goproxy//github.com/golangci/lint-1/@v/v0.0.0-20191013205115-297bf364a8e0.mod -> github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20191013205115-297bf364a8e0.mod mirror://goproxy//github.com/golangci/maligned/@v/v0.0.0-20180506175553-b1d89398deca.zip -> github.com%2Fgolangci%2Fmaligned%2F@v%2Fv0.0.0-20180506175553-b1d89398deca.zip mirror://goproxy//github.com/golangci/maligned/@v/v0.0.0-20180506175553-b1d89398deca.mod -> github.com%2Fgolangci%2Fmaligned%2F@v%2Fv0.0.0-20180506175553-b1d89398deca.mod mirror://goproxy//github.com/golangci/misspell/@v/v0.0.0-20180809174111-950f5d19e770.mod -> github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.0.0-20180809174111-950f5d19e770.mod mirror://goproxy//github.com/golangci/misspell/@v/v0.3.5.zip -> github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.3.5.zip mirror://goproxy//github.com/golangci/misspell/@v/v0.3.5.mod -> github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/golangci/prealloc/@v/v0.0.0-20180630174525-215b22d4de21.zip -> github.com%2Fgolangci%2Fprealloc%2F@v%2Fv0.0.0-20180630174525-215b22d4de21.zip mirror://goproxy//github.com/golangci/prealloc/@v/v0.0.0-20180630174525-215b22d4de21.mod -> github.com%2Fgolangci%2Fprealloc%2F@v%2Fv0.0.0-20180630174525-215b22d4de21.mod mirror://goproxy//github.com/golangci/revgrep/@v/v0.0.0-20180526074752-d9c87f5ffaf0.mod -> github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180526074752-d9c87f5ffaf0.mod mirror://goproxy//github.com/golangci/revgrep/@v/v0.0.0-20180812185044-276a5c0a1039.zip -> github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180812185044-276a5c0a1039.zip mirror://goproxy//github.com/golangci/revgrep/@v/v0.0.0-20180812185044-276a5c0a1039.mod -> github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180812185044-276a5c0a1039.mod mirror://goproxy//github.com/golangci/unconvert/@v/v0.0.0-20180507085042-28b1c447d1f4.zip -> github.com%2Fgolangci%2Funconvert%2F@v%2Fv0.0.0-20180507085042-28b1c447d1f4.zip mirror://goproxy//github.com/golangci/unconvert/@v/v0.0.0-20180507085042-28b1c447d1f4.mod -> github.com%2Fgolangci%2Funconvert%2F@v%2Fv0.0.0-20180507085042-28b1c447d1f4.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/btree/@v/v1.0.1.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/google/btree/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/google/goexpect/@v/v0.0.0-20210430020637-ab937bf7fd6f.zip -> github.com%2Fgoogle%2Fgoexpect%2F@v%2Fv0.0.0-20210430020637-ab937bf7fd6f.zip mirror://goproxy//github.com/google/goexpect/@v/v0.0.0-20210430020637-ab937bf7fd6f.mod -> github.com%2Fgoogle%2Fgoexpect%2F@v%2Fv0.0.0-20210430020637-ab937bf7fd6f.mod mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.zip -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.zip mirror://goproxy//github.com/google/goterm/@v/v0.0.0-20190703233501-fc88cf888a3f.mod -> github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20201206194719-59e495f2b7e1.zip -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20201206194719-59e495f2b7e1.zip mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20201206194719-59e495f2b7e1.mod -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20201206194719-59e495f2b7e1.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gookit/color/@v/v1.3.1.mod -> github.com%2Fgookit%2Fcolor%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/goreleaser/chglog/@v/v0.1.2.zip -> github.com%2Fgoreleaser%2Fchglog%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/goreleaser/chglog/@v/v0.1.2.mod -> github.com%2Fgoreleaser%2Fchglog%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/goreleaser/fileglob/@v/v0.3.1.zip -> github.com%2Fgoreleaser%2Ffileglob%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/goreleaser/fileglob/@v/v0.3.1.mod -> github.com%2Fgoreleaser%2Ffileglob%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.10.3.zip -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.10.3.mod -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.0.0-20190318220348-4088753ea4d3.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.0-20190318220348-4088753ea4d3.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.0.3.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.1.0.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.6.1.zip -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.6.1.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/gostaticanalysis/comment/@v/v1.3.0.mod -> github.com%2Fgostaticanalysis%2Fcomment%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gostaticanalysis/comment/@v/v1.4.1.zip -> github.com%2Fgostaticanalysis%2Fcomment%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gostaticanalysis/comment/@v/v1.4.1.mod -> github.com%2Fgostaticanalysis%2Fcomment%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.9.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.zip -> github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.zip mirror://goproxy//github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.mod -> github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jgautheron/goconst/@v/v0.0.0-20201117150253-ccae5bf973f3.zip -> github.com%2Fjgautheron%2Fgoconst%2F@v%2Fv0.0.0-20201117150253-ccae5bf973f3.zip mirror://goproxy//github.com/jgautheron/goconst/@v/v0.0.0-20201117150253-ccae5bf973f3.mod -> github.com%2Fjgautheron%2Fgoconst%2F@v%2Fv0.0.0-20201117150253-ccae5bf973f3.mod mirror://goproxy//github.com/jingyugao/rowserrcheck/@v/v0.0.0-20191204022205-72ab7603b68a.zip -> github.com%2Fjingyugao%2Frowserrcheck%2F@v%2Fv0.0.0-20191204022205-72ab7603b68a.zip mirror://goproxy//github.com/jingyugao/rowserrcheck/@v/v0.0.0-20191204022205-72ab7603b68a.mod -> github.com%2Fjingyugao%2Frowserrcheck%2F@v%2Fv0.0.0-20191204022205-72ab7603b68a.mod mirror://goproxy//github.com/jirfag/go-printf-func-name/@v/v0.0.0-20191110105641-45db9963cdd3.mod -> github.com%2Fjirfag%2Fgo-printf-func-name%2F@v%2Fv0.0.0-20191110105641-45db9963cdd3.mod mirror://goproxy//github.com/jirfag/go-printf-func-name/@v/v0.0.0-20200119135958-7558a9eaa5af.zip -> github.com%2Fjirfag%2Fgo-printf-func-name%2F@v%2Fv0.0.0-20200119135958-7558a9eaa5af.zip mirror://goproxy//github.com/jirfag/go-printf-func-name/@v/v0.0.0-20200119135958-7558a9eaa5af.mod -> github.com%2Fjirfag%2Fgo-printf-func-name%2F@v%2Fv0.0.0-20200119135958-7558a9eaa5af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.0.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/josharian/native/@v/v0.0.0-20200817173448-b6b71def0850.zip -> github.com%2Fjosharian%2Fnative%2F@v%2Fv0.0.0-20200817173448-b6b71def0850.zip mirror://goproxy//github.com/josharian/native/@v/v0.0.0-20200817173448-b6b71def0850.mod -> github.com%2Fjosharian%2Fnative%2F@v%2Fv0.0.0-20200817173448-b6b71def0850.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201009170750-9c6f07d100c1.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201216134343-bde56ed16391.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201216134343-bde56ed16391.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201220180245-69540ac93943.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201220180245-69540ac93943.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210122163228-8d122574c736.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210122163228-8d122574c736.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210212075122-66c871082f2b.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210212075122-66c871082f2b.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210525051524-4cc836578190.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210525051524-4cc836578190.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210525051524-4cc836578190.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210525051524-4cc836578190.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kevinburke/ssh_config/@v/v0.0.0-20190725054713-01f96b0aa0cd.mod -> github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20190725054713-01f96b0aa0cd.mod mirror://goproxy//github.com/kevinburke/ssh_config/@v/v0.0.0-20201106050909-4977a11b4351.zip -> github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20201106050909-4977a11b4351.zip mirror://goproxy//github.com/kevinburke/ssh_config/@v/v0.0.0-20201106050909-4977a11b4351.mod -> github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20201106050909-4977a11b4351.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.zip -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.10.7.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.7.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.0.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.12.2.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.12.2.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/fs/@v/v0.1.0.zip -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kunwardeep/paralleltest/@v/v1.0.2.zip -> github.com%2Fkunwardeep%2Fparalleltest%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/kunwardeep/paralleltest/@v/v1.0.2.mod -> github.com%2Fkunwardeep%2Fparalleltest%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kyoh86/exportloopref/@v/v0.1.8.zip -> github.com%2Fkyoh86%2Fexportloopref%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/kyoh86/exportloopref/@v/v0.1.8.mod -> github.com%2Fkyoh86%2Fexportloopref%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/logrusorgru/aurora/@v/v0.0.0-20181002194514-a7b3b318ed4e.mod -> github.com%2Flogrusorgru%2Faurora%2F@v%2Fv0.0.0-20181002194514-a7b3b318ed4e.mod mirror://goproxy//github.com/lxn/walk/@v/v0.0.0-20210112085537-c389da54e794.mod -> github.com%2Flxn%2Fwalk%2F@v%2Fv0.0.0-20210112085537-c389da54e794.mod mirror://goproxy//github.com/lxn/win/@v/v0.0.0-20210218163916-a377121e959e.mod -> github.com%2Flxn%2Fwin%2F@v%2Fv0.0.0-20210218163916-a377121e959e.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.4.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.4.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.4.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.4.mod mirror://goproxy//github.com/maratori/testpackage/@v/v1.0.1.zip -> github.com%2Fmaratori%2Ftestpackage%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/maratori/testpackage/@v/v1.0.1.mod -> github.com%2Fmaratori%2Ftestpackage%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matoous/godox/@v/v0.0.0-20190911065817-5d6d842e92eb.mod -> github.com%2Fmatoous%2Fgodox%2F@v%2Fv0.0.0-20190911065817-5d6d842e92eb.mod mirror://goproxy//github.com/matoous/godox/@v/v0.0.0-20200801072554-4fb83dc2941e.zip -> github.com%2Fmatoous%2Fgodox%2F@v%2Fv0.0.0-20200801072554-4fb83dc2941e.zip mirror://goproxy//github.com/matoous/godox/@v/v0.0.0-20200801072554-4fb83dc2941e.mod -> github.com%2Fmatoous%2Fgodox%2F@v%2Fv0.0.0-20200801072554-4fb83dc2941e.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/mattn/goveralls/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mbilski/exhaustivestruct/@v/v1.1.0.zip -> github.com%2Fmbilski%2Fexhaustivestruct%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mbilski/exhaustivestruct/@v/v1.1.0.mod -> github.com%2Fmbilski%2Fexhaustivestruct%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/ethtool/@v/v0.0.0-20210210192532-2b88debcdd43.zip -> github.com%2Fmdlayher%2Fethtool%2F@v%2Fv0.0.0-20210210192532-2b88debcdd43.zip mirror://goproxy//github.com/mdlayher/ethtool/@v/v0.0.0-20210210192532-2b88debcdd43.mod -> github.com%2Fmdlayher%2Fethtool%2F@v%2Fv0.0.0-20210210192532-2b88debcdd43.mod mirror://goproxy//github.com/mdlayher/genetlink/@v/v1.0.0.zip -> github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mdlayher/genetlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.2-0.20210123213345-5cc92139ae3e.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.2-0.20210123213345-5cc92139ae3e.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.3.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.4.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.4.1.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.4.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/mdlayher/sdnotify/@v/v0.0.0-20210228150836-ea3ec207d697.zip -> github.com%2Fmdlayher%2Fsdnotify%2F@v%2Fv0.0.0-20210228150836-ea3ec207d697.zip mirror://goproxy//github.com/mdlayher/sdnotify/@v/v0.0.0-20210228150836-ea3ec207d697.mod -> github.com%2Fmdlayher%2Fsdnotify%2F@v%2Fv0.0.0-20210228150836-ea3ec207d697.mod mirror://goproxy//github.com/mdlayher/socket/@v/v0.0.0-20210307095302-262dc9984e00.zip -> github.com%2Fmdlayher%2Fsocket%2F@v%2Fv0.0.0-20210307095302-262dc9984e00.zip mirror://goproxy//github.com/mdlayher/socket/@v/v0.0.0-20210307095302-262dc9984e00.mod -> github.com%2Fmdlayher%2Fsocket%2F@v%2Fv0.0.0-20210307095302-262dc9984e00.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.42.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.42.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.42.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.42.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.0.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.0.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moricho/tparallel/@v/v0.2.1.zip -> github.com%2Fmoricho%2Ftparallel%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/moricho/tparallel/@v/v0.2.1.mod -> github.com%2Fmoricho%2Ftparallel%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/mozilla/tls-observatory/@v/v0.0.0-20200317151703-4fa42e1c2dee.mod -> github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20200317151703-4fa42e1c2dee.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/nakabonne/nestif/@v/v0.3.0.zip -> github.com%2Fnakabonne%2Fnestif%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/nakabonne/nestif/@v/v0.3.0.mod -> github.com%2Fnakabonne%2Fnestif%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20180912185939-ae427f1e4c1d.zip -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.zip mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20180912185939-ae427f1e4c1d.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nishanths/exhaustive/@v/v0.1.0.zip -> github.com%2Fnishanths%2Fexhaustive%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/nishanths/exhaustive/@v/v0.1.0.mod -> github.com%2Fnishanths%2Fexhaustive%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.1.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.1.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.2.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.2.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.2.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.2.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.zip -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.zip mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/getopt/@v/v1.1.0.zip -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/pborman/getopt/@v/v1.1.0.mod -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.6.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.1.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.1.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.zip -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.mod -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/peterbourgon/ff/v3/@v/v3.0.0.mod -> github.com%2Fpeterbourgon%2Fff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/phayes/checkstyle/@v/v0.0.0-20170904204023-bfd46e6a821d.zip -> github.com%2Fphayes%2Fcheckstyle%2F@v%2Fv0.0.0-20170904204023-bfd46e6a821d.zip mirror://goproxy//github.com/phayes/checkstyle/@v/v0.0.0-20170904204023-bfd46e6a821d.mod -> github.com%2Fphayes%2Fcheckstyle%2F@v%2Fv0.0.0-20170904204023-bfd46e6a821d.mod mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.zip -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.zip mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.mod -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.10.1.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.13.0.zip -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/pkg/sftp/@v/v1.13.0.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/polyfloyd/go-errorlint/@v/v0.0.0-20201006195004-351e25ade6e3.mod -> github.com%2Fpolyfloyd%2Fgo-errorlint%2F@v%2Fv0.0.0-20201006195004-351e25ade6e3.mod mirror://goproxy//github.com/polyfloyd/go-errorlint/@v/v0.0.0-20201127212506-19bd8db6546f.zip -> github.com%2Fpolyfloyd%2Fgo-errorlint%2F@v%2Fv0.0.0-20201127212506-19bd8db6546f.zip mirror://goproxy//github.com/polyfloyd/go-errorlint/@v/v0.0.0-20201127212506-19bd8db6546f.mod -> github.com%2Fpolyfloyd%2Fgo-errorlint%2F@v%2Fv0.0.0-20201127212506-19bd8db6546f.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/quasilyte/go-consistent/@v/v0.0.0-20190521200055-c6f3937de18c.mod -> github.com%2Fquasilyte%2Fgo-consistent%2F@v%2Fv0.0.0-20190521200055-c6f3937de18c.mod mirror://goproxy//github.com/quasilyte/go-ruleguard/@v/v0.2.0.mod -> github.com%2Fquasilyte%2Fgo-ruleguard%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/quasilyte/go-ruleguard/@v/v0.2.1.zip -> github.com%2Fquasilyte%2Fgo-ruleguard%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/quasilyte/go-ruleguard/@v/v0.2.1.mod -> github.com%2Fquasilyte%2Fgo-ruleguard%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/quasilyte/regex/syntax/@v/v0.0.0-20200407221936-30656e2c4a95.mod -> github.com%2Fquasilyte%2Fregex%2Fsyntax%2F@v%2Fv0.0.0-20200407221936-30656e2c4a95.mod mirror://goproxy//github.com/quasilyte/regex/syntax/@v/v0.0.0-20200805063351-8f842688393c.zip -> github.com%2Fquasilyte%2Fregex%2Fsyntax%2F@v%2Fv0.0.0-20200805063351-8f842688393c.zip mirror://goproxy//github.com/quasilyte/regex/syntax/@v/v0.0.0-20200805063351-8f842688393c.mod -> github.com%2Fquasilyte%2Fregex%2Fsyntax%2F@v%2Fv0.0.0-20200805063351-8f842688393c.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.5.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.1.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryancurrah/gomodguard/@v/v1.1.0.zip -> github.com%2Fryancurrah%2Fgomodguard%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/ryancurrah/gomodguard/@v/v1.1.0.mod -> github.com%2Fryancurrah%2Fgomodguard%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/ryanrolds/sqlclosecheck/@v/v0.3.0.zip -> github.com%2Fryanrolds%2Fsqlclosecheck%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/ryanrolds/sqlclosecheck/@v/v0.3.0.mod -> github.com%2Fryanrolds%2Fsqlclosecheck%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.zip -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.zip mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.mod -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/securego/gosec/v2/@v/v2.5.0.zip -> github.com%2Fsecurego%2Fgosec%2Fv2%2F@v%2Fv2.5.0.zip mirror://goproxy//github.com/securego/gosec/v2/@v/v2.5.0.mod -> github.com%2Fsecurego%2Fgosec%2Fv2%2F@v%2Fv2.5.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shazow/go-diff/@v/v0.0.0-20160112020656-b6b7b6733b8c.zip -> github.com%2Fshazow%2Fgo-diff%2F@v%2Fv0.0.0-20160112020656-b6b7b6733b8c.zip mirror://goproxy//github.com/shazow/go-diff/@v/v0.0.0-20160112020656-b6b7b6733b8c.mod -> github.com%2Fshazow%2Fgo-diff%2F@v%2Fv0.0.0-20160112020656-b6b7b6733b8c.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20190901111213-e4ec7b275ada.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20190901111213-e4ec7b275ada.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sonatard/noctx/@v/v0.0.1.zip -> github.com%2Fsonatard%2Fnoctx%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/sonatard/noctx/@v/v0.0.1.mod -> github.com%2Fsonatard%2Fnoctx%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/sourcegraph/go-diff/@v/v0.6.1.zip -> github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/sourcegraph/go-diff/@v/v0.6.1.mod -> github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.4.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.5.1.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/spf13/afero/@v/v1.5.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.1.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/ssgreg/nlreturn/v2/@v/v2.1.0.zip -> github.com%2Fssgreg%2Fnlreturn%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/ssgreg/nlreturn/v2/@v/v2.1.0.mod -> github.com%2Fssgreg%2Fnlreturn%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.3.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.3.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tailscale/certstore/@v/v0.0.0-20210528134328-066c94b793d3.zip -> github.com%2Ftailscale%2Fcertstore%2F@v%2Fv0.0.0-20210528134328-066c94b793d3.zip mirror://goproxy//github.com/tailscale/certstore/@v/v0.0.0-20210528134328-066c94b793d3.mod -> github.com%2Ftailscale%2Fcertstore%2F@v%2Fv0.0.0-20210528134328-066c94b793d3.mod mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201214215404-77d1e9757027.zip -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201214215404-77d1e9757027.zip mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201214215404-77d1e9757027.mod -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201214215404-77d1e9757027.mod mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.zip -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.mod -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/tdakkota/asciicheck/@v/v0.0.0-20200416190851-d7f85be797a2.mod -> github.com%2Ftdakkota%2Fasciicheck%2F@v%2Fv0.0.0-20200416190851-d7f85be797a2.mod mirror://goproxy//github.com/tdakkota/asciicheck/@v/v0.0.0-20200416200610-e657995f937b.zip -> github.com%2Ftdakkota%2Fasciicheck%2F@v%2Fv0.0.0-20200416200610-e657995f937b.zip mirror://goproxy//github.com/tdakkota/asciicheck/@v/v0.0.0-20200416200610-e657995f937b.mod -> github.com%2Ftdakkota%2Fasciicheck%2F@v%2Fv0.0.0-20200416200610-e657995f937b.mod mirror://goproxy//github.com/tetafro/godot/@v/v1.3.0.mod -> github.com%2Ftetafro%2Fgodot%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/tetafro/godot/@v/v1.3.2.zip -> github.com%2Ftetafro%2Fgodot%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/tetafro/godot/@v/v1.3.2.mod -> github.com%2Ftetafro%2Fgodot%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20190930140734-f7f2e9bca95e.mod -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190930140734-f7f2e9bca95e.mod mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20200424151742-cb6215831a94.zip -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20200424151742-cb6215831a94.zip mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20200424151742-cb6215831a94.mod -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20200424151742-cb6215831a94.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tomarrell/wrapcheck/@v/v0.0.0-20200807122107-df9e8bcb914d.mod -> github.com%2Ftomarrell%2Fwrapcheck%2F@v%2Fv0.0.0-20200807122107-df9e8bcb914d.mod mirror://goproxy//github.com/tomarrell/wrapcheck/@v/v0.0.0-20201130113247-1683564d9756.zip -> github.com%2Ftomarrell%2Fwrapcheck%2F@v%2Fv0.0.0-20201130113247-1683564d9756.zip mirror://goproxy//github.com/tomarrell/wrapcheck/@v/v0.0.0-20201130113247-1683564d9756.mod -> github.com%2Ftomarrell%2Fwrapcheck%2F@v%2Fv0.0.0-20201130113247-1683564d9756.mod mirror://goproxy//github.com/tommy-muehle/go-mnd/@v/v1.3.1-0.20200224220436-e6f9a994e8fa.zip -> github.com%2Ftommy-muehle%2Fgo-mnd%2F@v%2Fv1.3.1-0.20200224220436-e6f9a994e8fa.zip mirror://goproxy//github.com/tommy-muehle/go-mnd/@v/v1.3.1-0.20200224220436-e6f9a994e8fa.mod -> github.com%2Ftommy-muehle%2Fgo-mnd%2F@v%2Fv1.3.1-0.20200224220436-e6f9a994e8fa.mod mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.zip -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.mod -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/ultraware/funlen/@v/v0.0.3.zip -> github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/ultraware/funlen/@v/v0.0.3.mod -> github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/ultraware/whitespace/@v/v0.0.4.zip -> github.com%2Fultraware%2Fwhitespace%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/ultraware/whitespace/@v/v0.0.4.mod -> github.com%2Fultraware%2Fwhitespace%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/uudashr/gocognit/@v/v1.0.1.zip -> github.com%2Fuudashr%2Fgocognit%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/uudashr/gocognit/@v/v1.0.1.mod -> github.com%2Fuudashr%2Fgocognit%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasthttp/@v/v1.16.0.mod -> github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.16.0.mod mirror://goproxy//github.com/valyala/quicktemplate/@v/v1.6.3.mod -> github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.6.3.mod mirror://goproxy//github.com/valyala/tcplisten/@v/v0.0.0-20161114210144-ceec8f93295a.mod -> github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.mod -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.3.0.zip -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.3.0.mod -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.zip -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/ziutek/telnet/@v/v0.0.0-20180329124119-c3b780dc415b.mod -> github.com%2Fziutek%2Ftelnet%2F@v%2Fv0.0.0-20180329124119-c3b780dc415b.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go4.org/intern/@v/v0.0.0-20210108033219-3eb7198706b2.zip -> go4.org%2Fintern%2F@v%2Fv0.0.0-20210108033219-3eb7198706b2.zip mirror://goproxy//go4.org/intern/@v/v0.0.0-20210108033219-3eb7198706b2.mod -> go4.org%2Fintern%2F@v%2Fv0.0.0-20210108033219-3eb7198706b2.mod mirror://goproxy//go4.org/mem/@v/v0.0.0-20201119185036-c04c5a6ff174.zip -> go4.org%2Fmem%2F@v%2Fv0.0.0-20201119185036-c04c5a6ff174.zip mirror://goproxy//go4.org/mem/@v/v0.0.0-20201119185036-c04c5a6ff174.mod -> go4.org%2Fmem%2F@v%2Fv0.0.0-20201119185036-c04c5a6ff174.mod mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222175341-b30ae309168e.mod -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222175341-b30ae309168e.mod mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222180813-1025295fd063.zip -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222180813-1025295fd063.zip mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222180813-1025295fd063.mod -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222180813-1025295fd063.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190219172222-a4c6cb3142f2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200302210943-78000ba7a073.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201208171446-5f87f3452ae9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201208171446-5f87f3452ae9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191007182048-72f939374954.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201010224723-4f7140c49acb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201216054612-986b41b23924.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210525063256-abc453219eb5.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210525063256-abc453219eb5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190221075227-b4e8571b14e0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190411185658-b44545bcd369.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201009025420-dfb3f7c4e634.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201018230417-eeed37f84f13.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201018230417-eeed37f84f13.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201109165425-215b40eba54c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201109165425-215b40eba54c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201118182958-a01c418693c7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201118182958-a01c418693c7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201207223542-d4d67f95c62d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201207223542-d4d67f95c62d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201218084310-7d0127a74742.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201218084310-7d0127a74742.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210110051926-789bb1bd4061.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210110051926-789bb1bd4061.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210123111255-9b0068b26619.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210123111255-9b0068b26619.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210216163648-f7da38b97c65.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210216163648-f7da38b97c65.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210301091718-77cc2087c03b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210301091718-77cc2087c03b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210309040221-94ec62e08169.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210309040221-94ec62e08169.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210403161142-5e06dd20ab57.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210525143221-35b2ab0089ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210525143221-35b2ab0089ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210616094352-59db8d763f22.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210616094352-59db8d763f22.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210503060354-a79de5458b56.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210503060354-a79de5458b56.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210503060354-a79de5458b56.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210503060354-a79de5458b56.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/text/@v/v0.3.7-0.20210524175448-3115f89c4b99.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7-0.20210524175448-3115f89c4b99.zip mirror://goproxy//golang.org/x/text/@v/v0.3.7-0.20210524175448-3115f89c4b99.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7-0.20210524175448-3115f89c4b99.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210611083556-38a9dc6acbc6.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210611083556-38a9dc6acbc6.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210611083556-38a9dc6acbc6.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210611083556-38a9dc6acbc6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190110163146-51295c7ec13a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190110163146-51295c7ec13a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190221204921-83362c3779f5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190221204921-83362c3779f5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190307163923-6a08e3108db3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190307163923-6a08e3108db3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311215038-5c2858a9cfe5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311215038-5c2858a9cfe5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190322203728-c1a832b0ad89.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190322203728-c1a832b0ad89.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190910044552-dd2b5c81c578.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190910044552-dd2b5c81c578.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117220505-0cba7a3a9ee9.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117220505-0cba7a3a9ee9.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200324003944-a576cf524670.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200324003944-a576cf524670.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200410194907-79a7a3126eef.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200410194907-79a7a3126eef.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200414032229-332987a829c3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200414032229-332987a829c3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200422022333-3d57cf2e726e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200422022333-3d57cf2e726e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200426102838-f3a5411a4c3b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200426102838-f3a5411a4c3b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200622203043-20e05c1c8ffa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200622203043-20e05c1c8ffa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200624225443-88f3c62a19ff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200624225443-88f3c62a19ff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200625211823-6506e20df31f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200625211823-6506e20df31f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200724022722-7017fd6b1305.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200724022722-7017fd6b1305.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200731060945-b5fad4ed8dd6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200731060945-b5fad4ed8dd6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200812195022-5ae4c3c160a0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200812195022-5ae4c3c160a0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200820010801-b793a1359eac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200820010801-b793a1359eac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200831203904-5a2aa26beb65.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200831203904-5a2aa26beb65.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201001104356-43ebab892c4c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201001104356-43ebab892c4c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201002184944-ecd9fd270d5d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201002184944-ecd9fd270d5d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201007032633-0806396f153e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201007032633-0806396f153e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201011145850-ed2f50202694.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201011145850-ed2f50202694.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201013201025-64a9e34f3752.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201013201025-64a9e34f3752.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201118003311-bd56c0adb394.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201118003311-bd56c0adb394.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201121010211-780cb80bd7fb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201121010211-780cb80bd7fb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201211185031-d93e913c1a58.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201211185031-d93e913c1a58.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.2.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.0-20210521230051-c27ff9b9f6f7.mod -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.0-20210521230051-c27ff9b9f6f7.mod mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.0-20210525143454-64cb82f2b3f5.zip -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.0-20210525143454-64cb82f2b3f5.zip mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.0-20210525143454-64cb82f2b3f5.mod -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.0-20210525143454-64cb82f2b3f5.mod mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.3.15-0.20210525143335-94c0476d63e3.zip -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.3.15-0.20210525143335-94c0476d63e3.zip mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.3.15-0.20210525143335-94c0476d63e3.mod -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.3.15-0.20210525143335-94c0476d63e3.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.zip -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.zip mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.6.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.6.mod mirror://goproxy//honnef.co/go/tools/@v/v0.1.4.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.1.4.zip mirror://goproxy//honnef.co/go/tools/@v/v0.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.1.4.mod mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20210515010201-ad03edc7c841.mod -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20210515010201-ad03edc7c841.mod mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20210602152128-50f8686885e3.zip -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20210602152128-50f8686885e3.zip mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20210602152128-50f8686885e3.mod -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20210602152128-50f8686885e3.mod mirror://goproxy//inet.af/netstack/@v/v0.0.0-20210622165351-29b14ebc044e.zip -> inet.af%2Fnetstack%2F@v%2Fv0.0.0-20210622165351-29b14ebc044e.zip mirror://goproxy//inet.af/netstack/@v/v0.0.0-20210622165351-29b14ebc044e.mod -> inet.af%2Fnetstack%2F@v%2Fv0.0.0-20210622165351-29b14ebc044e.mod mirror://goproxy//inet.af/peercred/@v/v0.0.0-20210318190834-4259e17bb763.zip -> inet.af%2Fpeercred%2F@v%2Fv0.0.0-20210318190834-4259e17bb763.zip mirror://goproxy//inet.af/peercred/@v/v0.0.0-20210318190834-4259e17bb763.mod -> inet.af%2Fpeercred%2F@v%2Fv0.0.0-20210318190834-4259e17bb763.mod mirror://goproxy//inet.af/wf/@v/v0.0.0-20210516214145-a5343001b756.zip -> inet.af%2Fwf%2F@v%2Fv0.0.0-20210516214145-a5343001b756.zip mirror://goproxy//inet.af/wf/@v/v0.0.0-20210516214145-a5343001b756.mod -> inet.af%2Fwf%2F@v%2Fv0.0.0-20210516214145-a5343001b756.mod mirror://goproxy//mvdan.cc/gofumpt/@v/v0.0.0-20200802201014-ab5a8192947d.mod -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.0.0-20200802201014-ab5a8192947d.mod mirror://goproxy//mvdan.cc/gofumpt/@v/v0.0.0-20201129102820-5c11c50e9475.zip -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.0.0-20201129102820-5c11c50e9475.zip mirror://goproxy//mvdan.cc/gofumpt/@v/v0.0.0-20201129102820-5c11c50e9475.mod -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.0.0-20201129102820-5c11c50e9475.mod mirror://goproxy//mvdan.cc/interfacer/@v/v0.0.0-20180901003855-c20040233aed.zip -> mvdan.cc%2Finterfacer%2F@v%2Fv0.0.0-20180901003855-c20040233aed.zip mirror://goproxy//mvdan.cc/interfacer/@v/v0.0.0-20180901003855-c20040233aed.mod -> mvdan.cc%2Finterfacer%2F@v%2Fv0.0.0-20180901003855-c20040233aed.mod mirror://goproxy//mvdan.cc/lint/@v/v0.0.0-20170908181259-adc824a0674b.zip -> mvdan.cc%2Flint%2F@v%2Fv0.0.0-20170908181259-adc824a0674b.zip mirror://goproxy//mvdan.cc/lint/@v/v0.0.0-20170908181259-adc824a0674b.mod -> mvdan.cc%2Flint%2F@v%2Fv0.0.0-20170908181259-adc824a0674b.mod mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20200501210554-b37ab49443f7.zip -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20200501210554-b37ab49443f7.zip mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20200501210554-b37ab49443f7.mod -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20200501210554-b37ab49443f7.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/goversion/@v/v1.2.0.zip -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.zip mirror://goproxy//rsc.io/goversion/@v/v1.2.0.mod -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.mod
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9dcc8fba52eed29eacb76bbd62f1e63b
+_md5_=5898203764517d27c5386e0ee13b9f71
diff --git a/metadata/md5-cache/net-vpn/tailscale-1.2.10-r1 b/metadata/md5-cache/net-vpn/tailscale-1.2.10-r1
index 0047963a719a..01d8b4a7172e 100644
--- a/metadata/md5-cache/net-vpn/tailscale-1.2.10-r1
+++ b/metadata/md5-cache/net-vpn/tailscale-1.2.10-r1
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/tailscale/tailscale/archive/v1.2.10.tar.gz -> tailscale-1.2.10.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//github.com/alecthomas/kingpin/@v/v2.2.6+incompatible.mod -> github.com%2Falecthomas%2Fkingpin%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20180613141037-e580b900e9f5.zip -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.zip mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20180613141037-e580b900e9f5.mod -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.zip -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.zip mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/apenwarr/fixconsole/@v/v0.0.0-20191012055117-5a9f6489cc29.zip -> github.com%2Fapenwarr%2Ffixconsole%2F@v%2Fv0.0.0-20191012055117-5a9f6489cc29.zip mirror://goproxy//github.com/apenwarr/fixconsole/@v/v0.0.0-20191012055117-5a9f6489cc29.mod -> github.com%2Fapenwarr%2Ffixconsole%2F@v%2Fv0.0.0-20191012055117-5a9f6489cc29.mod mirror://goproxy//github.com/apenwarr/w32/@v/v0.0.0-20190407065021-aa00fece76ab.zip -> github.com%2Fapenwarr%2Fw32%2F@v%2Fv0.0.0-20190407065021-aa00fece76ab.zip mirror://goproxy//github.com/apenwarr/w32/@v/v0.0.0-20190407065021-aa00fece76ab.mod -> github.com%2Fapenwarr%2Fw32%2F@v%2Fv0.0.0-20190407065021-aa00fece76ab.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.mod mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.zip -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.zip mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.mod -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.zip -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.zip -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.mod -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.zip -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.zip mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.mod -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.mod mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.1.10.zip -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.1.10.mod -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.10.10.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.10.10.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lxn/walk/@v/v0.0.0-20191128110447-55ccb3a9f5c1.mod -> github.com%2Flxn%2Fwalk%2F@v%2Fv0.0.0-20191128110447-55ccb3a9f5c1.mod mirror://goproxy//github.com/lxn/win/@v/v0.0.0-20191128105842-2da648fda5b4.mod -> github.com%2Flxn%2Fwin%2F@v%2Fv0.0.0-20191128105842-2da648fda5b4.mod mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.zip -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.zip mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20190409184431-ee0cd42419d3.zip -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.zip mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20190409184431-ee0cd42419d3.mod -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.6.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.zip -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.mod -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.zip -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.zip mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.mod -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.zip -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.zip mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.mod -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201003033024-5d95aab075be.zip -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201003033024-5d95aab075be.zip mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201003033024-5d95aab075be.mod -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201003033024-5d95aab075be.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20200921221757-11a958a67bdd.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20200921221757-11a958a67bdd.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20200921221757-11a958a67bdd.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20200921221757-11a958a67bdd.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20201008164108-2c83f43a9859.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201008164108-2c83f43a9859.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20201008164108-2c83f43a9859.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201008164108-2c83f43a9859.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20201021041318-a6168fd06b3f.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201021041318-a6168fd06b3f.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20201021041318-a6168fd06b3f.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201021041318-a6168fd06b3f.mod mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.zip -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.mod -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.zip -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.mod -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.zip -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go4.org/mem/@v/v0.0.0-20200706164138-185c595c3ecc.zip -> go4.org%2Fmem%2F@v%2Fv0.0.0-20200706164138-185c595c3ecc.zip mirror://goproxy//go4.org/mem/@v/v0.0.0-20200706164138-185c595c3ecc.mod -> go4.org%2Fmem%2F@v%2Fv0.0.0-20200706164138-185c595c3ecc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200429183012-4b2356b1ed79.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200429183012-4b2356b1ed79.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191003171128-d98b1b443823.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191003171128-d98b1b443823.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191007182048-72f939374954.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190411185658-b44545bcd369.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191003212358-c178f38b412c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191003212358-c178f38b412c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501145240-bc7a7d42d5c3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501145240-bc7a7d42d5c3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200812155832-6a926be9bd1d.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200812155832-6a926be9bd1d.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200812155832-6a926be9bd1d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200812155832-6a926be9bd1d.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201001230009-b5b87423c93b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201001230009-b5b87423c93b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201002184944-ecd9fd270d5d.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201002184944-ecd9fd270d5d.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201002184944-ecd9fd270d5d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201002184944-ecd9fd270d5d.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.20200321-0.20200715051853-507f148e1c42.zip -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20200715051853-507f148e1c42.zip mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.20200321-0.20200715051853-507f148e1c42.mod -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20200715051853-507f148e1c42.mod mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.1.2-0.20201004085714-dd60d0447f81.zip -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201004085714-dd60d0447f81.zip mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.1.2-0.20201004085714-dd60d0447f81.mod -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201004085714-dd60d0447f81.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20200810144936-56928fe48a98.zip -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20200810144936-56928fe48a98.zip mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20200810144936-56928fe48a98.mod -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20200810144936-56928fe48a98.mod mirror://goproxy//rsc.io/goversion/@v/v1.2.0.zip -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.zip mirror://goproxy//rsc.io/goversion/@v/v1.2.0.mod -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.mod
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=467539ca36989e2d65c808766daf3c1c
+_md5_=adcd1b20ff1aefed4d7a20393bf7f9e6
diff --git a/metadata/md5-cache/net-vpn/tailscale-1.4.0 b/metadata/md5-cache/net-vpn/tailscale-1.4.0
index 1721b24d50ec..51adeab6ce7b 100644
--- a/metadata/md5-cache/net-vpn/tailscale-1.4.0
+++ b/metadata/md5-cache/net-vpn/tailscale-1.4.0
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/tailscale/tailscale/archive/v1.4.0.tar.gz -> tailscale-1.4.0.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.1-0.20200122224058-0482b626c726.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.1-0.20200122224058-0482b626c726.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20200908182639-5b44b70ab3ab.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20200908182639-5b44b70ab3ab.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/alecthomas/kingpin/@v/v2.2.6+incompatible.mod -> github.com%2Falecthomas%2Fkingpin%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20180613141037-e580b900e9f5.zip -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.zip mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20180613141037-e580b900e9f5.mod -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.zip -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.zip mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/apenwarr/fixconsole/@v/v0.0.0-20191012055117-5a9f6489cc29.zip -> github.com%2Fapenwarr%2Ffixconsole%2F@v%2Fv0.0.0-20191012055117-5a9f6489cc29.zip mirror://goproxy//github.com/apenwarr/fixconsole/@v/v0.0.0-20191012055117-5a9f6489cc29.mod -> github.com%2Fapenwarr%2Ffixconsole%2F@v%2Fv0.0.0-20191012055117-5a9f6489cc29.mod mirror://goproxy//github.com/apenwarr/w32/@v/v0.0.0-20190407065021-aa00fece76ab.zip -> github.com%2Fapenwarr%2Fw32%2F@v%2Fv0.0.0-20190407065021-aa00fece76ab.zip mirror://goproxy//github.com/apenwarr/w32/@v/v0.0.0-20190407065021-aa00fece76ab.mod -> github.com%2Fapenwarr%2Fw32%2F@v%2Fv0.0.0-20190407065021-aa00fece76ab.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.mod mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.zip -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.zip mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.mod -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v1.1.1-0.20190506075156-2146c9339422.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv1.1.1-0.20190506075156-2146c9339422.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20201119153540-4cbc285b3327.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20201119153540-4cbc285b3327.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.9.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.9.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200928162600-f2cc35102c2a.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200928162600-f2cc35102c2a.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20191213151349-ff969a566b00.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20191213151349-ff969a566b00.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20200121165050-0be804eadb15.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20200121165050-0be804eadb15.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20200205145503-b45ef1f1f737.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20200205145503-b45ef1f1f737.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20191028175130-9e7d5ac5ea55.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20191028175130-9e7d5ac5ea55.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dpjacques/clockwork/@v/v0.1.1-0.20200827220843-c1f524b839be.mod -> github.com%2Fdpjacques%2Fclockwork%2F@v%2Fv0.1.1-0.20200827220843-c1f524b839be.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/dvyukov/go-fuzz/@v/v0.0.0-20201127111758-49e582c6c23d.mod -> github.com%2Fdvyukov%2Fgo-fuzz%2F@v%2Fv0.0.0-20201127111758-49e582c6c23d.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.zip -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.zip -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.mod -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.6.1-0.20180915234121-886344bea079.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.6.1-0.20180915234121-886344bea079.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3-0.20201020212313-ab46b8bd0abd.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3-0.20201020212313-ab46b8bd0abd.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.2-0.20191108005307-e555eab49ce8.mod -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.2-0.20191108005307-e555eab49ce8.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.zip -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.zip mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.mod -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.2-0.20190508160503-636abe8753b8.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.2-0.20190508160503-636abe8753b8.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.1.10.zip -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.1.10.mod -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201009170750-9c6f07d100c1.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201216134343-bde56ed16391.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201216134343-bde56ed16391.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201216134343-bde56ed16391.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201216134343-bde56ed16391.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.10.10.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.10.10.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.4-0.20190131011033-7dc38fb350b1.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4-0.20190131011033-7dc38fb350b1.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.4-0.20190131011033-7dc38fb350b1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4-0.20190131011033-7dc38fb350b1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lxn/walk/@v/v0.0.0-20201110160827-18ea5e372cdb.mod -> github.com%2Flxn%2Fwalk%2F@v%2Fv0.0.0-20201110160827-18ea5e372cdb.mod mirror://goproxy//github.com/lxn/win/@v/v0.0.0-20201111105847-2a20daff6a55.mod -> github.com%2Flxn%2Fwin%2F@v%2Fv0.0.0-20201111105847-2a20daff6a55.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattbaird/jsonpatch/@v/v0.0.0-20171005235357-81af80346b1a.mod -> github.com%2Fmattbaird%2Fjsonpatch%2F@v%2Fv0.0.0-20171005235357-81af80346b1a.mod mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.0.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/mdlayher/sdnotify/@v/v0.0.0-20200625151349-e4a4f32afc4a.zip -> github.com%2Fmdlayher%2Fsdnotify%2F@v%2Fv0.0.0-20200625151349-e4a4f32afc4a.zip mirror://goproxy//github.com/mdlayher/sdnotify/@v/v0.0.0-20200625151349-e4a4f32afc4a.mod -> github.com%2Fmdlayher%2Fsdnotify%2F@v%2Fv0.0.0-20200625151349-e4a4f32afc4a.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170308212314-bb9b5e7adda9.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170308212314-bb9b5e7adda9.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.zip -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.zip mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2-0.20181111125026-1722abf79c2f.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20181111125026-1722abf79c2f.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20190409184431-ee0cd42419d3.zip -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.zip mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20190409184431-ee0cd42419d3.mod -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.6.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.zip -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.mod -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.zip -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.zip mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.mod -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.zip -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.zip mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.mod -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201214215404-77d1e9757027.zip -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201214215404-77d1e9757027.zip mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201214215404-77d1e9757027.mod -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201214215404-77d1e9757027.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210109012254-dc30a1b9415e.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210109012254-dc30a1b9415e.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210109012254-dc30a1b9415e.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210109012254-dc30a1b9415e.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210113223737-a6213b5eaf98.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210113223737-a6213b5eaf98.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210113223737-a6213b5eaf98.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210113223737-a6213b5eaf98.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210114205708-a1377e83f551.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210114205708-a1377e83f551.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210114205708-a1377e83f551.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210114205708-a1377e83f551.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210116013233-4cd297ed5a7d.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210116013233-4cd297ed5a7d.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210116013233-4cd297ed5a7d.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210116013233-4cd297ed5a7d.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210120212909-7ad8a0443bd3.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210120212909-7ad8a0443bd3.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210120212909-7ad8a0443bd3.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210120212909-7ad8a0443bd3.mod mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.zip -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.mod -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.zip -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.mod -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.0.1-0.20190930145447-2ec5bdc52b86.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.1-0.20190930145447-2ec5bdc52b86.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.zip -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//go4.org/intern/@v/v0.0.0-20201223054237-ef8cbcb8edd7.zip -> go4.org%2Fintern%2F@v%2Fv0.0.0-20201223054237-ef8cbcb8edd7.zip mirror://goproxy//go4.org/intern/@v/v0.0.0-20201223054237-ef8cbcb8edd7.mod -> go4.org%2Fintern%2F@v%2Fv0.0.0-20201223054237-ef8cbcb8edd7.mod mirror://goproxy//go4.org/intern/@v/v0.0.0-20201223061701-969c7e87e7cb.zip -> go4.org%2Fintern%2F@v%2Fv0.0.0-20201223061701-969c7e87e7cb.zip mirror://goproxy//go4.org/intern/@v/v0.0.0-20201223061701-969c7e87e7cb.mod -> go4.org%2Fintern%2F@v%2Fv0.0.0-20201223061701-969c7e87e7cb.mod mirror://goproxy//go4.org/intern/@v/v0.0.0-20210101010959-7cab76ca296a.zip -> go4.org%2Fintern%2F@v%2Fv0.0.0-20210101010959-7cab76ca296a.zip mirror://goproxy//go4.org/intern/@v/v0.0.0-20210101010959-7cab76ca296a.mod -> go4.org%2Fintern%2F@v%2Fv0.0.0-20210101010959-7cab76ca296a.mod mirror://goproxy//go4.org/mem/@v/v0.0.0-20201119185036-c04c5a6ff174.zip -> go4.org%2Fmem%2F@v%2Fv0.0.0-20201119185036-c04c5a6ff174.zip mirror://goproxy//go4.org/mem/@v/v0.0.0-20201119185036-c04c5a6ff174.mod -> go4.org%2Fmem%2F@v%2Fv0.0.0-20201119185036-c04c5a6ff174.mod mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222175341-b30ae309168e.zip -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222175341-b30ae309168e.zip mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222175341-b30ae309168e.mod -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222175341-b30ae309168e.mod mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222180813-1025295fd063.zip -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222180813-1025295fd063.zip mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222180813-1025295fd063.mod -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222180813-1025295fd063.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201112155050-0c6587e931a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201112155050-0c6587e931a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201124201722-c8d3bf9c5392.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201124201722-c8d3bf9c5392.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201124201722-c8d3bf9c5392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201124201722-c8d3bf9c5392.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191007182048-72f939374954.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201010224723-4f7140c49acb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201216054612-986b41b23924.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201216054612-986b41b23924.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190411185658-b44545bcd369.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200217220822-9197077df867.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200217220822-9197077df867.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201009025420-dfb3f7c4e634.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201018230417-eeed37f84f13.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201018230417-eeed37f84f13.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201107080550-4d91cf3a1aaf.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201107080550-4d91cf3a1aaf.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201118182958-a01c418693c7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201118182958-a01c418693c7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201202213521-69691e467435.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201202213521-69691e467435.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201218084310-7d0127a74742.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201218084310-7d0127a74742.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201218084310-7d0127a74742.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201218084310-7d0127a74742.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201207232118-ee85cb95a76b.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201207232118-ee85cb95a76b.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201207232118-ee85cb95a76b.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201207232118-ee85cb95a76b.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200609164405-eb789aa7ce50.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200609164405-eb789aa7ce50.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201021000207-d49c4edd7d96.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201021000207-d49c4edd7d96.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201211185031-d93e913c1a58.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201211185031-d93e913c1a58.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201211185031-d93e913c1a58.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201211185031-d93e913c1a58.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.20200321-0.20201111175144-60b3766b89b9.zip -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20201111175144-60b3766b89b9.zip mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.20200321-0.20201111175144-60b3766b89b9.mod -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20201111175144-60b3766b89b9.mod mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.1.2-0.20201113162609-9b85be97fdf8.zip -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201113162609-9b85be97fdf8.zip mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.1.2-0.20201113162609-9b85be97fdf8.mod -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201113162609-9b85be97fdf8.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200117163144-32f20d992d24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.1-0.20201020201750-d3470999428b.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.1-0.20201020201750-d3470999428b.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.1-0.20201020201750-d3470999428b.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.1-0.20201020201750-d3470999428b.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gvisor.dev/gvisor/@v/v0.0.0-20210111185822-3ff3110fcdd6.zip -> gvisor.dev%2Fgvisor%2F@v%2Fv0.0.0-20210111185822-3ff3110fcdd6.zip mirror://goproxy//gvisor.dev/gvisor/@v/v0.0.0-20210111185822-3ff3110fcdd6.mod -> gvisor.dev%2Fgvisor%2F@v%2Fv0.0.0-20210111185822-3ff3110fcdd6.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.1.0.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//honnef.co/go/tools/@v/v0.1.0.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20201228234250-33d0a924ebbf.zip -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20201228234250-33d0a924ebbf.zip mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20201228234250-33d0a924ebbf.mod -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20201228234250-33d0a924ebbf.mod mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20210105212526-648fbc18a69d.zip -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20210105212526-648fbc18a69d.zip mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20210105212526-648fbc18a69d.mod -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20210105212526-648fbc18a69d.mod mirror://goproxy//k8s.io/api/@v/v0.16.13.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.13.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.13.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.13.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.14-rc.0.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.14-rc.0.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.13.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.13.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410163147-594e756bea31.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410163147-594e756bea31.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/goversion/@v/v1.2.0.zip -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.zip mirror://goproxy//rsc.io/goversion/@v/v1.2.0.mod -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9e9e85e46edcaa9fd9e911867c0de10e
+_md5_=0d06643b7da9cf0a75e6f8b2a04e5003
diff --git a/metadata/md5-cache/net-vpn/tailscale-1.4.1 b/metadata/md5-cache/net-vpn/tailscale-1.4.1
index fe52e2d73d49..a9614d9c13ed 100644
--- a/metadata/md5-cache/net-vpn/tailscale-1.4.1
+++ b/metadata/md5-cache/net-vpn/tailscale-1.4.1
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/tailscale/tailscale/archive/v1.4.1.tar.gz -> tailscale-1.4.1.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.1-0.20200122224058-0482b626c726.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.1-0.20200122224058-0482b626c726.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20200908182639-5b44b70ab3ab.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20200908182639-5b44b70ab3ab.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/alecthomas/kingpin/@v/v2.2.6+incompatible.mod -> github.com%2Falecthomas%2Fkingpin%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20180613141037-e580b900e9f5.zip -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.zip mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20180613141037-e580b900e9f5.mod -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.zip -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.zip mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/apenwarr/fixconsole/@v/v0.0.0-20191012055117-5a9f6489cc29.zip -> github.com%2Fapenwarr%2Ffixconsole%2F@v%2Fv0.0.0-20191012055117-5a9f6489cc29.zip mirror://goproxy//github.com/apenwarr/fixconsole/@v/v0.0.0-20191012055117-5a9f6489cc29.mod -> github.com%2Fapenwarr%2Ffixconsole%2F@v%2Fv0.0.0-20191012055117-5a9f6489cc29.mod mirror://goproxy//github.com/apenwarr/w32/@v/v0.0.0-20190407065021-aa00fece76ab.zip -> github.com%2Fapenwarr%2Fw32%2F@v%2Fv0.0.0-20190407065021-aa00fece76ab.zip mirror://goproxy//github.com/apenwarr/w32/@v/v0.0.0-20190407065021-aa00fece76ab.mod -> github.com%2Fapenwarr%2Fw32%2F@v%2Fv0.0.0-20190407065021-aa00fece76ab.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.mod mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.zip -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.zip mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.mod -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v1.1.1-0.20190506075156-2146c9339422.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv1.1.1-0.20190506075156-2146c9339422.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20201119153540-4cbc285b3327.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20201119153540-4cbc285b3327.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.9.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.9.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200928162600-f2cc35102c2a.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200928162600-f2cc35102c2a.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20191213151349-ff969a566b00.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20191213151349-ff969a566b00.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20200121165050-0be804eadb15.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20200121165050-0be804eadb15.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20200205145503-b45ef1f1f737.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20200205145503-b45ef1f1f737.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20191028175130-9e7d5ac5ea55.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20191028175130-9e7d5ac5ea55.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dpjacques/clockwork/@v/v0.1.1-0.20200827220843-c1f524b839be.mod -> github.com%2Fdpjacques%2Fclockwork%2F@v%2Fv0.1.1-0.20200827220843-c1f524b839be.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/dvyukov/go-fuzz/@v/v0.0.0-20201127111758-49e582c6c23d.mod -> github.com%2Fdvyukov%2Fgo-fuzz%2F@v%2Fv0.0.0-20201127111758-49e582c6c23d.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.zip -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.zip -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.mod -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.6.1-0.20180915234121-886344bea079.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.6.1-0.20180915234121-886344bea079.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3-0.20201020212313-ab46b8bd0abd.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3-0.20201020212313-ab46b8bd0abd.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.2-0.20191108005307-e555eab49ce8.mod -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.2-0.20191108005307-e555eab49ce8.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.zip -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.zip mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.mod -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.2-0.20190508160503-636abe8753b8.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.2-0.20190508160503-636abe8753b8.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.1.10.zip -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.1.10.mod -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201009170750-9c6f07d100c1.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201216134343-bde56ed16391.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201216134343-bde56ed16391.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201216134343-bde56ed16391.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201216134343-bde56ed16391.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.10.10.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.10.10.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.4-0.20190131011033-7dc38fb350b1.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4-0.20190131011033-7dc38fb350b1.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.4-0.20190131011033-7dc38fb350b1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4-0.20190131011033-7dc38fb350b1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lxn/walk/@v/v0.0.0-20201110160827-18ea5e372cdb.mod -> github.com%2Flxn%2Fwalk%2F@v%2Fv0.0.0-20201110160827-18ea5e372cdb.mod mirror://goproxy//github.com/lxn/win/@v/v0.0.0-20201111105847-2a20daff6a55.mod -> github.com%2Flxn%2Fwin%2F@v%2Fv0.0.0-20201111105847-2a20daff6a55.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattbaird/jsonpatch/@v/v0.0.0-20171005235357-81af80346b1a.mod -> github.com%2Fmattbaird%2Fjsonpatch%2F@v%2Fv0.0.0-20171005235357-81af80346b1a.mod mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.0.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/mdlayher/sdnotify/@v/v0.0.0-20200625151349-e4a4f32afc4a.zip -> github.com%2Fmdlayher%2Fsdnotify%2F@v%2Fv0.0.0-20200625151349-e4a4f32afc4a.zip mirror://goproxy//github.com/mdlayher/sdnotify/@v/v0.0.0-20200625151349-e4a4f32afc4a.mod -> github.com%2Fmdlayher%2Fsdnotify%2F@v%2Fv0.0.0-20200625151349-e4a4f32afc4a.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170308212314-bb9b5e7adda9.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170308212314-bb9b5e7adda9.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.zip -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.zip mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2-0.20181111125026-1722abf79c2f.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20181111125026-1722abf79c2f.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20190409184431-ee0cd42419d3.zip -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.zip mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20190409184431-ee0cd42419d3.mod -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.6.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.zip -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.mod -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.zip -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.zip mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.mod -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.zip -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.zip mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.mod -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201214215404-77d1e9757027.zip -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201214215404-77d1e9757027.zip mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201214215404-77d1e9757027.mod -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201214215404-77d1e9757027.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210109012254-dc30a1b9415e.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210109012254-dc30a1b9415e.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210109012254-dc30a1b9415e.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210109012254-dc30a1b9415e.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210113223737-a6213b5eaf98.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210113223737-a6213b5eaf98.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210113223737-a6213b5eaf98.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210113223737-a6213b5eaf98.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210114205708-a1377e83f551.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210114205708-a1377e83f551.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210114205708-a1377e83f551.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210114205708-a1377e83f551.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210116013233-4cd297ed5a7d.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210116013233-4cd297ed5a7d.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210116013233-4cd297ed5a7d.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210116013233-4cd297ed5a7d.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210120212909-7ad8a0443bd3.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210120212909-7ad8a0443bd3.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210120212909-7ad8a0443bd3.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210120212909-7ad8a0443bd3.mod mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.zip -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.mod -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.zip -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.mod -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.0.1-0.20190930145447-2ec5bdc52b86.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.1-0.20190930145447-2ec5bdc52b86.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.zip -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//go4.org/intern/@v/v0.0.0-20201223054237-ef8cbcb8edd7.zip -> go4.org%2Fintern%2F@v%2Fv0.0.0-20201223054237-ef8cbcb8edd7.zip mirror://goproxy//go4.org/intern/@v/v0.0.0-20201223054237-ef8cbcb8edd7.mod -> go4.org%2Fintern%2F@v%2Fv0.0.0-20201223054237-ef8cbcb8edd7.mod mirror://goproxy//go4.org/intern/@v/v0.0.0-20201223061701-969c7e87e7cb.zip -> go4.org%2Fintern%2F@v%2Fv0.0.0-20201223061701-969c7e87e7cb.zip mirror://goproxy//go4.org/intern/@v/v0.0.0-20201223061701-969c7e87e7cb.mod -> go4.org%2Fintern%2F@v%2Fv0.0.0-20201223061701-969c7e87e7cb.mod mirror://goproxy//go4.org/intern/@v/v0.0.0-20210101010959-7cab76ca296a.zip -> go4.org%2Fintern%2F@v%2Fv0.0.0-20210101010959-7cab76ca296a.zip mirror://goproxy//go4.org/intern/@v/v0.0.0-20210101010959-7cab76ca296a.mod -> go4.org%2Fintern%2F@v%2Fv0.0.0-20210101010959-7cab76ca296a.mod mirror://goproxy//go4.org/mem/@v/v0.0.0-20201119185036-c04c5a6ff174.zip -> go4.org%2Fmem%2F@v%2Fv0.0.0-20201119185036-c04c5a6ff174.zip mirror://goproxy//go4.org/mem/@v/v0.0.0-20201119185036-c04c5a6ff174.mod -> go4.org%2Fmem%2F@v%2Fv0.0.0-20201119185036-c04c5a6ff174.mod mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222175341-b30ae309168e.zip -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222175341-b30ae309168e.zip mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222175341-b30ae309168e.mod -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222175341-b30ae309168e.mod mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222180813-1025295fd063.zip -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222180813-1025295fd063.zip mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222180813-1025295fd063.mod -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222180813-1025295fd063.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201112155050-0c6587e931a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201112155050-0c6587e931a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201124201722-c8d3bf9c5392.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201124201722-c8d3bf9c5392.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201124201722-c8d3bf9c5392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201124201722-c8d3bf9c5392.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191007182048-72f939374954.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201010224723-4f7140c49acb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201216054612-986b41b23924.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201216054612-986b41b23924.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190411185658-b44545bcd369.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200217220822-9197077df867.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200217220822-9197077df867.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201009025420-dfb3f7c4e634.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201018230417-eeed37f84f13.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201018230417-eeed37f84f13.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201107080550-4d91cf3a1aaf.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201107080550-4d91cf3a1aaf.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201118182958-a01c418693c7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201118182958-a01c418693c7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201202213521-69691e467435.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201202213521-69691e467435.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201218084310-7d0127a74742.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201218084310-7d0127a74742.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201218084310-7d0127a74742.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201218084310-7d0127a74742.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201207232118-ee85cb95a76b.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201207232118-ee85cb95a76b.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201207232118-ee85cb95a76b.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201207232118-ee85cb95a76b.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200609164405-eb789aa7ce50.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200609164405-eb789aa7ce50.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201021000207-d49c4edd7d96.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201021000207-d49c4edd7d96.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201211185031-d93e913c1a58.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201211185031-d93e913c1a58.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201211185031-d93e913c1a58.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201211185031-d93e913c1a58.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.20200321-0.20201111175144-60b3766b89b9.zip -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20201111175144-60b3766b89b9.zip mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.20200321-0.20201111175144-60b3766b89b9.mod -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20201111175144-60b3766b89b9.mod mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.1.2-0.20201113162609-9b85be97fdf8.zip -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201113162609-9b85be97fdf8.zip mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.1.2-0.20201113162609-9b85be97fdf8.mod -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201113162609-9b85be97fdf8.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200117163144-32f20d992d24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.1-0.20201020201750-d3470999428b.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.1-0.20201020201750-d3470999428b.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.1-0.20201020201750-d3470999428b.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.1-0.20201020201750-d3470999428b.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gvisor.dev/gvisor/@v/v0.0.0-20210111185822-3ff3110fcdd6.zip -> gvisor.dev%2Fgvisor%2F@v%2Fv0.0.0-20210111185822-3ff3110fcdd6.zip mirror://goproxy//gvisor.dev/gvisor/@v/v0.0.0-20210111185822-3ff3110fcdd6.mod -> gvisor.dev%2Fgvisor%2F@v%2Fv0.0.0-20210111185822-3ff3110fcdd6.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.1.0.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//honnef.co/go/tools/@v/v0.1.0.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20201228234250-33d0a924ebbf.zip -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20201228234250-33d0a924ebbf.zip mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20201228234250-33d0a924ebbf.mod -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20201228234250-33d0a924ebbf.mod mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20210105212526-648fbc18a69d.zip -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20210105212526-648fbc18a69d.zip mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20210105212526-648fbc18a69d.mod -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20210105212526-648fbc18a69d.mod mirror://goproxy//k8s.io/api/@v/v0.16.13.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.13.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.13.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.13.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.14-rc.0.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.14-rc.0.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.13.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.13.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410163147-594e756bea31.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410163147-594e756bea31.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/goversion/@v/v1.2.0.zip -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.zip mirror://goproxy//rsc.io/goversion/@v/v1.2.0.mod -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5ee54bb52ea72ad237702cdf6f0aa72a
+_md5_=1d55c109cd02d545adec26b41ff814de
diff --git a/metadata/md5-cache/net-vpn/tailscale-1.4.5 b/metadata/md5-cache/net-vpn/tailscale-1.4.5
index 2c34fcc0ed18..a2c0229d46aa 100644
--- a/metadata/md5-cache/net-vpn/tailscale-1.4.5
+++ b/metadata/md5-cache/net-vpn/tailscale-1.4.5
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/tailscale/tailscale/archive/v1.4.5.tar.gz -> tailscale-1.4.5.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.1-0.20200122224058-0482b626c726.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.1-0.20200122224058-0482b626c726.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20200908182639-5b44b70ab3ab.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20200908182639-5b44b70ab3ab.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/alecthomas/kingpin/@v/v2.2.6+incompatible.mod -> github.com%2Falecthomas%2Fkingpin%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20180613141037-e580b900e9f5.zip -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.zip mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20180613141037-e580b900e9f5.mod -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.zip -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.zip mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/apenwarr/fixconsole/@v/v0.0.0-20191012055117-5a9f6489cc29.zip -> github.com%2Fapenwarr%2Ffixconsole%2F@v%2Fv0.0.0-20191012055117-5a9f6489cc29.zip mirror://goproxy//github.com/apenwarr/fixconsole/@v/v0.0.0-20191012055117-5a9f6489cc29.mod -> github.com%2Fapenwarr%2Ffixconsole%2F@v%2Fv0.0.0-20191012055117-5a9f6489cc29.mod mirror://goproxy//github.com/apenwarr/w32/@v/v0.0.0-20190407065021-aa00fece76ab.zip -> github.com%2Fapenwarr%2Fw32%2F@v%2Fv0.0.0-20190407065021-aa00fece76ab.zip mirror://goproxy//github.com/apenwarr/w32/@v/v0.0.0-20190407065021-aa00fece76ab.mod -> github.com%2Fapenwarr%2Fw32%2F@v%2Fv0.0.0-20190407065021-aa00fece76ab.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.mod mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.zip -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.zip mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.mod -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v1.1.1-0.20190506075156-2146c9339422.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv1.1.1-0.20190506075156-2146c9339422.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20201119153540-4cbc285b3327.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20201119153540-4cbc285b3327.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.9.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.9.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200928162600-f2cc35102c2a.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200928162600-f2cc35102c2a.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20191213151349-ff969a566b00.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20191213151349-ff969a566b00.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20200121165050-0be804eadb15.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20200121165050-0be804eadb15.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20200205145503-b45ef1f1f737.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20200205145503-b45ef1f1f737.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20191028175130-9e7d5ac5ea55.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20191028175130-9e7d5ac5ea55.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dpjacques/clockwork/@v/v0.1.1-0.20200827220843-c1f524b839be.mod -> github.com%2Fdpjacques%2Fclockwork%2F@v%2Fv0.1.1-0.20200827220843-c1f524b839be.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/dvyukov/go-fuzz/@v/v0.0.0-20201127111758-49e582c6c23d.mod -> github.com%2Fdvyukov%2Fgo-fuzz%2F@v%2Fv0.0.0-20201127111758-49e582c6c23d.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.zip -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.zip -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.mod -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.6.1-0.20180915234121-886344bea079.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.6.1-0.20180915234121-886344bea079.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3-0.20201020212313-ab46b8bd0abd.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3-0.20201020212313-ab46b8bd0abd.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.2-0.20191108005307-e555eab49ce8.mod -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.2-0.20191108005307-e555eab49ce8.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.zip -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.zip mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.mod -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.2-0.20190508160503-636abe8753b8.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.2-0.20190508160503-636abe8753b8.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.1.10.zip -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.1.10.mod -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201009170750-9c6f07d100c1.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201216134343-bde56ed16391.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201216134343-bde56ed16391.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201216134343-bde56ed16391.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201216134343-bde56ed16391.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.10.10.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.10.10.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.4-0.20190131011033-7dc38fb350b1.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4-0.20190131011033-7dc38fb350b1.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.4-0.20190131011033-7dc38fb350b1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4-0.20190131011033-7dc38fb350b1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lxn/walk/@v/v0.0.0-20201110160827-18ea5e372cdb.mod -> github.com%2Flxn%2Fwalk%2F@v%2Fv0.0.0-20201110160827-18ea5e372cdb.mod mirror://goproxy//github.com/lxn/win/@v/v0.0.0-20201111105847-2a20daff6a55.mod -> github.com%2Flxn%2Fwin%2F@v%2Fv0.0.0-20201111105847-2a20daff6a55.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattbaird/jsonpatch/@v/v0.0.0-20171005235357-81af80346b1a.mod -> github.com%2Fmattbaird%2Fjsonpatch%2F@v%2Fv0.0.0-20171005235357-81af80346b1a.mod mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.0.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/mdlayher/sdnotify/@v/v0.0.0-20200625151349-e4a4f32afc4a.zip -> github.com%2Fmdlayher%2Fsdnotify%2F@v%2Fv0.0.0-20200625151349-e4a4f32afc4a.zip mirror://goproxy//github.com/mdlayher/sdnotify/@v/v0.0.0-20200625151349-e4a4f32afc4a.mod -> github.com%2Fmdlayher%2Fsdnotify%2F@v%2Fv0.0.0-20200625151349-e4a4f32afc4a.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170308212314-bb9b5e7adda9.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170308212314-bb9b5e7adda9.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.zip -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.zip mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2-0.20181111125026-1722abf79c2f.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20181111125026-1722abf79c2f.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20190409184431-ee0cd42419d3.zip -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.zip mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20190409184431-ee0cd42419d3.mod -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.6.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.zip -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.mod -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.zip -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.zip mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.mod -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.zip -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.zip mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.mod -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201214215404-77d1e9757027.zip -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201214215404-77d1e9757027.zip mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201214215404-77d1e9757027.mod -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201214215404-77d1e9757027.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210109012254-dc30a1b9415e.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210109012254-dc30a1b9415e.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210109012254-dc30a1b9415e.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210109012254-dc30a1b9415e.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210113223737-a6213b5eaf98.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210113223737-a6213b5eaf98.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210113223737-a6213b5eaf98.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210113223737-a6213b5eaf98.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210114205708-a1377e83f551.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210114205708-a1377e83f551.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210114205708-a1377e83f551.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210114205708-a1377e83f551.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210116013233-4cd297ed5a7d.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210116013233-4cd297ed5a7d.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210116013233-4cd297ed5a7d.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210116013233-4cd297ed5a7d.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210120212909-7ad8a0443bd3.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210120212909-7ad8a0443bd3.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210120212909-7ad8a0443bd3.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210120212909-7ad8a0443bd3.mod mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.zip -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.mod -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.zip -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.mod -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.0.1-0.20190930145447-2ec5bdc52b86.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.1-0.20190930145447-2ec5bdc52b86.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.zip -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//go4.org/intern/@v/v0.0.0-20201223054237-ef8cbcb8edd7.zip -> go4.org%2Fintern%2F@v%2Fv0.0.0-20201223054237-ef8cbcb8edd7.zip mirror://goproxy//go4.org/intern/@v/v0.0.0-20201223054237-ef8cbcb8edd7.mod -> go4.org%2Fintern%2F@v%2Fv0.0.0-20201223054237-ef8cbcb8edd7.mod mirror://goproxy//go4.org/intern/@v/v0.0.0-20201223061701-969c7e87e7cb.zip -> go4.org%2Fintern%2F@v%2Fv0.0.0-20201223061701-969c7e87e7cb.zip mirror://goproxy//go4.org/intern/@v/v0.0.0-20201223061701-969c7e87e7cb.mod -> go4.org%2Fintern%2F@v%2Fv0.0.0-20201223061701-969c7e87e7cb.mod mirror://goproxy//go4.org/intern/@v/v0.0.0-20210101010959-7cab76ca296a.zip -> go4.org%2Fintern%2F@v%2Fv0.0.0-20210101010959-7cab76ca296a.zip mirror://goproxy//go4.org/intern/@v/v0.0.0-20210101010959-7cab76ca296a.mod -> go4.org%2Fintern%2F@v%2Fv0.0.0-20210101010959-7cab76ca296a.mod mirror://goproxy//go4.org/mem/@v/v0.0.0-20201119185036-c04c5a6ff174.zip -> go4.org%2Fmem%2F@v%2Fv0.0.0-20201119185036-c04c5a6ff174.zip mirror://goproxy//go4.org/mem/@v/v0.0.0-20201119185036-c04c5a6ff174.mod -> go4.org%2Fmem%2F@v%2Fv0.0.0-20201119185036-c04c5a6ff174.mod mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222175341-b30ae309168e.zip -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222175341-b30ae309168e.zip mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222175341-b30ae309168e.mod -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222175341-b30ae309168e.mod mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222180813-1025295fd063.zip -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222180813-1025295fd063.zip mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222180813-1025295fd063.mod -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222180813-1025295fd063.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201112155050-0c6587e931a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201112155050-0c6587e931a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201124201722-c8d3bf9c5392.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201124201722-c8d3bf9c5392.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201124201722-c8d3bf9c5392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201124201722-c8d3bf9c5392.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191007182048-72f939374954.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201010224723-4f7140c49acb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201216054612-986b41b23924.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201216054612-986b41b23924.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190411185658-b44545bcd369.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200217220822-9197077df867.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200217220822-9197077df867.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201009025420-dfb3f7c4e634.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201018230417-eeed37f84f13.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201018230417-eeed37f84f13.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201107080550-4d91cf3a1aaf.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201107080550-4d91cf3a1aaf.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201118182958-a01c418693c7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201118182958-a01c418693c7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201202213521-69691e467435.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201202213521-69691e467435.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201218084310-7d0127a74742.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201218084310-7d0127a74742.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201218084310-7d0127a74742.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201218084310-7d0127a74742.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201207232118-ee85cb95a76b.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201207232118-ee85cb95a76b.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201207232118-ee85cb95a76b.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201207232118-ee85cb95a76b.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200609164405-eb789aa7ce50.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200609164405-eb789aa7ce50.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201021000207-d49c4edd7d96.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201021000207-d49c4edd7d96.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201211185031-d93e913c1a58.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201211185031-d93e913c1a58.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201211185031-d93e913c1a58.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201211185031-d93e913c1a58.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.20200321-0.20201111175144-60b3766b89b9.zip -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20201111175144-60b3766b89b9.zip mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.20200321-0.20201111175144-60b3766b89b9.mod -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20201111175144-60b3766b89b9.mod mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.1.2-0.20201113162609-9b85be97fdf8.zip -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201113162609-9b85be97fdf8.zip mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.1.2-0.20201113162609-9b85be97fdf8.mod -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201113162609-9b85be97fdf8.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200117163144-32f20d992d24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.1-0.20201020201750-d3470999428b.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.1-0.20201020201750-d3470999428b.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.1-0.20201020201750-d3470999428b.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.1-0.20201020201750-d3470999428b.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gvisor.dev/gvisor/@v/v0.0.0-20210111185822-3ff3110fcdd6.zip -> gvisor.dev%2Fgvisor%2F@v%2Fv0.0.0-20210111185822-3ff3110fcdd6.zip mirror://goproxy//gvisor.dev/gvisor/@v/v0.0.0-20210111185822-3ff3110fcdd6.mod -> gvisor.dev%2Fgvisor%2F@v%2Fv0.0.0-20210111185822-3ff3110fcdd6.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.1.0.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//honnef.co/go/tools/@v/v0.1.0.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20201228234250-33d0a924ebbf.zip -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20201228234250-33d0a924ebbf.zip mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20201228234250-33d0a924ebbf.mod -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20201228234250-33d0a924ebbf.mod mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20210105212526-648fbc18a69d.zip -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20210105212526-648fbc18a69d.zip mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20210105212526-648fbc18a69d.mod -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20210105212526-648fbc18a69d.mod mirror://goproxy//k8s.io/api/@v/v0.16.13.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.13.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.13.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.13.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.14-rc.0.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.14-rc.0.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.13.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.13.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410163147-594e756bea31.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410163147-594e756bea31.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/goversion/@v/v1.2.0.zip -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.zip mirror://goproxy//rsc.io/goversion/@v/v1.2.0.mod -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ff60a2eaee9b7490d4505b22f3c8769f
+_md5_=be232f29f3f34ee4723ac5e77abd8834
diff --git a/metadata/md5-cache/net-vpn/tailscale-1.8.7 b/metadata/md5-cache/net-vpn/tailscale-1.8.7
index 0f5496e62f9c..027710df03ee 100644
--- a/metadata/md5-cache/net-vpn/tailscale-1.8.7
+++ b/metadata/md5-cache/net-vpn/tailscale-1.8.7
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/tailscale/tailscale/archive/v1.8.7.tar.gz -> tailscale-1.8.7.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//github.com/alecthomas/kingpin/@v/v2.2.6+incompatible.mod -> github.com%2Falecthomas%2Fkingpin%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20180613141037-e580b900e9f5.zip -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.zip mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20180613141037-e580b900e9f5.mod -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.zip -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.zip mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.mod mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.zip -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.zip mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.mod -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/cyolosecurity/certstore/@v/v0.0.0-20200922073901-ece7f1d353c2.zip -> github.com%2Fcyolosecurity%2Fcertstore%2F@v%2Fv0.0.0-20200922073901-ece7f1d353c2.zip mirror://goproxy//github.com/cyolosecurity/certstore/@v/v0.0.0-20200922073901-ece7f1d353c2.mod -> github.com%2Fcyolosecurity%2Fcertstore%2F@v%2Fv0.0.0-20200922073901-ece7f1d353c2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dvyukov/go-fuzz/@v/v0.0.0-20201127111758-49e582c6c23d.mod -> github.com%2Fdvyukov%2Fgo-fuzz%2F@v%2Fv0.0.0-20201127111758-49e582c6c23d.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.1.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.1.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/github/fakeca/@v/v0.1.0.zip -> github.com%2Fgithub%2Ffakeca%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/github/fakeca/@v/v0.1.0.mod -> github.com%2Fgithub%2Ffakeca%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.zip -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.zip -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.mod -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/google/btree/@v/v1.0.1.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/google/btree/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.zip -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.zip mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.mod -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.mod mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.1.10.zip -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.1.10.mod -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/josharian/native/@v/v0.0.0-20200817173448-b6b71def0850.zip -> github.com%2Fjosharian%2Fnative%2F@v%2Fv0.0.0-20200817173448-b6b71def0850.zip mirror://goproxy//github.com/josharian/native/@v/v0.0.0-20200817173448-b6b71def0850.mod -> github.com%2Fjosharian%2Fnative%2F@v%2Fv0.0.0-20200817173448-b6b71def0850.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201009170750-9c6f07d100c1.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201216134343-bde56ed16391.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201216134343-bde56ed16391.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201220180245-69540ac93943.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201220180245-69540ac93943.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210122163228-8d122574c736.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210122163228-8d122574c736.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210212075122-66c871082f2b.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210212075122-66c871082f2b.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20210212075122-66c871082f2b.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20210212075122-66c871082f2b.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.10.10.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.10.10.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lxn/walk/@v/v0.0.0-20201110160827-18ea5e372cdb.mod -> github.com%2Flxn%2Fwalk%2F@v%2Fv0.0.0-20201110160827-18ea5e372cdb.mod mirror://goproxy//github.com/lxn/win/@v/v0.0.0-20201111105847-2a20daff6a55.mod -> github.com%2Flxn%2Fwin%2F@v%2Fv0.0.0-20201111105847-2a20daff6a55.mod mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mdlayher/ethtool/@v/v0.0.0-20210210192532-2b88debcdd43.zip -> github.com%2Fmdlayher%2Fethtool%2F@v%2Fv0.0.0-20210210192532-2b88debcdd43.zip mirror://goproxy//github.com/mdlayher/ethtool/@v/v0.0.0-20210210192532-2b88debcdd43.mod -> github.com%2Fmdlayher%2Fethtool%2F@v%2Fv0.0.0-20210210192532-2b88debcdd43.mod mirror://goproxy//github.com/mdlayher/genetlink/@v/v1.0.0.zip -> github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mdlayher/genetlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.2.2-0.20210123213345-5cc92139ae3e.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.2.2-0.20210123213345-5cc92139ae3e.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.3.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.3.2.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.3.2.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mdlayher/sdnotify/@v/v0.0.0-20200625151349-e4a4f32afc4a.zip -> github.com%2Fmdlayher%2Fsdnotify%2F@v%2Fv0.0.0-20200625151349-e4a4f32afc4a.zip mirror://goproxy//github.com/mdlayher/sdnotify/@v/v0.0.0-20200625151349-e4a4f32afc4a.mod -> github.com%2Fmdlayher%2Fsdnotify%2F@v%2Fv0.0.0-20200625151349-e4a4f32afc4a.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.zip -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.zip mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20190409184431-ee0cd42419d3.zip -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.zip mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20190409184431-ee0cd42419d3.mod -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.6.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.zip -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.mod -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.zip -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.zip mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.mod -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.zip -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.zip mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.mod -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201214215404-77d1e9757027.zip -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201214215404-77d1e9757027.zip mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201214215404-77d1e9757027.mod -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201214215404-77d1e9757027.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210429195722-6cd106ab1339.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210429195722-6cd106ab1339.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210429195722-6cd106ab1339.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210429195722-6cd106ab1339.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210510175647-030c638da3df.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210510175647-030c638da3df.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20210510175647-030c638da3df.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20210510175647-030c638da3df.mod mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.zip -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.mod -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.zip -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.mod -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.zip -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go4.org/intern/@v/v0.0.0-20210108033219-3eb7198706b2.zip -> go4.org%2Fintern%2F@v%2Fv0.0.0-20210108033219-3eb7198706b2.zip mirror://goproxy//go4.org/intern/@v/v0.0.0-20210108033219-3eb7198706b2.mod -> go4.org%2Fintern%2F@v%2Fv0.0.0-20210108033219-3eb7198706b2.mod mirror://goproxy//go4.org/mem/@v/v0.0.0-20201119185036-c04c5a6ff174.zip -> go4.org%2Fmem%2F@v%2Fv0.0.0-20201119185036-c04c5a6ff174.zip mirror://goproxy//go4.org/mem/@v/v0.0.0-20201119185036-c04c5a6ff174.mod -> go4.org%2Fmem%2F@v%2Fv0.0.0-20201119185036-c04c5a6ff174.mod mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222175341-b30ae309168e.mod -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222175341-b30ae309168e.mod mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222180813-1025295fd063.zip -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222180813-1025295fd063.zip mirror://goproxy//go4.org/unsafe/assume-no-moving-gc/@v/v0.0.0-20201222180813-1025295fd063.mod -> go4.org%2Funsafe%2Fassume-no-moving-gc%2F@v%2Fv0.0.0-20201222180813-1025295fd063.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201112155050-0c6587e931a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201112155050-0c6587e931a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210317152858-513c2a44f670.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210317152858-513c2a44f670.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210317152858-513c2a44f670.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210317152858-513c2a44f670.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191007182048-72f939374954.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201010224723-4f7140c49acb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201216054612-986b41b23924.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190411185658-b44545bcd369.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201009025420-dfb3f7c4e634.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201018230417-eeed37f84f13.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201018230417-eeed37f84f13.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201107080550-4d91cf3a1aaf.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201107080550-4d91cf3a1aaf.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201118182958-a01c418693c7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201118182958-a01c418693c7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201218084310-7d0127a74742.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201218084310-7d0127a74742.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210110051926-789bb1bd4061.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210110051926-789bb1bd4061.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210123111255-9b0068b26619.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210123111255-9b0068b26619.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210216163648-f7da38b97c65.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210216163648-f7da38b97c65.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210301091718-77cc2087c03b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210301091718-77cc2087c03b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210316164454-77fc1eacc6aa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210316164454-77fc1eacc6aa.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210403161142-5e06dd20ab57.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210403161142-5e06dd20ab57.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210317153231-de623e64d2a6.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210317153231-de623e64d2a6.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200609164405-eb789aa7ce50.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200609164405-eb789aa7ce50.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201211185031-d93e913c1a58.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201211185031-d93e913c1a58.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201211185031-d93e913c1a58.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201211185031-d93e913c1a58.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.20200321-0.20201111175144-60b3766b89b9.zip -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20201111175144-60b3766b89b9.zip mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.20200321-0.20201111175144-60b3766b89b9.mod -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20201111175144-60b3766b89b9.mod mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.1.2-0.20201113162609-9b85be97fdf8.zip -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201113162609-9b85be97fdf8.zip mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.1.2-0.20201113162609-9b85be97fdf8.mod -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201113162609-9b85be97fdf8.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.1.0.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//honnef.co/go/tools/@v/v0.1.0.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20210222205655-a1ec2b7b8c44.zip -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20210222205655-a1ec2b7b8c44.zip mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20210222205655-a1ec2b7b8c44.mod -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20210222205655-a1ec2b7b8c44.mod mirror://goproxy//inet.af/netstack/@v/v0.0.0-20210317161235-a1bf4e56ef22.zip -> inet.af%2Fnetstack%2F@v%2Fv0.0.0-20210317161235-a1bf4e56ef22.zip mirror://goproxy//inet.af/netstack/@v/v0.0.0-20210317161235-a1bf4e56ef22.mod -> inet.af%2Fnetstack%2F@v%2Fv0.0.0-20210317161235-a1bf4e56ef22.mod mirror://goproxy//inet.af/peercred/@v/v0.0.0-20210302202138-56e694897155.zip -> inet.af%2Fpeercred%2F@v%2Fv0.0.0-20210302202138-56e694897155.zip mirror://goproxy//inet.af/peercred/@v/v0.0.0-20210302202138-56e694897155.mod -> inet.af%2Fpeercred%2F@v%2Fv0.0.0-20210302202138-56e694897155.mod mirror://goproxy//rsc.io/goversion/@v/v1.2.0.zip -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.zip mirror://goproxy//rsc.io/goversion/@v/v1.2.0.mod -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.mod
 _eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6fda329382184434001a92f896897cd3
+_md5_=69a606e67906b1e1eb39dc5b59086a98
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.5.9-r1 b/metadata/md5-cache/net-vpn/tor-0.4.5.9-r1
index f3a42cbbe6ca..274419011caa 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.5.9-r1
+++ b/metadata/md5-cache/net-vpn/tor-0.4.5.9-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.4.5.9.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.5.9.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.5.9.tar.gz.asc )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7a4f3a3eba188f095eae3d1928ffe7f4
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.6.5-r1 b/metadata/md5-cache/net-vpn/tor-0.4.6.5-r1
index d69598e67084..41e4059af680 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.6.5-r1
+++ b/metadata/md5-cache/net-vpn/tor-0.4.6.5-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.4.6.5.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.6.5.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.6.5.tar.gz.asc )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b308993511cf8f95d79983a86d2ae5c5
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.6.6 b/metadata/md5-cache/net-vpn/tor-0.4.6.6
index 7da81f4e3cb7..5f838a5e6748 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.6.6
+++ b/metadata/md5-cache/net-vpn/tor-0.4.6.6
@@ -11,5 +11,5 @@ RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.4.6.6.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.6.6.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.6.6.tar.gz.asc )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=410271a18f45a43259236ef55b337f89
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index da87c23a2456..89cae51f9752 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/airspy-1.0.10 b/metadata/md5-cache/net-wireless/airspy-1.0.10
new file mode 100644
index 000000000000..d905cf64aa23
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/airspy-1.0.10
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=virtual/udev virtual/libusb:1
+DESCRIPTION=Usemode driver and associated tools for airspy
+EAPI=7
+HOMEPAGE=http://www.airspy.com
+IUSE=+udev
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=virtual/udev virtual/libusb:1
+SLOT=0
+SRC_URI=https://github.com/airspy/host/archive/v1.0.10.tar.gz -> airspy-1.0.10.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3031843e77ec49e5e3f64dd051d731a5
diff --git a/metadata/md5-cache/net-wireless/bladerf-2019.07 b/metadata/md5-cache/net-wireless/bladerf-2019.07
deleted file mode 100644
index 7bf832f1b822..000000000000
--- a/metadata/md5-cache/net-wireless/bladerf-2019.07
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libusb-1.0.16 tecla? ( dev-libs/libtecla ) virtual/pkgconfig
-DESCRIPTION=Libraries for supporing the BladeRF hardware from Nuand
-EAPI=7
-HOMEPAGE=https://nuand.com/
-IUSE=doc +tecla
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+ LGPL-2.1+
-PDEPEND=>=net-wireless/bladerf-firmware-2.3.2 >=net-wireless/bladerf-fpga-0.11.0
-RDEPEND=>=dev-libs/libusb-1.0.16 tecla? ( dev-libs/libtecla )
-SLOT=0/2019.07
-SRC_URI=https://github.com/Nuand/bladeRF/archive/2019.07.tar.gz -> bladerf-2019.07.tar.gz https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=286041404920f8b4d52331d6ad92b97a
diff --git a/metadata/md5-cache/net-wireless/bladerf-2021.03 b/metadata/md5-cache/net-wireless/bladerf-2021.03
index 8f5b8dd055a3..31f8f993222a 100644
--- a/metadata/md5-cache/net-wireless/bladerf-2021.03
+++ b/metadata/md5-cache/net-wireless/bladerf-2021.03
@@ -5,11 +5,11 @@ DESCRIPTION=Libraries for supporing the BladeRF hardware from Nuand
 EAPI=7
 HOMEPAGE=https://nuand.com/
 IUSE=doc +tecla
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+ LGPL-2.1+
 PDEPEND=>=net-wireless/bladerf-firmware-2.4.0 >=net-wireless/bladerf-fpga-0.12.0
 RDEPEND=>=dev-libs/libusb-1.0.16 tecla? ( dev-libs/libtecla )
 SLOT=0/2021.03
 SRC_URI=https://github.com/Nuand/bladeRF/archive/2021.03.tar.gz -> bladerf-2021.03.tar.gz https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8aaa07eb158cd7c42795aaf39477c4aa
+_md5_=e3545ab87ac1db2d15900119a7d3ef00
diff --git a/metadata/md5-cache/net-wireless/bladerf-firmware-2.2.0 b/metadata/md5-cache/net-wireless/bladerf-firmware-2.2.0
deleted file mode 100644
index 76b153acff76..000000000000
--- a/metadata/md5-cache/net-wireless/bladerf-firmware-2.2.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=bladeRF FX3 firmware images
-EAPI=6
-HOMEPAGE=http://nuand.com/fx3.php
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://nuand.com/fx3/bladeRF_fw_v2.2.0.img
-_md5_=51f4781899c36e4ed4c5fa80930d62dc
diff --git a/metadata/md5-cache/net-wireless/bladerf-firmware-2.3.2 b/metadata/md5-cache/net-wireless/bladerf-firmware-2.3.2
deleted file mode 100644
index a20db44e6e01..000000000000
--- a/metadata/md5-cache/net-wireless/bladerf-firmware-2.3.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=bladeRF FX3 firmware images
-EAPI=7
-HOMEPAGE=http://nuand.com/fx3.php
-KEYWORDS=amd64 ~arm x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://nuand.com/fx3/bladeRF_fw_v2.3.2.img
-_md5_=1516fe105e0ae20033710d77811e543d
diff --git a/metadata/md5-cache/net-wireless/bladerf-firmware-2.4.0 b/metadata/md5-cache/net-wireless/bladerf-firmware-2.4.0
index bc03a028607e..901085ee59b8 100644
--- a/metadata/md5-cache/net-wireless/bladerf-firmware-2.4.0
+++ b/metadata/md5-cache/net-wireless/bladerf-firmware-2.4.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install postinst unpack
 DESCRIPTION=bladeRF FX3 firmware images
 EAPI=7
 HOMEPAGE=http://nuand.com/fx3.php
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://nuand.com/fx3/bladeRF_fw_v2.4.0.img
-_md5_=71c26bfeb29849e3abf7751bd596a154
+_md5_=49e18294c83294e99848239bc149cb74
diff --git a/metadata/md5-cache/net-wireless/bladerf-fpga-0.11.0 b/metadata/md5-cache/net-wireless/bladerf-fpga-0.11.0
deleted file mode 100644
index a24fb3325525..000000000000
--- a/metadata/md5-cache/net-wireless/bladerf-fpga-0.11.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=bladeRF FPGA bitstreams
-EAPI=7
-HOMEPAGE=http://nuand.com/fpga.php
-IUSE=+xA4 +xA9 +x40 +x115
-KEYWORDS=amd64 ~arm x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=xA4? ( http://nuand.com/fpga/v0.11.0/hostedxA4.rbf -> hostedxA4-0.11.0.rbf ) xA9? ( http://nuand.com/fpga/v0.11.0/hostedxA9.rbf -> hostedxA9-0.11.0.rbf ) x40? ( http://nuand.com/fpga/v0.11.0/hostedx40.rbf -> hostedx40-0.11.0.rbf ) x115? ( http://nuand.com/fpga/v0.11.0/hostedx115.rbf -> hostedx115-0.11.0.rbf )
-_md5_=0b7cdebc102b69f9373a4c63002cccc6
diff --git a/metadata/md5-cache/net-wireless/bladerf-fpga-0.12.0 b/metadata/md5-cache/net-wireless/bladerf-fpga-0.12.0
index 9022714924a5..1d7311831543 100644
--- a/metadata/md5-cache/net-wireless/bladerf-fpga-0.12.0
+++ b/metadata/md5-cache/net-wireless/bladerf-fpga-0.12.0
@@ -3,8 +3,8 @@ DESCRIPTION=bladeRF FPGA bitstreams
 EAPI=7
 HOMEPAGE=http://nuand.com/fpga.php
 IUSE=+xA4 +xA9 +x40 +x115
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=xA4? ( http://nuand.com/fpga/v0.12.0/hostedxA4.rbf -> hostedxA4-0.12.0.rbf ) xA9? ( http://nuand.com/fpga/v0.12.0/hostedxA9.rbf -> hostedxA9-0.12.0.rbf ) x40? ( http://nuand.com/fpga/v0.12.0/hostedx40.rbf -> hostedx40-0.12.0.rbf ) x115? ( http://nuand.com/fpga/v0.12.0/hostedx115.rbf -> hostedx115-0.12.0.rbf )
-_md5_=eb430c9696614a52f8628256ab171c6e
+_md5_=458a5bd9d7dd87eb1ef4f5808ff027ca
diff --git a/metadata/md5-cache/net-wireless/bladerf-fpga-0.7.3 b/metadata/md5-cache/net-wireless/bladerf-fpga-0.7.3
deleted file mode 100644
index 4b9cfbb758db..000000000000
--- a/metadata/md5-cache/net-wireless/bladerf-fpga-0.7.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=bladeRF FPGA bitstreams
-EAPI=6
-HOMEPAGE=http://nuand.com/fpga.php
-IUSE=+xA4 +xA9 +x40 +x115
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=xA4? ( http://nuand.com/fpga/v0.7.3/hostedxA4.rbf -> hostedxA4-0.7.3.rbf ) xA9? ( http://nuand.com/fpga/v0.7.3/hostedxA9.rbf -> hostedxA9-0.7.3.rbf ) x40? ( http://nuand.com/fpga/v0.7.3/hostedx40.rbf -> hostedx40-0.7.3.rbf ) x115? ( http://nuand.com/fpga/v0.7.3/hostedx115.rbf -> hostedx115-0.7.3.rbf )
-_md5_=4853e03e31cd9e2820e51a8dc8e98cc9
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index edb71a85ef57..eede1a00aa1d 100644
--- a/metadata/md5-cache/perl-core/Manifest.gz
+++ b/metadata/md5-cache/perl-core/Manifest.gz
diff --git a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.560.0 b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.560.0
index 886782233d30..356b2daeb700 100644
--- a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.560.0
+++ b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.560.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Common Scalar and List utility subroutines
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Scalar-List-Utils
-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
+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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.56.tar.gz
 _eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=0157b6b16d56c0c72aa3398438333cf2
+_md5_=f51feaafa9d622c74f37417141e4a63d
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 5778079c40c0..cf91a93ac012 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/bowtie-2.2.9 b/metadata/md5-cache/sci-biology/bowtie-2.2.9
deleted file mode 100644
index 3f8c65c1ac95..000000000000
--- a/metadata/md5-cache/sci-biology/bowtie-2.2.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install pretend
-DEPEND=dev-lang/perl tbb? ( dev-cpp/tbb ) app-arch/unzip
-DESCRIPTION=Popular short read aligner for Next-generation sequencing data
-EAPI=6
-HOMEPAGE=http://bowtie-bio.sourceforge.net/bowtie2/
-IUSE=examples cpu_flags_x86_sse2 +tbb
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl tbb? ( dev-cpp/tbb )
-SLOT=2
-SRC_URI=mirror://sourceforge/project/bowtie-bio/bowtie2/2.2.9/bowtie2-2.2.9-source.zip
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=46d87c867cd445707dc1913cf3dd7eb6
diff --git a/metadata/md5-cache/sci-biology/bowtie-2.4.4 b/metadata/md5-cache/sci-biology/bowtie-2.4.4
new file mode 100644
index 000000000000..7ac1b71be9eb
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/bowtie-2.4.4
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install setup
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-lang/perl sys-libs/zlib
+DESCRIPTION=Popular short read aligner for Next-generation sequencing data
+EAPI=8
+HOMEPAGE=http://bowtie-bio.sourceforge.net/bowtie2/
+IUSE=cpu_flags_x86_sse2 examples python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-lang/perl sys-libs/zlib
+REQUIRED_USE=cpu_flags_x86_sse2 ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=2
+SRC_URI=mirror://sourceforge/project/bowtie-bio/bowtie2/2.4.4/bowtie2-2.4.4-source.zip
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a169406c93e64d9cae6cbb8ad262f62b
diff --git a/metadata/md5-cache/sci-biology/emboss-6.6.0-r1 b/metadata/md5-cache/sci-biology/emboss-6.6.0-r1
index 5ed53d5b0273..874dba6953c9 100644
--- a/metadata/md5-cache/sci-biology/emboss-6.6.0-r1
+++ b/metadata/md5-cache/sci-biology/emboss-6.6.0-r1
@@ -10,6 +10,6 @@ LICENSE=LGPL-2 GPL-2 Apache-2.0 GPL-3+ CC-BY-3.0
 PDEPEND=!minimal? ( sci-biology/aaindex sci-biology/cutg sci-biology/primer3 sci-biology/prints sci-biology/prosite sci-biology/rebase )
 RDEPEND=!games-action/xbomber !sys-devel/cons dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) pdf? ( media-libs/libharu:= ) png? ( media-libs/gd:2=[png] ) postgres? ( dev-db/postgresql:= ) X? ( x11-libs/libXt )
 SLOT=0
-SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.6.0.tar.gz
+SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.6.0.tar.gz https://dev.gentoo.org/~soap/distfiles/emboss-6.6.0-patches.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	93f4f6ac626ed63f042344dd76574b41	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=72c86b427ea83b8feb792884f23feaf3
+_md5_=ca77e598a1b176f454ece551aad686da
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 303140c70e65..960692a90256 100644
--- a/metadata/md5-cache/sci-calculators/Manifest.gz
+++ b/metadata/md5-cache/sci-calculators/Manifest.gz
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-3.19.0 b/metadata/md5-cache/sci-calculators/qalculate-gtk-3.19.0
index 22bc91766e48..e69fc76588d0 100644
--- a/metadata/md5-cache/sci-calculators/qalculate-gtk-3.19.0
+++ b/metadata/md5-cache/sci-calculators/qalculate-gtk-3.19.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.18.0:= x11-libs/cairo x11-libs/
 DESCRIPTION=Modern multi-purpose calculator
 EAPI=7
 HOMEPAGE=https://qalculate.github.io/
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.18.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v3.19.0/qalculate-gtk-3.19.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=87454354d503a319e7e2eee9ef708212
+_md5_=b147ef4adc30d5fb01165432761e8824
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-3.20.1 b/metadata/md5-cache/sci-calculators/qalculate-gtk-3.20.1
new file mode 100644
index 000000000000..ad657cc3aa5b
--- /dev/null
+++ b/metadata/md5-cache/sci-calculators/qalculate-gtk-3.20.1
@@ -0,0 +1,13 @@
+BDEPEND=app-text/rarian dev-util/gdbus-codegen dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.20.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Modern multi-purpose calculator
+EAPI=7
+HOMEPAGE=https://qalculate.github.io/
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.20.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
+SLOT=0
+SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v3.20.1/qalculate-gtk-3.20.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a10ab6d2289cfb4143af4ff7fb06c853
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 663fd4035118..f3323b5c1bf3 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/folium-0.12.1 b/metadata/md5-cache/sci-geosciences/folium-0.12.1
new file mode 100644
index 000000000000..eff8afb6da8a
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/folium-0.12.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( sci-libs/branca[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-libs/branca[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=Python Data, Leaflet.js Maps
+EAPI=7
+HOMEPAGE=https://github.com/python-visualization/folium
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=sci-libs/branca[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-visualization/folium/archive/refs/tags/v0.12.1.tar.gz -> folium-0.12.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b1f091d1afcc7fb18bdd18a6508b1297
diff --git a/metadata/md5-cache/sci-geosciences/geopy-2.2.0 b/metadata/md5-cache/sci-geosciences/geopy-2.2.0
new file mode 100644
index 000000000000..75f315caec55
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/geopy-2.2.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sci-geosciences/GeographicLib-1.51-r1[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=Python client for several popular geocoding web services
+EAPI=7
+HOMEPAGE=https://github.com/geopy/geopy
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=sci-geosciences/GeographicLib-1.51-r1[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/geopy/geopy/archive/refs/tags/2.2.0.tar.gz -> geopy-2.2.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0aa5e40b621ef73bb461ef11c291af8d
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-9.3 b/metadata/md5-cache/sci-geosciences/gpxsee-9.3
new file mode 100644
index 000000000000..46fcabb7dd10
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-9.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files
+EAPI=7
+HOMEPAGE=https://www.gpxsee.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=https://github.com/tumic0/GPXSee/archive/9.3.tar.gz -> gpxsee-9.3.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e260936f846b73a5dbc936cd5957da72
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 77b456a17356..4adebfd79dbf 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/branca-0.4.2 b/metadata/md5-cache/sci-libs/branca-0.4.2
new file mode 100644
index 000000000000..2b18d9346b7e
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/branca-0.4.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DESCRIPTION=spinoff from folium, host the non-map-specific features.
+EAPI=7
+HOMEPAGE=https://github.com/python-visualization/branca
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-visualization/branca/archive/refs/tags/v0.4.2.tar.gz -> branca-0.4.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4346433892aa5e7397c796d01e89d144
diff --git a/metadata/md5-cache/sci-libs/camd-2.4.6-r1 b/metadata/md5-cache/sci-libs/camd-2.4.6-r1
index 2df79cc3041e..edf1a9172e84 100644
--- a/metadata/md5-cache/sci-libs/camd-2.4.6-r1
+++ b/metadata/md5-cache/sci-libs/camd-2.4.6-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/camd-2.4.6.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ebae1b1c95de9ab0095a32d3d2a76e0f
+_md5_=78539d20346f1b12258a6e96381f6f7b
diff --git a/metadata/md5-cache/sci-libs/cdf-3.8.0 b/metadata/md5-cache/sci-libs/cdf-3.8.0
deleted file mode 100644
index a8d10d162485..000000000000
--- a/metadata/md5-cache/sci-libs/cdf-3.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=java? ( >=virtual/jre-1.8:= ) ncurses? ( sys-libs/ncurses:0= ) ncurses? ( virtual/pkgconfig ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Common Data Format I/O library for multi-dimensional data sets
-EAPI=7
-HOMEPAGE=https://cdf.gsfc.nasa.gov
-IUSE=doc examples java ncurses static-libs elibc_FreeBSD java
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=CDF
-RDEPEND=java? ( >=virtual/jre-1.8:= ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
-RESTRICT=bindist
-SLOT=0
-SRC_URI=https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_0-dist-cdf.tar.gz java? ( https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_0-dist-java.tar.gz ) doc? ( https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf38ifd.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380crm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380csrm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380frm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380prm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380ug.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380vbrm.pdf )
-_eclasses_=java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b2dc8ee36783bee1fd372c254112bcf1
diff --git a/metadata/md5-cache/sci-libs/cdf-3.8.0-r1 b/metadata/md5-cache/sci-libs/cdf-3.8.0-r1
new file mode 100644
index 000000000000..0711d166d999
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/cdf-3.8.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=java? ( >=virtual/jre-1.8:= ) ncurses? ( sys-libs/ncurses:0= ) ncurses? ( virtual/pkgconfig ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Common Data Format I/O library for multi-dimensional data sets
+EAPI=7
+HOMEPAGE=https://cdf.gsfc.nasa.gov
+IUSE=doc examples java ncurses static-libs elibc_FreeBSD java
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
+LICENSE=CDF
+RDEPEND=java? ( >=virtual/jre-1.8:= ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RESTRICT=bindist
+SLOT=0
+SRC_URI=https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_0-dist-cdf.tar.gz java? ( https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_0-dist-java.tar.gz ) doc? ( https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf38ifd.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380crm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380csrm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380frm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380prm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380ug.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380vbrm.pdf )
+_eclasses_=java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1f1ef060db0f6cea93dd921ca3b4fc6c
diff --git a/metadata/md5-cache/sci-libs/gsl-2.7 b/metadata/md5-cache/sci-libs/gsl-2.7
index ce61e42cf8f9..7ce5cbb078a8 100644
--- a/metadata/md5-cache/sci-libs/gsl-2.7
+++ b/metadata/md5-cache/sci-libs/gsl-2.7
@@ -5,10 +5,10 @@ DESCRIPTION=The GNU Scientific Library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gsl/
 IUSE=cblas-external +deprecated static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas:= )
 SLOT=0/25
 SRC_URI=mirror://gnu/gsl/gsl-2.7.tar.gz https://dev.gentoo.org/~sam/distfiles/sci-libs/gsl/gsl-2.7-cblas.patch.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5f40e728255f80e2cba736088ceee605
+_md5_=70772a965a28648b452a0832b0e5edeb
diff --git a/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1 b/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
index e25de8d29167..557fa72aa83a 100644
--- a/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
+++ b/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?] dev-python/setuptools[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=Keras deep learning library reference implementations of deep learning models
 EAPI=6
 HOMEPAGE=https://keras.io/applications/
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/keras-team/keras-applications/archive/1.0.8.tar.gz -> keras-applications-1.0.8.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b04a2c3dad0e99b606db5200257841de
+_md5_=7d3005a3aa29f72e2d19577fbda77fa2
diff --git a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2 b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2
index 7b0b217f44a3..8146de2ff1b8 100644
--- a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2
+++ b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?] dev-python/scipy[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] dev-python/setuptools[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=Easy data preprocessing and data augmentation for deep learning models
 EAPI=6
 HOMEPAGE=https://keras.io/
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?] dev-python/scipy[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/K/Keras_Preprocessing/Keras_Preprocessing-1.1.2.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4938c7b0c8e0bc4a944a7f255c6c43dd
+_md5_=ee096f546742a452b61f09641d37f1d3
diff --git a/metadata/md5-cache/sci-libs/libint-2.6.0-r5 b/metadata/md5-cache/sci-libs/libint-2.6.0-r5
index a28c69c069ca..553a97e693f4 100644
--- a/metadata/md5-cache/sci-libs/libint-2.6.0-r5
+++ b/metadata/md5-cache/sci-libs/libint-2.6.0-r5
@@ -5,10 +5,10 @@ DESCRIPTION=Matrix elements (integrals) evaluation over Cartesian Gaussian funct
 EAPI=7
 HOMEPAGE=https://github.com/evaleev/libint
 IUSE=static-libs doc
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/fortran
 SLOT=2
 SRC_URI=https://github.com/evaleev/libint/archive/v2.6.0.tar.gz -> libint-2.6.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6646af70bbaedf0e52ea2f7d877bdada
+_md5_=547a187482e19b8c279320c224f45f84
diff --git a/metadata/md5-cache/sci-libs/libqalculate-3.19.0 b/metadata/md5-cache/sci-libs/libqalculate-3.19.0
index d65239636421..9b4bb26a2d4c 100644
--- a/metadata/md5-cache/sci-libs/libqalculate-3.19.0
+++ b/metadata/md5-cache/sci-libs/libqalculate-3.19.0
@@ -5,10 +5,10 @@ DESCRIPTION=A modern multi-purpose calculator library
 EAPI=7
 HOMEPAGE=https://qalculate.github.io/
 IUSE=curl icu gnuplot readline
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= dev-libs/libxml2:2 dev-libs/mpfr:0= virtual/libiconv curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) gnuplot? ( >=sci-visualization/gnuplot-3.7 )
 SLOT=0/21
 SRC_URI=https://github.com/Qalculate/libqalculate/releases/download/v3.19.0/libqalculate-3.19.0.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a8615ab093520a02123bfdbba48d3329
+_md5_=f2f35046f5323aab3a813c0774854e52
diff --git a/metadata/md5-cache/sci-libs/libqalculate-3.20.1-r1 b/metadata/md5-cache/sci-libs/libqalculate-3.20.1-r1
new file mode 100644
index 000000000000..faeedc363f81
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libqalculate-3.20.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/gmp:0= dev-libs/libxml2:2 dev-libs/mpfr:0= virtual/libiconv curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= )
+DESCRIPTION=A modern multi-purpose calculator library
+EAPI=7
+HOMEPAGE=https://qalculate.github.io/
+IUSE=curl icu gnuplot readline
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0= dev-libs/libxml2:2 dev-libs/mpfr:0= virtual/libiconv curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) gnuplot? ( >=sci-visualization/gnuplot-3.7 )
+SLOT=0/22
+SRC_URI=https://github.com/Qalculate/libqalculate/releases/download/v3.20.1/libqalculate-3.20.1.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=10e6f92b0811080b0f60e7e8c394b1f1
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.5.0-r1 b/metadata/md5-cache/sci-libs/tensorflow-2.5.0-r1
new file mode 100644
index 000000000000..8311a882c984
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.5.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip >=dev-libs/protobuf-3.8.0 dev-java/java-config >=dev-util/bazel-3.7.2 cuda? ( >=dev-util/nvidia-cuda-toolkit-9.1[profiler] ) !python? ( dev-lang/python ) python? ( dev-python/cython dev-python/mock >=dev-python/grpcio-tools-1.28 ) >=dev-util/bazel-0.20
+DEFINED_PHASES=compile configure install prepare pretend setup unpack
+DEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev-libs/icu:= >=dev-libs/jsoncpp-1.9.2 dev-libs/libpcre dev-libs/nsync dev-libs/openssl:0= >=dev-libs/protobuf-3.13.0:= >=dev-libs/re2-0.2019.06.01:= media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.28:= net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2 cuda? ( || ( ( =dev-util/nvidia-cuda-toolkit-11.1*[profiler] =dev-libs/cudnn-8* ) ( =dev-util/nvidia-cuda-toolkit-11.2*[profiler] =dev-libs/cudnn-8* ) ) ) mpi? ( virtual/mpi ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/flatbuffers-1.12.0:= dev-python/absl-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astor-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/astunparse[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dill[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flatbuffers[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/gast-0.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-pasta-0.1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/opt-einsum-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/grpcio-1.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wrapt-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/keras-preprocessing-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-visualization/tensorboard-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python? ( dev-python/mock dev-python/setuptools )
+DESCRIPTION=Computation framework using data flow graphs for scalable machine learning
+EAPI=7
+HOMEPAGE=https://www.tensorflow.org/
+IUSE=cuda mpi +python xla cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+PDEPEND=python? ( >=sci-libs/tensorflow-estimator-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev-libs/icu:= >=dev-libs/jsoncpp-1.9.2 dev-libs/libpcre dev-libs/nsync dev-libs/openssl:0= >=dev-libs/protobuf-3.13.0:= >=dev-libs/re2-0.2019.06.01:= media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.28:= net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2 cuda? ( || ( ( =dev-util/nvidia-cuda-toolkit-11.1*[profiler] =dev-libs/cudnn-8* ) ( =dev-util/nvidia-cuda-toolkit-11.2*[profiler] =dev-libs/cudnn-8* ) ) ) mpi? ( virtual/mpi ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/flatbuffers-1.12.0:= dev-python/absl-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astor-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/astunparse[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dill[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flatbuffers[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/gast-0.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-pasta-0.1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/opt-einsum-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/grpcio-1.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wrapt-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/keras-preprocessing-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-visualization/tensorboard-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.5.0.tar.gz -> tensorflow-2.5.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.5.0-r1.tar.bz2 https://github.com/abseil/abseil-cpp/archive/6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz -> abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip -> ruy-54774a7a2cf85963777289193629d4bd42de4a59.zip https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz -> llvm-1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/oneapi-src/oneDNN/archive/v2.2.tar.gz -> oneDNN-v2.2.tar.gz https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip -> pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz https://github.com/tensorflow/toolchains/archive/v1.1.10.tar.gz -> tensorflow-toolchains-v1.1.10.tar.gz https://gitlab.com/libeigen/eigen/-/archive/f612df273689a19d25b45ca4f8269463207c4fee/eigen-f612df273689a19d25b45ca4f8269463207c4fee.tar.gz cuda? ( https://github.com/NVIDIA/cudnn-frontend/archive/360d6e7164dfb7c802493fd1c0464f0d815b852a.zip -> cudnn-frontend-360d6e7164dfb7c802493fd1c0464f0d815b852a.zip https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip https://github.com/nvidia/nccl/archive/v2.8.3-1.tar.gz -> nvidia-nccl-v2.8.3-1.tar.gz ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
+_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=10efa1d4dabffaab17a1f7d5a3d42a9f
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.5.0 b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.5.0
index 41e862f60f12..c252bd8ce2fb 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.5.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.5.0
@@ -1,15 +1,15 @@
-BDEPEND=app-arch/unzip dev-java/java-config >=dev-util/bazel-3 >=dev-util/bazel-0.20 python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=app-arch/unzip dev-java/java-config >=dev-util/bazel-3 >=dev-util/bazel-0.20 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sci-libs/tensorflow[python,python_targets_python3_8(-)?]
+DEPEND=sci-libs/tensorflow[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=A high-level TensorFlow API that greatly simplifies machine learning programming
 EAPI=7
 HOMEPAGE=https://www.tensorflow.org/
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=sci-libs/tensorflow[python,python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=sci-libs/tensorflow[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/estimator/archive/v2.5.0.tar.gz -> tensorflow-estimator-2.5.0.tar.gz https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
 _eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=64806b5aea78f0d733a7824d134047d8
+_md5_=6a5bbe15a915fd1aa9937133b8e2dc2d
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index fccb7dba710d..68b0b25ab69d 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.11b b/metadata/md5-cache/sci-mathematics/z3-4.8.11b
index 4834b24b38c8..f95a1c832650 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.11b
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.11b
@@ -5,11 +5,11 @@ DESCRIPTION=An efficient theorem prover
 EAPI=7
 HOMEPAGE=https://github.com/Z3Prover/z3/
 IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0/4.8
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.11b.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1a650c7ff5a151d1fba4940c596fffd4
+_md5_=d59f7ec3f79daffd0e141196ff69670d
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 58c1a5c393d5..784f339b15e8 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1 b/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
index 452405905f3a..aa03b0856377 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.4.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
-_md5_=bcc360bc00f3d21eace54926a45c5b0c
+_md5_=ca3d483e634884770c772817bc0096f9
diff --git a/metadata/md5-cache/sci-visualization/tensorboard-2.5.0 b/metadata/md5-cache/sci-visualization/tensorboard-2.5.0
index f09b56b5a75e..bb104ee5ceb5 100644
--- a/metadata/md5-cache/sci-visualization/tensorboard-2.5.0
+++ b/metadata/md5-cache/sci-visualization/tensorboard-2.5.0
@@ -1,15 +1,15 @@
-BDEPEND=app-arch/unzip python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
+BDEPEND=app-arch/unzip python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=install prepare
 DESCRIPTION=TensorFlow's Visualization Toolkit
 EAPI=7
 HOMEPAGE=https://www.tensorflow.org/
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-PDEPEND=sci-libs/tensorflow[python,python_targets_python3_8(-)?]
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] dev-python/bleach[python_targets_python3_8(-)?] >=dev-python/google-auth-1.6.3[python_targets_python3_8(-)?] >=dev-python/google-auth-oauthlib-0.4.1[python_targets_python3_8(-)?] dev-python/grpcio[python_targets_python3_8(-)?] dev-python/html5lib[python_targets_python3_8(-)?] dev-python/markdown[python_targets_python3_8(-)?] dev-python/numpy[python_targets_python3_8(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] >=dev-python/setuptools-41[python_targets_python3_8(-)?] dev-python/werkzeug[python_targets_python3_8(-)?] dev-python/wheel[python_targets_python3_8(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+PDEPEND=sci-libs/tensorflow[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/bleach[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.6.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-oauthlib-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-41[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/py3/t/tensorboard/tensorboard-2.5.0-py3-none-any.whl -> tensorboard-2.5.0.zip
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=274edc44854bf0e1035f946a1af40b77
+_md5_=ab17d8823e9f217f838624ea76102210
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 79c4f6bfa404..e9939bb73ae7 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/checkpolicy-3.2 b/metadata/md5-cache/sys-apps/checkpolicy-3.2
index fabcf2d20cf7..1d042cf9a6d1 100644
--- a/metadata/md5-cache/sys-apps/checkpolicy-3.2
+++ b/metadata/md5-cache/sys-apps/checkpolicy-3.2
@@ -5,10 +5,10 @@ DESCRIPTION=SELinux policy compiler
 EAPI=7
 HOMEPAGE=http://userspace.selinuxproject.org
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-3.2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/checkpolicy-3.2.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a555fc862c894a964079f2d6a40e2e36
+_md5_=0334050a1390e65cda8314d0aba2f30e
diff --git a/metadata/md5-cache/sys-apps/earlyoom-1.6.2 b/metadata/md5-cache/sys-apps/earlyoom-1.6.2
index ee6f096eadcc..81791b9fa7ff 100644
--- a/metadata/md5-cache/sys-apps/earlyoom-1.6.2
+++ b/metadata/md5-cache/sys-apps/earlyoom-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Early OOM Daemon for Linux
 EAPI=7
 HOMEPAGE=https://github.com/rfjakob/earlyoom
 IUSE=docs systemd test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT-with-advertising
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rfjakob/earlyoom/archive/v1.6.2.tar.gz -> earlyoom-1.6.2.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b576f0dd9789d5466fb41d40da98a2e9
+_md5_=f553a669742c33c237a63b3c6bd43d5c
diff --git a/metadata/md5-cache/sys-apps/fix-gnustack-0.1 b/metadata/md5-cache/sys-apps/fix-gnustack-0.1
index c00e6e00dd34..1806ee72281c 100644
--- a/metadata/md5-cache/sys-apps/fix-gnustack-0.1
+++ b/metadata/md5-cache/sys-apps/fix-gnustack-0.1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=-
 DEPEND=dev-libs/elfutils
 DESCRIPTION=Utility to report and remove the executable flag from an ELF object's GNU_STACK
-EAPI=5
+EAPI=7
 HOMEPAGE=https://dev.gentoo.org/~blueness/fix-gnustack
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/elfutils
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/fix-gnustack/fix-gnustack-0.1.tar.bz2
-_md5_=6d35ef5f45c3433cfbcfd091812e1a30
+_md5_=8ef0170e062baa8321345e06f1605729
diff --git a/metadata/md5-cache/sys-apps/hotplug2stdout-1.2.1 b/metadata/md5-cache/sys-apps/hotplug2stdout-1.2.1
index e1473741e4dd..5da198671a6c 100644
--- a/metadata/md5-cache/sys-apps/hotplug2stdout-1.2.1
+++ b/metadata/md5-cache/sys-apps/hotplug2stdout-1.2.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=A tool for reading kernel uevent(s) to stdout
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.bellut.net/projects.html
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/hotplug2stdout-1.2.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b7fc4f6d04a03db02d4fff2b5b720eb3
+_md5_=c5681b7518343c85d87ff40c9b534199
diff --git a/metadata/md5-cache/sys-apps/man-db-2.9.4 b/metadata/md5-cache/sys-apps/man-db-2.9.4
deleted file mode 100644
index c0fa21de80b7..000000000000
--- a/metadata/md5-cache/sys-apps/man-db-2.9.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( >=app-text/po4a-0.45 sys-devel/gettext virtual/libiconv virtual/libintl ) virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare setup unpack
-DEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff gdbm? ( sys-libs/gdbm:= ) !gdbm? ( berkdb? ( sys-libs/db:= ) ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib )
-DESCRIPTION=a man replacement that utilizes berkdb instead of flat files
-EAPI=7
-HOMEPAGE=http://www.nongnu.org/man-db/
-IUSE=berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-PDEPEND=manpager? ( app-text/manpager )
-RDEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff gdbm? ( sys-libs/gdbm:= ) !gdbm? ( berkdb? ( sys-libs/db:= ) ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) acct-group/man acct-user/man selinux? ( sec-policy/selinux-mandb )
-SLOT=0
-SRC_URI=mirror://nongnu/man-db/man-db-2.9.4.tar.xz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1201015b2ef16ca9833e77ef38c511ef
diff --git a/metadata/md5-cache/sys-apps/man-db-2.9.4-r1 b/metadata/md5-cache/sys-apps/man-db-2.9.4-r1
new file mode 100644
index 000000000000..02ffa373f627
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/man-db-2.9.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( >=app-text/po4a-0.45 sys-devel/gettext virtual/libiconv virtual/libintl ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare setup unpack
+DEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff gdbm? ( sys-libs/gdbm:= ) !gdbm? ( berkdb? ( sys-libs/db:= ) ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib )
+DESCRIPTION=A man replacement that utilizes berkdb instead of flat files
+EAPI=7
+HOMEPAGE=http://www.nongnu.org/man-db/
+IUSE=berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+PDEPEND=manpager? ( app-text/manpager )
+RDEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff gdbm? ( sys-libs/gdbm:= ) !gdbm? ( berkdb? ( sys-libs/db:= ) ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) acct-group/man acct-user/man selinux? ( sec-policy/selinux-mandb ) virtual/tmpfiles
+SLOT=0
+SRC_URI=mirror://nongnu/man-db/man-db-2.9.4.tar.xz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e75d03d3796eb9ab4605be197c657482
diff --git a/metadata/md5-cache/sys-apps/man-db-9999 b/metadata/md5-cache/sys-apps/man-db-9999
index 1b915a75cfa7..f64af8b4e0d5 100644
--- a/metadata/md5-cache/sys-apps/man-db-9999
+++ b/metadata/md5-cache/sys-apps/man-db-9999
@@ -1,14 +1,14 @@
 BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( >=app-text/po4a-0.45 sys-devel/gettext virtual/libiconv virtual/libintl ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst preinst prepare setup unpack
 DEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff gdbm? ( sys-libs/gdbm:= ) !gdbm? ( berkdb? ( sys-libs/db:= ) ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib )
-DESCRIPTION=a man replacement that utilizes berkdb instead of flat files
+DESCRIPTION=A man replacement that utilizes berkdb instead of flat files
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/man-db/
 IUSE=berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib
 LICENSE=GPL-3
 PDEPEND=manpager? ( app-text/manpager )
 PROPERTIES=live
-RDEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff gdbm? ( sys-libs/gdbm:= ) !gdbm? ( berkdb? ( sys-libs/db:= ) ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) acct-group/man acct-user/man selinux? ( sec-policy/selinux-mandb )
+RDEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff gdbm? ( sys-libs/gdbm:= ) !gdbm? ( berkdb? ( sys-libs/db:= ) ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) acct-group/man acct-user/man selinux? ( sec-policy/selinux-mandb ) virtual/tmpfiles
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5b268f178d71ddb28410d57317e9d199
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8f523c92948712e7bde20fdd72c01700
diff --git a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200120 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200120
index ba9bf7c2ab9b..58a5e6aa7bb8 100644
--- a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200120
+++ b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200120
@@ -3,10 +3,10 @@ DEPEND=app-eselect/eselect-awk
 DESCRIPTION=An (often faster than gawk) awk-interpreter
 EAPI=7
 HOMEPAGE=https://invisible-island.net/mawk/mawk.html
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-awk
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/mawk/mawk-1.3.4-20200120.tgz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a9866572452bc2efd00849880ce45241
+_md5_=99c09b81201938783f0f299c3cd9917d
diff --git a/metadata/md5-cache/sys-apps/mcstrans-3.2 b/metadata/md5-cache/sys-apps/mcstrans-3.2
index 6be1a18b77fb..3f29e535b897 100644
--- a/metadata/md5-cache/sys-apps/mcstrans-3.2
+++ b/metadata/md5-cache/sys-apps/mcstrans-3.2
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= dev-libs/libpcre:=
 DESCRIPTION=SELinux context translation to human readable names
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:=
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/mcstrans-3.2.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a6ab689d72e448f0128cc86cc71e75dd
+_md5_=45537357c46b651da730c8c98b0905cf
diff --git a/metadata/md5-cache/sys-apps/memtest86-bin-9.1 b/metadata/md5-cache/sys-apps/memtest86-bin-9.1
deleted file mode 100644
index c9fd763e0095..000000000000
--- a/metadata/md5-cache/sys-apps/memtest86-bin-9.1
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/unzip sys-fs/fatcat
-DEFINED_PHASES=install postinst postrm preinst prerm pretend unpack
-DESCRIPTION=Stand alone memory testing software for x86 computers
-EAPI=7
-HOMEPAGE=http://www.memtest86.com/
-KEYWORDS=-* ~amd64
-LICENSE=PassMark-EULA
-SLOT=0
-SRC_URI=https://www.memtest86.com/downloads/memtest86-usb.zip -> memtest86-bin-9.1.zip
-_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557
-_md5_=d27e646b93d8264428e02edc14885fc1
diff --git a/metadata/md5-cache/sys-apps/memtest86-bin-9.2 b/metadata/md5-cache/sys-apps/memtest86-bin-9.2
new file mode 100644
index 000000000000..7dc9d7be4f20
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/memtest86-bin-9.2
@@ -0,0 +1,11 @@
+BDEPEND=app-arch/unzip sys-fs/fatcat
+DEFINED_PHASES=install postinst postrm preinst prerm pretend unpack
+DESCRIPTION=Stand alone memory testing software for x86 computers
+EAPI=7
+HOMEPAGE=http://www.memtest86.com/
+KEYWORDS=-* ~amd64
+LICENSE=PassMark-EULA
+SLOT=0
+SRC_URI=https://www.memtest86.com/downloads/memtest86-usb.zip -> memtest86-bin-9.2.zip
+_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557
+_md5_=d27e646b93d8264428e02edc14885fc1
diff --git a/metadata/md5-cache/sys-apps/pmount-gui-0_pre20130806 b/metadata/md5-cache/sys-apps/pmount-gui-0_pre20130806
index 42207dbe2e96..e960fabf4fab 100644
--- a/metadata/md5-cache/sys-apps/pmount-gui-0_pre20130806
+++ b/metadata/md5-cache/sys-apps/pmount-gui-0_pre20130806
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
+DEPEND=x11-libs/gtk+:2
 DESCRIPTION=A simple graphical frontend for pmount
-EAPI=5
+EAPI=7
 HOMEPAGE=http://git.tdb.fi/?p=pmount-gui.git;a=summary
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
@@ -9,4 +10,4 @@ RDEPEND=x11-libs/gtk+:2 sys-apps/pmount virtual/udev
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ssuominen/pmount-gui-0_pre20130806.tar.xz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=87a6648e3c5de3361b31180dd132237f
+_md5_=3b552098e628861625a35724c3a39649
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-3.2 b/metadata/md5-cache/sys-apps/policycoreutils-3.2
index 893a11d04dd1..e2c094d3b264 100644
--- a/metadata/md5-cache/sys-apps/policycoreutils-3.2
+++ b/metadata/md5-cache/sys-apps/policycoreutils-3.2
@@ -5,7 +5,7 @@ DESCRIPTION=SELinux core utilities
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=audit pam split-usr python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=GPL-2
 PDEPEND=sys-apps/semodule-utils sys-apps/selinux-python
 RDEPEND=>=sys-libs/libselinux-3.2:=[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-libs/libsemanage-3.2:=[python(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-libs/libsepol-3.2:= sys-libs/libcap-ng:= >=app-admin/setools-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] audit? ( >=sys-process/audit-1.5.1[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) pam? ( sys-libs/pam:= ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-misc/pax-utils
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/policycoreutils-3.2.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.37.tar.bz2
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=80bec2ed3172589da7ea3932b7c943ee
+_md5_=4bfb3bbf06a2b2abb8e13bc1b228db51
diff --git a/metadata/md5-cache/sys-apps/progress-0.15 b/metadata/md5-cache/sys-apps/progress-0.15
deleted file mode 100644
index d88d3d7e4f7b..000000000000
--- a/metadata/md5-cache/sys-apps/progress-0.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses virtual/pkgconfig
-DESCRIPTION=Coreutils Viewer: show progress for cp, rm, dd, and so forth
-EAPI=5
-HOMEPAGE=https://github.com/Xfennec/progress
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses
-SLOT=0
-SRC_URI=https://github.com/Xfennec/progress/archive/v0.15.tar.gz -> progress-0.15.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=301f69b26b6a72c3075f6dc952020f78
diff --git a/metadata/md5-cache/sys-apps/progress-0.15-r1 b/metadata/md5-cache/sys-apps/progress-0.15-r1
new file mode 100644
index 000000000000..5c8f0b635b7b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/progress-0.15-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/ncurses:=
+DESCRIPTION=Coreutils Viewer: show progress for cp, rm, dd, and so forth
+EAPI=7
+HOMEPAGE=https://github.com/Xfennec/progress
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:=
+SLOT=0
+SRC_URI=https://github.com/Xfennec/progress/archive/v0.15.tar.gz -> progress-0.15.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dd59403dff23fcc566957aef69bf5967
diff --git a/metadata/md5-cache/sys-apps/restorecond-3.2 b/metadata/md5-cache/sys-apps/restorecond-3.2
index 2beb43e7c393..991a18958fc9 100644
--- a/metadata/md5-cache/sys-apps/restorecond-3.2
+++ b/metadata/md5-cache/sys-apps/restorecond-3.2
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:=
 DESCRIPTION=Daemon to watch for creation and set default SELinux fcontexts
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:=
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/restorecond-3.2.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=516d86b1ec28cc22883bdd4d6c9f435a
+_md5_=899f47a4760f7ff8de259994e7893211
diff --git a/metadata/md5-cache/sys-apps/secilc-3.2 b/metadata/md5-cache/sys-apps/secilc-3.2
index e167079b722a..917433503d1a 100644
--- a/metadata/md5-cache/sys-apps/secilc-3.2
+++ b/metadata/md5-cache/sys-apps/secilc-3.2
@@ -4,11 +4,11 @@ DEPEND=>=sys-libs/libsepol-3.2
 DESCRIPTION=SELinux Common Intermediate Language (CIL) Compiler
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-3.2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/secilc-3.2.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bfbc0ec7490138afd88ac2d569f678f6
+_md5_=522ed6295c1d99a3b733b0db37e07320
diff --git a/metadata/md5-cache/sys-apps/selinux-python-3.2 b/metadata/md5-cache/sys-apps/selinux-python-3.2
index b251a67eebf8..771710aee18f 100644
--- a/metadata/md5-cache/sys-apps/selinux-python-3.2
+++ b/metadata/md5-cache/sys-apps/selinux-python-3.2
@@ -5,7 +5,7 @@ DESCRIPTION=SELinux core utilities
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libselinux-3.2:=[python] >=sys-libs/libsemanage-3.2:=[python(+)] >=sys-libs/libsepol-3.2:= >=app-admin/setools-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-process/audit-1.5.1[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/selinux-python-3.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1c70dbfd4e4770d7a5c63b58b4af0542
+_md5_=78c4ebde8f0ba62b3a052f2970b8d983
diff --git a/metadata/md5-cache/sys-apps/semodule-utils-3.2 b/metadata/md5-cache/sys-apps/semodule-utils-3.2
index 0f18dcfbf690..24c09aea0a02 100644
--- a/metadata/md5-cache/sys-apps/semodule-utils-3.2
+++ b/metadata/md5-cache/sys-apps/semodule-utils-3.2
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/libsepol-3.2:=
 DESCRIPTION=SELinux policy module utilities
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-3.2:=
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/semodule-utils-3.2.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e2d89ed0e9b1ae8fa7164847e1b8881c
+_md5_=7b48f03b66a386f6fcda80538cf8def2
diff --git a/metadata/md5-cache/sys-apps/unscd-0.54-r1 b/metadata/md5-cache/sys-apps/unscd-0.54-r1
index 77be90d8022f..5de782e909fe 100644
--- a/metadata/md5-cache/sys-apps/unscd-0.54-r1
+++ b/metadata/md5-cache/sys-apps/unscd-0.54-r1
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install postinst unpack
 DEPEND=sys-libs/glibc[nscd(+)]
 DESCRIPTION=simple & stable nscd replacement
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/glibc[nscd(+)] virtual/tmpfiles
 SLOT=0
 SRC_URI=https://busybox.net/~vda/unscd/nscd-0.54.c -> nscd-0.54-r1.c
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4ce4706ab4efa9a76cc4f3123d522f33
+_md5_=3ef19520f285153f8b1c0f66dfa094ed
diff --git a/metadata/md5-cache/sys-apps/usbguard-0.7.6-r1 b/metadata/md5-cache/sys-apps/usbguard-0.7.6-r1
deleted file mode 100644
index ce72b00bf1d1..000000000000
--- a/metadata/md5-cache/sys-apps/usbguard-0.7.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( >=dev-libs/dbus-glib-0.100 dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
-DESCRIPTION=Daemon protecting your computer against BadUSB
-EAPI=7
-HOMEPAGE=https://github.com/USBGuard/usbguard
-IUSE=bash-completion dbus ldap policykit systemd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( >=dev-libs/dbus-glib-0.100 dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) virtual/udev
-REQUIRED_USE=policykit? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-0.7.6/usbguard-0.7.6.tar.gz
-_md5_=09013264e89f028677e6ab975b24f2f9
diff --git a/metadata/md5-cache/sys-apps/usbguard-0.7.8 b/metadata/md5-cache/sys-apps/usbguard-0.7.8
deleted file mode 100644
index 3cdebcd7e629..000000000000
--- a/metadata/md5-cache/sys-apps/usbguard-0.7.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
-DESCRIPTION=Daemon protecting your computer against BadUSB
-EAPI=7
-HOMEPAGE=https://github.com/USBGuard/usbguard
-IUSE=bash-completion dbus ldap policykit static-libs systemd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) virtual/udev
-REQUIRED_USE=policykit? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-0.7.8/usbguard-0.7.8.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8d5fc419ad60e4942c92820e12b3b624
diff --git a/metadata/md5-cache/sys-apps/usbguard-1.0.0 b/metadata/md5-cache/sys-apps/usbguard-1.0.0
deleted file mode 100644
index 8b0931069b41..000000000000
--- a/metadata/md5-cache/sys-apps/usbguard-1.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
-DESCRIPTION=Daemon protecting your computer against BadUSB
-EAPI=7
-HOMEPAGE=https://github.com/USBGuard/usbguard
-IUSE=bash-completion dbus ldap policykit static-libs systemd test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) virtual/udev
-REQUIRED_USE=policykit? ( dbus ) test? ( static-libs )
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-1.0.0/usbguard-1.0.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ef1de997173c33d225da8c67e79c5383
diff --git a/metadata/md5-cache/sys-apps/usbguard-1.0.0-r1 b/metadata/md5-cache/sys-apps/usbguard-1.0.0-r1
deleted file mode 100644
index fb584d642464..000000000000
--- a/metadata/md5-cache/sys-apps/usbguard-1.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) umockdev? ( dev-util/umockdev ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
-DESCRIPTION=Daemon protecting your computer against BadUSB
-EAPI=7
-HOMEPAGE=https://github.com/USBGuard/usbguard
-IUSE=bash-completion dbus ldap policykit static-libs systemd test umockdev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 bash-completion? ( >=app-shells/bash-completion-2.0 ) dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) umockdev? ( dev-util/umockdev ) virtual/udev
-REQUIRED_USE=policykit? ( dbus ) test? ( static-libs )
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-1.0.0/usbguard-1.0.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a8540dadec9ab88e3bd167740c262750
diff --git a/metadata/md5-cache/sys-apps/usbguard-1.0.0-r2 b/metadata/md5-cache/sys-apps/usbguard-1.0.0-r2
new file mode 100644
index 000000000000..3fb96aaf4b9b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/usbguard-1.0.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) umockdev? ( dev-util/umockdev ) app-text/asciidoc dev-cpp/catch:1 dbus? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gdbus-codegen )
+DESCRIPTION=Daemon protecting your computer against BadUSB
+EAPI=7
+HOMEPAGE=https://github.com/USBGuard/usbguard
+IUSE=dbus ldap policykit static-libs systemd test umockdev
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=<dev-libs/pegtl-3 >=dev-libs/libsodium-0.4.5:= >=dev-libs/protobuf-2.5.0:= >=sys-cluster/libqb-0.16.0:= sys-devel/gcc:*[cxx] >=sys-libs/libcap-ng-0.7.0 >=sys-libs/libseccomp-2.0.0 >=sys-process/audit-2.7.7 dbus? ( dev-libs/glib:2 sys-apps/dbus policykit? ( sys-auth/polkit[introspection] ) ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd ) umockdev? ( dev-util/umockdev ) virtual/udev
+REQUIRED_USE=policykit? ( dbus ) test? ( static-libs )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-1.0.0/usbguard-1.0.0.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0b9cf9c0208df0a03075996af59c2338
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.37.1 b/metadata/md5-cache/sys-apps/util-linux-2.37.1
index c98388826126..9dc219cc0a34 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.37.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.37.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.1.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c5897c9f64a0e09eae32cd5d54e8b524
+_md5_=f0e00bffd2e7476ba285c5ea59b8a5d8
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 41aeca17e156..8af95cf1714d 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3
index d880cdcc17ec..4ed4aae53cc5 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.11.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	s6	16867a2a1f9a98a096c53221e1294a22	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fe17d282a2918c4c0041635803fe27d4
+_md5_=3eb48a65e6bf35334f92821a664cb2c1
diff --git a/metadata/md5-cache/sys-auth/polkit-qt-0.114.0 b/metadata/md5-cache/sys-auth/polkit-qt-0.114.0
index 4bca9ff46010..3ede543642a1 100644
--- a/metadata/md5-cache/sys-auth/polkit-qt-0.114.0
+++ b/metadata/md5-cache/sys-auth/polkit-qt-0.114.0
@@ -5,10 +5,10 @@ DESCRIPTION=Qt wrapper around polkit-1 client libraries
 EAPI=7
 HOMEPAGE=https://api.kde.org/polkit-qt-1/html/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-0.103
 SLOT=0
 SRC_URI=mirror://kde/stable/polkit-qt-1/polkit-qt-1-0.114.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=85854b53ed02eb9cb5f6cf605326e405
+_md5_=7aaaf25765d48378a07adf5971ee7150
diff --git a/metadata/md5-cache/sys-auth/yubico-piv-tool-2.2.0-r1 b/metadata/md5-cache/sys-auth/yubico-piv-tool-2.2.0-r1
index ca838ebbe622..9f6d3eaaa2a6 100644
--- a/metadata/md5-cache/sys-auth/yubico-piv-tool-2.2.0-r1
+++ b/metadata/md5-cache/sys-auth/yubico-piv-tool-2.2.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/gengetopt sys-apps/help2man virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/pcsc-lite dev-libs/openssl:0=[-bindist(-)] test? ( dev-libs/check )
+DEPEND=sys-apps/pcsc-lite <dev-libs/openssl-3.0.0:0=[-bindist(-)] test? ( dev-libs/check )
 DESCRIPTION=Command-line tool and p11-kit module for the YubiKey PIV application
 EAPI=7
 HOMEPAGE=https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool
 IUSE=test
 KEYWORDS=amd64
 LICENSE=BSD-2
-RDEPEND=sys-apps/pcsc-lite dev-libs/openssl:0=[-bindist(-)]
+RDEPEND=sys-apps/pcsc-lite <dev-libs/openssl-3.0.0:0=[-bindist(-)]
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-2.2.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=347a23752feb0ff779f1f9190ab400a6
+_md5_=6499c122e12508db0853ca5c360fbb4c
diff --git a/metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25 b/metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25
index 51c78ad5c2da..104d36a59cc2 100644
--- a/metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25
+++ b/metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Yubico/yubikey-personalization-gui/archive/yubikey-personalization-gui-3.1.25.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0518f6980c872df87085e1e0d85f573f
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=460bd39468a24479f757a514611180a2
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 9e0aff34cb6c..5d6f23f0f5a1 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/ndctl-71.1-r1 b/metadata/md5-cache/sys-block/ndctl-71.1-r1
deleted file mode 100644
index f14810022e9a..000000000000
--- a/metadata/md5-cache/sys-block/ndctl-71.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/asciidoc app-text/xmlto sys-devel/libtool virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/json-c:= sys-apps/keyutils:= sys-apps/kmod:= sys-apps/util-linux:= virtual/libudev:= systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Helper tools and libraries for managing non-volatile memory on Linux
-EAPI=7
-HOMEPAGE=https://github.com/pmem/ndctl
-IUSE=bash-completion systemd test
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT CC0-1.0
-RDEPEND=dev-libs/json-c:= sys-apps/keyutils:= sys-apps/kmod:= sys-apps/util-linux:= virtual/libudev:= systemd? ( sys-apps/systemd:= )
-RESTRICT=!test? ( test ) test
-SLOT=0/6
-SRC_URI=https://github.com/pmem/ndctl/archive/v71.1.tar.gz -> ndctl-71.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b450382c5ae418498128f40e4139ff32
diff --git a/metadata/md5-cache/sys-block/ndctl-71.1-r2 b/metadata/md5-cache/sys-block/ndctl-71.1-r2
new file mode 100644
index 000000000000..6951f79b2970
--- /dev/null
+++ b/metadata/md5-cache/sys-block/ndctl-71.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-text/asciidoc app-text/xmlto sys-devel/libtool virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/json-c:= sys-apps/keyutils:= sys-apps/kmod:= sys-apps/util-linux:= virtual/libudev:= systemd? ( sys-apps/systemd:= )
+DESCRIPTION=Helper tools and libraries for managing non-volatile memory on Linux
+EAPI=7
+HOMEPAGE=https://github.com/pmem/ndctl
+IUSE=bash-completion systemd test
+KEYWORDS=amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT CC0-1.0
+RDEPEND=dev-libs/json-c:= sys-apps/keyutils:= sys-apps/kmod:= sys-apps/util-linux:= virtual/libudev:= systemd? ( sys-apps/systemd:= )
+RESTRICT=!test? ( test ) test
+SLOT=0/6
+SRC_URI=https://github.com/pmem/ndctl/archive/v71.1.tar.gz -> ndctl-71.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=79900f1c4c4f3aa92d16e91ec4485656
diff --git a/metadata/md5-cache/sys-block/parted-3.4 b/metadata/md5-cache/sys-block/parted-3.4
index 670d13787823..2d0b83311cb5 100644
--- a/metadata/md5-cache/sys-block/parted-3.4
+++ b/metadata/md5-cache/sys-block/parted-3.4
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-fs/e2fsprogs-1.27 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/ncurses-5.7-r7:0= >=sys-libs/readline-5.2:0= ) elibc_uclibc? ( dev-libs/libiconv )
 SLOT=0
 SRC_URI=mirror://gnu/parted/parted-3.4.tar.xz verify-sig? ( mirror://gnu/parted/parted-3.4.tar.xz.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4ddcf01805bcc32174dc9c9a1883812f
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3110586928f47a1b1866f2f7c110c2d6
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 637b3b7bc5ca..c73b121440b4 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/aboot-9999 b/metadata/md5-cache/sys-boot/aboot-9999
new file mode 100644
index 000000000000..9ec15d3c147c
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/aboot-9999
@@ -0,0 +1,10 @@
+BDEPEND=app-text/docbook-sgml-utils >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Alpha Linux boot loader for SRM
+EAPI=7
+HOMEPAGE=https://github.com/mattst88/aboot https://sourceforge.net/projects/aboot/
+LICENSE=GPL-2
+PROPERTIES=live
+SLOT=0
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=582b8ca932bc4f9d6556600b1182e2cb
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index cf3ca9faeb77..5d78dfdcd20d 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.21-r2 b/metadata/md5-cache/sys-cluster/ceph-14.2.21-r2
index 104c51182421..82da431a70fd 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.21-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.21-r2
@@ -13,4 +13,4 @@ RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.21.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ce83b5ede747798d77b805a690dd3032
+_md5_=7afdbf0123cc08476d732767d9ce55cb
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.22 b/metadata/md5-cache/sys-cluster/ceph-14.2.22
index c14e7a027c0c..294a05cfdc29 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.22
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.22
@@ -13,4 +13,4 @@ RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.22.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3985323e9c3ab37fd0347c50f0687bc8
+_md5_=b71262f4b80f8aca4b9bc777fac1578d
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.12-r2 b/metadata/md5-cache/sys-cluster/ceph-15.2.12-r2
index e316cd790668..1dbe01cc0391 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.12-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.12-r2
@@ -13,4 +13,4 @@ RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.12.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=de0dd03f86ac687241f83d10a1abda80
+_md5_=619483c79e7d8db808ac2d44dd8ea567
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.13-r2 b/metadata/md5-cache/sys-cluster/ceph-15.2.13-r2
index 16e7229142fa..6b788b4df76d 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.13-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.13-r2
@@ -13,4 +13,4 @@ RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.13.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3cbbe807b05e4d31c1440b61f92fdcba
+_md5_=e37a0c58e20df78195dc19260f090fb1
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2 b/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2
index b8bd4efc3df2..b672efcc504f 100644
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2
@@ -13,4 +13,4 @@ RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.4.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=134d2acd6444813fc57555ecae273832
+_md5_=08fe1e531221072af7a4b0933ce9dbe2
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.5 b/metadata/md5-cache/sys-cluster/ceph-16.2.5
index 8c2caca623ad..164b6c2a267a 100644
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.5
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.5
@@ -13,4 +13,4 @@ RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.5.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2fe25e6a28077bfd54c00cb506a8d9a0
+_md5_=6354c0f7d59d36c1d80f283f9cda79b6
diff --git a/metadata/md5-cache/sys-cluster/galera-26.4.8 b/metadata/md5-cache/sys-cluster/galera-26.4.8
index 99ad0255b869..4630cff6a792 100644
--- a/metadata/md5-cache/sys-cluster/galera-26.4.8
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.8
@@ -5,11 +5,11 @@ DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep
 EAPI=7
 HOMEPAGE=https://galeracluster.com
 IUSE=cpu_flags_x86_sse4_2 garbd test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86
 LICENSE=GPL-2 BSD
 RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.galeracluster.com/galera-4/source/galera-4-26.4.8.tar.gz -> galera-26.4.8.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0ef61683d31cb232a12b504e893444c0
+_md5_=c91c6dc3390bf2f7884afbca639b9064
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-7.9-r1 b/metadata/md5-cache/sys-cluster/glusterfs-7.9-r1
index 5ee0bfaeb5c5..28fa15f16011 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-7.9-r1
+++ b/metadata/md5-cache/sys-cluster/glusterfs-7.9-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/7
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/7/7.9/glusterfs-7.9.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7a535594f1da0e829d1b975be6299d32
+_md5_=c7773980f910055656071aad38e7e38d
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-8.3-r1 b/metadata/md5-cache/sys-cluster/glusterfs-8.3-r1
index 197d397b82cb..63e7fab32ba6 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-8.3-r1
+++ b/metadata/md5-cache/sys-cluster/glusterfs-8.3-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/8
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/8/8.3/glusterfs-8.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4f05ae03aab4592258b011f703c181ad
+_md5_=924102ee1f463b22354c4f3af29b448c
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-8.4-r1 b/metadata/md5-cache/sys-cluster/glusterfs-8.4-r1
index 1f44fc6442e3..8c2791af2ec5 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-8.4-r1
+++ b/metadata/md5-cache/sys-cluster/glusterfs-8.4-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/8
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/8/8.4/glusterfs-8.4.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4f05ae03aab4592258b011f703c181ad
+_md5_=924102ee1f463b22354c4f3af29b448c
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-8.5-r1 b/metadata/md5-cache/sys-cluster/glusterfs-8.5-r1
index 1492e5c73ff9..2b54bb426fee 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-8.5-r1
+++ b/metadata/md5-cache/sys-cluster/glusterfs-8.5-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/8
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/8/8.5/glusterfs-8.5.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d677a242c19da3579385bd12d0caa247
+_md5_=6f364397dabbcd7ff55d421772456487
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-9.1-r1 b/metadata/md5-cache/sys-cluster/glusterfs-9.1-r1
index dcca1a2ae539..140650c6294f 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-9.1-r1
+++ b/metadata/md5-cache/sys-cluster/glusterfs-9.1-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/9
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/9/9.1/glusterfs-9.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f8db5373da7b4717603cafaf2e216388
+_md5_=6490271ab5ff8a24de24089b7f15260b
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-9.2-r1 b/metadata/md5-cache/sys-cluster/glusterfs-9.2-r1
index 42d84953708d..13e70e846de0 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-9.2-r1
+++ b/metadata/md5-cache/sys-cluster/glusterfs-9.2-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/9
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/9/9.2/glusterfs-9.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=de25f85513536a4ae62bd3c9a60ca15d
+_md5_=106e96a8a8dfbc4db75a8a2083d1875b
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101 b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
index 23c2b083358a..e3820b644a15 100644
--- a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
+++ b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-11-0-1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c65f947b51a10aae437968a8c0817892
+_md5_=bccb729a6ba2c6ed57fc73711c1fc83c
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 7e2008ba67b2..2d67a165901e 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.71 b/metadata/md5-cache/sys-devel/autoconf-2.71
deleted file mode 100644
index fec1342bd126..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-2.71
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Used to create autoconfiguration files
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
-IUSE=emacs
-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
-LICENSE=GPL-3
-PDEPEND=emacs? ( app-emacs/autoconf-mode )
-RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 >=sys-devel/autoconf-wrapper-15 sys-devel/gnuconfig !~sys-devel/autoconf-2.71:2.5
-SLOT=2.71
-SRC_URI=mirror://gnu/autoconf/autoconf-2.71.tar.xz -> autoconf-2.71.tar.xz https://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.71.tar.xz -> autoconf-2.71.tar.xz
-_eclasses_=toolchain-autoconf	c85a87c2280cd1204e1433d3e1123e41
-_md5_=c5fde1bd42a8c697465a56f40b902710
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.71-r1 b/metadata/md5-cache/sys-devel/autoconf-2.71-r1
new file mode 100644
index 000000000000..44a1f8b86c0b
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/autoconf-2.71-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6
+DEFINED_PHASES=configure install prepare test
+DESCRIPTION=Used to create autoconfiguration files
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
+IUSE=emacs
+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
+LICENSE=GPL-3
+PDEPEND=emacs? ( app-emacs/autoconf-mode )
+RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 >=sys-devel/autoconf-wrapper-15 sys-devel/gnuconfig !~sys-devel/autoconf-2.71:2.5
+SLOT=2.71
+SRC_URI=mirror://gnu/autoconf/autoconf-2.71.tar.xz -> autoconf-2.71.tar.xz https://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.71.tar.xz -> autoconf-2.71.tar.xz
+_eclasses_=toolchain-autoconf	c85a87c2280cd1204e1433d3e1123e41
+_md5_=ffb998eabf22fa78cb148f0d0f47e063
diff --git a/metadata/md5-cache/sys-devel/autoconf-9999 b/metadata/md5-cache/sys-devel/autoconf-9999
index 686ecb980e12..36d64bc87ff9 100644
--- a/metadata/md5-cache/sys-devel/autoconf-9999
+++ b/metadata/md5-cache/sys-devel/autoconf-9999
@@ -1,5 +1,5 @@
 BDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 >=sys-apps/texinfo-4.3 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare unpack
+DEFINED_PHASES=configure install prepare test unpack
 DESCRIPTION=Used to create autoconfiguration files
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 >=sys-devel/autoconf-wrapper-14 sys-devel/gnuconfig !~sys-devel/autoconf-9999:2.5
 SLOT=9999
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	toolchain-autoconf	c85a87c2280cd1204e1433d3e1123e41
-_md5_=9eaf63765ec50add253302d3bf761b9c
+_md5_=10d63d88c5cd52aa561c3cb770729f7c
diff --git a/metadata/md5-cache/sys-devel/binutils-2.36.1-r2 b/metadata/md5-cache/sys-devel/binutils-2.36.1-r2
index 1cdd8c2ea31b..519047bd87f5 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.36.1-r2
+++ b/metadata/md5-cache/sys-devel/binutils-2.36.1-r2
@@ -11,6 +11,6 @@ RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 REQUIRED_USE=default-gold? ( gold )
 RESTRICT=!test? ( test )
 SLOT=2.36
-SRC_URI=mirror://gnu/binutils/binutils-2.36.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.36.1-patches-4.tar.xz
+SRC_URI=mirror://gnu/binutils/binutils-2.36.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.36.1-patches-5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=62cb57b1b7062ea062c4b0b205829251
+_md5_=f8c2eb032e9ba2a567be29d5df54ca56
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-11.3.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-11.3.1-r1
index 418e7817c351..eb4246fb3eb8 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-11.3.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-11.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-libs/tapi sys-devel/
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-530.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-949.0.1.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-551.4.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-8.2-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-11.3-r1.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bf93fd9ef6eb634fc1c85568192b555d
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
index 89322b634600..84f0d443ac14 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi )
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-274.2.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-895.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-421.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-8.2-r1.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f4b3d213ee305bed1416866b4ee24432
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.36.1-r2 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.36.1-r2
index 5aa026bd532b..06e7ebd37583 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.36.1-r2
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.36.1-r2
@@ -11,6 +11,6 @@ RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 REQUIRED_USE=default-gold? ( gold )
 RESTRICT=!test? ( test )
 SLOT=2.36
-SRC_URI=mirror://gnu/binutils/binutils-2.36.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.36.1-patches-4.tar.xz
+SRC_URI=mirror://gnu/binutils/binutils-2.36.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.36.1-patches-5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0772a6206430393fce9bb03e93c880c3
+_md5_=11fc1553c2a8620825914767c9b4f566
diff --git a/metadata/md5-cache/sys-devel/bmake-20210621 b/metadata/md5-cache/sys-devel/bmake-20210621
deleted file mode 100644
index da310d95297d..000000000000
--- a/metadata/md5-cache/sys-devel/bmake-20210621
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=NetBSD's portable make
-EAPI=8
-HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20210621.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
-_md5_=0df4be9d4232c44b8d91e6e38dbba3d2
diff --git a/metadata/md5-cache/sys-devel/bmake-20210704 b/metadata/md5-cache/sys-devel/bmake-20210704
new file mode 100644
index 000000000000..eeab0b8f44c8
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/bmake-20210704
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=NetBSD's portable make
+EAPI=8
+HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20210704.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
+_md5_=0df4be9d4232c44b8d91e6e38dbba3d2
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.1 b/metadata/md5-cache/sys-devel/clang-10.0.1
index 7c4fc880078f..54fb3dfba187 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.1
+++ b/metadata/md5-cache/sys-devel/clang-10.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.1-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-10.0.1-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b073c104957b1401328f64dde52c7756
diff --git a/metadata/md5-cache/sys-devel/clang-11.1.0 b/metadata/md5-cache/sys-devel/clang-11.1.0
index 08a7a9f19703..b5e4b4d234f6 100644
--- a/metadata/md5-cache/sys-devel/clang-11.1.0
+++ b/metadata/md5-cache/sys-devel/clang-11.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=11/11.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-11.1.0-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-11.1.0-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1b963cdf206d377f4fb1cf5c23faa255
diff --git a/metadata/md5-cache/sys-devel/clang-12.0.0-r1 b/metadata/md5-cache/sys-devel/clang-12.0.0-r1
index f6e217284613..2d4a31f38cc4 100644
--- a/metadata/md5-cache/sys-devel/clang-12.0.0-r1
+++ b/metadata/md5-cache/sys-devel/clang-12.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=12
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-12.0.0-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.0-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=24f5a429eebe9784d5ae00950abff847
diff --git a/metadata/md5-cache/sys-devel/clang-12.0.1 b/metadata/md5-cache/sys-devel/clang-12.0.1
index 2a50db114e09..5195d042f45d 100644
--- a/metadata/md5-cache/sys-devel/clang-12.0.1
+++ b/metadata/md5-cache/sys-devel/clang-12.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=12
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-12.0.1-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ae23af24fa5deb65f37f9c07e368b53e
diff --git a/metadata/md5-cache/sys-devel/clang-13.0.0.9999 b/metadata/md5-cache/sys-devel/clang-13.0.0.9999
index 4ecd65a0c328..455b9e0f0a86 100644
--- a/metadata/md5-cache/sys-devel/clang-13.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-13.0.0.9999
@@ -12,6 +12,6 @@ RDEPEND=~sys-devel/llvm-13.0.0.9999:13=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=13
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9bb12087bc9e60aaee3b5b66eeeaa3e2
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-2.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=30413ec1711cc53a93e894c6db755315
diff --git a/metadata/md5-cache/sys-devel/clang-14.0.0.9999 b/metadata/md5-cache/sys-devel/clang-14.0.0.9999
new file mode 100644
index 000000000000..7647ccec8a85
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-14.0.0.9999
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/cmake-3.16 doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-python/sphinx dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-14.0.0.9999:14=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) llvm_targets_AArch64? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_VE] ) !!sys-devel/llvm:0
+DESCRIPTION=C language family frontend for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug default-compiler-rt default-libcxx default-lld doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE test doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-14.0.0.9999 default-compiler-rt? ( =sys-libs/compiler-rt-14.0.0.9999* llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) default-libcxx? ( >=sys-libs/libcxx-14.0.0.9999 ) default-lld? ( sys-devel/lld )
+PROPERTIES=live
+RDEPEND=~sys-devel/llvm-14.0.0.9999:14=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) llvm_targets_AArch64? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.0.9999:14[llvm_targets_VE] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=14
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-2.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=30413ec1711cc53a93e894c6db755315
diff --git a/metadata/md5-cache/sys-devel/clang-common-10.0.1 b/metadata/md5-cache/sys-devel/clang-common-10.0.1
index aff58718e998..6bc6a3b9479f 100644
--- a/metadata/md5-cache/sys-devel/clang-common-10.0.1
+++ b/metadata/md5-cache/sys-devel/clang-common-10.0.1
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=adade0b4461ea612110e077bfbad8b1b
diff --git a/metadata/md5-cache/sys-devel/clang-common-11.1.0 b/metadata/md5-cache/sys-devel/clang-common-11.1.0
index 86a3560e9491..5e73c8ed44aa 100644
--- a/metadata/md5-cache/sys-devel/clang-common-11.1.0
+++ b/metadata/md5-cache/sys-devel/clang-common-11.1.0
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad5c57d3900d811224444bde2c7bcdb9
diff --git a/metadata/md5-cache/sys-devel/clang-common-12.0.0 b/metadata/md5-cache/sys-devel/clang-common-12.0.0
index 7723ce1afb17..46c76f19522a 100644
--- a/metadata/md5-cache/sys-devel/clang-common-12.0.0
+++ b/metadata/md5-cache/sys-devel/clang-common-12.0.0
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=84aaad63c41d19e1795c0de0c01add97
diff --git a/metadata/md5-cache/sys-devel/clang-common-12.0.1 b/metadata/md5-cache/sys-devel/clang-common-12.0.1
index b4c137f64fd2..269408c05ee1 100644
--- a/metadata/md5-cache/sys-devel/clang-common-12.0.1
+++ b/metadata/md5-cache/sys-devel/clang-common-12.0.1
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a595ff2d43181fa2e05cd4b7e10ca6a2
diff --git a/metadata/md5-cache/sys-devel/clang-common-13.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-13.0.0.9999
index 160638cba248..8c8d41e86cf9 100644
--- a/metadata/md5-cache/sys-devel/clang-common-13.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-13.0.0.9999
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 PROPERTIES=live
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b90c4c0dc9eaa89be17463c64885562d
diff --git a/metadata/md5-cache/sys-devel/clang-common-14.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-14.0.0.9999
new file mode 100644
index 000000000000..8c8d41e86cf9
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-14.0.0.9999
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of clang
+EAPI=7
+HOMEPAGE=https://llvm.org/
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=sys-devel/clang:*
+PROPERTIES=live
+SLOT=0
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b90c4c0dc9eaa89be17463c64885562d
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-14.0.0.9999 b/metadata/md5-cache/sys-devel/clang-runtime-14.0.0.9999
new file mode 100644
index 000000000000..3a87138793a3
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-14.0.0.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=7
+HOMEPAGE=https://clang.llvm.org/
+IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=metapackage
+PROPERTIES=live
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-14.0.0.9999:14.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-14.0.0.9999:14.0.0 ) ) libcxx? ( >=sys-libs/libcxx-14.0.0.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-14.0.0.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=sanitize? ( compiler-rt )
+SLOT=14.0.0
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=75ae4db590ba9c2b4b7ba88cf44c1dfe
diff --git a/metadata/md5-cache/sys-devel/gcc-11.1.1_pre9999 b/metadata/md5-cache/sys-devel/gcc-11.1.1_pre9999
deleted file mode 100644
index b214ad3cda65..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-11.1.1_pre9999
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto zstd valgrind custom-cflags
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-PROPERTIES=live
-RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=!test? ( test )
-SLOT=11
-SRC_URI=mirror://gentoo/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.1.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=333d3453f4dee9ac9a211b78caff33d0
diff --git a/metadata/md5-cache/sys-devel/gcc-11.2.0 b/metadata/md5-cache/sys-devel/gcc-11.2.0
new file mode 100644
index 000000000000..eec9bdcbee61
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.2.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=7
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto zstd valgrind custom-cflags
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=mirror://gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz mirror://gentoo/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.2.0-patches-1.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a8bad3083dcda1a940040476ead3b966
diff --git a/metadata/md5-cache/sys-devel/gcc-11.2.1_pre9999 b/metadata/md5-cache/sys-devel/gcc-11.2.1_pre9999
new file mode 100644
index 000000000000..b39b79cb7ef9
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.2.1_pre9999
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=7
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto zstd valgrind custom-cflags
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+PROPERTIES=live
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=mirror://gentoo/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.2.0-patches-1.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=58b3deebeac6423c709570df91505378
diff --git a/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999 b/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
index 8a51caaf5ee6..477e614b0a2f 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
+++ b/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
@@ -11,6 +11,6 @@ PROPERTIES=live
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=12
-SRC_URI=mirror://gentoo/gcc-12.0.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-12.0.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-12.0.0-patches-1.tar.bz2
+SRC_URI=mirror://gentoo/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-12.0.0-patches-2.tar.bz2
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain	6801429976b5670e9a62710011d7e77e	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=88cb582aeedbbadc222b42381674a088
+_md5_=af519d281c076dbc0332244398a2ac83
diff --git a/metadata/md5-cache/sys-devel/gdb-10.2-r1 b/metadata/md5-cache/sys-devel/gdb-10.2-r1
new file mode 100644
index 000000000000..ffbf0e2208b5
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gdb-10.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils sys-apps/texinfo virtual/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
+DESCRIPTION=GNU debugger
+EAPI=7
+HOMEPAGE=https://sourceware.org/gdb/
+IUSE=cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2
+RDEPEND=dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=ia64? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnu/gdb/gdb-10.2.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-10.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=72c26604ccaf29b9a3e38ed53bec70d6
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.1 b/metadata/md5-cache/sys-devel/lld-10.0.1
index d5b06360b0d8..1124422bf6f0 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.1
+++ b/metadata/md5-cache/sys-devel/lld-10.0.1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-10.0.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6aa8a05853f11822769b10904526cf58
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.1-r1 b/metadata/md5-cache/sys-devel/lld-10.0.1-r1
index fc256b739fae..057ce2992b1a 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.1-r1
+++ b/metadata/md5-cache/sys-devel/lld-10.0.1-r1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-10.0.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=85b48d908ea9813bb0eaaf8ca2c77ad0
diff --git a/metadata/md5-cache/sys-devel/lld-11.1.0 b/metadata/md5-cache/sys-devel/lld-11.1.0
index b429a05d15e2..1e833c6b8269 100644
--- a/metadata/md5-cache/sys-devel/lld-11.1.0
+++ b/metadata/md5-cache/sys-devel/lld-11.1.0
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-11.1.0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1f251fe5c4229a54e0a9a80aecf8f36c
diff --git a/metadata/md5-cache/sys-devel/lld-11.1.0-r1 b/metadata/md5-cache/sys-devel/lld-11.1.0-r1
index c5fc978a17cf..4d948ee57d18 100644
--- a/metadata/md5-cache/sys-devel/lld-11.1.0-r1
+++ b/metadata/md5-cache/sys-devel/lld-11.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-11.1.0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=14f976791bad7b06b11d2c453da8f86e
diff --git a/metadata/md5-cache/sys-devel/lld-12.0.0 b/metadata/md5-cache/sys-devel/lld-12.0.0
index ae30754cd621..d786778f630c 100644
--- a/metadata/md5-cache/sys-devel/lld-12.0.0
+++ b/metadata/md5-cache/sys-devel/lld-12.0.0
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-12.0.0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6df2c6086a4c7dba2f3c7569a547f49c
diff --git a/metadata/md5-cache/sys-devel/lld-12.0.1 b/metadata/md5-cache/sys-devel/lld-12.0.1
index cc6ed40c7a85..f8d1dd68da51 100644
--- a/metadata/md5-cache/sys-devel/lld-12.0.1
+++ b/metadata/md5-cache/sys-devel/lld-12.0.1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-12.0.1
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=49e08269babaf1f564d0bf61f8e291dd
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.0.9999 b/metadata/md5-cache/sys-devel/lld-13.0.0.9999
index bdc7a067aee0..93bb6ed6ef6c 100644
--- a/metadata/md5-cache/sys-devel/lld-13.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-13.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-13.0.0.9999
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=880a6fe30a5e015c5e4a23f0e5e4cd97
diff --git a/metadata/md5-cache/sys-devel/lld-14.0.0.9999 b/metadata/md5-cache/sys-devel/lld-14.0.0.9999
new file mode 100644
index 000000000000..f846483b07cd
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-14.0.0.9999
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.10 ~dev-python/lit-14.0.0.9999[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 ~dev-python/lit-14.0.0.9999[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 ~dev-python/lit-14.0.0.9999[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-14.0.0.9999 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test test
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PROPERTIES=live
+RDEPEND=~sys-devel/llvm-14.0.0.9999
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=880a6fe30a5e015c5e4a23f0e5e4cd97
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.1 b/metadata/md5-cache/sys-devel/llvm-10.0.1
index 92c10d8c77c6..ca3ae97d7d74 100644
--- a/metadata/md5-cache/sys-devel/llvm-10.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.1-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-10.0.1-3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6a4996af0949ca6a581f2d572ebd5d69
diff --git a/metadata/md5-cache/sys-devel/llvm-11.1.0 b/metadata/md5-cache/sys-devel/llvm-11.1.0
index bdebda318628..7634a6b9ea2a 100644
--- a/metadata/md5-cache/sys-devel/llvm-11.1.0
+++ b/metadata/md5-cache/sys-devel/llvm-11.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-11.1.0-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-11.1.0-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cbfa585703ce7d381568718358a57878
diff --git a/metadata/md5-cache/sys-devel/llvm-12.0.0 b/metadata/md5-cache/sys-devel/llvm-12.0.0
index 6612d7bb554a..4be41a584e59 100644
--- a/metadata/md5-cache/sys-devel/llvm-12.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-12.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-12.0.0-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.0-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c2340224bb1792b378b98ea240f582c9
diff --git a/metadata/md5-cache/sys-devel/llvm-12.0.1 b/metadata/md5-cache/sys-devel/llvm-12.0.1
index 1b797135a908..48ed7b0ba99a 100644
--- a/metadata/md5-cache/sys-devel/llvm-12.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-12.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-12.0.1-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2caa3cd3a915673262272e53b3d559e6
diff --git a/metadata/md5-cache/sys-devel/llvm-13.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-13.0.0.9999
index 55b1e9c0adc1..664c8d40df7b 100644
--- a/metadata/md5-cache/sys-devel/llvm-13.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-13.0.0.9999
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fd422feab10bd00ed98513969ce5d740
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c1c7a5b2c9c75442f4505b2b4decf0b2
diff --git a/metadata/md5-cache/sys-devel/llvm-14.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-14.0.0.9999
new file mode 100644
index 000000000000..691d41d978bb
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-14.0.0.9999
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-14.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-python/sphinx dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gold? ( sys-libs/binutils-libs )
+DESCRIPTION=Low Level Virtual Machine
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
+PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-14 )
+PROPERTIES=live
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE )
+RESTRICT=!test? ( test )
+SLOT=14
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c1c7a5b2c9c75442f4505b2b4decf0b2
diff --git a/metadata/md5-cache/sys-devel/llvm-common-10.0.1 b/metadata/md5-cache/sys-devel/llvm-common-10.0.1
index 08e4d182d24d..35b57ad05d0a 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-10.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-common-10.0.1
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=llvm.org	cb97295f27f4f75aab38e6965ecb7759	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=4c75f8014998cb50a9cc323b3a17d65a
diff --git a/metadata/md5-cache/sys-devel/llvm-common-11.1.0 b/metadata/md5-cache/sys-devel/llvm-common-11.1.0
index bc9630541c5e..e88ff0a4aa96 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-11.1.0
+++ b/metadata/md5-cache/sys-devel/llvm-common-11.1.0
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=llvm.org	cb97295f27f4f75aab38e6965ecb7759	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=480a5379341a27dc6bd5c84f6c1fbc78
diff --git a/metadata/md5-cache/sys-devel/llvm-common-12.0.0 b/metadata/md5-cache/sys-devel/llvm-common-12.0.0
index d592b3f027c9..df6cb8def518 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-12.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-common-12.0.0
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=llvm.org	cb97295f27f4f75aab38e6965ecb7759	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=c65cec41b6a9c0ff3c5b366c37b5b99d
diff --git a/metadata/md5-cache/sys-devel/llvm-common-12.0.1 b/metadata/md5-cache/sys-devel/llvm-common-12.0.1
index 4039f116c94f..583769f13680 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-12.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-common-12.0.1
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=llvm.org	cb97295f27f4f75aab38e6965ecb7759	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=a8b59d835aeee72041f3863f0ede30ba
diff --git a/metadata/md5-cache/sys-devel/llvm-common-13.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-13.0.0.9999
index 564fae56f1eb..46992abc5781 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-13.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-13.0.0.9999
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
 _md5_=0f952970544f31ba021c8c334a70d237
diff --git a/metadata/md5-cache/sys-devel/llvm-common-14.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-14.0.0.9999
new file mode 100644
index 000000000000..46992abc5781
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-14.0.0.9999
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PROPERTIES=live
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=0f952970544f31ba021c8c334a70d237
diff --git a/metadata/md5-cache/sys-devel/llvmgold-14 b/metadata/md5-cache/sys-devel/llvmgold-14
new file mode 100644
index 000000000000..c90fa94f0c70
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvmgold-14
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=LLVMgold plugin symlink for autoloading
+EAPI=8
+HOMEPAGE=https://llvm.org/
+LICENSE=public-domain
+PROPERTIES=live
+RDEPEND=sys-devel/llvm:14[gold] !sys-devel/llvm:0
+SLOT=0
+_md5_=5781f3bd5e806f652ce639f1527938f5
diff --git a/metadata/md5-cache/sys-devel/slibtool-0.5.33 b/metadata/md5-cache/sys-devel/slibtool-0.5.33
index cdf449d6fbeb..f1e71fd9a6c6 100644
--- a/metadata/md5-cache/sys-devel/slibtool-0.5.33
+++ b/metadata/md5-cache/sys-devel/slibtool-0.5.33
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://dl.midipix.org/slibtool/slibtool-0.5.33.tar.xz verify-sig? ( https://dl.midipix.org/slibtool/slibtool-0.5.33.tar.xz.sig )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=f29891a526e6e21bc99931ee5ef97eef
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=2d9a65a8c02e7718513015f2067b6619
diff --git a/metadata/md5-cache/sys-devel/slibtool-0.5.34 b/metadata/md5-cache/sys-devel/slibtool-0.5.34
index 5efe72bdf835..0ab2264f9c93 100644
--- a/metadata/md5-cache/sys-devel/slibtool-0.5.34
+++ b/metadata/md5-cache/sys-devel/slibtool-0.5.34
@@ -4,9 +4,9 @@ DESCRIPTION=A skinny libtool implementation, written in C
 EAPI=7
 HOMEPAGE=https://git.foss21.org/slibtool
 IUSE=verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://dl.midipix.org/slibtool/slibtool-0.5.34.tar.xz verify-sig? ( https://dl.midipix.org/slibtool/slibtool-0.5.34.tar.xz.sig )
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=5ab326278bab55b481a60da35525f97e
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=c398f18404216dd47ccec9e86504b05c
diff --git a/metadata/md5-cache/sys-devel/slibtool-9999 b/metadata/md5-cache/sys-devel/slibtool-9999
index e8b12a7e9d8c..61c59acddee5 100644
--- a/metadata/md5-cache/sys-devel/slibtool-9999
+++ b/metadata/md5-cache/sys-devel/slibtool-9999
@@ -7,4 +7,4 @@ LICENSE=MIT
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f29891a526e6e21bc99931ee5ef97eef
+_md5_=2d9a65a8c02e7718513015f2067b6619
diff --git a/metadata/md5-cache/sys-devel/sparse-0.6.3 b/metadata/md5-cache/sys-devel/sparse-0.6.3
index 8a1f3c03d622..304a8818a0b8 100644
--- a/metadata/md5-cache/sys-devel/sparse-0.6.3
+++ b/metadata/md5-cache/sys-devel/sparse-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( sys-devel/llvm:10= ) sqlite? ( dev-db/s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/devel/sparse/dist/sparse-0.6.3.tar.xz
-_eclasses_=llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d8cd2d34dbac465b8a8839fdd34f4cc3
diff --git a/metadata/md5-cache/sys-devel/sparse-9999 b/metadata/md5-cache/sys-devel/sparse-9999
index 457e72da5b16..7171696119bb 100644
--- a/metadata/md5-cache/sys-devel/sparse-9999
+++ b/metadata/md5-cache/sys-devel/sparse-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( sys-devel/llvm:10= ) sqlite? ( dev-db/sqlite:= ) xml? ( dev-libs/libxml2 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d8cd2d34dbac465b8a8839fdd34f4cc3
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index d9d492c440ed..89edf7803dff 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.12.1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.12.1
deleted file mode 100644
index 3dcc0ab83465..000000000000
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.12.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
-DESCRIPTION=Btrfs filesystem utilities
-EAPI=7
-HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-RESTRICT=test
-SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.12.1.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=144f4abe24d7083d13f52144f6619a00
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.13.1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.13.1
new file mode 100644
index 000000000000..d3b51f5f33ee
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.13.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
+DESCRIPTION=Btrfs filesystem utilities
+EAPI=7
+HOMEPAGE=https://btrfs.wiki.kernel.org
+IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RESTRICT=test
+SLOT=0/0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.13.1.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f0dc1a4a196c9e4446b59e6f0f1f3a13
diff --git a/metadata/md5-cache/sys-fs/cachefilesd-0.10.10-r1 b/metadata/md5-cache/sys-fs/cachefilesd-0.10.10-r1
index a04b73b379ed..13409c1c39b6 100644
--- a/metadata/md5-cache/sys-fs/cachefilesd-0.10.10-r1
+++ b/metadata/md5-cache/sys-fs/cachefilesd-0.10.10-r1
@@ -10,4 +10,4 @@ RDEPEND=selinux? ( sec-policy/selinux-cachefilesd ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://people.redhat.com/~dhowells/fscache/cachefilesd-0.10.10.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=52e5b3948a297913d1757d2fdb89cc5f
+_md5_=d5c8c3f39b8b4ef0a96667694e9d549d
diff --git a/metadata/md5-cache/sys-fs/cachefilesd-0.10.9 b/metadata/md5-cache/sys-fs/cachefilesd-0.10.9
index f458df58ef43..150f97767d58 100644
--- a/metadata/md5-cache/sys-fs/cachefilesd-0.10.9
+++ b/metadata/md5-cache/sys-fs/cachefilesd-0.10.9
@@ -10,4 +10,4 @@ RDEPEND=selinux? ( sec-policy/selinux-cachefilesd ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://people.redhat.com/~dhowells/fscache/cachefilesd-0.10.9.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=244ac2e974afe01cf3a8322efe36b482
+_md5_=48b57a757529d961aaedb1033bf3137c
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.3.4-r1 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.4-r1
deleted file mode 100644
index de297229211c..000000000000
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.3.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) )
-DESCRIPTION=Tool to setup encrypted devices with dm-crypt
-EAPI=7
-HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
-IUSE=gcrypt kernel nettle +openssl +argon2 nls pwquality reencrypt static static-libs +udev urandom kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2+
-RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev )
-REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt )
-SLOT=0/12
-SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.4.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0e9f59f73fa40fcbb21f9534026b60e1
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.3.4-r2 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.4-r2
new file mode 100644
index 000000000000..1920c3c402e2
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.3.4-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) )
+DESCRIPTION=Tool to setup encrypted devices with dm-crypt
+EAPI=7
+HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
+IUSE=gcrypt kernel nettle +openssl +argon2 nls pwquality reencrypt static static-libs +udev urandom kernel_linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=GPL-2+
+RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) virtual/tmpfiles
+REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt )
+SLOT=0/12
+SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.4.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f3a89a27a250365bca9c698221dc0ca0
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.3.6 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.6
deleted file mode 100644
index e650f59cd863..000000000000
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) )
-DESCRIPTION=Tool to setup encrypted devices with dm-crypt
-EAPI=7
-HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
-IUSE=gcrypt kernel nettle +openssl +argon2 nls pwquality reencrypt static static-libs +udev urandom kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2+
-RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev )
-REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt )
-SLOT=0/12
-SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.6.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0e9f59f73fa40fcbb21f9534026b60e1
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.3.6-r1 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.6-r1
new file mode 100644
index 000000000000..a42e1b141243
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.3.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) )
+DESCRIPTION=Tool to setup encrypted devices with dm-crypt
+EAPI=7
+HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
+IUSE=gcrypt kernel nettle +openssl +argon2 nls pwquality reencrypt static static-libs +udev urandom kernel_linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=GPL-2+
+RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) virtual/tmpfiles
+REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt )
+SLOT=0/12
+SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.6.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f3a89a27a250365bca9c698221dc0ca0
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.4.0_rc0 b/metadata/md5-cache/sys-fs/cryptsetup-2.4.0_rc0
deleted file mode 100644
index 8bb1c1325655..000000000000
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.4.0_rc0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) ssh? ( net-libs/libssh ) sys-fs/lvm2 udev? ( virtual/libudev ) static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) )
-DESCRIPTION=Tool to setup encrypted devices with dm-crypt
-EAPI=7
-HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
-IUSE=gcrypt kernel nettle +openssl +argon2 nls pwquality reencrypt static static-libs +udev urandom ssh kernel_linux
-LICENSE=GPL-2+
-RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) ssh? ( net-libs/libssh ) sys-fs/lvm2 udev? ( virtual/libudev )
-REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt )
-SLOT=0/12
-SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.0-rc0.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=37e149df98125b4c41172e04a63832d1
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.4.0_rc1-r1 b/metadata/md5-cache/sys-fs/cryptsetup-2.4.0_rc1-r1
new file mode 100644
index 000000000000..ff8d06837ebd
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.4.0_rc1-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) ssh? ( net-libs/libssh ) sys-fs/lvm2 udev? ( virtual/libudev ) static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) )
+DESCRIPTION=Tool to setup encrypted devices with dm-crypt
+EAPI=7
+HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
+IUSE=gcrypt kernel nettle +openssl +argon2 nls pwquality reencrypt ssh static static-libs +udev urandom kernel_linux
+LICENSE=GPL-2+
+RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) ssh? ( net-libs/libssh ) sys-fs/lvm2 udev? ( virtual/libudev ) virtual/tmpfiles
+REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt )
+SLOT=0/12
+SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.0-rc1.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=848105325405e356291ed7462122f83f
diff --git a/metadata/md5-cache/sys-fs/fuse-3.10.3 b/metadata/md5-cache/sys-fs/fuse-3.10.3
index 351edc7f047d..b5829aea9731 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.10.3
+++ b/metadata/md5-cache/sys-fs/fuse-3.10.3
@@ -4,11 +4,11 @@ DESCRIPTION=An interface for filesystems implemented in userspace
 EAPI=7
 HOMEPAGE=https://github.com/libfuse/libfuse
 IUSE=+suid test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.10.3/fuse-3.10.3.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=365c40c88cd2cf6c80bdbdb01aff5414
+_md5_=f8acc6782085b1b0cfd11550339b9061
diff --git a/metadata/md5-cache/sys-fs/lxcfs-4.0.8 b/metadata/md5-cache/sys-fs/lxcfs-4.0.8
index 8e988e7fcb22..18c6c3dcf398 100644
--- a/metadata/md5-cache/sys-fs/lxcfs-4.0.8
+++ b/metadata/md5-cache/sys-fs/lxcfs-4.0.8
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 sys-fs/fuse:3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxcfs/lxcfs-4.0.8.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/lxcfs-4.0.8.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=12f2c9b78bcfd176b833d805f4c4f3f7
diff --git a/metadata/md5-cache/sys-fs/lxcfs-4.0.9 b/metadata/md5-cache/sys-fs/lxcfs-4.0.9
index 1ac9f343c632..c9c9be2d30ce 100644
--- a/metadata/md5-cache/sys-fs/lxcfs-4.0.9
+++ b/metadata/md5-cache/sys-fs/lxcfs-4.0.9
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 sys-fs/fuse:3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxcfs/lxcfs-4.0.9.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/lxcfs-4.0.9.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=1d6238d7930048e34bcfd13f038c78db
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.8.6-r1 b/metadata/md5-cache/sys-fs/multipath-tools-0.8.6-r1
index d952f980f330..12f3bea1911d 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.8.6-r1
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.8.6-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Device mapper target autoconfig
 EAPI=7
 HOMEPAGE=http://christophe.varoqui.free.fr/
 IUSE=systemd rbd test kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu:= >=sys-fs/lvm2-2.02.45 >=virtual/libudev-232-r3 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/opensvc/multipath-tools/archive/refs/tags/0.8.6.tar.gz -> multipath-tools-0.8.6.tar.gz
 _eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=3e84b0dd040cb27f2e367ed1550bf13d
+_md5_=a35e949f04f8e0feac3a150c37efe688
diff --git a/metadata/md5-cache/sys-fs/udev-245.5-r1 b/metadata/md5-cache/sys-fs/udev-245.5-r1
deleted file mode 100644
index 6f6b6de3178d..000000000000
--- a/metadata/md5-cache/sys-fs/udev-245.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
-DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl +kmod selinux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=LGPL-2.1 MIT GPL-2
-PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
-RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v245.5/systemd-stable-245.5.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=9cce8336d79fe0ee5558fa4091600a84
diff --git a/metadata/md5-cache/sys-fs/udev-246-r1 b/metadata/md5-cache/sys-fs/udev-246-r1
deleted file mode 100644
index 6728e73365a0..000000000000
--- a/metadata/md5-cache/sys-fs/udev-246-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
-DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl +kmod selinux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1 MIT GPL-2
-PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-34
-RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd/archive/v246/systemd-246.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=3b6e3a2106451e7103b102152a9546a4
diff --git a/metadata/md5-cache/sys-fs/udev-247.2 b/metadata/md5-cache/sys-fs/udev-247.2
deleted file mode 100644
index 9e3916b703f8..000000000000
--- a/metadata/md5-cache/sys-fs/udev-247.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
-DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl +kmod selinux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1 MIT GPL-2
-PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-34
-RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v247.2/systemd-stable-247.2.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=06fc2ed8be0af33dd6f7056ba59495d9
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.1-r1 b/metadata/md5-cache/sys-fs/udisks-2.9.1-r1
deleted file mode 100644
index 6f99211c270d..000000000000
--- a/metadata/md5-cache/sys-fs/udisks-2.9.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets >=dev-util/gdbus-codegen-2.32 >=dev-util/gtk-doc-am-1.3 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.8 ) virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.24[kbd] ) >=sys-kernel/linux-headers-3.1
-DESCRIPTION=Daemon providing interfaces to work with storage devices
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
-IUSE=acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.24[kbd] ) >=sys-block/parted-3 >=sys-apps/util-linux-2.30 selinux? ( sec-policy/selinux-devicekit )
-REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
-SLOT=2
-SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.1/udisks-2.9.1.tar.bz2
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=db1c00bbe566a5bc6848702ea77628e7
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.1-r2 b/metadata/md5-cache/sys-fs/udisks-2.9.1-r2
new file mode 100644
index 000000000000..fce89c5cc8da
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xsl-stylesheets >=dev-util/gdbus-codegen-2.32 >=dev-util/gtk-doc-am-1.3 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.8 ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.24[kbd] ) >=sys-kernel/linux-headers-3.1
+DESCRIPTION=Daemon providing interfaces to work with storage devices
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
+IUSE=acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram kernel_linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
+LICENSE=LGPL-2+ GPL-2+
+RDEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.24[kbd] ) >=sys-block/parted-3 >=sys-apps/util-linux-2.30 selinux? ( sec-policy/selinux-devicekit ) virtual/tmpfiles
+REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
+SLOT=2
+SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.1/udisks-2.9.1.tar.bz2
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f155bf9ecc057788fb2f46c0fcf0e390
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.2-r1 b/metadata/md5-cache/sys-fs/udisks-2.9.2-r1
deleted file mode 100644
index 3ea701595221..000000000000
--- a/metadata/md5-cache/sys-fs/udisks-2.9.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets >=dev-util/gdbus-codegen-2.32 >=dev-util/gtk-doc-am-1.3 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.8 ) virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.25[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.25[kbd] ) >=sys-kernel/linux-headers-3.1
-DESCRIPTION=Daemon providing interfaces to work with storage devices
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
-IUSE=acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.25[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.25[kbd] ) >=sys-block/parted-3 >=sys-apps/util-linux-2.30 selinux? ( sec-policy/selinux-devicekit )
-REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
-SLOT=2
-SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.2/udisks-2.9.2.tar.bz2
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7df28c0c0df93bd773aeeb8a6a885e09
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.2-r2 b/metadata/md5-cache/sys-fs/udisks-2.9.2-r2
new file mode 100644
index 000000000000..02022e871390
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xsl-stylesheets >=dev-util/gdbus-codegen-2.32 >=dev-util/gtk-doc-am-1.3 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.8 ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.25[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.25[kbd] ) >=sys-kernel/linux-headers-3.1
+DESCRIPTION=Daemon providing interfaces to work with storage devices
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
+IUSE=acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ GPL-2+
+RDEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.25[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.25[kbd] ) >=sys-block/parted-3 >=sys-apps/util-linux-2.30 selinux? ( sec-policy/selinux-devicekit ) virtual/tmpfiles
+REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
+SLOT=2
+SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.2/udisks-2.9.2.tar.bz2
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f24be4f5780061f9622ca3c3436239c6
diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.5 b/metadata/md5-cache/sys-fs/zfs-2.0.5
index 93464a5b8def..f7f4197603cb 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.0.5
+++ b/metadata/md5-cache/sys-fs/zfs-2.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9
 RESTRICT=test
 SLOT=0/4
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=92f2369315ce0ee29c30f5f50d991f4a
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ca0cfe7ba19661ca66a4db6208c58104
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.0 b/metadata/md5-cache/sys-fs/zfs-2.1.0
index aba5ed7c9b85..b2d7de02f5ec 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.1.0
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9
 RESTRICT=test
 SLOT=0/5
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=442e4e9ba86b7fcb49fdb0e1e256f5d3
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=bb1f6ff3ed5f597057c1a5abc2e93e11
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 0bd6072b7d32..6a1ff6d8dfc2 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9
 RESTRICT=test
 SLOT=0/5
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7f4a0c85dfcdaefa6a5ff1173eb432a0
+_md5_=463c8a23291ddf488f1740c9b5b4a4c2
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5 b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5
index 5f467c49aca8..67ea32f9f3e2 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5
@@ -12,5 +12,5 @@ RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virt
 RESTRICT=debug? ( strip ) test
 SLOT=0/2.0.5
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=32642560faf5f557a1ffff1fde52f635
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=62db6b095b785cdd4f320d5075f35080
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.0 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.0
index 29dd85a9c0c4..c6436cbaed96 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.0
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.0
@@ -12,5 +12,5 @@ RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virt
 RESTRICT=debug? ( strip ) test
 SLOT=0/2.1.0
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a3dbe96b2194ed8edf110f0457f15019
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7596401acf2d8d8a87e6e86707c9b555
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index f2a9e093b0eb..a3467c9cea19 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -12,4 +12,4 @@ RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virt
 RESTRICT=debug? ( strip ) test
 SLOT=0/9999
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a3dbe96b2194ed8edf110f0457f15019
+_md5_=7596401acf2d8d8a87e6e86707c9b555
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 26f6aa49dd13..141990e898a4 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.54 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.54
new file mode 100644
index 000000000000..efa2e8287a73
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.54
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.54
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.54 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.54
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-60.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-60.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=800130f427d30d90d17ffbbcfeaa08e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.55 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.55
new file mode 100644
index 000000000000..70eb34a92052
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.55
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.55
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.55 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.55
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-61.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-61.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e7c1b56789d2ae9e6c719ff5719f9a3c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.6 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.6
new file mode 100644
index 000000000000..c6b00ccd5d32
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.6
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.13.6
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.13.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.6
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-8.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.13.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.13.4 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.13.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.13.4 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=36922c331a2d7e66bac97e814f122bef
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.7
new file mode 100644
index 000000000000..8fc54e89527f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.7
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.13.7
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.13.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.7
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-9.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-9.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.13.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.13.4 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.13.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.13.4 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f2a7793d909a407657529f3dd473005e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.136 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.136
new file mode 100644
index 000000000000..95d03d32660e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.136
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.136
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.136 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.136
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-140.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-140.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=90061225b63ee2e6e582dba6f3d5f21a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.137 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.137
new file mode 100644
index 000000000000..0a1bd6e63f00
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.137
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.137
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.137 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.137
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-141.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-141.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=72a334ddbfa724fb31c9721207dde971
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.54 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.54
new file mode 100644
index 000000000000..00a7c9d7a701
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.54
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.54
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.54 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.54
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-60.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-60.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.54-1.xpak -> gentoo-kernel-5.10.54-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.54-1.xpak -> gentoo-kernel-5.10.54-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=57a69e56a2a0ddd314c54789b46ea687
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.54-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.54-r1
new file mode 100644
index 000000000000..d97cb072ae0e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.54-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.54
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.54 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.54
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-60.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-60.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.54-1.xpak -> gentoo-kernel-5.10.54-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cbd6a10587fe60af32bfea202e62c1d7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.55 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.55
new file mode 100644
index 000000000000..bc8ec6181993
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.55
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.55
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.55 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.55
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-61.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-61.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.55-1.xpak -> gentoo-kernel-5.10.55-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.55-1.xpak -> gentoo-kernel-5.10.55-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ed3e26bb73eb3c21bbdda8988b4d9149
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.55-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.55-r1
new file mode 100644
index 000000000000..0e14755d1cab
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.55-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.55
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.55 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.55
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-61.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-61.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.55-1.xpak -> gentoo-kernel-5.10.55-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cbd6a10587fe60af32bfea202e62c1d7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.5-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.5-r1
new file mode 100644
index 000000000000..4d994f424c4b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.13.5
+RDEPEND=!sys-kernel/gentoo-kernel:5.13.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.5
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-7.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-7.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.5-1.xpak -> gentoo-kernel-5.13.5-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=96edffee181c4bdb22258f1a4cc4cd8f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.6 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.6
new file mode 100644
index 000000000000..18794f5c78e5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.6
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.13.6
+RDEPEND=!sys-kernel/gentoo-kernel:5.13.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.6
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-8.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.6-1.xpak -> gentoo-kernel-5.13.6-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.6-1.xpak -> gentoo-kernel-5.13.6-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cb9823513884c4539e79ad162ace2053
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.6-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.6-r1
new file mode 100644
index 000000000000..3987d765620c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.13.6
+RDEPEND=!sys-kernel/gentoo-kernel:5.13.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.6
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-8.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-8.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.6-1.xpak -> gentoo-kernel-5.13.6-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=96edffee181c4bdb22258f1a4cc4cd8f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.7
new file mode 100644
index 000000000000..548182a93c9a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.7
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.13.7
+RDEPEND=!sys-kernel/gentoo-kernel:5.13.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.7
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-9.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-9.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.7-1.xpak -> gentoo-kernel-5.13.7-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.7-1.xpak -> gentoo-kernel-5.13.7-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=09ecd66d65ec84fd6124449f9a75f25f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.7-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.7-r1
new file mode 100644
index 000000000000..9bbb7237e1f8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.7-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.13.7
+RDEPEND=!sys-kernel/gentoo-kernel:5.13.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.7
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-9.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-9.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.7-1.xpak -> gentoo-kernel-5.13.7-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=96edffee181c4bdb22258f1a4cc4cd8f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.136 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.136
new file mode 100644
index 000000000000..69ed0433705c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.136
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.136
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.136 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.136
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-140.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-140.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.136-1.xpak -> gentoo-kernel-5.4.136-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.136-1.xpak -> gentoo-kernel-5.4.136-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.136-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.136-r1
new file mode 100644
index 000000000000..3ceddae910c5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.136-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.136
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.136 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.136
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-140.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-140.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.136-1.xpak -> gentoo-kernel-5.4.136-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=65b0dcce347739bcba48c9db3d787501
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.137 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.137
new file mode 100644
index 000000000000..a3374369347a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.137
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.137
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.137 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.137
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-141.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-141.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.137-1.xpak -> gentoo-kernel-5.4.137-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.137-1.xpak -> gentoo-kernel-5.4.137-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=95f703e2817767b31828e67652bef959
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.137-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.137-r1
new file mode 100644
index 000000000000..0ddd9d230819
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.137-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.137
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.137 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.137
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-141.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-141.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.137-1.xpak -> gentoo-kernel-5.4.137-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=65b0dcce347739bcba48c9db3d787501
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.241 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.241
new file mode 100644
index 000000000000..5f06d46f0a7c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.241
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.241
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-251.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-251.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-251.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-251.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-251.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-251.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-251.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-251.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-251.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ae71879d73c7bc60e8866b28753381fa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.199 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.199
new file mode 100644
index 000000000000..d85ebdbbcca0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.199
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.199
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-198.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-198.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-198.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-198.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-198.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-198.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-198.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-198.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-198.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=094727016e4f80b99f5c701da59d352d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.200 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.200
new file mode 100644
index 000000000000..48bb73c4b228
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.200
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.200
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-199.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-199.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-199.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-199.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-199.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-199.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-199.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-199.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-199.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c5ce8a5b2a9081049e5fc51a92503630
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.277 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.277
new file mode 100644
index 000000000000..996ab724dc25
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.277
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.4.277
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-279.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-279.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-279.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-279.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-279.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-279.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-279.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-279.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-279.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f689aa683f78b51884f4d4a8d790957d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.277 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.277
new file mode 100644
index 000000000000..b332ff59bfa8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.277
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.9.277
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-281.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-281.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-281.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-281.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-281.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-281.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-281.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-281.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-281.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c5473b4e7da6196ecaa8ae9a5a8e4919
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.54 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.54
new file mode 100644
index 000000000000..7151cf26038a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.54
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.54
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-60.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-60.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-60.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-60.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-60.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-60.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-60.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-60.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-60.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2f490619bfa756e516afbe698435ce7f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.55 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.55
new file mode 100644
index 000000000000..750e4e930bc2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.55
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.55
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-61.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-61.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-61.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-61.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-61.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-61.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-61.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-61.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-61.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=70c29f2cd808f5a3b738c17523175a70
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.6
new file mode 100644
index 000000000000..8ca371da123a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.6
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.13 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.13.6
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-8.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-8.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-8.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-8.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-8.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-8.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-8.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-8.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c4491ce5e87a030360e820d2b241e9f3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.7
new file mode 100644
index 000000000000..e1a97d7e8fb1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.7
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.13 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.13.7
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-9.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-9.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-9.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-9.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-9.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-9.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-9.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-9.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=99654db4a8cdbd00204ea3a8012a744e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.136 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.136
new file mode 100644
index 000000000000..961cc5ad52e2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.136
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.136
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-140.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-140.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-140.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-140.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-140.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-140.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-140.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-140.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-140.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=aca94960d3d9a5b3d8080df9fc8be09e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.137 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.137
new file mode 100644
index 000000000000..29c20c8b3f05
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.137
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.137
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-141.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-141.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-141.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-141.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-141.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-141.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-141.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-141.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-141.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=441bd5aba8c40c3eeaefd5d51486850d
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.14.237 b/metadata/md5-cache/sys-kernel/mips-sources-4.14.237
deleted file mode 100644
index fb6f3df018f5..000000000000
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.14.237
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20180128
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
-IUSE=experimental ip27 ip28 ip30 symlink build
-KEYWORDS=-* ~mips
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.14.237
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.237.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~kumba/distfiles/mipsgit-4.14.0-20180128.diff.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-4.14.0-patches-v3.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cba2c1d35de50502ec728d53d4685c65
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.14.241 b/metadata/md5-cache/sys-kernel/mips-sources-4.14.241
new file mode 100644
index 000000000000..019a35d3f1df
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.14.241
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20180128
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
+IUSE=experimental ip27 ip28 ip30 symlink build
+KEYWORDS=-* ~mips
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.241
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.241.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~kumba/distfiles/mipsgit-4.14.0-20180128.diff.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-4.14.0-patches-v3.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cba2c1d35de50502ec728d53d4685c65
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.19.195 b/metadata/md5-cache/sys-kernel/mips-sources-4.19.195
deleted file mode 100644
index 0e968a289a9f..000000000000
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.19.195
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Kernel.org sources for MIPS-based machines
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
-IUSE=experimental ip27 ip28 ip30 symlink build
-KEYWORDS=-* ~mips
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.19.195
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.195.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-4.19.0-patches-v3.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=71cb69e700b957c1f109cd62cab18b7e
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.19.200 b/metadata/md5-cache/sys-kernel/mips-sources-4.19.200
new file mode 100644
index 000000000000..0411bb597d61
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.19.200
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Kernel.org sources for MIPS-based machines
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
+IUSE=experimental ip27 ip28 ip30 symlink build
+KEYWORDS=-* ~mips
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.200
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.200.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-4.19.0-patches-v3.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=71cb69e700b957c1f109cd62cab18b7e
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-5.4.127 b/metadata/md5-cache/sys-kernel/mips-sources-5.4.127
deleted file mode 100644
index 4855a20c15de..000000000000
--- a/metadata/md5-cache/sys-kernel/mips-sources-5.4.127
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Kernel.org sources for MIPS-based machines
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
-IUSE=experimental ip27 ip28 ip30 symlink build
-KEYWORDS=-* ~mips
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.4.127
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.127.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-5.4-patches-v6.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=15ca8f29a8b6c85ed63b2aa0ae1e86ca
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-5.4.137 b/metadata/md5-cache/sys-kernel/mips-sources-5.4.137
new file mode 100644
index 000000000000..4cd54099184b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/mips-sources-5.4.137
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Kernel.org sources for MIPS-based machines
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
+IUSE=experimental ip27 ip28 ip30 symlink build
+KEYWORDS=-* ~mips
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.137
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.137.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-5.4-patches-v6.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=15ca8f29a8b6c85ed63b2aa0ae1e86ca
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.52 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.52
index 462c51c6cd24..7828f39c6a29 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.52
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.52
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.52
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.52.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.52.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.53 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.53
index 1dfae9c60efb..ba9939eea45d 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.53
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.53
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.53
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.53.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.53.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.54 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.54
new file mode 100644
index 000000000000..c8727516c0a4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.54
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.54
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.54 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.54
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.54.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.54.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.55 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.55
new file mode 100644
index 000000000000..8d00be02c0b3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.55
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.55
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.55 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.55
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.55.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.55.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.19 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.19
index cda20c4a90dc..68ab45e4c9db 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.19
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.19
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.12.19
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.19.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.19.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.12.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.12.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.12.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/17639df044f5f81bbf267f566426eae4a5187875/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.12.5 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=5df19398044f74fd0dd076acc605cac3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.4 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.4
index d617c9fc71be..dc88bcbd61e8 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.4
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.4
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.13.4
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.4.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.4.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.13.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.13.4 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.13.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.13.4 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=a93f1747965c4491c5ddeeb88d925dc1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.5 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.5
index 5ec2650a57bb..e3b4533ea7bc 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.5
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.5
@@ -12,5 +12,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.13.5
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.5.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.5.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.13.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.13.4 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.13.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.13.4 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=a93f1747965c4491c5ddeeb88d925dc1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.6 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.6
new file mode 100644
index 000000000000..5235315dbd03
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.6
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.13.6
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.13.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.6
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.6.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.6.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.13.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.13.4 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.13.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.13.4 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=a93f1747965c4491c5ddeeb88d925dc1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.7 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.7
new file mode 100644
index 000000000000..bb501fb56b96
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.7
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.13.7
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.13.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.7
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.7.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.7.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.13.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.13.4 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.13.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.13.4 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=a93f1747965c4491c5ddeeb88d925dc1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.134 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.134
index 089c066e52f5..1fcce213e0f3 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.134
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.134
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.134 || ( sys-kernel/installkernel-gen
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.134
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.134.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.134.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.135 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.135
index 2e7571b097bb..4b719c6ffcc7 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.135
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.135
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.135 || ( sys-kernel/installkernel-gen
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.135
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.135.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.135.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.136 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.136
new file mode 100644
index 000000000000..c07909656603
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.136
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.136
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.136 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.136
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.136.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.136.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.137 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.137
new file mode 100644
index 000000000000..0269e7e21bdd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.137
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.137
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.137 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.137
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.137.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.137.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.240 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.240
deleted file mode 100644
index b74410b07fa1..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.240
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.14.240
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.240.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.241 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.241
new file mode 100644
index 000000000000..09b6f8e04a10
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.241
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.241
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.241.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.198 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.198
deleted file mode 100644
index 38ade7f03751..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.198
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.19.198
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.198.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.200 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.200
new file mode 100644
index 000000000000..b37794fd87a0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.200
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.200
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.200.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.276 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.276
deleted file mode 100644
index 72af9fbc6b9d..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.276
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.4.276
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.276.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.277 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.277
new file mode 100644
index 000000000000..dde4a3485e48
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.277
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.4.277
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.277.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.276 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.276
deleted file mode 100644
index f56ec4f5fb65..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.276
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.9.276
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.276.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.277 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.277
new file mode 100644
index 000000000000..094942af2a4c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.277
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.9.277
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.277.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.53 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.53
deleted file mode 100644
index 1196146c80ae..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.53
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10.53
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.53.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.55 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.55
new file mode 100644
index 000000000000..d5a7b773c9d1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.55
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.55
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.55.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.5 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.5
deleted file mode 100644
index 59796c7478c9..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.13.5
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.5.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.7 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.7
new file mode 100644
index 000000000000..f5eec19bb3ef
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.13.7
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.7.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.135 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.135
deleted file mode 100644
index d718f99cc05e..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.135
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.4.135
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.135.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.137 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.137
new file mode 100644
index 000000000000..55ed1122baf9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.137
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.137
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.137.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 85e3b5c602e3..4d1bb7c54f9c 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.36.1-r2 b/metadata/md5-cache/sys-libs/binutils-libs-2.36.1-r2
index 495c31f3c0b7..acbfe5338e1a 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.36.1-r2
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.36.1-r2
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5
 SLOT=0/2.36.1
-SRC_URI=mirror://gnu/binutils/binutils-2.36.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.36.1-patches-4.tar.xz
+SRC_URI=mirror://gnu/binutils/binutils-2.36.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.36.1-patches-5.tar.xz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=42ca43c21631cc8cd1d84a5f12e9b85d
+_md5_=bcf83fc1455896ea969d0adfaae87d7c
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-10.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-10.0.1
index a0f9be6fd9dd..3844d7d3469c 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-10.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-10.0.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-10.0.1-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9d80785fa02434c813ed7747e241a961
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-11.1.0 b/metadata/md5-cache/sys-libs/compiler-rt-11.1.0
index b9d96d945a0e..fa5d6dc458e7 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-11.1.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-11.1.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=11.1.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-11.1.0-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0239213f7acaea92ec4d0265b8a7202a
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-12.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-12.0.0
index 778672405fe6..2d27291243bd 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-12.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-12.0.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=12.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.0-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a460b74756e45927134a052925c44e04
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-12.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-12.0.1
index e02d1f34a693..6fbe388692c9 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-12.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-12.0.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=12.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=560f9c08abe4053f35f9a670c6bbac0d
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-13.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-13.0.0.9999
index 2981c36c8085..bd1be7a2adec 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-13.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=13.0.0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=82ec3c36f177593d737c4442c5602192
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-14.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-14.0.0.9999
new file mode 100644
index 000000000000..902b34910ddf
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.0.9999
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.10 >=dev-python/lit-9.0.1[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 >=dev-python/lit-9.0.1[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/lit-9.0.1[python_targets_python3_8(-)] ) ) =sys-devel/clang-14.0.0.9999*:14 ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang test
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+PROPERTIES=live
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=14.0.0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=82ec3c36f177593d737c4442c5602192
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1
index 363bacea218f..746c61d0e568 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-10.0.1-4.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e3fa140400891876cff0f11994c246b8
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1
index 2452499b21d1..86c910a5a393 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
 SLOT=11.1.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-11.1.0-3.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=df52bb64510a8c85d18909d3bda211e3
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0
index 7e1f0a1739a9..60c16ef32fe0 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!test? ( test ) !clang? ( test ) test !test? ( test )
 SLOT=12.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.0-1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4f64306de1ce10fa8a62a0a3763e063a
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1
index 77a700b51839..e4a2c2c1169a 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
 SLOT=12.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ddd4fee6f55de9ec23820c2feb21bd85
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0.9999
index 2d74e345f204..d1ea45c80e9e 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0.9999
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
 SLOT=13.0.0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3959272b2f1ac12e7348d60a60d91519
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.0.9999
new file mode 100644
index 000000000000..b116d3a55a35
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.0.9999
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.10 >=dev-python/lit-5[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 >=dev-python/lit-5[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/lit-5[python_targets_python3_8(-)] ) ) =sys-devel/clang-14.0.0.9999*:14 sys-libs/compiler-rt:14.0.0 ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang test elibc_glibc +libfuzzer +memprof +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+PROPERTIES=live
+REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
+RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
+SLOT=14.0.0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3959272b2f1ac12e7348d60a60d91519
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index a4cd44857f2c..10a586547fa9 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -11,6 +11,6 @@ PROPERTIES=live
 RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
-SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210724.tar.gz )
+SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d703f3c81c35b73ccc619a9d2b9c056e
+_md5_=16fd2dde439b83062aed7f0b38cc5845
diff --git a/metadata/md5-cache/sys-libs/ldb-2.3.0-r1 b/metadata/md5-cache/sys-libs/ldb-2.3.0-r1
index 8ddba426068e..80fb16349b03 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.3.0-r1
+++ b/metadata/md5-cache/sys-libs/ldb-2.3.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=LDAP-like embedded database
 EAPI=7
 HOMEPAGE=https://ldb.samba.org
 IUSE=doc ldap +lmdb python test python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) test? ( python )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.3.0
 SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.3.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
-_md5_=cb61f0d8a4baec7c39751acf5ab296bb
+_md5_=51ad6f5dccd12dce3d3679a7ecb43c32
diff --git a/metadata/md5-cache/sys-libs/libapparmor-3.0.1 b/metadata/md5-cache/sys-libs/libapparmor-3.0.1
index d66ca9bbe2ed..358401fb5c6f 100644
--- a/metadata/md5-cache/sys-libs/libapparmor-3.0.1
+++ b/metadata/md5-cache/sys-libs/libapparmor-3.0.1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/apparmor/3.0/3.0.1/+download/apparmor-3.0.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e925b5b24bac22b7296910b028b286ee
+_md5_=f322559d566d3992d8a683f40ddfe3aa
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.25 b/metadata/md5-cache/sys-libs/libblockdev-2.25
index 110f4dfbd0d0..b3bd1cd21e90 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.25
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.25
@@ -5,7 +5,7 @@ DESCRIPTION=A library for manipulating block devices
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libblockdev
 IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) escrow? ( cryptsetup )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.25-1/libblockdev-2.25.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b03e69996e39815f54533acb553a79d0
+_md5_=aa7964bbf6942f816c6a4be0d9a47293
diff --git a/metadata/md5-cache/sys-libs/libcxx-10.0.1 b/metadata/md5-cache/sys-libs/libcxx-10.0.1
index fc282986b991..c6ff3fe79096 100644
--- a/metadata/md5-cache/sys-libs/libcxx-10.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-10.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-10.0.1-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a03eb428c81c1dc7f762f7e8bfa902fb
diff --git a/metadata/md5-cache/sys-libs/libcxx-11.1.0 b/metadata/md5-cache/sys-libs/libcxx-11.1.0
index 7e5020281a47..6a4129957f15 100644
--- a/metadata/md5-cache/sys-libs/libcxx-11.1.0
+++ b/metadata/md5-cache/sys-libs/libcxx-11.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-11.1.0-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d9879a2ef9a3d4c1c9277b6abbfca934
diff --git a/metadata/md5-cache/sys-libs/libcxx-12.0.0 b/metadata/md5-cache/sys-libs/libcxx-12.0.0
index f14925b1f296..60e56ce5e7de 100644
--- a/metadata/md5-cache/sys-libs/libcxx-12.0.0
+++ b/metadata/md5-cache/sys-libs/libcxx-12.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.0-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=35fa54ec31b59d645e43cff57bf0c57e
diff --git a/metadata/md5-cache/sys-libs/libcxx-12.0.1 b/metadata/md5-cache/sys-libs/libcxx-12.0.1
index 64510111b3ae..8916f5fc305f 100644
--- a/metadata/md5-cache/sys-libs/libcxx-12.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-12.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5976bacc7f9a11eea8cebc470dddb4a0
diff --git a/metadata/md5-cache/sys-libs/libcxx-13.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-13.0.0.9999
index 205bda85c3c7..38fd7405a6f2 100644
--- a/metadata/md5-cache/sys-libs/libcxx-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-13.0.0.9999
@@ -12,5 +12,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=32fba6facf88f60b12eb8d57799d0357
diff --git a/metadata/md5-cache/sys-libs/libcxx-14.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-14.0.0.9999
new file mode 100644
index 000000000000..5b0a819ae692
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-14.0.0.9999
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-util/cmake-3.16 >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-14.0.0.9999[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=New implementation of the C++ standard library, targeting C++11
+EAPI=7
+HOMEPAGE=https://libcxx.llvm.org/
+IUSE=elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+PROPERTIES=live
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-14.0.0.9999[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+REQUIRED_USE=libunwind? ( libcxxabi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=32fba6facf88f60b12eb8d57799d0357
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-10.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-10.0.1
index 7e0f4238069b..af0c52793ecb 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-10.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-10.0.1
@@ -11,5 +11,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8ae40d2a63267f3c1d664cceee0f0c9f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-11.1.0 b/metadata/md5-cache/sys-libs/libcxxabi-11.1.0
index 2538072c1fbc..57d45b70601b 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-11.1.0
+++ b/metadata/md5-cache/sys-libs/libcxxabi-11.1.0
@@ -11,5 +11,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fe1f6668bb28c4102ab467dffe9d089f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-12.0.0 b/metadata/md5-cache/sys-libs/libcxxabi-12.0.0
index e52edcd60b5d..889412f8f155 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-12.0.0
+++ b/metadata/md5-cache/sys-libs/libcxxabi-12.0.0
@@ -11,5 +11,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b1d97c49d565681770068617eda4b6ac
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-12.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-12.0.1
index b19b5088fc22..4926487d4b4b 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-12.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-12.0.1
@@ -11,5 +11,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6b0a46f66d48fec325618a29c75d281e
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-13.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-13.0.0.9999
index a18c5744ce01..3822bc36fb51 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-13.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=010c1a2681af81cafdaa9b63848a5574
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a554d662957d8a7a0749634b66efceb2
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-14.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-14.0.0.9999
new file mode 100644
index 000000000000..3822bc36fb51
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-14.0.0.9999
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=7
+HOMEPAGE=https://libcxxabi.llvm.org/
+IUSE=+libunwind static-libs test elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+PROPERTIES=live
+RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a554d662957d8a7a0749634b66efceb2
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.1 b/metadata/md5-cache/sys-libs/libomp-10.0.1
index b7407495ac85..e8c8620db0d6 100644
--- a/metadata/md5-cache/sys-libs/libomp-10.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-10.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fb0fe7a1427178d3fce2af3995f868a7
diff --git a/metadata/md5-cache/sys-libs/libomp-11.1.0 b/metadata/md5-cache/sys-libs/libomp-11.1.0
index e519fb0725aa..bac6483fe1b0 100644
--- a/metadata/md5-cache/sys-libs/libomp-11.1.0
+++ b/metadata/md5-cache/sys-libs/libomp-11.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=890dd5a7b0c2f8e4f3c5c2cd44442336
diff --git a/metadata/md5-cache/sys-libs/libomp-12.0.0 b/metadata/md5-cache/sys-libs/libomp-12.0.0
index 69fce0cf3e6d..4e647d96f0e5 100644
--- a/metadata/md5-cache/sys-libs/libomp-12.0.0
+++ b/metadata/md5-cache/sys-libs/libomp-12.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e42b3ce6e2396fed96b4e636a3754c62
diff --git a/metadata/md5-cache/sys-libs/libomp-12.0.1 b/metadata/md5-cache/sys-libs/libomp-12.0.1
index 65115939506a..8ab98896e55c 100644
--- a/metadata/md5-cache/sys-libs/libomp-12.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-12.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5d4dbd2a5facb904b696c364d5e1320f
diff --git a/metadata/md5-cache/sys-libs/libomp-13.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-13.0.0.9999
index e3917369548d..60d3bbc2f9dd 100644
--- a/metadata/md5-cache/sys-libs/libomp-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-13.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=82459bc0e8f154380f8dca9d0255402e
diff --git a/metadata/md5-cache/sys-libs/libomp-14.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-14.0.0.9999
new file mode 100644
index 000000000000..60d3bbc2f9dd
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-14.0.0.9999
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig ) test? ( || ( ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) >=sys-devel/clang-6 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=7
+HOMEPAGE=https://openmp.llvm.org
+IUSE=cuda hwloc kernel_linux offload ompt test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+PROPERTIES=live
+RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=82459bc0e8f154380f8dca9d0255402e
diff --git a/metadata/md5-cache/sys-libs/libselinux-3.2 b/metadata/md5-cache/sys-libs/libselinux-3.2
index 64572b6b0ec2..e6374d94cd64 100644
--- a/metadata/md5-cache/sys-libs/libselinux-3.2
+++ b/metadata/md5-cache/sys-libs/libselinux-3.2
@@ -5,11 +5,11 @@ DESCRIPTION=SELinux userland library
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~riscv x86
 LICENSE=public-domain
 RDEPEND=>=sys-libs/libsepol-3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ) elibc_musl? ( sys-libs/fts-standalone )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/libselinux-3.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e48a6407cfffe628fdb485641ff18c27
+_md5_=57bfcbfb07e66bea5652cbca136c34a7
diff --git a/metadata/md5-cache/sys-libs/libsemanage-3.2 b/metadata/md5-cache/sys-libs/libsemanage-3.2
index 6bc0bca67063..27d1880fcff1 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-3.2
+++ b/metadata/md5-cache/sys-libs/libsemanage-3.2
@@ -5,7 +5,7 @@ DESCRIPTION=SELinux kernel and policy management library
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libselinux-3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/2
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/libsemanage-3.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c916b6bf733e90fea792b83fd1ca40fa
+_md5_=67612a126328529e99cbf3c6ef242776
diff --git a/metadata/md5-cache/sys-libs/libsepol-3.2 b/metadata/md5-cache/sys-libs/libsepol-3.2
index fd7a7ce6b238..27c7830fed03 100644
--- a/metadata/md5-cache/sys-libs/libsepol-3.2
+++ b/metadata/md5-cache/sys-libs/libsepol-3.2
@@ -3,10 +3,10 @@ DESCRIPTION=SELinux binary policy representation library
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~riscv x86
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/libsepol-3.2.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=399e14ca949fd2c18f8780b6b0c10bff
+_md5_=90499350484c45b758f06c74fb671d56
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1
index ca916c887034..45fcead66c66 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1
@@ -11,5 +11,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b9a789af973371589143f0f6967637bc
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-11.1.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-11.1.0
index e613a3b9e49e..e7f903b0ae43 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-11.1.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-11.1.0
@@ -11,5 +11,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e8d16b641be8589b718b495300ac753b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0
index 2eeb544df413..057408d9d43a 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0
@@ -11,5 +11,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e40867fc3666d3400df4d7471ec1d15c
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1
index 3e03dc374826..95c6b106ad0b 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1
@@ -11,5 +11,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=49e0ff60cd1da27c611eb5ef871594b4
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0.9999
index 7dc1faa3477e..8d426721e34e 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	e3da6859d62ca2f32d0438304c9c77c4	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2c255bb8da5a1f40da1daae37f58fdcc
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=692019d16e5e538c9a935241eb80a893
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.0.9999
new file mode 100644
index 000000000000..8d426721e34e
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.0.9999
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=7
+HOMEPAGE=https://github.com/llvm-mirror/libunwind
+IUSE=debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+PROPERTIES=live
+RDEPEND=!sys-libs/libunwind
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=692019d16e5e538c9a935241eb80a893
diff --git a/metadata/md5-cache/sys-libs/musl-nscd-1.0.2 b/metadata/md5-cache/sys-libs/musl-nscd-1.0.2
index 729bfa107c0e..251f3628f17e 100644
--- a/metadata/md5-cache/sys-libs/musl-nscd-1.0.2
+++ b/metadata/md5-cache/sys-libs/musl-nscd-1.0.2
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=install postinst prepare
 DEPEND=!sys-libs/glibc !sys-libs/uclibc
 DESCRIPTION=musl-nscd is an implementation of the NSCD protocol for the musl libc
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/pikhq/musl-nscd/archive/v1.0.2.tar.gz -> musl-nscd-1.0.2.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d29e1560713fd59ca951c88ecdee1c1f
+_md5_=98b2f68ad3f034c9709bf2d3cae18ee0
diff --git a/metadata/md5-cache/sys-libs/musl-nscd-1.0.3 b/metadata/md5-cache/sys-libs/musl-nscd-1.0.3
index 2c827bfec9af..e3098ac2058b 100644
--- a/metadata/md5-cache/sys-libs/musl-nscd-1.0.3
+++ b/metadata/md5-cache/sys-libs/musl-nscd-1.0.3
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=install postinst prepare
 DEPEND=!sys-libs/glibc !sys-libs/uclibc
 DESCRIPTION=musl-nscd is an implementation of the NSCD protocol for the musl libc
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/pikhq/musl-nscd/archive/v1.0.3.tar.gz -> musl-nscd-1.0.3.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fcc7e44afb30f72793e6c139d378c912
+_md5_=d6bfdf51288621c96b3fc9a82b5b54e4
diff --git a/metadata/md5-cache/sys-libs/musl-nscd-9999 b/metadata/md5-cache/sys-libs/musl-nscd-9999
index fb9a73b9ba1c..ee24a469dcf3 100644
--- a/metadata/md5-cache/sys-libs/musl-nscd-9999
+++ b/metadata/md5-cache/sys-libs/musl-nscd-9999
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install prepare unpack
+DEFINED_PHASES=install postinst prepare unpack
 DEPEND=!sys-libs/glibc !sys-libs/uclibc
 DESCRIPTION=musl-nscd is an implementation of the NSCD protocol for the musl libc
 EAPI=7
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=virtual/tmpfiles
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6d127254ff39eec47811c9c01bccc5c1
+_md5_=804ca139d610e777f75a7cd042230ddd
diff --git a/metadata/md5-cache/sys-libs/tapi-2.0.0 b/metadata/md5-cache/sys-libs/tapi-2.0.0
index 5713ed12274e..92441819e5b2 100644
--- a/metadata/md5-cache/sys-libs/tapi-2.0.0
+++ b/metadata/md5-cache/sys-libs/tapi-2.0.0
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=sys-devel/llvm:= sys-devel/clang:=
 SLOT=0
 SRC_URI=https://opensource.apple.com/tarballs/clang/clang-800.0.42.1.tar.gz http://releases.llvm.org/5.0.1/llvm-5.0.1.src.tar.xz http://releases.llvm.org/5.0.1/cfe-5.0.1.src.tar.xz https://github.com/ributzka/tapi/archive/b9205695b4edee91000383695be8de5ba8e0db41.tar.gz -> tapi-2.0.0.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=78fc77b3e754d18624fb8feedc1ba85d
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 8c7ada65fbd7..c78a659e850f 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.31 b/metadata/md5-cache/sys-power/acpid-2.0.31
deleted file mode 100644
index 4fc972219af8..000000000000
--- a/metadata/md5-cache/sys-power/acpid-2.0.31
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst pretend setup
-DEPEND=>=sys-kernel/linux-headers-3 virtual/pkgconfig
-DESCRIPTION=Daemon for Advanced Configuration and Power Interface
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/acpid2
-IUSE=selinux kernel_linux
-KEYWORDS=amd64 ~arm arm64 ~ia64 x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-apm )
-SLOT=0
-SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.31.tar.xz https://dev.gentoo.org/~andrey_utkin/distfiles/sys-power_acpid_2.0.29-r1_extras.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=adbec279148571a51583f0d0d571d83c
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.32 b/metadata/md5-cache/sys-power/acpid-2.0.32
deleted file mode 100644
index 53fb105a3b9d..000000000000
--- a/metadata/md5-cache/sys-power/acpid-2.0.32
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst pretend setup
-DEPEND=>=sys-kernel/linux-headers-3 virtual/pkgconfig
-DESCRIPTION=Daemon for Advanced Configuration and Power Interface
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/acpid2
-IUSE=selinux kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-apm )
-SLOT=0
-SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.32.tar.xz https://dev.gentoo.org/~andrey_utkin/distfiles/sys-power_acpid_2.0.29-r1_extras.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8fb30c35ac66d9c3934a79d22f09f134
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.32-r1 b/metadata/md5-cache/sys-power/acpid-2.0.32-r1
deleted file mode 100644
index 02491aaddc91..000000000000
--- a/metadata/md5-cache/sys-power/acpid-2.0.32-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst pretend setup
-DEPEND=>=sys-kernel/linux-headers-3 virtual/pkgconfig
-DESCRIPTION=Daemon for Advanced Configuration and Power Interface
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/acpid2
-IUSE=selinux kernel_linux
-KEYWORDS=amd64 ~arm arm64 ~ia64 x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-apm )
-SLOT=0
-SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.32.tar.xz https://dev.gentoo.org/~andrey_utkin/distfiles/sys-power_acpid_2.0.32-r1_extras.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9c1ed58a71aedc28141078280f153c30
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 6d1d267bc780..e8d8e3439b14 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/audit-3.0 b/metadata/md5-cache/sys-process/audit-3.0
index 0bb5dace4061..7e579e6aa15a 100644
--- a/metadata/md5-cache/sys-process/audit-3.0
+++ b/metadata/md5-cache/sys-process/audit-3.0
@@ -5,7 +5,7 @@ DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=7
 HOMEPAGE=https://people.redhat.com/sgrubb/audit/
 IUSE=gssapi ldap python static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr
-KEYWORDS=amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap ) sys-libs/libcap-ng python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-3.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=c8f3baff4db94b6cbef67a3980ff5662
+_md5_=bb0c7cecb338ef7c565244dca008ce41
diff --git a/metadata/md5-cache/sys-process/parallel-20210422-r1 b/metadata/md5-cache/sys-process/parallel-20210422-r1
index f02a84b8f484..a6e772efe892 100644
--- a/metadata/md5-cache/sys-process/parallel-20210422-r1
+++ b/metadata/md5-cache/sys-process/parallel-20210422-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20210422.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20210422.tar.bz2.sig )
-_eclasses_=verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=eebec486e6ccafea825c39022180cbeb
+_eclasses_=verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=3eeec0abafe0ba941377b6aa307fc2c7
diff --git a/metadata/md5-cache/sys-process/parallel-20210522 b/metadata/md5-cache/sys-process/parallel-20210522
index 1762dac0554b..fc463efb62a4 100644
--- a/metadata/md5-cache/sys-process/parallel-20210522
+++ b/metadata/md5-cache/sys-process/parallel-20210522
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20210522.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20210522.tar.bz2.sig )
-_eclasses_=verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=eebec486e6ccafea825c39022180cbeb
+_eclasses_=verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=3eeec0abafe0ba941377b6aa307fc2c7
diff --git a/metadata/md5-cache/sys-process/parallel-20210622 b/metadata/md5-cache/sys-process/parallel-20210622
index 4e77719aacb0..ba1209ebdce2 100644
--- a/metadata/md5-cache/sys-process/parallel-20210622
+++ b/metadata/md5-cache/sys-process/parallel-20210622
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20210622.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20210622.tar.bz2.sig )
-_eclasses_=verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=7b3fd0d67db796ff0e2722d44963efe2
+_eclasses_=verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=7bc98f2456ac6eb4db602b8b6e9a982c
diff --git a/metadata/md5-cache/sys-process/parallel-20210722 b/metadata/md5-cache/sys-process/parallel-20210722
index 193688707e17..28b2f190391c 100644
--- a/metadata/md5-cache/sys-process/parallel-20210722
+++ b/metadata/md5-cache/sys-process/parallel-20210722
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20210722.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20210722.tar.bz2.sig )
-_eclasses_=verify-sig	10c122d0f49c54100ad5e279db0cb43c
-_md5_=0976998ba221b7e275f6fbc75bde284b
+_eclasses_=verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=e2c517a534bc5d79f22bbb7e5ccb5599
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index f475f20d0bc1..61f5cd171236 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.54 b/metadata/md5-cache/virtual/dist-kernel-5.10.54
new file mode 100644
index 000000000000..e0fec32ed1fa
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.54
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.54 ~sys-kernel/gentoo-kernel-bin-5.10.54 ~sys-kernel/vanilla-kernel-5.10.54 )
+SLOT=0/5.10.54
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.55 b/metadata/md5-cache/virtual/dist-kernel-5.10.55
new file mode 100644
index 000000000000..68ca5c1a0c9b
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.55
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.55 ~sys-kernel/gentoo-kernel-bin-5.10.55 ~sys-kernel/vanilla-kernel-5.10.55 )
+SLOT=0/5.10.55
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.13.6 b/metadata/md5-cache/virtual/dist-kernel-5.13.6
new file mode 100644
index 000000000000..e41c8033727a
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.13.6
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.13.6 ~sys-kernel/gentoo-kernel-bin-5.13.6 ~sys-kernel/vanilla-kernel-5.13.6 )
+SLOT=0/5.13.6
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.13.7 b/metadata/md5-cache/virtual/dist-kernel-5.13.7
new file mode 100644
index 000000000000..8eed35d09b50
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.13.7
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.13.7 ~sys-kernel/gentoo-kernel-bin-5.13.7 ~sys-kernel/vanilla-kernel-5.13.7 )
+SLOT=0/5.13.7
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.136 b/metadata/md5-cache/virtual/dist-kernel-5.4.136
new file mode 100644
index 000000000000..995d260909d9
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.136
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.136 ~sys-kernel/gentoo-kernel-bin-5.4.136 ~sys-kernel/vanilla-kernel-5.4.136 )
+SLOT=0/5.4.136
+_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.137 b/metadata/md5-cache/virtual/dist-kernel-5.4.137
new file mode 100644
index 000000000000..ed5ad40af39a
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.137
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.137 ~sys-kernel/gentoo-kernel-bin-5.4.137 ~sys-kernel/vanilla-kernel-5.4.137 )
+SLOT=0/5.4.137
+_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.560.0 b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.560.0
index 3083bc8e34eb..bf513a1c9ca3 100644
--- a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.560.0
+++ b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.560.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils
 EAPI=8
-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
+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
 RDEPEND=~perl-core/Scalar-List-Utils-1.560.0 dev-lang/perl:=
 SLOT=0
-_md5_=babefa90622c53d6261d7d031d4bb956
+_md5_=5c4288f8d422fb0f465886e9404c32e7
diff --git a/metadata/md5-cache/virtual/rust-1.53.0 b/metadata/md5-cache/virtual/rust-1.53.0
index 25480137f1e8..76d9a5e18dea 100644
--- a/metadata/md5-cache/virtual/rust-1.53.0
+++ b/metadata/md5-cache/virtual/rust-1.53.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Rust language compiler
 EAPI=7
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv x86
 RDEPEND=|| ( ~dev-lang/rust-1.53.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-lang/rust-bin-1.53.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=34d218dfa7569622c98583a9a360ec6a
+_md5_=d15844e2c8126e4bb9963a98ea766efe
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 2d962b94be29..176e5bc55b72 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r2 b/metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r2
index cf00c5ed4955..8d35ded013d3 100644
--- a/metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r2
+++ b/metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r2
@@ -9,4 +9,4 @@ RDEPEND=virtual/krb5 =www-servers/apache-2* virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://sourceforge/modauthkerb/mod_auth_kerb-5.4.tar.gz https://dev.gentoo.org/~mgorny/dist/mod_auth_kerb-5.4-gentoo-patchset.tar.bz2
 _eclasses_=apache-module	46dd6706a4df4d5086a9c2b19dc2c344	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8e42cb54d0668071dfae231a1a91e224
+_md5_=4f18fb1996399dbd261a2890365c801c
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 8fad6d2ec368..14e0ee7e54d3 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/grafana-bin-7.5.10 b/metadata/md5-cache/www-apps/grafana-bin-7.5.10
new file mode 100644
index 000000000000..eafd55bd09a4
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-7.5.10
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=acct-group/grafana acct-user/grafana
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=8
+HOMEPAGE=https://grafana.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/grafana acct-user/grafana media-libs/fontconfig
+SLOT=0
+SRC_URI=https://dl.grafana.com/oss/release/grafana-7.5.10.linux-amd64.tar.gz -> grafana-bin-7.5.10.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=87020bbe75dfbe46fa0bdfc645aee504
diff --git a/metadata/md5-cache/www-apps/grafana-bin-8.0.6 b/metadata/md5-cache/www-apps/grafana-bin-8.0.6
new file mode 100644
index 000000000000..01fe6d9ed9c3
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-8.0.6
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=acct-group/grafana acct-user/grafana
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=8
+HOMEPAGE=https://grafana.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/grafana acct-user/grafana media-libs/fontconfig
+SLOT=0
+SRC_URI=https://dl.grafana.com/oss/release/grafana-8.0.6.linux-amd64.tar.gz -> grafana-bin-8.0.6.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=87020bbe75dfbe46fa0bdfc645aee504
diff --git a/metadata/md5-cache/www-apps/hugo-0.85.0 b/metadata/md5-cache/www-apps/hugo-0.85.0
deleted file mode 100644
index 483e4add717b..000000000000
--- a/metadata/md5-cache/www-apps/hugo-0.85.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16.0 >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=The world's fastest framework for building websites
-EAPI=7
-HOMEPAGE=https://gohugo.io https://github.com/gohugoio/hugo
-IUSE=doc +sass
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 Unlicense BSD BSD-2 MPL-2.0 MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/gohugoio/hugo/archive/v0.85.0.tar.gz -> hugo-0.85.0.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20180421153158-65cc252bf669.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.55.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.55.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.58.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.58.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.81.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.81.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.9.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.9.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/aws/@v/v0.0.0-20181029163544-2befc13012d0.mod -> contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.12.1.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.mod mirror://goproxy//contrib.go.opencensus.io/integrations/ocsql/@v/v0.1.4.mod -> contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.mod mirror://goproxy//contrib.go.opencensus.io/resource/@v/v0.1.1.mod -> contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.2.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.2.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-service-bus-go/@v/v0.10.1.mod -> github.com%2F!azure%2Fazure-service-bus-go%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.9.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.9.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.7.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.7.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.3.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.zip -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.mod -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!geert!johan/go.incremental/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!geert!johan/go.rice/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!google!cloud!platform/cloudsql-proxy/@v/v0.0.0-20191009163259-e802c2cb94ae.mod -> github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20191009163259-e802c2cb94ae.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.2-0.20200305040604-4f3623dce67a.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.8.2.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.1.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.1.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.2.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.2.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.1.17-0.20190424132513-439c674f7ae0.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.1.17-0.20190424132513-439c674f7ae0.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.1-0.20190708041108-0548c6b1afae.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/kong-hcl/@v/v0.1.8-0.20190615233001-b21fea9723c8.mod -> github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20181024024818-d37bc2a10ba1.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20181024024818-d37bc2a10ba1.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.18.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.18.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.13.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.13.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.23.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.23.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.23.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.23.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bep/debounce/@v/v1.2.0.zip -> github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/bep/debounce/@v/v1.2.0.mod -> github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/bep/gitmap/@v/v1.1.2.zip -> github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/bep/gitmap/@v/v1.1.2.mod -> github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/bep/godartsass/@v/v0.12.0.zip -> github.com%2Fbep%2Fgodartsass%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/bep/godartsass/@v/v0.12.0.mod -> github.com%2Fbep%2Fgodartsass%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/bep/golibsass/@v/v1.0.0.zip -> github.com%2Fbep%2Fgolibsass%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/bep/golibsass/@v/v1.0.0.mod -> github.com%2Fbep%2Fgolibsass%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bep/gowebp/@v/v0.1.0.zip -> github.com%2Fbep%2Fgowebp%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bep/gowebp/@v/v0.1.0.mod -> github.com%2Fbep%2Fgowebp%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bep/tmc/@v/v0.5.1.zip -> github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/bep/tmc/@v/v0.5.1.mod -> github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cheekybits/is/@v/v0.0.0-20150225183255-68e9c0620927.mod -> github.com%2Fcheekybits%2Fis%2F@v%2Fv0.0.0-20150225183255-68e9c0620927.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.zip -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.mod -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/daaku/go.zipexe/@v/v1.0.0.mod -> github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20161028175848-04cdfd42973b.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20161028175848-04cdfd42973b.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/disintegration/gift/@v/v1.2.1.zip -> github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/disintegration/gift/@v/v1.2.1.mod -> github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.4.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.4.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanw/esbuild/@v/v0.11.16.zip -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.16.zip mirror://goproxy//github.com/evanw/esbuild/@v/v0.11.16.mod -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.16.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.2.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.61.0.zip -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.61.0.zip mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.61.0.mod -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.61.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.2.2.zip -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/gobuffalo/flect/@v/v0.2.2.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.zip -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gohugoio/go-i18n/v2/@v/v2.1.3-0.20210430103248-4c28c89f8013.zip -> github.com%2Fgohugoio%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013.zip mirror://goproxy//github.com/gohugoio/go-i18n/v2/@v/v2.1.3-0.20210430103248-4c28c89f8013.mod -> github.com%2Fgohugoio%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013.mod mirror://goproxy//github.com/gohugoio/testmod!builder/mods/@v/v0.0.0-20190520184928-c56af20f2e95.zip -> github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.zip mirror://goproxy//github.com/gohugoio/testmod!builder/mods/@v/v0.0.0-20190520184928-c56af20f2e95.mod -> github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-replayers/grpcreplay/@v/v0.1.0.zip -> github.com%2Fgoogle%2Fgo-replayers%2Fgrpcreplay%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/go-replayers/grpcreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fgrpcreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/go-replayers/httpreplay/@v/v0.1.0.zip -> github.com%2Fgoogle%2Fgo-replayers%2Fhttpreplay%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/go-replayers/httpreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fhttpreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.zip -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200507031123-427632fa3b1c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200507031123-427632fa3b1c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/wire/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/wire/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.zip -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.zip mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/csrf/@v/v1.6.0.mod -> github.com%2Fgorilla%2Fcsrf%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/gorilla/handlers/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jdkato/prose/@v/v1.2.1.zip -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/jdkato/prose/@v/v1.2.1.mod -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kyokomi/emoji/v2/@v/v2.2.8.zip -> github.com%2Fkyokomi%2Femoji%2Fv2%2F@v%2Fv2.2.8.zip mirror://goproxy//github.com/kyokomi/emoji/v2/@v/v2.2.8.mod -> github.com%2Fkyokomi%2Femoji%2Fv2%2F@v%2Fv2.2.8.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/magefile/mage/@v/v1.11.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.11.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/matryer/try/@v/v0.0.0-20161228173917-9ac251b645a2.mod -> github.com%2Fmatryer%2Ftry%2F@v%2Fv0.0.0-20161228173917-9ac251b645a2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190702010315-6dee0af9227d.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/mmark/@v/v1.3.6.zip -> github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.zip mirror://goproxy//github.com/miekg/mmark/@v/v1.3.6.mod -> github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/montanaflynn/stats/@v/v0.6.3.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.6.3.mod mirror://goproxy//github.com/muesli/smartcrop/@v/v0.3.0.zip -> github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/muesli/smartcrop/@v/v0.3.0.mod -> github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/neurosnap/sentences/@v/v1.0.6.mod -> github.com%2Fneurosnap%2Fsentences%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.zip -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.zip mirror://goproxy//github.com/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.mod -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.mod mirror://goproxy//github.com/niklasfasching/go-org/@v/v1.5.0.zip -> github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/niklasfasching/go-org/@v/v1.5.0.mod -> github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/nkovacs/streamquote/@v/v0.0.0-20170412213628-49af9bddb229.mod -> github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.mod -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20210226163009-20ebb0f2a09e.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.10.1.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.8.0.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.8.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.zip -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.zip mirror://goproxy//github.com/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.mod -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sanity-io/litter/@v/v1.5.0.zip -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/sanity-io/litter/@v/v1.5.0.mod -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shogo82148/go-shuffle/@v/v0.0.0-20180218125048-27e6095f230d.mod -> github.com%2Fshogo82148%2Fgo-shuffle%2F@v%2Fv0.0.0-20180218125048-27e6095f230d.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/fsync/@v/v0.9.0.zip -> github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/spf13/fsync/@v/v0.9.0.mod -> github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20161117074351-18a02ba4a312.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20161117074351-18a02ba4a312.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.16.zip -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.16.zip mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.16.mod -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.16.mod mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.18.zip -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.18.zip mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.18.mod -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.18.mod mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.14.zip -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.14.zip mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.14.mod -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.14.mod mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.18.zip -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.18.zip mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.18.mod -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.18.mod mirror://goproxy//github.com/tdewolff/test/@v/v1.0.6.zip -> github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/tdewolff/test/@v/v1.0.6.mod -> github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasttemplate/@v/v1.0.1.mod -> github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.22.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.8.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.8.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.8.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.8.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.9.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.9.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.9.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.9.mod mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200307114337-60d527fdb691.zip -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.zip mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200307114337-60d527fdb691.mod -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.15.0.mod -> go.opencensus.io%2F@v%2Fv0.15.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//gocloud.dev/@v/v0.20.0.zip -> gocloud.dev%2F@v%2Fv0.20.0.zip mirror://goproxy//gocloud.dev/@v/v0.20.0.mod -> gocloud.dev%2F@v%2Fv0.20.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20210220032944-ac19c3e999fb.zip -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20210220032944-ac19c3e999fb.zip mirror://goproxy//golang.org/x/image/@v/v0.0.0-20210220032944-ac19c3e999fb.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20210220032944-ac19c3e999fb.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210413134643-5e61552d6c78.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210413134643-5e61552d6c78.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181128092732-4ed8d59d0b35.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181128092732-4ed8d59d0b35.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200317113312-5766fd39f98d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200317113312-5766fd39f98d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501145240-bc7a7d42d5c3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501145240-bc7a7d42d5c3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200724161237-0e2f3a69832c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200724161237-0e2f3a69832c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210412220455-f1c623a9e750.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210412220455-f1c623a9e750.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210412220455-f1c623a9e750.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210412220455-f1c623a9e750.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190422233926-fe54fb35175b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190422233926-fe54fb35175b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200317043434-63da46f3035e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200317043434-63da46f3035e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200325010219-a49f79bcc224.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200325010219-a49f79bcc224.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200601175630-2caf76543d99.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200601175630-2caf76543d99.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200606014950-c42cb6316fb6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200606014950-c42cb6316fb6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200608174601-1b747fd94509.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200608174601-1b747fd94509.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.26.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.26.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.43.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod mirror://goproxy//google.golang.org/api/@v/v0.45.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.45.0.zip mirror://goproxy//google.golang.org/api/@v/v0.45.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.45.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200317114155-1f3552e48f24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200317114155-1f3552e48f24.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200325114520-5b2d0af7952b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200325114520-5b2d0af7952b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200603110839-e855014d5736.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200603110839-e855014d5736.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200608115520-7c474a2e3482.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200608115520-7c474a2e3482.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201109203340-2640f1f9cdfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201201144952-b05cb90ed32e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201210142538-e3217bee35cc.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201214200347-8c77b98c765d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210222152913-aa3ee6e6a81c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210310155132-4ce2db91004e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210402141018-6c239bbf2bb1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210402141018-6c239bbf2bb1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210413151531-c14fb6ef47c3.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210413151531-c14fb6ef47c3.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210413151531-c14fb6ef47c3.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210413151531-c14fb6ef47c3.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.35.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.mod mirror://goproxy//gopkg.in/neurosnap/sentences.v1/@v/v1.0.6.mod -> gopkg.in%2Fneurosnap%2Fsentences.v1%2F@v%2Fv1.0.6.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=81034b26fe0d0140cd3c60174eda6475
diff --git a/metadata/md5-cache/www-apps/hugo-0.86.1 b/metadata/md5-cache/www-apps/hugo-0.86.1
new file mode 100644
index 000000000000..9c0fc42a71b1
--- /dev/null
+++ b/metadata/md5-cache/www-apps/hugo-0.86.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16.0 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=The world's fastest framework for building websites
+EAPI=7
+HOMEPAGE=https://gohugo.io https://github.com/gohugoio/hugo
+IUSE=doc +sass
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 Unlicense BSD BSD-2 MIT
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/gohugoio/hugo/archive/v0.86.1.tar.gz -> hugo-0.86.1.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20180421153158-65cc252bf669.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.55.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.55.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.58.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.58.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.81.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.81.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.9.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.9.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/aws/@v/v0.0.0-20181029163544-2befc13012d0.mod -> contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.12.1.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.mod mirror://goproxy//contrib.go.opencensus.io/integrations/ocsql/@v/v0.1.4.mod -> contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.mod mirror://goproxy//contrib.go.opencensus.io/resource/@v/v0.1.1.mod -> contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.2.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.2.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-service-bus-go/@v/v0.10.1.mod -> github.com%2F!azure%2Fazure-service-bus-go%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.9.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.9.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.7.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.7.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.3.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.zip -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.zip mirror://goproxy//github.com/!burnt!sushi/locker/@v/v0.0.0-20171006230638-a6e239ea1c69.mod -> github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!geert!johan/go.incremental/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!geert!johan/go.rice/@v/v1.0.0.mod -> github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!google!cloud!platform/cloudsql-proxy/@v/v0.0.0-20191009163259-e802c2cb94ae.mod -> github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20191009163259-e802c2cb94ae.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.2-0.20200305040604-4f3623dce67a.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.8.2.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.1.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.1.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.2.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.2.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.1.17-0.20190424132513-439c674f7ae0.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.1.17-0.20190424132513-439c674f7ae0.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.1-0.20190708041108-0548c6b1afae.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/kong-hcl/@v/v0.1.8-0.20190615233001-b21fea9723c8.mod -> github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20181024024818-d37bc2a10ba1.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20181024024818-d37bc2a10ba1.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20181024024818-d37bc2a10ba1.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.18.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.18.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.13.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.13.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.23.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.23.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.23.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.23.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bep/debounce/@v/v1.2.0.zip -> github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/bep/debounce/@v/v1.2.0.mod -> github.com%2Fbep%2Fdebounce%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/bep/gitmap/@v/v1.1.2.zip -> github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/bep/gitmap/@v/v1.1.2.mod -> github.com%2Fbep%2Fgitmap%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/bep/godartsass/@v/v0.12.0.zip -> github.com%2Fbep%2Fgodartsass%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/bep/godartsass/@v/v0.12.0.mod -> github.com%2Fbep%2Fgodartsass%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/bep/golibsass/@v/v1.0.0.zip -> github.com%2Fbep%2Fgolibsass%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/bep/golibsass/@v/v1.0.0.mod -> github.com%2Fbep%2Fgolibsass%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bep/gowebp/@v/v0.1.0.zip -> github.com%2Fbep%2Fgowebp%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bep/gowebp/@v/v0.1.0.mod -> github.com%2Fbep%2Fgowebp%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bep/tmc/@v/v0.5.1.zip -> github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/bep/tmc/@v/v0.5.1.mod -> github.com%2Fbep%2Ftmc%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cheekybits/is/@v/v0.0.0-20150225183255-68e9c0620927.mod -> github.com%2Fcheekybits%2Fis%2F@v%2Fv0.0.0-20150225183255-68e9c0620927.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.zip -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cli/safeexec/@v/v1.0.0.mod -> github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/daaku/go.zipexe/@v/v1.0.0.mod -> github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20161028175848-04cdfd42973b.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20161028175848-04cdfd42973b.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/disintegration/gift/@v/v1.2.1.zip -> github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/disintegration/gift/@v/v1.2.1.mod -> github.com%2Fdisintegration%2Fgift%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.4.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.4.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanw/esbuild/@v/v0.11.16.zip -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.16.zip mirror://goproxy//github.com/evanw/esbuild/@v/v0.11.16.mod -> github.com%2Fevanw%2Fesbuild%2F@v%2Fv0.11.16.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.7.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.2.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.61.0.zip -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.61.0.zip mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.61.0.mod -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.61.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.2.2.zip -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/gobuffalo/flect/@v/v0.2.2.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.zip -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gohugoio/go-i18n/v2/@v/v2.1.3-0.20210430103248-4c28c89f8013.zip -> github.com%2Fgohugoio%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013.zip mirror://goproxy//github.com/gohugoio/go-i18n/v2/@v/v2.1.3-0.20210430103248-4c28c89f8013.mod -> github.com%2Fgohugoio%2Fgo-i18n%2Fv2%2F@v%2Fv2.1.3-0.20210430103248-4c28c89f8013.mod mirror://goproxy//github.com/gohugoio/testmod!builder/mods/@v/v0.0.0-20190520184928-c56af20f2e95.zip -> github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.zip mirror://goproxy//github.com/gohugoio/testmod!builder/mods/@v/v0.0.0-20190520184928-c56af20f2e95.mod -> github.com%2Fgohugoio%2Ftestmod!builder%2Fmods%2F@v%2Fv0.0.0-20190520184928-c56af20f2e95.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-replayers/grpcreplay/@v/v0.1.0.zip -> github.com%2Fgoogle%2Fgo-replayers%2Fgrpcreplay%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/go-replayers/grpcreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fgrpcreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/go-replayers/httpreplay/@v/v0.1.0.zip -> github.com%2Fgoogle%2Fgo-replayers%2Fhttpreplay%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/go-replayers/httpreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fhttpreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.zip -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200507031123-427632fa3b1c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200507031123-427632fa3b1c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/wire/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/wire/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.zip -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.zip mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/csrf/@v/v1.6.0.mod -> github.com%2Fgorilla%2Fcsrf%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/gorilla/handlers/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jdkato/prose/@v/v1.2.1.zip -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/jdkato/prose/@v/v1.2.1.mod -> github.com%2Fjdkato%2Fprose%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kyokomi/emoji/v2/@v/v2.2.8.zip -> github.com%2Fkyokomi%2Femoji%2Fv2%2F@v%2Fv2.2.8.zip mirror://goproxy//github.com/kyokomi/emoji/v2/@v/v2.2.8.mod -> github.com%2Fkyokomi%2Femoji%2Fv2%2F@v%2Fv2.2.8.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/magefile/mage/@v/v1.11.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.11.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/matryer/try/@v/v0.0.0-20161228173917-9ac251b645a2.mod -> github.com%2Fmatryer%2Ftry%2F@v%2Fv0.0.0-20161228173917-9ac251b645a2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190702010315-6dee0af9227d.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/mmark/@v/v1.3.6.zip -> github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.zip mirror://goproxy//github.com/miekg/mmark/@v/v1.3.6.mod -> github.com%2Fmiekg%2Fmmark%2F@v%2Fv1.3.6.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/montanaflynn/stats/@v/v0.6.3.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.6.3.mod mirror://goproxy//github.com/muesli/smartcrop/@v/v0.3.0.zip -> github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/muesli/smartcrop/@v/v0.3.0.mod -> github.com%2Fmuesli%2Fsmartcrop%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/neurosnap/sentences/@v/v1.0.6.mod -> github.com%2Fneurosnap%2Fsentences%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.zip -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.zip mirror://goproxy//github.com/nfnt/resize/@v/v0.0.0-20180221191011-83c6a9932646.mod -> github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.mod mirror://goproxy//github.com/niklasfasching/go-org/@v/v1.5.0.zip -> github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/niklasfasching/go-org/@v/v1.5.0.mod -> github.com%2Fniklasfasching%2Fgo-org%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/nkovacs/streamquote/@v/v0.0.0-20170412213628-49af9bddb229.mod -> github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.mod -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20210226163009-20ebb0f2a09e.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.10.1.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.8.0.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.8.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.3-0.20200218234912-41c5fccfd6f6.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.3-0.20200218234912-41c5fccfd6f6.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.zip -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.zip mirror://goproxy//github.com/rwcarlsen/goexif/@v/v0.0.0-20190401172101-9e8deecbddbd.mod -> github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sanity-io/litter/@v/v1.5.0.zip -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/sanity-io/litter/@v/v1.5.0.mod -> github.com%2Fsanity-io%2Flitter%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shogo82148/go-shuffle/@v/v0.0.0-20180218125048-27e6095f230d.mod -> github.com%2Fshogo82148%2Fgo-shuffle%2F@v%2Fv0.0.0-20180218125048-27e6095f230d.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/fsync/@v/v0.9.0.zip -> github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/spf13/fsync/@v/v0.9.0.mod -> github.com%2Fspf13%2Ffsync%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20161117074351-18a02ba4a312.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20161117074351-18a02ba4a312.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.16.zip -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.16.zip mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.16.mod -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.16.mod mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.18.zip -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.18.zip mirror://goproxy//github.com/tdewolff/minify/v2/@v/v2.9.18.mod -> github.com%2Ftdewolff%2Fminify%2Fv2%2F@v%2Fv2.9.18.mod mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.14.zip -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.14.zip mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.14.mod -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.14.mod mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.18.zip -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.18.zip mirror://goproxy//github.com/tdewolff/parse/v2/@v/v2.5.18.mod -> github.com%2Ftdewolff%2Fparse%2Fv2%2F@v%2Fv2.5.18.mod mirror://goproxy//github.com/tdewolff/test/@v/v1.0.6.zip -> github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/tdewolff/test/@v/v1.0.6.mod -> github.com%2Ftdewolff%2Ftest%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasttemplate/@v/v1.0.1.mod -> github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.22.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.8.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.8.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.8.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.8.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.9.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.9.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.9.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.9.mod mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200307114337-60d527fdb691.zip -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.zip mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20200307114337-60d527fdb691.mod -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.15.0.mod -> go.opencensus.io%2F@v%2Fv0.15.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//gocloud.dev/@v/v0.20.0.zip -> gocloud.dev%2F@v%2Fv0.20.0.zip mirror://goproxy//gocloud.dev/@v/v0.20.0.mod -> gocloud.dev%2F@v%2Fv0.20.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20210220032944-ac19c3e999fb.zip -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20210220032944-ac19c3e999fb.zip mirror://goproxy//golang.org/x/image/@v/v0.0.0-20210220032944-ac19c3e999fb.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20210220032944-ac19c3e999fb.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210413134643-5e61552d6c78.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210413134643-5e61552d6c78.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181128092732-4ed8d59d0b35.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181128092732-4ed8d59d0b35.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200317113312-5766fd39f98d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200317113312-5766fd39f98d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501145240-bc7a7d42d5c3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501145240-bc7a7d42d5c3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200724161237-0e2f3a69832c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200724161237-0e2f3a69832c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210412220455-f1c623a9e750.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210412220455-f1c623a9e750.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210412220455-f1c623a9e750.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210412220455-f1c623a9e750.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190422233926-fe54fb35175b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190422233926-fe54fb35175b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200317043434-63da46f3035e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200317043434-63da46f3035e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200325010219-a49f79bcc224.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200325010219-a49f79bcc224.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200601175630-2caf76543d99.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200601175630-2caf76543d99.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200606014950-c42cb6316fb6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200606014950-c42cb6316fb6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200608174601-1b747fd94509.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200608174601-1b747fd94509.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.26.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.26.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.43.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod mirror://goproxy//google.golang.org/api/@v/v0.45.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.45.0.zip mirror://goproxy//google.golang.org/api/@v/v0.45.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.45.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200317114155-1f3552e48f24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200317114155-1f3552e48f24.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200325114520-5b2d0af7952b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200325114520-5b2d0af7952b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200603110839-e855014d5736.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200603110839-e855014d5736.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200608115520-7c474a2e3482.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200608115520-7c474a2e3482.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201109203340-2640f1f9cdfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201201144952-b05cb90ed32e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201210142538-e3217bee35cc.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201214200347-8c77b98c765d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210222152913-aa3ee6e6a81c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210310155132-4ce2db91004e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210402141018-6c239bbf2bb1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210402141018-6c239bbf2bb1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210413151531-c14fb6ef47c3.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210413151531-c14fb6ef47c3.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210413151531-c14fb6ef47c3.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210413151531-c14fb6ef47c3.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.35.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.mod mirror://goproxy//gopkg.in/neurosnap/sentences.v1/@v/v1.0.6.mod -> gopkg.in%2Fneurosnap%2Fsentences.v1%2F@v%2Fv1.0.6.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e09eae4252accb2a99369a6c7530ac79
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.8.4 b/metadata/md5-cache/www-apps/icingaweb2-2.8.4
new file mode 100644
index 000000000000..0c846b4fd37c
--- /dev/null
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.8.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config install postinst setup
+DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+DESCRIPTION=Icinga Web 2 - Frontend for icinga2
+EAPI=7
+HOMEPAGE=http://www.icinga.org/
+IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
+SLOT=0
+SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.8.4 -> icingaweb2-2.8.4.tar.gz
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3d74192f386d2a874e3ef602a3797a14
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.9.2 b/metadata/md5-cache/www-apps/icingaweb2-2.9.2
new file mode 100644
index 000000000000..4f549ba7aa83
--- /dev/null
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.9.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config install postinst setup
+DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+DESCRIPTION=Icinga Web 2 - Frontend for icinga2
+EAPI=7
+HOMEPAGE=http://www.icinga.org/
+IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
+SLOT=0
+SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.9.2 -> icingaweb2-2.9.2.tar.gz
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=50ff6e859d11a87577f4b54f0976b614
diff --git a/metadata/md5-cache/www-apps/kibana-bin-6.8.17 b/metadata/md5-cache/www-apps/kibana-bin-6.8.17
new file mode 100644
index 000000000000..700478499399
--- /dev/null
+++ b/metadata/md5-cache/www-apps/kibana-bin-6.8.17
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Analytics and search dashboard for Elasticsearch
+EAPI=7
+HOMEPAGE=https://www.elastic.co/products/kibana
+IUSE=x-pack
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )
+RDEPEND=acct-group/kibana acct-user/kibana >=net-libs/nodejs-10.15.2 <net-libs/nodejs-14 x-pack? ( dev-libs/expat dev-libs/nss )
+SLOT=0
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-6.8.17-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-oss-6.8.17-linux-x86_64.tar.gz )
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ac241698071c40a61a76b9cb3b46a4a5
diff --git a/metadata/md5-cache/www-apps/kibana-bin-7.13.4 b/metadata/md5-cache/www-apps/kibana-bin-7.13.4
new file mode 100644
index 000000000000..5e3b9cfa4c1a
--- /dev/null
+++ b/metadata/md5-cache/www-apps/kibana-bin-7.13.4
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Analytics and search dashboard for Elasticsearch
+EAPI=7
+HOMEPAGE=https://www.elastic.co/products/kibana
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 Elastic-2.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB
+RDEPEND=acct-group/kibana acct-user/kibana dev-libs/expat dev-libs/nss >=net-libs/nodejs-14.16.0 <net-libs/nodejs-15
+SLOT=0
+SRC_URI=https://artifacts.elastic.co/downloads/kibana/kibana-7.13.4-linux-x86_64.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=99ced78ff0f440be0066e8313f38c106
diff --git a/metadata/md5-cache/www-apps/postfixadmin-3.3.9-r1 b/metadata/md5-cache/www-apps/postfixadmin-3.3.9-r1
deleted file mode 100644
index 7a89da8834b7..000000000000
--- a/metadata/md5-cache/www-apps/postfixadmin-3.3.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=dev-lang/php:*[unicode,imap,postgres?] vacation? ( acct-group/vacation acct-user/vacation dev-perl/DBI dev-perl/Email-Sender dev-perl/Email-Valid dev-perl/Log-Dispatch dev-perl/Log-Log4perl dev-perl/MIME-Charset dev-perl/MIME-EncWords mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web Based Management tool for Postfix style virtual domains and users
-EAPI=7
-HOMEPAGE=http://postfixadmin.sourceforge.net
-IUSE=+mysql postgres +vacation vhosts
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php:*[unicode,imap,postgres?] vacation? ( acct-group/vacation acct-user/vacation dev-perl/DBI dev-perl/Email-Sender dev-perl/Email-Valid dev-perl/Log-Dispatch dev-perl/Log-Log4perl dev-perl/MIME-Charset dev-perl/MIME-EncWords mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ) virtual/httpd-php mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres )
-SLOT=3.3.9-r1
-SRC_URI=https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-3.3.9.tar.gz
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=91b171640bb361ba904ce15bc7dfec5f
diff --git a/metadata/md5-cache/www-apps/postfixadmin-3.3.9-r2 b/metadata/md5-cache/www-apps/postfixadmin-3.3.9-r2
new file mode 100644
index 000000000000..f726f36674cf
--- /dev/null
+++ b/metadata/md5-cache/www-apps/postfixadmin-3.3.9-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prerm setup
+DEPEND=dev-lang/php:*[unicode,imap,postgres?] vacation? ( acct-group/vacation acct-user/vacation dev-perl/DBI dev-perl/Email-Sender dev-perl/Email-Valid dev-perl/Log-Dispatch dev-perl/Log-Log4perl dev-perl/MIME-Charset dev-perl/MIME-EncWords mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Web Based Management tool for Postfix style virtual domains and users
+EAPI=7
+HOMEPAGE=http://postfixadmin.sourceforge.net
+IUSE=+mysql postgres +vacation vhosts
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php:*[unicode,imap,postgres?] vacation? ( acct-group/vacation acct-user/vacation dev-perl/DBI dev-perl/Email-Sender dev-perl/Email-Valid dev-perl/Log-Dispatch dev-perl/Log-Log4perl dev-perl/MIME-Charset dev-perl/MIME-EncWords mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ) virtual/httpd-php mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres )
+SLOT=3.3.9-r2
+SRC_URI=https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-3.3.9.tar.gz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=61164f73844e005b8448a8337e464543
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 5500319da7ba..1767a402b905 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-93.0.4577.15 b/metadata/md5-cache/www-client/chromium-93.0.4577.15
deleted file mode 100644
index 640bfe24f5c6..000000000000
--- a/metadata/md5-cache/www-client/chromium-93.0.4577.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-93.0.4577.15.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-93-patchset-6/chromium-93-patchset-6.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-92-glibc-2.33-patch.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=68281eaf975cebb69926566fc1841abe
diff --git a/metadata/md5-cache/www-client/chromium-93.0.4577.18 b/metadata/md5-cache/www-client/chromium-93.0.4577.18
new file mode 100644
index 000000000000..b5c1b9e3185f
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-93.0.4577.18
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=https://chromium.org/
+IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-93.0.4577.18.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-93-patchset-6/chromium-93-patchset-6.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-92-glibc-2.33-patch.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=68281eaf975cebb69926566fc1841abe
diff --git a/metadata/md5-cache/www-client/firefox-78.12.0 b/metadata/md5-cache/www-client/firefox-78.12.0
index 822876932d0c..e0f73c0d9fa7 100644
--- a/metadata/md5-cache/www-client/firefox-78.12.0
+++ b/metadata/md5-cache/www-client/firefox-78.12.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >
 REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland ) wifi? ( dbus )
 SLOT=0/esr78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/source/firefox-78.12.0esr.source.tar.xz -> firefox-78.12.0esr.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-15.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.12.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.12.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.12.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.12.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.12.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.12.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.12.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.12.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.12.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.12.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.12.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.12.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.12.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.12.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.12.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.12.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.12.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.12.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.12.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.12.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.12.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.12.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.12.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.12.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.12.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.12.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.12.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.12.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.12.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.12.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.12.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.12.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.12.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.12.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.12.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.12.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.12.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.12.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.12.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.12.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.12.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.12.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.12.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.12.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.12.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.12.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.12.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.12.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.12.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.12.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.12.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.12.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.12.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.12.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.12.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.12.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.12.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.12.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.12.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.12.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.12.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.12.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.12.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.12.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.12.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.12.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.12.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.12.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.12.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.12.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.12.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.12.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.12.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.12.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.12.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.12.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.12.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.12.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.12.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.12.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.12.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.12.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.12.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.12.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.12.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.12.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.12.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.12.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.12.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.12.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.12.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.12.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.12.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.12.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.12.0esr-zh-TW.xpi )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=59001da5b2cc242aa7b5ce37265da2d2
diff --git a/metadata/md5-cache/www-client/firefox-90.0.2 b/metadata/md5-cache/www-client/firefox-90.0.2
index 047c6fbd0fb3..831f052178bd 100644
--- a/metadata/md5-cache/www-client/firefox-90.0.2
+++ b/metadata/md5-cache/www-client/firefox-90.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/nss-3.66 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x
 REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
 SLOT=0/90
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/90.0.2/source/firefox-90.0.2.source.tar.xz -> firefox-90.0.2.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-90-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-90-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-90-patches-01.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ach.xpi -> firefox-90.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/af.xpi -> firefox-90.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/an.xpi -> firefox-90.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ar.xpi -> firefox-90.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ast.xpi -> firefox-90.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/az.xpi -> firefox-90.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/be.xpi -> firefox-90.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bg.xpi -> firefox-90.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bn.xpi -> firefox-90.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/br.xpi -> firefox-90.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bs.xpi -> firefox-90.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-90.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ca.xpi -> firefox-90.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cak.xpi -> firefox-90.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cs.xpi -> firefox-90.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cy.xpi -> firefox-90.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/da.xpi -> firefox-90.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/de.xpi -> firefox-90.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-90.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/el.xpi -> firefox-90.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-90.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-90.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/eo.xpi -> firefox-90.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-90.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-90.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-90.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-90.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/et.xpi -> firefox-90.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/eu.xpi -> firefox-90.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fa.xpi -> firefox-90.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ff.xpi -> firefox-90.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fi.xpi -> firefox-90.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fr.xpi -> firefox-90.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-90.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-90.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gd.xpi -> firefox-90.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gl.xpi -> firefox-90.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gn.xpi -> firefox-90.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-90.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/he.xpi -> firefox-90.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-90.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hr.xpi -> firefox-90.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-90.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hu.xpi -> firefox-90.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-90.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ia.xpi -> firefox-90.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/id.xpi -> firefox-90.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/is.xpi -> firefox-90.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/it.xpi -> firefox-90.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ja.xpi -> firefox-90.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ka.xpi -> firefox-90.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kab.xpi -> firefox-90.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kk.xpi -> firefox-90.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/km.xpi -> firefox-90.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kn.xpi -> firefox-90.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ko.xpi -> firefox-90.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lij.xpi -> firefox-90.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lt.xpi -> firefox-90.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lv.xpi -> firefox-90.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/mk.xpi -> firefox-90.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/mr.xpi -> firefox-90.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ms.xpi -> firefox-90.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/my.xpi -> firefox-90.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-90.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-90.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nl.xpi -> firefox-90.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-90.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/oc.xpi -> firefox-90.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-90.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pl.xpi -> firefox-90.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-90.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-90.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/rm.xpi -> firefox-90.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ro.xpi -> firefox-90.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ru.xpi -> firefox-90.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/si.xpi -> firefox-90.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sk.xpi -> firefox-90.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sl.xpi -> firefox-90.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/son.xpi -> firefox-90.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sq.xpi -> firefox-90.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sr.xpi -> firefox-90.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-90.0.2-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/szl.xpi -> firefox-90.0.2-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ta.xpi -> firefox-90.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/te.xpi -> firefox-90.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/th.xpi -> firefox-90.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/tl.xpi -> firefox-90.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/tr.xpi -> firefox-90.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/trs.xpi -> firefox-90.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/uk.xpi -> firefox-90.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ur.xpi -> firefox-90.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/uz.xpi -> firefox-90.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/vi.xpi -> firefox-90.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/xh.xpi -> firefox-90.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-90.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-90.0.2-zh-TW.xpi )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=48d7f3319df476e70f6327eae6f06f60
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-92.0.4515.107 b/metadata/md5-cache/www-client/google-chrome-beta-92.0.4515.107
deleted file mode 100644
index 9aba8d7583e9..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-92.0.4515.107
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Google
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_92.0.4515.107-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bcc54f6c33b23e21a948dc2d14b06bdc
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.18 b/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.18
new file mode 100644
index 000000000000..f3f861372d47
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The web browser from Google
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_93.0.4577.18-1_amd64.deb
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bcc54f6c33b23e21a948dc2d14b06bdc
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4577.15 b/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4577.15
deleted file mode 100644
index 99fc8978c802..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4577.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Google
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_93.0.4577.15-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bcc54f6c33b23e21a948dc2d14b06bdc
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4577.18 b/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4577.18
new file mode 100644
index 000000000000..5655865ceae1
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4577.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The web browser from Google
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_93.0.4577.18-1_amd64.deb
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bcc54f6c33b23e21a948dc2d14b06bdc
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.45 b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.45
deleted file mode 100644
index f7a2df8e7bd9..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.45
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Microsoft
-EAPI=7
-HOMEPAGE=https://www.microsoft.com/en-us/edge
-IUSE=kernel_linux
-KEYWORDS=-* ~amd64
-LICENSE=microsoft-edge
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_92.0.902.45-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.62 b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.62
new file mode 100644
index 000000000000..78b58ffec2ae
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.62
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The web browser from Microsoft
+EAPI=7
+HOMEPAGE=https://www.microsoft.com/en-us/edge
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=microsoft-edge
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_92.0.902.62-1_amd64.deb
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/opera-beta-78.0.4093.103 b/metadata/md5-cache/www-client/opera-beta-78.0.4093.103
new file mode 100644
index 000000000000..5fc17ba53eed
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-78.0.4093.103
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=OPERA-2018
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera-beta/78.0.4093.103/linux/opera-beta_78.0.4093.103_amd64.deb https://download2.operacdn.com/pub/opera-beta/78.0.4093.103/linux/opera-beta_78.0.4093.103_amd64.deb https://download3.operacdn.com/pub/opera-beta/78.0.4093.103/linux/opera-beta_78.0.4093.103_amd64.deb https://download4.operacdn.com/pub/opera-beta/78.0.4093.103/linux/opera-beta_78.0.4093.103_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-92.0.4515.20.tar.xz )
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5c15c634a063e31582a9d6d3c4bf9b75
diff --git a/metadata/md5-cache/www-client/opera-beta-78.0.4093.46 b/metadata/md5-cache/www-client/opera-beta-78.0.4093.46
deleted file mode 100644
index 8f4542c3471d..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-78.0.4093.46
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=OPERA-2018
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/78.0.4093.46/linux/opera-beta_78.0.4093.46_amd64.deb https://download2.operacdn.com/pub/opera-beta/78.0.4093.46/linux/opera-beta_78.0.4093.46_amd64.deb https://download3.operacdn.com/pub/opera-beta/78.0.4093.46/linux/opera-beta_78.0.4093.46_amd64.deb https://download4.operacdn.com/pub/opera-beta/78.0.4093.46/linux/opera-beta_78.0.4093.46_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-92.0.4515.20.tar.xz )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5c15c634a063e31582a9d6d3c4bf9b75
diff --git a/metadata/md5-cache/www-client/pybugz-0.13 b/metadata/md5-cache/www-client/pybugz-0.13
deleted file mode 100644
index 37772a14f6ce..000000000000
--- a/metadata/md5-cache/www-client/pybugz-0.13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[readline(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Command line interface to (Gentoo) Bugzilla
-EAPI=7
-HOMEPAGE=https://github.com/williamh/pybugz
-IUSE=zsh-completion python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[readline(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/williamh/pybugz/archive/0.13.tar.gz -> pybugz-0.13.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=590f7589c2591269843379af9f2a6213
diff --git a/metadata/md5-cache/www-client/pybugz-0.13-r1 b/metadata/md5-cache/www-client/pybugz-0.13-r1
new file mode 100644
index 000000000000..aa7af6af1839
--- /dev/null
+++ b/metadata/md5-cache/www-client/pybugz-0.13-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[readline(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=Command line interface to (Gentoo) Bugzilla
+EAPI=7
+HOMEPAGE=https://github.com/williamh/pybugz
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[readline(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/williamh/pybugz/archive/0.13.tar.gz -> pybugz-0.13.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c01a4c162a336841215c2e3a83e26549
diff --git a/metadata/md5-cache/www-client/pybugz-9999 b/metadata/md5-cache/www-client/pybugz-9999
index e046fef71971..defb960ef6ee 100644
--- a/metadata/md5-cache/www-client/pybugz-9999
+++ b/metadata/md5-cache/www-client/pybugz-9999
@@ -4,11 +4,11 @@ DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3
 DESCRIPTION=Command line interface to (Gentoo) Bugzilla
 EAPI=7
 HOMEPAGE=https://github.com/williamh/pybugz
-IUSE=zsh-completion python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[readline(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b7c838a38c4913472a74caec4bf48e1d
+_md5_=13516933e729312922274ad2b76fb2e4
diff --git a/metadata/md5-cache/www-client/vivaldi-4.0.2312.38 b/metadata/md5-cache/www-client/vivaldi-4.0.2312.38
deleted file mode 100644
index 5117c885afa2..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-4.0.2312.38
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm ~arm64
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 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/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.38-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.38-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.38-1_arm64.deb )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=85d450b4be07e6001b151344ae41d3bf
diff --git a/metadata/md5-cache/www-client/vivaldi-4.0.2312.41 b/metadata/md5-cache/www-client/vivaldi-4.0.2312.41
index b8485d148986..f7f7e8d745f6 100644
--- a/metadata/md5-cache/www-client/vivaldi-4.0.2312.41
+++ b/metadata/md5-cache/www-client/vivaldi-4.0.2312.41
@@ -4,11 +4,11 @@ DESCRIPTION=A browser for our friends
 EAPI=7
 HOMEPAGE=https://vivaldi.com/
 IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
+KEYWORDS=-* amd64 ~arm ~arm64
 LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 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/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.41-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.41-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.41-1_arm64.deb )
 _eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fc270c831d5e47c6c0ab6a96b1a0e98a
+_md5_=85d450b4be07e6001b151344ae41d3bf
diff --git a/metadata/md5-cache/www-client/vivaldi-4.1.2369.11 b/metadata/md5-cache/www-client/vivaldi-4.1.2369.11
new file mode 100644
index 000000000000..9a51e76d24b9
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-4.1.2369.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 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/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.1.2369.11-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.1.2369.11-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.1.2369.11-1_arm64.deb )
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fc270c831d5e47c6c0ab6a96b1a0e98a
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2358.15 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2358.15
deleted file mode 100644
index bc7240d68efa..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2358.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 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/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2358.15-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2358.15-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2358.15-1_arm64.deb )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fc270c831d5e47c6c0ab6a96b1a0e98a
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2369.10 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2369.10
new file mode 100644
index 000000000000..f5188d621f5a
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-4.1.2369.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 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/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2369.10-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2369.10-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.1.2369.10-1_arm64.deb )
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fc270c831d5e47c6c0ab6a96b1a0e98a
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 425e1b3cb353..41be78add3e6 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/vdradmin-am-3.6.10-r1 b/metadata/md5-cache/www-misc/vdradmin-am-3.6.10-r1
index 72a34ad64f2e..6c4e47ae55d7 100644
--- a/metadata/md5-cache/www-misc/vdradmin-am-3.6.10-r1
+++ b/metadata/md5-cache/www-misc/vdradmin-am-3.6.10-r1
@@ -11,4 +11,4 @@ RDEPEND=acct-group/vdradmin acct-user/vdradmin dev-lang/perl dev-perl/Template-T
 SLOT=0
 SRC_URI=http://andreas.vdr-developer.org/vdradmin-am/download/vdradmin-am-3.6.10.tar.bz2
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=88db4525a41101d1d0e6628a9cc30031
+_md5_=810deb79b97efdb99742b07d5f5f11fa
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index d54f1d508b7a..56d8eea1d1a6 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.107_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.107_beta
deleted file mode 100644
index 77ebb7265df8..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.107_beta
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_92.0.4515.107-1_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.15_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.15_alpha
deleted file mode 100644
index d6cec5877014..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.15_alpha
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
-RESTRICT=bindist mirror strip
-SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_93.0.4577.15-1_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.18_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.18_alpha
new file mode 100644
index 000000000000..131cb49efc74
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.18_alpha
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
+RESTRICT=bindist mirror strip
+SLOT=unstable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_93.0.4577.18-1_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.18_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.18_beta
new file mode 100644
index 000000000000..238f25a59882
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.18_beta
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=beta
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_93.0.4577.18-1_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 0f68f05d905f..9cc3289a9bc1 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/apache-2.4.48-r3 b/metadata/md5-cache/www-servers/apache-2.4.48-r3
index c79a38a76b79..504ed830d7a8 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.48-r3
+++ b/metadata/md5-cache/www-servers/apache-2.4.48-r3
@@ -5,7 +5,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=7
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog split-usr threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_auth_form apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authn_socache apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers +apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_lua apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_uwsgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_session apache2_modules_session_cookie apache2_modules_session_crypto apache2_modules_session_dbd apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_memcache apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.48
 RDEPEND=apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) virtual/tmpfiles
@@ -13,4 +13,4 @@ REQUIRED_USE=apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_tar
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.48.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
 _eclasses_=apache-2	2ac8b88289753f6ba063ef5f5c99b369	autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=da41cabad22e20583b76f2239b5fbd25
+_md5_=96d62be46227b5646a9ed1ce1b284482
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.55-r101 b/metadata/md5-cache/www-servers/lighttpd-1.4.55-r101
index 772ef220d63c..efd3bdb53c63 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.55-r101
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.55-r101
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.55.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=92c24a0b5c6c15856eaa032986a1b873
+_md5_=fdc65a31546554e77c0eebb87434aa07
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.58-r1 b/metadata/md5-cache/www-servers/lighttpd-1.4.58-r1
index bb0520acfdab..00c9779e1a26 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.58-r1
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.58-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.58.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5e6559065d04d2eef492aefc04f3a3d4
+_md5_=68ee423271810564b55a85f1065de6be
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.59-r1 b/metadata/md5-cache/www-servers/lighttpd-1.4.59-r1
index bc89dd99eda9..46b7ad433442 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.59-r1
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.59-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.59.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c2af566b31c571aac3ce8c62d6350157
+_md5_=06fef0306e425de7f624e773fa5d7bba
diff --git a/metadata/md5-cache/www-servers/nginx-1.21.1 b/metadata/md5-cache/www-servers/nginx-1.21.1
index f6a25bc00320..246085013952 100644
--- a/metadata/md5-cache/www-servers/nginx-1.21.1
+++ b/metadata/md5-cache/www-servers/nginx-1.21.1
@@ -5,7 +5,7 @@ DESCRIPTION=Robust, small and high performance http and reverse proxy server
 EAPI=7
 HOMEPAGE=https://nginx.org
 IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
 PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
 RDEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=mainline
 SRC_URI=https://nginx.org/download/nginx-1.21.1.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.6.1.tar.gz -> njs-0.6.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.6.1.tar.gz -> njs-0.6.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3f1101a7354586e278cfc6d3ddf81cfa
+_md5_=5c349d18b9b83781bbf8ea8900023411
diff --git a/metadata/md5-cache/www-servers/puma-5.4.0 b/metadata/md5-cache/www-servers/puma-5.4.0
new file mode 100644
index 000000000000..2b443744eabc
--- /dev/null
+++ b/metadata/md5-cache/www-servers/puma-5.4.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] test? ( dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] test? ( dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] test? ( dev-ruby/rack[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby30(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby30(-)] ) ) test? ( ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/nio4r:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
+EAPI=8
+HOMEPAGE=https://puma.io/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/openssl:0= ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/nio4r:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/puma/puma/archive/v5.4.0.tar.gz -> puma-5.4.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e9f14eae18951062ef1ad9d7b62bea33
diff --git a/metadata/md5-cache/www-servers/tornado-6.1 b/metadata/md5-cache/www-servers/tornado-6.1
index ee58ae6c95a0..a9db48379ee5 100644
--- a/metadata/md5-cache/www-servers/tornado-6.1
+++ b/metadata/md5-cache/www-servers/tornado-6.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python web framework and asynchronous networking library
 EAPI=7
 HOMEPAGE=https://www.tornadoweb.org/
 IUSE=examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pycurl-7.19.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-6.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3acc5095ba5e21a04e2944b92524617c
+_md5_=047e1df1bc231dd864dfc6d49882fa64
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r103 b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r103
index 2ef388dcfd5d..842c44b40209 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r103
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r103
@@ -5,11 +5,11 @@ DESCRIPTION=uWSGI server for Python web applications
 EAPI=7
 HOMEPAGE=https://projects.unbit.it/uwsgi/
 IUSE=apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php python python-asyncio python-gevent ruby +lua_single_target_lua5-1 php_targets_php7-3 php_targets_php7-4 python_targets_python3_8 python_targets_python3_9 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux
+KEYWORDS=amd64 arm x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( net-libs/libnsl php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
 REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio python-gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python-asyncio? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python-gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.19.1.tar.gz -> uwsgi-2.0.19.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8f7b227ea5931075d08f8460254506d3
+_md5_=174c08ff9f98d993455706786d437343
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index ecb068a15704..528dd1f41e29 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.11-r3 b/metadata/md5-cache/x11-base/xorg-server-1.20.11-r3
deleted file mode 100644
index 51b2c8df21cc..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-1.20.11-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=media-libs/libglvnd[X] dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2018.4 >=x11-libs/xtrans-1.3.5 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) )
-DESCRIPTION=X.Org X servers
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
-RDEPEND=media-libs/libglvnd[X] dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) wayland? ( x11-base/xwayland )
-REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !wayland ) xephyr? ( kdrive )
-RESTRICT=!test? ( test )
-SLOT=0/1.20.11
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.11.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=97453cad1de2b1a6af21edfecb1802c4
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.11-r4 b/metadata/md5-cache/x11-base/xorg-server-1.20.11-r4
new file mode 100644
index 000000000000..0454a3530221
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-server-1.20.11-r4
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=media-libs/libglvnd[X] dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2018.4 >=x11-libs/xtrans-1.3.5 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) )
+DESCRIPTION=X.Org X servers
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
+IUSE=dmx kdrive xephyr xnest xorg xvfb debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
+RDEPEND=media-libs/libglvnd[X] dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver )
+REQUIRED_USE=!minimal? ( || ( dmx kdrive xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) xephyr? ( kdrive )
+RESTRICT=!test? ( test )
+SLOT=0/1.20.11
+SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.11.tar.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=58367bb8f08593b87202436fbf834e97
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.13-r1 b/metadata/md5-cache/x11-base/xorg-server-1.20.13-r1
new file mode 100644
index 000000000000..d8179d7ffcf3
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-server-1.20.13-r1
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=media-libs/libglvnd[X] dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2018.4 >=x11-libs/xtrans-1.3.5 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) )
+DESCRIPTION=X.Org X servers
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
+IUSE=dmx kdrive xephyr xnest xorg xvfb debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
+RDEPEND=media-libs/libglvnd[X] dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver )
+REQUIRED_USE=!minimal? ( || ( dmx kdrive xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) xephyr? ( kdrive )
+RESTRICT=!test? ( test )
+SLOT=0/1.20.13
+SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.13.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=d8d2717fe96fdbe468601db558847c04
diff --git a/metadata/md5-cache/x11-base/xorg-server-9999 b/metadata/md5-cache/x11-base/xorg-server-9999
index 137ffec4f651..d37f1fb4b68e 100644
--- a/metadata/md5-cache/x11-base/xorg-server-9999
+++ b/metadata/md5-cache/x11-base/xorg-server-9999
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=media-libs/libglvnd[X] dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2018.4 >=x11-libs/xtrans-1.3.5 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) )
+DEPEND=media-libs/libglvnd[X] dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2018.4 >=x11-libs/xtrans-1.3.5 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) )
 DESCRIPTION=X.Org X servers
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity doc
+IUSE=dmx kdrive xephyr xnest xorg xvfb debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity doc
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-9999 )
 PROPERTIES=live
-RDEPEND=media-libs/libglvnd[X] dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) wayland? ( x11-base/xwayland )
-REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !wayland ) xephyr? ( kdrive )
+RDEPEND=media-libs/libglvnd[X] dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver )
+REQUIRED_USE=!minimal? ( || ( dmx kdrive xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) xephyr? ( kdrive )
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=4ddf1d310b8c891e6363701c9db0e38e
+_md5_=d8d2717fe96fdbe468601db558847c04
diff --git a/metadata/md5-cache/x11-base/xwayland-21.1.2 b/metadata/md5-cache/x11-base/xwayland-21.1.2
index caef3566b5ad..d3fcb84e7edf 100644
--- a/metadata/md5-cache/x11-base/xwayland-21.1.2
+++ b/metadata/md5-cache/x11-base/xwayland-21.1.2
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install test
-DEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland video_cards_nvidia? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-18[X(+),egl,gbm] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3
+DEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland video_cards_nvidia? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3
 DESCRIPTION=Standalone X server running under Wayland
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/xserver.html
 IUSE=rpc unwind ipv6 xcsecurity selinux video_cards_nvidia
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland video_cards_nvidia? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-18[X(+),egl,gbm] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3 !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
+RDEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland video_cards_nvidia? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3 !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-21.1.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=369ec7932b07dd8ff182a237684018bb
+_md5_=b4d478306a7eefa18d9122ece9511948
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 5a73648e6ac1..042cefed7f13 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144
index 97e7ed321f53..0ca93ffc8a0e 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144
@@ -5,10 +5,10 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=7
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
 IUSE=+X +driver static-libs +tools kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=GPL-2 MIT NVIDIA-r2
 RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/390
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.144/NVIDIA-Linux-x86_64-390.144.run ) x86? ( https://download.nvidia.com/XFree86/Linux-aarch64/390.144/NVIDIA-Linux-x86-390.144.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.144.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1f79d69b739a414b5546d4c7bbfdb896
+_md5_=2afd5d64eea7582ae30142b3aab4f043
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
index 0990ab11f870..d09025eca017 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
@@ -5,10 +5,10 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=7
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
 IUSE=+X +driver static-libs +tools kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
 RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/460
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/460.91.03/NVIDIA-Linux-x86_64-460.91.03.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/460.91.03/NVIDIA-Linux-aarch64-460.91.03.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-460.91.03.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f942c4f5fc7df908a98109847cdedadb
+_md5_=caf731fad15cbae21a269c54bb7dfab0
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.57.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.57.02
index 4c2aca02f518..c56ffd1960b4 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.57.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.57.02
@@ -11,4 +11,4 @@ RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk
 SLOT=0/470
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/470.57.02/NVIDIA-Linux-x86_64-470.57.02.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/470.57.02/NVIDIA-Linux-aarch64-470.57.02.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.57.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.57.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.57.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.57.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.57.02.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4ea9b24d583e96f36783abfa01e67c4b
+_md5_=e3c6cff71fc525cd267f9c5b0dec28ff
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-21.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-21.0.0
new file mode 100644
index 000000000000..b0fd32bdba91
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-21.0.0
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=>=x11-libs/libdrm-2.4.89[video_cards_amdgpu] x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-proto x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
+DESCRIPTION=Accelerated Open Source driver for AMDGPU cards
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu
+IUSE=udev
+KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_amdgpu] x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-amdgpu-21.0.0.tar.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=9c577940c9d793bcd850f30d2a6f362e
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 04b83ff0049e..3aefa18d4e89 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.11.6 b/metadata/md5-cache/x11-libs/qscintilla-2.11.6
index 8435af6993f3..044374e45dab 100644
--- a/metadata/md5-cache/x11-libs/qscintilla-2.11.6
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.11.6
@@ -4,10 +4,10 @@ DESCRIPTION=Qt port of Neil Hodgson's Scintilla C++ editor control
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
 IUSE=designer doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
 SLOT=0/15
 SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.6/QScintilla-2.11.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=07032dbebe6b0d2c9f45bc57b8d514e0
+_md5_=80b5e31715c044cde91cf7f64709e21a
diff --git a/metadata/md5-cache/x11-libs/xapps-2.2.2 b/metadata/md5-cache/x11-libs/xapps-2.2.2
deleted file mode 100644
index 57dec939515d..000000000000
--- a/metadata/md5-cache/x11-libs/xapps-2.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.40.6 sys-devel/gettext gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
-DESCRIPTION=Cross-desktop libraries and common resources
-EAPI=7
-HOMEPAGE=https://github.com/linuxmint/xapp/
-IUSE=gtk-doc introspection static-libs python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/xapp/archive/2.2.2.tar.gz -> xapps-2.2.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c6d812675310e0fbd1c5245976d8bdb9
diff --git a/metadata/md5-cache/x11-libs/xapps-2.2.3 b/metadata/md5-cache/x11-libs/xapps-2.2.3
new file mode 100644
index 000000000000..72a4aa6447d6
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/xapps-2.2.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.40.6 sys-devel/gettext gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
+DESCRIPTION=Cross-desktop libraries and common resources
+EAPI=7
+HOMEPAGE=https://github.com/linuxmint/xapp/
+IUSE=gtk-doc introspection static-libs python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/xapp/archive/2.2.3.tar.gz -> xapps-2.2.3.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c6d812675310e0fbd1c5245976d8bdb9
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index a9d4f8a83244..e046c66eb261 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/bbcd-0.3.1-r3 b/metadata/md5-cache/x11-misc/bbcd-0.3.1-r3
index b6b328998517..c80135dbecd1 100644
--- a/metadata/md5-cache/x11-misc/bbcd-0.3.1-r3
+++ b/metadata/md5-cache/x11-misc/bbcd-0.3.1-r3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=configure install
 DEPEND=media-libs/libcdaudio x11-libs/libX11 x11-libs/libXt
 DESCRIPTION=Basic CD Player for blackbox wm
 EAPI=6
@@ -8,4 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libcdaudio x11-libs/libX11
 SLOT=0
 SRC_URI=http://tranber1.free.fr/bbcd-0.3.1.tar.gz
-_md5_=99b3b0d56f6bc2a654a61f1ab5f5aefe
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=65f3d3ea249c53f0b0b586f0bf20db5f
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.30.0-r2 b/metadata/md5-cache/x11-misc/lightdm-1.30.0-r2
index 569145f18758..9191303ba33d 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.30.0-r2
+++ b/metadata/md5-cache/x11-misc/lightdm-1.30.0-r2
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.30.0/lightdm-1.30.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a5582dc6af8b98d1954f031a2bbc4c1c
+_md5_=2017e39cdbe394876d42b7dfc3ef6eca
diff --git a/metadata/md5-cache/x11-misc/makedepend-1.0.6 b/metadata/md5-cache/x11-misc/makedepend-1.0.6
index 430bd4fd9414..816259ffb856 100644
--- a/metadata/md5-cache/x11-misc/makedepend-1.0.6
+++ b/metadata/md5-cache/x11-misc/makedepend-1.0.6
@@ -4,9 +4,9 @@ DEPEND=x11-base/xorg-proto
 DESCRIPTION=create dependencies in makefiles
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/makedepend
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/util/makedepend-1.0.6.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=b25397267081f2664c268206a95e280a
+_md5_=4d7c05b4d0cd28943eeba265b48fb7af
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2 b/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
index 0e1f4980e9ad..4d6890cea03d 100644
--- a/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
+++ b/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Advanced freedesktop.org compliant menu editor
 EAPI=7
 HOMEPAGE=https://bluesabre.org/menulibre/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/gobject-introspection dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] gnome-base/gnome-menus[introspection] x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2[introspection] x11-libs/gtk+:3[X,introspection] x11-libs/gtksourceview:3.0[introspection] x11-themes/hicolor-icon-theme python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://launchpad.net/menulibre/2.2/2.2.1/+download/menulibre-2.2.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4135effd848a6c0034420a9e45ed2dc0
+_md5_=7be86bc3d3d9a77617b49fe280a24b1f
diff --git a/metadata/md5-cache/x11-misc/shutter-0.97 b/metadata/md5-cache/x11-misc/shutter-0.97
index 9bfa4aa00cce..1fff5de6203c 100644
--- a/metadata/md5-cache/x11-misc/shutter-0.97
+++ b/metadata/md5-cache/x11-misc/shutter-0.97
@@ -3,10 +3,10 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Feature-rich screenshot program
 EAPI=7
 HOMEPAGE=https://shutter-project.org/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Carp-Always dev-perl/libxml-perl dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/GooCanvas2 dev-perl/GooCanvas2-CairoTypes dev-perl/Gtk3 >=dev-perl/Gtk3-ImageView-9 dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Pango dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl] x11-libs/libwnck:3[introspection]
 SLOT=0
 SRC_URI=https://github.com/shutter-project/shutter/archive/v0.97.tar.gz -> shutter-0.97.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	prefix	d04f14b297013ad1410550c0757f14f8	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cb4a5c4edb66808b6966212d5fa17c2b
+_md5_=6c5f5fe46f36bedc6c6194dd001680c8
diff --git a/metadata/md5-cache/x11-misc/xsel-1.2.0-r1 b/metadata/md5-cache/x11-misc/xsel-1.2.0-r1
index d6a8e3200d87..50dfbf9bad88 100644
--- a/metadata/md5-cache/x11-misc/xsel-1.2.0-r1
+++ b/metadata/md5-cache/x11-misc/xsel-1.2.0-r1
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto x11-libs/libXt
 DESCRIPTION=Command-line program for getting and setting the contents of the X selection
 EAPI=6
 HOMEPAGE=http://www.vergenet.net/~conrad/software/xsel
-KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=HPND
 RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.vergenet.net/~conrad/software/xsel/download/xsel-1.2.0.tar.gz
-_md5_=f47b0d32afd49ef5ff9a53017bfeebf9
+_md5_=e078cca0506e93754ee2ecb04b56c581
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 0f5b0bbd0651..b12ccab64162 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/purple-mattermost-2.0 b/metadata/md5-cache/x11-plugins/purple-mattermost-2.0
deleted file mode 100644
index 520f0799feba..000000000000
--- a/metadata/md5-cache/x11-plugins/purple-mattermost-2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=app-text/discount dev-libs/glib dev-libs/json-glib net-im/pidgin
-DESCRIPTION=A libpurple/Pidgin plugin for Mattermost
-EAPI=7
-HOMEPAGE=https://github.com/EionRobb/purple-mattermost
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-text/discount dev-libs/glib dev-libs/json-glib net-im/pidgin
-SLOT=0
-SRC_URI=https://github.com/EionRobb/purple-mattermost/archive/v2.0.tar.gz -> purple-mattermost-2.0.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ccff155fd2f96bde1883b4ba48aad813
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 532ad39b45d6..b1d51b1f67ec 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/terminator-2.1.1 b/metadata/md5-cache/x11-terms/terminator-2.1.1
index 8642639c85e0..b49ea1fb2963 100644
--- a/metadata/md5-cache/x11-terms/terminator-2.1.1
+++ b/metadata/md5-cache/x11-terms/terminator-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnome-terminator/terminator/releases/download/v2.1.1/terminator-2.1.1.tar.gz verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v2.1.1/terminator-2.1.1.tar.gz.asc )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	10c122d0f49c54100ad5e279db0cb43c	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f9379f8da9df2ed07d638b33b3590c0f
diff --git a/metadata/md5-cache/x11-terms/terminology-1.9.0 b/metadata/md5-cache/x11-terms/terminology-1.9.0
index 5b464b56e9d5..ea9cf02da4de 100644
--- a/metadata/md5-cache/x11-terms/terminology-1.9.0
+++ b/metadata/md5-cache/x11-terms/terminology-1.9.0
@@ -5,10 +5,10 @@ DESCRIPTION=Feature rich terminal emulator using the Enlightenment Foundation Li
 EAPI=7
 HOMEPAGE=https://www.enlightenment.org/about-terminology
 IUSE=extras nls
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=|| ( dev-libs/efl[gles2-only] dev-libs/efl[opengl] ) || ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 dev-libs/efl[eet,fontconfig]
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/apps/terminology/terminology-1.9.0.tar.xz https://downloads.terminolo.gy/terminology-1.9.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d3f48c003fa2227ab53b997942ae2e2e
+_md5_=6e006a0c6612d0c5883c1b235d54737d
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 528d000578de..6dad77a4547c 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-9999 b/metadata/md5-cache/x11-wm/herbstluftwm-9999
index 41c6819d0c4d..5d774ba7532b 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-9999
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-9999
@@ -8,8 +8,8 @@ IUSE=+doc python test test python_targets_python3_8 python_targets_python3_9 pyt
 LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr app-shells/bash python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) test? ( doc )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7bdfd7adc559cbae84421625cdde1459
+_md5_=5f3b99d058178439d293ae3508bad7e0
diff --git a/metadata/md5-cache/x11-wm/muffin-5.0.1 b/metadata/md5-cache/x11-wm/muffin-5.0.1
deleted file mode 100644
index f0c04aee3d19..000000000000
--- a/metadata/md5-cache/x11-wm/muffin-5.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=configure install postinst postrm prepare test
-DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=dev-libs/json-glib-1.0 >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/zenity >=media-libs/libcanberra-0.26[gtk3] virtual/opengl >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.6.0 >=x11-libs/libxkbcommon-0.4.3 x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender >=x11-libs/pango-1.14.0[X,introspection?] >=x11-libs/startup-notification-0.7:= x11-misc/xkeyboard-config introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 )
-DESCRIPTION=Compositing window manager forked from Mutter for use with Cinnamon
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin
-IUSE=+introspection test xinerama test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=dev-libs/json-glib-1.0 >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/zenity >=media-libs/libcanberra-0.26[gtk3] virtual/opengl >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.6.0 >=x11-libs/libxkbcommon-0.4.3 x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender >=x11-libs/pango-1.14.0[X,introspection?] >=x11-libs/startup-notification-0.7:= x11-misc/xkeyboard-config introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) xinerama? ( x11-libs/libXinerama )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/muffin/archive/5.0.1.tar.gz -> muffin-5.0.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=df1c5d1cd91b1d67e0daa8d634371874
diff --git a/metadata/md5-cache/x11-wm/muffin-5.0.1-r1 b/metadata/md5-cache/x11-wm/muffin-5.0.1-r1
new file mode 100644
index 000000000000..68ec8c71fe38
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/muffin-5.0.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure install postinst postrm prepare test
+DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=dev-libs/json-glib-1.0 >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/zenity >=media-libs/libcanberra-0.26[gtk3] virtual/opengl >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.6.0 >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender >=x11-libs/pango-1.14.0[X,introspection?] >=x11-libs/startup-notification-0.7:= x11-misc/xkeyboard-config introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 )
+DESCRIPTION=Compositing window manager forked from Mutter for use with Cinnamon
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin
+IUSE=+introspection test xinerama test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=dev-libs/json-glib-1.0 >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/zenity >=media-libs/libcanberra-0.26[gtk3] virtual/opengl >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.6.0 >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender >=x11-libs/pango-1.14.0[X,introspection?] >=x11-libs/startup-notification-0.7:= x11-misc/xkeyboard-config introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) xinerama? ( x11-libs/libXinerama )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/muffin/archive/5.0.1.tar.gz -> muffin-5.0.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1ff181e36f3b9f2fd513350e8306070e
diff --git a/metadata/md5-cache/x11-wm/xpra-4.2 b/metadata/md5-cache/x11-wm/xpra-4.2
index fe5a941f0cb4..6dedb4f9a6a2 100644
--- a/metadata/md5-cache/x11-wm/xpra-4.2
+++ b/metadata/md5-cache/x11-wm/xpra-4.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://xpra.org/src/xpra-4.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7b1fcf193a61312e8c45ee1714c6d929
+_md5_=b55329e31286f782d8fa2b402a269160
diff --git a/metadata/md5-cache/x11-wm/xpra-4.2.1 b/metadata/md5-cache/x11-wm/xpra-4.2.1
index 81d2aab5bad9..8014af18a919 100644
--- a/metadata/md5-cache/x11-wm/xpra-4.2.1
+++ b/metadata/md5-cache/x11-wm/xpra-4.2.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://xpra.org/src/xpra-4.2.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=35d2d1e753606cc78ea86e9ea74c4a62
+_md5_=267ffd21f4f75212e867ce5294bc0b25
diff --git a/metadata/news/2021-07-23-libxcrypt-migration/2021-07-23-libxcrypt-migration.ru.txt b/metadata/news/2021-07-23-libxcrypt-migration/2021-07-23-libxcrypt-migration.ru.txt
new file mode 100644
index 000000000000..0aa0b34bb2c6
--- /dev/null
+++ b/metadata/news/2021-07-23-libxcrypt-migration/2021-07-23-libxcrypt-migration.ru.txt
@@ -0,0 +1,67 @@
+Title: Миграция в ~arch с glibc[crypt] на libxcrypt
+Author: Andreas K. Hüttel <dilfridge@gentoo.org>
+Author: Sam James <sam@gentoo.org>
+Translator: Alexey Sokolov <alexey+gentoo@asokolov.org>
+Posted: 2021-07-23
+Revision: 1
+News-Item-Format: 2.0
+
+Реализация библиотеки libcrypt.so в glibc давно устарела и скоро
+будет удалена.
+
+Прочие дистрибутивы годы назад уже переключились на внешнюю
+реализацию под названием libxcrypt. Мы решили последовать их примеру
+и тоже переключиться на libxcrypt. Вначале изменения затронут системы
+на ~arch.
+
+Это будет обычное обновление, и, скорее всего, вам не нужно будет
+предпринимать никаких действий, и проблем возникнуть не должно.
+
+Однако, мы рекомендуем сперва *полностью* обновить систему.
+Это стандартная рекомендация, но в этом конкретном случае
+более простой граф зависимостей поможет portage вычислить
+порядок обновлений.
+
+Так что, чтобы упростить процесс обновления, пожалуйста,
+обновите систему сейчас, до начала самой миграции.
+
+Для пользователей ~arch изменение произойдёт 14 июля 2021,
+пользователи стабильной ветки перейдут на libxcrypt позже.
+
+Если по какой-либо причине вы *не* хотите пока переходить
+на libxcrypt (всего лишь отлагая неизбежное), выполните
+следующие действия:
+* размаскируйте и включите USE-флаг crypt пакета sys-libs/glibc
+* замаскируйте USE-флаг system пакета sys-libs/libxcrypt
+* замаскируйте >=virtual/libcrypt-2
+
+Если вы хотите перейти на libxcrypt уже, точная процедура
+описана в wiki (см. ниже), но суть такая:
+* принудительно выключите USE-флаг crypt пакета sys-libs/glibc
+* размаскируйте USE-флаги system и, если требуется, split-usr
+  пакета sys-libs/libxcrypt
+* размаскируйте ~virtual/libcrypt-2
+
+Обратите внимание: если последний раз вы меняли пароль до ~2008 года, он
+может использовать в /etc/shadow слабые хеш-функции, такие как md5crypt.
+При этом ошибка в PAM [0][1] может помешать вам войти в систему.
+Мы рекомендуем вам сменить пароль командой "passwd", чтобы были использованы
+современные методы хеширования паролей. Новая версия PAM с исправлением этой
+ошибки уже добавлена в дерево.
+
+В некоторых случаях Portage может попытаться пересобрать некоторые
+пакеты в неправильном порядке [2]. Если какой-то пакет не собирается,
+попробуйте сначала обновить libcrypt и libxcrypt:
+
+# emerge -v1 virtual/libcrypt sys-libs/libxcrypt
+
+А затем продолжите обновление системы с помощью опции Portage
+"--keep-going=y".
+
+Дополнительные сведения можно найти здесь:
+* https://wiki.gentoo.org/wiki/Project:Toolchain/libcrypt_implementation
+* https://bugs.gentoo.org/699422
+
+[0] https://bugs.gentoo.org/802267
+[1] https://bugs.gentoo.org/802807
+[2] https://bugs.gentoo.org/802210
diff --git a/metadata/news/2021-08-01-tcpd-disabled/2021-08-01-tcpd-disabled.en.txt b/metadata/news/2021-08-01-tcpd-disabled/2021-08-01-tcpd-disabled.en.txt
new file mode 100644
index 000000000000..02e18bf15c6f
--- /dev/null
+++ b/metadata/news/2021-08-01-tcpd-disabled/2021-08-01-tcpd-disabled.en.txt
@@ -0,0 +1,68 @@
+Title: USE=tcpd no longer globally enabled
+Author: David Seifert <soap@gentoo.org>
+Posted: 2021-08-01
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Profile: default/linux/*
+Display-If-Installed: net-analyzer/argus-clients[tcpd]
+Display-If-Installed: net-ftp/proftpd[tcpd]
+Display-If-Installed: app-admin/conserver[tcpd]
+Display-If-Installed: app-admin/prelude-manager[tcpd]
+Display-If-Installed: app-admin/qpage[tcpd]
+Display-If-Installed: app-admin/syslog-ng[tcpd]
+Display-If-Installed: app-backup/bacula[tcpd]
+Display-If-Installed: app-backup/bareos[tcpd]
+Display-If-Installed: app-misc/mosquitto[tcpd]
+Display-If-Installed: dev-libs/yaz[tcpd]
+Display-If-Installed: gnome-base/gdm[tcpd]
+Display-If-Installed: mail-mta/exim[tcpd]
+Display-If-Installed: mail-mta/sendmail[tcpd]
+Display-If-Installed: media-sound/pulseaudio[tcpd]
+Display-If-Installed: net-analyzer/argus[tcpd]
+Display-If-Installed: net-analyzer/net-snmp[tcpd]
+Display-If-Installed: net-analyzer/nrpe[tcpd]
+Display-If-Installed: net-analyzer/nsca[tcpd]
+Display-If-Installed: net-analyzer/rrdtool[tcpd]
+Display-If-Installed: net-fs/netatalk[tcpd]
+Display-If-Installed: net-fs/nfs-utils[tcpd]
+Display-If-Installed: net-ftp/atftp[tcpd]
+Display-If-Installed: net-ftp/tftp-hpa[tcpd]
+Display-If-Installed: net-ftp/vsftpd[tcpd]
+Display-If-Installed: net-irc/ngircd[tcpd]
+Display-If-Installed: net-mail/cyrus-imapd[tcpd]
+Display-If-Installed: net-mail/dovecot[tcpd]
+Display-If-Installed: net-mail/mailutils[tcpd]
+Display-If-Installed: net-mail/tpop3d[tcpd]
+Display-If-Installed: net-misc/apt-cacher-ng[tcpd]
+Display-If-Installed: net-misc/ser2net[tcpd]
+Display-If-Installed: net-misc/socat[tcpd]
+Display-If-Installed: net-misc/sslh[tcpd]
+Display-If-Installed: net-misc/stunnel[tcpd]
+Display-If-Installed: net-misc/usbip[tcpd]
+Display-If-Installed: net-nds/openldap[tcpd]
+Display-If-Installed: net-nds/rpcbind[tcpd]
+Display-If-Installed: net-nds/tac_plus[tcpd]
+Display-If-Installed: net-proxy/dante[tcpd]
+Display-If-Installed: net-vpn/ocserv[tcpd]
+Display-If-Installed: net-vpn/pptpd[tcpd]
+Display-If-Installed: sci-libs/dcmtk[tcpd]
+Display-If-Installed: sys-apps/linux-misc-apps[tcpd]
+Display-If-Installed: sys-apps/xinetd[tcpd]
+Display-If-Installed: sys-fs/quota[tcpd]
+Display-If-Installed: sys-power/nut[tcpd]
+
+On 2021-11-01, we will remove USE="tcpd" from the globally default
+enabled USE flags (https://bugs.gentoo.org/805077). USE="tcpd" usually
+enables sys-apps/tcp-wrappers for an ad hoc firewall based on
+/etc/hosts.allow and /etc/hosts.deny.
+
+The Base System project has come to the conclusion that 24 years after
+the last upstream release, tcp-wrappers is not suitable for a default
+configuration in 2021 anymore. Other distributions have completely
+removed support at this point. We strongly recommend you switch to more
+modern packet filters, such as BPF, nftables, or iptables. If you rely
+on tcp-wrappers, you can re-enable the flag, see
+
+  https://wiki.gentoo.org/wiki//etc/portage/package.use
+
+for package-specific ways to re-enable tcp-wrappers.
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 7a72b79ac53e..34c0987b1bc5 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 13127 BLAKE2B 48dcdc744faac295d7e940945e2b94bc36fdb9280374bfc294be22c17310f4955e8cf9ed86e79377561110355907e899de6dbb881be09a380095cf3f459a4d0c SHA512 1e3e0397f22b3a604da99aad6077f9ef3eab37fc45ead99cd2477203abb00c21ec19cfd941874474dcdfe39c72bb1da6fc88446968c21e2b8cd07dd690e2c3d2
-TIMESTAMP 2021-07-28T08:39:11Z
+MANIFEST Manifest.files.gz 13475 BLAKE2B 78672f657c8cd4903e8ecebdb7be6f976c894b3bae286d6dcd5ed5d92f2d0b3f9691c2b4965adb146feb9b29def2b8fb038da3256ba9273197c72de6caa123b3 SHA512 d0fe055f8f6681873a2f4a0a5f219c015cfe8b366b8105534e1272abaad74a581e4d9c8f69db1599303c15acec1eed9bf84545aaaef82424fc60d9119b5f798f
+TIMESTAMP 2021-08-01T20:38:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEBF69fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEHBmNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAGGg/8DKSsng96TjpEBIyKEk8e0kiLF0opJcDZ+UsYpksEw00d5IbgFKm9GtSc
-JhEaTkTL9p/YLJq8k0ce8/FFnx4ic4IHjVxQKJ3j5GFPU6Q/ijsH5eXFxS9CS1o3
-qCDjJlxv25rsJ0NVR+6OYSFEaDlYsvTK0s+9p704J9VTmDknTS4fm1u+UjGU0o8r
-igDbWI8Ox4PnIQS/PMw2+Ja9Y4HTgzF+i/1rXXmWlC2n6AHw59BwJlycSlkYE4RZ
-5F4FTBcGxAHucAx0rkj27FZcJyBwYxy7GNxn/7atGf0NQqrTMAXZ8d4LsU6gv+ol
-rDIWRVAhum5Jh/f+GS3qI0C4P7fJo3dWpmiwuGgIxzzjZrmjSU8qdpefAOgvFchR
-l58mquL1cCmTapCwl10TDrS0Px78mF2i7ssbHAXuYaO1AGPNILzhUReYE4Wigaft
-HVMWqEafTvIsTC+Zm6ogYevbSvBOMHJiwRU7AcdWkU+CoFlqUtyFkWucaWwXyyy4
-o1v5DwgBKmdogCDThUURMcicWIdIht1e5Fi9ICjy1YTHBwB7HvhLys5hYAguDBEE
-9udrNNTZcxQYYm2TbMdEUwcW+KKcIjCUq4Ph8x8cV4uY98w8ctapRtHXN39F6fnt
-KfubPlNkZgSF2xyFDxHsXg1dCAS3x+zeLQiS+W6c1rIv2zhMOLQ=
-=4M7h
+klATThAAt0w6gOdkQBNAAoJOIz7noV3dKaLnIec44NnaFMzhn/Zq0pewpCLDDEuT
+Smr25D0y7sSX3GY+2EpthoEXV8GXCuev8IM2eoqDaw/pmAoL55ZSpwRCwlr/V1gR
+2/LblK+J/IAqBcdHsQL6ViheOMEGAwZfLF85d8fplK+c+Is/kD9OtmcIXQ4c+qfa
+y8pFfdaazWmO8wuPQzlwtHgHC5FFsRx5PsLdXEWNEtkyG0XTQET0xWEvE1p1sAmY
+hEfXuHcdQ3+e/0b4wDr5IdJpySYl/lyLDdCrZ2MmqJuxomoDIR1EEc1iFDuY+Q3Y
+TuBc3DFJqKgm+mXj3FePz9WPa/3bBCJuLH48GCwJljXVVul2urZ+wMy+hQ23suXT
+wFeBPspATg2UbR2AuVxiVZgrjaaGL/FzQJV2JBoCzJXAMIBmtB/x5zInjHKvr6lj
+szeGwr6tGVgnTvoBrH2dck7MIdlsSFQctndc3VvQ1oRCN7HOKwQN9xWWMwePsrvT
+LKv6Hbz2wz9cYJQle3zxdFAArBQ5xUbrB3QyzaAK4+M4LfdxtTgRwn+26oUmoQKB
+C/VIQMbwTHmwwE1l/ABT7CyYGWJIWYhjfgje2yEhx40HbyumkG/pKF3DIp74JGX/
+VTHUZosfu0ch3svVTlYxeWkfUJsyX5MBbXkJemxOfXK8WKFgSXk=
+=j+RY
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index f3814ce251db..81c1ae82950c 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3937e501c09e..c4217f2d7aae 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jul 2021 08:39:07 +0000
+Sun, 01 Aug 2021 20:38:55 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index a853494374d0..b17266d04945 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-0d11e58acccb28e8371d53ed53806a8a2d7b16be 1626997272 2021-07-22T23:41:12+00:00
+6e9873c02074cbbe1fb75e7c6a216f216185b62d 1627846494 2021-08-01T19:34:54+00:00
diff --git a/metadata/timestamp b/metadata/timestamp
index b0457ee83a4b..2d47eb6d3adf 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jul 28 08:39:07 AM UTC 2021
+Sun Aug  1 08:38:55 PM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f8acb5033e96..5d689be557a5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jul 2021 08:45:01 +0000
+Sun, 01 Aug 2021 20:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2f6f248bd665..997c51eabe95 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f4048512d2f0e3dd5d08c010b647ce1aa70d9107 1627460102 2021-07-28T08:15:02+00:00
+66b0172e8c4a57a48e46a5d018bb2ca983c65a8e 1627849913 2021-08-01T20:31:53+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 512fcbdc65e1..7604bf78a14a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1627461301 Wed 28 Jul 2021 08:35:01 AM UTC
+1627850101 Sun 01 Aug 2021 08:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 3937e501c09e..c4217f2d7aae 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Jul 2021 08:39:07 +0000
+Sun, 01 Aug 2021 20:38:55 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 0c7d67c9b672..cfe9557cd1bb 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 3880beb1943a..bbefb09c8f51 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,5 +1,5 @@
 AUX fail2ban-0.11.2-fix-tests-for-2021.patch 1821 BLAKE2B 52fae8ace32d6205d290d7e3a57378e10398742a735e9bf734d1ba4c6ff73abeb7bff8d0f76924c815a1dcdd7e57bf1a584956e1c03ff0db93f20ce68f1c8176 SHA512 a3db4065b5e815d409318c7aeb0f2fac87b2f91f7b1923a4c1684cbc97eb086ccd0fab993270d8c84d6f9da911f467d391689f312d89cea7cc6d59c20cfd39b0
 DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97
-EBUILD fail2ban-0.11.2.ebuild 3586 BLAKE2B ddef850abaa1cd6d483ad780844fd574f561d308a2468fdf33cbfd479f525bfb6d130ca273cdd403490fb47b33a348c4ae76db70ca6aa017e99bb1eec2856612 SHA512 704a93c15b8101b45add0e217e412aa245fe40e4db92b9a95cc140b6fd605553e2e55fcd61ec3dedcc4a1e94a88b48ff84e42e9b451b0fd2db63ebfce566a84f
-EBUILD fail2ban-9999.ebuild 3538 BLAKE2B 0751d5d88c53d7d8821b9cd8ed7f62bf20c01790ea8007739866999a36f880acc32527a70052136b1e3364e109c130d8a69eccb9b313b26587ab2136180d85c9 SHA512 7b7c7cd7beba19c4c1367d0a37627212346788f9cfe111b8938ff3dbf71e4703617fb951bbf98aac226494cd86fb368b303dfc00a8afa9fbbecadf15d1a45814
+EBUILD fail2ban-0.11.2.ebuild 3625 BLAKE2B f4b38ddd45e4cc6f9c5e39a56aae7e131c98d3867fece38c5e6936161b47b6885e6d5a294be2531a8b8a4c4d67f38b7bcb03156b8193f3bcb3279c3f0a40732c SHA512 ce4be968377b06d0e95735d487a7c1c9de1b19a659b12fe03d50a792fdf69fdc81633201417cd6a932220d9228c4e17e3d8e70e884eba7c5d2cc9d1b6624c216
+EBUILD fail2ban-9999.ebuild 3577 BLAKE2B d355a7e2dd272987146d9bf37de7ff205052837ad04324964e7bef2a18759c0db07ca3cbe494f989acf36663138a3ed5755930ef6c3de99ee50677c4afab2733 SHA512 9553bf8079c7b886c038a87aec8bca6862290568463fd5aaf585741853ac4b8582e0b033a5ff40d9174cce5d47b8617dc23d971eb17e398638021f30c93237bf
 MISC metadata.xml 356 BLAKE2B 28861bc6e3c62f2c21ea1480816f2645de929f009dccf7f6ecf9d8a10ed72214fa80acab6bd72ca314b6f3154096b0c0f0324b07fece238150c356aac17886e9 SHA512 5759cb73ed737bf25d4fc68dc12a722100e5d7aba222a082d49900e8cbc06cbd1bf5d7272fae9f6256d475fe29397f391fcbffda9eee4e73214ad941da27ce69
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
index caf428f0ca77..3096e694a197 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
@@ -95,6 +95,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}-tmpfiles.conf
+
 	if [[ ${previous_less_than_0_7} = 0 ]] ; then
 		elog
 		elog "Configuration files are now in /etc/fail2ban/"
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index d0d4d4ef18f7..2ad8f462e23d 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -92,6 +92,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}-tmpfiles.conf
+
 	if [[ ${previous_less_than_0_7} == 0 ]] ; then
 		elog
 		elog "Configuration files are now in /etc/fail2ban/"
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 58af597705d1..7e558fd8dc45 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,4 +1,4 @@
-AUX logrotate.d-munin.3 692 BLAKE2B 914766875ea00212043c3d23fc4bd7f36b8974f956210319a8d5565c15e78eaae73a9c8d8dee3cb68f21f59d7d568ef07db3b4f708dd5ce4145a9e2f1170aa24 SHA512 c67a173f77f94725e9aafb47470b816cd013d5363ca59b2d0453ff5d032b0b3ca7e5f60e96d430c2aec69bd8979157da09bf7d34969bd6b55183fca7a0381b03
+AUX logrotate.d-munin.3 678 BLAKE2B 56c5e73e775c51898290707f324a305aa024ac732994b7e8ac2213a29740f481012d6433a6e72879524fbb3f958420919441265b0b5943b022267d47ca847640 SHA512 77853b9f0465da10e1844e25225350b7351126b19ee4caaad168b7b27003bca65bf34176293c610d5a4cb790a4a5d380fab482844ab23d6063208b2ce0fe1349
 AUX munin-1.3.2-plugins.conf 1760 BLAKE2B 97d853698470c35dd4bc305a559be6b1160a6877e557f6146eeddaf7d91f72c7ade36e1f5571c5ad742560a2f5f400fc51b481ee7ce305db9546af6b211046ac SHA512 c3498c4364cedd27016562568f918995be92dd6b3c2735ddd008190de0a729f8ea59e61f8517f6f48beaad14edb349af7476a39f55d246ab06d6cbe91679565f
 AUX munin-async.service 201 BLAKE2B 2de35c4577d097525b75fb812042627702e846daf908b8deeaf9980c76b31135d5ea906b0932dfe3b4d589e3c635e37e8198cf2b6e9d60cdc305eb499815266f SHA512 55a99866cb9ff50723a223b8a45b418f13ed754b6ca919260af8312a323aad432aca047724a5e32f6aee2f8f541ae829bf6bfdf19d22e7543ef2e5a7b9cd9d6a
 AUX munin-asyncd.init.2 452 BLAKE2B 3f368195aa6896a726068b9db0ce0d1fc5750fee69a4ca5b60bfc2897486625cb83dab1ceec5cd6c1cf4d4aa0fc517eb0e41548004254abc8ad25657b0bfd422 SHA512 5d2ca928ea953e5fec8451dca218165f2c058c6d57519fea65e94148c0dff5ca0a06a2a22b09f416e375e825463d4d2a7c1a424c60051fdb4fa0d79af9463c26
@@ -15,7 +15,7 @@ DIST munin-2.0.66-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051
 DIST munin-2.0.66.tar.gz 2257034 BLAKE2B b0c5412f32a54857acbe4baa5cf1447c7cf7053cad79ac09216ddc1aa8696ced813c3ad373517a8a48c5a08fae76154a0dda069efc036b7773e0557f078f8ff2 SHA512 928f727c558db6699524f3f3c2822404638e10e95678f4f211ec445ad6fbbdb7685a3d28343dbce616f60ced3cabff3b44e21a0a0e84b1d05032d295b81afab0
 DIST munin-2.0.67-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.67.tar.gz 2258670 BLAKE2B 374b336403433d612b7998c77e6eb4f0eb68ffda4204ae6bc3c303f7667154c2ce606ffa27226c5644f3e6f71655c939b749da925136f59be4762891af49e2b1 SHA512 a8381491dfa15572438d9acda7a09feb0c3918ebe49e7bcfce5c172b36b4a5a0472bd6d06f5fad41270af0510b3fe115509d146f372df7fa47ed4aa1ec5f95d4
-EBUILD munin-2.0.66-r1.ebuild 12267 BLAKE2B 05ee840753229d97e2b1d5914191950bece83b6575cffa2a7ee50de4dfc3a16f892d8f660288315faccc570166e58fd391795a90fa3aa24531a5fd13752636e1 SHA512 b5ad10e6752dce09b925e05d42db944b5a8f25820b9fbfbfd0272b053539f2b70655ffaf745395f920f5d601ab65d1c0efeb27a3dc353f60b3d8c617f5949b2b
-EBUILD munin-2.0.67-r2.ebuild 12270 BLAKE2B efd09dd6739e73d4fe3b76dea649cdbc6b89f7fb631e01032e64b61fc5a83d0cd74e74c8c991e50a85a30bf485d97b8462a8690244a3a6f07f8cd8aefc590d6a SHA512 0fdff012ebd0dcbba79ae4595210759f4fe1b88181cfea8f3321d78e6941a0752e366aeb7931628c6d33e81c6b217b8e3dbd3e882dde76c868aba94a6365294d
-EBUILD munin-2.0.67-r3.ebuild 12179 BLAKE2B 9c9bd8113ccb2378a46b426e03717a9d331e337053742e09a113890b86551686c555240a83fe9ff65ffd1db99d6ac0444e2f802cd2bb35e4d9e8b4ecbc417906 SHA512 04fdf2ced3ed7f85de597e6590f8bb08400e98898c9acb669cd811de8195bd8d30446739432cd3702ed5d493e21f6785d911e09221d790fa081b6509660b0131
+EBUILD munin-2.0.66-r3.ebuild 12294 BLAKE2B 38acab7fb05b587bde64f914c8b0260297bbda56101fbca4dde767b4f7c5c7a9218d7aa5201294c1ab993215fbd0d67241099fcc2b3210f1f2a296dc3724ee7b SHA512 95a026d0ad372c7e77fa05c236af93e4d6563a586dda018929fdee212023d24f137fcbb33ef46344905e4d3b6cee5a2cc19931bea259576794f6371434905aa0
+EBUILD munin-2.0.67-r6.ebuild 12297 BLAKE2B d06b44129fdf229231a8b528f87f5868d2a1a456c5c36d657d03e691aa0dc84dc42f7a776f64575e5c0c38d167d6c241b51b1ec361e534dff916fa534ac87f9e SHA512 d3db57073670e6f151d9052b4dc9a193a22c5e42468f8be99b4f1c3da379c880c631097e254ccbb32db810d7225aadc3c642cf1700eb3d3b3029a63d7867975e
+EBUILD munin-2.0.67-r7.ebuild 12206 BLAKE2B c5acf7bba358087ff1063db553b6583954339f610caf272cb4f5378c6be138ecc94b6cb6150c0ed600e86a5d898749b7a1b64d4f05ecc351c62bf6b3c90cf52b SHA512 156281bb0393c3316bb5a6cefd2354635caab1b028aa51e2569dda9ec475271a26bc22941b8ea396812535383dbad3965c3a49805d326a303ed3cd2d71fca8cd
 MISC metadata.xml 3932 BLAKE2B 3f5a88c85ae9be35c1ef8c9b4f6ac99d8ced0974e3306c691a4c5fed87139c8514732fb0418d4f34e6be26786252df5d3876aaf2a895fb03dea08787488ccb04 SHA512 c066c14c28804c4f5f11b15046f4fe43e7b34f0befc98fb03d4cd3e222664806e03509196054076433596dfb3bc2b1369f69047bf15a6c5c4981d354280033ef
diff --git a/net-analyzer/munin/files/logrotate.d-munin.3 b/net-analyzer/munin/files/logrotate.d-munin.3
index 2d3b6829762b..5133c47e8ba1 100644
--- a/net-analyzer/munin/files/logrotate.d-munin.3
+++ b/net-analyzer/munin/files/logrotate.d-munin.3
@@ -4,7 +4,6 @@
 	rotate 7
 	compress
 	delaycompress
-	copytruncate
 	notifempty
 	create 640 root root
 	postrotate
diff --git a/net-analyzer/munin/munin-2.0.66-r1.ebuild b/net-analyzer/munin/munin-2.0.66-r1.ebuild
deleted file mode 100644
index 7a5621b5deb7..000000000000
--- a/net-analyzer/munin/munin-2.0.66-r1.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHSET=1
-
-inherit java-pkg-opt-2 systemd
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="
-	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
-RESTRICT="!test? ( test )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
-	acct-user/munin
-	acct-user/munin-async
-	acct-group/munin
-	dev-lang/perl:=[berkdb]
-	dev-perl/DBI
-	dev-perl/Date-Manip
-	dev-perl/File-Copy-Recursive
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/Net-CIDR
-	dev-perl/Net-DNS
-	dev-perl/Net-Netmask
-	dev-perl/Net-SNMP
-	dev-perl/Net-Server[ipv6(-)?]
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	virtual/perl-Text-Balanced
-	virtual/perl-Time-HiRes
-	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-	asterisk? ( dev-perl/Net-Telnet )
-	cgi? (
-		dev-perl/FCGI
-		dev-perl/CGI-Fast
-		)
-	dhcpd? (
-		>=net-misc/dhcp-3[server]
-		dev-perl/Net-IP
-		dev-perl/HTTP-Date
-		)
-	doc? ( dev-python/sphinx )
-	http? ( dev-perl/libwww-perl )
-	irc? ( dev-perl/Net-IRC )
-	ldap? ( dev-perl/perl-ldap )
-	kernel_linux? ( sys-process/procps )
-	memcached? ( dev-perl/Cache-Memcached )
-	mysql? (
-		virtual/mysql
-		dev-perl/Cache-Cache
-		dev-perl/DBD-mysql
-		)
-	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	!minimal? (
-		dev-perl/HTML-Template
-		dev-perl/IO-Socket-INET6
-		dev-perl/URI
-		>=net-analyzer/rrdtool-1.3[graph,perl]
-		virtual/ssh
-		)
-	"
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	dev-perl/Module-Build
-	java? ( >=virtual/jdk-1.5 )
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-Exception
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/Test-MockObject
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND_COM}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.5
-			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)
-		selinux? ( sec-policy/selinux-munin )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	echo ${PV} > RELEASE || die
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	local cgiuser=$(usex apache2 apache munin)
-
-	cat >> "${S}"/Makefile.config <<- EOF
-	PREFIX=\$(DESTDIR)/usr
-	CONFDIR=\$(DESTDIR)/etc/munin
-	DOCDIR=${T}/useless/doc
-	MANDIR=\$(PREFIX)/share/man
-	LIBDIR=\$(PREFIX)/libexec/munin
-	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-	CGIDIR=${cgidir}
-	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-	CGIUSER=${cgiuser}
-	DBDIR=\$(DESTDIR)/var/lib/munin
-	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-	LOGDIR=\$(DESTDIR)/var/log/munin
-	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
-	JCVALID=$(usex java yes no)
-	STATEDIR=\$(DESTDIR)/run/munin
-	EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-	emake -j1
-	use doc && emake -C doc html
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	local testtargets="test-common test-node test-plugins"
-	use minimal || testtargets+=" test-master"
-
-	LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-	local dirs="
-		/var/log/munin
-		/var/lib/munin/plugin-state
-		/var/lib/munin-node/plugin-state
-		/var/www/localhost/htdocs/munin
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-	# we remove /run from the install, as it's not the package's to deal
-	# with.
-	rm -rf "${D}"/run || die
-
-	# remove the plugins for non-Gentoo package managers; use -f so that
-	# it doesn't fail when installing on non-Linux platforms.
-	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
-	d /run/munin 0700 munin munin - -
-	EOF
-
-	systemd_dounit "${FILESDIR}"/munin-async.service
-	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-node.service
-
-	cat >> "${T}"/munin.env <<- EOF
-	CONFIG_PROTECT=/var/spool/munin-async/.ssh
-	EOF
-	newenvd "${T}"/munin.env 50munin
-
-	dodoc README ChangeLog INSTALL
-	if use doc; then
-		cd "${S}"/doc/_build/html || die
-		docinto html
-		dodoc -r *
-		cd "${S}" || die
-	fi
-
-	dodir /etc/logrotate.d/
-	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
-		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/spool/munin-async/.ssh
-	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-	fperms 0750 /var/spool/munin-async{,/.ssh}
-	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-			keepdir /var/cache/munin-cgi
-			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-			fowners $(usex apache2 apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache2; then
-				insinto /etc/apache2/vhosts.d
-				newins "${FILESDIR}"/munin.apache.include munin.include
-				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-			fi
-		else
-			sed \
-				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
-				-i "${D}"/etc/munin/munin.conf || die
-		fi
-
-		keepdir /var/lib/munin/.ssh
-		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
-		IdentityFile /var/lib/munin/.ssh/id_ecdsa
-		IdentityFile /var/lib/munin/.ssh/id_rsa
-		EOF
-
-		fowners munin:munin /var/lib/munin/.ssh/{,config}
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		dodir /usr/share/${PN}
-		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
-		# Force the shell to bash
-		SHELL=/bin/bash
-		# Mail reports to root@, not munin@
-		MAILTO=root
-
-		# This runs the munin task every 5 minutes.
-		*/5	* * * *		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#*/1 * * * *		/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#*/2 * * * *		/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#*/15 * * * *		nice /usr/libexec/munin/munin-html
-		EOF
-
-		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
-		# Mail reports to root@, not munin@, only execute one at a time
-		!mailto(root),serial(true)
-
-		# This runs the munin task every 5 minutes.
-		@ 5		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#@ 1	/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#@ 2	/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#@ 5	nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#@ 15	nice /usr/libexec/munin/munin-html
-		EOF
-
-		# remove .htaccess file
-		find "${D}" -name .htaccess -delete || die
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	ebegin "Setting up cron ..."
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa \
-		-f /var/lib/munin/.ssh/id_rsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa \
-		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache2 apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache2; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.66-r3.ebuild b/net-analyzer/munin/munin-2.0.66-r3.ebuild
new file mode 100644
index 000000000000..4d6837047b53
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.66-r3.ebuild
@@ -0,0 +1,418 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCHSET=1
+
+inherit java-pkg-opt-2 systemd tmpfiles
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/"
+SRC_URI="
+	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+RESTRICT="!test? ( test )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+	acct-user/munin
+	acct-user/munin-async
+	acct-group/munin
+	dev-lang/perl:=[berkdb]
+	dev-perl/DBI
+	dev-perl/Date-Manip
+	dev-perl/File-Copy-Recursive
+	dev-perl/List-MoreUtils
+	dev-perl/Log-Log4perl
+	dev-perl/Net-CIDR
+	dev-perl/Net-DNS
+	dev-perl/Net-Netmask
+	dev-perl/Net-SNMP
+	dev-perl/Net-Server[ipv6(-)?]
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-MIME-Base64
+	virtual/perl-Storable
+	virtual/perl-Text-Balanced
+	virtual/perl-Time-HiRes
+	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+	asterisk? ( dev-perl/Net-Telnet )
+	cgi? (
+		dev-perl/FCGI
+		dev-perl/CGI-Fast
+		)
+	dhcpd? (
+		>=net-misc/dhcp-3[server]
+		dev-perl/Net-IP
+		dev-perl/HTTP-Date
+		)
+	doc? ( dev-python/sphinx )
+	http? ( dev-perl/libwww-perl )
+	irc? ( dev-perl/Net-IRC )
+	ldap? ( dev-perl/perl-ldap )
+	kernel_linux? ( sys-process/procps )
+	memcached? ( dev-perl/Cache-Memcached )
+	mysql? (
+		virtual/mysql
+		dev-perl/Cache-Cache
+		dev-perl/DBD-mysql
+		)
+	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+	ssl? ( dev-perl/Net-SSLeay )
+	syslog? ( virtual/perl-Sys-Syslog )
+	!minimal? (
+		dev-perl/HTML-Template
+		dev-perl/IO-Socket-INET6
+		dev-perl/URI
+		>=net-analyzer/rrdtool-1.3[graph,perl]
+		virtual/ssh
+		)
+	"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	dev-perl/Module-Build
+	java? ( >=virtual/jdk-1.5 )
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/Test-MockObject
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		virtual/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+		java? (
+			>=virtual/jre-1.5
+			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	echo ${PV} > RELEASE || die
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	eapply_user
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	local cgiuser=$(usex apache2 apache munin)
+
+	cat >> "${S}"/Makefile.config <<- EOF || die
+	PREFIX=\$(DESTDIR)/usr
+	CONFDIR=\$(DESTDIR)/etc/munin
+	DOCDIR=${T}/useless/doc
+	MANDIR=\$(PREFIX)/share/man
+	LIBDIR=\$(PREFIX)/libexec/munin
+	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+	CGIDIR=${cgidir}
+	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+	CGIUSER=${cgiuser}
+	DBDIR=\$(DESTDIR)/var/lib/munin
+	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+	LOGDIR=\$(DESTDIR)/var/log/munin
+	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
+	JCVALID=$(usex java yes no)
+	STATEDIR=\$(DESTDIR)/run/munin
+	EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+	use doc && emake -C doc html
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
+	local testtargets="test-common test-node test-plugins"
+	use minimal || testtargets+=" test-master"
+
+	LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/var/lib/munin-node/plugin-state
+		/var/www/localhost/htdocs/munin
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+	# we remove /run from the install, as it's not the package's to deal
+	# with.
+	rm -rf "${D}"/run || die
+
+	# remove the plugins for non-Gentoo package managers; use -f so that
+	# it doesn't fail when installing on non-Linux platforms.
+	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die
+	d /run/munin 0700 munin munin - -
+	EOF
+
+	systemd_dounit "${FILESDIR}"/munin-async.service
+	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-node.service
+
+	cat >> "${T}"/munin.env <<- EOF
+	CONFIG_PROTECT=/var/spool/munin-async/.ssh
+	EOF
+	newenvd "${T}"/munin.env 50munin
+
+	dodoc README ChangeLog INSTALL
+	if use doc; then
+		cd "${S}"/doc/_build/html || die
+		docinto html
+		dodoc -r *
+		cd "${S}" || die
+	fi
+
+	dodir /etc/logrotate.d/
+	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
+		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
+	keepdir /var/spool/munin-async/.ssh
+	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+	fperms 0750 /var/spool/munin-async{,/.ssh}
+	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+			keepdir /var/cache/munin-cgi
+			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+			fowners $(usex apache2 apache munin) \
+				/var/cache/munin-cgi \
+				/var/log/munin/munin-cgi-{graph,html}.log
+
+			if use apache2; then
+				insinto /etc/apache2/vhosts.d
+				newins "${FILESDIR}"/munin.apache.include munin.include
+				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+			fi
+		else
+			sed \
+				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+				-i "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+		IdentityFile /var/lib/munin/.ssh/id_ecdsa
+		IdentityFile /var/lib/munin/.ssh/id_rsa
+		EOF
+
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+		# Force the shell to bash
+		SHELL=/bin/bash
+		# Mail reports to root@, not munin@
+		MAILTO=root
+
+		# This runs the munin task every 5 minutes.
+		*/5	* * * *		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#*/1 * * * *		/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#*/2 * * * *		/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#*/15 * * * *		nice /usr/libexec/munin/munin-html
+		EOF
+
+		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+		# Mail reports to root@, not munin@, only execute one at a time
+		!mailto(root),serial(true)
+
+		# This runs the munin task every 5 minutes.
+		@ 5		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#@ 1	/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#@ 2	/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#@ 5	nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#@ 15	nice /usr/libexec/munin/munin-html
+		EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa \
+		-f /var/lib/munin/.ssh/id_rsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa \
+		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf
+
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+	if use cgi; then
+		chown $(usex apache2 apache munin) \
+			"${ROOT}"/var/cache/munin-cgi \
+			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+		if use apache2; then
+			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+			elog "host you want it to be served."
+			elog "If you want to enable CGI-based HTML as well, you have to add to"
+			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+		else
+			elog "Effective CGI support has just been added in 2.0.7-r6."
+			elog "Documentation on how to use it is still sparse."
+		fi
+	fi
+
+	# we create this here as we don't want Portage to check /run
+	# symlinks but we still need this to be present before the reboot.
+	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+		mkdir "${ROOT}"/run/munin
+		chown munin:munin "${ROOT}"/run/munin
+		chmod 0700 "${ROOT}"/run/munin
+	fi
+}
diff --git a/net-analyzer/munin/munin-2.0.67-r2.ebuild b/net-analyzer/munin/munin-2.0.67-r2.ebuild
deleted file mode 100644
index 9f666d4ad680..000000000000
--- a/net-analyzer/munin/munin-2.0.67-r2.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHSET=1
-
-inherit java-pkg-opt-2 systemd
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="
-	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
-IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
-RESTRICT="!test? ( test )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
-	acct-user/munin
-	acct-user/munin-async
-	acct-group/munin
-	dev-lang/perl:=[berkdb]
-	dev-perl/DBI
-	dev-perl/Date-Manip
-	dev-perl/File-Copy-Recursive
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/Net-CIDR
-	dev-perl/Net-DNS
-	dev-perl/Net-Netmask
-	dev-perl/Net-SNMP
-	dev-perl/Net-Server[ipv6(-)?]
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	virtual/perl-Text-Balanced
-	virtual/perl-Time-HiRes
-	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-	asterisk? ( dev-perl/Net-Telnet )
-	cgi? (
-		dev-perl/FCGI
-		dev-perl/CGI-Fast
-		)
-	dhcpd? (
-		>=net-misc/dhcp-3[server]
-		dev-perl/Net-IP
-		dev-perl/HTTP-Date
-		)
-	doc? ( dev-python/sphinx )
-	http? ( dev-perl/libwww-perl )
-	irc? ( dev-perl/Net-IRC )
-	ldap? ( dev-perl/perl-ldap )
-	kernel_linux? ( sys-process/procps )
-	memcached? ( dev-perl/Cache-Memcached )
-	mysql? (
-		virtual/mysql
-		dev-perl/Cache-Cache
-		dev-perl/DBD-mysql
-		)
-	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	!minimal? (
-		dev-perl/HTML-Template
-		dev-perl/IO-Socket-INET6
-		dev-perl/URI
-		>=net-analyzer/rrdtool-1.3[graph,perl]
-		virtual/ssh
-		)
-	"
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	dev-perl/Module-Build
-	java? ( >=virtual/jdk-1.8 )
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-Exception
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/Test-MockObject
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND_COM}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.8:*
-			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)
-		selinux? ( sec-policy/selinux-munin )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	echo ${PV} > RELEASE || die
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	local cgiuser=$(usex apache2 apache munin)
-
-	cat >> "${S}"/Makefile.config <<- EOF
-	PREFIX=\$(DESTDIR)/usr
-	CONFDIR=\$(DESTDIR)/etc/munin
-	DOCDIR=${T}/useless/doc
-	MANDIR=\$(PREFIX)/share/man
-	LIBDIR=\$(PREFIX)/libexec/munin
-	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-	CGIDIR=${cgidir}
-	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-	CGIUSER=${cgiuser}
-	DBDIR=\$(DESTDIR)/var/lib/munin
-	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-	LOGDIR=\$(DESTDIR)/var/log/munin
-	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
-	JCVALID=$(usex java yes no)
-	STATEDIR=\$(DESTDIR)/run/munin
-	EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-	emake -j1
-	use doc && emake -C doc html
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	local testtargets="test-common test-node test-plugins"
-	use minimal || testtargets+=" test-master"
-
-	LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-	local dirs="
-		/var/log/munin
-		/var/lib/munin/plugin-state
-		/var/lib/munin-node/plugin-state
-		/var/www/localhost/htdocs/munin
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-	# we remove /run from the install, as it's not the package's to deal
-	# with.
-	rm -rf "${D}"/run || die
-
-	# remove the plugins for non-Gentoo package managers; use -f so that
-	# it doesn't fail when installing on non-Linux platforms.
-	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
-	d /run/munin 0700 munin munin - -
-	EOF
-
-	systemd_dounit "${FILESDIR}"/munin-async.service
-	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-node.service
-
-	cat >> "${T}"/munin.env <<- EOF
-	CONFIG_PROTECT=/var/spool/munin-async/.ssh
-	EOF
-	newenvd "${T}"/munin.env 50munin
-
-	dodoc README ChangeLog INSTALL
-	if use doc; then
-		cd "${S}"/doc/_build/html || die
-		docinto html
-		dodoc -r *
-		cd "${S}" || die
-	fi
-
-	dodir /etc/logrotate.d/
-	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
-		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/spool/munin-async/.ssh
-	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-	fperms 0750 /var/spool/munin-async{,/.ssh}
-	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-			keepdir /var/cache/munin-cgi
-			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-			fowners $(usex apache2 apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache2; then
-				insinto /etc/apache2/vhosts.d
-				newins "${FILESDIR}"/munin.apache.include munin.include
-				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-			fi
-		else
-			sed \
-				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
-				-i "${D}"/etc/munin/munin.conf || die
-		fi
-
-		keepdir /var/lib/munin/.ssh
-		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
-		IdentityFile /var/lib/munin/.ssh/id_ecdsa
-		IdentityFile /var/lib/munin/.ssh/id_rsa
-		EOF
-
-		fowners munin:munin /var/lib/munin/.ssh/{,config}
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		dodir /usr/share/${PN}
-		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
-		# Force the shell to bash
-		SHELL=/bin/bash
-		# Mail reports to root@, not munin@
-		MAILTO=root
-
-		# This runs the munin task every 5 minutes.
-		*/5	* * * *		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#*/1 * * * *		/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#*/2 * * * *		/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#*/15 * * * *		nice /usr/libexec/munin/munin-html
-		EOF
-
-		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
-		# Mail reports to root@, not munin@, only execute one at a time
-		!mailto(root),serial(true)
-
-		# This runs the munin task every 5 minutes.
-		@ 5		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#@ 1	/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#@ 2	/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#@ 5	nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#@ 15	nice /usr/libexec/munin/munin-html
-		EOF
-
-		# remove .htaccess file
-		find "${D}" -name .htaccess -delete || die
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	ebegin "Setting up cron ..."
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa \
-		-f /var/lib/munin/.ssh/id_rsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa \
-		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache2 apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache2; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.67-r3.ebuild b/net-analyzer/munin/munin-2.0.67-r3.ebuild
deleted file mode 100644
index a0ed5615dc54..000000000000
--- a/net-analyzer/munin/munin-2.0.67-r3.ebuild
+++ /dev/null
@@ -1,414 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHSET=1
-
-inherit java-pkg-opt-2 systemd
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="https://munin-monitoring.org/"
-SRC_URI="
-	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
-RESTRICT="!test? ( test )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
-	acct-user/munin
-	acct-user/munin-async
-	acct-group/munin
-	dev-lang/perl:=[berkdb]
-	dev-perl/DBI
-	dev-perl/Date-Manip
-	dev-perl/File-Copy-Recursive
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/Net-CIDR
-	dev-perl/Net-DNS
-	dev-perl/Net-Netmask
-	dev-perl/Net-SNMP
-	dev-perl/Net-Server[ipv6(-)?]
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	virtual/perl-Text-Balanced
-	virtual/perl-Time-HiRes
-	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-	asterisk? ( dev-perl/Net-Telnet )
-	cgi? (
-		dev-perl/FCGI
-		dev-perl/CGI-Fast
-		)
-	dhcpd? (
-		>=net-misc/dhcp-3[server]
-		dev-perl/Net-IP
-		dev-perl/HTTP-Date
-		)
-	doc? ( dev-python/sphinx )
-	http? ( dev-perl/libwww-perl )
-	irc? ( dev-perl/Net-IRC )
-	ldap? ( dev-perl/perl-ldap )
-	kernel_linux? ( sys-process/procps )
-	memcached? ( dev-perl/Cache-Memcached )
-	mysql? (
-		virtual/mysql
-		dev-perl/Cache-Cache
-		dev-perl/DBD-mysql
-		)
-	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	!minimal? (
-		dev-perl/HTML-Template
-		dev-perl/IO-Socket-INET6
-		dev-perl/URI
-		>=net-analyzer/rrdtool-1.3[graph,perl]
-		virtual/ssh
-		)
-	"
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	dev-perl/Module-Build
-	java? ( >=virtual/jdk-1.8 )
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-Exception
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/Test-MockObject
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND_COM}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.8:*
-			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)
-		selinux? ( sec-policy/selinux-munin )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	echo ${PV} > RELEASE || die
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	local cgiuser=$(usex apache2 apache munin)
-
-	cat >> "${S}"/Makefile.config <<- EOF
-	PREFIX=\$(DESTDIR)/usr
-	CONFDIR=\$(DESTDIR)/etc/munin
-	DOCDIR=${T}/useless/doc
-	MANDIR=\$(PREFIX)/share/man
-	LIBDIR=\$(PREFIX)/libexec/munin
-	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-	CGIDIR=${cgidir}
-	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-	CGIUSER=${cgiuser}
-	DBDIR=\$(DESTDIR)/var/lib/munin
-	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-	LOGDIR=\$(DESTDIR)/var/log/munin
-	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
-	JCVALID=$(usex java yes no)
-	STATEDIR=\$(DESTDIR)/run/munin
-	EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-	emake -j1
-	use doc && emake -C doc html
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	local testtargets="test-common test-node test-plugins"
-	use minimal || testtargets+=" test-master"
-
-	LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-	local dirs="
-		/var/log/munin
-		/var/lib/munin/plugin-state
-		/var/lib/munin-node/plugin-state
-		/var/www/localhost/htdocs/munin
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-	# we remove /run from the install, as it's not the package's to deal
-	# with.
-	rm -rf "${D}"/run || die
-
-	# remove the plugins for non-Gentoo package managers; use -f so that
-	# it doesn't fail when installing on non-Linux platforms.
-	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
-	d /run/munin 0700 munin munin - -
-	EOF
-
-	systemd_dounit "${FILESDIR}"/munin-async.service
-	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-node.service
-
-	cat >> "${T}"/munin.env <<- EOF
-	CONFIG_PROTECT=/var/spool/munin-async/.ssh
-	EOF
-	newenvd "${T}"/munin.env 50munin
-
-	dodoc README ChangeLog INSTALL
-	if use doc; then
-		cd "${S}"/doc/_build/html || die
-		docinto html
-		dodoc -r *
-		cd "${S}" || die
-	fi
-
-	dodir /etc/logrotate.d/
-	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
-		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/spool/munin-async/.ssh
-	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-	fperms 0750 /var/spool/munin-async{,/.ssh}
-	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-			fowners $(usex apache2 apache munin) \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache2; then
-				insinto /etc/apache2/vhosts.d
-				newins "${FILESDIR}"/munin.apache.include munin.include
-				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-			fi
-		else
-			sed \
-				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
-				-i "${D}"/etc/munin/munin.conf || die
-		fi
-
-		keepdir /var/lib/munin/.ssh
-		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
-		IdentityFile /var/lib/munin/.ssh/id_ecdsa
-		IdentityFile /var/lib/munin/.ssh/id_rsa
-		EOF
-
-		fowners munin:munin /var/lib/munin/.ssh/{,config}
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		dodir /usr/share/${PN}
-		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
-		# Force the shell to bash
-		SHELL=/bin/bash
-		# Mail reports to root@, not munin@
-		MAILTO=root
-
-		# This runs the munin task every 5 minutes.
-		*/5	* * * *		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#*/1 * * * *		/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#*/2 * * * *		/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#*/15 * * * *		nice /usr/libexec/munin/munin-html
-		EOF
-
-		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
-		# Mail reports to root@, not munin@, only execute one at a time
-		!mailto(root),serial(true)
-
-		# This runs the munin task every 5 minutes.
-		@ 5		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#@ 1	/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#@ 2	/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#@ 5	nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#@ 15	nice /usr/libexec/munin/munin-html
-		EOF
-
-		# remove .htaccess file
-		find "${D}" -name .htaccess -delete || die
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	ebegin "Setting up cron ..."
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa \
-		-f /var/lib/munin/.ssh/id_rsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa \
-		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache2 apache munin) \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache2; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.67-r6.ebuild b/net-analyzer/munin/munin-2.0.67-r6.ebuild
new file mode 100644
index 000000000000..b4ad2481fd45
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.67-r6.ebuild
@@ -0,0 +1,418 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCHSET=1
+
+inherit java-pkg-opt-2 systemd tmpfiles
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/"
+SRC_URI="
+	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+RESTRICT="!test? ( test )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+	acct-user/munin
+	acct-user/munin-async
+	acct-group/munin
+	dev-lang/perl:=[berkdb]
+	dev-perl/DBI
+	dev-perl/Date-Manip
+	dev-perl/File-Copy-Recursive
+	dev-perl/List-MoreUtils
+	dev-perl/Log-Log4perl
+	dev-perl/Net-CIDR
+	dev-perl/Net-DNS
+	dev-perl/Net-Netmask
+	dev-perl/Net-SNMP
+	dev-perl/Net-Server[ipv6(-)?]
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-MIME-Base64
+	virtual/perl-Storable
+	virtual/perl-Text-Balanced
+	virtual/perl-Time-HiRes
+	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+	asterisk? ( dev-perl/Net-Telnet )
+	cgi? (
+		dev-perl/FCGI
+		dev-perl/CGI-Fast
+		)
+	dhcpd? (
+		>=net-misc/dhcp-3[server]
+		dev-perl/Net-IP
+		dev-perl/HTTP-Date
+		)
+	doc? ( dev-python/sphinx )
+	http? ( dev-perl/libwww-perl )
+	irc? ( dev-perl/Net-IRC )
+	ldap? ( dev-perl/perl-ldap )
+	kernel_linux? ( sys-process/procps )
+	memcached? ( dev-perl/Cache-Memcached )
+	mysql? (
+		virtual/mysql
+		dev-perl/Cache-Cache
+		dev-perl/DBD-mysql
+		)
+	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+	ssl? ( dev-perl/Net-SSLeay )
+	syslog? ( virtual/perl-Sys-Syslog )
+	!minimal? (
+		dev-perl/HTML-Template
+		dev-perl/IO-Socket-INET6
+		dev-perl/URI
+		>=net-analyzer/rrdtool-1.3[graph,perl]
+		virtual/ssh
+		)
+	"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	dev-perl/Module-Build
+	java? ( >=virtual/jdk-1.8 )
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/Test-MockObject
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		virtual/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+		java? (
+			>=virtual/jre-1.8:*
+			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	echo ${PV} > RELEASE || die
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	eapply_user
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	local cgiuser=$(usex apache2 apache munin)
+
+	cat >> "${S}"/Makefile.config <<- EOF || die
+	PREFIX=\$(DESTDIR)/usr
+	CONFDIR=\$(DESTDIR)/etc/munin
+	DOCDIR=${T}/useless/doc
+	MANDIR=\$(PREFIX)/share/man
+	LIBDIR=\$(PREFIX)/libexec/munin
+	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+	CGIDIR=${cgidir}
+	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+	CGIUSER=${cgiuser}
+	DBDIR=\$(DESTDIR)/var/lib/munin
+	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+	LOGDIR=\$(DESTDIR)/var/log/munin
+	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
+	JCVALID=$(usex java yes no)
+	STATEDIR=\$(DESTDIR)/run/munin
+	EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+	use doc && emake -C doc html
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
+	local testtargets="test-common test-node test-plugins"
+	use minimal || testtargets+=" test-master"
+
+	LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/var/lib/munin-node/plugin-state
+		/var/www/localhost/htdocs/munin
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+	# we remove /run from the install, as it's not the package's to deal
+	# with.
+	rm -rf "${D}"/run || die
+
+	# remove the plugins for non-Gentoo package managers; use -f so that
+	# it doesn't fail when installing on non-Linux platforms.
+	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die
+	d /run/munin 0700 munin munin - -
+	EOF
+
+	systemd_dounit "${FILESDIR}"/munin-async.service
+	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-node.service
+
+	cat >> "${T}"/munin.env <<- EOF
+	CONFIG_PROTECT=/var/spool/munin-async/.ssh
+	EOF
+	newenvd "${T}"/munin.env 50munin
+
+	dodoc README ChangeLog INSTALL
+	if use doc; then
+		cd "${S}"/doc/_build/html || die
+		docinto html
+		dodoc -r *
+		cd "${S}" || die
+	fi
+
+	dodir /etc/logrotate.d/
+	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
+		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
+	keepdir /var/spool/munin-async/.ssh
+	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+	fperms 0750 /var/spool/munin-async{,/.ssh}
+	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+			keepdir /var/cache/munin-cgi
+			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+			fowners $(usex apache2 apache munin) \
+				/var/cache/munin-cgi \
+				/var/log/munin/munin-cgi-{graph,html}.log
+
+			if use apache2; then
+				insinto /etc/apache2/vhosts.d
+				newins "${FILESDIR}"/munin.apache.include munin.include
+				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+			fi
+		else
+			sed \
+				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+				-i "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+		IdentityFile /var/lib/munin/.ssh/id_ecdsa
+		IdentityFile /var/lib/munin/.ssh/id_rsa
+		EOF
+
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+		# Force the shell to bash
+		SHELL=/bin/bash
+		# Mail reports to root@, not munin@
+		MAILTO=root
+
+		# This runs the munin task every 5 minutes.
+		*/5	* * * *		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#*/1 * * * *		/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#*/2 * * * *		/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#*/15 * * * *		nice /usr/libexec/munin/munin-html
+		EOF
+
+		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+		# Mail reports to root@, not munin@, only execute one at a time
+		!mailto(root),serial(true)
+
+		# This runs the munin task every 5 minutes.
+		@ 5		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#@ 1	/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#@ 2	/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#@ 5	nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#@ 15	nice /usr/libexec/munin/munin-html
+		EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa \
+		-f /var/lib/munin/.ssh/id_rsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa \
+		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf
+
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+	if use cgi; then
+		chown $(usex apache2 apache munin) \
+			"${ROOT}"/var/cache/munin-cgi \
+			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+		if use apache2; then
+			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+			elog "host you want it to be served."
+			elog "If you want to enable CGI-based HTML as well, you have to add to"
+			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+		else
+			elog "Effective CGI support has just been added in 2.0.7-r6."
+			elog "Documentation on how to use it is still sparse."
+		fi
+	fi
+
+	# we create this here as we don't want Portage to check /run
+	# symlinks but we still need this to be present before the reboot.
+	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+		mkdir "${ROOT}"/run/munin
+		chown munin:munin "${ROOT}"/run/munin
+		chmod 0700 "${ROOT}"/run/munin
+	fi
+}
diff --git a/net-analyzer/munin/munin-2.0.67-r7.ebuild b/net-analyzer/munin/munin-2.0.67-r7.ebuild
new file mode 100644
index 000000000000..00a940ba1b5f
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.67-r7.ebuild
@@ -0,0 +1,415 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCHSET=1
+
+inherit java-pkg-opt-2 systemd tmpfiles
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="https://munin-monitoring.org/"
+SRC_URI="
+	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+RESTRICT="!test? ( test )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+	acct-user/munin
+	acct-user/munin-async
+	acct-group/munin
+	dev-lang/perl:=[berkdb]
+	dev-perl/DBI
+	dev-perl/Date-Manip
+	dev-perl/File-Copy-Recursive
+	dev-perl/List-MoreUtils
+	dev-perl/Log-Log4perl
+	dev-perl/Net-CIDR
+	dev-perl/Net-DNS
+	dev-perl/Net-Netmask
+	dev-perl/Net-SNMP
+	dev-perl/Net-Server[ipv6(-)?]
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-MIME-Base64
+	virtual/perl-Storable
+	virtual/perl-Text-Balanced
+	virtual/perl-Time-HiRes
+	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+	asterisk? ( dev-perl/Net-Telnet )
+	cgi? (
+		dev-perl/FCGI
+		dev-perl/CGI-Fast
+		)
+	dhcpd? (
+		>=net-misc/dhcp-3[server]
+		dev-perl/Net-IP
+		dev-perl/HTTP-Date
+		)
+	doc? ( dev-python/sphinx )
+	http? ( dev-perl/libwww-perl )
+	irc? ( dev-perl/Net-IRC )
+	ldap? ( dev-perl/perl-ldap )
+	kernel_linux? ( sys-process/procps )
+	memcached? ( dev-perl/Cache-Memcached )
+	mysql? (
+		virtual/mysql
+		dev-perl/Cache-Cache
+		dev-perl/DBD-mysql
+		)
+	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+	ssl? ( dev-perl/Net-SSLeay )
+	syslog? ( virtual/perl-Sys-Syslog )
+	!minimal? (
+		dev-perl/HTML-Template
+		dev-perl/IO-Socket-INET6
+		dev-perl/URI
+		>=net-analyzer/rrdtool-1.3[graph,perl]
+		virtual/ssh
+		)
+	"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	dev-perl/Module-Build
+	java? ( >=virtual/jdk-1.8 )
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/Test-MockObject
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		virtual/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+		java? (
+			>=virtual/jre-1.8:*
+			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	echo ${PV} > RELEASE || die
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	eapply_user
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	local cgiuser=$(usex apache2 apache munin)
+
+	cat >> "${S}"/Makefile.config <<- EOF || die
+	PREFIX=\$(DESTDIR)/usr
+	CONFDIR=\$(DESTDIR)/etc/munin
+	DOCDIR=${T}/useless/doc
+	MANDIR=\$(PREFIX)/share/man
+	LIBDIR=\$(PREFIX)/libexec/munin
+	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+	CGIDIR=${cgidir}
+	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+	CGIUSER=${cgiuser}
+	DBDIR=\$(DESTDIR)/var/lib/munin
+	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+	LOGDIR=\$(DESTDIR)/var/log/munin
+	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
+	JCVALID=$(usex java yes no)
+	STATEDIR=\$(DESTDIR)/run/munin
+	EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+	use doc && emake -C doc html
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
+	local testtargets="test-common test-node test-plugins"
+	use minimal || testtargets+=" test-master"
+
+	LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/var/lib/munin-node/plugin-state
+		/var/www/localhost/htdocs/munin
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+	# we remove /run from the install, as it's not the package's to deal
+	# with.
+	rm -rf "${D}"/run || die
+
+	# remove the plugins for non-Gentoo package managers; use -f so that
+	# it doesn't fail when installing on non-Linux platforms.
+	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die
+	d /run/munin 0700 munin munin - -
+	EOF
+
+	systemd_dounit "${FILESDIR}"/munin-async.service
+	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-node.service
+
+	cat >> "${T}"/munin.env <<- EOF
+	CONFIG_PROTECT=/var/spool/munin-async/.ssh
+	EOF
+	newenvd "${T}"/munin.env 50munin
+
+	dodoc README ChangeLog INSTALL
+	if use doc; then
+		cd "${S}"/doc/_build/html || die
+		docinto html
+		dodoc -r *
+		cd "${S}" || die
+	fi
+
+	dodir /etc/logrotate.d/
+	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
+		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
+	keepdir /var/spool/munin-async/.ssh
+	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+	fperms 0750 /var/spool/munin-async{,/.ssh}
+	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+			fowners $(usex apache2 apache munin) \
+				/var/log/munin/munin-cgi-{graph,html}.log
+
+			if use apache2; then
+				insinto /etc/apache2/vhosts.d
+				newins "${FILESDIR}"/munin.apache.include munin.include
+				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+			fi
+		else
+			sed \
+				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+				-i "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+		IdentityFile /var/lib/munin/.ssh/id_ecdsa
+		IdentityFile /var/lib/munin/.ssh/id_rsa
+		EOF
+
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+		# Force the shell to bash
+		SHELL=/bin/bash
+		# Mail reports to root@, not munin@
+		MAILTO=root
+
+		# This runs the munin task every 5 minutes.
+		*/5	* * * *		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#*/1 * * * *		/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#*/2 * * * *		/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#*/15 * * * *		nice /usr/libexec/munin/munin-html
+		EOF
+
+		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+		# Mail reports to root@, not munin@, only execute one at a time
+		!mailto(root),serial(true)
+
+		# This runs the munin task every 5 minutes.
+		@ 5		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#@ 1	/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#@ 2	/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#@ 5	nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#@ 15	nice /usr/libexec/munin/munin-html
+		EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa \
+		-f /var/lib/munin/.ssh/id_rsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa \
+		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf
+
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+	if use cgi; then
+		chown $(usex apache2 apache munin) \
+			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+		if use apache2; then
+			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+			elog "host you want it to be served."
+			elog "If you want to enable CGI-based HTML as well, you have to add to"
+			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+		else
+			elog "Effective CGI support has just been added in 2.0.7-r6."
+			elog "Documentation on how to use it is still sparse."
+		fi
+	fi
+
+	# we create this here as we don't want Portage to check /run
+	# symlinks but we still need this to be present before the reboot.
+	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+		mkdir "${ROOT}"/run/munin
+		chown munin:munin "${ROOT}"/run/munin
+		chmod 0700 "${ROOT}"/run/munin
+	fi
+}
diff --git a/net-analyzer/nagios-check_multiple/Manifest b/net-analyzer/nagios-check_multiple/Manifest
index d6ef6504e1c4..0a596c7b1a98 100644
--- a/net-analyzer/nagios-check_multiple/Manifest
+++ b/net-analyzer/nagios-check_multiple/Manifest
@@ -1,3 +1,4 @@
 DIST nagios-check_multiple-0.0.1.tar.gz 9376 BLAKE2B 2db464b7edd4aa704560a3f16a5d70e4cdef7cd35284e3c679f3e10e5ef6eaaba19dc361efbb10a77f87c14726439869e4b415fe7e393a1d7ac23233b3bfa66a SHA512 a75bcd821afc6daca612f42c552fb965a3068dc04a94df41ff41d36928c764d44bcf72e1bd6d776bf4b443c73fc3946c0a91443a562019fcd1b6e8687d0ebcd2
+EBUILD nagios-check_multiple-0.0.1-r1.ebuild 1363 BLAKE2B b694b57a674daa4d5f2d24818952b3073ddaa8b4a0e7c3817c5bc58ab0c61e2a5c48a362c34e61694638879283d5e4096aee199b7f90777db67911b6fe1210ec SHA512 0d5e0b7f3fc32ad9f592c5db2d2cf617a167a86ac5610db531570825d59bca2b67e76a8c3e310d8fa4eaf1cd30a7217a39d8125e7c15eb588d941b1766b84212
 EBUILD nagios-check_multiple-0.0.1.ebuild 1357 BLAKE2B bd94906a71835708c96c225886dae2212cb17b585a4b39c3df3efadc83fdf9f5319029a5ff4406c7adbe3ee50d00c2bf812e902743483c1953770aa6570b79fb SHA512 ac1e10889763e24662d02f640b3174635d2fed615a2e99dfce317dda93a3b847245aeab593bb999ae583228963d6a4df196699569c38a09838dcbee05d3cbc9b
 MISC metadata.xml 346 BLAKE2B 16270d3fccdcd1c5519beddf3e520377a2538ca793fc1d0c9e3f1e640db66b562971900d5595754104cc30390661c6ff714ac790868e6aeae719e68c72eb2d0d SHA512 7f773b9c98c57e43fb394a2db6bc357d49c4561f44419aff7867fdc07eece455a473309646e90ed065ab11c64576d4dd764d134403330bd83e9f71e680d5a932
diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild
new file mode 100644
index 000000000000..474031b4927f
--- /dev/null
+++ b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+MY_PN="check_multiple"
+DESCRIPTION="A Nagios plugin to execute multiple checks in parallel"
+HOMEPAGE="https://github.com/clarkbox/check_multiple"
+SRC_URI="https://github.com/clarkbox/check_multiple/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	distutils-r1_src_install
+
+	local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "${nagiosplugindir}"
+
+	# Create a symlink from the nagios plugin directory to the /usr/bin
+	# location. The "binary" in /usr/bin should also be a symlink, since
+	# the python machinery allows the user to switch out the
+	# interpreter. We don't want to mess with any of that, so we just
+	# point to whatever the system would use if the user executed
+	# ${MY_PN}.
+	#
+	# The relative symlink is preferred so that if the package is
+	# installed e.g. while in a chroot, the symlink will never point
+	# outside of that chroot.
+	#
+	dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}"
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest -v lib/check_multiple/check_multiple.py \
+		|| die "test suite failed"
+}
diff --git a/net-analyzer/nagios-icinga-openvpn/Manifest b/net-analyzer/nagios-icinga-openvpn/Manifest
index 386b3333cabc..f019798defef 100644
--- a/net-analyzer/nagios-icinga-openvpn/Manifest
+++ b/net-analyzer/nagios-icinga-openvpn/Manifest
@@ -1,3 +1,4 @@
 DIST nagios-icinga-openvpn-0.0.1.tar.gz 4637 BLAKE2B 365b6450cccd5f7f25348583eae45c0b15932ec1e858d375171911e4108dd2b7fc133559a35399ece8d2a349f05b2f51897cf9e271f498b6bbaa2c6bba3551a9 SHA512 0dae6c2df71a20e287720767aa4ba41d0568f3cd4bd2a6eb252f86d810d3de265ddc38397df15bb1b115ba35ac68aa6e18345dc4432d4d13b08b500483ffbb11
 EBUILD nagios-icinga-openvpn-0.0.1-r1.ebuild 1200 BLAKE2B 7ae3d149997a47dd3958d69346a54488d89212196a8aa8a3de61c83528ac7bcc4bb57696f256d11c6140f0aa195d3f29f5fb5603aee86e9be6b223326724d62b SHA512 32a0c553937548477cdf84e369dffcbea84f2748ad460030687cccd562ee91036b7d8658e37a1858b078405bf6575d9ba3e3c434f070b8d2d3174f01205673c1
+EBUILD nagios-icinga-openvpn-0.0.1-r2.ebuild 1212 BLAKE2B e323ee6bbf7e208dbfe0b32068f78ce36c7b39dec27e692a534ca57eac8cf8f6fb0320827fd2b4c12a6f4e270eeec6902c5049ef452552b7f5085c70d34f6004 SHA512 c15bfb212bcf5e8407e0ba729082e99165aa05fd39e19b6cd1ab8689a9055965223728623f02d1f2bc99562d6cd28bbad50bee241a6eac53b43c49cc8cc5b283
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild
new file mode 100644
index 000000000000..6ff5f2740438
--- /dev/null
+++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_8 python3_9 python3_10 )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+MY_PN="check_openvpn"
+DESCRIPTION="A Nagios plugin to check whether an OpenVPN server is alive"
+HOMEPAGE="https://github.com/liquidat/nagios-icinga-openvpn"
+SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+src_install() {
+	distutils-r1_src_install
+
+	local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "${nagiosplugindir}"
+
+	# Create a symlink from the nagios plugin directory to the /usr/bin
+	# location. The "binary" in /usr/bin should also be a symlink, since
+	# the python machinery allows the user to switch out the
+	# interpreter. We don't want to mess with any of that, so we just
+	# point to whatever the system would use if the user executed
+	# ${MY_PN}.
+	#
+	# The relative symlink is preferred so that if the package is
+	# installed e.g. while in a chroot, the symlink will never point
+	# outside of that chroot.
+	#
+	dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}"
+}
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 758b9b4d14e6..b16099c16091 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -16,6 +16,6 @@ DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e462
 DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d
 DIST nmap-7.91.tar.bz2.asc 195 BLAKE2B 16c4bad309c4652128a67f00c6b89f6552f432166733cac45756c20df0f48bdd0b8b9edbcce3df8f25d0a8e422be2494d9d5639fa74fc3f1e2c13489c52387c1 SHA512 376b74fc15896a1008709dac45b5af5d35ca00a1753994aba3ee6cffe2c2f0d67619fab45d57e83b454cfb376defe965f2bf881ef4cb8d5f8f2215979ad8ee96
 EBUILD nmap-7.80-r2.ebuild 3302 BLAKE2B 1067cf3f8cfc655936e8326cb74adbb27c86fa2a4b64a964a68442beb8c496adc968fcfdbd991f90d54e62f7004ac6876a85194c9a198b99fdb515f8b812f9d6 SHA512 5547b397864ba934196705250f714e6bcc7a10613745cef95dff817acde8386627ad494da7748f5e1d0a66e8e74727632f61840253e95d5a191ea2ab16df77ca
-EBUILD nmap-7.91-r2.ebuild 3227 BLAKE2B d0f0ccc51175f6d4962da5ce4752215fae3527fc8a6edfb8296ad33c3cbc8017f6c8ed420176f9a3d4554fc9cd82f2b66d7ffdae8f6057385a6ebcb358f84cf6 SHA512 4698d60d268cddfe09c35e3bd137c3dfb1e9bb95ce1535cf1beac0d1ebc4ccf5363dc81a6b03f80cb6ad87819ff739a738afaa6f5692349ebae122690c0ee8ff
-EBUILD nmap-9999.ebuild 3191 BLAKE2B b3a18f95682620393cfcbd4ebd5da0bf9d1544ba07664042d6bf8c1206d038495ae82bdb9160d27ca28a9abef5e0423518274b096c39d99c12dc7e7ab52972ab SHA512 24fa8dece88f808850305bcc053717c7610225c5920ae801e2bea2ce6c2ab5bab2dff619df55088f68d538e584a678b18c5f956cfbef89ad0a568cd98ad8497d
+EBUILD nmap-7.91-r2.ebuild 3235 BLAKE2B ee342955c8d38eb326b5de456c986eb7be3da4998333ee085a3600d497ab7f7dfdb630f750184de0f15989a276a7d7c2ec886f27b2c980af0d10d2fd54f56e0c SHA512 1b6124c5f6b1e58cea5834e3662d985343101a3f1bed150f4ca321cfbcd1290f6c91801ba2360552b480874c0193c0f93dc682dc490ce393602ed2af5bd3aa6f
+EBUILD nmap-9999.ebuild 3199 BLAKE2B f77fa1c163955c79703536ed201aae478bb1e165814764b5d994d04c66f8f5c18ea37d29227bb71362e10d6b5e5239ca97c081f4de60d1adfecce6b2982d18b0 SHA512 4d4fa28592a7e250d45bce010e94f6576fbdf3a995110b6e4ed19e28ed8c534635e9a2d1697577bfe4f5ddab04a3457592c71cfa219fcfddc70cc9951dac69e0
 MISC metadata.xml 979 BLAKE2B d77a475cc6bb5be93382dd712d5cee9b4a358a0cab70a0b13b40dd78cd6c5ccdc1802eaa58814ef3868281b2129c907cd22d480b4667ba9c162c0c0ac1ef2aa4 SHA512 c97db5c77b309a940b3307ef35edd202feb0cc5778d4d4ef9a624458012b473fb0a96c6d9460c3d42cc1fe3c5c9009c29aabff058c1dff818b6901d068f47e48
diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 2011c9655dae..d8498b958689 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]] ; then
 	# Just in case for now as future seems undecided.
 	LICENSE="NPSL"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/nmap.asc
 	inherit verify-sig
 
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 0143075841b4..0b17737335e2 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]] ; then
 	# Just in case for now as future seems undecided.
 	LICENSE="NPSL"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/nmap.asc
 	inherit verify-sig
 
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index 0f4861cbcef5..e30ba73906b6 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -6,5 +6,5 @@ DIST nrpe-4.0.2.tar.gz 524146 BLAKE2B dc100579420eeccaaa2a913f56c76b86b6ebdce8d1
 DIST nrpe-4.0.3.tar.gz 524160 BLAKE2B d2c99cadf718e7049c911388b105fb4f5248307c733d94a73fd02ac69c49be230dad58be0a182af9c8d7e0d1f34e8dba6b8fc46a7c01eb15d845f2b3a54499ed SHA512 31d932c481c8a53bd0f8865fb3cfeeb1466b9b05fa89382aa056aa9343a09843b51fe5398fd0388e6bba99e9c3d8093f6033799fd83afd43012bfe8fdc5a33e3
 EBUILD nrpe-4.0.0.ebuild 2754 BLAKE2B 41c7ab9b52abb8dafef7936c7ffaea0bd8d3f3fd2b658254eebb119c2b8bcc4ebe293d31f6eaeafbea8a181aa1f402f5193d349254709edb6ac44b08444b633c SHA512 2e818678b118dab57bca1f4ddc094b57e225cf0aa9bed460e7f1143758cc7eba591dc32f08c6d1219c2d1e3c27bdcb396da9c46f02a27b3808abf83a2d7869bf
 EBUILD nrpe-4.0.2.ebuild 2810 BLAKE2B 4d947f53a170ba7d178581ea7fab97eb2faa45207e6b9103352905dd6b445676d76a91cf3287addce3e965c746d525146f52e5523d13d6599a6d215d880afd13 SHA512 04f3e6b17a8636f7eb3c2055cb0d8213047c80544e4f64aaae30b17396acdb0446421bd8bfa245b3c97c4ba6b40039d3c614a0b95e8de1dbf1a97d1341899f0a
-EBUILD nrpe-4.0.3.ebuild 2770 BLAKE2B 807189a2b10ce8efee80dd4131b115fddf0d538fc5cda633d738b2286cf64e6e1d7cdd121e84d05f059ba95bcc768eae82cf96394ac619627c8dc8399b1ed100 SHA512 3d8cb1bbc09241e6ff7480ce7d03181896dce8a8df8491ec041d71d9b66e33df5bd69bf7aa4c6abdfe2e79788d36cb729240586669333135064faa488b95a19e
+EBUILD nrpe-4.0.3.ebuild 2765 BLAKE2B abb5c457a7b68ddb5255b41f84beb1fd970a8057487ac513964889378f29f2b2845589683f28ba7430c67e102e95e2f2d74588ef2e640345830678e709ea3462 SHA512 f8d83f2580f0241232719f648d7f1f619d8998a20d1f33f2928ef60619d8aeb6ab7085eaa1327b9fa76e8f9d657e9345f75c2c7b902766f43b07391abbfbf30d
 MISC metadata.xml 770 BLAKE2B 93991f7ee4c1b6c26b67e873fae0cdb66170cd93ba6b79d6e798cb2605126888a996f633eccd038ece2a822d1b92498c2036746bb3a1add2e336c6026c2db86d SHA512 48693abab21581eff977b8deaa5fabc5d388960c9cd090b590a1f6d3c8d37b63fe33ec86d6f95d7435404314b84053f8c2ca84b0f33c6c7241ea7260f82a3a27
diff --git a/net-analyzer/nrpe/nrpe-4.0.3.ebuild b/net-analyzer/nrpe/nrpe-4.0.3.ebuild
index 5cbe3d9a63b6..585fd858b111 100644
--- a/net-analyzer/nrpe/nrpe-4.0.3.ebuild
+++ b/net-analyzer/nrpe/nrpe-4.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="command-args selinux ssl tcpd"
 
 DEPEND="acct-group/nagios
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
index 918aaec8bd55..ff359a71cc34 100644
--- a/net-analyzer/prelude-correlator/Manifest
+++ b/net-analyzer/prelude-correlator/Manifest
@@ -3,5 +3,5 @@ AUX prelude-correlator.initd 654 BLAKE2B 10bb6e1ba38c916394cbeab1d314e39ee61753c
 AUX prelude-correlator.run 139 BLAKE2B 2eac955ca980c1e49d39946d3890c5dba1b7f5a40670c28f788d66535e1a52735fb8620a78a1ec6cdb59ae517d0317c363c72779087fcfbdc7011e3b1bdd9370 SHA512 f05c771f387b2eb59e37006ba5bb959d8d67cbdbdfdd5a7c5a42b592d2c9d4532bfa425565722745ad52e7fb1d327738c02f1602e0eeb42ea403275d69380f51
 AUX prelude-correlator.service 339 BLAKE2B 25275e92b5471521e1f8e3f23d1a0a483c7cb3300edbcc563cb84c280f64a7555b47e4cbe97c00ee76777e9f44de9bbd911de69deec5bec2898a09c1a206f7a1 SHA512 8f0d0478bea87e2bdc8266044e580f983b12dcaafec1b7cb87074f9cd3825a9c0b2b6d59fba8fc4a62a5af0b9f0dede6f8c5d3cbf436fcf900b031947ea20f68
 DIST prelude-correlator-5.2.0.tar.gz 216556 BLAKE2B 9ccdbaf01224d34a507191521aeda8a8fe91004dc0b7a6113cbfc4b0d7ebab345a160b0e498b3c3477e3cc52cda1501d11a558842bb286444a925463a66ff7b5 SHA512 96e0c7637f3d17dc7cd76603e95f29eba0a1ec86ae603dcb6900b26a12e410e62884f9e339a228e3dd4a0db0fd0e8849bbd098caeb7e3c15db917ed33ebb5b43
-EBUILD prelude-correlator-5.2.0.ebuild 911 BLAKE2B 89780f9562a124f3fd90ba39a8e7d82c8008acb819c4c064ab579acd397f4ae00b9d4da86a048d81f2d3f381dee17a9b004a02b4f76dee8dd7156b935bdcc358 SHA512 312739c7fd601f936d14f8ee920154e9d9814fd27c91cac4f64015501ecff05371859ba23322d996b591e1185eb3223cbd26883094ae553a791a73b198e00f12
+EBUILD prelude-correlator-5.2.0.ebuild 960 BLAKE2B 86f6e65e18e9c191cc7b113df6af2685851035681cc969bd9dc050c67a6635aaab54ff14b5f71528676528c81845082fe63ad5be816f2af9ca884596892d4fd8 SHA512 2cb32c632cfd85cb6e38b2f40b930b7b15e73f9b5b8940fc3c02e47eb08c0823fd1e0205d2287af0c753fc069eee250ac5e0baee4e94a736942d63b44ad6f059
 MISC metadata.xml 854 BLAKE2B e16af36fd906bd519bd60d82628e1d75c5f27e1da3a5d59c71c4385fcfbfdc5b288f3d56473ba009e151b718516ab195976a845645a840c8c9bbfc613f49b348 SHA512 d336ad2f22f859c19cdaf0cab481115cacd818b85b8c5fad469b388477bdd772d506f56b2214b0a4ac0bf2868c57d26fd9fadd7f32fd04279c04196fe2ab5d96
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
index 62f46b3c3ace..359b4c7a6bfd 100644
--- a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
+++ b/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
@@ -35,3 +35,7 @@ src_install() {
 
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest
index 7b2671ff6e64..9521658214ca 100644
--- a/net-analyzer/prelude-lml/Manifest
+++ b/net-analyzer/prelude-lml/Manifest
@@ -5,6 +5,6 @@ AUX prelude-lml.run 125 BLAKE2B 79cab33e4b7f2508d621cef7342d34042e5841a73c2e75aa
 AUX prelude-lml.service 297 BLAKE2B c1ecbb3f69c21ccd82f7c985598a3cfcf5313d9004d9bc1b9f7dc911b54a51ae1aa0870c5fe236ef1473254196aec34391b838d928bb3c0d1e7ee92f131abcd5 SHA512 0faa91b3736fe111b08fdd3f03829c35a81133cfc54e677ebc423d4d9a29113744253fbee12f9b531494f2f39b549df54eec4cc5c7363375443113277fead87a
 DIST prelude-lml-5.1.0.tar.gz 1585080 BLAKE2B 572a3bf2b013dc3f427f7e3a4cc650219945a0e481e10f9f8f8e6afac75c86db5319fd16f1bf9157ede55ae511ce5151a0fe63694d0b8cc2becbd6430521fba3 SHA512 248434352c340d9979051897190fc7fbe835c7b1f2411ec98a04cbf0bebb6f115e80ca854d35ab2b2f50722c052eea10e088e4557ca4218f0dfed21ae21109ae
 DIST prelude-lml-5.2.0.tar.gz 1584414 BLAKE2B c97a730e366cdf0663ad6393acc0125d01995bd1339f4538a1dd62c2aa85e46dd78e3e279067a2bac328db675b5de59cebb8474bdafbe00d745320d360124535 SHA512 45de2dea196941086a690b3081b98253a3d9685552a25f39cf3b92d3b223c5a9d98057f855da1f23fff7aa425fd832e6021050d2d7fe58322c4f3f48c34394b5
-EBUILD prelude-lml-5.1.0.ebuild 1075 BLAKE2B 784e15f5493576d8a1c7b432159be81aa0cda97e9be3e5a8f919cd6f7333e9ffdb1eb3d4ace32d6be587982df243aa5d7bc11dcc67cf209654af9c5cf70e6e1f SHA512 1de5bc8adea9fab6044c957433a73c5ba5315c800afa8cb4a06d6336d3a5c8cf6a84cdcf2a9d81a063e6f061fbd99d1a8de76a68aac99f96338d744a91d6869b
+EBUILD prelude-lml-5.1.0.ebuild 1124 BLAKE2B a8a7c9e876f50c83e9c5134f6b6a1f61a1f70c0b460edfa00561a9b606fd9a93768651dfc8c029826dae35934a8a81ff71377cf60e27f36dcaaa43896aaf5f78 SHA512 599c15735a6a1255620f86d546ffb1b0825c3c072484f1956e5eab6bd888f42fc5a41deacc2979f4d0d9ac1b0ede39c2a37301a772b290cb77992abe05654edd
 EBUILD prelude-lml-5.2.0.ebuild 1166 BLAKE2B 5efaa9bc573a8af072bb2727886c9e49fa10e222fd5b1793d4d884b4c51fa5629396c6e95fc2681a85e4c6a74ea09f61a9caeb19824be7e570af5781da5163e1 SHA512 be81fec712f3076160d5d584173f0f1edbe564b755523985e5236d2c04316ec1e6e6ab8a77d3f75346dec1a1f89809a07af5c9b4459af00b71e57ae4378c92f1
 MISC metadata.xml 765 BLAKE2B 9f85da7f3df6def91ca41f8bf45437bb8ea8d773c1a45140719d7112271294d87234752a8319be0e79b909c0d20b18cc91cc9aa67d2c5abe101e54a1a2574c7d SHA512 36bec921d2b2e315343c8597b1ee3408efbfac0ff660838f5aa4feec6f20b22dca9d07d679d4df9bf887552026ce3516732e28d1cc9efd50d07bce745d69b671
diff --git a/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild
index d397625a92db..26fe70882eec 100644
--- a/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild
+++ b/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild
@@ -57,3 +57,7 @@ src_install() {
 
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 3f50ba420da4..925d5a850f27 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -3,5 +3,5 @@ AUX smokeping.conf 32 BLAKE2B ea64af0cebbb847c89503b3d893c902ab2d761afbce6594731
 AUX smokeping.init.5 1360 BLAKE2B 4213a42dcd43c1166c5f10d287c9e50be37265f8be6db3a8b9e18351dfbe7259a8ca98eff044cd1c7ef657356e3960e60745aea63a79bdc73fd009b3bd746bd7 SHA512 64adf577c9d7d79c268cf46c40ed7db23c93cbd49897070d9028ee6636794b1c101d1a9d1ff6f92c24512e18bf0f06b10b67117090918920fb8b8189dec85d4f
 AUX smokeping.service 200 BLAKE2B 77110386e5d304c04d00114800c1f42bb5e8b5ce1eab419afd2fa7c59c1a569fe244c7f7c18e01519d82389bf66f5b6935dd212b3bf68ace9b480e981c311001 SHA512 2f8824143b8283ad02274107c5ed0e84f0c1465fc089823e36ef44a42fec68564d8cc4ff5fb0ad6dc0443e21fac5a8cbcbb0a9bea151b57efaff2a082d15f344
 DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830
-EBUILD smokeping-2.7.3-r1.ebuild 4020 BLAKE2B 4bd615ccfeb02ead87f489c2fed34973359bb0922337d7386f2c4053e5ee325e6949d220058ef1e84e94613c7f43bacbfa48e720ea278307bd1aee2a13b18d13 SHA512 951cdd387b25a9a918e01dc6d959b129ba4a9be9fe9dc3d487d3014720dd7acf2faac9a276e13b74d0813ab7dad5ca4e8e391c8ed16970b4ddf3995f0babd9a7
+EBUILD smokeping-2.7.3-r1.ebuild 4069 BLAKE2B e184cf1644685eec1f6dc077304cbe95902b60a35ee47c3542943837f72d24579297986195d8c4a1ff63923970d86c155cdbd24b353a8dd69825d1b6fb6b18fe SHA512 d67b8fe64ba07aeeb047cafdc1a3d54df0e581ad7bbce2ee8b8b31c7e85f7197ec4c872c4ce62a4642e3b0394f720423239cc4af6bbcdda91fd678299de2a8a1
 MISC metadata.xml 468 BLAKE2B d219af56f99fd891f8990b2298c9daa86d8fa3f8433b04eeabab1d47492a4ba186906a265612422517f9fb373217473fd047412dc08b7b1bf3f2aaccc92ec2d9 SHA512 0ca877d24981625a5d601cd19fc18fe37b48526c7266c248ee0ba955ecc873b31ea5f06d3feb692566d228a481193fab1f70c53aaa0be089aee490d80f80e815
diff --git a/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild b/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild
index 497f430571fb..26e3c02ce8a7 100644
--- a/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild
@@ -137,3 +137,7 @@ src_install() {
 
 	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 38aa01ae2ddb..f340b73f8b4c 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -8,6 +8,6 @@ AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee35
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
 DIST suricata-5.0.7.tar.gz 29211384 BLAKE2B 939e672d9df61863c7adcc4bf52f5620e3760f0d6178362828474b1a72c4e3a69bf1ab52a3220c0069ae5a545c56307553c2796166af488a72a25dddd68782a8 SHA512 dce3929c796e04778eb9437bd4c7203aa9dae56be0baa4b7d986d3eedff3bfc71aa2886ecdeed9d87ec3d88cd3060ff8ef01540d15eb857698a2c4696da5899c
 DIST suricata-6.0.3.tar.gz 32421197 BLAKE2B c1b339823f2caab73aeb82f96fb703834cd3ca9f0f60662cf340cbc36734aea47106d49869bd70cf3acb419e954ca37bcd22ad1b2d789597bf36f8fe7ceebe11 SHA512 186b871959988ca7cbd0d69e725aed18af915f93363c7ecc0ffa20d8ad8f50a326be08452d085772b1df84ef25258ef0dd6b35d41b0988cb1c653e60aeb103a2
-EBUILD suricata-5.0.7.ebuild 6298 BLAKE2B 1a476c96d3148077c7e828b8d51b46a3101f40b1bbe7d0ff99d147a2dede4a545eed0a81216159cc28351adc77f9fffeae5ec79d68e2d24f296da6ebbfaf8785 SHA512 fc793b67f9d7f14c99e0d81d4b229a667cdaf0efd35a6c8879e19ca42e3ed6a1dfe8197e15108bdd492d05323c7703c593a5c76e2414ccdf4a90ad934780a6d7
-EBUILD suricata-6.0.3.ebuild 6574 BLAKE2B b738ad0c1151bbc68464443557d02b8d44395e94f51116f80cdd62cdc39acbac6e583d06e7da14be75670c87cff0acb1780b94622b0bca9e9bcaf554582f325c SHA512 858d9be588774b6ab7659b08ef33280de3d0eec8595ac75d8da7f24301c03fbd79a34c9e09252170f49ee3722b8bc369678389b29e5c7c66f3965e028b715d31
+EBUILD suricata-5.0.7.ebuild 6328 BLAKE2B 663b792d20371e5333293365db2070a253285a19e72b1accb12b88cbbf68bb7a143a1cf201820c4d328688ea4781ba9ab9a5d61a83eb6d59139d6ff99421c7dc SHA512 5a45c6fb2528cb9d130b95d76795b2daa89876f71dc8016bfce6c95e7d1cbb02e3c301050726d4ff1cb2bba04b04fde97573b0460a63574069e3cb369187581b
+EBUILD suricata-6.0.3.ebuild 6604 BLAKE2B 0095c03b426f8e0b0245446427e1620d2bc21c8c1629bbb28c9827e332b8627d36dec6b9a7b078181913202635f596bd562de92a3fb1a6c78d4e89498048b085 SHA512 fc3faef17001e3ccb9764248306fc7f9b81361c750168982ba13e46685bb0a898860b0dfeeb4141590fd93b3898ceb079a0e2f69f95bdce0dd035898aa470574
 MISC metadata.xml 958 BLAKE2B 944628811fffa8d4c801dfab169a83b31fbca9d5e6c52a7aaf7131b56118bd53e9360002fc5e335253f9bab7c434c2f4defe44f4f1bed00fabc9013454f24c14 SHA512 b077688adea6058d1249a025898c81289ce04f47f6fd2684d8a2aa8e4494f994d68d07393097b1181add90d8f87c62e07e6717e08e3d4a0ebf9c1109859ef551
diff --git a/net-analyzer/suricata/suricata-5.0.7.ebuild b/net-analyzer/suricata/suricata-5.0.7.ebuild
index 50b8ba84db3c..b2e2f7e436d8 100644
--- a/net-analyzer/suricata/suricata-5.0.7.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.7.ebuild
@@ -147,6 +147,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	elog
 	if use systemd; then
 		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
diff --git a/net-analyzer/suricata/suricata-6.0.3.ebuild b/net-analyzer/suricata/suricata-6.0.3.ebuild
index c6dfbc4f14b8..6b5b71ffe43b 100644
--- a/net-analyzer/suricata/suricata-6.0.3.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.3.ebuild
@@ -147,6 +147,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	elog
 	if use systemd; then
 		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 7bc0031d90e9..cd045b5371cd 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -6,7 +6,7 @@ DIST tcpdump-4.99.0-upstream.tar.gz.sig 442 BLAKE2B a6cafbccdc1ecfb236a643b72114
 DIST tcpdump-4.99.1-upstream.tar.gz 2014324 BLAKE2B 0a10fe68afdfe80d3e7e661352fcaf1c47702df27fbed959f52fb0ec81543a1d4ce6b0de16a8b081de48dd43e09a13f5e1f0fb11d7590f92cbff29dc511bea12 SHA512 53d31355e1a6ef5a65bb3bf72454169fc80adf973a327a5768840e6ccf0550fbeb3c8a41f959635076d871df0619680321910a3a97879607f481cdaa8b7ceda7
 DIST tcpdump-4.99.1-upstream.tar.gz.sig 442 BLAKE2B 9a80b1796ef777bd06d0b8953fe1ff446431d0ff1dffcd58e29a0b771f6734f70f3f0da7c36a1eaa1b6e57719d79c601872a84b7734208a7e8951cad9aca86ee SHA512 b438643701efbbb5579d9d51ed48756a47dd644e0acb10b0edff6d04f3ae4cea6528b40820a656407b73f983b2a634e0165a6c8c0fca3b557394a14e2f2384ab
 EBUILD tcpdump-4.9.3-r4.ebuild 1700 BLAKE2B 807df788ac7f23cfe14a7c8116607bdb8bbdf346df552feeb8b72bd23f6f4867b8701e2b72ff585be5f5a658c12cb1dc955d205437bf9ec80e5e969c9aa7103b SHA512 4f1ea4403015d9b0e01c155f0df4695c4e71a997ac2e35334f3cb2f9cdff6f79dc23e29a963d9305c3d946b98dbd59ee45a22e91c0de13bdac502511bf1b65ef
-EBUILD tcpdump-4.99.0.ebuild 2299 BLAKE2B b12600c20ca80aed3aef1c0206be94cd61cfca8a4ecadb25f1de82b748d416daaa1772533c688a06a609edc4d8fc19f6b526041f6d57a6da8210974cb743cf1d SHA512 8eaed7d2f02b9e1fd3d517f09fce49a5e46c60e027f951a61c2ef7cf2bc51b3c8e2def33703a1104e48f12f02cdd633895f7d83bddb871b1c8ca082d9222c436
-EBUILD tcpdump-4.99.1.ebuild 2334 BLAKE2B 7ec3017043221b173eb62ad5d824bc3f2d520d8a48de773d5497ff9992b6ac93b5722ec7512ac4490db6720ad82ced3de68a8925bac4ba1e04ac6164f4df7bab SHA512 bccac4cde5f83a40fcc30b947db4b5605d96d3dc55d99f67ce52a0a030a02dc76f5f52e28caeb77a429e12df701c4b5975c784bc201f5098e1263911d38f463f
-EBUILD tcpdump-9999.ebuild 2144 BLAKE2B f1291e3a4d1f0244dbe4a7e80b40b9ce1f44b5d1f5e76a6888f4cbf77c704497bc316e25f8785faa75319e658e3f162dcde20ce86e2ba497481dfae0c7def580 SHA512 5a64ffdb86df8529d264554aa097cd824e5c26690a9b1a258f5b56238f6af5ee80920109cd1c9e3c128eeb0acfbceffb889ecf2a1310865615c73da1186a3c0c
+EBUILD tcpdump-4.99.0.ebuild 2307 BLAKE2B 229d12e8a50be64a4987639fea0483c6438e79b9319c34aff770c5ff3d7048248dc8d43503e32ba608954d6f3f9fc65d76968e1f12d19cc1f67d7fc64f09482e SHA512 6eaee5aae61523f951608def16cce4e8ff34d74be950e033c6054eb4d2b27a7bd44a95c25e93c70dd0339c5a53010a9c0462a48e983b34d8336b09343218011c
+EBUILD tcpdump-4.99.1.ebuild 2342 BLAKE2B 280d9abad4d57f130518fea29ccd9f94a7587070e476d04a0805c86751ac993d26e255e30694b35f1e61e8614d22bf1d0cfd572220e08da2764bc66d533f3bcd SHA512 98b8ab6b95fc1fec71d7f2af31ef231addd5146e090b0c64d4265b4a5967bbb75a8dbc66637a50e1139f405ed576c37d6cbfd81ae0b4a55b69a26629b4b63c96
+EBUILD tcpdump-9999.ebuild 2152 BLAKE2B 826b40b6b1993e92e19d3be108c8118789304a541b0d2bd969c88b08d32a177e87ef9d8c00f43208128dc44c1458700fa18474f889ad5f5174b6583c84e43209 SHA512 df08352120690b76ba132a5087d39605e7ae0502e20ab9e0e5ecd9fd6a2585622a6ffe6f542dfa279f54e37fcd564c32fc5b9941c83de0fbb0c57553db111444
 MISC metadata.xml 700 BLAKE2B 75eb9e5a825df6e9f4d4ef871e18eeaf6960ee25bbb42d5cb4bcd78775a7ead3ca45c76dd54ccee34c30e56d39303ee4d374a13bbaf449cbcf72242b7c9306f0 SHA512 c248231c288d69b2f71e86054095b599d72e971b9f8e67bacd851907b70b6a252fbf85a47f2b7f0cd3422ec7ef69410e2b3dbbe6de6b96320718dd5400900c74
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
index 99b6d4b9e939..bfc246ebfee4 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 
 	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
 	inherit verify-sig
 
 	# Note: drop -upstream on bump, this is just because we switched to the official
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
index 722dbc5dde2e..80191305e0e5 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 
 	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
 	inherit verify-sig
 
 	# Note: drop -upstream on bump, this is just because we switched to the official
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 2fe0728499d4..748778bb057c 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 
 	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
 	inherit verify-sig
 
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
diff --git a/net-analyzer/tracebox/Manifest b/net-analyzer/tracebox/Manifest
index 647acd59bdde..cf07fe1e1d3d 100644
--- a/net-analyzer/tracebox/Manifest
+++ b/net-analyzer/tracebox/Manifest
@@ -1,4 +1,5 @@
-AUX tracebox-0.4.4-deps.patch 5159 BLAKE2B cea5cfb75b407c7e9a88062abc931ae27b7f5022e586ee7f811129ac2b5c5a54a61b6a0ce71961ebf6102d1b53087e91260cfe4d8f6622d78e98e87408c2d64b SHA512 a87ff6ef0079f99241dd975d1fcb1bb3d1c2a0a623af1932d9a00b45b6d70b403e34f8dbc07551cda55707d5eea5e48a7bb7ac931474efe6186937942a769761
+AUX tracebox-0.4.4-autotools.patch 6324 BLAKE2B 26a9e8df24323a05b16d6a97e24d06c2d7aefb48533b2ac5ef5f4f15c5900c8870e0a28bbfe669223ea5b794dc91ae59f17304d31fd0fd4c1d119d7aeea4ad9e SHA512 cc4fd3acfed4f8914e7aea87a5a8be177bf13ebdd920c9ff468a2f33e154eaaa5e238e4dfc4d1cb222128a6c5c974de117633250daf6c071b6468e7f07ccd29a
+AUX tracebox-0.4.4-include-crafter.patch 995 BLAKE2B cbc16ee7f29d76b5dec03c4bb332b4155fa93a04a32a783ba4976c81262f481aa2a09b3df1e22e2b94e457016e3f16a927f41f7ec50749bc5ffc822370182c00 SHA512 6164cca291ff982556785051f0d4ed418221aea6701b3a66d32fc36d69c39c9e8c7e74ed06bed938628651e67ea9d24554e848582cdec19ebe9b03ba4104703e
 DIST tracebox-0.4.4.tar.gz 76828 BLAKE2B 0c3fbe9ea3fd5a967c85cf7b175900d899885f6c43ca8ffa32ba98256490b5bc23e8f80618208df6ec05f0484e5ce27599528aa5d84e331ac71eca960b6b1fd0 SHA512 2113d6ed4543b0c3a9b44bc92c4eb8ab2a860b4409a5eba374b9960ddb4ba299a33c0dea49595c94bc725eda36633d8bb698236d662ea9cc1027070b597c52f6
-EBUILD tracebox-0.4.4-r100.ebuild 1250 BLAKE2B bebc05ecba31e0b71f2e3548e490227a0552d9235c491ef5d2568aa83b2ef5eee88a0c969104d8202098c047f1e9db5f0386fe768c75edf8dd67b51f51cb6a84 SHA512 ec6c1125325177e9e1f15afaadfbf557072d54ddff5b9f01f0f8a0a658a24d46d76f120aa28b86fead73c54e66f1311f3d6139685a734a4e07f86e40faff677c
+EBUILD tracebox-0.4.4-r100.ebuild 1083 BLAKE2B fc5145dd9d37a579497f6fdee4720096f13210cb203a661b65be0cc09fdb9f34026ec5e37505d4dbea69b445f959706519b95f59be63159c7ee36aea3a053cb9 SHA512 d2fd07e88ceec0ddda22bb4de8c9847a00a0aaafd4f59e52194400e9fb98731d69fd0019960e1549e4db108a89ba73a1c8ad78c31be52890cf1647181e10cd5f
 MISC metadata.xml 575 BLAKE2B 513c1e0904b220151dc961251b8b93223017d423d67c194d4af8ac03c73d4d4d023b377b2b95b7a5a730c8bb6a722669ed4defb2cc822c5ffa69a39d7c380775 SHA512 3b56de905ff16d563e9d69b1306950dcfb5097ed04a1aab5bc69db6242804ad9e5172c4d19f610daaa109bae97871342ef29b037b8e8f8b96bc42b3f5f543856
diff --git a/net-analyzer/tracebox/files/tracebox-0.4.4-autotools.patch b/net-analyzer/tracebox/files/tracebox-0.4.4-autotools.patch
new file mode 100644
index 000000000000..612132d157f4
--- /dev/null
+++ b/net-analyzer/tracebox/files/tracebox-0.4.4-autotools.patch
@@ -0,0 +1,214 @@
+- do not link to bundled
+  * dev-libs/json-c
+  * net-libs/libcrafter
+- allow different lua versions
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,6 +14,8 @@
+ AC_HEADER_STDC
+ AC_HEADER_ASSERT
+ 
++PKG_PROG_PKG_CONFIG
++
+ AX_CXX_COMPILE_STDCXX_11
+ 
+ # Checks for header files.
+@@ -32,40 +34,14 @@
+ AC_FUNC_FORK
+ AC_CHECK_FUNCS([gettimeofday memset select socket strtol])
+ 
+-AC_ARG_WITH(lua,
+-[  --with-lua=DIR      use lua in DIR],
+-[ case "$withval" in
+-  yes|no)
+-     AC_MSG_RESULT(no)
+-     ;;
+-  *)
+-     AC_MSG_RESULT($withval)
+-     if test -f $withval/lua.h -a -f $withval/liblua.a; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        LUA_INCLUDE="-I$withval"
+-        LUA_LIB="-L$withval -llua"
+-        LIBS="$LIBS -lm"
+-     elif test -f $withval/include/lua.h -a -f $withval/lib/liblua.a; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        LUA_INCLUDE="-I$withval/include"
+-        LUA_LIB="-L$withval/lib -llua"
+-        LIBS="$LIBS -lm"
+-     else
+-        AC_ERROR("lua.h or liblua.a not found in $withval")
+-     fi
+-     ;;
+-  esac ],
+-    [
+-        AX_PROG_LUA
+-        AX_LUA_HEADERS
+-        AX_LUA_LIBS
+-        if test x"$LUA_LIB" = x; then
+-            AC_MSG_ERROR([Lua library not found. You may try option --with-lua-suffix.])
+-        fi
+-    ]
+-)
++PKG_CHECK_MODULES([LUA53], [lua-5.3], [LUA_FOUND=5.3; LUA_INCLUDE="${LUA53_CFLAGS}"; LUA_LIB="${LUA53_LIBS}"],AC_MSG_WARN([lua 5.3 not found]))
++PKG_CHECK_MODULES([LUA52], [lua-5.2], [LUA_FOUND=5.2; LUA_INCLUDE="${LUA52_CFLAGS}"; LUA_LIB="${LUA52_LIBS}"],AC_MSG_WARN([lua 5.2 not found]))
++PKG_CHECK_MODULES([LUA51], [lua5.1], [LUA_FOUND=5.1; LUA_INCLUDE="${LUA51_CFLAGS}"; LUA_LIB="${LUA51_LIBS}"],AC_MSG_WARN([lua 5.1 not found]))
++PKG_CHECK_MODULES([LUA], [lua], [LUA_FOUND=5.1-noSLOT; LUA_INCLUDE="${LUA_CFLAGS}"; LUA_LIB="${LUA_LIBS}"],AC_MSG_WARN([lua 5.1 not found]))
++
++if test -z "$LUA_FOUND"; then
++     AC_MSG_ERROR([lua 5.3, 5.2 or 5.1 is required])
++fi
+ AC_SUBST(LUA_INCLUDE)
+ AC_SUBST(LUA_LIB)
+ 
+@@ -121,24 +97,12 @@
+ AC_ARG_WITH(json,
+ [  --with-json=DIR      use json-c in DIR],
+ [ case "$withval" in
+-  yes|no)
++  no)
+      AC_MSG_RESULT(no)
+      ;;
+   *)
+      AC_MSG_RESULT($withval)
+-     if test -f $withval/json.h -a -f $withval/libjson-c.a; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        JSON_INCLUDE="-I$withval"
+-        JSON_LIB="-L$withval -ljson-c"
+-     elif test -f $withval/include/json-c/json.h -a -f $withval/lib/libjson-c.a; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        JSON_INCLUDE="-I$withval/include"
+-        JSON_LIB="-L$withval/lib -ljson-c"
+-     else
+-        AC_ERROR("json.h or libjson-c.a not found in $withval")
+-     fi
++     PKG_CHECK_MODULES([JSON], [json-c], [JSON_INCLUDE="${JSON_CFLAGS}"; JSON_LIB="${JSON_LIBS}"],AC_MSG_ERROR([json-c was requested but not found]))
+      AC_SUBST(JSON_INCLUDE)
+      AC_SUBST(JSON_LIB)
+      AC_DEFINE([HAVE_JSONC], [1], [Using json-c])
+@@ -153,41 +117,7 @@
+     ]
+ )
+ 
+-AC_MSG_CHECKING(for libpcap)
+-AC_ARG_WITH(libpcap,
+-[  --with-libpcap=DIR      use libpcap in DIR],
+-[ case "$withval" in
+-  yes|no)
+-     AC_MSG_RESULT(no)
+-     ;;
+-  *)
+-     AC_MSG_RESULT($withval)
+-     if test -f $withval/pcap.h -a \
+-         -f $withval/libpcap.a -a \
+-         -d $withval/pcap; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        PCAPINC="-I$withval -I$withval/bpf"
+-        PCAPLIB="-L$withval -lpcap"
+-     else
+-        AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval)
+-     fi
+-     ;;
+-  esac ],
+-[ if test -f ${prefix}/include/pcap.h; then
+-     PCAPINC="-I${prefix}/include"
+-     PCAPLIB="-L${prefix}/lib -lpcap"
+-  elif test -f /usr/include/pcap/pcap.h; then
+-     PCAPINC="-I/usr/include/pcap"
+-     PCAPLIB="-lpcap"
+-  elif test -f /usr/include/pcap.h; then
+-     PCAPLIB="-lpcap"
+-  else
+-     AC_MSG_RESULT(no)
+-     AC_ERROR(libpcap not found)
+-  fi
+-  AC_MSG_RESULT(yes) ]
+-)
++PKG_CHECK_MODULES([PCAP], [libpcap], [PCAPINC="${PCAP_CFLAGS}"; PCAPLIB="${PCAP_LIBS}"],AC_MSG_ERROR([libpcap is required]))
+ AC_SUBST(PCAPINC)
+ AC_SUBST(PCAPLIB)
+ 
+@@ -234,17 +164,7 @@
+     AC_CHECK_LIB([pthread], [pthread_create])
+ ])
+ 
+-# Make sure libcrafter build a static library by adding the --disable-shared
+-# argument to the configure script.
+-ac_configure_args_pre="$ac_configure_args"
+-ac_configure_args_post="$ac_configure_args --disable-shared"
+-ac_configure_args="$ac_configure_args_post"
+-
+-AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"])
+-AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"])
+-AC_CONFIG_SUBDIRS(noinst/libcrafter/libcrafter)
+-
+-ac_configure_args="$ac_configure_args_pre"
++PKG_CHECK_MODULES([crafter], [crafter], [LIBS="$LIBS $crafter_LIBS"],AC_MSG_ERROR([libcrafter is required]))
+ 
+ # Enable click submodule
+ AS_IF([test "x$enable_tests" = "xyes"], [
+@@ -254,7 +174,6 @@
+ 
+     AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"])
+     AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"])
+-    AC_CONFIG_SUBDIRS(tests/tools/click)
+ 
+     ac_configure_args="$ac_configure_args_pre"
+ ])
+@@ -271,7 +190,6 @@
+ 
+ AC_CONFIG_FILES([
+ 	Makefile
+-	noinst/Makefile
+ 	src/Makefile
+ 	src/tracebox/Makefile
+ 	tests/Makefile
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,8 +8,8 @@
+ MAYBE_DOC = doc
+ endif
+ 
+-SUBDIRS = noinst src $(MAYBE_OPT) $(MAYBE_DOC)
+-DIST_SUBDIRS = noinst src tests doc
++SUBDIRS =  src $(MAYBE_OPT) $(MAYBE_DOC)
++DIST_SUBDIRS =  src tests doc
+ 
+ debian-package:
+ 	dpkg-buildpackage -rfakeroot -tc -us -uc
+--- a/noinst/Makefile.am
++++ b/noinst/Makefile.am
+@@ -1,4 +1,3 @@
+-DIST_SUBDIRS = libcrafter/libcrafter
+ 
+ all-local:
+ 	cd libcrafter/libcrafter && $(MAKE) $(AM_MAKEFLAGS) all
+--- a/src/tracebox/Makefile.am
++++ b/src/tracebox/Makefile.am
+@@ -4,7 +4,6 @@
+ 
+ dist_man_MANS = tracebox.1
+ 
+-dist_bin_SCRIPTS = luatracebox
+ 
+ SUBDIRS = examples
+ 
+@@ -78,13 +77,11 @@
+ 
+ tracebox_LDADD = \
+ 	$(EXTRALIBS) \
+-	$(abs_top_builddir)/noinst/libcrafter/libcrafter/libcrafter.la \
+ 	$(LUA_LIB) \
+ 	$(PCAPLIB) \
+ 	$(JSON_LIB)
+ 
+ tracebox_CPPFLAGS = \
+-	-I$(top_srcdir)/noinst/libcrafter/libcrafter \
+ 	$(LUA_INCLUDE) \
+ 	$(PCAPINC) \
+ 	$(JSON_INCLUDE) \
diff --git a/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch b/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch
deleted file mode 100644
index 43c0132a49a7..000000000000
--- a/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch
+++ /dev/null
@@ -1,157 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,6 +14,8 @@
- AC_HEADER_STDC
- AC_HEADER_ASSERT
- 
-+PKG_PROG_PKG_CONFIG
-+
- AX_CXX_COMPILE_STDCXX_11
- 
- # Checks for header files.
-@@ -32,40 +34,14 @@
- AC_FUNC_FORK
- AC_CHECK_FUNCS([gettimeofday memset select socket strtol])
- 
--AC_ARG_WITH(lua,
--[  --with-lua=DIR      use lua in DIR],
--[ case "$withval" in
--  yes|no)
--     AC_MSG_RESULT(no)
--     ;;
--  *)
--     AC_MSG_RESULT($withval)
--     if test -f $withval/lua.h -a -f $withval/liblua.a; then
--        owd=`pwd`
--        if cd $withval; then withval=`pwd`; cd $owd; fi
--        LUA_INCLUDE="-I$withval"
--        LUA_LIB="-L$withval -llua"
--        LIBS="$LIBS -lm"
--     elif test -f $withval/include/lua.h -a -f $withval/lib/liblua.a; then
--        owd=`pwd`
--        if cd $withval; then withval=`pwd`; cd $owd; fi
--        LUA_INCLUDE="-I$withval/include"
--        LUA_LIB="-L$withval/lib -llua"
--        LIBS="$LIBS -lm"
--     else
--        AC_ERROR("lua.h or liblua.a not found in $withval")
--     fi
--     ;;
--  esac ],
--    [
--        AX_PROG_LUA
--        AX_LUA_HEADERS
--        AX_LUA_LIBS
--        if test x"$LUA_LIB" = x; then
--            AC_MSG_ERROR([Lua library not found. You may try option --with-lua-suffix.])
--        fi
--    ]
--)
-+PKG_CHECK_MODULES([LUA53], [lua-5.3], [LUA_FOUND=5.3; LUA_INCLUDE="${LUA53_CFLAGS}"; LUA_LIB="${LUA53_LIBS}"],AC_MSG_WARN([lua 5.3 not found]))
-+PKG_CHECK_MODULES([LUA52], [lua-5.2], [LUA_FOUND=5.2; LUA_INCLUDE="${LUA52_CFLAGS}"; LUA_LIB="${LUA52_LIBS}"],AC_MSG_WARN([lua 5.2 not found]))
-+PKG_CHECK_MODULES([LUA51], [lua5.1], [LUA_FOUND=5.1; LUA_INCLUDE="${LUA51_CFLAGS}"; LUA_LIB="${LUA51_LIBS}"],AC_MSG_WARN([lua 5.1 not found]))
-+PKG_CHECK_MODULES([LUA], [lua], [LUA_FOUND=5.1-noSLOT; LUA_INCLUDE="${LUA_CFLAGS}"; LUA_LIB="${LUA_LIBS}"],AC_MSG_WARN([lua 5.1 not found]))
-+
-+if test -z "$LUA_FOUND"; then
-+     AC_MSG_ERROR([lua 5.3, 5.2 or 5.1 is required])
-+fi
- AC_SUBST(LUA_INCLUDE)
- AC_SUBST(LUA_LIB)
- 
-@@ -121,24 +97,12 @@
- AC_ARG_WITH(json,
- [  --with-json=DIR      use json-c in DIR],
- [ case "$withval" in
--  yes|no)
-+  no)
-      AC_MSG_RESULT(no)
-      ;;
-   *)
-      AC_MSG_RESULT($withval)
--     if test -f $withval/json.h -a -f $withval/libjson-c.a; then
--        owd=`pwd`
--        if cd $withval; then withval=`pwd`; cd $owd; fi
--        JSON_INCLUDE="-I$withval"
--        JSON_LIB="-L$withval -ljson-c"
--     elif test -f $withval/include/json-c/json.h -a -f $withval/lib/libjson-c.a; then
--        owd=`pwd`
--        if cd $withval; then withval=`pwd`; cd $owd; fi
--        JSON_INCLUDE="-I$withval/include"
--        JSON_LIB="-L$withval/lib -ljson-c"
--     else
--        AC_ERROR("json.h or libjson-c.a not found in $withval")
--     fi
-+     PKG_CHECK_MODULES([JSON], [json-c], [JSON_INCLUDE="${JSON_CFLAGS}"; JSON_LIB="${JSON_LIBS}"],AC_MSG_ERROR([json-c was requested but not found]))
-      AC_SUBST(JSON_INCLUDE)
-      AC_SUBST(JSON_LIB)
-      AC_DEFINE([HAVE_JSONC], [1], [Using json-c])
-@@ -153,41 +117,7 @@
-     ]
- )
- 
--AC_MSG_CHECKING(for libpcap)
--AC_ARG_WITH(libpcap,
--[  --with-libpcap=DIR      use libpcap in DIR],
--[ case "$withval" in
--  yes|no)
--     AC_MSG_RESULT(no)
--     ;;
--  *)
--     AC_MSG_RESULT($withval)
--     if test -f $withval/pcap.h -a \
--         -f $withval/libpcap.a -a \
--         -d $withval/pcap; then
--        owd=`pwd`
--        if cd $withval; then withval=`pwd`; cd $owd; fi
--        PCAPINC="-I$withval -I$withval/bpf"
--        PCAPLIB="-L$withval -lpcap"
--     else
--        AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval)
--     fi
--     ;;
--  esac ],
--[ if test -f ${prefix}/include/pcap.h; then
--     PCAPINC="-I${prefix}/include"
--     PCAPLIB="-L${prefix}/lib -lpcap"
--  elif test -f /usr/include/pcap/pcap.h; then
--     PCAPINC="-I/usr/include/pcap"
--     PCAPLIB="-lpcap"
--  elif test -f /usr/include/pcap.h; then
--     PCAPLIB="-lpcap"
--  else
--     AC_MSG_RESULT(no)
--     AC_ERROR(libpcap not found)
--  fi
--  AC_MSG_RESULT(yes) ]
--)
-+PKG_CHECK_MODULES([PCAP], [libpcap], [PCAPINC="${PCAP_CFLAGS}"; PCAPLIB="${PCAP_LIBS}"],AC_MSG_ERROR([libpcap is required]))
- AC_SUBST(PCAPINC)
- AC_SUBST(PCAPLIB)
- 
-@@ -234,17 +164,7 @@
-     AC_CHECK_LIB([pthread], [pthread_create])
- ])
- 
--# Make sure libcrafter build a static library by adding the --disable-shared
--# argument to the configure script.
--ac_configure_args_pre="$ac_configure_args"
--ac_configure_args_post="$ac_configure_args --disable-shared"
--ac_configure_args="$ac_configure_args_post"
--
--AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"])
--AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"])
--AC_CONFIG_SUBDIRS(noinst/libcrafter/libcrafter)
--
--ac_configure_args="$ac_configure_args_pre"
-+PKG_CHECK_MODULES([crafter], [crafter], [LIBS="$LIBS $crafter_LIBS"],AC_MSG_ERROR([libcrafter is required]))
- 
- # Enable click submodule
- AS_IF([test "x$enable_tests" = "xyes"], [
-@@ -254,7 +174,6 @@
- 
-     AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"])
-     AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"])
--    AC_CONFIG_SUBDIRS(tests/tools/click)
- 
-     ac_configure_args="$ac_configure_args_pre"
- ])
diff --git a/net-analyzer/tracebox/files/tracebox-0.4.4-include-crafter.patch b/net-analyzer/tracebox/files/tracebox-0.4.4-include-crafter.patch
new file mode 100644
index 000000000000..bedd0208303a
--- /dev/null
+++ b/net-analyzer/tracebox/files/tracebox-0.4.4-include-crafter.patch
@@ -0,0 +1,44 @@
+--- a/src/tracebox/PacketModification.h
++++ b/src/tracebox/PacketModification.h
+@@ -8,7 +8,7 @@
+ #ifndef __PACKETMODIFICATION_H__
+ #define __PACKETMODIFICATION_H__
+ 
+-#include "crafter.h"
++#include <crafter.h>
+ #ifdef HAVE_LIBJSON
+ #include <json/json.h>
+ #endif
+--- a/src/tracebox/PartialHeader.h
++++ b/src/tracebox/PartialHeader.h
+@@ -8,7 +8,7 @@
+ #ifndef __PARTIALHEADER_H__
+ #define __PARTIALHEADER_H__
+ 
+-#include "crafter.h"
++#include <crafter.h>
+ 
+ /* ICMP message can contains partial header information */
+ 
+--- a/src/tracebox/script.h
++++ b/src/tracebox/script.h
+@@ -9,7 +9,7 @@
+ #ifndef __TRACEBOX_SCRIPT_H__
+ #define __TRACEBOX_SCRIPT_H__
+ 
+-#include "crafter.h"
++#include <crafter.h>
+ 
+ Crafter::Packet *script_packet(std::string& cmd);
+ int script_exec(const char*, int, char**);
+--- a/src/tracebox/tracebox.h
++++ b/src/tracebox/tracebox.h
+@@ -11,7 +11,7 @@
+ 
+ #include <memory>
+ 
+-#include "crafter.h"
++#include <crafter.h>
+ #include "config.h"
+ #include "PacketModification.h"
+ 
diff --git a/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild b/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild
index 63a8ba122cbd..7278ad0ab731 100644
--- a/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild
+++ b/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit autotools lua-single
+inherit autotools flag-o-matic lua-single
 
 DESCRIPTION="A Middlebox Detection Tool"
 HOMEPAGE="http://www.tracebox.org/"
@@ -15,51 +15,37 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="curl sniffer"
-
 REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="test"
 
 RDEPEND="${LUA_DEPS}
 	>=net-libs/libcrafter-0.3_p20171019
 	dev-libs/json-c
 	net-libs/libpcap
 	curl? ( net-misc/curl )
-	sniffer? ( net-libs/libnetfilter_queue )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-RESTRICT="test"
+	sniffer? ( net-libs/libnetfilter_queue )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.4-deps.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-include-crafter.patch
 )
 
 src_prepare() {
 	default
-
-	sed -i -e '/SUBDIRS/s|noinst||g' Makefile.am || die
-	sed -i -e '/DIST_SUBDIRS.*libcrafter/d' noinst/Makefile.am || die
-
-	sed -i \
-		-e '/[[:graph:]]*libcrafter[[:graph:]]*/d' \
-		-e '/dist_bin_SCRIPTS/d' \
-		src/${PN}/Makefile.am \
-		|| die
-
-	sed -i \
-		-e 's|"crafter.h"|<crafter.h>|g' \
-		src/${PN}/PacketModification.h \
-		src/${PN}/PartialHeader.h \
-		src/${PN}/script.h \
-		src/${PN}/${PN}.h \
-		|| die
-
+	# remove bundled
+	# - dev-libs/json-c
+	# - net-libs/libcrafter
+	rm -r noinst || die
 	eautoreconf
 }
 
 src_configure() {
+	# https://bugs.gentoo.org/786687
+	# std::byte clashes with crafter/Types.h typedef
+	append-cxxflags -std=c++14
+
 	econf \
 		$(use_enable curl) \
 		$(use_enable sniffer)
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 09d22b3bce9d..ab05d5d40c2a 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -15,8 +15,8 @@ DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b
 DIST vnstat-2.6.tar.gz.asc 833 BLAKE2B 5e79d1b622dd4d37603a209b78018a3e88f2c404c700e1f439e4b98e2c2dd5bdf26e8ecd3b1b1242e14a725d7839c5a8b3b5448dc27e1f917cbeaf6012546656 SHA512 c643152bec14b70317465f8adc2256b41b8686e106b35ce492ad5030c2d5b32162441ac5fb2f309071da855efdf444076288cf075d8073bad0c0907067366e7f
 DIST vnstat-2.7.tar.gz 287304 BLAKE2B f7b50cccfe4b62bce45751e6029650dc6d8ac7b7925cc4177fb1772c6d842b5201f6834d5e6374016b4c42374660b1c127d5b021adffe873de0a4c484171b6b3 SHA512 3d1674ddb5269d29d4d758551dc3e58fb1858a7dd790914c7d74047443b25d242c91f8ab20bdede9c1b061d6b682d73f3d6c1a8aa656a9676bc33c0ed9b1b2d4
 DIST vnstat-2.7.tar.gz.asc 833 BLAKE2B ae9bb28ccd9f10e7ac0c32e9895140cdd9d8498ef18d9b716ffbed3c6693ff08e5ddb08c377ec009df881f7fc1666f09da48cee75857566bdd4f1a2be30a97b9 SHA512 dd1ae2d94400aee9622c28385a103680ca87abfb66b5c92e8ce7240b97f28e81ac1a9cfc97fff7cd6d3934bfa639f46c835acbf855c7a4a29309946d7cbd80d4
-EBUILD vnstat-1.17-r1.ebuild 1705 BLAKE2B cc7ae0926a5cbd7eddbb7c086daf089923047e5e5e7f970d3f43b99f25a8c308a1a366082e0451976115b1f03b37e99db4a40e2a441f86af5cd204ca80988311 SHA512 ae1534aa8199948b44619b91aefa1bfd1d67b025bc3594ab14e3a963e9786dd5a27e98458bdc2fbe9c3d1ef7d6c302331f5c8e8568207ed7291f3209f7d007fe
-EBUILD vnstat-2.6-r1.ebuild 1815 BLAKE2B 214e211c905fb49fcb9e86e878e996d80f9430eb21eb36a91e32860b6e15ba86794a46fb8a79692715f66cdaf006119fae19f4dec1eb6666a5d9fc740534047a SHA512 2fde65ada54835efdd756ed5ffc2f90aabdd4d28036dd1a195bb6669b61c1e054bab8762aa7f076fc009056989d6ec9db45c542bc8f155c8a04a196af0e16995
-EBUILD vnstat-2.7.ebuild 1827 BLAKE2B b497d9314a79f620a69a73bb56a11b1c9e71b7008714f9a806bcb7a5d911485947e0b30ec21ceef6c2ecd697e1b4ece75489ac5836536d764b393438e9e672b8 SHA512 3c05d6de583a2478d8e82fb57a99f0e67d9061aba9b14c5e7b0419c265694eccda6f2f5a7beecd72be3064912516349357b24c5e2c34354d1748d4b3843b1b22
-EBUILD vnstat-9999.ebuild 1834 BLAKE2B 62d54236a163b5cbff07c2fa631286cd27675f985677ab73138a278eab96bc6780e5be09fc1d3b3a3d9aa3ad89736de1b6fbc462cfbb734c8c956103d3ac0c72 SHA512 ab2ba9bb3a63f1c9b825a82f3914e2debc23907427f232888d21b3d5f6996b51f007f16f4e40559546e302663f0f61b56027eb865cff3cddf1e8c5bd87490f9d
+EBUILD vnstat-1.17-r1.ebuild 1713 BLAKE2B e6a0509d32fc4e01da97664e5917ab3f52936ff64b2355eb3fb5001666ef3cda799b06d9c9371eeec6cc16bfa4f526ed0f16b05604f05dd9d18949175cc944c8 SHA512 3fdf87be74420b698cc5bb3ff61a15d32d2ee0175cb4eabe2b33389364d3a73a32e6e0a618e9ac7fee29af5fe6512b0606e477a37a1c19309d1cdf9bfd69da5a
+EBUILD vnstat-2.6-r1.ebuild 1874 BLAKE2B 13382c3dc9eabd86b0b3f1e078df103e53f623dc6cdd7d30f520b4eee20897a006ff2c19263da66afe5f220f02312f75bfda9c57344d65a28aa10ef19939bec9 SHA512 be34ffdc8d3a3adb5b9a9142563a2d60c8d372a7e0872f57b1a8dfa2663c338d2306a03312c853b2f95388059f83118b886afbcbe489862e7200be163909b9b9
+EBUILD vnstat-2.7.ebuild 1886 BLAKE2B 1bba15cdf65b93fdc053cd97dfc114a75492baa27961a07f12448dc6766e3c9dd20b43f34745bce4e289d59eafc4ad4eb422d7c68e511558007056fee81ecedc SHA512 441cddc095ff8e7e76f25fbb20bef44924cbb228fbb8188ad6b9b04ea66ad0dedd0f888a0e47f4ad6af9b966bbaff7721b4a4a67c19618af19db57db87b38455
+EBUILD vnstat-9999.ebuild 1893 BLAKE2B f53aa75d4ddc29eb5487ac9f82d0c3c3a8652945ce25acd4e1addf45d55821c9c8b32424ad6a4b9075e0dddc05599be803df642f2e6d89a2c5f7a0b3bee225ad SHA512 bdca1b74ac946f48d0c58ca4b65f9b3b782b24584ae99e47c4c451644f5dfea583ec123ef499571addbc52343aae0951b385a7001af254d4a72dc967f689c489
 MISC metadata.xml 835 BLAKE2B 4798aa86fd444665d135f7b2ede84889049113260c965b01999a2f9000c826fefa6877e8d3267a813421df97b2a0076f0718278ad3e0cf376bfc91babaaf87f3 SHA512 1c51f11ba3524329dec2101494c89d26859eab16e862e36e49df9240ee3fddf0380bfd929ec1719fc0e21808fc26f381b3be06f5fc89127f4c7e2fd188b3e886
diff --git a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
index 8aa25d8a3276..d66538eaedb0 100644
--- a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/teemutoivola.asc
 inherit flag-o-matic toolchain-funcs verify-sig
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
diff --git a/net-analyzer/vnstat/vnstat-2.6-r1.ebuild b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild
index 3d37feff320b..828e302eae17 100644
--- a/net-analyzer/vnstat/vnstat-2.6-r1.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/vergoh/vnstat"
 	inherit git-r3
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/teemutoivola.asc
 	inherit verify-sig
 
 	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
@@ -77,3 +77,7 @@ src_install() {
 	newdoc INSTALL README.setup
 	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
 }
+
+pkg_postinst() {
+	tmpfiles_process vnstatd.conf
+}
diff --git a/net-analyzer/vnstat/vnstat-2.7.ebuild b/net-analyzer/vnstat/vnstat-2.7.ebuild
index 3582e9086840..5798621a7601 100644
--- a/net-analyzer/vnstat/vnstat-2.7.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.7.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/vergoh/vnstat"
 	inherit git-r3
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/teemutoivola.asc
 	inherit verify-sig
 
 	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
@@ -80,3 +80,7 @@ src_install() {
 	newdoc INSTALL README.setup
 	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
 }
+
+pkg_postinst() {
+	tmpfiles_process vnstatd.conf
+}
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index 189549001483..02ba926a4b8b 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/vergoh/vnstat"
 	inherit git-r3
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/teemutoivola.asc
 	inherit verify-sig
 
 	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
@@ -80,3 +80,7 @@ src_install() {
 	newdoc INSTALL README.setup
 	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
 }
+
+pkg_postinst() {
+	tmpfiles_process vnstatd.conf
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 837ed09592d8..0058d964a413 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,6 +4,6 @@ AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361f
 DIST wireshark-3.4.6.tar.xz 32304604 BLAKE2B 17eb721dd56482e856b10bfb19b3e3f61b9ce4b285415dedcac0b03114969a672b11b975fe2c8c5a56656dc07d744413c3019a2fc38cefa954e735f3cc1162f8 SHA512 eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d
 DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5 SHA512 26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
 EBUILD wireshark-3.4.6.ebuild 7206 BLAKE2B 4808491b469daf8b3185292bcfbbe215a9f32abd4ab0d0f4f78163633524b7b2457b17dc109a653a2ff2aa3f296aa7d9284bbf90c379e593e4bb33e1a6e81675 SHA512 5308aaf15324c020d1fa5bb68ba366f1dc686e0f40b1ea203cd1950cbcaa6e678380c0bc8bf24ec644649a07e364d8318b131cc234db94be2add86046c4626c7
-EBUILD wireshark-3.4.7.ebuild 7207 BLAKE2B 3445aa9ca7457f02b265d1ca6216e27d0f16def6be35d7cd727d8d7bf9abc7b6e9e1bd85a8caf2a67b50b94a02b3150e8cd5b8a0f64f10ad40c863b6c06546c9 SHA512 e7c5fe35695e948dd9ef53a23693735d37e3a0e5b2f273d4b0a0894f3a3c63fd904861ca8ed8387c298d92188310f10cc9075af9de877a67807842b996dc52f9
+EBUILD wireshark-3.4.7.ebuild 7206 BLAKE2B 4808491b469daf8b3185292bcfbbe215a9f32abd4ab0d0f4f78163633524b7b2457b17dc109a653a2ff2aa3f296aa7d9284bbf90c379e593e4bb33e1a6e81675 SHA512 5308aaf15324c020d1fa5bb68ba366f1dc686e0f40b1ea203cd1950cbcaa6e678380c0bc8bf24ec644649a07e364d8318b131cc234db94be2add86046c4626c7
 EBUILD wireshark-9999.ebuild 7211 BLAKE2B 2b907655ef70a51ea09d2e597b84e625b9bf75ea3a23c44768176402dc17a6ed3732bcd6c5bec2dd53e4054920402b2412d2dc28aa0a9666dec990cce66624d3 SHA512 20443697c5a2ed143a16d4327bc1af599414beaac337aef6bd77bc6236a39a2d7f862aeeb42007df91a844a1a70d83403b0a82ae2678653bf4c65f4254c82948
 MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba
diff --git a/net-analyzer/wireshark/wireshark-3.4.7.ebuild b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
index a10e188cd194..234f78724444 100644
--- a/net-analyzer/wireshark/wireshark-3.4.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 8ab7ee2d23bc..ba479f5a9088 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -273,12 +273,12 @@ DIST zabbix-5.0.14.tar.gz 21159722 BLAKE2B 627e64138335b2a3b679a69f21d778df1eb5b
 DIST zabbix-5.4.1.tar.gz 23830541 BLAKE2B 93d39c69798dd593a77f2cd0046818763bda6d07ea43295d0fd9cd6d21a974d46f3783649fa63878e85c70e6b7cc6284ea88df2503d5011365641cd58dba9cbb SHA512 d9533bc2fac816a6c5e18462c509fb6307409528979f56cdf03085801c01d6ff17251cbcae83cc2158f944dd9302d429746e39ca669483e442474c51d6caab33
 DIST zabbix-5.4.2.tar.gz 24085572 BLAKE2B 0a2f7d645906b7df4dfbd3846de483ad5a9f8e9328daa212cbceb139d71418bea3b7af3a4426a6e2b3a55bbb8d42817ffc79d948152a2eb06ec97ec264efa8bd SHA512 c5ceaecc77d641ba656b52ab335fab664eba093779cbb882dea7de6e2e70be3c5d50f8035f1c709a8e244729f7d2181204e1337ae96b078ec3f08c9adb10bb1b
 DIST zabbix-5.4.3.tar.gz 24190581 BLAKE2B c757739b4ed4b8ab233c41b1311a2b7055530b7b19ec3296265cbbd04ad298e24c46605e4f996758021c74526fbfbcf9a58c7aa00a746f50a2f35bf67130b9ed SHA512 8efa043237a9e7cab3c26c300ca177746241602bf156e01ee6fa31d15d71677d6b4efe9bf9cffadc419e98c44ff3a179370b851b55a78dce9b4b4ee4d8c287c1
-EBUILD zabbix-4.0.31-r1.ebuild 9437 BLAKE2B f57c675a872a6a0c176b91086ba7b816ca835a887d8592ffd914e36d8a91a59c16b8025f59895163ca0a5125c7208f8eeb1541abb1f6df75d004a5a09522bdf8 SHA512 6275f6e866202146f148d903b982acd326c52aa802833cc4fcc3da653cfd3ed4ab637ff65857cf73e08f91dfa9dde64fada3ad8ab5aec766078f6a9d1768d6a3
-EBUILD zabbix-4.0.32.ebuild 9439 BLAKE2B 5b8105ee5c68df610474eeec87401927952c673f6f0da783d45a7e75af1df7541ac0a51a2e5db29052f6e1355a0d359c4b7c955827703689c133986cd256958e SHA512 0ca31665694b83574eaa9cfaa267ccf20d0bd3dfe00e2805a480a53c67d2a4d0d98aca25ae673c0ebbece2fca5115ded640d41a70832e9661b919a129ed66564
-EBUILD zabbix-5.0.12-r1.ebuild 32434 BLAKE2B 39beaba2d48e9257397db5fe115e1619af9974c4eecebe8d718fb63c6a8368b6bc944d3d0c8b933e7dea0a3266266c5568fc3c223821a4cdc124b89c9dcd6bc0 SHA512 2adff1e020386cbea1faade1b04eb9bc124476919bfe8e17e5a303d3b3a31905ba1a02a86b062b1afeb61bd06d480cf355396668f30f4807735ca2e5d099641a
-EBUILD zabbix-5.0.13.ebuild 32436 BLAKE2B 08e39e15fe208ea8e6de362267d8d57b7e738ca2fc872e659b25dd5b7257ba6d116b6392795683346b6f0f5bd3e41fd9c6694d625446ad89adcd93f21ee157b1 SHA512 17ea5eba81bc67e5e4af7844f6dfb1e4363e86caf7c804dcad6c458600a29c8e65b91c81cfe43040ab9d9a2918c1bbcd8af70c07a63237b4f1d3e4f8f9d81724
-EBUILD zabbix-5.0.14.ebuild 32436 BLAKE2B 08e39e15fe208ea8e6de362267d8d57b7e738ca2fc872e659b25dd5b7257ba6d116b6392795683346b6f0f5bd3e41fd9c6694d625446ad89adcd93f21ee157b1 SHA512 17ea5eba81bc67e5e4af7844f6dfb1e4363e86caf7c804dcad6c458600a29c8e65b91c81cfe43040ab9d9a2918c1bbcd8af70c07a63237b4f1d3e4f8f9d81724
-EBUILD zabbix-5.4.1-r1.ebuild 34748 BLAKE2B 8b3124f4a161e0155d5c9822876fd18acd09dbd37395f76af3bbf454b9680f49001bab94f73fbfbea32ce90d7ea9bd3437f58df73c97f5dba7ee25253ce423ff SHA512 7f15082a553f0f510947872a111ba2ea8044d06728ee6054e0eb84cff098dd9a69d39a369130a34d467729843f0798493f3ba1b605468845c2e6dc66ba97a57e
-EBUILD zabbix-5.4.2.ebuild 34750 BLAKE2B a86da673bb948835cfb17d81bd5a41aeea87ca6526ba2f9319063aa73b910b080a47569e0f84e027a4979734c6560336ecc5d041e9427b561d8e52cbf18df5ba SHA512 59d22870078c289e08e4bc31729acba4c66b37901e98a76eccf803e1b51100b7cef3a2c460c73cf14916f41cd0fc5a77d2ae748b993cc8fb362538551644408a
-EBUILD zabbix-5.4.3.ebuild 34750 BLAKE2B a86da673bb948835cfb17d81bd5a41aeea87ca6526ba2f9319063aa73b910b080a47569e0f84e027a4979734c6560336ecc5d041e9427b561d8e52cbf18df5ba SHA512 59d22870078c289e08e4bc31729acba4c66b37901e98a76eccf803e1b51100b7cef3a2c460c73cf14916f41cd0fc5a77d2ae748b993cc8fb362538551644408a
+EBUILD zabbix-4.0.31-r1.ebuild 9601 BLAKE2B 0a8da8db8c417a2601d347a0e3fc2ab83c65f3869fc2bba8b31918f08240c42d6f559e6550ced11c6786ff7053efc9a9e49c8c13f35068a9298a4b22de5b7f63 SHA512 f957ef5d2f3d858265e11df99bc85169bccaa05d2be4352d05d132513cdd84315e56906b4a0230bc87b9eb03e68f73d69e0650e689783925dce64210c06de0e4
+EBUILD zabbix-4.0.32.ebuild 9603 BLAKE2B 710091e33a13efa1aa26faacf94f2ab8453a03e83039c7f8ab615f30df820a1ae0973e58c78623661d2e2d18c1d04b88ceefb0f085bf7d160385c816f07045f7 SHA512 f378e43a9a92a5bdb26fd20ad91246a640c879a413ffc77a3d6feba5c936574cd7dc66be20f0b5cc8683fab282e310a0b461bd5ef04ea289aa7273c1f2a733f3
+EBUILD zabbix-5.0.12-r1.ebuild 32662 BLAKE2B b9b6934216c4894f60ae9d848f48ddf22c41bd6f4742f0e2e19ac37d8fbb28efc873c9b9aa51b20633baccda6b9b8047b6f4b8659e35c006c62cc0e514317d80 SHA512 d795b77707adf9c1a58ea562ad8db6753fd68c80dea54c36ad3d74ed193db0e40946ffc59ce2eb01c2ce9d3598dca576b97ab601ec3749ee72aeeefd163c6982
+EBUILD zabbix-5.0.13.ebuild 32664 BLAKE2B 2c833ba3b4849654e61d9abb2a959090db2371c5fb246fd07689b7ab2821e1c138d0bfac0148bfe4df2cb020129aa102214507545bc2d5fc6bf628154abc92a3 SHA512 4bed7771ff6ccf4332136ee53112fb2bdc214de6c5f385acb765b6edc0fbb940e626250ba64f8b59b2a1565bcb8bd0b48a846bc9f1b7302dbcb911fa9e93b669
+EBUILD zabbix-5.0.14.ebuild 32664 BLAKE2B 2c833ba3b4849654e61d9abb2a959090db2371c5fb246fd07689b7ab2821e1c138d0bfac0148bfe4df2cb020129aa102214507545bc2d5fc6bf628154abc92a3 SHA512 4bed7771ff6ccf4332136ee53112fb2bdc214de6c5f385acb765b6edc0fbb940e626250ba64f8b59b2a1565bcb8bd0b48a846bc9f1b7302dbcb911fa9e93b669
+EBUILD zabbix-5.4.1-r1.ebuild 34976 BLAKE2B b18b3b11167a4a0ffcde23fc427aebdf6cb704c7fcbea2c1bc44a05c029c5813581870a106a8624917d7d7edd29bff6223688092770da6bda1b6828c7e7c3e4a SHA512 62789ac4e902fda5798576b8c3692353a560845370a1e25c95cfd5a49e9f318e7da3e059764170d73554c0bd5b6dfa118fefc9ef782b6411a3d9d08eecdb5fcf
+EBUILD zabbix-5.4.2.ebuild 34978 BLAKE2B 8c60c941f472c28e15d41daa8ab9ba67d7e03a8dcc14c8af56565e7b1d6eaeaffcb043d24f05fefc8b858a38bb9e89a9b08277a9094f90a8236aed3e21666f3e SHA512 1254dd41273ab03e56482cc3185ce459eef5848ca0d4d2a47bb5f637c373568d4abe52058b03eb99e2a597934a5788b44ceeb76c2ebd31abf5b6ed4cde9ae96a
+EBUILD zabbix-5.4.3.ebuild 34978 BLAKE2B 8c60c941f472c28e15d41daa8ab9ba67d7e03a8dcc14c8af56565e7b1d6eaeaffcb043d24f05fefc8b858a38bb9e89a9b08277a9094f90a8236aed3e21666f3e SHA512 1254dd41273ab03e56482cc3185ce459eef5848ca0d4d2a47bb5f637c373568d4abe52058b03eb99e2a597934a5788b44ceeb76c2ebd31abf5b6ed4cde9ae96a
 MISC metadata.xml 1519 BLAKE2B 3ee4cfb156b8bf0378378f73ac7584b16e3cf7b824a43350a77889bd17ceb470240206ee3b3412e826477417be9bb07920d0ef944a7c49d3a56fc2b0f2a9082f SHA512 6bd6020054a9be205b9805fd757f3f71bf3e6334a41c71c1c59d9e760638a51f6a12ae84274ae9be87ed23c0942abdeacb539343643cae33615ee87e20613464
diff --git a/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild
index 9aad51163a13..f3cb8a820f0f 100644
--- a/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild
@@ -313,6 +313,7 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -323,6 +324,14 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy ; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent ; then
+		tmpfiles_process zabbix-agent.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-analyzer/zabbix/zabbix-4.0.32.ebuild b/net-analyzer/zabbix/zabbix-4.0.32.ebuild
index d1235337a343..b4467228139f 100644
--- a/net-analyzer/zabbix/zabbix-4.0.32.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.32.ebuild
@@ -313,6 +313,8 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
+
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -323,6 +325,14 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
index c94739cfae13..b8d35f5a7591 100644
--- a/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
@@ -557,6 +557,8 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
+
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -567,6 +569,18 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-analyzer/zabbix/zabbix-5.0.13.ebuild b/net-analyzer/zabbix/zabbix-5.0.13.ebuild
index b921c70a4e01..eba63f9a9e55 100644
--- a/net-analyzer/zabbix/zabbix-5.0.13.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.13.ebuild
@@ -557,6 +557,8 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
+
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -567,6 +569,18 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-analyzer/zabbix/zabbix-5.0.14.ebuild b/net-analyzer/zabbix/zabbix-5.0.14.ebuild
index b921c70a4e01..eba63f9a9e55 100644
--- a/net-analyzer/zabbix/zabbix-5.0.14.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.14.ebuild
@@ -557,6 +557,8 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
+
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -567,6 +569,18 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
index cd6face9be93..73471980e5cb 100644
--- a/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
@@ -581,6 +581,8 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
+
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -591,6 +593,18 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-analyzer/zabbix/zabbix-5.4.2.ebuild b/net-analyzer/zabbix/zabbix-5.4.2.ebuild
index 8a3157cfa587..21c67e3c16ad 100644
--- a/net-analyzer/zabbix/zabbix-5.4.2.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.2.ebuild
@@ -581,6 +581,8 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
+
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -591,6 +593,18 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-analyzer/zabbix/zabbix-5.4.3.ebuild b/net-analyzer/zabbix/zabbix-5.4.3.ebuild
index 8a3157cfa587..21c67e3c16ad 100644
--- a/net-analyzer/zabbix/zabbix-5.4.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.3.ebuild
@@ -581,6 +581,8 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
+
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -591,6 +593,18 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 85147a194aa2..ac51ca24ba5e 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/moserial/Manifest b/net-dialup/moserial/Manifest
index a39181b36a31..e2b4dfc2b7ad 100644
--- a/net-dialup/moserial/Manifest
+++ b/net-dialup/moserial/Manifest
@@ -1,3 +1,5 @@
 DIST moserial-3.0.16.tar.xz 1170976 BLAKE2B dd761019bf559112262bb92ec3a08aa9bcce5e73b03ca10a13547a0496729a229f8bd92c6e67c6661c69d07cf0cc573d885c3668703ecc2b5b594eebe73ea8cb SHA512 2101b5eef61c396f2511d08afad0c44caae63e274412ab26f2f6c9e5ff4c1bb1c1b447cabb66ab25530d5b9881a3e09cd6d9d264aa571c0e5ee48012c1917f7b
+DIST moserial-3.0.20.tar.xz 1176180 BLAKE2B f4481e71c994df233f190f5886cb8a3e9dd333f78c8562370c56487beccbacf09a118c6c463195a6cfb7306771b080d317b3ef07f5c9b5adc4b37a1ec59e794b SHA512 bb2884f2cc4345a8b19faa199668efd1a919b6b456dae0a3b81b62a18b58cf978a227220925b39b2172d7b9208aebe80ce6d21a2d3605730405f4bbf6ef29683
 EBUILD moserial-3.0.16.ebuild 531 BLAKE2B af667ca6cfcc984117fcc561b80116c838cfd49d7ad16e0ed098f3957c5efa04d710323b814af3f4f372531654364856ec80f13a97b180134d81323b56d5e0e0 SHA512 88b587bfc5fc1c9ffe76ad65ab2f367b61f8a29e8d2f8f9a192cfdef96c7486ff49596aadbbe1cf7f241edaf89b291a5aa74b25a63f51604b87f95d2126a39e4
+EBUILD moserial-3.0.20.ebuild 533 BLAKE2B 24055645b672360b8c02c6d89b91988422cd771c5fc629ef97eccdd90360509b6ff3a4c46d655d8a3c119cf1ae3a4d02f3e093c7a4beb27c41fbf10d28a8825e SHA512 cd4a3f2f23f1e083a18e182e2e471590a941af2abb860fa32a6adad0cc26260cb84c6f7e0762474fa6aed50101ef4718b1e06d3eaf8be8f1a8378716b6156a53
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-dialup/moserial/moserial-3.0.20.ebuild b/net-dialup/moserial/moserial-3.0.20.ebuild
new file mode 100644
index 000000000000..3c39e2b6c5fe
--- /dev/null
+++ b/net-dialup/moserial/moserial-3.0.20.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2
+
+DESCRIPTION="A clean and friendly gtk-based serial terminal"
+HOMEPAGE="https://wiki.gnome.org/Apps/Moserial https://gitlab.gnome.org/GNOME/moserial"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.16:2[dbus]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.2.0:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	virtual/pkgconfig
+"
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 290a2eebbda4..d385282e362d 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -3,6 +3,6 @@ AUX xl2tpd.conf 18 BLAKE2B 1486c7555965c14429cbbc7ab5dcebac02aa0639204d3eb203b58
 AUX xl2tpd.service 232 BLAKE2B 16578777774cd7d378efb37f917e368d39f84267c45184d9b72a9d501f75e59cf2f14e1326c347cc4d62c541696a2cf4e5af51f13c0c909c26f908a374944e39 SHA512 184b4f63492c5a09fa61ebf0913a4a47e1cd3b321b80b122f2177ff8f5c9eccdc4a73831dfffc3c2e39325f5cb0b30c4e3f99c1f0fed1f21935be5da38a83579
 DIST xl2tpd-1.3.15.tar.gz 524960 BLAKE2B 5349b4bce7e4b8ea26ec3c739847456b6c8fdac667c8ad9d5241d3c83bc450a47c88c99c37cea2b0461fd4abb3e32da67de7c8ab95d288c8c423bea9af4abf1d SHA512 f65c7f2f1c03728d825b8857baa0c2297e9d5dbd97a2375484a32851326db5951deb9bf3598cbec860f0787d1bb577b4f0a47372e3244fd92c8bad7ce684889b
 DIST xl2tpd-1.3.16.tar.gz 531861 BLAKE2B 2f809c8623c1a77ee538014d4ff3389e32e142f8cd6acad1657198323835574dd3d062e5ed6ee81ded5c4a1a65d8e200759ed6013884bb655ca6f5eef5333931 SHA512 d92bd9070c0e78ba1f4f7ee38be9e87d1f869fe240433f2fd7d1c974f1bce1573ab7aeb5922f316e53bd0fd4580b6152d585b1e0e0cd6fb01ef8fa85d9509b16
-EBUILD xl2tpd-1.3.15.ebuild 1078 BLAKE2B 761c38318b9f5b9721721bbed41fdbe8c9ee7ed99f17d2f24fd4b29cf3c3160e4ca58d87882b93b9b632a1fcc746e4477dda358c6560d0e99cd99234f63505af SHA512 d0cb54581c63ecfa4f47404d4a57a7f193ca32917f0ce54e25e7c86d1e0492eae64bb148128df125d25f1a2a5247ca1af6166e4c3025b1ef0d2b4b5dc7fda281
-EBUILD xl2tpd-1.3.16.ebuild 1085 BLAKE2B 20c3ac81d66a8eab5de0ec85f3166c9d4f43e095bfdbdefa5b6c2a0d74a57dc004add754ab8a6d402eb828205da1c45d8541fd71da7415dfed76a8f5b4187d97 SHA512 f954ebc38dd2bead295714557a8397067b45b58af6df6b24fbd06d7e212ff5f06fcb94902cdb73893629b71ebf49cb79ba0e5509a0a06947fb61f9342ce6d7ee
+EBUILD xl2tpd-1.3.15.ebuild 1128 BLAKE2B feb8f443afd9f98a97385b3a70a8282d4fc8e6cecf3e5942fb11b7f6a531c7cb522ac620976f4ac7efe4fd9d282ab9fe809c73d49c78a1315360d3229363100d SHA512 4471177f05f6f8be137ca8c51662c8096710062bd66c22d87419c626dd5921aa9154ad25564afdee25fb01df1380f26a2ab0187f238114ad52054f6a8fb8ed9f
+EBUILD xl2tpd-1.3.16.ebuild 1135 BLAKE2B bf851f7b21d6774b4ae9d6d49ec5be76d5ce18f0c3d338cdd900f2144b9ed53971722bffd9660cd72317d35ecda04d84c7967470e3ea27c1664815a021e4e03d SHA512 09736b23fed138cee839e60ff57b83cb8b29e79d6d8c466856710b9c81a579a3854071bfd89c09cc9d1d55b668bb52335c4c2f6732dc360a2eba7138d7a70353
 MISC metadata.xml 878 BLAKE2B 56e541158d5eff046fe42874247d9af43261529b126d301e541b591afb7c758564d390eabae5ae04a321a0bb37cf802c7661d7352f3972497a72ce93536099b5 SHA512 ea7a1b3de81e15eab945860a8ce5453fe5d7908e6f4ceb59038555db2103a512e76b077c7fba2da2806c591ff4a6519323e536469d0571866aa73927d1e430b2
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.15.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.15.ebuild
index 672c9d925083..1bfcb77b0089 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.15.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.15.ebuild
@@ -46,3 +46,7 @@ src_install() {
 	insopts -m 0600
 	newins doc/l2tp-secrets.sample l2tp-secrets
 }
+
+pkg_postinst() {
+	tmpfiles_process xl2tpd.conf
+}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
index a1825dcc1a53..5821a9c07fe3 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
@@ -46,3 +46,7 @@ src_install() {
 	insopts -m 0600
 	newins doc/l2tp-secrets.sample l2tp-secrets
 }
+
+pkg_postinst() {
+	tmpfiles_process xl2tpd.conf
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 1795d9f1f87a..5e9d88c0b14f 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 3e7fcc0a864a..2174112d0e9e 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -11,6 +11,6 @@ AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826b
 DIST bind-9.16.15.tar.xz 5025688 BLAKE2B 8b0723d46f812793f5a52b1ddacf21fe28e183ef8cd166eadf0af163280021fce7c0a6a560d28dacbc6dd4642e41eb5424b4de2c5ff1049a5cfa5d52e3df5beb SHA512 30dad6e2144b3ac53ef0a2d1ed3c8342120f148fc0eb6409113a6d5ed3444eecb917915fdf39c26fd223396fc1e873410a50da305f0b870864f7fbbdccec8033
 DIST bind-9.16.18.tar.xz 5023512 BLAKE2B 7766c1e6ab30ae42f0ba49d96fe0e2675e79aa01c48569d3cf5c122944319fbb88299a193ce06cc0aa67f6085fd80e29472fc7adc845e4bbb7ff6896dae87ed6 SHA512 6ba2f14324ebdc66d2a6d60e929fb47e170dd7662cf4b18ef3ad9da30a61b43c7d5539e931c483ab36e63ae0398aeed255fd672489fb332dccf182df9aa102f9
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.16.15-r2.ebuild 11030 BLAKE2B a9d6493aab1cea25ca0439e699b5d378dc54591aec121050b8a833584cdd949bed3a22df624e5be86ed2d8f934786a4c4f654c6461b1e2397b72bcaecd5eda64 SHA512 bbb0e6d934d31ccd2a3518b4a50e28136cbf2f1c3d6c3d4e4244710bcf94099aafabceb6bb3dabd2754c1eae6a591c94cbe410ecff6d83f05d059cb8ee896bba
-EBUILD bind-9.16.18.ebuild 10981 BLAKE2B 5bb750d517b143317420cf19068d4f42ac35bcfd9032ff930091364994e605a6c7ed3b9328dcdaf1e0218db7da586b12761bac3c1a2bb1b4666f54df359ab199 SHA512 990bcbbabdd98ca05c32b04dfabd6ed7df485eb6d7e33faef5ed20e8a0dbcdffcddf22b301e0acfa70eac3cbec8f77f985404ca3794397bc34175f6e991b6532
+EBUILD bind-9.16.15-r2.ebuild 11016 BLAKE2B 3709d824ac8ada3ad5cb246cab344a8f657503e6fea99f1b5f309e2ef519756c366dea3dc444b46c6686749c7c9477b6da6cedcb65d1aa87edd6fbce2fa2a3af SHA512 dd16ca87cc5e379ce441173e1a20b3a2f88fcf8f884ee2cd14bf0c353ef758ca668351dcb59def7e1c84e368caf8fb884abce0fbec6f0327f07a29caaa3687c1
+EBUILD bind-9.16.18.ebuild 10967 BLAKE2B 4a206574ca2b2e2a92d05e8adfa23d6c67e507f0785b150ebde12fb7291f5592fe208af702b548428630dad97d29cce9fc92ad7a2642749e49be62fb3a72143b SHA512 f79efa884c0d9d441dc22ea6a969b9063350c1865df7595c4a7e54b831abc0effca4c925f1fb69ddc95c0ee44fe064cbb971a6db1e569abcf4efb5df3ee895df
 MISC metadata.xml 973 BLAKE2B 9e2cd4d34c8cd9f6bc860c667d2440e7916dfa7ca343e578d7c089b3f45db3b1fbdd79d14ccf1af7fc25115316c42304dc635f1aec78d47eee1fec5c1a09aa43 SHA512 87ee75e39604d9839f849763f2b1675e6d13835dc482bcecd729e6c8416ef90d76edd8e5c5ec87b9e4eb0aa416fb7dc74143bc29cbce02ac3a83eaaa5a88f012
diff --git a/net-dns/bind/bind-9.16.15-r2.ebuild b/net-dns/bind/bind-9.16.15-r2.ebuild
index 9beac1bb8860..257ef4e4f60b 100644
--- a/net-dns/bind/bind-9.16.15-r2.ebuild
+++ b/net-dns/bind/bind-9.16.15-r2.ebuild
@@ -278,7 +278,7 @@ python_install() {
 }
 
 pkg_postinst() {
-	tmpfiles_process "${FILESDIR}"/named.conf
+	tmpfiles_process named.conf
 
 	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
 		einfo "Using /dev/urandom for generating rndc.key"
diff --git a/net-dns/bind/bind-9.16.18.ebuild b/net-dns/bind/bind-9.16.18.ebuild
index b7e24261c206..1dd3551c955e 100644
--- a/net-dns/bind/bind-9.16.18.ebuild
+++ b/net-dns/bind/bind-9.16.18.ebuild
@@ -275,7 +275,7 @@ python_install() {
 }
 
 pkg_postinst() {
-	tmpfiles_process "${FILESDIR}"/named.conf
+	tmpfiles_process named.conf
 
 	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
 		einfo "Using /dev/urandom for generating rndc.key"
diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest
index 9125cc0b415d..a8806a80e611 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -1162,5 +1162,5 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 EBUILD coredns-1.6.9.ebuild 37542 BLAKE2B b262e6e35a99cd7b5240502cb60f62e6f7c3ebbbe10e6948eb54bddacfed6e9d00275aced5d8b4233c81360d17b95e90d7ba111689855cbb1c833eeb7239e3bb SHA512 8a0570c92695815ab87e916a48a9aa313a7e7b5c17e7db3e31a6cf394750b358db36c1ee3f5d2b44fa17abc2f13883945fa88a8ca6c777fda90b8d018d6196f1
 EBUILD coredns-1.7.0.ebuild 47042 BLAKE2B 27cdbce782d2fc6872b9fd159dd564c0b72fb592ccb82275e74f0e02fa55f02a363eaebbb9b161f4369390031aef3197f9ab38639c2083e0c263f081240e1be6 SHA512 2e80ecadeb41ce07b5c858dc07e98b56b355f73afbf9f523aa5806daaad1637f41cbe2a4f6e1d4429fae858095d2ca70a3229a99e9fe1b75f4c63efdfc9ac2b9
-EBUILD coredns-1.8.3.ebuild 46679 BLAKE2B b0f09df848695834a4ca3e26a2798d149252629e569f1e82db22d5b01f78df6c4ef67ba2e0eb347a0bb5b901569eaea64bf864beb2c6578e6efaa5d1a33f0b3c SHA512 2c27cc2d9eabae2af99ca13e5758fa9ad4b357a432edefb17d2d8ebc5e06b7a71baf077418cc425143c7c21cc8914f084c4d1cec5ae85396e72b45d135285ebb
+EBUILD coredns-1.8.3.ebuild 46708 BLAKE2B 7ff8eb492e30a2b05e0bbddced5a38dde51f0028c4e9087d8701f177f256328f7a1d5333e13837b99ddfa74c20b03663581a76263c8f66d7e7618da28d6f7fde SHA512 4131c792ba275f369e583e090e2e8ce3ac2d0b1af2303494b02d170f4aa2155c85013c2a00a658c80b802765d2eb2c5db2e0a1d30195fc4febd4a4f752bdbb02
 MISC metadata.xml 782 BLAKE2B 16d03af7e36cb4fafb32cad39444432f4f43df03895c1a83028c13dd1c4e997c35014456fe3e5587f82f609e979489c9971e7e21122092bc2266b19778a53fe7 SHA512 783e304ab7158e9ec6c91caa2649f43e056e915e5a2d0647ac8c7a72892222e50d3e64e6ae297be9088a45bbecb21265ccdb3afe5857de06e4cd628b50497c75
diff --git a/net-dns/coredns/coredns-1.8.3.ebuild b/net-dns/coredns/coredns-1.8.3.ebuild
index fb5faae345e3..14b4e4767af6 100644
--- a/net-dns/coredns/coredns-1.8.3.ebuild
+++ b/net-dns/coredns/coredns-1.8.3.ebuild
@@ -912,4 +912,5 @@ src_test() {
 pkg_postinst() {
 	fcaps_pkg_postinst
 	go-module_pkg_postinst
+	tmpfiles_process ${PN}.conf
 }
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index e2c3a85295b0..75e904d0ba30 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,8 +1,8 @@
 AUX getdns-1.4.2-stubby.service.patch 568 BLAKE2B f2e605116f924b109bf2cd734c8eb79314aeb02b0e30e2fd8d62117b44a74f20e64b1b527253a09525ad9ab26aa2a64a51940773064de87e295d1831dfe9e51b SHA512 67c88787d48662d5c555cd2cdff5916a2211aaf45a13b41e0a909d703dcbc66cb3de834cc94b7c3d292d16a99d024b07098b4e0bb1c790e48201ca9ffb598bd2
 AUX getdns-1.7.0-docdir.patch 769 BLAKE2B d6eabd639382b1fdaefb344c440dabbdcd5a61e5999a31d8565c994baf80bb9a05efad6cd54dd5dd871c4d6c4b05febb9302a68c8bb36184b5d024c5f6fcfd30 SHA512 7eb0895ca0707f396a326469b3ecf09e43cb52f7d83e2288570f88b13cc884770a2aa634f8f0128ee38c2f4ea43074e80797ae8c07788dcca66706af2cd050b7
 AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090e2f07d4aed4903b88e07576893f653a8704f5181b3fb67f51327e41fef909bc56f5022bf124a4183 SHA512 10793c0ab9081c083dd702b57ffd864aa5a6d76f678eeb704b577188c0a00536f39f2dbb960d8333564b99981a5e2d4414802ffa8506b7cb41fc517680e2b78c
-AUX stubby.initd-r2 685 BLAKE2B d079db5129c02d7b4bdbfdd28733426b39f9e094e76f14e5a32b948f40717faa1886f9093059ddca9e4cd58e6621e06ff75ff94ef713338b1e0335785274f954 SHA512 11b9a6d1a60543ed6e897c87b9c78c72a241388486f1d389918f5a11176a208d885e641fe304bd2ca91284861e37422b8c387ebc8aaa820093b3e70d31b28cf1
-AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b934f9b9b9f9001a41ebaf148d266272529c594a79eb27c0b99ff9f30d4c519f91128d35b4ea87eb22 SHA512 c4f1de3789debd1d51a47499960b6f688bc594b4beb01062a55c5623a6ceb07d03705e4f411c9a0cc88442af223120b29c46a9dc72c600477d3e598f9c02c805
+AUX stubby.initd-r2 625 BLAKE2B 83737407d4ba1d64edabd346868e8401438a9b90b7ddea2d11387ca2dd4d27b68b53039dbf83c60d54c63e9e72171421c40ecaefd5b9b6d8bd4a09eb2a6dcb54 SHA512 0149fd219af720102988663f58f730228f8684267daaf279bcb80fbf70aba3d3d8cd41e745af2b3afbae6270259232dcc5bada0f58c935e6157620c06c53f347
+AUX stubby.logrotate 90 BLAKE2B 8417a72ee319a12a38b94dcbd38617925539ec4971443097be155012ca7eefadb558c9ea01af03e77f1c28441f06fce73f01c2bfbbe9d305ec56b728b5eb886c SHA512 1dc35b1d0572de915304e632d9b4e6f3017deb3c906d93fad532564d70b961c5595194ac8e11d1888710ff3b5cf9512e1a1a5007d10128dde31875bee8c9e0e0
 DIST getdns-1.7.0.tar.gz 690885 BLAKE2B 25e81c01c5da0a5494dc25077257f8f98210b442b7ca65c895aa2a40af180e840aa53205ae84ed242cbd6c55f8830caf255db9d7f607dde39f118ab7494a7072 SHA512 d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6
-EBUILD getdns-1.7.0.ebuild 2204 BLAKE2B 116183bd38d48b081e2ced7f848b7d6041836f3b0252feb6bfb63a4684ff471daac34ef73ac9c313f8b5de658d1e283430678471264234545f2d53bf5f399850 SHA512 f80e4c56c358af1d40b90db57e4f8fe456a92edfa36ec0cddd9248ee2d494008525cf509bc986bcf6ff0586b980bdd222b6231f9b8488ca05a8142b4a0ce49b5
+EBUILD getdns-1.7.0-r1.ebuild 2242 BLAKE2B 7468adf7cf9711c877583a06f1cd9a96a3b3ffc751cc5598b55e5077c5271a78970788e42d3aa740811bba07c661c03e4a28817f63625f54b347445457a51c4f SHA512 9392d61012b16b669b6459403f3cbd09a4aeb998041864e3de9e51a7ef456940be95df467776c6ee294b549171afe8ab6a04cfe87bb3885374915e9c2f02eacb
 MISC metadata.xml 745 BLAKE2B 9cb2fc16135f99e9d57f767fbfa621d1ebe4fe1544b7aa27d38abb874868f641cc47bcf4fb5dae852110bca97ed7f5ceb8afd79faa9577350f986e83c83a4ca3 SHA512 fa3dcfa3e3e8b05f41d428c028171f74fbd7120bb16b10802f176a8a03baaba7cfc079f5d02125ad5602b03d3f6588fc47c4638a75d614a32e70ec8069db4ca4
diff --git a/net-dns/getdns/files/stubby.initd-r2 b/net-dns/getdns/files/stubby.initd-r2
index 69e76c0acfdf..6af818c2db8a 100644
--- a/net-dns/getdns/files/stubby.initd-r2
+++ b/net-dns/getdns/files/stubby.initd-r2
@@ -5,7 +5,7 @@
 stubby_opts="-C ${STUBBY_CONFIG_FILE:-/etc/stubby/stubby.yml} -v ${STUBBY_LOGLEVEL:-5}"
 command="capsh"
 command_args="--inh=cap_net_bind_service --user=stubby -- -c '/usr/bin/stubby -g ${stubby_opts} >>/var/log/stubby.log 2>&1'"
-pidfile="/run/stubby.pid"
+pidfile="/run/stubby/stubby.pid"
 name="DNS Privacy Daemon"
 
 depend()
@@ -18,11 +18,6 @@ depend()
 
 start_pre()
 {
-	checkpath -f -m 0644 -o stubby:stubby /run/stubby.pid
+	checkpath -d -m 0755 -o stubby:stubby /run/stubby
 	checkpath -f -m 0644 -o stubby:stubby /var/log/stubby.log
 }
-
-stop_post()
-{
-	[ -f /run/stubby.pid ] && rm /run/stubby.pid
-}
diff --git a/net-dns/getdns/files/stubby.logrotate b/net-dns/getdns/files/stubby.logrotate
index 48058782594c..ca41d872cfd4 100644
--- a/net-dns/getdns/files/stubby.logrotate
+++ b/net-dns/getdns/files/stubby.logrotate
@@ -1,6 +1,7 @@
 /var/log/stubby.log {
 	rotate 4
 	compress
+	copytruncate
 	size 200k
 	noolddir
 	missingok
diff --git a/net-dns/getdns/getdns-1.7.0-r1.ebuild b/net-dns/getdns/getdns-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..98248f10308a
--- /dev/null
+++ b/net-dns/getdns/getdns-1.7.0-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+_SRCURI_P="${P/%_beta1/-beta.1}"
+
+inherit cmake fcaps systemd tmpfiles
+
+DESCRIPTION="Modern asynchronous DNS API"
+HOMEPAGE="https://getdnsapi.net/"
+SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby test +unbound"
+
+S="${WORKDIR}/${_SRCURI_P}"
+
+# https://bugs.gentoo.org/661760
+# https://github.com/getdnsapi/getdns/issues/407
+# (As of 1.7.0, seems to need network)
+RESTRICT="test"
+#RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/libbsd
+	dev-libs/libyaml
+	dev-libs/openssl:=
+	idn? ( net-dns/libidn2:= )
+	gnutls? (
+		net-libs/gnutls:0=[dane,openssl]
+		dev-libs/nettle:0=
+	)
+	libev? ( dev-libs/libev:= )
+	libevent? ( dev-libs/libevent:= )
+	libuv? ( dev-libs/libuv:= )
+	test? ( dev-libs/check )
+	>=net-dns/unbound-1.5.9:=
+"
+RDEPEND="
+	${DEPEND}
+	stubby? (
+		acct-group/stubby
+		acct-user/stubby
+		sys-libs/libcap
+	)
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.2-stubby.service.patch"
+	"${FILESDIR}/${PN}-1.7.0-docdir.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_RUNSTATEDIR=/var/run/stubby
+		-DBUILD_DOXYGEN=$(usex doc)
+		-DBUILD_GETDNS_QUERY=$(usex getdns-query)
+		-DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon)
+		-DBUILD_STUBBY=$(usex stubby)
+		-DENABLE_STATIC=$(usex static-libs)
+		-DBUILD_TESTING:BOOL=$(usex test)
+		-DENABLE_UNBOUND_EVENT_API=$(usex unbound)
+		-DUSE_GNUTLS=$(usex gnutls)
+		-DUSE_LIBEV=$(usex libev)
+		-DUSE_LIBEVENT2=$(usex libevent)
+		-DUSE_LIBIDN2=$(usex idn)
+		-DUSE_LIBUV=$(usex libuv)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use stubby; then
+		newinitd "${FILESDIR}"/stubby.initd-r2 stubby
+		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/stubby.logrotate stubby
+		systemd_dounit "${S}"/stubby/systemd/stubby.service
+		dotmpfiles "${S}"/stubby/systemd/stubby.conf
+	fi
+}
+
+pkg_postinst() {
+	if use stubby; then
+		fcaps cap_net_bind_service=ei /usr/bin/stubby
+		tmpfiles_process stubby.conf
+	fi
+}
diff --git a/net-dns/getdns/getdns-1.7.0.ebuild b/net-dns/getdns/getdns-1.7.0.ebuild
deleted file mode 100644
index 0be2dffb7beb..000000000000
--- a/net-dns/getdns/getdns-1.7.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-_SRCURI_P="${P/%_beta1/-beta.1}"
-
-inherit cmake fcaps systemd tmpfiles
-
-DESCRIPTION="Modern asynchronous DNS API"
-HOMEPAGE="https://getdnsapi.net/"
-SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby test +unbound"
-
-S="${WORKDIR}/${_SRCURI_P}"
-
-# https://bugs.gentoo.org/661760
-# https://github.com/getdnsapi/getdns/issues/407
-# (As of 1.7.0, seems to need network)
-RESTRICT="test"
-#RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/libbsd
-	dev-libs/libyaml
-	dev-libs/openssl:=
-	idn? ( net-dns/libidn2:= )
-	gnutls? (
-		net-libs/gnutls:0=[dane,openssl]
-		dev-libs/nettle:0=
-	)
-	libev? ( dev-libs/libev:= )
-	libevent? ( dev-libs/libevent:= )
-	libuv? ( dev-libs/libuv:= )
-	test? ( dev-libs/check )
-	>=net-dns/unbound-1.5.9:=
-"
-RDEPEND="
-	${DEPEND}
-	stubby? (
-		acct-group/stubby
-		acct-user/stubby
-		sys-libs/libcap
-	)
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.2-stubby.service.patch"
-	"${FILESDIR}/${PN}-1.7.0-docdir.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_RUNSTATEDIR=/var/run
-		-DBUILD_DOXYGEN=$(usex doc)
-		-DBUILD_GETDNS_QUERY=$(usex getdns-query)
-		-DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon)
-		-DBUILD_STUBBY=$(usex stubby)
-		-DENABLE_STATIC=$(usex static-libs)
-		-DBUILD_TESTING:BOOL=$(usex test)
-		-DENABLE_UNBOUND_EVENT_API=$(usex unbound)
-		-DUSE_GNUTLS=$(usex gnutls)
-		-DUSE_LIBEV=$(usex libev)
-		-DUSE_LIBEVENT2=$(usex libevent)
-		-DUSE_LIBIDN2=$(usex idn)
-		-DUSE_LIBUV=$(usex libuv)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	if use stubby; then
-		newinitd "${FILESDIR}"/stubby.initd-r2 stubby
-		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/stubby.logrotate stubby
-		systemd_dounit "${S}"/stubby/systemd/stubby.service
-		dotmpfiles "${S}"/stubby/systemd/stubby.conf
-	fi
-}
-
-pkg_postinst() {
-	if use stubby; then
-		fcaps cap_net_bind_service=ei /usr/bin/stubby
-	fi
-}
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 5d9dc97c51d7..b57bedb71f95 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -3,6 +3,6 @@ DIST libidn-1.37.tar.gz 2603177 BLAKE2B 2f55644b8e521ae75638e6b660f7a7e457957b78
 DIST libidn-1.37.tar.gz.sig 488 BLAKE2B 449e2222becc9c3714463c9875a625ef017aad9c188c2487ea3c7677a56c7821f02ac39404581bb033a23860e8b07251efabefd85a1f2be91461f2bd27162869 SHA512 6fc3543d32d2a2b730ee22c04098420200292c95582a625cbd05729b3df40f87faa35aaceb9fa45245fa891971a10f47281f490eb7bc3099910e349c643360a2
 DIST libidn-1.38.tar.gz 2681263 BLAKE2B 92059e87554338a3565ee4b517fa1ba7bd3e9d57d8be7d71aee377220f50b597e529469c6ddc7c9e7c25b9e83c76f652457256dd32249c3e1cd97df8867723a1 SHA512 5e59b2263fde44d1463b47b516347b17a4e3e3696ebba66ab5fe464d567e2ec81f769fa7cf72ed51cfb501e32221813bb375373713a47e2f599fc6122850e419
 DIST libidn-1.38.tar.gz.sig 488 BLAKE2B 3a5a5f3d79f2f01019d71e2b20b7daf264c71ed21ec922733c03ed42e0acd0bb6c2758ca7095b7fc52025d01c784eb539e53408ae663ac2bcdcc8e92ba11f342 SHA512 9caf0f9633f607861e94d6efe30383181db67e6fb437903b6c1ff1758363824afc1b01458f845d2bf11c8f2ec01708ba98da54a43a6e2429978caa0f41166ffe
-EBUILD libidn-1.37.ebuild 2798 BLAKE2B 6ba3a5a3a6699f45d9e52d54df7933f26e97290fd2a957f90b4be22fee8f13de5e722fae7991b9d88fcf422f84fc0bbeac93d02eb0f28ac80540c32a4c13e3e9 SHA512 7b6fa387a4177cad5ec1b5f5d102da90deb641570c20d59aae90172b318faf6865431cf7142f3606bc8ef75c9c23389a1a22c0a448968abdb0cd3f89c94e23c7
-EBUILD libidn-1.38-r1.ebuild 2748 BLAKE2B e38276943a8c10a8703b0e9b18af8d57f61c5d2500e1229403e4de797692d9457c5ac4b4c73ebccf04bbaaebdee9e4f564fd3b941ab0dfedea196eefcd0ac480 SHA512 f51f55b72ace2e6d4f5b364cae58cc975c69bbaf31f8e08441fcd28a0ee31243b961b48a5b60f16569c5c03dc5bce76482bfec86eec0fae0b9bd3bf817819d22
+EBUILD libidn-1.37.ebuild 2806 BLAKE2B 84db394eee3598c9f893f23427f5e6994db2518de33c230d1db557eaf422b0411ccec7117ed7bbd265d1e7b183918933a9b31a73db874a222a7b67e1f240ea7d SHA512 48aadb15f08f65e09c698d7089be7f874d64eeae9421cbe4b58107115a9bb3178b2652f0a170cede42c0530a10659a2d934ba9a6750c8635daaa4ee0f24f9307
+EBUILD libidn-1.38-r1.ebuild 2756 BLAKE2B 461f0fe166ac8309709793431c77396e88ea4d5b56f17adcbab034b124d3a8cc6f63e1016059f43a257256db39c5b24e518cfaf99d54c13e78586135444baa02 SHA512 d7d31034f1d2f992e55e3e9de60904ea4cdf427a13c0260deec71d1b897a9df83c377a1a44ce64d7cfcd5365277f89280e6733da6c5e6ab72c29a2ec433f9739
 MISC metadata.xml 347 BLAKE2B 293e4cc6e22f51f47bf25f9be723ae443dd92138e6ddac7bfa4bbeb314a823dcf62429551125167fdc41e1031050f5baf034f493daa1cfa0aaa3fd824a4ddea7 SHA512 8fc22ee1c8de823f07c90e20c8075ef00ad130c07f5e556f61b501e4b162992050cbbfd6ad492b551464370f8d90382f3243d93830be92ccef6bd54481dd6bdd
diff --git a/net-dns/libidn/libidn-1.37.ebuild b/net-dns/libidn/libidn-1.37.ebuild
index c188af3af801..4d58cba26c07 100644
--- a/net-dns/libidn/libidn-1.37.ebuild
+++ b/net-dns/libidn/libidn-1.37.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libidn.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libidn.asc
 inherit elisp-common java-pkg-opt-2 libtool mono-env multilib-minimal verify-sig
 
 DESCRIPTION="Internationalized Domain Names (IDN) implementation"
diff --git a/net-dns/libidn/libidn-1.38-r1.ebuild b/net-dns/libidn/libidn-1.38-r1.ebuild
index f5700cc22cb1..64a9be86524c 100644
--- a/net-dns/libidn/libidn-1.38-r1.ebuild
+++ b/net-dns/libidn/libidn-1.38-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libidn.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libidn.asc
 inherit elisp-common java-pkg-opt-2 libtool mono-env multilib-minimal verify-sig
 
 DESCRIPTION="Internationalized Domain Names (IDN) implementation"
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index ba044b339c7d..4a19a20031f0 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -2,6 +2,6 @@ DIST libidn2-2.3.1.tar.gz 2188338 BLAKE2B 323840b0d84f41cc746ca9b5a24169a374e95b
 DIST libidn2-2.3.1.tar.gz.sig 488 BLAKE2B 2e1428ec240964fcdc1dbe96afa69920e5f5439ebf9c58e134832ceab932aef57176744a8fdf76ca29e73650c18406ec894b8e92dd95d52cb712bf7f823ca820 SHA512 2db4bb3a11562634276664fb857306271c6ebc96cf5e90b39b404c3fe47190ec65ce3866cebcfa0c1216d29d7aed8c7907b869e602a722db1cf8f6ab94da9c78
 DIST libidn2-2.3.2.tar.gz 2169556 BLAKE2B 6914630ecf6dcf18eb808dae933b819ee705c73011e6ffd68f8d14dd2c2ed084a9b504385c29988b2c4b439c6c8f2f552e47f4d624ae20d8b64767bf4d47f6a3 SHA512 958dbf49a47a84c7627ac182f4cc8ea452696cec3f0d1ff102a6c48e89893e772b2aa81f75da8223dfc6326515cca3ae085268fbf997828de9330c3a351152f1
 DIST libidn2-2.3.2.tar.gz.sig 488 BLAKE2B 832a5424034147a2c969fdbe0e094c23cda6305fe6411728f7727054571f54f6f056b939cf13023606dcb4f4bd85ed527b8e85bce6e56ed366e893ea16f8eb13 SHA512 0559b51b37c7937f3e1f8bf9de9b193f137f16b79d6673f85691a4f4a12ec132568e913848a70136f8522118817f7ecaa8432d353a5eff6b99a7be8719421fe0
-EBUILD libidn2-2.3.1.ebuild 1483 BLAKE2B 1ff3a3ebdcfa331ca560505ff5f9347bc3936f65e55b384a46def83079e8de58dde6090938a95545cba8fae8e2ea53d706c595195ca726e57b5d2f2d39f5c28c SHA512 678b749b553f5b10c63768471858825ad42abaab422829c946c4c2c1a413ccf8c5a85300499b80b1353ad38bc37a9c85c97ce34f41f32730d7166434047eb9d3
-EBUILD libidn2-2.3.2.ebuild 1491 BLAKE2B 1e8bed08c6b8d76bd85cb25ea4a372531887dbc1de267288e51dd2ec8ca31fb2ed9d5b40ff9215e1530804e7ba688975668499182889299c8b2ccb5467ad8b1c SHA512 4f9fc2eaa29080ab07c7f5e5ff4487a1143acae876cf193829d0be8fb55d2e03207b23e036992a1dbc98d12b94ff70c764c7025892b0b5b2bb82f5744153d87d
+EBUILD libidn2-2.3.1.ebuild 1491 BLAKE2B 98c8872036e18f8c2272b31f94e80882e99df7f15953785f8ea50924bba398d1833d475f772ef447298500a273733437e3ac441f4bd9a7d46026609e2a6a7af9 SHA512 fed576edbdce4b3f66d85e2eef741cb307436f8c014c3c324c8ac9905f0941373613b45c17d4d0e03ce4e6d339185b099280f764d8969814dfb4d0121781d5dc
+EBUILD libidn2-2.3.2.ebuild 1499 BLAKE2B 283cacb787d91d7783c11c9f63492304ff71ee7cff400155c8d62c2a0651ba56e9584eaa23826216f80767ed9ca800e29aa2b0db2b058849541a23e3cc853a27 SHA512 23daf0d0b9c364466a7b0aeb0de07fb6bf05ca0d369d05dadfcbb574a504d4944b3a481820bafc6757ebb586ead56e276a22bbc5314a279ae6da32aa488b3e21
 MISC metadata.xml 561 BLAKE2B 074256567a8f1b82c825d213cf6ea2030ab7b08151d7c14b35396abaa1043974808deba8ef4bbf48dfda4d2f68f832a2c9342090aae38b8e30b73ed91f17c846 SHA512 96d7ffcaa48c2bfb6273f7ec4ea99e4accc7c615d08c9aba892c7eacb7429c1b0ec8d330152cc88ad165cfd4ff5b1062db3f5df43b7e33bfcf5296d19376f654
diff --git a/net-dns/libidn2/libidn2-2.3.1.ebuild b/net-dns/libidn2/libidn2-2.3.1.ebuild
index a9c7703ca032..a0e563e61005 100644
--- a/net-dns/libidn2/libidn2-2.3.1.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libidn.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libidn.asc
 inherit multilib-minimal toolchain-funcs verify-sig
 
 DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
diff --git a/net-dns/libidn2/libidn2-2.3.2.ebuild b/net-dns/libidn2/libidn2-2.3.2.ebuild
index ca045ed9ec8c..4e5541bc54ef 100644
--- a/net-dns/libidn2/libidn2-2.3.2.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libidn.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libidn.asc
 inherit multilib-minimal toolchain-funcs verify-sig
 
 DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index b3df33c2cb23..8cde10d1098c 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -6,5 +6,5 @@ AUX pdnsd.rc8 573 BLAKE2B 9ba317e4c8df4c351452cb2de554c38b341e3ddf621d40c1486bae
 AUX pdnsd.service 269 BLAKE2B b14978db01ec729a6e04d4849a468fd45999c1fbd7d21e986b2034edb81f645df7f5ce8924d72e11b04a548c6957964c936442f1d57c5fa9a327667b331ce4f4 SHA512 c1504f52fb30ba197bd3c3450f200f2f274bf73f7a6436bc317ad9affc18e9c5edcb8555913a4aa9c6bf44b935e0c9cd005b4f5b0fd56eed6e11914f63db9ef2
 AUX pdnsd.tmpfiles 37 BLAKE2B c4da53c3d0ebea88e456e6ea07b2505ed187e074286bb40fabde6a27c4cc017dabea3207e8fde80aa3fe38957b12ce8e09c809b369f06356c1737ae0825cdbff SHA512 7beacc66e8504ca0f8e613dfc8ed2479362f1ebc98ffab902622b36c795fe75e176d9f0a330ad74e10a7f7b1597cce068d94eea6511a75b941e42b2458b76df5
 DIST pdnsd-1.2.9a-par.tar.gz 516061 BLAKE2B 33f2fa85f4b2fa3b709e612c12c8a6edff67f3d2203a8ccd9e838f72b8ab2664eb2e88c0957c08c64568581d9eeb4bede9157ba0928fa6d28ccca279f71fbd1a SHA512 4fde296642306aa986ddb7cad0b5991bcd397656d93ef4962706276848c7fa62c664a40198e807d029637f116e8000c237d98b91cbbfec5c08b134d8bb3adf81
-EBUILD pdnsd-1.2.9a-r2.ebuild 3250 BLAKE2B bd56cc6f7a169534d4036826e8c6aec618303a842e39e3453904c922d9af74fabdf411d06585168ca3fd10a419639663feb29ad344ca81a7efbb6e5118394c5c SHA512 2b0573958605aa6f6332b172d0b90068d869800dd8237ccddf9321e295ecb1c2db3bab242cf3cde427eb8cf618b03e7d4a3e23dc1016c5b47bdaf3051a637e6a
+EBUILD pdnsd-1.2.9a-r2.ebuild 2858 BLAKE2B 5010c16850b6b6efb35967f1bcbc2b03caf931b20a78d1f59622d41c8c4fa7776baddc88197b3c274fe5a2a4a1a8e1bdf70e88297fc68753f0a13c84c79b7937 SHA512 b986c42160e55f8bbab7fd8d2cdd3ba342c49972429e78de7eff5e7a38349a62ff274e5a00de847a198e8bb5c9c010b5d166d66ad6511a5bdba3fdaf468a6788
 MISC metadata.xml 690 BLAKE2B b0622b07b0bde244e72fda490d314bfc9741a9e543d2d28454bb318974c05482b0f35b3ec84e200ad44028315dacb36a733d58a854d92ffa5fddbdc5d8c06367 SHA512 d206ddb764115a80a423255760eb5d82f842cecde6318be38a8d0b7121b2c893b0eff6687837965b9058b53c4e24245a349dbfe91ee0b18e8e3482b0aa623fe8
diff --git a/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild b/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
index 8769b15cfd58..209fff4708a5 100644
--- a/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
@@ -94,14 +94,5 @@ pkg_postinst() {
 	elog ""
 	elog "Sample config file in /etc/pdnsd/pdnsd.conf.sample"
 
-	# The tmpfiles.d configuration does not come into effect before the
-	# next reboot so create the cachedir now.
-	local cachedir="${EPREFIX}/var/cache/pdnsd"
-	if [[ ! -d "${cachedir}" ]] ; then
-		mkdir "${cachedir}" || eerror "Failed to create cache"
-	fi
-	chown pdnsd:pdnsd "${cachedir}" \
-		|| eerror "Failed to set ownership for cachedir"
-	chmod 0750 "${cachedir}" \
-		|| eerror "Failed to set permissions for cachedir"
+	tmpfiles_process pdnsd.conf
 }
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 285214dee389..88c859ab4694 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index f858f12d45b1..2b566c351c20 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -4,5 +4,5 @@ AUX fwknopd.init 2706 BLAKE2B 561cc62b1e557d425648947c25751dfb2fe323b04cb96ea1d0
 AUX fwknopd.service 235 BLAKE2B c46c01121a745ee46a5415654c0ba422531008ed52915833712f748026eda3afd8019d6ec6bb86434b40ad273a4cc46115d3a64a73b621731ec68f3bad92dc41 SHA512 890bbba586183275cbd3b420a9c0d609ff3eca0fd239b4af97e2730e2790f317fc114f51d60107ba4fbddd2cabb60c70d8b615e2a75bb80cf27d352c894a1c6d
 AUX fwknopd.tmpfiles.conf 31 BLAKE2B 81d88d9bb1fd826c242b2815e1a6c0e5a300f22e19dd65ad67e114d692731cb532162ac877f0239879ebfcf0432d61053adcddd2c234d85ed60bf33720b22dcc SHA512 73b56a42c7728c9dabd82cd81bd6ffa1b948fe80fa67feee348ad65f957f1f2ea53c6b5d74fa2784ea75c45c2c27b5d989da4a618f3a4cf67914c927e04b74ae
 DIST fwknop-2.6.10.tar.gz 1988197 BLAKE2B d4c2010c64ab160f0edc02e2b1530749ee47ff6ed16d6b556d366daef7ce5e22ef38fbbbf6e8cfaa14e0d9706ba2b65937b03c70b54b3429ff1732ae33c1852c SHA512 3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80
-EBUILD fwknop-2.6.10-r2.ebuild 3346 BLAKE2B dde091d0ccec20e131d4210d6dbc419e7d850d73a01feaf9c57a9debbf673a1c35a35ad2d2f87667cdef356ad99021c56b057efeb7acbdd5e2ae99eb9d1e6c66 SHA512 ca2941a4c62c5d092da245c6a14dc3305f338c8de2b5a305a6db8069d9ea7f0088d79c36ce8d36bbf7dc977db3a44d544f65990fbdacfb5f7888f6ef763c6eeb
+EBUILD fwknop-2.6.10-r2.ebuild 3379 BLAKE2B f55fac553135a5a46ff8c491a3dac990885b7786e62926e59cb870dcd617f2c3b1a4981a18caac43e0565ff0b746838fc6cc765dff6011d2278461fb7d793834 SHA512 6b38fdfb06b8b2e10ff357983f0c46ebf3fdd7fb79110ad163ac397dc46d7bebb44e19c7aba43b43f4f07d2726471cca464bdc989d52bcd6c241b06ffd0094fc
 MISC metadata.xml 1247 BLAKE2B f551b38248b14f9e08af3710c35c3fec1d198ff0c100132a495fe4e040b1ae94005c46aef50e7fe931133b41d2b738fca97d458a777caf7e4892e169938acb9e SHA512 5a1f01811b27e88a339578d410ae41212c4c1c4a3ced4a47f63c09db3226023e4ac822164f5448a1912fc8829743c6a60c04852d836bec5ebbfa0726bfc47568
diff --git a/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild b/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
index 5c86fee98c20..f8c21045b3ae 100644
--- a/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
@@ -108,6 +108,8 @@ pkg_postinst() {
 	if use server; then
 		readme.gentoo_print_elog
 
+		tmpfiles_process fwknopd.conf
+
 		if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then
 			echo
 			ewarn "fwknopd daemon relies on the 'comment' match in order to expire"
diff --git a/net-firewall/pglinux/Manifest b/net-firewall/pglinux/Manifest
index 653c1b6f51f9..dd80a443447d 100644
--- a/net-firewall/pglinux/Manifest
+++ b/net-firewall/pglinux/Manifest
@@ -1,4 +1,4 @@
 AUX pglinux-2.3.1_p20171006-fno-common.patch 492 BLAKE2B 803ecc1c2089a873ef2df2901c3364ff4e9242c2b6758c0b2e8fee57c7a13e31d6fb2a5f10ee24f8452e453299112af3be4fb1500f472bdd8192ea1b2363f13e SHA512 dbeac2030b38a7e224a0d3221ebbb8b3199f8a7eca3d675c6516121c8a61c6834f25da93bab60fe3216745d6fde12f4342c8f9f94abab6efbdda45e7f0f697a6
 DIST pglinux-2.3.1_p20171006.zip 340253 BLAKE2B a39ecad1290dd31b126ed58c22f2de1162a4081e07f576509b5d77adffeb4a74b5aeb489f8f63134b0fc37d174e61b6631bdb350c3277729456092ba0ae3c600 SHA512 ea30076d7a21fa71d5e352c479cb1a463c9f244d675f5c7f9d5d25a33b27f4c7f1a39d173f2fd156e3f2cb0652da0a06c078fc38972275073f38d48f207e42f3
-EBUILD pglinux-2.3.1_p20171006.ebuild 2774 BLAKE2B 564b62b2840db3de3127ee645100536b119ece123c2e997ef479257530d1bbde3adc315b92da7a60f01b0090770ae75cfb920e13eb82302d813a4ea2de8e1ddb SHA512 103ef7f94bbce3923629f6cd2cfa009e25783faaf0b1472eb6a721a67fbbe7f7072e1763e9bff59dfa351eb0b9bce2df347dd792df0299910ba9b65e32b1d4a7
-MISC metadata.xml 877 BLAKE2B 23f3f249945c9c606588fab5cb610e10a5adfa00bb9f9408f5dd373bc76b6a1b4b0cfff72de8b86d2b7de335d1730ee5cf15108b519e148f797ff2855fa16064 SHA512 6b9986e54aa2b6d75acabfc74e080d0e378b79f94178d7dec3c6b870fa90ccbf4840559942d29ce27f017a63b8f8760c21ac09fffb0040f9f624a053c489d8de
+EBUILD pglinux-2.3.1_p20171006-r1.ebuild 2723 BLAKE2B 44f3fdd7fe81e04f602534feab720ab350792b0b2d759c8c9f9a7018776c461228f4a49ab9dec0ae24a0948ecf081a07935960e67096a714cabf836e6945e060 SHA512 b63ea078a0342c2b0e5c4a5a1fa4b9b13e5d5ab2fb019c2fc147d7ecc4dafdd8e5280dc7a0bb95c5483a4f0558d81b8af1b692e72e166609997c331f43d157ce
+MISC metadata.xml 820 BLAKE2B efafb43f3bbd06143d7f3a5783708bf4a6dacc735d8caf789c14ddffde5dff23cc3dfed2bc80b60041742ef090f0e7507aaf45a89e1476aca9fb3da28bf40dab SHA512 c1b29a1abf368d7235a63eb9e72e312a5033319a21f326f0411a55d837871ad53ffa2c691a86ae93a5d2692708f7c8ca84b216c4132a7f4ec17f87b6dcf2d7ab
diff --git a/net-firewall/pglinux/metadata.xml b/net-firewall/pglinux/metadata.xml
index dcc75e5ecdcd..e2699e133a8b 100644
--- a/net-firewall/pglinux/metadata.xml
+++ b/net-firewall/pglinux/metadata.xml
@@ -10,7 +10,6 @@
 	</upstream>
 	<use>
 		<flag name="cron">Install cron script</flag>
-		<flag name="logrotate">Install logrotate.d file</flag>
 	</use>
 	<longdescription lang="en">
 	PeerGuardian Linux (pgl) is a privacy oriented firewall application. It blocks
diff --git a/net-firewall/pglinux/pglinux-2.3.1_p20171006-r1.ebuild b/net-firewall/pglinux/pglinux-2.3.1_p20171006-r1.ebuild
new file mode 100644
index 000000000000..c3893308ef37
--- /dev/null
+++ b/net-firewall/pglinux/pglinux-2.3.1_p20171006-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT=9d91ab6a8e6bc2b41e985aa698eb5c1eb364fea8
+MY_PN="peerguardian"
+MY_P="${MY_PN}-${PV}"
+inherit autotools qmake-utils linux-info systemd xdg-utils
+
+DESCRIPTION="Privacy oriented firewall application"
+HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
+SRC_URI="https://sourceforge.net/code-snapshots/git/p/pe/peerguardian/code.git/peerguardian-code-${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cron dbus networkmanager qt5 zlib"
+REQUIRED_USE="qt5? ( dbus )"
+
+DEPEND="
+	net-libs/libnetfilter_queue
+	net-libs/libnfnetlink
+	dbus? ( sys-apps/dbus )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		|| ( kde-plasma/kde-cli-tools[kdesu] x11-misc/ktsuss )
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}
+	net-firewall/iptables
+	sys-apps/sysvinit
+	cron? ( virtual/cron )
+	networkmanager? ( net-misc/networkmanager:= )
+"
+BDEPEND="
+	app-arch/unzip
+	sys-devel/libtool:2
+	virtual/pkgconfig
+"
+
+CONFIG_CHECK="~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_TARGET_NFQUEUE
+	~NETFILTER_XT_MATCH_IPRANGE
+	~NETFILTER_XT_MARK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NF_CONNTRACK
+	~NF_CONNTRACK_IPV4
+	~NF_DEFRAG_IPV4
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_TARGET_REJECT"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+S="${WORKDIR}/${MY_PN}-code-${COMMIT}"
+
+src_prepare() {
+	default
+	sed -e 's:/sbin/runscript:/sbin/openrc-run:' \
+		-i pglcmd/init/pgl.gentoo.in || die "Failed to convert to openrc-run"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-lowmem
+		--with-iconsdir=/usr/share/icons/hicolor/128x128/apps
+		--with-gentoo-init
+		--localstatedir=/var
+		--enable-logrotate
+		$(use_enable cron)
+		$(use_enable dbus)
+		$(use_enable networkmanager)
+		$(use_with qt5)
+		LRELEASE=$(qt5_get_bindir)/lrelease
+		LUPDATE=$(qt5_get_bindir)/lupdate
+		MOC=$(qt5_get_bindir)/moc
+		QMAKE=$(qt5_get_bindir)/qmake
+		RCC=$(qt5_get_bindir)/rcc
+		UIC=$(qt5_get_bindir)/uic
+		$(use_enable zlib)
+		--with-systemd="$(systemd_get_systemunitdir)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/{lib,log,spool}/pgl
+	rm -rf "${ED}"/tmp || die
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	elog "  app-arch/p7zip (needed for blocklists packed as .7z)"
+	elog "  app-arch/unzip (needed for blocklists packed as .zip)"
+	elog "  virtual/mta (needed to send informational (blocklist updates) and"
+	elog "    warning mails (if pglcmd.wd detects a problem.))"
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-firewall/pglinux/pglinux-2.3.1_p20171006.ebuild b/net-firewall/pglinux/pglinux-2.3.1_p20171006.ebuild
deleted file mode 100644
index 4c8bd3811e74..000000000000
--- a/net-firewall/pglinux/pglinux-2.3.1_p20171006.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT=9d91ab6a8e6bc2b41e985aa698eb5c1eb364fea8
-MY_PN="peerguardian"
-MY_P="${MY_PN}-${PV}"
-inherit autotools qmake-utils linux-info systemd xdg-utils
-
-DESCRIPTION="Privacy oriented firewall application"
-HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
-SRC_URI="https://sourceforge.net/code-snapshots/git/p/pe/peerguardian/code.git/peerguardian-code-${COMMIT}.zip -> ${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cron dbus logrotate networkmanager qt5 zlib"
-REQUIRED_USE="qt5? ( dbus )"
-
-DEPEND="
-	net-libs/libnetfilter_queue
-	net-libs/libnfnetlink
-	dbus? ( sys-apps/dbus )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		|| ( kde-plasma/kde-cli-tools[kdesu] x11-misc/ktsuss )
-	)
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}
-	net-firewall/iptables
-	sys-apps/sysvinit
-	cron? ( virtual/cron )
-	logrotate? ( app-admin/logrotate )
-	networkmanager? ( net-misc/networkmanager:= )
-"
-BDEPEND="
-	app-arch/unzip
-	sys-devel/libtool:2
-	virtual/pkgconfig
-"
-
-CONFIG_CHECK="~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_TARGET_NFQUEUE
-	~NETFILTER_XT_MATCH_IPRANGE
-	~NETFILTER_XT_MARK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NF_CONNTRACK
-	~NF_CONNTRACK_IPV4
-	~NF_DEFRAG_IPV4
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_TARGET_REJECT"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-S="${WORKDIR}/${MY_PN}-code-${COMMIT}"
-
-src_prepare() {
-	default
-	sed -e 's:/sbin/runscript:/sbin/openrc-run:' \
-		-i pglcmd/init/pgl.gentoo.in || die "Failed to convert to openrc-run"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-lowmem
-		--with-iconsdir=/usr/share/icons/hicolor/128x128/apps
-		--with-gentoo-init
-		--localstatedir=/var
-		$(use_enable cron)
-		$(use_enable dbus)
-		$(use_enable logrotate)
-		$(use_enable networkmanager)
-		$(use_with qt5)
-		LRELEASE=$(qt5_get_bindir)/lrelease
-		LUPDATE=$(qt5_get_bindir)/lupdate
-		MOC=$(qt5_get_bindir)/moc
-		QMAKE=$(qt5_get_bindir)/qmake
-		RCC=$(qt5_get_bindir)/rcc
-		UIC=$(qt5_get_bindir)/uic
-		$(use_enable zlib)
-		--with-systemd="$(systemd_get_systemunitdir)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/{lib,log,spool}/pgl
-	rm -rf "${ED}"/tmp || die
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "  app-arch/p7zip (needed for blocklists packed as .7z)"
-	elog "  app-arch/unzip (needed for blocklists packed as .zip)"
-	elog "  virtual/mta (needed to send informational (blocklist updates) and"
-	elog "    warning mails (if pglcmd.wd detects a problem.))"
-
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index b25f0f78ec24..9fcd130fea52 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9a4e15fb01a5..964ef56017fe 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -9,10 +9,10 @@ DIST samba-4.14.4.tar.gz 18645552 BLAKE2B 4fbf4b000496b66c7c464a4b522108fde12df3
 DIST samba-4.14.5.tar.gz 18653694 BLAKE2B 6c8fdafb20d6a42797a2f55f29e9f4a239845fd802c0384c0cb88d916f240a1ed18fb3e9a041eb70e8c2f56abb6c63f3229d40d710ab5ddf3697e0161d61726f SHA512 ef50aae93141a41034a10eb0b1a135d4b8b28c63663b930d24d6199d9ffd1fd139b6443d1859df19d3299b507a4a1c2810de057e2affd4e8b8cfc7175fdd7b39
 DIST samba-4.14.6.tar.gz 18661572 BLAKE2B d3bd9ba13c89afab1a2d119cbd0488240802710b24c6f681ba962804c6f5097003ed939da8747582aab710405f09ca90eded06eeddd3dd42a5aaa2a99be6be1b SHA512 0ce3f46b2693daa27656fe9a04925cbe7dd398342cab352f0422a350eb9f91d1ea6d64fb18d04010b93fb3c0b9fe6434b23deb1f26018bd1f9bdc1b0f97beca2
 DIST samba-4.15.0rc1.tar.gz 18860258 BLAKE2B c6c49a32de44e491a6ca3018b0f00c350590f15e18a21342979191d88b84584374d0c2ec38091e281c262a90a75fbf5b8d3c23d0a2fc7beb097723006bf3b4e5 SHA512 df5c285cbe37acc95513ed740e82df5823cfcfc6701606998115e82e6c9e8576ca1f8fb93e52d9a7f109f78878575e34d214c30ed5cfa177117d280e0e27597d
-EBUILD samba-4.13.10-r1.ebuild 9919 BLAKE2B 3e0578d885b2b5522fd1c73f5866da9e569b3af48c0f0dc73615d34a4660c6667c69ed5c4ee402d794f6e1fe760a30239f4054d38a3ea2a5ca331f7c0cd1a8b1 SHA512 902db52a306abbb05da7cc038982b34ec5eb7f8caf76df8425595cda00b8370810b5a8e8eb28a53bfb4802b1de6c3aaeaf8b3358af3f4668e01d572b160709a0
-EBUILD samba-4.13.9-r2.ebuild 9912 BLAKE2B 553eab8ba3baf011c1dff4850012d060d2654859327d24769ec8f3445f53ae3e7ac7534e70dae2b0f6d9753a3fa5ecb782e1288198ff6fc2ba6c58b238d83204 SHA512 f9cf86b0d7fc531994da8a79e5de2fd203cce55cb246682567af8ab81b363d5afd8a192c9695ca51109fe345dc928ec7cfb0a3dfc13e969e22c64658aae01985
-EBUILD samba-4.14.4-r2.ebuild 10020 BLAKE2B 44726dca2766df9be4de0f6be825bdd3193557984dce22c1bab88b3c63d2b346a7e020d854570a3d8085d94f77b867f4fd284ec1ec5ff07e90aaa5c3a84b11bc SHA512 112486c07184b2c03603377c6e8177944be098609fe9a1101e86526ece343a37bac135959b790949e0af5d86c1574f506ad8cadd422009f025519121a2e598bc
-EBUILD samba-4.14.5-r2.ebuild 10039 BLAKE2B 8909c26b317252584cbf09b526147c49ff6318607a67cbaf5c6e20b8303abcad0aa70dcae38865019103f0cf97c2693a7f60744ab89f229f811b3567e26bf8a6 SHA512 19cfe814c8efcee282441c038a20ea46dc333aa8cb15fa56aa2b7335b536872f91c6b579a6dda87fc769485e9e4c9b2988bba532f54f5b81ba77e46b4da39802
-EBUILD samba-4.14.6-r1.ebuild 10020 BLAKE2B 44726dca2766df9be4de0f6be825bdd3193557984dce22c1bab88b3c63d2b346a7e020d854570a3d8085d94f77b867f4fd284ec1ec5ff07e90aaa5c3a84b11bc SHA512 112486c07184b2c03603377c6e8177944be098609fe9a1101e86526ece343a37bac135959b790949e0af5d86c1574f506ad8cadd422009f025519121a2e598bc
-EBUILD samba-4.15.0_rc1-r1.ebuild 9938 BLAKE2B a0be1105cfb464bd51bacc83671280b820b6a0ee01d959e0947a6d49503122839cd804475c9c2df1ddcc903bf0ca185046b285353d8bf8d1c9bd684f49d75ae9 SHA512 4da059efc87c1218bc0a0fb7fd56afda2d563eb7bb8f836362f4ed6f046783bc64b2b3d9e2b8b4009ecd4176d2bc3a0ad7082b485950721c527890a0b6aed64e
+EBUILD samba-4.13.10-r1.ebuild 9949 BLAKE2B ea390ab7ebf754f13df802bd7cafec9e225007ed17ff9141119b3dad161db3405e56d49797e727cbf8a4ae0077f53db28f1d459f75ba59198585ef103a3beab9 SHA512 ee3d5d92a99ff087a728432ff5033163ed6513f70cf27ddfe891c46f3614318089cbf4c65d62b029f46a8b26de9544e39d65f5d99a885e0e2289e0a0366a0d8e
+EBUILD samba-4.13.9-r2.ebuild 9942 BLAKE2B 7bee9ff108d961c7974c3605cfeb5d9c58094b379079bfae49b7c6623bc3bcc0ae6e6ec698d190e4ef96a1948b514e3aa3dc6f4e6bc1fb63a5b9535e2de452ab SHA512 a79bcfd3bf0a4576bcc31468ccad7c73a59bb921e40641f23f4fbf2267ca0ee48967279141b7ae24283df730cda43be00f59a374565b30045a38567936f75081
+EBUILD samba-4.14.4-r2.ebuild 10050 BLAKE2B c8c75e229c2a6fe845eece488c1b74513f896deda4bd44ad0608ad64fe04e59f1f9acfeb68d5eedc62dbdfd8859008c3bb8048658b5f8c08b8948f85cc4529c4 SHA512 1a083be83117996ac09684f110dfeacb1b5d51ca65d6550f284dd889ffdda2b131ff9e71a82da2bd0e6d5fb7cdb65b359f29657b8d48b57bf1363ff46236b2e7
+EBUILD samba-4.14.5-r2.ebuild 10069 BLAKE2B 612013a18e68bb9490337e0a1a5667a2943a6bc143b9a41ac166f20985a20c3f86fa12bafd9ea3fd09ab658fda9b56d479c548f222f9412151de1495833bf1dc SHA512 252b22eea885f102d0c76021a333bd724376e0850ff8783a39f87d16f6e87b664c6fc772918849a173f1106333a193cbc0b66a503239b6c223be64f1b6727206
+EBUILD samba-4.14.6-r1.ebuild 10050 BLAKE2B c8c75e229c2a6fe845eece488c1b74513f896deda4bd44ad0608ad64fe04e59f1f9acfeb68d5eedc62dbdfd8859008c3bb8048658b5f8c08b8948f85cc4529c4 SHA512 1a083be83117996ac09684f110dfeacb1b5d51ca65d6550f284dd889ffdda2b131ff9e71a82da2bd0e6d5fb7cdb65b359f29657b8d48b57bf1363ff46236b2e7
+EBUILD samba-4.15.0_rc1-r1.ebuild 9968 BLAKE2B 80eb1d44cc52ac0d7a97798d88d527c5fcea2c2e9ce49f984b971b9b265af2c455ce64ccae03803b6e4d42876ad305c263b1cc287f52c0b2c7ecf85204ce8fa5 SHA512 ee28f2034dc75df6c9ae340b29e56b0c046211cc69079434926a46e20a5539cc06a07cd6a70f33ce70a7dde76243828c3bf845fb995ed2d85d534ab290e80fc5
 MISC metadata.xml 2165 BLAKE2B 5fa428c3ddb3f45073923778fc80ca4d62090232b9bb6bcfdd0a16a6c4c51304794db41359c17b6ba9492b30dba0f42ff7ada6c8a30c5df80e83e748d8009ee9 SHA512 8723f3a16210e8da11eb1d3ea8142bff3deeaecc44c62da68a789b5364bf3456aef65794b205d24cc41eff7ba03fffd38266aea2dd1883eff5c9ca305d2032ed
diff --git a/net-fs/samba/samba-4.13.10-r1.ebuild b/net-fs/samba/samba-4.13.10-r1.ebuild
index c5eb38eb2f50..d04cb92e5119 100644
--- a/net-fs/samba/samba-4.13.10-r1.ebuild
+++ b/net-fs/samba/samba-4.13.10-r1.ebuild
@@ -320,6 +320,8 @@ multilib_src_test() {
 }
 
 pkg_postinst() {
+	tmpfiles_process samba.conf
+
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		elog "Be aware that this release contains the best of all of Samba's"
 		elog "technology parts, both a file server (that you can reasonably expect"
diff --git a/net-fs/samba/samba-4.13.9-r2.ebuild b/net-fs/samba/samba-4.13.9-r2.ebuild
index 1042fb9c1b7f..494b48393144 100644
--- a/net-fs/samba/samba-4.13.9-r2.ebuild
+++ b/net-fs/samba/samba-4.13.9-r2.ebuild
@@ -320,6 +320,8 @@ multilib_src_test() {
 }
 
 pkg_postinst() {
+	tmpfiles_process samba.conf
+
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		elog "Be aware that this release contains the best of all of Samba's"
 		elog "technology parts, both a file server (that you can reasonably expect"
diff --git a/net-fs/samba/samba-4.14.4-r2.ebuild b/net-fs/samba/samba-4.14.4-r2.ebuild
index 8c1e9a652efc..ac4c338a3303 100644
--- a/net-fs/samba/samba-4.14.4-r2.ebuild
+++ b/net-fs/samba/samba-4.14.4-r2.ebuild
@@ -324,6 +324,8 @@ multilib_src_test() {
 }
 
 pkg_postinst() {
+	tmpfiles_process samba.conf
+
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		elog "Be aware that this release contains the best of all of Samba's"
 		elog "technology parts, both a file server (that you can reasonably expect"
diff --git a/net-fs/samba/samba-4.14.5-r2.ebuild b/net-fs/samba/samba-4.14.5-r2.ebuild
index 39f4db758764..52f211eaa846 100644
--- a/net-fs/samba/samba-4.14.5-r2.ebuild
+++ b/net-fs/samba/samba-4.14.5-r2.ebuild
@@ -324,6 +324,8 @@ multilib_src_test() {
 }
 
 pkg_postinst() {
+	tmpfiles_process samba.conf
+
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		elog "Be aware that this release contains the best of all of Samba's"
 		elog "technology parts, both a file server (that you can reasonably expect"
diff --git a/net-fs/samba/samba-4.14.6-r1.ebuild b/net-fs/samba/samba-4.14.6-r1.ebuild
index 8c1e9a652efc..ac4c338a3303 100644
--- a/net-fs/samba/samba-4.14.6-r1.ebuild
+++ b/net-fs/samba/samba-4.14.6-r1.ebuild
@@ -324,6 +324,8 @@ multilib_src_test() {
 }
 
 pkg_postinst() {
+	tmpfiles_process samba.conf
+
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		elog "Be aware that this release contains the best of all of Samba's"
 		elog "technology parts, both a file server (that you can reasonably expect"
diff --git a/net-fs/samba/samba-4.15.0_rc1-r1.ebuild b/net-fs/samba/samba-4.15.0_rc1-r1.ebuild
index 6f9535c6ca1b..600ade433775 100644
--- a/net-fs/samba/samba-4.15.0_rc1-r1.ebuild
+++ b/net-fs/samba/samba-4.15.0_rc1-r1.ebuild
@@ -320,6 +320,8 @@ multilib_src_test() {
 }
 
 pkg_postinst() {
+	tmpfiles_process samba.conf
+
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		elog "Be aware that this release contains the best of all of Samba's"
 		elog "technology parts, both a file server (that you can reasonably expect"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 2932393946d1..3176cfd13fc4 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 62d9b9ec49ff..d2c801f9f497 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -7,6 +7,6 @@ AUX ejabberd.tmpfiles.conf 78 BLAKE2B d516116f500baf9972b4bdee069ab9930bcc8aa309
 AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aab434cfceda34120880184488659e30f1961d576566111b4159b34b30fea5307bc255ce382781d SHA512 b66dfed9967e6524af8f46204eadcbed0a427ecc5cca30ec1fd58373714467077858a252c039828a18130244d46a54a019e17828cf3ac055c18044c2a6881449
 DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578 SHA512 7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
 DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B 85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e SHA512 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
-EBUILD ejabberd-20.04.ebuild 9045 BLAKE2B 446556a5dd96d34c6287f6d7fe212efd6f679753ab9ce98e359dafca6a82ce1b78d1848a6803177dacd7299dd8e54493dfdb3c3fb1ca6e89d2b948e2309b0af5 SHA512 75671043e79bdebbadb53befafe7014806bdf493d88c54eeae8cdd5d34bca1d519aee2d0e852a9b3de6cc160dfbc0a13d61ff9ea0f7d92c321039ff2d857af87
-EBUILD ejabberd-21.04.ebuild 8474 BLAKE2B 8e9de7e0dc60e26980e69ac949deb37b533260e2c82127c0c20ba854ff0bb1578ccd25b245f8526e633610e8e597ce42537d5260e7f5791c3e925c1d4b3653b5 SHA512 c8f42da30aee30e4c722467fc307cd9c862c101f71e95bcc547357b502097ce4295669adf42a4ceceb704d6a4b6e81683c4a388bb9f8decfd511a941ac12c7a2
+EBUILD ejabberd-20.04.ebuild 9084 BLAKE2B eaf5b71f770f15df5697b52aafcd06c45f7f23ceae80e488bb9d815a2b6996349470541b6d4dc94bf1a98d2f78733f39236263dd6bec70a852ee800d1f9af994 SHA512 963b849ffb6d2a6879777205a7bc84349fb379eb00b8afbd4d574c77fa276246e943c92598bfeba0badfe0a7b92e4b07c6357e0b91ca7cb49cce90c1b8653d60
+EBUILD ejabberd-21.04.ebuild 8513 BLAKE2B d6f4f4b124f0adadf319caedbf6fe29f63423c8a1b204f9e7577f8b2752264cd754682b7ea61ada493326c41dee9d2b77f819d833a4b9179cc6f4686924ce752 SHA512 606f72c427143783f2f0555c2aca330fff0c8e10dee3e6c1c267f537d8eebaaf7ac4a6ef723e3e8cbfe900bc9b8fe91529268b08f19ecfda43e54317472ea8f2
 MISC metadata.xml 1516 BLAKE2B e156fd8588db78fd863ed478db344d54ed4b401426c602b63b3652a2bdf0db426eac2f46797f40443225abc9fd4f45060701030e7002a31b5162a61712cc8c9b SHA512 091f443f98785ac57d5c9a8c5dfa258029cf5f2b3f6ca90ec4330881b7331c7490cd885f1a477574bc8d6af6a75ec3ea9c8a6d1051194f3cb0636c5672d63671
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild b/net-im/ejabberd/ejabberd-20.04.ebuild
index e2df234b563a..90c657f64b01 100644
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -271,6 +271,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.tmpfiles.conf
+
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		echo
 		elog "For configuration instructions, please see"
diff --git a/net-im/ejabberd/ejabberd-21.04.ebuild b/net-im/ejabberd/ejabberd-21.04.ebuild
index 3cf528129054..245c006f1141 100644
--- a/net-im/ejabberd/ejabberd-21.04.ebuild
+++ b/net-im/ejabberd/ejabberd-21.04.ebuild
@@ -252,6 +252,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.tmpfiles.conf
+
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		echo
 		elog "For configuration instructions, please see"
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index d3a90deeba15..27262f458396 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_5.8.0_amd64.deb 111604106 BLAKE2B 33a6e3a6cc57e193f4a5d85fee99f10a20a3eeacf39d8fc82bd23a7b62f43d17a605e1111b84ad1ded7292ca04f4cd1dcb367b5b44d69edc91fe32084a3ab7b1 SHA512 a85242647370913de2e623798f0851ff9c50c3dd67e7990637450537120ad75d8473424ef7c41efc08df549384392844df9e6851a19600bd3a436309db5da3b7
-EBUILD signal-desktop-bin-5.8.0.ebuild 5012 BLAKE2B a1643e0d6e909fdd2314b8889b971b94099863c554ac23b03faabdbd915fde783580b2bc4327b11395a52d507719864a163e0b425980a247d3c9298a11a6ab11 SHA512 b96169f7370e9523d01a2809d685553ef4701c95d4e16de86dea786ca1d2711cf7c6bb489cde64d45352deb9ec1f1834a95c0d0b5dc244d77201622db2f3d081
+DIST signal-desktop_5.11.0_amd64.deb 111843804 BLAKE2B 3c3d10ce5077d7ae46ffcde35d5a711ddfe6f2138305442d4ac747fd50ae5bbd46c756ab07ecfe9f4e422fe0fa89c5cf1ac90978714d4a65acfa381ce061d15a SHA512 f08ee9716678613e5d5a1036703dfb38b6862dac3b61ef05fbeb49d6d38cc86090d16f3925be2e99bdf252d060d04a699fbaea3a2e0b91170eb50103ec3f509e
+EBUILD signal-desktop-bin-5.11.0.ebuild 2789 BLAKE2B 1ade4d51b1a472ef7c4b4396b2044886a7bd1e06461b26c75977ac6eb7f90619c6761ce0b4f9db0d245bcc9f97cf343cf5dead03d024eb388d8a50132bd0134c SHA512 aa2c22282010509bc52c45e63f891c1327b8bc141968cb587feab339c41b2515411cc2f4c0c5f226b661dceab68fa630bd9c4ba5296776b846213a9dbaedd908
 MISC metadata.xml 396 BLAKE2B 38a79e09275e5b085003b4fd511917b1ada4b25a7f7d8693da9fa35be6f924fd3a8cac88aa689a482391b3ccc89a07ec1946b8d0dc1ec5c45f23b94f65095ade SHA512 e173a6d2920e003012ffa756fc3e0aa15bbea2eb63b37b9387ec016680cdef7d7db0d510f4663e2a941df4b587c367d3af66ef0fa8d0c4b069648b1dbfd0d4ad
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.11.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.11.0.ebuild
new file mode 100644
index 000000000000..0cbadc9286be
--- /dev/null
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.11.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-bin/}"
+
+inherit pax-utils unpacker xdg
+
+DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
+HOMEPAGE="https://signal.org/
+	https://github.com/signalapp/Signal-Desktop"
+SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+sound"
+RESTRICT="splitdebug"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-accessibility/at-spi2-core
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[X(+)]
+	net-print/cups
+	sys-apps/dbus[X]
+	x11-libs/gdk-pixbuf
+	x11-libs/cairo
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxshmfence
+	x11-libs/pango
+	sound? (
+		|| (
+			media-sound/pulseaudio
+			media-sound/apulse
+		)
+	)
+"
+
+QA_PREBUILT="
+	opt/Signal/chrome-sandbox
+	opt/Signal/libEGL.so
+	opt/Signal/libGLESv2.so
+	opt/Signal/libffmpeg.so
+	opt/Signal/libvk_swiftshader.so
+	opt/Signal/libvulkan.so.1
+	opt/Signal/resources/app.asar.unpacked/node_modules/*
+	opt/Signal/signal-desktop
+	opt/Signal/swiftshader/libEGL.so
+	opt/Signal/swiftshader/libGLESv2.so"
+
+src_prepare() {
+	default
+	sed -e 's| --no-sandbox||g' \
+		-i usr/share/applications/signal-desktop.desktop || die
+	unpack usr/share/doc/signal-desktop/changelog.gz
+
+	rm opt/Signal/resources/app.asar.unpacked/node_modules/{ffi-napi/node_modules/ref-napi/prebuilds/linux-arm64/electron.napi.armv8.node,ffi-napi/node_modules/ref-napi/prebuilds/linux-arm64/node.napi.armv8.node,ffi-napi/prebuilds/linux-arm64/node.napi.uv1.armv8.node,ref-napi/prebuilds/linux-arm64/electron.napi.armv8.node,ref-napi/prebuilds/linux-arm64/node.napi.armv8.node} || die
+}
+
+src_install() {
+	insinto /
+	dodoc changelog
+	doins -r opt
+	insinto /usr/share
+
+	if has_version media-sound/apulse[-sdk] && ! has_version media-sound/pulseaudio; then
+		sed -i 's/Exec=/Exec=apulse /g' usr/share/applications/signal-desktop.desktop || die
+	fi
+
+	doins -r usr/share/applications
+	doins -r usr/share/icons
+	fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox
+	fperms u+s /opt/Signal/chrome-sandbox
+	pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox
+
+	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "For using the tray icon on compatible desktop environments, start Signal with"
+	elog " '--start-in-tray' or '--use-tray-icon'."
+}
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.8.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.8.0.ebuild
deleted file mode 100644
index 4af36932f98e..000000000000
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.8.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-bin/}"
-
-inherit pax-utils unpacker xdg
-
-DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
-HOMEPAGE="https://signal.org/
-	https://github.com/signalapp/Signal-Desktop"
-SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
-
-LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+sound"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk
-	app-accessibility/at-spi2-core
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[X(+)]
-	net-print/cups
-	sys-apps/dbus[X]
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/pango
-	sound? (
-		|| (
-			media-sound/pulseaudio
-			media-sound/apulse
-		)
-	)
-"
-
-QA_PREBUILT="opt/Signal/signal-desktop
-	opt/Signal/chrome-sandbox
-	opt/Signal/crashpad_handler
-	opt/Signal/libEGL.so
-	opt/Signal/libffmpeg.so
-	opt/Signal/libGLESv2.so
-	opt/Signal/libnode.so
-	opt/Signal/libvulkan.so.1
-	opt/Signal/libVkICD_mock_icd.so
-	opt/Signal/libvk_swiftshader.so
-	opt/Signal/libvulkan.so
-	opt/Signal/swiftshader/libEGL.so
-	opt/Signal/swiftshader/libGLESv2.so
-	opt/Signal/resources/app.asar.unpacked/node_modules/@journeyapps/sqlcipher/lib/binding/napi-v6-linux-x64/node_sqlite3.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/@signalapp/signal-client/prebuilds/linux-x64/node.napi.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/curve25519-n/build/Release/curve.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/build/Release/ffi_bindings.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/node_modules/ref-napi/prebuilds/linux-x64/electron.napi.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/node_modules/ref-napi/prebuilds/linux-x64/node.napi.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/prebuilds/linux-x64/node.napi.uv1.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux_x64.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ref-array-napi/node_modules/ref-napi/build/Release/binding.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/build/Release/binding.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/prebuilds/linux-x64/electron.napi.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/prebuilds/linux-x64/node.napi.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc-x64.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/8.10.6/lib/libvips-cpp.so.42
-	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup.so
-	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup-x64.so
-	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/node_modules/ref-napi/build/Release/binding.node"
-
-RESTRICT="splitdebug"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-	sed -e 's| --no-sandbox||g' \
-		-i usr/share/applications/signal-desktop.desktop || die
-	unpack usr/share/doc/signal-desktop/changelog.gz
-
-	rm opt/Signal/resources/app.asar.unpacked/node_modules/{ffi-napi/node_modules/ref-napi/prebuilds/linux-arm64/electron.napi.armv8.node,ffi-napi/node_modules/ref-napi/prebuilds/linux-arm64/node.napi.armv8.node,ffi-napi/prebuilds/linux-arm64/node.napi.uv1.armv8.node,ref-napi/prebuilds/linux-arm64/electron.napi.armv8.node,ref-napi/prebuilds/linux-arm64/node.napi.armv8.node} || die
-}
-
-src_install() {
-	insinto /
-	dodoc changelog
-	doins -r opt
-	insinto /usr/share
-
-	if has_version media-sound/apulse[-sdk] && ! has_version media-sound/pulseaudio; then
-		sed -i 's/Exec=/Exec=apulse /g' usr/share/applications/signal-desktop.desktop || die
-	fi
-
-	doins -r usr/share/applications
-	doins -r usr/share/icons
-	fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox
-	fperms u+s /opt/Signal/chrome-sandbox
-	pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox
-
-	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "For using the tray icon on compatible desktop environments, start Signal with"
-	elog " '--start-in-tray' or '--use-tray-icon'."
-}
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 092de5912f78..340f0689e0ba 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -4,5 +4,5 @@ AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
 DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B 45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792 SHA512 8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7
-EBUILD spectrum2-2.0.13-r2.ebuild 2423 BLAKE2B c5e01b9ba0bafd07bbb1a0ac9a5775bbc5f361ff6cf71b470820ac65c743b72b4a3b6be7cd588fb44c409c8a8a4177a73f5836b2cf754505acbc20b87802d558 SHA512 a2a670a25707546f2401d39a13d53f77513ac346a918100dbce20a35e277c96c1e641ad38ea506052d20707ba8ff1ad2a50fa1b94c978ce2223c50f8497dd359
+EBUILD spectrum2-2.0.13-r2.ebuild 2476 BLAKE2B a564a421adb89943b03d8877401effceab8c26d69d13fba8da20f4d259f67cc752b477a187df0f925980fd34b419607ceb37cd8d162ebb5d264e4d92f0b3115d SHA512 3a96447634d3197f58afc15815e5d6ee7520a974edf503b1879f5ae7210decf15d3556be687900c26eac7632f1401a20d260e7b6fcc8a1e857ac04a1d8c07a53
 MISC metadata.xml 1140 BLAKE2B 279808a98359761ce2620d44575f320de77b5b19f795d55c9b3b16f13eec2ab5fd900c00adef81ba87aacd41d9527ca998bcd27fc6a7d3c3c61d668791f501a4 SHA512 8adf9a85df87528db06d13c830dd96bb2aa77a3d22bb5701c23db0951ac67d7b6b29c8ffa5af11a6bd15e84e7a0722ea99f18e7b6f9ca00b5b42dfc36d3a1a7d
diff --git a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
index ea3909e6addc..e270aa2de67e 100644
--- a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -108,3 +108,7 @@ src_install() {
 
 	einstalldocs
 }
+
+pkg_postinst() {
+	tmpfiles_process spectrum2.conf
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 6520c15e49a3..c8dc7886b527 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,8 +1,8 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-DIST tdesktop-2.8.1.tar.gz 15334528 BLAKE2B 915823eef057634404dd2bf1e75afdeb5c8768d7c7c7435216f31eec058b1cb8e5f96a47b1faeeecdfa46b4d0acb9dd1839978c3120ef8d41144608d89e45710 SHA512 2da82e6f6c33b5f404d20687e849aff17ce5de24c741adf2276e252643273f558a822c449d1acfd7deeb64644da94d472ddb55eb1881464390efa5d95219e489
-DIST tdesktop-2.8.9.tar.gz 15383963 BLAKE2B 2b156a5b4557c4aa5f358dbc6105cca2ff9d838160e71d6476332c2d4d9b78ea13b659cd95e7620e854d3116e44c537d2080dee424f6a942a0d9c0aa97c73e0d SHA512 537177e47d37772ae623ea4cca68df1e068362edd56a9af86fa02cabc44693403afe020460af709454148333711a34f34169dd239a9ef56e9996b5b0b44ef9c5
-DIST tsetup.2.8.1.tar.xz 37205872 BLAKE2B 915041cf403feca63b796747c3a072be555b729401a4290ad3773794a0d6df22eddbfea930fb2b17d8aa5aab337e6d8b45e28e710ffe34b80a7e033ae10e83be SHA512 e84cbec26420a633c93adcebe514b530bcb7fe425926795521d06f8f60377107f4174b57713fe248b9bfa7642ef1ff7709a825e96cf0b8d76e0e7e2ec7454aa2
-DIST tsetup.2.8.9.tar.xz 38714912 BLAKE2B fa1049d2c921dd8e7bfcf4777c5017ec1deb3508d24c79250dae774194c7e4e26bcc9313378e6c58255012baef7302545cd12a70ab64d908d68ef1475af1677a SHA512 b8c6ac6be16b4bc143c17c711ee46c73c986712f0fd89e3d4467f108c3b9e675f83a479569cf5cfc06c81c581080b75c2610fecf54644e600985d9b650d2f55a
-EBUILD telegram-desktop-bin-2.8.1.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
-EBUILD telegram-desktop-bin-2.8.9.ebuild 1327 BLAKE2B e60335f603996ebcd6d52896542d170ce624db0ef870b79e25903513d9f15975e4541b9c2b942ee204fa0d5c6b2b725665dbb19c6efb9c875531f1229e1364b2 SHA512 3be2436e171b335d1e92f52778e1a9c8fa504c62c46a1068a0c47ac570417c195084d6eb1a65038eb360b26d2dca6fb7d9a44154d97e1050960523576ae4fa30
+DIST tdesktop-2.8.10.tar.gz 15383960 BLAKE2B 1849cce36d8b339087b84855b05318b0af143ae04fd0016811082b98073ed9560945590b7aeec4cd04751a9debe8211f78b958364f0f24419c028f0198f306b1 SHA512 e0986b932de4f4618c8dd1cc669eb5bd2bca0b3ca47856f911da0606781c86abab3ac1eeecf49bb077a6a4f09b2807bdc512496928666b175f4659c13d6f075b
+DIST tdesktop-2.9.0.tar.gz 15021044 BLAKE2B e958999080bd44c07170fa6898d774184323e6c689f3dc07a30ddd8c237f49f741717e4dd8b54ab69ef52ec60848a1b91cd2d039f828e8cbdd2778a045cbd642 SHA512 6c139de3c36f124e62dbb22306add6dbb2b2b11003150f3d41bf750e321bfc38205690d927fc7c217618236bf5574fdfc85723689e098511f789f8de1793ea0a
+DIST tsetup.2.8.10.tar.xz 38712292 BLAKE2B 6e9337fd7bc30d21ef28e21ada0e560d795c6de9638a614b563838dcbafeed0790295795512ddf5ef8cd5a2a2a5cb498a263531066c4078529c947494fcc537b SHA512 cd9d7bded6c8ebe44e09ee9f8029f96802d20a0ba25167240e45a400c71bdc6df217721f64ed6fbc7a79b50d342107e2573c671bf31b1f0b0960a81334c3b140
+DIST tsetup.2.9.0.tar.xz 38751860 BLAKE2B 4123faca33e858d43896181a740e70c585f96e9265e2c4e1e5f03bdd1e4b7eafd774180334773dc22fcddd0c52a222a592baa802b46f476990a1b475fca5cb8b SHA512 48a2cd83cf4bfe6709317192307435664fc61828c40771415098e407582f3288ef6afe372c349d28e6b1092252332db2f4bf89ee9b6a11a2e970d105aad4ca42
+EBUILD telegram-desktop-bin-2.8.10.ebuild 1327 BLAKE2B e60335f603996ebcd6d52896542d170ce624db0ef870b79e25903513d9f15975e4541b9c2b942ee204fa0d5c6b2b725665dbb19c6efb9c875531f1229e1364b2 SHA512 3be2436e171b335d1e92f52778e1a9c8fa504c62c46a1068a0c47ac570417c195084d6eb1a65038eb360b26d2dca6fb7d9a44154d97e1050960523576ae4fa30
+EBUILD telegram-desktop-bin-2.9.0.ebuild 1327 BLAKE2B e60335f603996ebcd6d52896542d170ce624db0ef870b79e25903513d9f15975e4541b9c2b942ee204fa0d5c6b2b725665dbb19c6efb9c875531f1229e1364b2 SHA512 3be2436e171b335d1e92f52778e1a9c8fa504c62c46a1068a0c47ac570417c195084d6eb1a65038eb360b26d2dca6fb7d9a44154d97e1050960523576ae4fa30
 MISC metadata.xml 616 BLAKE2B d92266b23ce1be2d3180a55b0723b6ea1bd2383e95ca7b216f845b13b5b86a23f44ba42998c13de91bc6b468ba5d0b0ac04a8093454fd512c9a2c3daf3106c17 SHA512 3db845ccdac1b80efeaf903a82bd11a23df8e93458143fb82499053a14a1bed515380d96a2c32f1ad94f58107b61453e8dcdddb4ec71fd570fd04ff35bc9ca21
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.1.ebuild
deleted file mode 100644
index 6821536278c0..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop optfeature xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT="usr/lib/${PN}/Telegram"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	>=media-libs/fontconfig-2.13
-	media-libs/freetype:2
-	media-libs/libglvnd[X]
-	>=sys-apps/dbus-1.4.2[X]
-	sys-libs/zlib
-	x11-libs/libSM
-	x11-libs/libdrm
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	exeinto /usr/lib/${PN}
-	doexe "Telegram"
-	newbin "${FILESDIR}"/${PN} "telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "spell checker support" app-text/enchant
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.9.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.10.ebuild
index 5d9bb593c191..5d9bb593c191 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.9.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.10.ebuild
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.9.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.9.0.ebuild
new file mode 100644
index 000000000000..5d9bb593c191
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.9.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/lib/${PN}/Telegram"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	media-libs/libglvnd[X]
+	>=sys-apps/dbus-1.4.2[X]
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libdrm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	exeinto /usr/lib/${PN}
+	doexe "Telegram"
+	newbin "${FILESDIR}"/${PN} "telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 4a60f9430016..23f774c6688e 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index 7c96559993e9..da9a44a6e204 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -1,5 +1,5 @@
 AUX ngircd.init-r1.d 388 BLAKE2B 10b6d4eb2cd39fe4e3087461cdc15f2ee8f1002e826552e145903b69e16ce46169a2dde19e03af38228ed9ede0473a828aa8cd123ab4a2b043fde448bb180954 SHA512 12e62e23899d1143a35e60bf983c319f72aa13c49123b497963f96317b2990cb2529919336da5a9b5c230e55479c289358261af92d25ef54bd19079908e18158
 DIST ngircd-26.1.tar.gz 562938 BLAKE2B a1a4ca8b6e12a02cb4ba2e07d777cf77051b5330464c91634cfac0b385157ab7c648e3b71151247bc8ee6cc847e84755fdca3d9b4a25205bbb57b8296995dd17 SHA512 4a3ee379dd8d8655a71134c745f750359ceb0512e184db555f65f2bcab68087480365a35680a9ec75b1e6eb0fef23e1cbe0a0e13c3c58d211e5a520a8eeaa71c
 DIST ngircd-26.1.tar.gz.sig 310 BLAKE2B 108daa66aeccd51468aa0c6ab2de18c3ce476e812145902186ac4b3b8b29b0da32057c5a6f44133cfa4507310a9a76a001301ebe2d37ca809e1b7d8502aaa492 SHA512 e0b6b28c65f1363c0e8043378d52bccc0a634d7c17018edbc33130c9dbc4c2896f3b3a3ab758746707b37e3e527abbd61e5af8c1455d5fcc5b1b202758c82576
-EBUILD ngircd-26.1-r1.ebuild 2224 BLAKE2B 28c7d3c23b46b67de978c857a4ea694ebd95be927a534589a30501cd127ff8a6c655fecb1165c8162d144cea6a3d9bfd419fe47ea7c5ffd3e9ce3cc42ef47c97 SHA512 4ccc4d187ccd312309723069890e73342d829b3704bc8ec3c66156dd28b64b1420bfc1c5add18d6e6ba3b0f943cfaec0d4d9e2f609260de18fbdb4ad59b196ce
+EBUILD ngircd-26.1-r1.ebuild 2232 BLAKE2B d3b2f3936585c71ba14ef210446a8d05ffabcc8f0e8becae453189fbf31f01b1466272e6e03804e02c8b90d36e0eafe675b258131b851ae71ed7fc6c6d010af9 SHA512 24f5b93b745ce9706f11ccae7b30c42fe406bf68ae9c694a464c4432cc672e365d1ae388cad3d1da4438f981e5eb017d924ef530c8a644c8f469f8a755758376
 MISC metadata.xml 650 BLAKE2B dd80efa442d59f04e26bb338e371ffa8380a4cdbb630db30e25adbaa930d9f0e4a486bbd05321b8185c23558ad4e29023153a69d1214294c345b46685eb7de86 SHA512 9b8879892c2edc6c7792c22a684f87ae559a43b034ee66f6242e73075012e1f53a33a63fc3ffa62c41f5fd620a4be6c1ffc57a1b62cf42ffa3c032cec4ff743b
diff --git a/net-irc/ngircd/ngircd-26.1-r1.ebuild b/net-irc/ngircd/ngircd-26.1-r1.ebuild
index b85654fa0929..4722361c3540 100644
--- a/net-irc/ngircd/ngircd-26.1-r1.ebuild
+++ b/net-irc/ngircd/ngircd-26.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alexbarton.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/alexbarton.asc
 inherit verify-sig
 
 DESCRIPTION="An IRC server written from scratch"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f5fea1013c78..7afc0407d39a 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libcrafter/Manifest b/net-libs/libcrafter/Manifest
index ad394b7824f1..d65aec57f59a 100644
--- a/net-libs/libcrafter/Manifest
+++ b/net-libs/libcrafter/Manifest
@@ -1,5 +1,5 @@
 AUX libcrafter-0.3_p20171019-libpcap.patch 1679 BLAKE2B a11d50715c98a087b5a858b3a2205fbef50762e1c553887e3e49e10bca39c88e82dff8110288e97eec3614e38cbfc839f1a2ef93de92495f859654b90daed96b SHA512 9d4e2eb90d74511ca9d192e855e72fa691a725af4db273cae9241d6c19b2340882a7e659c8eba62657ade5aa634f32a7aaa2e00a1ca43a2a1cde67c88743f9c2
 DIST libcrafter-1.0.tar.gz 116514 BLAKE2B 6f7adee30b1f7be1bf03fedd39deb53ddc7284934f908ebb056726c31adcaa133405a13c06fa6d35b066992e5ccf24eb971d46a44dcad6932009c1d35fc0c0f7 SHA512 146f34831bf26047be06a0dea406ed0495990fd4256c598b5a4ddea4ab8cc6635dbbe98010cb73ada94ec6bd8be65cdcb3489de7dd9b961711707047f94fb48d
-EBUILD libcrafter-1.0.ebuild 786 BLAKE2B 8db66b1266e2ddd24954f0f0f45e7a3b08fcbb1b931411d272da8d248c2f32bd901cd24ee0e8d232357f64af79270f81154a2b580439f656bb0d23d2b05ebebb SHA512 82d315fceac37eb42a91d752939512d632ab5397337b8ed1f48c5c245fc423113dec8cac90e271abb2fd45425eb59dcaa0305ad6e1f7d7ed5d3537d9317f6fcf
-EBUILD libcrafter-9999.ebuild 714 BLAKE2B 76cbdfbeb1b4c767933d94cf485267911ca2cff473d1af72f235eb8bf2306c1a102986a1744932c12acebeebaf75c67a2805550fdf6afaaf2d9b52c095608422 SHA512 6e732a478998c07602e04053cc438fe46bb11c18b5684e442c061940c999366e4061233bc35e5a2e545fa0b40c6fd8b15619f3eb2d08eceae6c1e8a1be852b12
+EBUILD libcrafter-1.0-r1.ebuild 731 BLAKE2B aac320f1eabe0d37695a9e9cdcd7c344115afdc5f55f64f818f65385aa3296e3b7818b459f0136f8c2bf3f8879ac0b21ec086d8c6e3746d9f27be89d748b8db2 SHA512 46323935d4728e0f72ecbb1ac70ddc9bc135bde28c35661ad9e40d461256b0b0d45862c80162f1f4c7bf669f2c3d2d805ea86381fcd4a449ecf062f4b118a6c5
+EBUILD libcrafter-9999.ebuild 647 BLAKE2B f07be5901cb221d34598359a1e100ebdc77f6feae6b6998e0d6e5f24b3835d220ea7d7fba71f60f8abbe7ed98c16e19d5497dbb06ee73c4caf2a5daa6effdbb4 SHA512 81234316ad91567fffd78172d7ae430c3e70cf7b5a42d08e6140398d07736078cf6aef4bde76e6dc3672cb8dbc6be618f2b417434ee7c65749764f6627fa7f0b
 MISC metadata.xml 1647 BLAKE2B d6ea5e5df1a27925827497df3022b86f82b0fa5c05e8dc87503b836ade2efb04e0e19b07ccf58b512528ba562caff2be6f14e1d56c5ea0f6040419c708287899 SHA512 6e1ee9e3402a26c3981552ff8fd7193f75dae388fb6d1e59739e1cc4e6f027c995cc68b1984fc13d39d56c152fee6b4b6ee82c9c79f6033627b5e9e0261bdc87
diff --git a/net-libs/libcrafter/libcrafter-1.0-r1.ebuild b/net-libs/libcrafter/libcrafter-1.0-r1.ebuild
new file mode 100644
index 000000000000..9eb5e0583a60
--- /dev/null
+++ b/net-libs/libcrafter/libcrafter-1.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A high level C++ network packet sniffing and crafting library"
+HOMEPAGE="https://github.com/pellegre/libcrafter"
+SRC_URI="https://github.com/pellegre/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-version-${PV}/${PN}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.3_p20171019-libpcap.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	dodoc "${WORKDIR}"/${PN}-version-${PV}/README
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libcrafter/libcrafter-1.0.ebuild b/net-libs/libcrafter/libcrafter-1.0.ebuild
deleted file mode 100644
index 7b919920ad00..000000000000
--- a/net-libs/libcrafter/libcrafter-1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A high level C++ network packet sniffing and crafting library"
-HOMEPAGE="https://github.com/pellegre/libcrafter"
-SRC_URI="https://github.com/pellegre/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3_p20171019-libpcap.patch
-)
-S=${WORKDIR}/${PN}-version-${PV}/${PN}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	dodoc "${WORKDIR}"/${PN}-version-${PV}/README
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libcrafter/libcrafter-9999.ebuild b/net-libs/libcrafter/libcrafter-9999.ebuild
index 16291e489096..e76b013ba9c7 100644
--- a/net-libs/libcrafter/libcrafter-9999.ebuild
+++ b/net-libs/libcrafter/libcrafter-9999.ebuild
@@ -1,38 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools git-r3
 
 DESCRIPTION="A high level C++ network packet sniffing and crafting library"
 HOMEPAGE="https://github.com/pellegre/libcrafter"
 EGIT_REPO_URI="https://github.com/pellegre/${PN}"
+S="${WORKDIR}/${P}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE="static-libs"
-
-RDEPEND="
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3_p20171019-libpcap.patch
-)
-S=${WORKDIR}/${P}/${PN}
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.3_p20171019-libpcap.patch )
 
 src_prepare() {
 	default
 	eautoreconf
 }
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
 src_install() {
 	default
 
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 5b8ad2ff4226..041f3ce5b5da 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -5,7 +5,7 @@ DIST libpcap-1.10.0-upstream.tar.gz 934559 BLAKE2B 54e809af242b18d600b88f29bbe31
 DIST libpcap-1.10.0-upstream.tar.gz.sig 442 BLAKE2B f19ca45bbeee39ef1b3f8a8e8d8d9f24ad43e503430a3fa969a8ce668cb7926e1d19adb7e7cf11fff9dafa09b04507052ccc98f7b2a81f053ff01ec6c7ec8f87 SHA512 8a13aef00120080793da800f038d13124d412dfcfae6c0a952bcab544b50c8b69f6a672438bbe5bcdbfeda2e0d541bccefefbfc69f94e1635c0e9eaf77f19902
 DIST libpcap-1.10.1-upstream.tar.gz 935221 BLAKE2B 0ec028e5d026a97b92ba6f23f88daf36b827eee08a752a0162fbabd1b5a2a70141ec403b6ff26dc3eb25ca5c6630c9c2f60f05b33161770da3d5e829c4eecdc6 SHA512 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171
 DIST libpcap-1.10.1-upstream.tar.gz.sig 442 BLAKE2B b76bf3c40a923b6c8fb9a356dff49a90e30dd0b0d785f138ac56bf1a41ad3a6fcfa3d5b3d28c12543857c5616b8938108b06313e35e4474d50991b72d9d371c8 SHA512 f9807efd11d99524b247981e5f4f02e1ffbeaa8468a9a22c66f9931a894071b9182164807b9fd11436883d36e8b0c6cc62302852005d958e34b5236e20caa33d
-EBUILD libpcap-1.10.0-r1.ebuild 2468 BLAKE2B dd8bce22814088bf47f61664bd186b258e08bd0c2efc41816abbff8139ea7df8b82281a4e5576045e53e2e755d71d9ead320531a2761ad3a26a8b52b15801286 SHA512 69aa5b060522c483eddf233167269245c5a2f399934def8ce9c19da80dcde3be749ce8ee73b55b1d31c2a4bf556f1ffc46f82933166bfcaae9a4b2eeadd54bb1
-EBUILD libpcap-1.10.1-r1.ebuild 2475 BLAKE2B 2e493cd953d9927e73aadd6fd5cac7f6c29fa062edc88e66f6933960587e470e3883f6855a9668ffe9e2d611bafcfe3014917d6c12fd4ca6e9e5dabd14a46715 SHA512 afe293e213399108758a2d82702f2758014b2b6695e39c288cc38f17b99308df201eb8882b5dbf2eb6f7f9dc4c00df33af4ab5a72e46a86602fa5722e3a631bd
-EBUILD libpcap-9999.ebuild 2359 BLAKE2B 2f62f50fd3203f17265ae84816ea449d6952ef931b35ba9ee58854d441960403c116eb89bceaeb4b62501c6babd6860d9ab8ee6614e3e6fc31075a53ad708aa0 SHA512 2b4dd339cae5c66a3f695324393e1972761c2dba67cd73b14b7c91c23552e411bf32950ad58edbba7bf57e4684d358d2acdad04b24cd164888bf7cc445f026f0
+EBUILD libpcap-1.10.0-r1.ebuild 2476 BLAKE2B 473af4c3649a18692e8047304277f56d60917e86ecc092d86445e3fc78d8f64aed3d95d2611d4bf08189e6de8bfa2d6c4549731712929aea393b29ec4d3aafdc SHA512 df995bfabab982b7b1bd5c93b45b14f0071d95427bba84aba3adf3cd623df1d1f1c60493a7bbd84de85004a349e117053b87f35cb58b54d8cdfcaa8a62b421df
+EBUILD libpcap-1.10.1-r1.ebuild 2478 BLAKE2B e7bcc60acf12f843bc7645fcd652f3adc686e36db1ea61ae695c5872d14f650887eefd6c375e3d6dae5223033e09d366c0e5c0c5679f5d4ca71954a686780584 SHA512 5927934318248145b9f103ba07602ed4820921af7f74879e6cc1938e17b0caac3bc5d40d136c01b9c8aefed0f1b722cb89d97b1ef52b21318289345ee2483207
+EBUILD libpcap-9999.ebuild 2367 BLAKE2B f029798f3799a205ad53f90ae83219f8ef372e7f7d4f8b883f41555a17c1501415a0f39b209a0020d47dd3dc85521ac5eccfb20848817635d06a142f11b3ab47 SHA512 01f2afbf6937907e5f271ca3e65c03022137dcf584d82b2169d16a5379e657f264e789e4c338fa980db488875865b4aec51634b28ea9e663605b770a51be24a4
 MISC metadata.xml 918 BLAKE2B 634ea0c95e68eeed1bab1a2e41d6bde245eb4f432fcda4ffb5cc509317d25e1a2c0ebc56a78d478913ee3c281458743b11327328a712fa509baef8654698e150 SHA512 2a81d02fdca06a6cca8afb80d013f4677ad8bd8de07191801bd73270b0140992674050a6fd883945ca1b6aba08a6ba7dee7e38a9eebf3825dda338d11cd5e14f
diff --git a/net-libs/libpcap/libpcap-1.10.0-r1.ebuild b/net-libs/libpcap/libpcap-1.10.0-r1.ebuild
index 1648d8b9e24b..13d40b16ff92 100644
--- a/net-libs/libpcap/libpcap-1.10.0-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
 	inherit git-r3
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
 	inherit verify-sig
 
 	# Note: drop -upstream on bump, this is just because we switched to the official
diff --git a/net-libs/libpcap/libpcap-1.10.1-r1.ebuild b/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
index 7384a1bdf841..2e3e52d41a71 100644
--- a/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
 	inherit git-r3
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
 	inherit verify-sig
 
 	# Note: drop -upstream on bump, this is just because we switched to the official
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD"
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 9e6f60a643f1..02b3408cddff 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
 	inherit git-r3
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
 	inherit verify-sig
 
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 349faef6b837..309d0548fbb9 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,3 +1,5 @@
 DIST libwebsockets-4.2.0.tar.gz 14550541 BLAKE2B 9471d19b15decfee4407a596cb3f127534e12ac6bf49c81b04120a379ff8a8e1c7767e9a7e586ad69d5af23e869914c749da771f8db6431ac09718b971d261e0 SHA512 e1fb5b204a030ded8dfe2a75c66ec8d1a2e6a67e82c7709fe3c4277e0ccb5fb40c18db04e73c640d07ef4516aa266ae8b102f802b2a41b80980260cb6921f369
+DIST libwebsockets-4.2.1.tar.gz 14557242 BLAKE2B 07d5a7278a3f0518f8d8c1a20c6ad08d7125c276d1b0236649abe961879e3985319ce03d6800f7312f63d2a92dd96d341783257695a91864a2ee93116a5a108f SHA512 b8b03a9f099079aace448eeee6690bee519c23ba14e0b186e1813bfdb9b915462a07a5f52bdb81949021bf631d99bda2661704814575f559b5a91c70cbb2ec30
 EBUILD libwebsockets-4.2.0.ebuild 2302 BLAKE2B ccd6d0d167e36590d377144b1d35d2ff3cdd20c10b78616992fd39583a24bac5159732764e0395022bdc1d9977000e66047aa4bfd5a06f30322273396753dd61 SHA512 f97e085f9d3092a4f4ac24325ff92cf852681b0955a08724005d349f949a5ff21a41c803d7e427f18c6bc2d21f7fe7d2ca90bd662dfdfb52ef00fa0e80772bdf
+EBUILD libwebsockets-4.2.1.ebuild 2307 BLAKE2B 11b75577ca954c0cbb444b43016b8c55d08c3a319ea97c7338e92f3f1db0ff390d0c5f04cde4ee9f864e9a0fef38d3fd88fba6d72a3b986b097d01728373fc32 SHA512 eac2509485c6b9f2bb277a994cf1670543d965f8995e0e34c492364c89e1054f51e34de26570fb70d05433840265803a839b6f59ae7ce58fcabdf8ac8dc41c69
 MISC metadata.xml 1720 BLAKE2B cd762542d4df782758246c55241a12ba6368b8db26d3814b777419b0a9b4fcf7b5a4682c6a05c41915c2b60a08efef003b83151f866d0bb3c9056fe50bd76a77 SHA512 2bf03ea4b6d1398ee685e40b4bbdba6a1f17527fba7100182c20fd5dfc87a1e88fe8cf3d02eb32f905af5ac8af5b250c98d00fb3a812602f314098bbf8f9813e
diff --git a/net-libs/libwebsockets/libwebsockets-4.2.1.ebuild b/net-libs/libwebsockets/libwebsockets-4.2.1.ebuild
new file mode 100644
index 000000000000..e2cb3c1838c5
--- /dev/null
+++ b/net-libs/libwebsockets/libwebsockets-4.2.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A flexible pure-C library for implementing network protocols"
+HOMEPAGE="https://libwebsockets.org/"
+SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/18" # libwebsockets.so.18
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
+	+lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5
+	sqlite3 ssl threads zip"
+
+REQUIRED_USE="
+	access-log? ( http2 )
+	generic-sessions? ( smtp sqlite3 )
+	http-proxy? ( client )
+	mbedtls? ( ssl )
+	smtp? ( libuv )
+	socks5? ( client http-proxy )
+	?? ( libev libevent )"
+
+RDEPEND="
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	http-proxy? ( net-libs/libhubbub )
+	libev? ( dev-libs/libev )
+	libevent? ( dev-libs/libevent:= )
+	libuv? ( dev-libs/libuv:= )
+	sqlite3? ( dev-db/sqlite:= )
+	ssl? (
+		!mbedtls? ( dev-libs/openssl:0= )
+		mbedtls? ( net-libs/mbedtls:= )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+		-DDISABLE_WERROR=ON
+		-DLWS_BUILD_HASH="unknown"
+		-DLWS_HAVE_LIBCAP=$(usex caps)
+		-DLWS_IPV6=$(usex ipv6)
+		-DLWS_ROLE_DBUS=$(usex dbus)
+		-DLWS_WITHOUT_CLIENT=$(usex !client)
+		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
+		-DLWS_WITH_ACCESS_LOG=$(usex access-log)
+		-DLWS_WITH_CGI=$(usex cgi)
+		-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions)
+		-DLWS_WITH_HTTP2=$(usex http2)
+		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
+		-DLWS_WITH_HUBBUB=$(usex http-proxy)
+		-DLWS_WITH_LEJP=$(usex lejp)
+		-DLWS_WITH_LIBEV=$(usex libev)
+		-DLWS_WITH_LIBEVENT=$(usex libevent)
+		-DLWS_WITH_LIBUV=$(usex libuv)
+		-DLWS_WITH_MBEDTLS=$(usex mbedtls)
+		-DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
+		-DLWS_WITH_SERVER_STATUS=$(usex server-status)
+		-DLWS_WITH_SMTP=$(usex smtp)
+		-DLWS_WITH_SOCKS5=$(usex socks5)
+		-DLWS_WITH_SQLITE3=$(usex sqlite3)
+		-DLWS_WITH_SSL=$(usex ssl)
+		-DLWS_WITH_STATIC=OFF
+		-DLWS_WITH_STRUCT_JSON=$(usex lejp)
+		-DLWS_WITH_THREADPOOL=$(usex threads)
+		-DLWS_WITH_ZIP_FOPS=$(usex zip)
+		-DLWS_WITHOUT_TESTAPPS=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index d6965cd8ae27..12a70f6eee92 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,5 +1,11 @@
 DIST mbedtls-2.16.10.tar.gz 2677333 BLAKE2B 5f94003547d5c4ba8daec8270b6e91fea1bbcc94aa7a7417018ec57b8807fbdbd057640fda24cf65171bf7dd872eb091d21e7508df28b57ddfc512736f9c6482 SHA512 13837316b04fab6bebacdd283f437b5f246df0785c866cf3d94019d040ab0edf417e0b409653f5abf98a4944345eb088010658c9de10f9e96a5624d33741898a
+DIST mbedtls-2.16.11.tar.gz 2692209 BLAKE2B 9d7bccfc0d1bc5a038b6dcb866722a27362c229a5f1b515396aabbb53e77cfe36525446fb2557c817772810f24335a51c9a5c45bcfa866d8a07ff4e96498dbde SHA512 b35de49ce596b549b5e85b6affdf2cf1360fb8b0d4e551636a91a4923b1cb212dce7880d575d40c73d5682afe8bb893312d803798ce8f807842a2aab8e2ba2ee
 DIST mbedtls-2.26.0.tar.gz 4080986 BLAKE2B 549f00db4bfbba4a88de0ff76f32140d7421ad3ab58e3cdf08ec40e0a3da5dcc7a1bcb6eb1ce491ebb544dcd15eb6bc634f04e6ab0f773dc89fa44b6843542ad SHA512 959f6dd0759bfd8dcc497a0527b8b9e9975adb9fee01461e6bcc37475cf9e4eae597687e05e077dfe51d0542c81bc3b90e6d9a692353dca331e020e02d642196
+DIST mbedtls-2.27.0.tar.gz 4212185 BLAKE2B 31840e5a518643495f319cac8e0c876bdca5dbdee6524d30cace3538d5fb5ba7847dd653f61f775f5c3c384ac0533afdbf6172b3e523db515eceecc29fadd2da SHA512 9503ef75f08d2574e0800b2e3b6f030461cbd97c74863a20e5688ced7558b0b6f87cbe33cbd003e69c825d0321393fe9b00b0be190ab408138414b99d5102994
+DIST mbedtls-3.0.0.tar.gz 4163127 BLAKE2B 5d94124a251dbcc38de614319f93c6f0346de516fd944c765ab3e60d46fba8fbbdba7a6f9e00f5f0550137301b4de98795851df788e367c4fcf03abb981d3c63 SHA512 be11878d82fc93d0847718514f4887c68d7b186c54682316c4a01082583a917b81f9760bb708aab72bf37148581a8dbc9f7048faf745cd2e1cd7e5bf8c48abad
 EBUILD mbedtls-2.16.10.ebuild 2436 BLAKE2B 0d76524a1be47d488c732ba0a3d4ea76a5eeb915e0f83575ae498fffc5629f2b86e399e3f00ed5418fe14ca2204febcf4a23d2e9a3a5338630b9f67bc027e8cf SHA512 d54f04f7988457506fc2abe03fb8e97b6abb7555c72bc852917e33aa6ece7b291c96cb6dabd5806cd19d5407806279981e660a1ff371b37b94535d7ddfdd99cc
+EBUILD mbedtls-2.16.11.ebuild 2442 BLAKE2B d63dcfbfb82a21e1eddad46b856589268656a361da610c5f32bbfafc3e09eb6149befe13dd9ad6d1486ff965fe6c6f74164093f3dbcb564a25ae4646db703dd4 SHA512 fdbbefedcbce58d236a4cceb78615b4a3a38652b21526de81445704230cc13a376bb2c0d8d4659b238fca8d0ffdb8c416b5e4a04e9fa0143cd46cea29dc45b77
 EBUILD mbedtls-2.26.0.ebuild 2502 BLAKE2B 6f7f727b0466a0d091596f5c187222b095a21fa61d6b70073db7014f17539440781f70e763bf17c5451e832db6795d3289528f1cb9cec53450da120a5b5ffb0b SHA512 ffed411ce59d0476563af7393dd9733d0b44eebc7e232cc6f88b2788af4a98c7511dafb1238874fa941df57ec3de7acede0459353103973ec0ddb03274053c41
+EBUILD mbedtls-2.27.0-r1.ebuild 2509 BLAKE2B bb8db644f894190b0faea5d1becde4f8c3261569e00bfcaae3a46d3796feb29bbf24e5dfdb438f5d256980e36ba52612fe3819b7fede261de435a0faac23b6b5 SHA512 2a6b78d9e0d8b8c0d303cfa668ad1fc67c549a9bf1b1c495f7756bf20b97837160cee1f48279b21505e0552083e75e339609f1ea8c982d8d12d8b903de922644
+EBUILD mbedtls-3.0.0.ebuild 2303 BLAKE2B fc3b11e2295fc79a2368e26c0ef0fa3a05de3e8187be3ee23a8e6ad8375ae0553559d29701bc887130928f057b99fae64bc3b897814636f134d42dbfd87a7b66 SHA512 d54986230f6e43923ef4bbf35d85bc80f65af4542e6f15f7894af0bb505778ed7cacd27a5cda4697868b43473a7572bec69fea9a8f63f73427e2a35641fce3c1
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.16.11.ebuild b/net-libs/mbedtls/mbedtls-2.16.11.ebuild
new file mode 100644
index 000000000000..418ab01d59a3
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.16.11.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	programs? (
+		dev-libs/openssl:0=
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
new file mode 100644
index 000000000000..1a1cbe6257f8
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/7.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	programs? (
+		dev-libs/openssl:0=
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/mbedtls/mbedtls-3.0.0.ebuild b/net-libs/mbedtls/mbedtls-3.0.0.ebuild
new file mode 100644
index 000000000000..41a81c85e7d0
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-3.0.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/10.16.4" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc programs static-libs test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	programs? (
+		dev-libs/openssl:0=
+	)"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/mbedtls_config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 3bd77aedf8f6..d445d5123625 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -10,13 +10,17 @@ AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v12.22.1.tar.xz 23650180 BLAKE2B 90b0a8ab3842483fea0c776e0245e63539a986c18f55abd8c7cd22ec399ccde22fa5b008d3e07c0f07713b5a45a1ee2a0bc370c04408800db2ee59cd92fcb5be SHA512 eaead633611bda04ab9be200aeddf3b4004b8104e9c6af246023b8008003dd3a7103e1508ea690443e59c6591521b04a2d71c7344343f2a20d1c935ef51c66a0
 DIST node-v12.22.3.tar.xz 23662268 BLAKE2B b686d96ce1a2e1678c1565dbc6025738be85dc6b0e21b39742265639eb8da590b33f86afa5ca3ecaa4c70e4155a97e413e4d6e5da9ec0c5cb19a876241e599e5 SHA512 11684b6df15b6b74b8674ebf2c2bb950d1e52b83f90478638e85dd11a163dc7c62ae888bc4c1c29e89179e0c47fdccc26bee2817d64eb3ff926b2d3e648c351c
+DIST node-v12.22.4.tar.xz 23653388 BLAKE2B dfed2c23f7bbafe20d955dbe382ee8b2b40d17a8f4a9266242b405d5c3cb8654e8727817822d33a06c121cd0f04a027cdd3e4483c70e95f17cb4032ab4429bc5 SHA512 dc833f60474bb5659870573d751cb0e90cef87f94f0111d379a66ba593bf1ac00f624be75839bdcbeb3380c5ca52ef87cd0ffbe8f4e89345b0dec3165b9ce85e
 DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0
 DIST node-v14.17.3.tar.xz 33585080 BLAKE2B 37267c9da2d773dbbe95f7378f5b0c2b0dc397b17850be325f9fec637c6745dede4ca4136ba4bf109d72d8982ee985f1e077cc706165f1be2e3dc3053edfe229 SHA512 c6096715299f155b96df873976da91e854da7e99cde635cdb65d5c962abc5283dac86b8ddce4f5a9f7498f9793ff08943645b5e5b0b23395dfe035f7295218bb
-DIST node-v16.5.0.tar.xz 33639108 BLAKE2B b5a719143761f2dec1c1e94b53a2b5679e4d3ec8026f411f98eb6f5579688fd0d291187f633d3caeae8adfc39ff8ba28de25f6f34536c8181fe80d18ad833531 SHA512 33dd76f7d7f1c949e1f709b869db9b047241a7752897514831f92b3b3877a7098c41c74207f5c0bbb2e62c5cbdaa29297b6d253133878a013482118c8172d08d
+DIST node-v14.17.4.tar.xz 33592020 BLAKE2B ad8a49715b3d568a5dc66b759d9c3074ea78c1c2293b1642549e32d26c5213ccc8fce4a531ef7727e3a74a63ddc26d8b71ac20bf5c86bf0af09467c2306363ef SHA512 c06228f1a82cf887fa1557be58a8814027926f5c9750c9f1a1656afd6f58151be08e05203343c62fb9a3957d99a73bee6fe509e52543fdbc5bd4c05a1e76c3cf
+DIST node-v16.6.0.tar.xz 33706684 BLAKE2B fa2db621ef2932a259bc2c7193215cad9023a74c5b614d72cd76bb09091a6130f28e4f16ceeaf43186b01695b8cf6b256e0d05e3e717993b691ec9416e801f82 SHA512 ca70e8f6479e3b8dc0aeeab02a377db3a1bbb3924477f720513c8734fc48bb203979a69741dde6c84e21623af1dad256affa5b3f7dfb9e68cf24590d5ddb1690
 EBUILD nodejs-12.22.1.ebuild 6450 BLAKE2B 5a540cf0588d177b2be4af525f3cc3b8d0de648b27c51ea2f1d07304711573180ab601f1149a4e8453446e8237f33f1a7b47d44956000856a85fde56693b48ec SHA512 c22aaa0bcfc45a6597162ed09df0facceb2352e2265e718e177d905afc96edb7c1e7c3647cfe98c9ab4a3c11aad7f9f2e7726a66fb680202ec83ff6310057d5e
 EBUILD nodejs-12.22.3.ebuild 7081 BLAKE2B d19b9826fde72e436c85082a4db792bc65c22077a6935b105e431f0c0d0721bfba270e1b6caf9f511632afd6825fa84980e3164a8112d81256183576bfc9caa8 SHA512 07b137e3f19621208f3617cfaf4d98ea733c0aed6f152c717addf59bede2ab972835226a8ab8b60db167bee560a47f9f428ba8cb781b3475f42b7c7c0baadfe7
+EBUILD nodejs-12.22.4.ebuild 7075 BLAKE2B bfb063d663713b81f9abdcc238f05dcf3e7e467c591f0a799655e7d0bc5b0b0020d884585ea8238d5806abd905cf7f709b1f632ab2aa22400233aab2becdfc29 SHA512 63471461c8cf575e256adebfb29423fc419bbba1a39601c7ad844e5cd835aef72fc9f229b79324624655a3ae8542dbc99046b14765ff1445be3409a34a0dd8c7
 EBUILD nodejs-14.16.1.ebuild 6147 BLAKE2B 6172c84baadb436d99ce1bb4dfa21deae28452a4fa7efe136a2868d837c0b26db3c92494fcc018e178080aca31be2ec69232cdeee5794ac4a8ba001305514dba SHA512 73fa6ae5d4c1b7e69e7f04adcdb0ecf431d349dd194671442dba28ce8db60e3383154888a743145c3ffe248d51896fb4b9032a980aaf048cc49e80a7a0c3ef29
 EBUILD nodejs-14.17.3.ebuild 7075 BLAKE2B 8bee554d2f20581ab82fb7abb85dcca4c942b33b93b22f15ba5a4e56006160dbf234ab1fa7f1ee765fe09a3166519d8c6761c7b1904c633153b692af57cba174 SHA512 e3b0f7e2d2e71ac063ebefd23d83343dcce1055b399d6a5f3e860faafbe790ac8fe53cd8dc145b474d133f8521911a7d878e9eb99a1af8e3d093e5f6c01f2068
-EBUILD nodejs-16.5.0.ebuild 6502 BLAKE2B 48bf9356926c2a31339d4841ad2481c81b5add8c1b0fd24975b79aa81cdb4b56f1f1fff4ef395461d7a8e3d47a7708d825f1ebcd885f7fef10b47ee84a6cfbb6 SHA512 c2ae73ad5ab86facf062a9ae0e84ddf12396d38e802dc36b48fb46944decfa24a31be956804a6b6dd4b0bafbe139d62fed95f5445e5ac6013683cda8bee338cf
+EBUILD nodejs-14.17.4.ebuild 7113 BLAKE2B 3cb79fe139ef02582038dd125987e20d90e40871223853469767fb9058dd27891f93ec3798c1c23a4f0fadbd7440499cbe7b0e0f488d67682caf0fdefcd19dd4 SHA512 1e78ceb1c1a09b69cd3ebaed57b9c29658627c1d03e907b40749bb40d9e4f96ca1cb6cc50b0d66f51ec4b419a458d24913a61cb69fb208514a24f6b3eb584e21
+EBUILD nodejs-16.6.0.ebuild 6538 BLAKE2B 7d88a79528f7455bdfb8b6c94da8076343a98247886dd57a3e785a4e7f99470a6513f66528b8b4f1a116c860ee075200cc3442b820b5f25229d93b8770c12995 SHA512 849c115192b313b628a05063c970bfc967d91fb3e26cc558502ed89d435693e9b0e0c1cab80f815b98de5a85b6f11e3fdafa79b07b67cf784c40abd799668bbc
 EBUILD nodejs-99999999.ebuild 6483 BLAKE2B d4ad4b4ca614a7ead97e4ae37493dfb4bb5da2a4d04bcf8126720401f2a76515608f6de44a6378813c98bdfb112d741072b9e3d9474e3d6248db556d452299e9 SHA512 398caa97aa48d604c91ad8dfc74b4d5b4fcb28a42d535b401253b04f79b0f7c450f25ec03b7b54d41755fa7bb734fe6031e2d0515849301b080dff1dfe98ab9b
 MISC metadata.xml 1000 BLAKE2B 2dd8788da6451360d25beeca97fe03a52761cf0478ddd03e4680e805b0f31309fb16e44c65f1ca7475f197e4f2f53b14a0a07d08d1324387191e0389d124e6a0 SHA512 a2dc0a100769ba541ac469df0ea74c20b057620fedfaeaf87516d62fb0eea00d1a42ec39f14713e37a44079a076a2770497e81ff0e9b987c70f234c6458e114c
diff --git a/net-libs/nodejs/nodejs-12.22.4.ebuild b/net-libs/nodejs/nodejs-12.22.4.ebuild
new file mode 100644
index 000000000000..aa0282ea003f
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.22.4.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector lto +npm +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.39.0:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/http-parser-2.9.3:=
+	>=net-libs/nghttp2-1.40.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	system-ssl? (
+		>=dev-libs/openssl-1.1.1:0=
+		<dev-libs/openssl-3.0.0_beta1:0=
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
+	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			if tc-is-gcc; then
+				if [[ $(gcc-major-version) -ge 11 ]]; then
+					# Bug #787158
+					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+				fi
+			else
+				# configure.py will abort on this later if we do not
+				die "${PN} only supports LTO for gcc"
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Known-to-fail test of a deprecated, legacy HTTP parser. Just don't bother.
+	rm -f test/parallel/test-http-transfer-encoding-smuggling-legacy.js
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-http-parser
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	if has usersandbox ${FEATURES}; then
+		rm -f "${S}"/test/parallel/test-fs-mkdir.js
+		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
+			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-14.17.4.ebuild b/net-libs/nodejs/nodejs-14.17.4.ebuild
new file mode 100644
index 000000000000..d65617465791
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.17.4.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.16.1
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? (
+		>=dev-libs/openssl-1.1.1:0=
+		<dev-libs/openssl-3.0.0_beta1:0=
+	)"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax-kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
+	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
+	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			if tc-is-gcc; then
+				if [[ $(gcc-major-version) -ge 11 ]]; then
+					# Bug #787158
+					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+				fi
+			else
+				# configure.py will abort on this later if we do not
+				die "${PN} only supports LTO for gcc"
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	# All this test does is check if the npm CLI produces warnings of any sort,
+	# failing if it does. Overkill, much? Especially given one possible warning
+	# is that there is a newer version of npm available upstream (yes, it does
+	# use the network if available), thus making it a real possibility for this
+	# test to begin failing one day even though it was fine before.
+	rm -f test/parallel/test-release-npm.js
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	if has usersandbox ${FEATURES}; then
+		rm -f "${S}"/test/parallel/test-fs-mkdir.js
+		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
+			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
diff --git a/net-libs/nodejs/nodejs-16.5.0.ebuild b/net-libs/nodejs/nodejs-16.5.0.ebuild
deleted file mode 100644
index 15f03fd11176..000000000000
--- a/net-libs/nodejs/nodejs-16.5.0.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9
-	>=dev-libs/libuv-1.40.0:=
-	>=net-dns/c-ares-1.17.0
-	>=net-libs/nghttp2-1.41.0
-	sys-libs/zlib
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
-	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if use lto; then
-			if tc-is-gcc; then
-				if [[ $(gcc-major-version) -ge 11 ]]; then
-					# Bug #787158
-					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	# All this test does is check if the npm CLI produces warnings of any sort,
-	# failing if it does. Overkill, much? Especially given one possible warning
-	# is that there is a newer version of npm available upstream (yes, it does
-	# use the network if available), thus making it a real possibility for this
-	# test to begin failing one day even though it was fine before.
-	rm -f test/parallel/test-release-npm.js
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-flags '-flto*'
-
-	local myconf=(
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	# parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
-	if has usersandbox ${FEATURES}; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-16.6.0.ebuild b/net-libs/nodejs/nodejs-16.6.0.ebuild
new file mode 100644
index 000000000000..236455536464
--- /dev/null
+++ b/net-libs/nodejs/nodejs-16.6.0.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.17.0
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+BDEPEND="${PYTHON_DEPS}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax-kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
+	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if use lto; then
+			if tc-is-gcc; then
+				if [[ $(gcc-major-version) -ge 11 ]]; then
+					# Bug #787158
+					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	# All this test does is check if the npm CLI produces warnings of any sort,
+	# failing if it does. Overkill, much? Especially given one possible warning
+	# is that there is a newer version of npm available upstream (yes, it does
+	# use the network if available), thus making it a real possibility for this
+	# test to begin failing one day even though it was fine before.
+	rm -f test/parallel/test-release-npm.js
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		keepdir /etc/npm
+
+		# Install bash completion for `npm`
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	if has usersandbox ${FEATURES}; then
+		rm -f "${S}"/test/parallel/test-fs-mkdir.js
+		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
+			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
+	fi
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index 3abcc9d40972..87dde53a0431 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -4,5 +4,5 @@ AUX serf-1.3.9-python3-check.patch 2896 BLAKE2B b757a9d1d3c4d5f9928e70a0182b3c7a
 AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3518eb7257885a582ed50dd3119a6459a52f134d149729cfc967265d6b9c478ec5d6f08a8a589bb5db0893d7bf SHA512 cf6726b860b876503820d8a42ff821f932bd1bf9a6157c98ebcbe77ebe71835ab4d2395fb9463fa187ef457100ededa59f9a7c430f98735c59f878cff600ff07
 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
-EBUILD serf-1.3.9-r2.ebuild 2023 BLAKE2B 6d164ac46edea868e3bb06e4088e7512fbca14ef1cd2f5c962ad97329064d7c59e130b6da712aaeacbee87d143853de9e6b5f966a5a512948ab21d4d121a10b4 SHA512 e836af5a29d8678afb5b79b7071e414fac0ae89d7a6ddd1b99f246ade2c99bd9b4bfdc4b8f0cad091ee13c1adcdee75932698ab5acab14691d42040f52256168
+EBUILD serf-1.3.9-r2.ebuild 2014 BLAKE2B aa22ce26d181ccc59edbca02fec8b088b2d007e24486c4b8c6faee9e2f257ae004bc96c3fade209b47b5395ea12bd1945a0df3e4107105599f347d90736a7fc6 SHA512 03945716d34e57bbf18b892afd0357ff2ab6b80a346fb20f529679fe16d6eaf3748fa2b83c8533212463cd8dbd8f064feacce0e7c9406b7b2154a74b4116dd42
 MISC metadata.xml 359 BLAKE2B 2e0d3e108f50e8f7e36f5c49b73ed3618a6848be9cbc73eb213545a40ac2e959f63e215b1b23f13665ece13cf7c548d5126112efd5df8c8ec6b05bdc5893ac3a SHA512 89556255a93ee1ed2bb71c9f1404de6547db145371a062e7be6daff4e8ea8a418f0fad2223caada5d3b75d8d625d6cbf9be3440aad7bb9c69c11d6e09c96e139
diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild
index d8de28619b71..daf94ac8d992 100644
--- a/net-libs/serf/serf-1.3.9-r2.ebuild
+++ b/net-libs/serf/serf-1.3.9-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+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 ~x64-solaris"
 IUSE="kerberos static-libs"
 RESTRICT="test"
 
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index 4349c3a86f46..c639a140f8af 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -4,5 +4,5 @@ AUX signond-8.60-crashfix.patch 5228 BLAKE2B 713fe5b5fe6c806fc09bf1710e5a5c8872b
 AUX signond-8.60-drop-fno-rtti.patch 4558 BLAKE2B cd75d2a269b337b43286f9a76d189b4cdd91e4c312b7664de49a2b6e72d63eedd3776ef3fe2a659120556725c748cc5a66a16568d3f24726229ca6baef129fa6 SHA512 d7b3abc6f82fdccba7544176f483d26dfe15200a07d9a44aaf0c2a7b27f09a1bef3e8f6e1a59f7a529c21bf373741f541710d1c3cc958bbcb7e0bd58d45d868c
 AUX signond-8.60-unused-dep.patch 984 BLAKE2B 67ec450053f294eec1be87411ab11dd14d3e6c9895a794b0aa6f08a433763f2aa246908bf8c8345639b98cf5be3a06670dfc200a238ce9582e37e186f88759c0 SHA512 b54a59c580436dfac3e469dd733557ddd1857f78fb992693f19c58683baed99e91193ca5c62cda9e974b7db48791c46156427a1c0043a24ec03c4594018fe697
 DIST signond-8.60.tar.gz 281359 BLAKE2B 3ecd8048d8c5551c3611e48091c35a9f0fe4c972e6b4730fe1f610b4870fe86911dee04c331847deee2a50f4a04acd5a8a0d1c605d1f4f0a24272d44c289a6d3 SHA512 fb3ccc99c692506ca29d5bae39bc375ff97057734fac1551ea39105d5f8e78f3df23e01a286f73be3a606c54b40f957c3c0d985484926e57f354218e4137ff3c
-EBUILD signond-8.60-r2.ebuild 1902 BLAKE2B d83b1f894ea6ef533174ba57fd1a5115c54bd5db461a57a38c17b4a3ff1d90d67c04a9470eeb7d24b192e95516d1fa9f346039a21034c3ae99256456f1dc5b1c SHA512 2103074f12f9ff2de23836ca604d627f0a9f11057c4baf792777136f744645885b6002e72dbd1fafd8c126c6a31551a2654bd259be54be585b592f780810c5a5
+EBUILD signond-8.60-r2.ebuild 1794 BLAKE2B 2ecb4e5b7115dcb1fe2e780e111d95a91fb363ba3ae0d7e8f9e02329834b3eb360bbd371e12ce2a8cbf1ba56071a6c344ade0d6d38e8231dd3d69a2a5c6830ed SHA512 2dcfc4854de637b42fa7191badfdee188514ea6a3d453bf560a732f4d5c8c979767028e66f1e05933dbb443b308d0f14aafb75aa6835883ae85330d35c4cbef7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signond/signond-8.60-r2.ebuild b/net-libs/signond/signond-8.60-r2.ebuild
index e9c1f2cee1f1..ac6a101babc4 100644
--- a/net-libs/signond/signond-8.60-r2.ebuild
+++ b/net-libs/signond/signond-8.60-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -51,10 +51,6 @@ src_prepare() {
 	sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/libsignon-qt/" \
 		-i lib/SignOn/doc/doc.pri || die
 
-	# std flags
-	sed -e "/CONFIG += c++11/d" \
-		-i common-project-config.pri || die "failed fixing CXXFLAGS"
-
 	use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" \
 		-i signon.pro lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 19e09a921d49..7b3f459ef308 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -5,5 +5,5 @@ DIST webkitgtk-2.32.2.tar.xz 23321888 BLAKE2B 1201ca423b90a7ba9e7613407e170d367b
 DIST webkitgtk-2.32.3.tar.xz 23323972 BLAKE2B da6f71214935fa13ee4d3214e3c34b636c2894f579539f0de4165e2fa51611cf8f57d40de9e3285a195b7e9f55fb9f5967722e01dcc78f9458b4fb74bc3e7e4a SHA512 473f89c6d56f6718e3e352a023d12188365b67cbe6535025205594729a10d792122275257b81ebe8e504a98814aa4e2a663616ffb13fea445df2b06929d89ebe
 EBUILD webkit-gtk-2.32.1.ebuild 9219 BLAKE2B f1a1b08374d123ba0d97361dd81fa6fa7d6dd22e8ad02d5cc37b315dadd505d013541c803b30fc3c93d6126934fa9199761305c8ba12eb955947f99ce187b1e4 SHA512 b51d1de9a62f612080bfc7bc470715e3faa4725d5774527c775be399b9811103e0d263b43016b150f19f5d76b6e20db465c8d42abd7466eaab1af67c48b2f911
 EBUILD webkit-gtk-2.32.2.ebuild 9127 BLAKE2B 8f64b27b0d8622086aec726452d99a1b1ca523dbb3f003c28f6ae31a8e460649ae7660fcdb52a6d32c0fad281c46ac180f95d1c7694bd1d2cb8897162079eb25 SHA512 b7803153a17d485dbcb9276986890134a6c560cb56619cc1b848b8eaf5fc9e7546d5bba06e793bdb9965a3ff69dc99212b10e58f39f027286e0d5192cae1c703
-EBUILD webkit-gtk-2.32.3.ebuild 9126 BLAKE2B 64ced378dbde60439a68f28130052c2b598a652f6407614cd94c647309e888dadbee255aefaba2ea8cece6c442584b6fe3552e4559ff3a4ed0d023fae88c4e0f SHA512 1334096f484ab35c4740349c91759bf1959bdc71c802421424cec60473dac91dfbdf41f75b169a30206f5eb94ce14b496c7ae223e41176e80c9c93dda4c95a47
+EBUILD webkit-gtk-2.32.3.ebuild 9122 BLAKE2B caf1119b272db82acc5539f50c94e2a7dd28f2fc7f36f1b23c929e85cf755f78fd5e6bb1185c58a191f465f6c8985e8438671617640c73e83c38ce48a45cecc9 SHA512 701e023d2be5679c8923e396251d358ec20e41ae4665f166e957055c29c28311c59c53b260da5355c9752c35f9174574d3529eb2d7a15ef5287f73d7c79a3724
 MISC metadata.xml 649 BLAKE2B 29aa977878b9cec915abe8d7ef5c367675fb280c184b3b915714e1aa98e3df442dfb5b06e42bcfab33a4329c3445dd9c6c86db02d6b2b29ffa855fdb18f086eb SHA512 c8bf98f91d4bb229e8561af3d33208b0c6df7b5542243e22f3ca04d1856c7fcc0c36a54e1cb536b6a07510daf329405383990008798db77064d66215843cb7e5
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
index 9e5a05f37769..d141e1d49cb8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index e21ea44a80a9..5fa99e0f4c10 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index da875fc2fdb2..05559fa55be1 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -4,12 +4,10 @@ AUX fetchmail.confd 297 BLAKE2B 00f9a55be3b6351dc7b97758f3403feab9d1025bb2b0398a
 AUX fetchmail.initd 993 BLAKE2B 76fb355805afc0b62f350f02dc0b0d6ac83659d2e15a49309192de313fa38b61e32db0bb9e5148c3d56bae61ca5e714f8d9576e0f95997d45a44d51f56c8235c SHA512 06091152111059425e86207e968ad5819eb67cd2dd264855e7b77a163b95591abc29befe4b3eb8bf2d2af105efb5006bb048f3db4ef3f8f4fafbb78767f69ebb
 AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27fb6ff9f3d5f1d8357302e11e6fc4d22d8944d504bdbb600e87b853e039601b8cca9763e1ca465573508 SHA512 088d7ff2c473d4b514cc5349ba6f10bb7f29ace1141d152db082c801a9dd0e6144a2dd350e27e97f633aaf286c2daa5253e52b5c410737c44f3fd9b5b57bab75
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
-DIST fetchmail-6.4.16.tar.xz 1316660 BLAKE2B fbe592327c52e9299cb09da9dafbf49e6cbbb2d998929aa30222b879a6c035a653dacda033cf4dec5e31cd90f3ebe4f388b1fd9155e65d29259260f30e658af0 SHA512 5e0d87739d73991c56111222cd84d6e16913b205c4d427feeb9b03d7f330442851f48769e168883ad75afc0a9db9b5267d1ad30e2ca0efe14263befd625dccf0
 DIST fetchmail-6.4.19.tar.xz 1316672 BLAKE2B 679d2c49698dd368d32439a8276412e3f32c0a0f6f0e7607bc323c0294c987307469451b4b085fe521f2d5dd4869d59b4841762b6a57b3c654b992e9de8ba87c SHA512 b10f0ac5b3b22f8b1d86367990fc96ea5c49dc21c873890c732c254c34503bd6ab9348c5ef88b99ba0f83f065fa9f9aead55de9721b0f296efa14eac0311daaf
-DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
+DIST fetchmail-6.4.20.tar.xz 1317204 BLAKE2B 85137bdae2fda05cba6e9bee9056bb9a1ef09b96199dc5f991da9aa5c2073f1c8cbf3fae43999a79de338a95e9d28e474035200758b65ffa9fa18b5a905c1279 SHA512 5b170f51a74b6596020282f5cbb34bf0a9ea8c5b089fd8c6c72df6c7742e16bcd5931d62181d56265779f9c3431c4ddf795a03deee09c5552a3aa0601282bd17
 DIST fetchmail-7.0.0-alpha8.tar.xz 1212256 BLAKE2B 1b123921a696e60b9c42ea30a379bc6cf46bb66dd630f50e1f10ceac5066932da9538295954be451c4665e1186b7281523bbae83fb4cdb7ad2d1b7b408a3a38f SHA512 fdb20b6a4723f718958e8c800d5a996ff0bb8d9ffe485e8f8429f28953a5a691fd8439c29cb4fbbae338d64c1e9cd1f5f9ed6d89261d0ca582f6345cacb696fe
-EBUILD fetchmail-6.4.16.ebuild 2387 BLAKE2B a3f0807de07c27a5e7ff01fa52107d667c36a9a4f105959aeda1ed959fc5cd0c493ce9ec9621e4341eff6777192051e5e0debd41d8b7815855f28fa5e7095abb SHA512 178254b1eb407c4bb6916774f7b468b07c960541b79f9ff0fb90f31d27c7d2d2dfd4237f96967664606792bdc037001fe796dc5c566f2bfed28acda35cf1785f
-EBUILD fetchmail-6.4.19.ebuild 2381 BLAKE2B fb808119e5d5286f0091ee0ddc8a9623bc6d1687805e7bca6bdb2aca1ecfea77b66dff6bf62804c01f142b6297bd9c269290d1ceba6da1fa51615a50cfa60fa9 SHA512 cb077671e4e4d08ad054a7763ae15666807915edce7f74ac282d393a8db075864160c3fb9a3317a0f2f34f4bab268fcb3b26a267c2ce12ed414d421684762598
-EBUILD fetchmail-6.4.8.ebuild 2377 BLAKE2B a7ffd34ba34e384618153aed0557a8dd47e018013e08d12720809bbe3bfb278253f5fe3032c185844a5b4d42a5a719fec38fca9a8ab86ec052a584068aa9882e SHA512 71ecb949c8dc620e9ca9fabce558eecbd00fe8cc9915bf9e7a3b73e27181662ef198cce6b1428f3e39873f2e41bd24e1c56e0e2d39462e83344b5cf395c1e4dd
-EBUILD fetchmail-7.0.0_alpha8.ebuild 2501 BLAKE2B ab0d5779dc6e78fac7f79b411d0118deaf2789ec94021045dd7e0e54816d5bc1760731a2cc06fd0b5c07275a91645034957e01cb7c96cf94b9e536b95c2d7782 SHA512 4309f7ad15ac6bdf8f63540585995c0482a7f1bd4c2b3d44e257702a8d01d914ba8b9ebf2fd70e8d9a6010c06a7d1085306a39a74d577a3216518a5e26221f81
+EBUILD fetchmail-6.4.19.ebuild 2411 BLAKE2B 434eb903a6d3664f5ab4aaa98d49e444fec57f732fac15a901d0fc3092514f9efc38f1e216c5a697f75c7a9fddff4e99dbc513780e933b04719cc955d945892a SHA512 721e3a879e4f8d0396665b146ffd7a321bdb091c449706bf1e2759b2b4f1d10e05abf71da640495718c387c92bd1c5404a511aca12307520115a285b4a55cb0f
+EBUILD fetchmail-6.4.20.ebuild 2411 BLAKE2B 434eb903a6d3664f5ab4aaa98d49e444fec57f732fac15a901d0fc3092514f9efc38f1e216c5a697f75c7a9fddff4e99dbc513780e933b04719cc955d945892a SHA512 721e3a879e4f8d0396665b146ffd7a321bdb091c449706bf1e2759b2b4f1d10e05abf71da640495718c387c92bd1c5404a511aca12307520115a285b4a55cb0f
+EBUILD fetchmail-7.0.0_alpha8.ebuild 2531 BLAKE2B 51172611a85f880f5b31414471182fbbec13207d30c3a1e7101a62ba56e87d3931fb9aa0e1999ef6caaa736126d16c56df0d8e82cab4231f9fdb74fee9dc3892 SHA512 a82d93629559170b406adddfbed04f93f5a856c92fb409254717c86bb284664c240fc69cb07cd5288afa09e41211b129f38be772045877c67fc8e787875207f2
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.16.ebuild b/net-mail/fetchmail/fetchmail-6.4.16.ebuild
deleted file mode 100644
index 9a15f59666e2..000000000000
--- a/net-mail/fetchmail/fetchmail-6.4.16.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="tk"
-
-inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="https://www.fetchmail.info/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ssl nls kerberos tk socks"
-REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="acct-user/fetchmail
-	ssl? (
-		>=dev-libs/openssl-1.1.1:=
-	)
-	kerberos? (
-		virtual/krb5
-		>=dev-libs/openssl-1.0.2:=
-	)
-	nls? ( virtual/libintl )
-	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
-	socks? ( net-proxy/dante )
-	tk? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-		')
-	)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/flex
-	nls? ( sys-devel/gettext )"
-
-DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
-HTML_DOCS="*.html"
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
-)
-S=${WORKDIR}/${P/_/.}
-
-pkg_setup() {
-	use tk && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# don't compile during src_install
-	use tk && : > "${S}"/py-compile
-	eautoreconf
-}
-
-src_configure() {
-	use tk || export PYTHON=:
-
-	econf \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		$(use_enable nls) \
-		$(use_with ssl ssl "${EPREFIX}/usr") \
-		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos kerberos5) \
-		--without-hesiod \
-		$(use_with socks)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
-	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
-
-	systemd_dounit  "${FILESDIR}"/${PN}.service
-	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
-	dotmpfiles "${FILESDIR}"/${PN}.conf
-
-	docinto contrib
-	local f
-	for f in contrib/* ; do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-
-	use tk && python_optimize
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
-		elog "the polling delay used by the fetchmail init script."
-	fi
-}
diff --git a/net-mail/fetchmail/fetchmail-6.4.19.ebuild b/net-mail/fetchmail/fetchmail-6.4.19.ebuild
index dfd0275cfb0e..e2ab38dd186c 100644
--- a/net-mail/fetchmail/fetchmail-6.4.19.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.19.ebuild
@@ -98,6 +98,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
 		elog "the polling delay used by the fetchmail init script."
diff --git a/net-mail/fetchmail/fetchmail-6.4.20.ebuild b/net-mail/fetchmail/fetchmail-6.4.20.ebuild
new file mode 100644
index 000000000000..e2ab38dd186c
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.4.20.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="tk"
+
+inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="https://www.fetchmail.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ssl nls kerberos tk socks"
+REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acct-user/fetchmail
+	ssl? (
+		>=dev-libs/openssl-1.1.1:=
+	)
+	kerberos? (
+		virtual/krb5
+		>=dev-libs/openssl-1.0.2:=
+	)
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
+	socks? ( net-proxy/dante )
+	tk? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
+HTML_DOCS="*.html"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
+)
+S=${WORKDIR}/${P/_/.}
+
+pkg_setup() {
+	use tk && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# don't compile during src_install
+	use tk && : > "${S}"/py-compile
+	eautoreconf
+}
+
+src_configure() {
+	use tk || export PYTHON=:
+
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl ssl "${EPREFIX}/usr") \
+		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		--without-hesiod \
+		$(use_with socks)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
+	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
+
+	systemd_dounit  "${FILESDIR}"/${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
+	dotmpfiles "${FILESDIR}"/${PN}.conf
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+
+	use tk && python_optimize
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+		elog "the polling delay used by the fetchmail init script."
+	fi
+}
diff --git a/net-mail/fetchmail/fetchmail-6.4.8.ebuild b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
deleted file mode 100644
index 5e9c5c2ab3eb..000000000000
--- a/net-mail/fetchmail/fetchmail-6.4.8.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_8 )
-PYTHON_REQ_USE="tk"
-
-inherit python-single-r1 systemd toolchain-funcs autotools tmpfiles
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="https://www.fetchmail.info/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ssl nls kerberos tk socks"
-REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="acct-user/fetchmail
-	ssl? (
-		>=dev-libs/openssl-1.1.1:=
-	)
-	kerberos? (
-		virtual/krb5
-		>=dev-libs/openssl-1.0.2:=
-	)
-	nls? ( virtual/libintl )
-	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
-	socks? ( net-proxy/dante )
-	tk? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-		')
-	)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/flex
-	nls? ( sys-devel/gettext )"
-
-DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
-HTML_DOCS="*.html"
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
-)
-S=${WORKDIR}/${P/_/.}
-
-pkg_setup() {
-	use tk && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# don't compile during src_install
-	use tk && : > "${S}"/py-compile
-	eautoreconf
-}
-
-src_configure() {
-	use tk || export PYTHON=:
-
-	econf \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		$(use_enable nls) \
-		$(use_with ssl ssl "${EPREFIX}/usr") \
-		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos kerberos5) \
-		--without-hesiod \
-		$(use_with socks)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
-	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
-
-	systemd_dounit  "${FILESDIR}"/${PN}.service
-	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
-	dotmpfiles "${FILESDIR}"/${PN}.conf
-
-	docinto contrib
-	local f
-	for f in contrib/* ; do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-
-	use tk && python_optimize
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
-		elog "the polling delay used by the fetchmail init script."
-	fi
-}
diff --git a/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild b/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
index 2a9b14181a09..80f96706c304 100644
--- a/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
+++ b/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
@@ -101,6 +101,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
 		elog "the polling delay used by the fetchmail init script."
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 5253383f106b..9ebf1480cb63 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,6 +1,7 @@
 AUX comsatd.initd 569 BLAKE2B 1b4ad287b67ef6d95fbc626296e79a857264754159967c54105e9d9f4493e95d3494cfce6082f289358021e02bbaac580a1b4d78ca8b2cc713af57197e532431 SHA512 9c36ddf70bf4f0e3c56f55651a740014078e3a1a79569a62ccd74e1ec7167eac6ecb69d56c15913d815c472fe943d17a1e781a669208d37c97671afea2208f8f
 AUX imap4d.initd 566 BLAKE2B 2d030e47f63b4133eed4b47c9069c54de290f907d9429eb99675380569e1e0efdbb1172664ba1ee0f2924ac7284981fbe350d1543a6d0790722456523d997535 SHA512 51d6cf4285c6823d97e52c7eb408a80aa66376f329685acdc21e096c2099a044b2fd18e7b9e5ed89406a3cd1f16b7aa7b0243f8ea46aa7824da48b566ec00324
 AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed337ab6ccc2b6263af9cfa8078913a7b70beb5874c999174d5648c1faeace8f68e146 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144
+AUX mailutils-3.12-disable_escapes.patch 781 BLAKE2B fdd350688f96d4b073154005a68f3eff179a0264bb4611916cb24955fb6759de534ec3cdc04bd9bb687eeaf4f714de5c590030c3a897dc8b54ca4d843ebdd6b0 SHA512 383dbe4d55a5fdaf3b62ee4a3743c04eb53b46246d1a08aff1c4b42171914014b39c1e2c3cad5b0c7bd6649d97ee5377c5643319d875b4fb6f7a93aea0b5fec3
 AUX mailutils-3.12-fix-big-endians.patch 698 BLAKE2B 5d73570756063047633c82df2038c29999b3f9aaa48d7bfe58cf48c985107c43e36a717203b323506a9c8e24dfc579c218c2107e5a59de642290d3699a9c8867 SHA512 78af75afb332a47b4780ea1a1d67113e7e71febcff6044c8e9281e09017181309d1665da50010db1ccfebffd2c0d9ddd10e753a867c9aee9d99b67f9475ffce1
 AUX mailutils-3.12-misssing-endif.patch 689 BLAKE2B a54f086b1fccd4c5965ef849158e0e667f25abb6f095bd5e8aa63b53199e01327c3de33b43892da1eb1429dc0443a5133880bb27374f128a4f00e58d476a7740 SHA512 40dc7fe324014eadde44e55af2a2de4e474a2f6c2bd3a3fbea10446156b4505cf36c89c7458da74749ab276570f5bdbaddf842ac9cf289ca7e7a4888d463a5d0
 AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b4079ea51cd8e57b4e97522d21e696bd6048fad2de885f88644d23f434a6e407f42ba8fcbcfe5b1e65884f37718e34328 SHA512 0972cde536a1a82fe243c9b048fc15f4863586a2344b54c9b4f6f8a5935762c7272c0af2698239af7de9da62b1c2928bc7f621e01f447423fdd8288cedee88b6
@@ -8,4 +9,5 @@ AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d07
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
 DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2
 EBUILD mailutils-3.12-r2.ebuild 3691 BLAKE2B d2dfeab68b8c1165d6cfee0c9333e99c42499fd9e43475f45fd44338926a1810fdbfa0283f72471148b625b3538605b484618c18e935a109e92064cb15d3b8b3 SHA512 40b34e364f380074a48647e6d897f6f7841dadc3ca7c1723289b11bdabf98f1757b6e990bf4b510b1322dcc943bdaf703ca0e6d5703a4445314c70801671147c
+EBUILD mailutils-3.12-r3.ebuild 3704 BLAKE2B c42084fe3f0993a5e1d4c2dff6086eaa919b2a36fdfc69ea25ba87d6cf883acfbc0ca3b5f250b77c8848bc304a4b4fd7d4ad800ab14213ecf62006d928abb445 SHA512 03aeac5de0343ae0d354e45055188259739a6969f2b76f8b473917d14210f8e96c151e0c7cc2f3db8c062279316ee506b4ec094a44d0da51ff8a15cac6cae659
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch b/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch
new file mode 100644
index 000000000000..073d1b671219
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch
@@ -0,0 +1,24 @@
+From 4befcfd015256c568121653038accbd84820198f Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Mon, 19 Jul 2021 11:27:40 +0300
+Subject: mail: disable compose escapes in non-interctive mode.
+
+diff --git a/mail/send.c b/mail/send.c
+index 1bdfe1134..098374dab 100644
+--- a/mail/send.c
++++ b/mail/send.c
+@@ -1324,8 +1324,9 @@ mail_compose_send (compose_env_t *env, int save_to)
+ 
+       if (strcmp (buf, ".") == 0 && mailvar_is_true (mailvar_name_dot))
+ 	done = 1;
+-      else if (mailvar_get (&escape, mailvar_name_escape,
+-			    mailvar_type_string, 0) == 0
++      else if (interactive
++	       && mailvar_get (&escape, mailvar_name_escape,
++			       mailvar_type_string, 0) == 0
+ 	       && buf[0] == escape[0])
+ 	{
+ 	  if (buf[1] == buf[0])
+-- 
+cgit v1.2.1
+
diff --git a/net-mail/mailutils/mailutils-3.12-r3.ebuild b/net-mail/mailutils/mailutils-3.12-r3.ebuild
new file mode 100644
index 000000000000..b8efb6324f39
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.12-r3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://mailutils.org/"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
+	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
+	tokyocabinet"
+
+RDEPEND="
+	!mail-filter/libsieve
+	!mail-client/mailx
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	dev-libs/libltdl:0
+	virtual/libcrypt:=
+	virtual/mta
+	berkdb? ( sys-libs/db:= )
+	bidi? ( dev-libs/fribidi )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gdbm? ( sys-libs/gdbm:= )
+	guile? ( dev-scheme/guile:12/2.2-1 )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c )
+	nls? ( sys-devel/gettext )
+	pam? ( sys-libs/pam:= )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( virtual/gsasl )
+	servers? ( virtual/libiconv dev-libs/libunistring:= )
+	ssl? ( net-libs/gnutls:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	servers? ( tcpd ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-add-include.patch
+	"${FILESDIR}"/${P}-misssing-endif.patch
+	"${FILESDIR}"/${P}-fix-big-endians.patch
+	"${FILESDIR}"/${P}-disable_escapes.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# maildir is the Gentoo default
+	econf \
+		MU_DEFAULT_SCHEME=maildir \
+		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		$(use_with berkdb berkeley-db) \
+		$(use_with bidi fribidi) \
+		$(use_enable ipv6) \
+		$(use_with gdbm) \
+		$(use_with sasl gsasl) \
+		$(use_with guile) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with postgres) \
+		$(use_enable python) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with tokyocabinet) \
+		$(use_with kyotocabinet) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable servers build-servers) \
+		$(use_with servers unistring ) \
+		$(use_enable clients build-clients) \
+		EMACS=$(usex emacs emacs no) \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	# bug 613112
+	newins "${FILESDIR}/mailutils.rc" mailutils.conf
+	keepdir /etc/mailutils.d/
+	insinto /etc/mailutils.d
+	doins "${FILESDIR}/mail"
+
+	if use python; then
+		python_optimize
+		if use static-libs; then
+			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+		fi
+	fi
+
+	if use servers; then
+		newinitd "${FILESDIR}"/imap4d.initd imap4d
+		newinitd "${FILESDIR}"/pop3d.initd pop3d
+		newinitd "${FILESDIR}"/comsatd.initd comsatd
+	fi
+
+	# compatibility link
+	if use clients && use split-usr; then
+		dosym ../usr/bin/mail /bin/mail
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.la" -delete || die
+	fi
+}
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index d37350d6ce93..6b0b76da28a8 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -3,7 +3,9 @@ AUX mu-1.4.15-guile3-1.patch 5237 BLAKE2B 49fb8d7c75d0dc758b7a0cc4d69fca9a1d776c
 AUX mu-1.4.15-guile3-2.patch 506 BLAKE2B ff01cdf9d9da6d4a2f2517c9a6df56e13929e4e9795f951c8f0cd3778c6a4f82cec305e2d24e05040b2395796690b9205e22699ce102745e9367e926ef6eaccd SHA512 c1da640ac0d900653b21d64b3078b8c3a02bc38a2745adb76a2c3c27f8829d0678daa18bb58e238d07a2d01d716a4291746840ad5438caa9637454f17ac8ddb4
 DIST mu-1.4.15.tar.gz 2309695 BLAKE2B 9808e59b758525937ec97e0ca6515108c1fb4287f3134d0c6038a74ef57b4992fede6b8957ba4e7e1681d8d307aec32fa6b2931e588004849e6c1dfb7da2f7f5 SHA512 dd0426c1fb7fe2430b47fc1232e067d1c017b3c428bbd8012c542f6e1ffa7741bb145c6851f40cbc945403534dabb4aa99faf369166167d187f083dde1d30546
 DIST mu-1.4.15.tar.xz 846052 BLAKE2B 933d04696c4ac145f20ca6c84f6fbe62f70fa3e45e50dfdf2e48a7007acecc56d8650f965dc6810fc7f8bbdae6595b7b7349f2675b08cd9fb619ee9eb24eb251 SHA512 e7741b77bce5c7c1c818549e803fb386f0b8727b995a7ac9b961b74e89cc7dbeed52b45d70895995a1640cfd36a49b052eeeed9be6c48999f2182a68bf5c205e
+DIST mu-1.6.1.tar.xz 866044 BLAKE2B ed6464e2ef63d37c42783235a0537cd20c7442333d4a6b59af0d257db8e3e6d85db7106ae2f89aa5f1536e50afadd40c89a8215a288080130d14e3ceb79b1638 SHA512 d894f302cabef86ff6b1d85eb945b2aca27729eaa6558598076c8f065d584592d5e601fe6a6045cea9b8a1466320c838f995ffdfd564447683538a5e48f8d7b0
 EBUILD mu-1.4.15-r1.ebuild 1374 BLAKE2B 6b14c1413eff8c536636d0a4e4a9ddc7db6a725f30ea34e48fe74154a5ba233aad28d268202adf1859cf7955dc78d083a72f97133951afc6c1d4ceea4fbdfdf9 SHA512 ad2787b57a340441aa760c7ff19dd906cfe7abf796136d5d72c6e2dade58dcd61f4204e192beff1d5f1f14636ecf6e451903073fea6f80dc0e8c676282bb7618
 EBUILD mu-1.4.15-r2.ebuild 1535 BLAKE2B 78399a21ac72dd380d097c76b15e7146e5e1d470fc16ec5c548ab18a56b4e0419751b68f3515bedebd591ad44bd68cbf7d451821a5b3c2cb1eec43a208516046 SHA512 18d3d5d1f811925cd2cb01c0c4302b76a841d0cd46e6fbc9cf52ffec716fd2f34775d06df10a1c51e6553e763d6be9675fe1ce0612781c2b2abab1c0e9d79fd6
 EBUILD mu-1.4.15.ebuild 1772 BLAKE2B 8b31278a7ee402b88f93ddea57340c8067be56a7b9377d20d705bffb56c2baac4e0c9c1bde2ce0b1b432e68b7bf40229e4ac775fa66a43df126f7cf22aa504ab SHA512 a611058c25591343bf57a5a820481516b71005e811e60a26b47d25f04f7ec8c5ca9b9936d5259f8fbd9f17c296a01246a48b451ef21a52268991b19dd6960441
+EBUILD mu-1.6.1.ebuild 1393 BLAKE2B 2b5542aa0646a1927db640b66a3d02a4124ef2821f0b583520267e6d48d21ad705c6a2335a550155a99e67239ff659da1f13a7165d7e73fbe956df44112698c4 SHA512 259f17e0b118aea57512d0c96ea37aeaa905586200a47cbfc90c9b80dc0fa1bfe6dfd634037cd68bcbfe50094479d2b917bdbb1533509582c014ea05d7634ed9
 MISC metadata.xml 925 BLAKE2B e2267c540c5107d64c6fd7ab7c0e20476a473fe704facc4d692f7f90272ed05fdff5af673dcc492a134371ee81ad0c3794e7bd22e7cd10b4cc5e744fb26d25bf SHA512 e7f92466cfd6fb8bdc66c1262bc4b426f73f1cebea24fe4cd2f6a5f256df46ad7a9ad545faeb91bfeb2ea17fad848b2b7f7eeef576ef0e010b5a87d821a0c5e3
diff --git a/net-mail/mu/mu-1.6.1.ebuild b/net-mail/mu/mu-1.6.1.ebuild
new file mode 100644
index 000000000000..0d32259bccc1
--- /dev/null
+++ b/net-mail/mu/mu-1.6.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="emacs guile mug"
+
+DEPEND="
+	dev-libs/glib:2=
+	dev-libs/gmime:3.0=
+	>=dev-libs/xapian-1.4:=
+	sys-libs/readline
+	emacs? ( >=app-editors/emacs-25.3:* )
+	guile? ( >=dev-scheme/guile-2.2:* )
+	mug? (
+		net-libs/webkit-gtk:4=
+		x11-libs/gtk+:3=
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable emacs mu4e)
+		$(use_enable mug gtk)
+		$(use_enable mug webkit)
+		$(use_enable guile)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "After upgrading from an old major version, you should"
+		elog "rebuild your mail index."
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
+
+		elisp-site-regen
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a3c017c6690a..134b62c4bfe6 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 676d90623a93..28e436093f82 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -17,7 +17,7 @@ AUX initd-16.16.2-r1 9986 BLAKE2B 4b1c9537ef85c9de1d0064a851472163576480f08b5738
 DIST asterisk-13.38.3.tar.gz 33711458 BLAKE2B a1f37c210e7e95962665310b542d9a3b682ecc5e90188e8272a0cd6e22ebfa963ed5af46f0f85c2074bc0bbe34d72473343ff3437d80b58e5383eb80385d0b89 SHA512 dd67f73704f1c68639313852ba1508165c7b525f0f4156c776258e27ee19a0ee87293ae7805178b0f37188fca91b861c52b5206cbba754a6181492d0efb7e895
 DIST asterisk-16.19.1.tar.gz 27870922 BLAKE2B e7b2ceac60f9db19802acc6c69b233556834815e1a9a3d17b2fd331d2577beb356f31a531a6d8fde70f78e9362bd8b6dbc796f906557c82bcd4847a612c788a3 SHA512 7b74fedce91ac597f3cc7a03b401ae7506bc6479faf008f3ea9c0f4783d85c5ce06d71bf73333d4bc1609a2cb96511d931d79f3bc8613906f370f9b4015b30b9
 DIST asterisk-18.5.1.tar.gz 27953748 BLAKE2B 543f2bfbe1527f3a168dc73d3d9f20e80e95be9de9532a97ff6a5c70a548d525c39ce5251b80dbcd1c0e31c066fc48520e6c373b1404bf24a00b0a48ad134bcd SHA512 95f30c14602587827c7d7bc4652639163f4fe6338fade35d533525aa8825d7a5082c9d6fa4671a5f4f89bd90a0d657ce7e51fd4216558bd367abcb10b25aeb23
-EBUILD asterisk-13.38.3.ebuild 10809 BLAKE2B 2a6b5c1c0cfacf96196b1f3d076554277377e1745ebb7cb7d0d801dbbd364e52a23464a78e4fc324895de7efaef495a38ca1db25f257b74f95e4c53fd591363b SHA512 24e91b215398d4d4c7e032b0b7de4aecd87e3764dda842a092a6d31f68dd3bb55df84c32c0bbb95f13aaccb42f700640a336a4fa8df02cc58dae80ef51f92ab3
-EBUILD asterisk-16.19.1.ebuild 11215 BLAKE2B 2589b6e945255a57c13f4d862d4d778787cd5cb05cf41ce15a1b8e389aff068ed2deb271c2eca62ab5b70e5d9dfa9a446a5f04a3dceebc68149ffb64007fe96e SHA512 7258715db285cecd25d4242c41a7fe01323f540e0923726783276eb83b199fda84fa6fd60a5f6b9200e86ee6f398af7c6fbb154808e913c842a6a1e0bd60644d
-EBUILD asterisk-18.5.1.ebuild 11190 BLAKE2B 85fcf0ea3ba693936835c47971d85b962def77113c77fd5d3c878e8f15ae7f8a5cf23d899d6779034f27ae78e7710a3ca27fa5302975d272f67ab11e086b2553 SHA512 2039c5d624abc31fd43840e7fbd57c483f0c8a543d79dce32c690800f88f49f1ee52dd63ee9ea2791afd876b934d87202316852d35833c93e28ba8c4c2b6fff6
+EBUILD asterisk-13.38.3.ebuild 10842 BLAKE2B 44b09df35f9b59f2daa63a7cfa2910bb15eb51ac1324b28f7aee598b7a9c8853fdbd3e6484374f0fe4d831503951566737fd08b572e52da0be5dbf08bac5afad SHA512 a71bdd8a11cc2feb48b59c0e62de7e09f70d6aa7b0fa7262a31788ab20991f0e4045a4e82ea6a1ad72994afc7058fd66d89382000841bcb6cc6a9b1e101250ec
+EBUILD asterisk-16.19.1.ebuild 11248 BLAKE2B d2c137191071f2d0cf06d9c8081dc3cbb0c44c9995ff8d7d600c6cce3d3c4b8701ec0da2ed4ba6e46b09673aac64edf9a1833188234bef1436fb24d2995e5caa SHA512 34f8db71938444a1eb643f05bc0fbed1412327c5fb57a198c771033d600615a1f6e3530e4f1b7002168367ccc3788ee1477abb350472832fef996991ea96c7c5
+EBUILD asterisk-18.5.1.ebuild 11223 BLAKE2B b74ab695e8413ebfb8d59b9efcda1071126bad027d3846b709a532eed2b155b881868fb5103aaeb95ce9501ae85d02e58448b5e0f7abe2dac5df02df2aaae7c5 SHA512 39fe7525da517fcd428716aef046bde75b098224eba226a8adad520bbd7656df430d0c39a0f50a3ec8878ab795186b1419916d5305f748fe6f91552d59d63e50
 MISC metadata.xml 1482 BLAKE2B 71a7d51199cb53116efd36963d5881264faa13f8beb375ab68074c3ab560443c3ea9cb021c5c03c9c55fdfa9fc27425c90b4313d3a3bd680079add6ebf5763d1 SHA512 df1f06ccc232488d08202b9f6bfc62e17769ef740a2c1da9ee8a2c48d40d7a293f522b6c9c899c7ae202ba7c6b207fc25e69730d2983bb307921f82c070a09ee
diff --git a/net-misc/asterisk/asterisk-13.38.3.ebuild b/net-misc/asterisk/asterisk-13.38.3.ebuild
index 400218a388d5..f20b32b8542d 100644
--- a/net-misc/asterisk/asterisk-13.38.3.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.3.ebuild
@@ -322,6 +322,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
 	if [ -z "${REPLACING_VERSIONS}" ]; then
 		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
 		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
diff --git a/net-misc/asterisk/asterisk-16.19.1.ebuild b/net-misc/asterisk/asterisk-16.19.1.ebuild
index 10706b53e507..77e488e7b79a 100644
--- a/net-misc/asterisk/asterisk-16.19.1.ebuild
+++ b/net-misc/asterisk/asterisk-16.19.1.ebuild
@@ -331,6 +331,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
 	if [ -z "${REPLACING_VERSIONS}" ]; then
 		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
 		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
diff --git a/net-misc/asterisk/asterisk-18.5.1.ebuild b/net-misc/asterisk/asterisk-18.5.1.ebuild
index 1334c613ae61..e3f72db7541b 100644
--- a/net-misc/asterisk/asterisk-18.5.1.ebuild
+++ b/net-misc/asterisk/asterisk-18.5.1.ebuild
@@ -330,6 +330,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
 	if [ -z "${REPLACING_VERSIONS}" ]; then
 		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
 		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 5394636ae07f..04f117c5703c 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -9,7 +9,7 @@ DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7
 DIST chrony-4.0.tar.gz.asc 195 BLAKE2B 1947a73f35eb5c58f91775d76473210a7b5edff5b808e360eb0c3724351c54ac4f187a2aa4450830130da718c6a0c488baa170ca87e7e6eac781d85c67b3773f SHA512 c3156d91f4fdb6f9e2fdbc83b1399afb0ecdfa9b7bc92648c5bce477c3f0f921d2a13aa21ac6c281f18b008c60f08e3db6d82b642b646f064aea1dbe19295c4c
 DIST chrony-4.1.tar.gz 564648 BLAKE2B f9c4b44c521ee592c109b8a3d500b9cb3ea4fbf0d7dce9d8754498ad41ce2ac87c913cf72a38557ce5f28208672163b21b067307f723fd91cc91d71f69e739ef SHA512 5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f
 DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e732554433d5ef6cf1a437296ee9d0da3b2e9e72d1ccb0e3a6b1ee1227e5d1626bf031b0491670ee0712e17c57ff SHA512 82faf9171d782c18224d2d44b340994b0ddab141e88cc803dea83d0ffbb6468bc51e8b11c8dd9bd327220cae04f7d789b58ab23141a2bdf038ce628f9adeb57a
-EBUILD chrony-4.0-r2.ebuild 5478 BLAKE2B 4dde74187b43f93d8056a1c70a0a9671ea3e5ef4f9975f0ed9458ec901565849fc0f7a8dced8398d82f1e6836cfdfe55d4c2630043795153b3592639c3828715 SHA512 d6249e70f95dc0bbe3355cea997b362bdce5b91d3aec27a885eefc7c10cac4ab9718054b172c37c60c4363e7eebb62bf1f4a6e77bef330d4c34c8975bfd71202
-EBUILD chrony-4.1-r1.ebuild 6624 BLAKE2B 7c26d02175f8c91190b04f0d9d79b09a8d5ca51d3a558116336dcaf3cb4fc4e5c801a36f2db6203d91cadc3912cf863e566a0c7a9205be57772decebef8dab58 SHA512 0896ac623d575faaa7f92c9e8f348c57e0fb9beb8b60c29f34603b6875cde0cbfab00c106c3e755b2285f76faf4155dd02c3d6fb38aa737fdc6157a15ca3fefc
-EBUILD chrony-9999.ebuild 6631 BLAKE2B 93c4b6a53a2c44bcf2508125fe33291c60a37321f32eaaa2c6fb4616bb97378cc50463ec977cd0204e1215c4651d84d79c39adca45285c9ae44e126007cea5a7 SHA512 69c90fa53b76c2a996d466098133a962764f19a54686bbd03c1694eff80b6e4a846bf6c33b1d139bcc0e0076eb51f49a78d45a550f816786785bad00b3fc6075
+EBUILD chrony-4.0-r2.ebuild 5486 BLAKE2B 5fdde6f20fd5bf52e8d0420a03ba876c8a089e314db34b72bf17ceedc4806ee873b39035ffad654fa3a176a1a377e1b113e3bfec65fc3bf4d1e2eab12bc64685 SHA512 7289a03274c007acf24dcb0060d1bcb961c1d10119af1b7559b13b93bb6c8af3e9d20e4bb38077f58eb427bfe4d9db60bc040d7a1ec1951cb1bfd325bbc2a4e9
+EBUILD chrony-4.1-r1.ebuild 6632 BLAKE2B 5e5de2d3d155e263801c1af8d26dce99a9992cec44d1a834050b29fdf1d61d4ce6fad49fca9066df40865014a731aebeb6c89cf028f7fab1338acfc90b9c8635 SHA512 5f6eb80d2d4edc0244818445eebf1adaa67b3c0ecedfb8f99f8eafa2c5139faafef82dbbb2e56fb2adf14b0b231a9c78cb763ec1559a68fa05ede78b5b4b8a40
+EBUILD chrony-9999.ebuild 6639 BLAKE2B 18ffeb606ea9af800b1690c6853b6436e1b8e3915701a563e6dd0cd8bacc22756c2682a4b845af73acdbf32d8602d003f0450b7997185d4bc563fdf41672545a SHA512 ec524df0d9ed1405baefeb53e471acce91035cdc183b80122c6eddee9c95ffbf452be056f00aff7c7b5805de29b0d75af4ecce89923c99adb2a632675b62c65b
 MISC metadata.xml 2299 BLAKE2B f5e8667a5fdeb86395d773eaf6e7d80c2133fe945565d7d6005f156a0a4763f1434ba887627fba63dd0f0a15663d7fa194d91699f6961ad21b9afa40576cd1fd SHA512 370e06edf9df22a327ff8b528f8a810c731af4615d740331ac737af8cbc5af265f7592ec22bf844301c5089185bc4f7de102f87378f85cf276d4f550933e519a
diff --git a/net-misc/chrony/chrony-4.0-r2.ebuild b/net-misc/chrony/chrony-4.0-r2.ebuild
index 290db9f4f020..693ea18334e4 100644
--- a/net-misc/chrony/chrony-4.0-r2.ebuild
+++ b/net-misc/chrony/chrony-4.0-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
 	inherit git-r3
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc
 	inherit verify-sig
 
 	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
diff --git a/net-misc/chrony/chrony-4.1-r1.ebuild b/net-misc/chrony/chrony-4.1-r1.ebuild
index 41b2733275f5..bd15590467d1 100644
--- a/net-misc/chrony/chrony-4.1-r1.ebuild
+++ b/net-misc/chrony/chrony-4.1-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
 	inherit git-r3
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc
 	inherit verify-sig
 
 	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index d3e68c8d0126..3f3cc9880058 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
 	inherit git-r3
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc
 	inherit verify-sig
 
 	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 73e0935b91d9..fb6e5749868d 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,6 +1,6 @@
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40
 DIST connman-1.40.tar.xz 758516 BLAKE2B 66834032f82e80a6f950d7ff823dc5f1f45090f3444b5a0241cabd0346cf9749b8780b624ce6a8e505305cc1a75423e5a95a7b1f77a282d231845bc33389924a SHA512 33df90814b7499aeafcd51fca4f8ffbc07efacfa29dda46d3b9bcd3ff26264dc53c3991e7e53a8563ca403015c345e59c7ad29427c38ee3d88dd282479db7a0f
-EBUILD connman-1.40.ebuild 2789 BLAKE2B 63f64c553f05d48aaee8967a2fb569287e7a0b9ff113031310837001b1e8651b1cf8387ba44ffc5ff7d4945fcb0e563a4e2fad3af4fb093af638765fb8e8a89a SHA512 89f74ce255f161f6820d0ff1ea4786336048ca53854bc40a9462c52ef08db38b35067e8a294026d1ac0ea5ae5962f30c751c01501e296d2d388d0abdbe3368f4
-EBUILD connman-9999.ebuild 2788 BLAKE2B 78e75bd78bb645b80931465d72ab2d51de070cf7538f289078d0bfb08c7f5421be5194dccd3b4482e641611a133d41092a9caf5086dc74bfeedf6e46329ce2d6 SHA512 612a4fdeb5cef9e435b8e59c53f869e052d530ee2e66917184d0bcd227eba1d22839b38b2bad182bb1ad2d98763cf3fdf43ed10426098685f9dd5e86fd85544a
+EBUILD connman-1.40.ebuild 2769 BLAKE2B 35f60256a6caacccab4669f29d4fc85dea55eee4d368590ffaae072e1898a4b892b47efa5e244fd83c6edd7266691ce086b96e55921fc4aa9bb1a08de80b64a1 SHA512 14d15a1134310baa57b5de17619fe06faaffe465a4c9a8219be58d40c65048d03f3c2339a67ae36747db31a3a3e9ccb1247c833cf2755741f520b7a28a8b1dc4
+EBUILD connman-9999.ebuild 2768 BLAKE2B 941f992ea03c199415c7c453a58335bc14f5d1bea965a676c364052a4dacaa3b95f28e7b8258f8069d2d4551142a0cd96c4eb748900778612372f79085141446 SHA512 b0e4d9b12c0a509899304e021b36a24ccae6e60334a50561224065b7ab022b14c31336cb4032cbaec05f8fd49db4fdc1c13775cccd434eef2cabc24203b8b495
 MISC metadata.xml 1302 BLAKE2B b6cea3b784c7f217c5d0befc833fe573ff68f010f9fb1043b11ce9c70473c45b2a9c03d59495e8a04f58e1657ce6a9ca531da9675bdd545493cd1bab8a583ae9 SHA512 3df49e8184d319601df17ff8238404c673026a6953f0a566c7d9134215841dab8cb6a4ec507e2c6467bfbc463678568696828173b80a96a4035a449ff886bb3f
diff --git a/net-misc/connman/connman-1.40.ebuild b/net-misc/connman/connman-1.40.ebuild
index b7656806b61f..d76ef5ba0be7 100644
--- a/net-misc/connman/connman-1.40.ebuild
+++ b/net-misc/connman/connman-1.40.ebuild
@@ -97,5 +97,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf
+	tmpfiles_process connman_resolvconf.conf
 }
diff --git a/net-misc/connman/connman-9999.ebuild b/net-misc/connman/connman-9999.ebuild
index acb42aed5422..9f0547208dca 100644
--- a/net-misc/connman/connman-9999.ebuild
+++ b/net-misc/connman/connman-9999.ebuild
@@ -97,5 +97,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf
+	tmpfiles_process connman_resolvconf.conf
 }
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index d0a8f6902b2c..78abdaef8e79 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -24,5 +24,5 @@ AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd5
 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
 DIST dhcp-4.4.2-P1.tar.gz 9898311 BLAKE2B 7cc40dfbe578bee13c7dd7868a25d0d88358bf82b02539e933a4eba06039a43f0d99b3ef6ce811b60ed3a991b222844f4a5bd9e597c11d83b09ff551ba0380a6 SHA512 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040
-EBUILD dhcp-4.4.2_p1-r1.ebuild 8343 BLAKE2B 645af883d29eb732f539ade6d80c992b1eed039869964bdb3c6180f76fb579b461cd1572b3644b95ede06b5c469ac3671f5621abe025ac9b611b47ede1c63b3e SHA512 a1e372dd55427af85f8632ed3cf21fec2ce7e63267ec18f272d27bee906c3afe79f68aee0ff29fe2643b8abe21e19baf99f6c37ccf151a1a194be06c7b0bcd5a
+EBUILD dhcp-4.4.2_p1-r1.ebuild 8400 BLAKE2B 0bc20dd4cdace6b2f429a1c29fcd21b023d6fa2effed495ef0f7c2713473518c0a03ea8bc854bb9b08c7a524a354dba6bd0192d8c95c094085e84af17af14b05 SHA512 dd1885aba5d66851b59acd8127781989faabe63beae84a59e2b39950464b4a03cc86d5951eebf58d54ab31407a01b8de2b8a48d7b6d68e2542d64ab3031e8182
 MISC metadata.xml 476 BLAKE2B e77eff7eca45c59f3f7ead1b4065db2696400ed0814fddcd6b8cd377d156795e7d7a6864da8c869b870d1705bbdd6f403a3a0358e149b5a4b4ad098589ba90a9 SHA512 8e9599bcb9c15749514d5fada7ebb4e4bf0752541ff8b54a3c6b557d5debc6356ce593b8f9640abf534aae123d3e65d978cfdf091635246c8afe2a170a61de26
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild
index 57fd8dd47f48..7ae208514c67 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild
@@ -271,6 +271,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	if use server ; then
+		tmpfiles_process dhcpd.conf
+	fi
+
 	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
 		ewarn
 		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index e76ff23e2db7..f2ae51851707 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -9,6 +9,6 @@ AUX exabgp.initd-r1 1591 BLAKE2B 10b61e1daf5d10a5e3d60c67bc3b67fdee1583d816d2b19
 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
-EBUILD exabgp-4.2.11-r1.ebuild 1250 BLAKE2B 32b423c361ba950250135dab442d795dfd8fc191bf3070877e2df2aae34dc76392030c15ce87bbe07b170d71c4ea64a1b5cace7885cb7bc308d6983731fad98a SHA512 0e245f536632f8cbf4869dd5cd52f945fb03e604ab2115d64ad9539075d384c64e003f3f5310ef8d4d31dc9a652705e1a684f579ec2b69184e91cd4fb70b222e
-EBUILD exabgp-4.2.11-r2.ebuild 1438 BLAKE2B 37e34dfe62a42ab901abf44a77b7a84c4434eb7da2d4c41b3fb007e14f93d98c3b91b545e345f8603c8f616e3dd79917c2081b6b77921df13ff3077c985a3e97 SHA512 57c1c36a2431e10de4dba2f788303d6a70a0d9446e4287fab535893ec2779c32a166f5b6e848132446580077d02c0df1838ece80a44ed7a6336abd94d3edb6cd
+EBUILD exabgp-4.2.11-r1.ebuild 1299 BLAKE2B b15271c374199edaa379240a18c56e5dc485714874a547f5436855454e4f4e6e8a4020620d7896b2dd19ca05e419ee66eadae0c715729b9d21b1c28445fa4ec6 SHA512 cfef1786caad92e870e52f7ca300b24c63d05049c9a4d3a057c7c5523bd94de3d291422b2346a6a5b8ef17137604577ca60bd00df76688018cb66b618aa1f0aa
+EBUILD exabgp-4.2.11-r2.ebuild 1487 BLAKE2B 50adc3f2ce14108cb64d7b2a59ff043e87f0fa3e8b04f85b2ccc65a1a83831fe10b8950e80167a35ce53cd2bc2e68e5d0c3bd659503d880c7cc50c07853e0fc9 SHA512 b1bc2e7e8d540197a3d2ff0a88c12cafc7688894814a5adf3658cf4672ceeb634502765789a13baff31e73eb1fd472084dd136a7ae07e83784a2d673a4dc4f35
 MISC metadata.xml 343 BLAKE2B 306f12e34e1edf8060cdd1515f77040a2b400a9d853b8b46a73b219464947cf3fc1f64efc32bde26074aa61cb483466ea752481876a02cb14c8388787105e61f SHA512 9c4c8e26eb586fa1153b1f02db408cebd9a460c6ceca049fe121977d1a14ec130d9289aca2f0cffee009a5e7f314818eb37b55790c75502817bb2941be7352f6
diff --git a/net-misc/exabgp/exabgp-4.2.11-r1.ebuild b/net-misc/exabgp/exabgp-4.2.11-r1.ebuild
index a61e484d1264..1ec8278c5641 100644
--- a/net-misc/exabgp/exabgp-4.2.11-r1.ebuild
+++ b/net-misc/exabgp/exabgp-4.2.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,3 +54,7 @@ python_install_all() {
 
 	doman doc/man/*.?
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild b/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
index 3e7774c03533..be3a94116ae7 100644
--- a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
+++ b/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
@@ -57,3 +57,7 @@ python_install_all() {
 
 	doman doc/man/*.?
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 6f1758466858..d78936a52553 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,7 +1,10 @@
+AUX freerdp-2-openssl-3.0.patch 2257 BLAKE2B f1df2fec92572b6afd3bdddbf5b55586d313bb521c84ce49878db969b0dd631b842a292cd17c6d3ace11846d558d3921460a95cef392221d4620a99ef4b6eac9 SHA512 c48514bc83266bfe35e50a83624694f637668cb8b90a650931626c72f100182318036a09ddcfc48f89e7b71f9520afe5212b684926585424e02bd1e830ca2402
 DIST freerdp-2.2.0.tar.gz 6878427 BLAKE2B 0a2a4e4724e9875ce5d975b2c9a0b89ce9467e5950ee4d2d007596269683fa834bfce83e2bf92558887e4fe9418186a5e69708e859649cd0ed095029167a7e12 SHA512 8917378f74b5fee1ddc607b152b29783855f7e1e838fde68bf4d55177295c15fdccece02356d83f998e3bef2abd75b8354d4bbd26a7631ed296a1daf46864aae
 DIST freerdp-2.3.2.tar.gz 7284490 BLAKE2B f6017752993fcd9213117016825344953872b3ad6b6717039ba78555bbeeb276eb548c2c097c5df46d25d19678b8e275ac25a4c62e212c087e1b52d9ce672de9 SHA512 b8502d34c73113a42bf2dc240431967829064d68f507cc42ff06432a784213eee4a2c001b174f1b970545aec75b3caf21ba5f4ee1ca8c07c7ef834131413204b
+DIST freerdp-2.4.0.tar.gz 7244549 BLAKE2B a48c48ca7af044a8421d15b7cae971e3f568b55b26b2bc44c99dfb5cbcd7558fe73ae8b59ee127f40cfafa30fc26fc45bf34cc86ae71cba9b3b9c450c88b131d SHA512 5dc34e66ae7185393981ae33676d689e3e3e8d7f738b37d53675ab991a762a42450d02d738166fc49f196d32453249eb36e35728f86edae6ddec866a913551f3
 EBUILD freerdp-2.2.0.ebuild 2805 BLAKE2B f351598a209d0c2fb18c711e9f76e9d26325d31605cb6ceb1f06d0508030cd6c127384794b03e5156fb866841a8e27915be0e5edc0e84d66c77b671f4c0639c1 SHA512 452305faf9d31e27b6571f1ada542bfac588b6491e6d451a35b132b816e74e25d8cc88b1abfeeb485989fd96eed79e030f68686b6502295b3895453c1b96dab4
-EBUILD freerdp-2.3.2.ebuild 2811 BLAKE2B 71ecfc100f2dc04e368e8561fb06c0799e1aa68d9ec64144958d4ba60af70961e66c3f6ac46da48ebd07ffc9e02869d8bb0699bec778b68600332c181aa1ccc3 SHA512 4312971f4594c7c5f966bdc505e5d3483392a1e0289fb84790550d7f270e1a84502c1a89cc3c779675eddf593eda0b6fa15a72280db6442e1cfd286af651c3ff
-EBUILD freerdp-2.9999.ebuild 2811 BLAKE2B 71ecfc100f2dc04e368e8561fb06c0799e1aa68d9ec64144958d4ba60af70961e66c3f6ac46da48ebd07ffc9e02869d8bb0699bec778b68600332c181aa1ccc3 SHA512 4312971f4594c7c5f966bdc505e5d3483392a1e0289fb84790550d7f270e1a84502c1a89cc3c779675eddf593eda0b6fa15a72280db6442e1cfd286af651c3ff
+EBUILD freerdp-2.3.2.ebuild 2867 BLAKE2B 67d97e3b81703d0d8be132acfdeade9cc0c08b6861fae2d74d45bfa970c5c22d16683dfef7728f5d5acd71338da6ecbd2bde0d1bbac14ab81730456ecbe50875 SHA512 0f8706eefbd4671c800363ca8bac3443b0c860115f263bc075d39c15414faca4320a0fb27f47a131ae4665dd2049bcb890169b182e2f8a4d1b17c303d3cd064c
+EBUILD freerdp-2.4.0.ebuild 2867 BLAKE2B 67d97e3b81703d0d8be132acfdeade9cc0c08b6861fae2d74d45bfa970c5c22d16683dfef7728f5d5acd71338da6ecbd2bde0d1bbac14ab81730456ecbe50875 SHA512 0f8706eefbd4671c800363ca8bac3443b0c860115f263bc075d39c15414faca4320a0fb27f47a131ae4665dd2049bcb890169b182e2f8a4d1b17c303d3cd064c
+EBUILD freerdp-2.9999.ebuild 2867 BLAKE2B 67d97e3b81703d0d8be132acfdeade9cc0c08b6861fae2d74d45bfa970c5c22d16683dfef7728f5d5acd71338da6ecbd2bde0d1bbac14ab81730456ecbe50875 SHA512 0f8706eefbd4671c800363ca8bac3443b0c860115f263bc075d39c15414faca4320a0fb27f47a131ae4665dd2049bcb890169b182e2f8a4d1b17c303d3cd064c
 EBUILD freerdp-9999.ebuild 2811 BLAKE2B 71ecfc100f2dc04e368e8561fb06c0799e1aa68d9ec64144958d4ba60af70961e66c3f6ac46da48ebd07ffc9e02869d8bb0699bec778b68600332c181aa1ccc3 SHA512 4312971f4594c7c5f966bdc505e5d3483392a1e0289fb84790550d7f270e1a84502c1a89cc3c779675eddf593eda0b6fa15a72280db6442e1cfd286af651c3ff
 MISC metadata.xml 481 BLAKE2B b7102d2ff331d4c991dbd2d20b3bd33d375fe5f332ab48f2c3401a579e584cdc4c84795a286c18536b82cd88b7b9991b3559774a937ac59ad8ccc21b91241f60 SHA512 47db413f3b78632acc874d8e67ef8231551a6074cb2269760fb780f1a86dc334bf7675550fed7a95e98a92470e3d70cfedb10f98f6ec686e785dd67615e93db7
diff --git a/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch
new file mode 100644
index 000000000000..e4662751e5ce
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch
@@ -0,0 +1,61 @@
+From 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Wed, 12 May 2021 12:48:15 +0200
+Subject: [PATCH] Fix FIPS mode support and build with OpenSSL 3.0
+
+FreeRDP fails to build with OpenSSL 3.0 because of usage of the `FIPS_mode`
+and `FIPS_mode_set` functions, which were removed there. Just a note that
+the FIPS mode is not supported by OpenSSL 1.1.* although the mentioned
+functions are still there (see https://wiki.openssl.org/index.php/FIPS_modules).
+Let's make FreeRDP build with OpenSSL 3.0 and fix the FIPS mode support.
+
+See: https://bugzilla.redhat.com/show_bug.cgi?id=1952937
+---
+ winpr/libwinpr/utils/ssl.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
+index 3a859039034..03b23af43ac 100644
+--- a/winpr/libwinpr/utils/ssl.c
++++ b/winpr/libwinpr/utils/ssl.c
+@@ -244,9 +244,17 @@ static BOOL winpr_enable_fips(DWORD flags)
+ #else
+ 		WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled");
+ 
++#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
++		if (!EVP_default_properties_is_fips_enabled(NULL))
++#else
+ 		if (FIPS_mode() != 1)
++#endif
+ 		{
++#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
++			if (EVP_set_default_properties(NULL, "fips=yes"))
++#else
+ 			if (FIPS_mode_set(1))
++#endif
+ 				WLog_INFO(TAG, "Openssl fips mode ENabled!");
+ 			else
+ 			{
+From e59acc13c8f9b522a15fd586e643f04af1a79d9a Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 1 Aug 2021 12:14:43 -0400
+Subject: [PATCH] winpr: avoid calling FIPS_mode() with OpenSSL 3.0
+
+Fixes: 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad
+---
+ winpr/libwinpr/utils/ssl.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
+index 03b23af43ac..74ef156e7b0 100644
+--- a/winpr/libwinpr/utils/ssl.c
++++ b/winpr/libwinpr/utils/ssl.c
+@@ -364,6 +364,8 @@ BOOL winpr_FIPSMode(void)
+ {
+ #if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER)
+ 	return FALSE;
++#elif defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
++	return (EVP_default_properties_is_fips_enabled(NULL) == 1);
+ #else
+ 	return (FIPS_mode() == 1);
+ #endif
diff --git a/net-misc/freerdp/freerdp-2.3.2.ebuild b/net-misc/freerdp/freerdp-2.3.2.ebuild
index 50350a7d1f9e..c08a85f6d05a 100644
--- a/net-misc/freerdp/freerdp-2.3.2.ebuild
+++ b/net-misc/freerdp/freerdp-2.3.2.ebuild
@@ -88,6 +88,10 @@ BDEPEND="
 	) )
 "
 
+PATCHES=(
+	"${FILESDIR}/freerdp-2-openssl-3.0.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test ON OFF)
diff --git a/net-misc/freerdp/freerdp-2.4.0.ebuild b/net-misc/freerdp/freerdp-2.4.0.ebuild
new file mode 100644
index 000000000000..c08a85f6d05a
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.4.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2011-2021 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/FreeRDP/FreeRDP.git"
+	case ${PV} in
+		2.*) EGIT_BRANCH="stable-2.0";;
+	esac
+else
+	MY_P=${P/_/-}
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-libs/zlib:0
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	usb? (
+		virtual/libudev:0=
+		sys-apps/util-linux:0=
+		dev-libs/dbus-glib:0=
+		virtual/libusb:1=
+	)
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	!ffmpeg? (
+		x11-libs/cairo:0=
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg:0 )
+	openh264? ( media-libs/openh264:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXrandr
+			x11-libs/libXtst
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) )
+"
+
+PATCHES=(
+	"${FILESDIR}/freerdp-2-openssl-3.0.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DCHANNEL_URBDRC=$(usex usb ON OFF)
+		-DWITH_ALSA=$(usex alsa ON OFF)
+		-DWITH_CCACHE=OFF
+		-DWITH_CUPS=$(usex cups ON OFF)
+		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
+		-DWITH_MANPAGES=$(usex doc ON OFF)
+		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
+		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
+		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
+		-DWITH_JPEG=$(usex jpeg ON OFF)
+		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DWITH_OPENH264=$(usex openh264 ON OFF)
+		-DWITH_PULSE=$(usex pulseaudio ON OFF)
+		-DWITH_SERVER=$(usex server ON OFF)
+		-DWITH_PCSC=$(usex smartcard ON OFF)
+		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
+		-DWITH_X11=$(usex X ON OFF)
+		-DWITH_XINERAMA=$(usex xinerama ON OFF)
+		-DWITH_XV=$(usex xv ON OFF)
+		-DWITH_WAYLAND=$(usex wayland ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild
index 50350a7d1f9e..c08a85f6d05a 100644
--- a/net-misc/freerdp/freerdp-2.9999.ebuild
+++ b/net-misc/freerdp/freerdp-2.9999.ebuild
@@ -88,6 +88,10 @@ BDEPEND="
 	) )
 "
 
+PATCHES=(
+	"${FILESDIR}/freerdp-2-openssl-3.0.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test ON OFF)
diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index 5ee1e03eb0ad..cbc951a78cb1 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -5,5 +5,5 @@ AUX icecast.logrotate 140 BLAKE2B e42003ef1902b876df9c90fbbe15ebfd41fe6b38d989d2
 AUX icecast.service 185 BLAKE2B 342bfd8bb1c906ae6184ae56469c7fd484b09d55da9d552cd1e8ec32865bc8756608f2962fc63810fe3fbd1936819d36207926c80e5eb1796ec7dc742f56d075 SHA512 a1e662f9b39ecbd35f28e849c5ae9db314d12e8fcefb152660180e9b51fe538197522c5ddda4908a4012ebe73ac4f9a6c12543a01548e9c41f17b5a17b942f51
 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 2072 BLAKE2B 720c084b7a6799cdc3abf6a45fd925ae39d3a2a493d4108ffce028e1df0ac21586ebdb28c0e2de961849c718a68ec9122b52d16981b7866a0fcaf775f97f7a59 SHA512 93e9fcbcda55ac720367023954c82996d0581f5b54c4e80809a493b3c6391bca864abd0f515994e3a49c58fc2e6beedcbd54dac60dd9972523c8adc0de755298
-MISC metadata.xml 512 BLAKE2B d4478aee58c5ea15615899722848ee4e84025febf3fdff1203cdc68cea5b7f9021df8995bec3d25bf8f06953dfb3b4b6f2621fae904be59cc88c78732a0ac79a SHA512 73beb97a44390ef3aa35ef29f473397886d8af1f02e8b76924697d8e86df99238010ae63b392e9eb8cd5e6d7c634e380a51c5e298074cd7ed8256649ef6bfc62
+EBUILD icecast-2.4.4-r1.ebuild 1995 BLAKE2B 825d6521954e6e25ffe2ced0f800083a584b44e8d881d87e97ceaa5f06afb70347d2487adf392acd8230db5a9f90230d5dbf53a14764e3f98e95c37e4eb5295f SHA512 1acab0291bc85849bb15938ec1bcaa0670f88f3e125f59f720ca34f6aa6dff1bd8321690ee1d474e32a6b6bb5b90f8ece24b7837359cf6b09fb603686c3ddb25
+MISC metadata.xml 422 BLAKE2B acba9b8d40f8b960a744bed2eb51992cea04f9c8bc84d9c9d34d4f0dbe0aed6ffbbab33e00bf73c66ead810b9c10366f51b02162bd61f4cff18d00ea803de957 SHA512 939b90c47e2a2f78d685d398f9f0d57506ba9eb7fbd18fcee68e27b9b1cb64c35cdbd49163642fcfe6f8e381b887f93c2bd7c3ae5d3758a6ab770481be83ce2e
diff --git a/net-misc/icecast/icecast-2.4.4-r1.ebuild b/net-misc/icecast/icecast-2.4.4-r1.ebuild
index 08a3afff7a22..3e9a5650a56b 100644
--- a/net-misc/icecast/icecast-2.4.4-r1.ebuild
+++ b/net-misc/icecast/icecast-2.4.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.xiph.org/releases/icecast/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="kate logrotate +speex +ssl +theora +yp"
+IUSE="kate +speex +ssl +theora +yp"
 
 #Although there is a --with-ogg and --with-orbis configure option, they're
 #only useful for specifying paths, not for disabling.
@@ -24,7 +24,6 @@ DEPEND="
 	media-libs/libogg
 	media-libs/libvorbis
 	kate? ( media-libs/libkate )
-	logrotate? ( app-admin/logrotate )
 	speex? ( media-libs/speex )
 	ssl? (
 		dev-libs/openssl:0=
@@ -73,12 +72,11 @@ src_install() {
 	doins "${FILESDIR}"/icecast.xml
 	fperms 600 /etc/icecast2/icecast.xml
 
-	if use logrotate; then
-		dodir /etc/logrotate.d
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${PN}.logrotate ${PN}
-	fi
+	dodir /etc/logrotate.d
+	insopts -m0644
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
 	diropts -m0764 -o icecast -g icecast
 	dodir /var/log/icecast
 	keepdir /var/log/icecast
diff --git a/net-misc/icecast/metadata.xml b/net-misc/icecast/metadata.xml
index fffe116b2fd0..d16442c35c9a 100644
--- a/net-misc/icecast/metadata.xml
+++ b/net-misc/icecast/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="kate">Add karaoke and text encapsulation support for Ogg files</flag>
-		<flag name="logrotate">Install support files for <pkg>app-admin/logrotate</pkg>?</flag>
 		<flag name="yp">Build support for yp public directory listings</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/knock/Manifest b/net-misc/knock/Manifest
index 07b77c2f6ac5..80765cf4e6c6 100644
--- a/net-misc/knock/Manifest
+++ b/net-misc/knock/Manifest
@@ -3,5 +3,5 @@ AUX knockd.initd.2 527 BLAKE2B 1c0e429d07d4023d34ae129c900161a9a681cd76761e953e3
 DIST knock-0.7.tar.gz 110791 BLAKE2B 19e63854800f4ef77199fb4005dabd749f16681068d205a924fa0bc926d2cc31a69c1f62ffa8ec335209cfa987e7db92d9332b43e971f71528f69740ced06391 SHA512 eab5d855f7111d9411e84a56a15e8ea74f41c5bd9dee27ab49f0d8d509eeeb96a60c508928c92916dc0ec9b737c447ca8ca5ed4db6479b389549d60e76a85aa7
 DIST knock-0.8.tar.gz 377107 BLAKE2B 1397ed04b1a202db08b0bd3a8a26745cd2e8390604c9dde7d18182e7ad4ddd19da074b1b54ea1ed59b1576f3110e21bac722c90a2cd3820910bdaa0026eec395 SHA512 6511e29f604cebc4a4048f5e49c1b73db0bbe0041a88f7c8559fa1a60ea894aadb72a608c423f867a5a4dddb06d00a0713863473981e42273662a77364c260ec
 EBUILD knock-0.7-r1.ebuild 1093 BLAKE2B 6fa890d34f137f602cca10a1b24c6d05341a8ade371eb20ae3e241eb51072e37ca5a358085237c01f51dd141aa6fc3868c58d1e1f3994dc593861d74c4a11a35 SHA512 7d2d709aeda869f5e5191ee79c150aa7f40e7749e6c0a65be304989f4fb6f21262df7bf6d032401c5342f5bf3da7e43e10cc678a305bfb6210e9b81a70940125
-EBUILD knock-0.8.ebuild 1097 BLAKE2B 06a01626481ae89c22e6ed32d776f41cddb0fef2397202361ca035f697dc4d8ea676166971f719a83b1c516cf728b93490f788c59df1faf1f1d4cdb6f4d4fe78 SHA512 91f7d15603c1da491b54ca18059545eff93c4868b4c6b11257fa755d5f727f333fac867b8d2487814dbf9e11f3567d6b4036ecf9d888fa0936c44c75b2618f1b
+EBUILD knock-0.8.ebuild 1093 BLAKE2B 6fa890d34f137f602cca10a1b24c6d05341a8ade371eb20ae3e241eb51072e37ca5a358085237c01f51dd141aa6fc3868c58d1e1f3994dc593861d74c4a11a35 SHA512 7d2d709aeda869f5e5191ee79c150aa7f40e7749e6c0a65be304989f4fb6f21262df7bf6d032401c5342f5bf3da7e43e10cc678a305bfb6210e9b81a70940125
 MISC metadata.xml 323 BLAKE2B 7686de9cbde61bea3e7014c4c2d795c57472c80ad8339c568ee91a2b8c3f21951fabdfb238e79765368e954704c322fae73e2851b01adfceedde6ba5198b52f8 SHA512 101eaef6a7379f57938957779947d799d43dac1bb045737c84d62b09000595f1d6464bb049661dab9342a1c74dcbbd10d6e37df2bf09d77b95a2aab8b3911ae2
diff --git a/net-misc/knock/knock-0.8.ebuild b/net-misc/knock/knock-0.8.ebuild
index f4a622618980..5d3643d7508a 100644
--- a/net-misc/knock/knock-0.8.ebuild
+++ b/net-misc/knock/knock-0.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.zeroflux.org/proj/knock/files/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="+server"
 
 DEPEND="server? ( net-libs/libpcap )"
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 0c9e5f886e9e..db4d6acacf9a 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -8,8 +8,8 @@ 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.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 2328 BLAKE2B 575bdfb257e3b310e610b3bae11588b8e680374413b66a6c33deaf88742cce0bfaa3f15e03df5ba6878627ef0f51483e4a724ac4695236ce3b8e0a7314174a21 SHA512 37c60afc88cec226d54363b91a6704cb3f58c0b61c19bda9434f8020767a4c7813989bc95e146524794e648433c64190edebd9f5600a5ee5745f50ed12bcbe5e
-EBUILD lldpd-1.0.11-r1.ebuild 2326 BLAKE2B 31315f0aaaf3c159425f6ed96e317735cad1d5a21fe58df5a814d102799f93bb5ec3edb69f5bbf67f0c983d79b9970c357bd0a2c578792e0ddc4673c44bd12a1 SHA512 8c9b9b8b594c599c553346d13e31d937ce3ad22e01318d0f150c19d305cf2209946c2620188a62b81cb767aa89eb8145cc93d195d1cc4dfb90a5c58b6701d3e7
-EBUILD lldpd-1.0.7-r1.ebuild 2268 BLAKE2B ca70d69b0b6c362af8bb8f2d999b9cb0d7db7888a85113862ac6b2fa56eb04e96a53ea7591b0d6a941bd11570e28fcc5b77f150d3401a790befc475fc8fc9fdb SHA512 a59a0b9c4bc82d48449af560d4e479e79ef7a8bf9fe4969166f849dfec279eb0d81ff79b7c84ad1ed267ac6a68bc0be8fcb3a53ff7d9a3889ec33f1d345f980f
-EBUILD lldpd-1.0.9-r1.ebuild 2270 BLAKE2B 309f03266454c2423acc852a321b0f3ab3f085c0955e08f7629feed317f731eb208a138d0ebd36f3a31e59c9abfd3bce414dc4035eb32a3dc44a0b427f3ae182 SHA512 903e50c504cfc70400919a03941b2e8162b3f3e62cc74263163c6fb79a93ec50d72e64ad10d615d508d41a2b6bfa038a180a5d9e3565f868f1fdd3532d5583a8
+EBUILD lldpd-1.0.10-r1.ebuild 2377 BLAKE2B 921143630d48be88873be3d721267570fffcf129f8c22740fda65ccf39f10de88ec2c2e5ee0bd3953aa8733e27986b586f43fc7adf71e26eb8df92a5e32568cf SHA512 4cc55b6808c5338c10b3bfd1ef5f153a34141f4e322d11e3ac2ae9ee054c5f3a84b100d19de588f4ad0decabf891e78ba2a279e1ee5d7c605ed1b8a2bcdd28d1
+EBUILD lldpd-1.0.11-r1.ebuild 2375 BLAKE2B ba0b75867585c20bc30834ba26132d318069582ce7eb504cf20102a95d49a4637e3506c8e07b641e0e6555545d68a0f479118bbdb82a18b72d8cde4410c3987e SHA512 3af2bb750d93626873ee7a04dce06ffb7102a4640c9db43588a6ce4d064e6aa03dfd4ffe396da13484e4193bd49ad36af37e93ddbe02af8210f84b4b5f19dbce
+EBUILD lldpd-1.0.7-r1.ebuild 2317 BLAKE2B 70eaee035ad5cf47d46aa5eed32728a9c75029e2a64fc7b67f5a18cf4e936ebc4936de25f8f526228618b13c0917e45452981688761686f2f908084101f36371 SHA512 22d3a805b254f51e081d66ec3d8fa3a9efb2b7ebfe6c6fd2a81891b0f81ebbb98cacda0a7ea4d0fcd8d9721f97b54a13050c15153219c8b2854d13e3845b1117
+EBUILD lldpd-1.0.9-r1.ebuild 2319 BLAKE2B db622f977457724e54f6fe6ed08d18ab5b6ac51b3afa8a186a86bde02a210a668709741d3f6b1434b6457b0c209aab73c63832091e98db54175b2db51ea98b7d SHA512 ca639a01537c74bf23eb7abb046550f6973675f843d3baea2446b8acb0edb81e5b029a36d1b62af7dccbc4978aca5d33a86b8d0a565b8f254b945112cf756bfe
 MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511
diff --git a/net-misc/lldpd/lldpd-1.0.10-r1.ebuild b/net-misc/lldpd/lldpd-1.0.10-r1.ebuild
index 64eceb88cec4..426784b12135 100644
--- a/net-misc/lldpd/lldpd-1.0.10-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.10-r1.ebuild
@@ -100,3 +100,7 @@ src_install() {
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-misc/lldpd/lldpd-1.0.11-r1.ebuild b/net-misc/lldpd/lldpd-1.0.11-r1.ebuild
index d31dbbc2f76e..5aae55e4aaad 100644
--- a/net-misc/lldpd/lldpd-1.0.11-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.11-r1.ebuild
@@ -100,3 +100,7 @@ src_install() {
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-misc/lldpd/lldpd-1.0.7-r1.ebuild b/net-misc/lldpd/lldpd-1.0.7-r1.ebuild
index b2c5422b9445..857f1e6a8607 100644
--- a/net-misc/lldpd/lldpd-1.0.7-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.7-r1.ebuild
@@ -96,3 +96,7 @@ src_install() {
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-misc/lldpd/lldpd-1.0.9-r1.ebuild b/net-misc/lldpd/lldpd-1.0.9-r1.ebuild
index 9009b6cd9a30..97aadd996bed 100644
--- a/net-misc/lldpd/lldpd-1.0.9-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.9-r1.ebuild
@@ -96,3 +96,7 @@ src_install() {
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index e5ffb6257ce9..9201fe120364 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,7 +5,9 @@ AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31e
 DIST NetworkManager-1.30.4.tar.xz 5303420 BLAKE2B c2d81fe03f75f4afd05cac06741d9e7fb0d2892bad30462788a39d9c84afd056614e8f8d3371f15f4de7398cc40a32861814498fc36911c43bbe8e43f5053cde SHA512 ca42907d0c0fc6a981d94798a5e264dd58c7d11576a8dd52c8ef6799334af46848091d872e9cec553714766c51457cbe12c5c2017eaac63abce968823b047624
 DIST NetworkManager-1.32.2.tar.xz 5242372 BLAKE2B d19dbbb86cafd29023e0bd1b3a1ce69580d769d77a993b5e0db6cc526de7b1cce573e74c96483bf88c3a45f3ac7d4831a27d1efb1d8414cc8dd6e5671bdbf4f3 SHA512 9c7891a1106ebf333344818d29810ae182b284d1966760ec79bafa0618378a5ca68d58ec941357328ae8d4a43473f3916d62e4cfa316a46532773326312c0cc1
 DIST NetworkManager-1.32.4.tar.xz 5250412 BLAKE2B 6c0931d50a8666f88865d4ca5281e1570dd230156e30bb27822c9ea3d93b3b3b24f336e154787794e7edd7c00296f9f7c5761136cac0c0eacf142a0371cbfe81 SHA512 95be90d4c8f8f9f58a3c7ad8d8c9b592d2b77f283df58b495fe1b673c4fadd4409f4fc00fc9766343e3ac240dd805583db4f05e6d1f0b367fe22b306227fc684
+DIST NetworkManager-1.32.6.tar.xz 5254712 BLAKE2B 44c3019ba6b04552e67f31e9c069754f627f9f97a9ed110ce662dff033c7e8c009bed55da15cd4df592f0edf2c44f445f2733307f06ffbc4c5a946e05c3f26a3 SHA512 7556e8c3934a83320646336bcaffc010a91258c1ab669596e4b7ece98eb35e1d1ae625bca0de3781638e0a186656de61d554ef8722beea6bc29cdb0c70314b1d
 EBUILD networkmanager-1.30.4.ebuild 11206 BLAKE2B 2eac583bf5c83f16e7417ebb890155a5386b91550071d2ad819d14a089ecd120a823b53b73eb01da2b212b2eef0095840a0de68bad7c8984aaaf8177ad2b5027 SHA512 5523dc378109cbf5f058a34dbfbdd75891d53f90cbf32d86c0bd15eb16b442082b37b8983ff59ef3f52756bff5472f855471906cc5d9a238d0f5434847a3792a
 EBUILD networkmanager-1.32.2.ebuild 11373 BLAKE2B d404928b488ea79a12e278df5e8f822ebd17fff4edef38b4877ff8888e38ebeedeece4eb903f71c838bf15430f1aa1506b46a9658d0938c2379a7b5f8138c62c SHA512 443b1a5471d1af71bb1796e242b1c8b6b21aff1203bf732ad2610e52f316678705157c379a0b925fec7eb016c31e24527f41d6a0bf55e0c720f3ab9f71110a29
 EBUILD networkmanager-1.32.4.ebuild 11373 BLAKE2B d404928b488ea79a12e278df5e8f822ebd17fff4edef38b4877ff8888e38ebeedeece4eb903f71c838bf15430f1aa1506b46a9658d0938c2379a7b5f8138c62c SHA512 443b1a5471d1af71bb1796e242b1c8b6b21aff1203bf732ad2610e52f316678705157c379a0b925fec7eb016c31e24527f41d6a0bf55e0c720f3ab9f71110a29
+EBUILD networkmanager-1.32.6.ebuild 11373 BLAKE2B d404928b488ea79a12e278df5e8f822ebd17fff4edef38b4877ff8888e38ebeedeece4eb903f71c838bf15430f1aa1506b46a9658d0938c2379a7b5f8138c62c SHA512 443b1a5471d1af71bb1796e242b1c8b6b21aff1203bf732ad2610e52f316678705157c379a0b925fec7eb016c31e24527f41d6a0bf55e0c720f3ab9f71110a29
 MISC metadata.xml 2062 BLAKE2B 117ea58d66dbedc65d59db38a46aa9e4b5c49bf1699748aa03c52c4b1543c4074f8ebea462ff0ac855f153702201bd14cec246dfd8496f5426bbfa10aad53b88 SHA512 083e9b2ddddf781116e7b337f6cd80278e1bc4ea218d9612feed313ed61cfb6ba531b8be818d80eff7e076bab66b7d7d73d96f58d410c7b3708e02e43e724b97
diff --git a/net-misc/networkmanager/networkmanager-1.32.6.ebuild b/net-misc/networkmanager/networkmanager-1.32.6.ebuild
new file mode 100644
index 000000000000..0ab6357947d6
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.32.6.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="NetworkManager"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	connection-sharing? ( || ( iptables nftables ) )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		iptables? ( net-firewall/iptables )
+		nftables? ( net-firewall/nftables )
+	)
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
+		net-misc/mobile-broadband-provider-info )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		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}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-nft=/sbin/nft
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
+		--with-crypto=$(usex nss nss gnutls)
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# 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`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			src/libnm-client-impl/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 1b096570e919..4c2bf2d2ed69 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -2,5 +2,5 @@ AUX omniNames 571 BLAKE2B d1a151abb6faf582478e3892b7b057f92263fa0278cb3f3fb82fec
 DIST omniORB-4.2.2.tar.bz2 2673800 BLAKE2B 6afe4759cf19b69bd02d4864e305a0ebd0d11943a54c20d53987d9775f04833d5d2dbeb99e5bdcc59d56f116cfb14b9ae92399323e3980a44d9cef47a012c24f SHA512 3fe6c05d0e7f19455c4cd6702887f91b7d14cdc248008cbc456c103072a37251387877bd64d59a271c6e92703a70bbbb9713f9fa2e45d094628e42564cffd0ad
 DIST omniORB-4.2.4.tar.bz2 2713397 BLAKE2B 5759b2563dca421b9a994bb13c30ce6dd98324a2357c4908130a42ce5baec357b881c22b4dff27809607ebde27e7cd65305a91aa5cbdb6d68a19df1f36524e72 SHA512 0b142b127175f16f844823e5adf5593b290528646e13a4c30f6cbd92d159d3998a81b952717039c3f0e386f79404ddd18a3de35fc45fa88383d1d9e51064d988
 EBUILD omniORB-4.2.2.ebuild 2356 BLAKE2B 399814240e5c0b85626ffb6800812207be3d7a3929d2defb4fc7a0f857d9d3f0187eb6986602696f636d30dcc527a85f7d51a985cef437196eb238ddfc750919 SHA512 f1019973a9c3feab9b118df4f9dd76cc028e995e5ec488f7b2d9822cf030ab1a9cb8c5ecd2779a3595cf2e4b3d5772653f95e18bdd11406c0a474a3e8460aaae
-EBUILD omniORB-4.2.4.ebuild 2360 BLAKE2B 125f9d6421b3a5f2b985a39d8005027c6f056296f380008215a69e725e883f45bae8dd69ed56a764263b75c994973a9b8404653231569651b5ffb121c8ef6a2c SHA512 fefb14322b1a452eab1bde9fdb3f6a5a1f637f57064381e1ef7268f4620e1b4fde60ea5d08bd13d09355e8a29b3dd2166d4262942212e3bfe81758bac03147c6
+EBUILD omniORB-4.2.4.ebuild 2356 BLAKE2B a245ac15e187ed3a520ed6c41d3673dfacc72b9ba94e9b4764b932627fcaf1b5915aa5af80d737e69d15703b0d2ee0b589c43d508bb7897680e697538480149d SHA512 25d9491129305db575442b6d732530048ae24c411224098dcf5633efcb1747e98c2cd900f769fc1e92371d0298eb7c41322d63b7f45ebeca8df68c336dacc36c
 MISC metadata.xml 247 BLAKE2B c2c840442760456aa29eeda2b225baa3eca5af75444074a09d500b1063f59ce978b5053c0d79fb7cd3717a477ef8e8e343dcf731a5a99e27058b0528c5066a4f SHA512 d76af24fd2513c0ed4a1f3066c9e9b9eb6407d1c013f22b3bcc9646fb771560c45c42c3851075ce9aa32bfe6ef68534cf1ccd3fefc9657fdb0b2794424ab8d1f
diff --git a/net-misc/omniORB/omniORB-4.2.4.ebuild b/net-misc/omniORB/omniORB-4.2.4.ebuild
index 3c0e6d3f124b..f5e6a5961446 100644
--- a/net-misc/omniORB/omniORB-4.2.4.ebuild
+++ b/net-misc/omniORB/omniORB-4.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="doc ipv6 ssl"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 1036672faa78..1bbaf9aaa3ff 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -4,7 +4,7 @@ AUX openntpd.init.d-20080406-r6 292 BLAKE2B fb5620bcb40b476796cf5242ebec17f4f7f0
 AUX openntpd.service-20080406-r4 196 BLAKE2B 7b55400bbc6b706f57eeb61370fea232237ce8e12a47bf5c681a9274acab9bcd5ad0e97708aa99f8d2df92a0fa57828fb747f220c038f83c54f30084a154c7bb SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e
 DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50
 DIST openntpd-6.8p1.tar.gz 443997 BLAKE2B 5b86c79ff2f822aba652da92325ad18803233c8b1548203c82603b99d2c41dce012dfb2be67828cc892559f323b764cc1711202fd85bc1d5d755b5e677406b98 SHA512 200056bedb9c757aae1ce5d3f6655175ec058cb479429fe4704955f3a3fa15e8a9cb578ae4898ddb4cfc08c9742bbab6a7c92b5e569f06a148e40c448360b58f
-EBUILD openntpd-6.2_p3-r2.ebuild 1750 BLAKE2B 198722e198470a7894d97c8625e0c953b6badb96f8da1d53cabe1fa71676ebeeebb39c7102bae9cbaadc766ebd87942a0f2e242f2bc87f765384a584890cc0b2 SHA512 490e5bb79254e050a719d75acf55f01cb9c4195e704d78841fc6925261ba4f4efed1af53035a0631172cef75acea2ae201b45e096422071964082f47e4b8297e
-EBUILD openntpd-6.8_p1-r1.ebuild 1700 BLAKE2B 1560e5d4589b96f9c07e2609f9cb7577234c587fc56b34f17d3a442bdfc78ecebf07c07c9177c1063829998854e85f9194b4b0f651668de063ee91663710f7b2 SHA512 d49c3d134531e01b3b2cb8d7e7696add56c4bfe7415fb979dc1cad118a119eb296e0dd27096700d83e6e37eea018bdb5780587a413d95f550dd8b0c6b0721e1f
+EBUILD openntpd-6.2_p3-r2.ebuild 1757 BLAKE2B 4fb06062691bbe2e55c1b143f45cb7f2696647eb08cb94e75ef1cfb35cfaa3e96cb4fb5cf650fe8dec3e726f32406611172a395b0060eb3a99ef4bae0cae5a70 SHA512 6fae243f65a065c73ba9ad9660a1558609b72f60e36e0c7d966bf00411276a52d3f1542a1db095cd44300b8d606b727ba69261665f96cf1097126d0816a8e2df
+EBUILD openntpd-6.8_p1-r1.ebuild 1707 BLAKE2B a000176a5e592b92fad1fc54bd0cda48dccf05fff84e119f621566485059689409c7042b5c6e774322af9bedd7b07f712dfe09cbbcfbfe287742c35efa3d13dd SHA512 cdb369814721f52440ef26aed7bd8d6bb7dc7e68a399540dd2286743a6b4cb3eb42b03db3e731413ee61fe5797d2879951809683d0b24a820c62934199294430
 EBUILD openntpd-6.8_p1.ebuild 1621 BLAKE2B 685e978d396f9306453d5f7a66c0727039b0084252d347995d94c45128fcd6af636b954f93e7dffe07acca4518a4fec3b2c3554b1b53d729975920cfa4654cb3 SHA512 2c9fc6b72fe8e690f43cf7b3e77803325b1b021fab58f403b59f83ec86e5cde135ad1ed45279c75f458c95ec42c58f1804e7a7827d381b4d2d4b67918cf2c673
 MISC metadata.xml 751 BLAKE2B 54941fc2ff24d2e3908660b1489fb0d9145661f7525929204bd7036576e7636591ed69ac4892a6ab4a6a0007f77d6614f5c6cd7f34ba7c6ce4563050390479f5 SHA512 b3c316a1bfd478a6da8d4a5c333f50c9f6b09550cab3cb35e9acc593a3714d8e6df2390409e259b55a6b7f158bfe1a22ee53f94ace06afb28ca5268bc6562254
diff --git a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
index 4d7fc203e169..510a2f7cbc09 100644
--- a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
+++ b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="selinux"
 
 DEPEND="
diff --git a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
index a600e51c8b82..29e7e2e180b3 100644
--- a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
+++ b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="constraints selinux"
 
 DEPEND="
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 282bc5bf0d99..64c9479dc241 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -12,6 +12,6 @@ AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e
 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 4412 BLAKE2B 349b7cae8d88f157b608189086b111d5ad0af227cc15a7dce04cfb94874e19551851fd09f12c414f2884294f86a6371bf956b37d9161072c5f612ebad7a557bc SHA512 35f1ddd7393bf0a57132ef1a7f3d2c872a057eb95f33dd7bc1703147c73675a4797b9b87d6fd0314e1f75cae29282e1305b91cb0a58d4862ccea2dc1ae5db349
-EBUILD openvswitch-2.15.0.ebuild 4370 BLAKE2B 7587be9823c2db3e0f7c815de8a226904b6c67fc2fe7edd1b7071e97906a10c89dc163f0a53771f88c51f6fd081a4e7203027a9434e9f0042eaafbc20d850394 SHA512 973d59ef1d51d4550bb671f607eda6b4737ba881dae26228c708f1e5769f443b44890acca2ea997014e80ad9dd67dbe8f293c401d64ab8880d9bbfb4e3c51c62
+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 458 BLAKE2B 52809b1a9ff6c0e69988e6e17cfe34145abcbe45c9d08e94f7fcc79e4ef72aeeaf2485349a04e16190c25c5b5cd61848253f5f63f1a50bf10e63918cae2ee1fa SHA512 080e0b3bbdc520573998377b41b08ca9ef0b049affb093fd98cc8af1d33c3c18a341a158ab3cf426a15641671018abf9f4a20734508276bbc88882b9f27eec36
diff --git a/net-misc/openvswitch/openvswitch-2.14.1.ebuild b/net-misc/openvswitch/openvswitch-2.14.1.ebuild
index cb44e1d8be7e..c873cc5a5478 100644
--- a/net-misc/openvswitch/openvswitch-2.14.1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.14.1.ebuild
@@ -123,6 +123,8 @@ 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}"
diff --git a/net-misc/openvswitch/openvswitch-2.15.0.ebuild b/net-misc/openvswitch/openvswitch-2.15.0.ebuild
index 7f44d4ded567..83ea5328d7d0 100644
--- a/net-misc/openvswitch/openvswitch-2.15.0.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.15.0.ebuild
@@ -122,6 +122,8 @@ 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}"
diff --git a/net-misc/plowshare/Manifest b/net-misc/plowshare/Manifest
index a4614227a371..67c0f1290ac1 100644
--- a/net-misc/plowshare/Manifest
+++ b/net-misc/plowshare/Manifest
@@ -1,6 +1,6 @@
 DIST plowshare-2.1.6.tar.gz 95946 BLAKE2B 1a3c420bc3370e03946f3f813ccecdec6b567245ee49cdf9f7b7788e41fed60b93931e7038e34f6edcbe8a00ed201681c28ae29ffb0aaec10112d03f653231c8 SHA512 bccc72f1add6389fd7fc41a27f9e169c622e3a4e7c9c1040c01a8a4569accc9b0b6910815a013d5e8aff7103ee26d943665ffeccc02db1879eca580b3892190d
 DIST plowshare-2.1.7.tar.gz 96282 BLAKE2B bfec7fba200d783fcba5051738f98f7cd862eede1661b4d72062bd111b394800406443e52ecf2f0b771b90a9834a87fae01a6055828e8a12446126c593daa01c SHA512 7fe91d3756c55ffc1daf9275bfd2413f2644accd8fa69f2b1064696e1435f9b8be9515907c8249ffde85436dc6966f1d42bad94ccfbde93ae584dcc0d642c215
-EBUILD plowshare-2.1.6.ebuild 1695 BLAKE2B 5fdb0b37e2fdced72fa29e47cb910bcf9a486becd10e346db67e70d4fbff6d9dc337dacd0c98a2fc45b5768de4c3f06f4616e3a79f1dce9ce297327a6744ad63 SHA512 40b22f4944da19a23d9c372791c83eb00f8e0ef2ba0a1d820dedb42077796e0e91f858d7e1f38985085621b8d76dbb379938a5041ead37074c90fdd6e9a99fe1
-EBUILD plowshare-2.1.7.ebuild 1695 BLAKE2B 5fdb0b37e2fdced72fa29e47cb910bcf9a486becd10e346db67e70d4fbff6d9dc337dacd0c98a2fc45b5768de4c3f06f4616e3a79f1dce9ce297327a6744ad63 SHA512 40b22f4944da19a23d9c372791c83eb00f8e0ef2ba0a1d820dedb42077796e0e91f858d7e1f38985085621b8d76dbb379938a5041ead37074c90fdd6e9a99fe1
-EBUILD plowshare-9999.ebuild 1657 BLAKE2B ad697863a68aa541a7654130856ac829a8044d4866250922ad70451ee67c4ba966d2ecb48a47499c53deefa1ca4a623c3e7df099945167d7810e49bf10952178 SHA512 b718b705c5c53bde6b09adf03cefc601fa2ab006e59daf1d943d3738ce82b5a11e7e9df1201bb7d04f0cc58cdd126bf963202a8bc3c21d101d8e0914bbdb02eb
+EBUILD plowshare-2.1.6-r1.ebuild 1511 BLAKE2B 01e8be107ce8a0dc113c95977de62ee32e522c4631b11e38ee0d831d8f856658cb4a2f1c5d7ee3e95da0e39af29c6234e1bf35391225e888f58f1c3b5f738e74 SHA512 cb8be3bd61142ddebdfa879af555b2fca269585b27cc54d0af04f72aa85e88fe6df15fcaf449843e3da32fe1b566c00675645b9daf490e10c54383ed561df570
+EBUILD plowshare-2.1.7-r1.ebuild 1511 BLAKE2B 01e8be107ce8a0dc113c95977de62ee32e522c4631b11e38ee0d831d8f856658cb4a2f1c5d7ee3e95da0e39af29c6234e1bf35391225e888f58f1c3b5f738e74 SHA512 cb8be3bd61142ddebdfa879af555b2fca269585b27cc54d0af04f72aa85e88fe6df15fcaf449843e3da32fe1b566c00675645b9daf490e10c54383ed561df570
+EBUILD plowshare-9999.ebuild 1471 BLAKE2B 9c66158debb0c162ea7e7f5cea42fa1957e4f33296ed613f334732c8984fa53df4c227a9261e740cfa82494eb807e85d14c736d498fe52c423de417fe99bbee6 SHA512 f8c773141349db717d9b649637125c8863084bd398abedb9743bfe2c8544423b4438cddc7e949cae8d885abf2f828f76d45495594f8a11a9a8eb706aaf943439
 MISC metadata.xml 408 BLAKE2B dead060e9bca4c0f9ded99161e297f85a00a992312ebb10402a6b91515c3eccab9e9dafe9c0ae813c3c64cb72d0f2e28822b6e49c9ceea8de254136d13092d5d SHA512 46c5f62d551219c2922af526b34c0b19e948c243f2afb1fe12b1b6ad85e0c5b963d1fbda60e8ad6ff26e3652d163ccad5ec12d910ac67e887f58bb538461c073
diff --git a/net-misc/plowshare/plowshare-2.1.6-r1.ebuild b/net-misc/plowshare/plowshare-2.1.6-r1.ebuild
new file mode 100644
index 000000000000..cacd5eb72e61
--- /dev/null
+++ b/net-misc/plowshare/plowshare-2.1.6-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
+HOMEPAGE="https://github.com/mcrapet/plowshare"
+SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+javascript view-captcha"
+
+RDEPEND="
+	>=app-shells/bash-4
+	|| ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
+	dev-vcs/git
+	net-misc/curl
+	sys-apps/util-linux
+	virtual/imagemagick-tools[tiff]
+	javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
+	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
+
+# NOTES:
+# javascript dep should be any javascript interpreter using /usr/bin/js
+
+src_prepare() {
+	# Fix doc install path
+	sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed"
+
+	default
+}
+
+src_compile() {
+	# There is a Makefile but it's not compiling anything, let's not try.
+	:
+}
+
+src_test() {
+	# Disable tests because all of them need a working Internet connection.
+	:
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" \
+		PLOWSHARE_FORCE_VERSION="${PV}" install
+}
+
+pkg_postinst() {
+	elog "plowshare is not delivered with modules by default anymore"
+	elog "Per-user modules can be installed/updated with the plowmod command"
+	if ! use javascript; then
+		ewarn "Without javascript you will not be able to use modules"
+		ewarn "requering a Javascript shell (/usr/bin/js)"
+	fi
+}
diff --git a/net-misc/plowshare/plowshare-2.1.6.ebuild b/net-misc/plowshare/plowshare-2.1.6.ebuild
deleted file mode 100644
index 52227ef820ef..000000000000
--- a/net-misc/plowshare/plowshare-2.1.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
-HOMEPAGE="https://github.com/mcrapet/plowshare"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="bash-completion +javascript view-captcha"
-
-SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-RDEPEND="
-	>=app-shells/bash-4
-	|| ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
-	dev-vcs/git
-	net-misc/curl
-	sys-apps/util-linux
-	virtual/imagemagick-tools[tiff]
-	javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
-	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
-DEPEND=""
-
-# NOTES:
-# javascript dep should be any javascript interpreter using /usr/bin/js
-
-src_prepare() {
-	# Fix doc install path
-	sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed"
-
-	if ! use bash-completion
-	then
-		sed -i -e \ "/^install:/s/install_bash_completion//" \
-			Makefile || die "sed failed"
-	fi
-
-	default
-}
-
-src_compile() {
-	# There is a Makefile but it's not compiling anything, let's not try.
-	:
-}
-
-src_test() {
-	# Disable tests because all of them need a working Internet connection.
-	:
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" \
-		PLOWSHARE_FORCE_VERSION="${PV}" install
-}
-
-pkg_postinst() {
-	elog "plowshare is not delivered with modules by default anymore"
-	elog "Per-user modules can be installed/updated with the plowmod command"
-	if ! use javascript; then
-		ewarn "Without javascript you will not be able to use modules"
-		ewarn "requering a Javascript shell (/usr/bin/js)"
-	fi
-}
diff --git a/net-misc/plowshare/plowshare-2.1.7-r1.ebuild b/net-misc/plowshare/plowshare-2.1.7-r1.ebuild
new file mode 100644
index 000000000000..cacd5eb72e61
--- /dev/null
+++ b/net-misc/plowshare/plowshare-2.1.7-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
+HOMEPAGE="https://github.com/mcrapet/plowshare"
+SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+javascript view-captcha"
+
+RDEPEND="
+	>=app-shells/bash-4
+	|| ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
+	dev-vcs/git
+	net-misc/curl
+	sys-apps/util-linux
+	virtual/imagemagick-tools[tiff]
+	javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
+	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
+
+# NOTES:
+# javascript dep should be any javascript interpreter using /usr/bin/js
+
+src_prepare() {
+	# Fix doc install path
+	sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed"
+
+	default
+}
+
+src_compile() {
+	# There is a Makefile but it's not compiling anything, let's not try.
+	:
+}
+
+src_test() {
+	# Disable tests because all of them need a working Internet connection.
+	:
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" \
+		PLOWSHARE_FORCE_VERSION="${PV}" install
+}
+
+pkg_postinst() {
+	elog "plowshare is not delivered with modules by default anymore"
+	elog "Per-user modules can be installed/updated with the plowmod command"
+	if ! use javascript; then
+		ewarn "Without javascript you will not be able to use modules"
+		ewarn "requering a Javascript shell (/usr/bin/js)"
+	fi
+}
diff --git a/net-misc/plowshare/plowshare-2.1.7.ebuild b/net-misc/plowshare/plowshare-2.1.7.ebuild
deleted file mode 100644
index 52227ef820ef..000000000000
--- a/net-misc/plowshare/plowshare-2.1.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
-HOMEPAGE="https://github.com/mcrapet/plowshare"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="bash-completion +javascript view-captcha"
-
-SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-RDEPEND="
-	>=app-shells/bash-4
-	|| ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
-	dev-vcs/git
-	net-misc/curl
-	sys-apps/util-linux
-	virtual/imagemagick-tools[tiff]
-	javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
-	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
-DEPEND=""
-
-# NOTES:
-# javascript dep should be any javascript interpreter using /usr/bin/js
-
-src_prepare() {
-	# Fix doc install path
-	sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed"
-
-	if ! use bash-completion
-	then
-		sed -i -e \ "/^install:/s/install_bash_completion//" \
-			Makefile || die "sed failed"
-	fi
-
-	default
-}
-
-src_compile() {
-	# There is a Makefile but it's not compiling anything, let's not try.
-	:
-}
-
-src_test() {
-	# Disable tests because all of them need a working Internet connection.
-	:
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" \
-		PLOWSHARE_FORCE_VERSION="${PV}" install
-}
-
-pkg_postinst() {
-	elog "plowshare is not delivered with modules by default anymore"
-	elog "Per-user modules can be installed/updated with the plowmod command"
-	if ! use javascript; then
-		ewarn "Without javascript you will not be able to use modules"
-		ewarn "requering a Javascript shell (/usr/bin/js)"
-	fi
-}
diff --git a/net-misc/plowshare/plowshare-9999.ebuild b/net-misc/plowshare/plowshare-9999.ebuild
index a0c97507680a..1c454b8d9c40 100644
--- a/net-misc/plowshare/plowshare-9999.ebuild
+++ b/net-misc/plowshare/plowshare-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit bash-completion-r1 git-r3
+inherit git-r3
 
 DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
 HOMEPAGE="https://github.com/mcrapet/plowshare"
@@ -11,8 +11,7 @@ EGIT_REPO_URI="https://github.com/mcrapet/plowshare.git"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE="bash-completion +javascript view-captcha"
+IUSE="+javascript view-captcha"
 
 RDEPEND="
 	>=app-shells/bash-4
@@ -23,7 +22,6 @@ RDEPEND="
 	virtual/imagemagick-tools[tiff]
 	javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
 	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
-DEPEND=""
 
 # NOTES:
 # javascript dep should be any javascript interpreter using /usr/bin/js
@@ -32,12 +30,6 @@ src_prepare() {
 	# Fix doc install path
 	sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed"
 
-	if ! use bash-completion
-	then
-		sed -i -e \ "/^install:/s/install_bash_completion//" \
-			Makefile || die "sed failed"
-	fi
-
 	default
 }
 
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 9644cb2cc266..5e247ca4b874 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -3,6 +3,6 @@ AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc55
 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
-EBUILD stunnel-5.58.ebuild 2919 BLAKE2B 035703b6f9da38617d26983d620087ef1fbf6393580f844dce372d90becf5535ca9297ec29c163f660d4e12ddbd9e56b1223150606f4f1eaca0b7101c5739987 SHA512 c53676354bf7cb298ddba2c5a6daae87d32682be026cba197fe1899b1903c7b7635760ea9290192c9e632359b6dfb4b6614abf6401532f84b95b586fd0b93c6a
-EBUILD stunnel-5.59.ebuild 2972 BLAKE2B c42d8fa88aa06f58f1470d921cc441c66945dfbe94bb8225af22e34b300aa23033f2e75e73c9bb75a057e50dbce3e70a879f8929ced54154f4b9c851c37a8bb6 SHA512 738ef4daa80792f2b78f790ec617e111a608049b16846254429caf3e3f293cc97149a8b0a2bf4ac885982ba8cd965edb8a2af6c3006f4d7e59b8ae05ffa657b1
+EBUILD stunnel-5.58.ebuild 2951 BLAKE2B afa7a612d238ba4e1195da562a63d632472cac4c11affbace964201206e7dfe472fd757ab548c0a2834e0b8cbaf4a1f44bd34d888a37a8dcabe04f57ef76cd88 SHA512 947e8b54f6d21b980bcc4afcd43a644da26ff8565fa6ad312c8086d2c782cd345a20fda94781296df4e8c913b5e0b88ddf582588a430bce4b9d4bbde05c3c651
+EBUILD stunnel-5.59.ebuild 3004 BLAKE2B 18ae3e208e065f910159202d3ee2635d100deb1e9be0ef903f5cee3b44ab4f0c604aaaf0ae91d62f28bfbd57bb50caecc5f1e5c004122219cf3ff33aff80cd19 SHA512 380dd888e2c5e313796c091fc0b50da00da6f98227cffd4b5fd5f90663592a327f9cb175b2aaa997a76656066c3f080ecd993ae0dfd467cc8d1159cb4d8eda49
 MISC metadata.xml 796 BLAKE2B baa4e805a9a0c26ada2f53ad6e8572a6d01e48ba4ea78e390aa908317d7018b853fc23c298b8d1c728beed8dd7f22a9130e2b35b7045c7b1344f9cb15d7b7935 SHA512 207c1c3882f2889921daaeea4e563ec827492e921187fcdd09d2cb7b4362a7ad8b01e062bc2017e5de459b1cb282c6c8d362620a04bfdfd99d931d88439e464e
diff --git a/net-misc/stunnel/stunnel-5.58.ebuild b/net-misc/stunnel/stunnel-5.58.ebuild
index 611d402d15cf..256081a6b48b 100644
--- a/net-misc/stunnel/stunnel-5.58.ebuild
+++ b/net-misc/stunnel/stunnel-5.58.ebuild
@@ -92,6 +92,8 @@ pkg_postinst() {
 		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"
diff --git a/net-misc/stunnel/stunnel-5.59.ebuild b/net-misc/stunnel/stunnel-5.59.ebuild
index 40631323d410..7f0616ce3608 100644
--- a/net-misc/stunnel/stunnel-5.59.ebuild
+++ b/net-misc/stunnel/stunnel-5.59.ebuild
@@ -93,6 +93,8 @@ pkg_postinst() {
 		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"
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 8dac235438f1..e18ba8e44af2 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,14 +1,5 @@
 AUX teamviewerd15.init 282 BLAKE2B eaa5844606cab7942d8117a7f62687f1ba2b3ff5deecf61903d9c01ea5434c8104eceb2e50d1c7a4b93089df53c98fab38da6e6e5f4ee8c18426a7165b9cc465 SHA512 bc2271c1fb360129bf0452950340389e434e420830d7d3f47dcd248151dbbadf798c025d4e47fe311857c070f3dd7b12f0092fa09508f0300963c6e04d8ed7c8
-DIST teamviewer_15.15.5_amd64.tar.xz 13264432 BLAKE2B 8f23c036b79c7ee7cbef1181825b5605afd77f22d0565e5359c928bd4014759c3ad56255d8e76ba75d3084c8a9bed98fcdd08f20e502c2906e6eaf6dd952a7b4 SHA512 e42cccb74c08ef1badcd4b78016078a9f6f3b69b700e4c64d6eae927fa4b748c11288ef5cc50aa962eabd17679479ececf8750e8c34f6361758da903e555a334
-DIST teamviewer_15.15.5_i386.tar.xz 13751236 BLAKE2B 32d8f6494c72b51feef54e2d5dd1096aee83c283a1d07680f428bd4321ede9975d1ee4e7cd55718f9250d54304d17887b98ae6e62617e7022ec78384fdde5a16 SHA512 315e6fcaa6d40aab17c47ac4eee6d894be3731ae7d0242e2b11bae279627de04540f8d46908826d53b6a6d275769c19a420c6f30e9869a734e87cb7d6832bfba
-DIST teamviewer_15.17.6_amd64.tar.xz 13763464 BLAKE2B 5dde0947470611bd67bd8913355c965c0e206d2bd5243e27a4fa742e4fc2d3e0849132a6b2527d453c1f8aa2026cb65897bc2a3c83b493914aa8bd69b1d408d7 SHA512 1775e1fb1c35eceb9df1ec12fb5d7a6e7e9df739a211b99561f67665834bbea2bb80af4547841b73be386cae184861d0f40423936d38f9a2055ee30edd4095c0
-DIST teamviewer_15.17.6_i386.tar.xz 14394028 BLAKE2B 4a5f7f72887c4ba391ae444eaba2c7c474b40fc0bfbe0c7745b4c925fbf7626862de162f49f115e41ccc0858cf7d6d813eadf0940d64217a6964b4d83526b0ad SHA512 f7b7a999069cb036b2b528651fb0737ca0dbcbe3b8283ca8281dd9c08f33b1aa44b7689c63816686538213cd10939dcc69510512ab61829ba7d4d7c6789709ba
-DIST teamviewer_15.18.5_amd64.tar.xz 14049816 BLAKE2B f3f32685f32c7cf10e6dacb9b11333fc5fd69a6039bfae4e872aaba2f71451873f5a6648056fb07a69fc44f83bb3067b6c72a5239eb0ce51f33b34ee595fd323 SHA512 5c60737a69c2777d555bc3ce76f43d38171fa4e8e0adf99c4ddece0b8852778c1ea630fe7d938cc6271aded4a6b0bbafec6cd3ccb79db304d0f7b9263bd93c5e
-DIST teamviewer_15.18.5_i386.tar.xz 14697088 BLAKE2B 85992ccfd946fdad245397b8ff9e9340bc608106bc2a8a5290f9e85c5aa012600f6b9c2fa42908d7c7228c089c6f941c25bf48f1424ff17cc87a97eadbb0073c SHA512 bf43108b919acc003384fa7ea342805ce7e6cd1016cf982f066e8e80756dc031d7ae9449ec18cd63e40c928a12dfd9a7138dc7d18943e68e93e72927dd651ab0
 DIST teamviewer_15.19.3_amd64.tar.xz 59343000 BLAKE2B 8f5e39d87d8badfda16f6fbb0cdc9b5c6e4a26e38a62612dd2bb12ba1c997f4210308dc6746795f771b486be6467ab0044d6c0a6e3d301bf3ce1f1dd8025c01e SHA512 88cbc0c7c5bef0813b4d8cd99e12e5fc6bcfc44ca43302439182d3eb4e01e85b03a2edc1135613b9b878ad61a0dff5df8efcd8b276b6f2b7ab255d72d754e396
 DIST teamviewer_15.19.3_i386.tar.xz 62513708 BLAKE2B 959286f2e265204f703c9e6efcb8ca0fecc039763da22506330fabe3e449e076d21922d443670f02429cf07d74869431f2fe521e88822b266ce4ef78800114fe SHA512 9bdad9c2c2aba500ad29a6eb84ad104cd4d621f63be47e6a7755c3907e25c0c19404afa2489c83779977d54ff93568433affa4267d715ae142ba946efe7ae5dd
-EBUILD teamviewer-15.15.5.ebuild 4027 BLAKE2B 8c597b6b34f440ce5fed8e6fab07d57fd6e70d9a78392e435a0133e7d6f6f4bc51e99fc80598f632eab8d0713fe153a4d4984b51cecbabff04744ac952d7f7a3 SHA512 87a8087b5e4de9fe6b618abc1effdc6abcff605214ff90d804324353f0a9c6e9fdb29fae1a02315fd5a0ba3843b2e004285ab0350ef1b361295c1794714da239
-EBUILD teamviewer-15.17.6-r1.ebuild 4042 BLAKE2B 43fc88ba97e92ee98398d072d926e7b344dc904996f424270fb558d2edbac287724df3c082461ce8eee8411f0c54a676ff1f069e784a100f7f912363b187fc21 SHA512 949265ca6c08ad52e503563b7be381a42e800474a3def791fe49411770b4a788941b4b2a22413ed407f21d0f521511dddda75baecd490d89494d95ce7843f52b
-EBUILD teamviewer-15.18.5.ebuild 4045 BLAKE2B 2039a40e0bb5181fe210ea82e33f532eeeb5211fd27ea801f4a497b0e5b7f54edbff44ea05cfd96aa9c09b3d2ed9e1f13cccd2b45875eb191e44cd01552450d6 SHA512 ca2f9b1907f6723d296f5a40e9b5e87b548b347a8aa323739e9abdd4947b51dbe58fe879127197026b3d625a69bfc81f99487c9b05796a3fcc7d8566af473f41
 EBUILD teamviewer-15.19.3-r2.ebuild 4527 BLAKE2B 2738a5bec353c27344ef053b8ca73169420528c6408d9ca7f01d465d0e041c09806d569f98f184e87a17a6b786005b17e449d9e414967e0f1a3bd171fc9bde2f SHA512 eafd6402451d9b27084efcef084a20ad4c5658857499899f5898db9ec37e496be976d542e580d515cfd4b6076ef833ad9be45957197928a762fa2e41979fbde9
 MISC metadata.xml 397 BLAKE2B 085e3a2bbb0db2ab42db784c18f8c1871f32a3e135226163d8a1ca3f612baf1efe6977a3dd8407fe850de154cb64de26520e3ba4ed5b3dd143cd422eefe5c750 SHA512 7b013dd022005f5b76a6e6dad9422565f4018736f013da5f4870bf2b51c0fd9f1f6c1127e0c31282125507e05011469e43f2efe48714ec0b2481f1e0da164657
diff --git a/net-misc/teamviewer/teamviewer-15.15.5.ebuild b/net-misc/teamviewer/teamviewer-15.15.5.ebuild
deleted file mode 100644
index f1cc5dc99df9..000000000000
--- a/net-misc/teamviewer/teamviewer-15.15.5.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop systemd xdg
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-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 -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # 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
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	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
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${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_PN}
-	dosym ../../var/log/${MY_PN} ${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 ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		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.17.6-r1.ebuild b/net-misc/teamviewer/teamviewer-15.17.6-r1.ebuild
deleted file mode 100644
index c9a4dd15708f..000000000000
--- a/net-misc/teamviewer/teamviewer-15.17.6-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_MAJOR="$(ver_cut 1)"
-MY_P="${PN}${MY_MAJOR}"
-inherit desktop systemd xdg
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_P}/*"
-
-S="${WORKDIR}"/teamviewer
-
-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 -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i 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
-
-	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'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	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}" teamviewer
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		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.18.5.ebuild b/net-misc/teamviewer/teamviewer-15.18.5.ebuild
deleted file mode 100644
index 63c023804a57..000000000000
--- a/net-misc/teamviewer/teamviewer-15.18.5.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_MAJOR="$(ver_cut 1)"
-MY_P="${PN}${MY_MAJOR}"
-inherit desktop systemd xdg
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_P}/*"
-
-S="${WORKDIR}"/teamviewer
-
-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}/" \
-		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
-
-	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'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	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}" teamviewer
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		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-nds/Manifest.gz b/net-nds/Manifest.gz
index 29157d8afd41..ed257fd91c01 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 7a071af4c9d1..91394b1c719c 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -25,8 +25,8 @@ DIST openldap-2.4.58.tgz 5885225 BLAKE2B effb618dba03497796a497cd7f53ec52e389133
 DIST openldap-2.4.59.tgz 5886272 BLAKE2B a2a8bed1d2af97fd41d651668152fd4740871bc5a8abf4b50390839228af82ac103346b3500ae0f8dd31b708acabb30435b90cd48dfafe510e648df5150d96b8 SHA512 233459ab446da6e107a7fc4ecd5668d6b08c11a11359ee76449550393e8f586a29b59d7ae09a050a1fca4fcf388ea61438ef60831b3ae802d92c048365ae3968
 DIST openldap-2.5.4.tgz 6415235 BLAKE2B 16e466d01dc7642786bb88a101854513f1239f1e817fd05145e89deb54bc1b911a5dc5f42b132747f14bdd2a3355e7c398b8b14937e7093361f4a96bfb7e9197 SHA512 00b57c9179acf3b1bde738e91604f3b09b5f5309106362bb947154d131868f233713eaa75c9af9771bfad731902d67406e8fb429851bad227fc48054cace16a8
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
-EBUILD openldap-2.4.57-r1.ebuild 29079 BLAKE2B 302454ebdaceab2c719b5cdb880e8d1489ef23a48f0b1f1f19080f0034f231775ed095e21e7e673a16ec43d3b2aaa2da6729e8e00f3fe0ef655b51410e815927 SHA512 059d2c495bf9df991ac6b3f51882850e40bfa8977a73d32d6c40bbbadc480f592388b431137d32949f123e9bca13dc74473ebeefd55d7f12458b4d9ab80ab1b0
-EBUILD openldap-2.4.58-r1.ebuild 29087 BLAKE2B 9bb96ae93381200cdc8ad70330fecfbde3062d96757469b2f2b9ac177d4394b4ac00622ffe78ae0e2319ee77dfb6271cb2f76839c50b8d527a7ae0350ef7a2c8 SHA512 38827b92cdffa27928b39df01ce084aecf707df942bad745086f119ce25ead14699ef17ea71d0452569ee6da748a8df100f5d4343ceffe92a2af0c1bf8491142
-EBUILD openldap-2.4.59-r1.ebuild 29087 BLAKE2B 9bb96ae93381200cdc8ad70330fecfbde3062d96757469b2f2b9ac177d4394b4ac00622ffe78ae0e2319ee77dfb6271cb2f76839c50b8d527a7ae0350ef7a2c8 SHA512 38827b92cdffa27928b39df01ce084aecf707df942bad745086f119ce25ead14699ef17ea71d0452569ee6da748a8df100f5d4343ceffe92a2af0c1bf8491142
-EBUILD openldap-2.5.4.ebuild 27198 BLAKE2B ab69f7b03123a7a68253e1b4139e5ac6a5811343d60de78927aaef12bdcdf196f58f969313894a97f9ff5b46fc9067f549d922764cab08006d26e9a43032ece4 SHA512 0e8d2a36f05aefed0852658bb2aa26580cd5f4e65bf0911b9db5ccc6283386bdd707b6bff086f1c165d1af7c2d9e1ecfbaaa2f2709e8d34dfb078a587170db7b
+EBUILD openldap-2.4.57-r1.ebuild 29110 BLAKE2B 206d1449037f69b81c4d47bc368919dcf1a796ef2e331df597acca641d4ff77cb7da7908c44f09b440d979bb17926e9a51af126f5d6941853a57ba88777e46e7 SHA512 42bf7ad43519b02c440430a919f7760c9f7d99ef715085fdae46aed3c36b54355e52a62a9b849207934703aa625151e54e0260e09cb52c900179de7d494adf70
+EBUILD openldap-2.4.58-r1.ebuild 29118 BLAKE2B 28397dfb743e0344575ff563b26537d1b6e330e609300863a018adcb4edb3b70c2c2bd8d689c4b986b85af3be95e25db93c9a14e53154d50acd5ffb46e6893ac SHA512 250e19bc91392627e7fc6e5b35fe6d104f06b318a7094b2506a04e438d6f2c2b201f6ca3d90d69f56338a2babe5d3c1c3d82e5eea29429f7ad06dae2fa472b5f
+EBUILD openldap-2.4.59-r1.ebuild 29118 BLAKE2B 28397dfb743e0344575ff563b26537d1b6e330e609300863a018adcb4edb3b70c2c2bd8d689c4b986b85af3be95e25db93c9a14e53154d50acd5ffb46e6893ac SHA512 250e19bc91392627e7fc6e5b35fe6d104f06b318a7094b2506a04e438d6f2c2b201f6ca3d90d69f56338a2babe5d3c1c3d82e5eea29429f7ad06dae2fa472b5f
+EBUILD openldap-2.5.4.ebuild 27229 BLAKE2B 83a96f855953a9cb56291949bfc0eaa4da21ab0cc784e34ca3866f5d00cc55f1fb3ac54252708b2eaf94fb78c4459646095dcb5509b6a5e0a0fc9a28c08522f7 SHA512 890bb982c7937e7e0fa4912ff304c8fb7b56ffc8db43b7290cfb90e8bac225cd0e913400756a6f08d8ba9d936cab6a2db35ddf34b1872b7b81c2132448bcc209
 MISC metadata.xml 1030 BLAKE2B b940261c1e1fac05fceffc80673100d3102e53b532b8936b2e51bbf5a6bdf2ff5cfe633c53b494856d973a86c8d0f2b5acf8f2c26d2c62d16f1313fb8dab798a SHA512 c031e0cbe8d8f6d5fcdd8d4c4e036e5087068c35ae44264b5e244c0d6dee429836f493d75f6bb2cb422d14ccd0a7934b13748cf83517791e61c51fd6d924deb3
diff --git a/net-nds/openldap/openldap-2.4.57-r1.ebuild b/net-nds/openldap/openldap-2.4.57-r1.ebuild
index 7486eb82e4bc..47420777739a 100644
--- a/net-nds/openldap/openldap-2.4.57-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.57-r1.ebuild
@@ -864,6 +864,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	if ! use minimal ; then
+		tmpfiles_process slapd.conf
+
 		# You cannot build SSL certificates during src_install that will make
 		# binary packages containing your SSL key, which is both a security risk
 		# and a misconfiguration if multiple machines use the same key and cert.
diff --git a/net-nds/openldap/openldap-2.4.58-r1.ebuild b/net-nds/openldap/openldap-2.4.58-r1.ebuild
index 633bd5c86de1..679dc8b2ae51 100644
--- a/net-nds/openldap/openldap-2.4.58-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.58-r1.ebuild
@@ -864,6 +864,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	if ! use minimal ; then
+		tmpfiles_process slapd.conf
+
 		# You cannot build SSL certificates during src_install that will make
 		# binary packages containing your SSL key, which is both a security risk
 		# and a misconfiguration if multiple machines use the same key and cert.
diff --git a/net-nds/openldap/openldap-2.4.59-r1.ebuild b/net-nds/openldap/openldap-2.4.59-r1.ebuild
index 633bd5c86de1..679dc8b2ae51 100644
--- a/net-nds/openldap/openldap-2.4.59-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.59-r1.ebuild
@@ -864,6 +864,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	if ! use minimal ; then
+		tmpfiles_process slapd.conf
+
 		# You cannot build SSL certificates during src_install that will make
 		# binary packages containing your SSL key, which is both a security risk
 		# and a misconfiguration if multiple machines use the same key and cert.
diff --git a/net-nds/openldap/openldap-2.5.4.ebuild b/net-nds/openldap/openldap-2.5.4.ebuild
index c0fabfd506f8..8c6dab1cf306 100644
--- a/net-nds/openldap/openldap-2.5.4.ebuild
+++ b/net-nds/openldap/openldap-2.5.4.ebuild
@@ -796,6 +796,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	if ! use minimal ; then
+		tmpfiles_process slapd.conf
+
 		# You cannot build SSL certificates during src_install that will make
 		# binary packages containing your SSL key, which is both a security risk
 		# and a misconfiguration if multiple machines use the same key and cert.
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index befa22280942..314925039628 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/go-ipfs/Manifest b/net-p2p/go-ipfs/Manifest
index d818d1598035..8cae9eb6ca28 100644
--- a/net-p2p/go-ipfs/Manifest
+++ b/net-p2p/go-ipfs/Manifest
@@ -24,6 +24,8 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba
 DIST contrib.go.opencensus.io%2Fexporter%2Fprometheus%2F@v%2Fv0.2.0.mod 431 BLAKE2B 3237015d3228279dc71efc8690d8953db1d2b9264710245fac65844d9d7065b20b441f82130d239df29e7ce05ee98f97e0b58bb711bc8b40f9921fbc8fe16343 SHA512 4ff8fed5f6cdf704bc930859d1c1af27df959ea7f14769c075a49d6850905b4bca550596e66d01d8493d4e95247cc37196a87406d4044e3dc76f9deedf387615
 DIST contrib.go.opencensus.io%2Fexporter%2Fprometheus%2F@v%2Fv0.2.0.zip 24875 BLAKE2B e1aa2ccd55163a45da85f4d27e4df0a45a8240fdde5fa17be7e4b73bdb8ced947d5506b279beceea754c12f370e1cbe77296939effbe4cb88cd4f8053fcde7f6 SHA512 f7a387f0940725f4437615635ccc16d6732acb65730edf91ca1d2f62d998228aff029dcd8e502e1f9924076175cbb442508ef86def9f52d7a2d9cc2214055245
+DIST contrib.go.opencensus.io%2Fexporter%2Fprometheus%2F@v%2Fv0.3.0.mod 224 BLAKE2B f755d056e503b2a6e9edb51a4f5ca986aefb4fc84e1d3b3f984d6e5b365aceb2323e6e104b64a60e651321a5b6f93c95aa727586e104fef8e8344637b3aa1791 SHA512 71f14fea20c14d4f12b03fc4ccbd69edefa5383fa6d2584042c00cef4c3970511421aa932f07a333ed96e8b05100874273024471e651b1cad0cbace5d4b97c77
+DIST contrib.go.opencensus.io%2Fexporter%2Fprometheus%2F@v%2Fv0.3.0.zip 39053 BLAKE2B a9f21ff60e396dede335c3d23d553bd16b6d1144daff685b9f85361041e284f19ca4171499b0b51a7ac7220d525c4b03477f755b5087465997bd6d1d377c88be SHA512 d3f3ca075b1a9cd7c5b4d26c2784ab08543b7b372155489f42976851bf6b127e1cb2ce2d3c00e48fb2db044a99804f60ad3aceb8080581c9c08bc721e93a3f45
 DIST dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod 40 BLAKE2B a701681a24f3354c06bffbbff75ce9ee56a1512189b5f3791cdfde30efedea11121f097b6d06f7dff40f9f651b0eab82e79bc33d0ac003bbeb123568d23124df SHA512 26c349638b8c031e65fde1387c9fad8fd99f09e2e165d943ee5ed2d1858db713936f07f640e9b2bb4e156c794cdf18f7076a559c4df7ecf39deb959232ca7940
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
 DIST dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod 38 BLAKE2B fe16fc3a32dfa62245da350c0082791b531fee71fc796e478326ba118ef6b939b775fbed97ba504a8712eee54a46d35081e84fbc66d2ccb3a52874fa256671c5 SHA512 a1c78474d2b67323d7d06018d53646df667fb3a6ed8ece9f6b482b4492c84cc71287b28932dde1a2962a610019b1c6290370fa100076fc185147c4406125870c
@@ -37,34 +39,51 @@ DIST github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190825152654-46b345b5
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod 35 BLAKE2B 68297267e33add40ca12e681b6b4461ef8a3dd23eb205a365b13b158d0e055e3650fa9539eae43bbbf4ddb559c872b95ed541a3f4330a0ad3395089c4cb9c9f8 SHA512 73bd53e14c96c10e3288cd859b5d7758e6d2897369060b1581b6a4290e233877e408c9dc6350b763c2ab678a2e8f3e8f7f3bf563928b43ad37a48187ccc0ee7b
 DIST github.com%2F!kubuxu%2Fgo-os-helper%2F@v%2Fv0.0.1.mod 38 BLAKE2B 75361b0366672474afbbdf7b74559e5ef3ff08fffb6ceb928aa58e6ab055ff06a7180437a4921868c4aca678c9657d750f101cbfd27e0292e7d315007ef35192 SHA512 0e374f95dd9c31f90c223e7bd34343970cd44d7d1988b468348517a545e99834c3b69e4b52d9de5ef81faead1684c820d1976d1631dad8cb8cac403fa20efbe9
 DIST github.com%2F!kubuxu%2Fgo-os-helper%2F@v%2Fv0.0.1.zip 1843 BLAKE2B 8e6c747abc72319f2939c1db9cd82530f1615d0bbc5085d88ee634f72c0868532e04466fe9a5ed1ff29184a6e11d9353e0ae82c6b97c831fb2dcc88ad79b3842 SHA512 d4bbc2796888108e23253381bf0a46c44fa89730e1f2c8e50e2e55e1314ad761fbf9d806ff8f061cb18647c430ae9859f79d3050ce72824befad0669a66e9f1b
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip 17606 BLAKE2B ee5acf57c658d87b97b533d695cb72c9d83e281f9e533271f03d85d52f92c3c90e240f3b6d2a01bebbea6befb147ab66d7f75c403fb8bb3e58a2bc0bb1269f6e SHA512 89912d8630bed5c71dcf391b57e4537b93f01c4f1cf320a8c11d5d34d47fa4e3ea4abbfb3bc3aa76ad3cf08350da67e190cd80322597d0de3123fbaccbcea9e4
-DIST github.com%2F!stebalien%2Fgo-bitfield%2F@v%2Fv0.0.0-20180330043415-076a62f9ce6e.mod 40 BLAKE2B cc7804b399283e97ddd4484d7867a6b68fd21b4093b47346dd21cd284731183d98c3525c834beda5dbcb789020767d5d7d766798fe72a1bd2538661805aa3be7 SHA512 81a26774365bc0f2ae76fb892cb1e834d37f09e958d27d9aac61ecff5bd7b85b694118f771f5ad3dd0ff607fe092796cad6853f93c1690ad4939c36c5af15126
+DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod 33 BLAKE2B 7013f44d03c22c21595c5369c52e1538a526891c9fc4cccac37373504f13c66d7c504552251f46632917739dfa1d6c3a15e15aec4dc03b9c69902b0bcfc8785c SHA512 db3271d8abd514934ce5d06fd20f7490db8368e57822a2379bbfd4ccb94e67354400d487d388a57467a5a16cec339cbae9488cecf82e41d85918639bedaa0a87
+DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B af7b84d9f1cd163555b32bcf960b28b64a5689a1c9694f430af310f5041cd967fcf0d6c1a6c4020478544d347e4ba5b2fd16a6ef54258d33314ee0ad9239752c SHA512 917ada7ac198a013d2b090dfc59a45bd2619dcb7227df1521ca38a0d822fab12ea8c158c526257fef4ef506af29d9fa678e8dc2a73fc13c8dfeb57b398801744
 DIST github.com%2F!stebalien%2Fgo-bitfield%2F@v%2Fv0.0.1.mod 49 BLAKE2B 0045e30dbd30e5442384443ea5ea4c2911cad42678f4d222bd489dd5dfe3a6245bae58f32163f9e4fee099dd4ba85935edd3ae7234f47d3306c8cc2bacd22087 SHA512 47e84fe2465a1985fc4555a510d3d67c602803ee1d6caff4f1ef7727f0e5f089ec7026cda012bcd05595ae84375e19edfefc97ab6635df9ffa27323e98cb3507
 DIST github.com%2F!stebalien%2Fgo-bitfield%2F@v%2Fv0.0.1.zip 4204 BLAKE2B e2515d9e38443e648f3703655552dd5f3b0af92c7cbc582e762373b78f88cfe93c119223748b05b9a5f85c6fd7e3020fae1bba8537ac34b35d36d25b377dc652 SHA512 dcc27498037f05b8768f2a2652ee77647d6f75d790d125ba4be040e5bb5ffdcb5f6df1fd1bfffef9df10e6091008ee27fd59d63e3e2419f4be7e42c6390eda01
+DIST github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod 42 BLAKE2B 8afd8d85fc5969d9c4b82c26f852d82fcdb08677ccf0d54d8d65b89af3ed5897125aa0d1f5fa6adca14e8b47850da8d5a70b5b3fb2f42a83ee84576137a2fc6a SHA512 e25b80b5e74a374b055238fc017a8c64ea89180ca07417abe673ad5eb0b53c9489b9d93f638da5b5cec250fe9a478345093dd2d1bf0b82fdfffe938ec1aa874d
 DIST github.com%2Faead%2Fsiphash%2F@v%2Fv1.0.1.mod 31 BLAKE2B 0e07ae1110a18d70ea6586009db68ef57051a89f7476c219cc584815e896efd2b3a40ba9603aea815152caf8ba655183fa65441b0de346aba273dd73459c73a0 SHA512 27782423c17ad862a5697922bcf0222239aef0b7915493caeb133743520490e07927a5b3c63227278e7abd352856ed276554d4e59639667336f23ff0bf111900
+DIST github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod 34 BLAKE2B 325996884246cd840e22801dc089388410afc2bd8ab7c5c1f4bac6aa6ac035f387e1b896a91702386edde85ba82efde16aa8d7bb55a7644fc3f530a36eabe89d SHA512 dcf507ac7e50307fec43fdc5e5dd93f0c8509ac99033500d1ff3414ac0a2419ddb10a688b17cd9d0035c36814a25ac68b771285ae21415eba7a55586b91fed7c
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip 66303 BLAKE2B 4b02e631a3537d577b78b1372f8496113c582bfaafc48f5ce6981ed72da6a611d6c692a85c6e7cc8aeb47c89d0fec9f491d59607ead55d5e4be256525d3173bb SHA512 d29dc8a3c82c34af07b0c393349eda79b30c988d439771e02106bf2f386ef5fc3feaebf00da3953a40bff2c5ed93880ecbf45e1607303c11a417bfffb96e2e65
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip 5447 BLAKE2B 9b79de84354305adc2019db61eaa5f84daaf0ba088b1582776b4973d85fda9055264b14218a00ddaa3c23696f5c57574eecbd48c2c7dc4df84348bf5c507d559 SHA512 eb9b80bd07a9586681ccb20b48644c404ad326e65251571531776ffb51eed20dfc79cb34dba332dea2fb4aa1a766da2cbad597b59db3c7f770b56febe1956ed4
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod 79 BLAKE2B 51cb1c2c33300626f74f843ce56c333b194b9a46230d3befe94343fe9daa62314a59b74a6d78c97415f839997fb42700c762fe02ef76240924ba52d18f723ad6 SHA512 df2dd357e057bb1fc65ef4869f64149f6446257406886e89a39f7dbc7e6c9da25a8c17567b14c8d3adefaf21fba98e0f2663924c7d32a4f82d30377ab4032162
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.zip 7096 BLAKE2B dd3436eacdcf42567210b68830f6a9663ed91531d73aa6c2548f50e387d7081a0908478135816a599014a82e23fd6ca9c2685ce8518c6ca73bce24a9f0ff5f6d SHA512 6111f8ea08657e90dce1ae450736cbc3a6e10cd61ee5211ef4cbb1abe1862d0fa658ef2922b6778084d10af3f3c55744962162bf9fbdf48d2c42f6a15b297ea2
 DIST github.com%2Falexbrainman%2Fgoissue34681%2F@v%2Fv0.0.0-20191006012335-3fc7a47baff5.mod 44 BLAKE2B 51cd299533d39c6f9e2cbe93b4e80f0bf3b261809e777114488d181b447caec2c06689aba7fa0bf39a3d6059fccb2132d0b5d22f1352f2526588218a36ab57f0 SHA512 a503f68b2ad686d9b813646a4af0405669d40f6209a32447a84fe4140df64f7c724f20e8b07aa1bd0ee29011db5764c677474f6ba2785dea65291a56e46a9100
 DIST github.com%2Falexbrainman%2Fgoissue34681%2F@v%2Fv0.0.0-20191006012335-3fc7a47baff5.zip 4991 BLAKE2B fc42942b4ef0f05f03de94dde89b3a62b29cafc0c677a1457de32a5a07f1e9fff6e4836623a7e7e08d6e3718bdbfe95bba23b0b96d099dafbb3fc3d090b4e65f SHA512 1cf0cabf4764c792e8c3ed464f02b07d603a63f9a5cb9bbc52d9c32c90ed61fd408cc7da68e7bb8335c0295f4dd017ebbfbfe12f03457872874d600866ab4678
 DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod 35 BLAKE2B f41c90b71b4b9e1876a13df9703b57f52ec6d7fd4258a7c44bca15c12310b512e400b32715180bfbe4726887aa7284fa21832ca9f9eb1dd759ee7d0c627307ac SHA512 5a93ead508f4f5e229e5d0e59dc820840819d9b32158ddecf2d6dae7ee96ce92af6bd80d18a98e437cbdda5de6df6cac03f7b535017fa92ef868dcccbc6e1f27
+DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
+DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
 DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod 33 BLAKE2B c5557c9c02300d9fc6ecaac5694461cd440f5a1f5cf9ddcdb38e6fc51d9a55d9ca1e98bfabecb6c83fce81e87979e66e56c585760ef61fdf1866480c0e32eab3 SHA512 15b2cb1fba3e5103879548ffdad032ae30f0e723cfd26fa6bcf69afff14b18c2cf3373f511702b3690fbdb7040996c437f9cd0253bdfbf211b665ff14e97aafd
+DIST github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod 125 BLAKE2B bee4d59ba1392d0211558f6ce3511c887a474463f784cd92069df7be6de5281079d579613f0e5988ad1f3355bc8ccbecdae7f1fd551fb122f7a0e8ef11523e1d SHA512 7e6ec3815d053e7d49d2b0a3d4fdde6c6eeac6048ad0eb681da1305f6d9d5bb6671e31834ff6e5d840d9a7944efa52707d40fa737fa9ec3d3ed9d130b589f9c6
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod 444 BLAKE2B 330419975445f724ee7b9a3ef8395fc7a153f189012dbe70e982865f5f556c2ab0d41a3465ec5cfddad034f12f226f77fcee9e3c1024693a0f9b13ee26f18092 SHA512 bfdf66b04b9c41824815a5a2707acce5c3f74aecf15a510d45adc84b732367885a18920d3dc50d968d0bc5e8a4fe3d519f7212de80baad4656c6867357c8fca7
 DIST github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.2.mod 45 BLAKE2B 57350526cf25f10ae2018fd72f9944dae239a72c2a44db02f0a7414d802cd03b48e58d3c63fea3cf02cffc26e6c7b334190b2f7a76b7e24ec50aaecdeba1a442 SHA512 d17d2e4a7184b75fde3ef47d7158c9913611ae55dc2e67ad2d0db87afaaf894d0eaf5f0f5b027e2d888c592735dec2d381c83c7992576eb164492e98b24b5f1d
-DIST github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.2.zip 7224 BLAKE2B e6ac68888b9879a7d2cab9a6eff383059b65a101177ae8981f4ab35baa327040789b6b69e0238c1498cb8896622d89a4f6110e9c8d4f92e6832413470fac36d9 SHA512 ff5523bf10a183ce2d09e876fe5bfca2902efa1eacb36d6e59065fdbbf8289afcb6569e77f62267ac62be4fb09e9fb98ab42a921829ed72c179df381838a4125
 DIST github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod 45 BLAKE2B 57350526cf25f10ae2018fd72f9944dae239a72c2a44db02f0a7414d802cd03b48e58d3c63fea3cf02cffc26e6c7b334190b2f7a76b7e24ec50aaecdeba1a442 SHA512 d17d2e4a7184b75fde3ef47d7158c9913611ae55dc2e67ad2d0db87afaaf894d0eaf5f0f5b027e2d888c592735dec2d381c83c7992576eb164492e98b24b5f1d
 DIST github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.zip 7220 BLAKE2B 0a7e9be6781be8c5c8726ac7acdce2d55c4b6690c151954442577b7a10005329261b1bac7d0ec9e0b15dd712762ad81c9614d90e03f7d32541eb99de904c8e2d SHA512 acb1039ee94aedeaab9cb25b218a2b7953ba22352198260630a168b1341f1d04dff827142a968b039cc03295055d2528fda134c696573ec1bee02648915ab22c
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
 DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
 DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip 19948 BLAKE2B 3f604e82647eb2a4a4c309622080fd07701d032a430999f13da727cc01d455cd3d0e31a7079e0bd833fd17d84a228f9e3f588719c4491ba83e50aa442080acf3 SHA512 e1c0c9251b0c7f05bcfad6f73cab4215cbd550d98065ccf8553dc04a56d7f6153ee70a477230a0e7cd8adc3707c8bfba279676902300537eb056fd912d75b51c
+DIST github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.mod 43 BLAKE2B 0bb8e89eb31061bf2d38a3ffef58a48d3fa9a0dee26aeaaad7f38119d76ab9f34f0bb8ea4bddf277b9dea40acfaceff8925d32eb3386e898d6da9916b55bd647 SHA512 3fd19a3f311a3d0a6faa4488daa0932c661c27aad69568efbfa8aac052b175e2934055f7563c081718fb8a5ae560316a0e884a0f904694d9dd128f61dee2ecb9
+DIST github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.zip 17076 BLAKE2B 93c0e7eb4b46ebfdb442e42b18ad6ff9e531d17b8ea3f140dc5e7cf8a9a4f46263df409b449f157a66f3af34be33a9c35a935533e172a3d6d918cb8c5a127d40 SHA512 ec0402d9a33a5930b3c667e65620c48bc36446e1ccedc608aa1429f9c45d15e7dbed9d00a05f09c7b9b0f933a52525ea7c376c269017e237837887bf95700d70
 DIST github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod 36 BLAKE2B e415584f1b251058c7ad9fda35a53a9c7f94434150330fdce3e1ef768c0b46aaec572e027040773f022b5e3657c4950442c1bc17c2c9b7f5106ba26c4aab733b SHA512 f271a93a69cd074418eec8b114375ca0a196d7cb4b69856658946fa7f2d8fc40381b575f0f624e9fb7d90d180da09477083905c70f01ae875c1f1d97084bc58c
 DIST github.com%2Fbren2010%2Fproquint%2F@v%2Fv0.0.0-20160323162903-38337c27106d.mod 36 BLAKE2B 815a2fdcc9ce7f6f9098e239ffe398112298a28dfcfee51d83f65d31c4a69bd1d2ed672549796b4ae53bf2ad7e7c7f5ac4f7aef3473a23276d073e2b6e750572 SHA512 059688fde287f20422e8b1928af3465836bf1a6796b94ad6f3194565063b0419de43e337ac7ca652c65e14bc129a6782ed10be61446cfd32e20a037a025df8f0
 DIST github.com%2Fbren2010%2Fproquint%2F@v%2Fv0.0.0-20160323162903-38337c27106d.zip 3037 BLAKE2B ed6b7355857a362ababddc1a32f6d39cf9ff94f50913b353c5c96a3b469a03e58d46fe88aabdcb9fdd5b42462f2e4e2e2e11520a6e5377b7138c8385b211497c SHA512 ca741a7b877540350513cd370fbe7a5cfb86b30522ed672efa58078fd338c38f86d953e36e1bb9309b65c08a3ac105a085de51411df048aec47d7c3e294a9814
@@ -72,18 +91,23 @@ DIST github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190213025234-306aecffea32.mod
 DIST github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190523000118-16327141da8c.mod 904 BLAKE2B 2e99a4fa33d10c5aa9653c93135028f9e0ce5262187878ff268d221b08540ecf1d08602f938da3f118fa98ae8d9bfbe4b086d0597d3d9150153158bd934d6cfe SHA512 a2c916d1296bba37af204683192c94b4a4b58b3490fbe6a4414673b8add1829b9f82700269d0d3be3da543d8d37bff64dddaac30864445fc986c93355900e408
 DIST github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190605094302-a0d1e3e36d50.mod 904 BLAKE2B 2e99a4fa33d10c5aa9653c93135028f9e0ce5262187878ff268d221b08540ecf1d08602f938da3f118fa98ae8d9bfbe4b086d0597d3d9150153158bd934d6cfe SHA512 a2c916d1296bba37af204683192c94b4a4b58b3490fbe6a4414673b8add1829b9f82700269d0d3be3da543d8d37bff64dddaac30864445fc986c93355900e408
 DIST github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190824003749-130ea5bddde3.mod 904 BLAKE2B 2e99a4fa33d10c5aa9653c93135028f9e0ce5262187878ff268d221b08540ecf1d08602f938da3f118fa98ae8d9bfbe4b086d0597d3d9150153158bd934d6cfe SHA512 a2c916d1296bba37af204683192c94b4a4b58b3490fbe6a4414673b8add1829b9f82700269d0d3be3da543d8d37bff64dddaac30864445fc986c93355900e408
-DIST github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.0.0-20190824003749-130ea5bddde3.zip 3103745 BLAKE2B c03faa9327d809bea23cb55e497fa084fa67703f4c0cfdaec59b1199a20358a0df7430998cc42fc8d1c0c8c22281b407d9d8fe875c166dcedfc62b3ce78f0433 SHA512 7ac2425554b5a702ad76189fd189fa73968bf8f72b14ec7c9aba7c5279ddf4ef39c49cb81cc9cf4cb6487c4b767e9be30a0d3854b48e3a06b40b0026a2b86962
 DIST github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.mod 913 BLAKE2B 34c74ca4a6b36d48d11cd24559e58f5f2d389db9c8946811bf60b4e36ca7ed0e1ec32da129b16b6d2e904200212761c0e0cc997886a96c195778c9f3305acad0 SHA512 eeca58cd15d73e4074d3139430632556301392118e1c1f468cd6c86331993ffeaed407503d0b687a455a4052dfd46a2049bd839437276133e009c4477b778b3c
 DIST github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.zip 3090472 BLAKE2B fa8bdba203e01448825880f0a4fe00e0cf5271b4e831c9f1631d04b88813689d2d154dd773efcec0b1f76381b114855a55df57338b0ddb29d68e81ac98074292 SHA512 c669c1e28867c8039eec5c99ce0ae99f18f0951cab0f140b00ec39354313de3e8a5148111334eee6d5e58ed4a207fa9663841c13454b89abbb7546506076c223
+DIST github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.21.0-beta.mod 555 BLAKE2B 9add6b6ac26374c8456e8c7a3089ef3a0f2449197d8a5394a8dda96e9480c2615795e8f2115ff8f779bb3cbcb95fcc2b584c2ff48a8355cbdc65302a6f75c7af SHA512 2cf3aeaf016dc66734dc2311ccd41d47030a050ede746fe95b9abfdf7b2a042a502e58a1c4dd466307660a0c14e44a5ab24b7982d142decde8a018d9f7d3efc2
+DIST github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.21.0-beta.zip 3094683 BLAKE2B 0d7c72e88ea051625e7d7bf6a6fde336ae366869fffb8459c16afb13d9771ae7fc1ae62879c059f63157365a81e06def5b08afc42bd4e1cf1083783abb2c2d9c SHA512 f1865d90623f8976e1d1a503b1e48626e0dbd12c89f269a67a819781599b3c35cb61dcc35a213a2fcb9bd919b8ab7fc438ee2429edc7beeb31e58d3487dfa18e
 DIST github.com%2Fbtcsuite%2Fbtclog%2F@v%2Fv0.0.0-20170628155309-84c8d2346e9f.mod 34 BLAKE2B c775b370ca97e395887e54ab02aefe9e14a50db63424bb16ef5879042a1cefe65147ce346999678bcebfe7148db5ed9f9eb136b4e13ce3420c475059118dbecc SHA512 9a9bfcfd623331e8b3e4b49de79bc3ab07d9c84aa5fb96a226a16acb479b9aaab06ef9f7a5a0b1af5da407d17dbe3c99760f76e22e113aa73f9fb4bcec3806e2
 DIST github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv0.0.0-20190207003914-4c204d697803.mod 35 BLAKE2B cd84a8bb023a5f82f7f7a3175704104f8180f9f81a38a56f7fd76a28fcd0456d1b70ae6c28e5a25b5fa2c03cc5b685aeaf800325372d575eb97af1bdbaeea18d SHA512 52310213cf480b7e62c96946555127515fe4874772e9cd88ba21be58a95a7e71c99d2935a304b56c5ac6901615eef0d942e6da39c9899dec4b3d7ecdd2aa5c5b
 DIST github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv0.0.0-20190425235716-9e5f4b9a998d.mod 35 BLAKE2B cd84a8bb023a5f82f7f7a3175704104f8180f9f81a38a56f7fd76a28fcd0456d1b70ae6c28e5a25b5fa2c03cc5b685aeaf800325372d575eb97af1bdbaeea18d SHA512 52310213cf480b7e62c96946555127515fe4874772e9cd88ba21be58a95a7e71c99d2935a304b56c5ac6901615eef0d942e6da39c9899dec4b3d7ecdd2aa5c5b
+DIST github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv1.0.2.mod 308 BLAKE2B 61a7c5781c1f7d591f91be8e620a8ed45c6ff850b801dcd22f7418f61672c287438e447b75b089d1b54a515c4411d850582fcf2a701b55b7a0568a2668913016 SHA512 4b7e20b65cc412af8e42385923df770e333912942f517df080a87d1793761ba88cd1b76b4e0faa9d2a6b5cd2ee9c9b783a746b08027b6bb4e41e2c9020acef5d
 DIST github.com%2Fbtcsuite%2Fgo-socks%2F@v%2Fv0.0.0-20170105172521-4720035b7bfd.mod 36 BLAKE2B 3232773544bcbba9d275a4547e52dcbe3a1f1cf7806e71e4ddb3ec1453130a8d64214b3c7410187b005abf33160441dde141c25ff967484c3caabb3afa4fddf4 SHA512 a0c78d97cb6ebedc110f96b2b163fb7ff5d07650f5d6c2f4f715d6c79fdccb15a6b13eb65e51bb1b352bd7960a0a45555c5aeaf5df2475e56749cbf2172f3704
 DIST github.com%2Fbtcsuite%2Fgoleveldb%2F@v%2Fv0.0.0-20160330041536-7834afc9e8cd.mod 37 BLAKE2B ced8ff9a67a6fdc521b30ce66ea72f1fafa31d692ea99d2a723f3a571817ebfb7f61f86dd13e494e348504066d4d28f162e1ff73c4012230d3fddb3a0f4351a3 SHA512 e11603e97773889aa6eb953de16e6affce4530db9ab4f4ce5468277879785689779817e1737d302974b0be25b9331152be67a417f222b329ff6f4d52d2b6217e
+DIST github.com%2Fbtcsuite%2Fgoleveldb%2F@v%2Fv1.0.0.mod 290 BLAKE2B f6fbb262e108d6a76844ac802fe83a92bb58cebb5839d32dd8654576375ad7a410a258f89c67ec92de5f7426f23e0006f8b75a53fc4ef04cb602b7f3969f6fb5 SHA512 deeca04ca64d4dc6968021f16b9a8e760d18e4c8059a0012c8376815285fda6414ca2d20a9e5281aedde07c8577b2b9a85ecfb8d739b912b96f1dc5541ff1a4f
 DIST github.com%2Fbtcsuite%2Fsnappy-go%2F@v%2Fv0.0.0-20151229074030-0bdef8d06723.mod 37 BLAKE2B 64da3d86f39de934212b6a45e6d9a6c2d373651f41f102297926935b866fd8be1015a0ea57ea2b74a8f78fe2726fa58879017e1164802fc547548869bfe4ed7d SHA512 50d63b876c12da0423ae718f3db7ec1e829f6c651ed6cf530bf8b09a14435f3092b73650e56e0da631e23f53330146edd9f7765be1eca72802bac596e8a62437
+DIST github.com%2Fbtcsuite%2Fsnappy-go%2F@v%2Fv1.0.0.mod 37 BLAKE2B 64da3d86f39de934212b6a45e6d9a6c2d373651f41f102297926935b866fd8be1015a0ea57ea2b74a8f78fe2726fa58879017e1164802fc547548869bfe4ed7d SHA512 50d63b876c12da0423ae718f3db7ec1e829f6c651ed6cf530bf8b09a14435f3092b73650e56e0da631e23f53330146edd9f7765be1eca72802bac596e8a62437
 DIST github.com%2Fbtcsuite%2Fwebsocket%2F@v%2Fv0.0.0-20150119174127-31079b680792.mod 37 BLAKE2B 2abbda206e6e06f01e6cf7f41f604175d0fc0ea76fbcd691272ce5248d6c68ca83bbb1ab54e27d51a2cb988ec7582c2386118ce040dad32ec7816f4b039630d2 SHA512 fcc74c64b0213c552b7c65b5d4d4ba756320ce9a8b0fca1721ea475cfba07c5589ca01f20c1ed49975300a8ecea1367f3e614bf602611a526891f8105fce57d1
 DIST github.com%2Fbtcsuite%2Fwinsvc%2F@v%2Fv1.0.0.mod 34 BLAKE2B b28e5f8509b703acec802140a2faac942edde87f448d478dc7da699cf058157f2c0d1bf0db9234243203747687c743e28164cb1c6ab432575e988d34738edf4c SHA512 3c291f18f0e2f5fea861239ae9dec3c70e4a6ba904a0c09f36c835bdeeaa25a49b2c7f290c8d030e9e731cd86e27966b7e41d57628c7ac5cb42e4e9fb2e6ace7
 DIST github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod 35 BLAKE2B 87fd74b3a198f0c8a9897797611b73c9017378af758bc559464b3e91a6f57ecc39752ad6ea9d73ec0df128a794a3caa6384cf1092808275fe6a55731b6f0bf8b SHA512 082d6dfd13dc8bbe32bb5fc0c8c7e0e2d8fe412397df32f87639179374e57eed96f7eea00a3cda8c0c9a78b354f9275c0be3fcea4b6c797aa627dec71870a41a
+DIST github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod 122 BLAKE2B 47d561554f8fc26402a1aff96895741d9d50e201237346d2d147eff3e5977f356a3dbadee8c8b3c492bba7f6be33d48ad89dbd8a02e710dd96a4b29b1f3c1fd6 SHA512 1f9d455792a66a48351a4ca57810d37306ff60474da6e8e308f983fcaca4326f6f64bab9c677900e014271b52333d1588e287493c2fa853bc7fa40717556a670
 DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
 DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip 14190 BLAKE2B 068cbd85a43c03d801420e794a87bca8d06aac5650cbd8597eff929bb3634edf85f33342b9b111626f995a340f77c76f60aa436c25654f47b3ed5c87af847c17 SHA512 cba946a17b3237fc696dcf45a7d2ab8e08795aa9a6b6a2dc9bf032cc26b15933d5b2d799a30e6631dbf6b2913c8cbf4f1833c6eedfe45b954a6cc1b6703a1b4a
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
@@ -99,24 +123,31 @@ DIST github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.zip 22029 BLAKE2B f0f246882150473
 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%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod 32 BLAKE2B 5483978ddce5f57e08f1358c34e5ea6b26a234e017b2e3a9af91296de3c79756f73f8cd9629b7d04c88e2135f30781cd0f43fbf9eceacebf26f141bb297f376a SHA512 865b4cc3ac91138e9b4581be778685f89bb93cdaf2372bb7b5db6227e249a2be89d5d14c89bd0e874e01d744aafc08b30b3ccee18a472981bed0e7740d892da0
 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%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
+DIST github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod 40 BLAKE2B 58aa150182b5b43107154bd337eb024049bc2c7e2d26cf4344c97d554e03d4175862ecbd1b65527aecc85b9824c474c3e5a49eacaad18e253cec50785963b18c SHA512 8a0be9bb45924e5d384fa68dc2e990a4705b46e8878558d4db10fb794c8e20b13ec54831e7387cf425613f3f33b5952702deed074bee5818fed3fb9cff7b4259
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
 DIST github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod 33 BLAKE2B 1ce5b6fdaf9b07e47e53896873b9ee4e96fa51c66a7a5afb3f48f34bf1b28addc5a5faa14832c24232a048b5d2b5ec0fd9af57997f0360105479550670b7272e SHA512 4fddb273aae34ba148c277266e98d174e04f5e888a1f59d44a86f7ec80168fbee85f245cea2e2fca44b29cf83f7a417e43b885438d7e3231c89604bb9f0a30c6
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.1-0.20180108230905-e214231b295a.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip 13848 BLAKE2B dc2ec3bf79baaafad410ac2b4625dbc1c520803659b480c2014ffef484d409135ea5d09035669457162457962dc6b3532a480893f399b876810fbc1adfdab8e2 SHA512 918009558869443193fed748b3cc807dbfc540967d60e0315c74c6a09324d7d783067e0f21c5461ebadcdec3c7e6417522565a00e33617af8a8168281a0040c3
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.zip 109300 BLAKE2B d76af4585d0240852a075ec55fc5a2d139cfde0530fb306893f2d981b0c9d5675eb162fe14bbf51b67f266049795f9e002f4929ee51a5686a59826e0ab4de3c4 SHA512 8e27958a53533d7412defe10e7be2c479c8d147001f4cb0e615a130ac362d604d334e35b43bed92a10f33fe72fbf7609aea46b910f53c2b7f7f15fa1dd088fb3
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod 91 BLAKE2B fad30507d91fca15291c8f13100206c9d9eae4f73ca4034e37de10d1494b42b03535540ce704582cd7a4be4ffa2685f778ac9cd3aa647d6c48d8e6fe33a345cb SHA512 54e3700ced7222d086eac5a73a5973147473e9d063a7a8dd719bff2dbe3d61d9e4cd7427f30c926a2289ef53948f158bc09e189d9714f0437d446f7c30d0cc6e
-DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip 114418 BLAKE2B 43e288a393932b03a27d91cd456cbef42c2611751d40e8a8e6c14d2b80f65990711a5be7d75e1f62b1eaef3d9eb8c9bcf3f51eb14a2436ca1dcb15b3b3a2ef16 SHA512 9df60d53633425f32d5bf594dd579ce61bee549c2672da2f7da39437031a8b0d27b7d3448adc6f9b20b230f48c355242ce8b01b0c5be25612165c53c73e10735
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod 91 BLAKE2B fad30507d91fca15291c8f13100206c9d9eae4f73ca4034e37de10d1494b42b03535540ce704582cd7a4be4ffa2685f778ac9cd3aa647d6c48d8e6fe33a345cb SHA512 54e3700ced7222d086eac5a73a5973147473e9d063a7a8dd719bff2dbe3d61d9e4cd7427f30c926a2289ef53948f158bc09e189d9714f0437d446f7c30d0cc6e
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.zip 116823 BLAKE2B b33381de26ca23c0d218ecd16b22bcf13362635348a4c9887ab2c4ec803e0dc2996833eeab85b327b838a234198dcd555dc148a02b8b1282a1dab61e44e56c80 SHA512 4aeae5f35d7de56c2e693fae7eaf6f418745b9d9b8a7652bda4acd6c2979cc2cd175c4809386b7e762d9c243e1504baf82aa4e4dadd7bc6050d2227a61510b7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.mod 91 BLAKE2B 75d03e4a6fc970743c11a4a9d52dedc93f72b3dd3052c72cdd660af9df42b014f48ecd65961248e3b20f3e258d1ea36e058879a7039ea58441902ec5f339e382 SHA512 722430decd4f1022e8b035bcc7c1ed295db21a3c64f9dbdf409bd0442356664d378d4af37b7de828c02453014a5a9ddefb3397cbbbc8481c14179ecba9499a5a
+DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.zip 120665 BLAKE2B a4a827aa46ddaa2f2c5edebfd1a3073d9e7a2df73350e3911d13d0b0e6fdbeb350b43b21247dd352bbde10e4a70cc055c2c787d279742580a79036b3e85206a5 SHA512 ec784c6edd689968aa88bb5eb3efc096e9575b6472ddcbb01f0a57954ceae4461c6255242adfa9fd6976ec60ceed721ab2464c6d4132dd9c98ef3a588b6bd553
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
 DIST github.com%2Fcrackcomm%2Fgo-gitignore%2F@v%2Fv0.0.0-20170627025303-887ab5e44cc3.mod 41 BLAKE2B 0569fb10d29c08fafa75095bf945bb059d1a87bb775664f748630cab8222275c1849024bd7555f7cdf9641da4c568cda6cd2ac5b12eb0274ba9f7d6c3106d6bc SHA512 9cfc41a0e8999351961d559cb39a9bc7fddeebf12507eeffb4e25a3d4913bb669120655440e33153254b5e22f6126921fdae097a8cddfab90ad9a9a28f2267ac
 DIST github.com%2Fcrackcomm%2Fgo-gitignore%2F@v%2Fv0.0.0-20170627025303-887ab5e44cc3.zip 9390 BLAKE2B 06e7bde44f0617d805668ad2bef610e12a6e7aedc46d726c6bce592ac009f1bf8cc4d82662cddb3cbff49449dc9a72ce008fc735d082690da194bf7e602edb78 SHA512 b6b7dafdf36ae744559777624aaa9f6a82c08718793e75d4d5a2596626fc8323244f1287bda2fefa08bf33e95677be3b0480d2addb766ff37efc95ab4279120c
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
 DIST github.com%2Fcskr%2Fpubsub%2F@v%2Fv1.0.2.mod 39 BLAKE2B ad751b3cc7739079f549f61216a0ed6c3ff60726f9e45854baf44eaeed0fcbb85dd4407f81907e6c4d67c9f32c811b9fca22537e4a5da5cdd89cd256ccc2e21a SHA512 c1b70111b85332905b8f0171d585fdcd269f3ea3f21235a1cf489f8986e24f9ccf2578f9752648a3c56b4e7c28ed056bf5946a0acde9e4d64f7ccc2205a2437e
 DIST github.com%2Fcskr%2Fpubsub%2F@v%2Fv1.0.2.zip 5270 BLAKE2B 69648bdf201bfe932646e7698101ae06537c9304bccfad9066149045e2842dde3b3c65a8fa2016df3eb0edda90455b3ada4354d45033e2f1ef49debae2238da3 SHA512 78034ae7b2c33884adcb317c59c765e4762ea1597873c73b54d68cb6e42930caddf03b42c971c986474d7f4c584aee1e48301a6331af983dafe1c55f2f80e592
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20171005155431-ecdeabc65495.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
@@ -125,44 +156,54 @@ DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
 DIST github.com%2Fdavidlazar%2Fgo-crypto%2F@v%2Fv0.0.0-20170701192655-dcfb0a7ac018.mod 39 BLAKE2B a5a917c97c8f04bcad823128c4c8d346a5c3b0c8d097b5adc051fc070a1e0e57e2f12937d044f5edadf95214a51624e82d5e08582afcef9d84b9277e97613422 SHA512 81d43869697d892072def7425ae71caf36d62746a1360974324bc1fc54a04cc5cc999f04047c4b734d618d469fc1c025976db9777f7d527c5cf107d7cd25d72c
 DIST github.com%2Fdavidlazar%2Fgo-crypto%2F@v%2Fv0.0.0-20170701192655-dcfb0a7ac018.zip 120931 BLAKE2B f99f79ad8718f7038f286f690bc539e9f90fc5fb133a928916e5ef680ef4e8e6a6e751dbeec3d8aac6bcbb6261b523ba9e27c48d0df480ba999065526ae81684 SHA512 369c5ae94a2065de77b833e1865e814d70393704189ed59ab02401a3b9d51a952c73d73f35025e2d60b0b7a2bef64e38189a90183d48b899549bff70e67f95e8
+DIST github.com%2Fdavidlazar%2Fgo-crypto%2F@v%2Fv0.0.0-20200604182044-b73af7476f6c.mod 182 BLAKE2B 028440584bbb0eb4b690d16a86af9f16bb3d639bd8e2415de6d26a81964c5fb838f702b752c191e4fdc8b9fca57a0cf71e2cbb1b1faf41ea49275302c5272ac3 SHA512 f1e372847132b2ccbb472057ef4b3f4996a420506b3e1ff30804694b4f234eb63b4931a5c310c7819f70a15e3e1f48b20aa26683f7ccff3adde07fd9803c91ef
+DIST github.com%2Fdavidlazar%2Fgo-crypto%2F@v%2Fv0.0.0-20200604182044-b73af7476f6c.zip 122029 BLAKE2B daf9718153372d41a98775825eb7953a3cffb16dce45ef21ae858f8de0cd5770808835e71a65ab8f67dd8b2cbaf677eed1ae5d6aa49e9fb3fb61abde9f878013 SHA512 2100f9a60c0919d12fc4b776bc33b3b6f2c9d99da22556b4ebacfddf49021ab96f9160f7cda532f81467c44a8991f76d54094ee0fb836fcbc5b9d6a28484caac
+DIST github.com%2Fdecred%2Fdcrd%2Flru%2F@v%2Fv1.0.0.mod 43 BLAKE2B 543bf18d5f844206bc7ac5296c2e3c16e02c0e0d0b0345d409e77c033de45ad184bd81781c22e1a1c6061ed46176893f0429bcb52498b55b361630a12f856116 SHA512 319156e912dff191063a87d2b75647eb012f0bd1d2e1d1b46825178e8b28c34eb9c739fa6cecfd458d17c846599d095c82b8be38ae1cd6cab9beffd0a211d0ed
 DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.5.5-0.20190226225317-8115aed38f8f.mod 35 BLAKE2B cb878d5c7457af4aaeffc81f34740798fe5bfb413f15efbe80c0af5108add18a9623f44f24b6ec47d4f15cde98452efb71701c71dd9914dbe48c8e8ec84a4c05 SHA512 14987165f56487477f7622d40ee2ec121d6a693bc7f13525e802819959207f347e1d7e1ede45ec6afc097861bad0f702206b649d29e5603c77d2718d701d997c
 DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0-rc1.mod 464 BLAKE2B 9792b2a4b32abb5a24e6f1b72b23c5cea641c403c04f376bc33c6e8323fad08380a9902570a6d26e6643c2011adc86b83db849f5cca1b0e46bda10fbf85280ee SHA512 4935cefbad5769054ca778dfca985e715354a193c35aa44895cbffaf1c485185d2066583358ecc9a7087033b8a8ae1a89630f8af2d920e7e8d9292d1ef343e18
-DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0-rc1.zip 341989 BLAKE2B b745bc54ff1b0592381c8175222d89f4bdb3e663af5ad6e5e3706a8e3762bbf18c973061172139390f3179cbe0f76b212df866aef9545f7419abae15771f54aa SHA512 9ae7cb795a52f1c2e7c4ef31cabe4f2a6b250b69326bfd246b553718bec100a8ce481c4fd1355d39bc2a8c724a56f3240ed4b9cfd9740a908eca490d01548215
 DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0.mod 464 BLAKE2B 9792b2a4b32abb5a24e6f1b72b23c5cea641c403c04f376bc33c6e8323fad08380a9902570a6d26e6643c2011adc86b83db849f5cca1b0e46bda10fbf85280ee SHA512 4935cefbad5769054ca778dfca985e715354a193c35aa44895cbffaf1c485185d2066583358ecc9a7087033b8a8ae1a89630f8af2d920e7e8d9292d1ef343e18
-DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0.zip 342714 BLAKE2B f0a7ed3e69df77490f529280fd9cbbd5f9e251feaecf73dfdab4afaf48e13a5afebccaa9b7eb5b362cb4029ebdd741456c8a94819584e5e3716b9f9f96f32e31 SHA512 dd2617288f2143045240f18c7754d2495538f1ca179537ca884d1fdea0f8e87c201b5b6315713da732b4ad62d74fb2c5fec85670a7751a73bc0aaa4717ba84b0
 DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.1.mod 596 BLAKE2B d855a89f47153fa7e0c2a8fb1b541cd98fe331d359064cbb02c89943ea6748c28e5c7b928f1c717d757e633385325d82f9183711de3f56d50ab2e8447232e043 SHA512 79159ae8b566227892fe8d01d84c245c066f61192fbf5164084aeb085ae37df0e271a73cb5b00c815580af04dc50cbf050292b5907d602f26a22eb36d1023e1b
-DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.1.zip 366135 BLAKE2B a75298ebcc118ec2a7ffe6157b74fa3eb3009e584343d29e0ee208bb28d596e6cb955b8c1a9fc26081653155907488f878c0007da7d527243ee6b2fb933c7798 SHA512 7cbad8e1b638c05d89d1347f4c6f6a973271b82392cdbcf4bc472fef6051a167a244bbf459f7f883420a1f8380d956522b79b3eefd59bb9c04eccbeadd629f0b
 DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.2.mod 596 BLAKE2B 447bedcf6165c3790175285c175e34f02e916b638605283f41ed5e906846f2310709617686afd6f2b644083d2d8c2301e4e1a5e6bdab3dbb8e690c4295e0c747 SHA512 5a02bc3a8aa33e8e865ca4447288e076684dc41d2d6f896863ba25d02632f419b41a44116380f4af631d58617d11c9366b9b86708f7d75b925b520743cea501b
 DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.2.zip 373756 BLAKE2B c34e6c3eee969b24bf250655535d2b00110afeaef372013aae1b7e612c112ee433752da9595d7da46c2c246efe725da0168c3754b919c1bc5c0abb9e87fe1d49 SHA512 31521c6ecc8bddf9e854c80cc8f1fc0f7d71fae13e1bad1aeefb9df65824ecbd719f0ed363aedc0ba2114ef0b81404a824461d03c5a1729529abc72b3d9b0e19
 DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2.mod 193 BLAKE2B 0938da2ee0a3bc0acc3416db8387be68292b8848b72cf3b44c28e11d6d456037f7ed998fe08fd142f42ccb447bd0f0a7cb75ff72e72d73a5649a85f7def42070 SHA512 7752f28d6ae3da6cd4f2b5d23ff373a4bd8b8b24879d9bde17bd22b1689aa5b87ccd1c206f4f70aaf5acfd89f4e1f11a04ed822266a576abc0a1f979cdce2911
 DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2.zip 55151 BLAKE2B 2d90fa0671336bcbeccf4570ddc400b9203a4b9e9739001700514970dfbe0f9d4870b1ec08ae1ec9c05f87d9c25c8eee602eb1c324165d03f0a2bac2d521ce8f SHA512 c2ec421a924993de0b49237494e6773e5f158b0e7249e4a32cb2007fd48de66a0b465f6731b192f2ac7391d939389c48ab837992fb97b51eb25fe9c23b3bbb82
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190104051053-3adb47b1fb0f.mod 34 BLAKE2B 7db9f433942253e04513e9a7e88b2a76cecb28837e808c9fd2fa444f19bb75f1567358ccdb5537dc6caf0aebffa08898127dc93f8f464c838da838f7ed70615d SHA512 ee0f8fff193e70c23c830494ebc2bbd182c1882ba443baeb4a8ce03166f399765ab8e4ac85047306b27c03e84fd0980f93b5b5e29f94129569ec8021e8d127fa
 DIST github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod 34 BLAKE2B 7db9f433942253e04513e9a7e88b2a76cecb28837e808c9fd2fa444f19bb75f1567358ccdb5537dc6caf0aebffa08898127dc93f8f464c838da838f7ed70615d SHA512 ee0f8fff193e70c23c830494ebc2bbd182c1882ba443baeb4a8ce03166f399765ab8e4ac85047306b27c03e84fd0980f93b5b5e29f94129569ec8021e8d127fa
 DIST github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip 31667 BLAKE2B 7114afb863d419c80d539e287e76ee6471163aa5fee433de95276174d1c1e9030097543afe97a6131356979bc88a14108679a98bca3cb8b38e833468e80d321d SHA512 f04577670a6649bfe5d40fb743df38fdb9499b3f584e38197eed2d958d4f3e77635e82c057aa643ab3268bb99e7478aaeccfc687be36b9723ccfea3551b45366
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb778605fc05dc686b59a3ad82a6df9020017243cc84498e4113c7b18343507a0084cd67febc329fa6b44e675696f99f632cd282ead5bb06f93ff3bd50bea SHA512 88e19d0139de7de602272e14586a99eda26b2867ea60ef56b517d13b37c0d28b1ab62c05b2f9cf1a9b8dcc8e5afa9c915baf7a30b0f17c4fbd47d5c71d0a3965
+DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
+DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
+DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0
+DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod 33 BLAKE2B 52211e27792f060734989af8b47b48f3f9edbdc94b49917d715bd8853a3f05ac714cfbf752d3171b4c223a8787497df16e1ee46b07203a6d2c4cae3540c66af1 SHA512 ddf8e796d04c0741342eae18ad343861ad7a76d030a5dd9a27b1a68b2944a0f94ec21b1513640179c73c16d79ac309b8552dae42d6e45bc0f03d33269666bbf6
 DIST github.com%2Felgris%2Fjsondiff%2F@v%2Fv0.0.0-20160530203242-765b5c24c302.mod 34 BLAKE2B dfc5ee3519612e45f0ef55948ce7f8b95ee0470c5a6538e691cb43f22d4b5ced3818fbfe9c5f4a0980c47d6388658a64984ceeea40291e4e6e06283f78947861 SHA512 310d02a673e9673e859bd24420ba308c7fa8833d969edadda91e3541119880c9a0e889fcff1e81c7c49a6acacdc11840d1f903db04d9e40321e94ae55365180a
 DIST github.com%2Felgris%2Fjsondiff%2F@v%2Fv0.0.0-20160530203242-765b5c24c302.zip 5742 BLAKE2B 49e40929dc4c0aca5d7dfd011be0ca1b011ec90cad123b80c86058ff4c2f4938c67eda2f72775973cbca14a0542f5bd3b8bef789a73d17bb2760391db06c454d SHA512 d5487e8756fc7a9de0b6cfa75e40f24c5b43339b528c2e65c51e9edb77c486673bfc6153af28a375bcf3809f1249c6c3375a22e2b4bf77f574433843c04287b9
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod 46 BLAKE2B 26844d83faf5b29bc13a3a48ccf6a3648324503647617e8ff13baeabe4d95ebc0e4f2ca5014b553148964625323dc1a11bbc0a4fb5357be97770a3b6cf808bc5 SHA512 5ec3e01429b0c86caa7ee04de7fd70505cacce1ed540081ce4c40143c8776cbb75443dbaa47642da02e263c02c7e3557d6425c3cb60f03a5bc296a1cc3b6541d
 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%2Ffacebookgo%2Fatomicfile%2F@v%2Fv0.0.0-20151019160806-2de1f203e7d5.mod 40 BLAKE2B 788854a486508afd2c3aaf4f3c87ddf59359b08769b3b84af73cccf8594ac643be95e7d5f84479a3d35beafad3595cfdb823ab7cdad38c81aff4a3aabb7f72a1 SHA512 f76655024fc95f46ba7516ff3afbcbc86db428c8d8c907d7396b427f6e0e184c894b24a171cfa41305d959b078027d83ae4bc33e439044bce9495a56599acf32
 DIST github.com%2Ffacebookgo%2Fatomicfile%2F@v%2Fv0.0.0-20151019160806-2de1f203e7d5.zip 4876 BLAKE2B a615d072731fa24de06353b213c34eab8c23b06fbc0191aa548443c86bd786513272ce909d61bfe027ca30ec7a295d77fb8d4cd345aefe7b352d29377336d291 SHA512 59f9ac4d06ece654e43bb94a08db6133cc8d3970433235f0082ee86607c476a3e0b1be822912c808df9983c94da1951909b6f6482328f0cacb31272fb2de36aa
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
 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%2Ffd%2Fgo-nat%2F@v%2Fv1.0.0.mod 252 BLAKE2B 194114a263aeec4af30e802ab12458933e3d4c2641ab9d9d49110ffcde6557fb229883840c9d133a988d2e0338eff85ce5212cafd2a9a1d46f6c77018f8261dc SHA512 dc86e98b1585fad3251406a63b40a42f65ac19ab566bed099d5db1d4f7797b41d862adec9eb156730a224be248810f12d1fb67aeead96059260703744c2941b6
 DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod 33 BLAKE2B 2c279a40bce4e61e5aad9d25a1c374b6c154586c296cfdfd56f52435c7739c8d9a8958e19d6da8026c2a03b728e0cb9bb512d5c094aa6111f9b10af24ab894ee SHA512 2bb0f125a91c8f92dc1cb5ec16441b27027585606a3862c216434b76324f3069941055c4bdc98372547543b095a4014155446de1be98264842504450121c941c
 DIST github.com%2Fflynn%2Fnoise%2F@v%2Fv0.0.0-20180327030543-2492fe189ae6.mod 30 BLAKE2B 2bb0a02cdeb2dba2efaec54c74b56d539f522416489c4e8d3348ac741e9c095965e1b265adcd2f50b890392611d48954ca4350d594dcc9678d7de50c4dc14169 SHA512 caa6f356856e2bba799701a0ff8642a1eb9755d672a03f9dc300281b69ccb4bb64f465892d20ca98e9264c29c84166c233ffffad5d681939bf44254c20af40ae
 DIST github.com%2Fflynn%2Fnoise%2F@v%2Fv0.0.0-20180327030543-2492fe189ae6.zip 200520 BLAKE2B 2537341833b898c0319f10cf0576be41e23333764652914b51dece4ce5f5116034c83dfa61586f95ea130b0a1980c2a564e11934e1cb9ffa1a298270a5dca474 SHA512 8ab0a3089a72d42705d4ab61340b60a6a1a9b547ba4b63085eb85adb7d5b18ea600309044d306a4a541a04baf378cf0d759778d72614c96a4d0079643de55b50
+DIST github.com%2Fflynn%2Fnoise%2F@v%2Fv1.0.0.mod 162 BLAKE2B 824644cba181be8a50cb72bf4654addc1ed4b2799142413d575dc40aa3fc3a51aab6800a0b25b522d0726b5ce974b9a4fcc0e8da09d80f258d75c40b06685db3 SHA512 38a670cd6a95b2f777a8fdcf2d1f5b786dc872c825a1e02b03f5592c4c351d9e70c437ebca1c2bd35055ca64485aed38148cb7632f70a0575d2625f0eb27e3c4
+DIST github.com%2Fflynn%2Fnoise%2F@v%2Fv1.0.0.zip 201815 BLAKE2B 34c8c9cca23f9c4bff9494f2168bc9d32afc8e73ff2b3efdec0ad10da3866469ef06b8d0cba8c4fb269dc8cb349a80386603f4d66c6eb5271643e9533e279ac7 SHA512 177239687d45e20f738ada3291595b2233ef00c4eb415261acf775976e24330088a68f78d513f80d5d8fbe23e89293ea5283e7ae2c1cc12a8645a60b31c3f3a6
 DIST github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod 962 BLAKE2B 4e010a5ff246d4e834d72b522e958d6f8063778261deb3abb11a5781a5d79c90e9697d43388158b4d80f811111eee0e86767d51ec58570d02ad4d7c8c9a31ba7 SHA512 c2b2b6ef8de68569c73aa8ce8c778dedd764f8204c8bc8a78b335d0138c49851af585da65e0ab9b2e561500f1eb0521a6f77d92794e38fcc22e6dec12113c959
 DIST github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.zip 231306 BLAKE2B 8db056d6fc6796e16bfc456d00ec08eeb0884fb7cf6e234193862453406a300e5bbfc23f0910bace51fc66e5c3801a14078aa8846dbf6b03a64c79414e350892 SHA512 822d1395436aee93d26cf53cdf65163247e8620b4f1bd3151270b9a9e2066012e9397158a10f433c0d0512dd8c4b6d53ec76b5e5d3f169be3e5970e3912dcccf
+DIST github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod 33 BLAKE2B 69d161a91f7a47f08054ac8715154885a3615d8366b32d226a08f3bc975f6c87d168006620ab53fff5ca938232f06ac9eccb1b7c0621c91f9d7368b38cf29bf4 SHA512 9376e6913b3d764bcf0de41f4d6cffec4da5a8d387488cf531113e1597371b838fc398020bc85fdbb0583fcd9fbc2fbcb23b246c3d8147a6c606bee3f0974882
+DIST github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod 32 BLAKE2B a4dc1d6fd70150916e3bab8b310fe7ba5c26aacb90241b18ddb51f2608ebcf4e82f29495e663181f5a7b1f0f09e0659607eae17850dd0bd3ea8dbdc0f4fa6ad1 SHA512 1e3cd7f2ca465a9930734e27984262e81d563551917c8af55c521f15cfbf56a423ef918fbd282b4947c81a65ffa1c17294d4cc83aae639d9432dd3a52fbe8e83
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod 121 BLAKE2B d9ab9021ab813b7b6985b19ffec32d7154e43a1a6def62015215f80f0be7f981786f112974b796bd69afd571015ee46bb8b7790bb52dd28da6b830563f1a6034 SHA512 50beb03164eb70760fe996a22127ba01c922fe6c817cbc6089c711cc19f6dc7e25ece6d1c9cd767a3b8b42b1cba84443690b01513a6740df6f8827e94bd1fc79
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.zip 49908 BLAKE2B 67bdf78212983dfc91c56ec978151d0d359e4c2f84ac7d68725ea1bf2404604011f63c73a293accd0d9e679996437a3678f5eb9dc0284b445a97c2cb70ca3638 SHA512 10f3c3075858f8c2096164ee49473611e9df69fe7df7ecc4b515c327f4f590a692b828553ada806054c896475257af706d903e5a964f8f2ce0f7706a6ba499b8
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
-DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod 106 BLAKE2B 4876f70d70d2d8703d7b6abea5457e093043912d6a672bf7794a892d1c17b159ed2b92dee05ba1625a1b7cd6c8d66d6dc715bfc1d7c0f1c47965ae8e30506bb2 SHA512 ea3a26ed1f6df26a7e2aa64ea9d5d4a4c3005163cd8adc05028cf25d56d01d115bcda38b7af992242013c2610f26a184ce43dd1826309c95fa008fa9c8c387d9
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip 42349 BLAKE2B f2c476034a47330b5424159be4a323bded799ca489163c8d485e95f17ce519d6c4d771a35eaed83e831acbe20c1d9ec5b782469ce20aa224ab03de459228fe59 SHA512 8df5f490e26760bcfbfee216b5479321d060d4e48911c98e4d3375a6f84bd161b5d80769fb0326b3122534ff726e8a987bdce365464cdd042ab4cb5366d674aa
-DIST github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.1.mod 51 BLAKE2B ebde0d586e331eb1d432c0284491524133797836ae3a12cc9eab25b46ffe1fd5ec1d4d46c8474cabbef0edd041f684486c7183a2fe74cb2385564218173a17f0 SHA512 e25792acacf4e07e445247eeed246a24b34e1199b57ff6974ac5a0b76c254dde9b6917ce68d8bc067cbf705ac515fac6a67ea73df48d058d87f9fee50b6365dc
-DIST github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.1.zip 24429858 BLAKE2B 5184903acd02a9f2ded09a4185156cbee3a9b0382dee88f44c1e56897497823d41b05574019427c74d29a7ef5b39f706dee7f451e7bfebc41f15dade18d32a91 SHA512 2dcd698e6afa955f280c0e09eec5a60ea3b1cab91babd58d86d23cf513ef476377c7a124dc7f56eb65f937394d170b888bcf68d366d8e1d7c2b6bb3dde49572e
 DIST github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.2.mod 51 BLAKE2B ebde0d586e331eb1d432c0284491524133797836ae3a12cc9eab25b46ffe1fd5ec1d4d46c8474cabbef0edd041f684486c7183a2fe74cb2385564218173a17f0 SHA512 e25792acacf4e07e445247eeed246a24b34e1199b57ff6974ac5a0b76c254dde9b6917ce68d8bc067cbf705ac515fac6a67ea73df48d058d87f9fee50b6365dc
 DIST github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.1.2.zip 24442450 BLAKE2B ca01b8b0c7f7a07ffc8657b51b7b4353c3985f16a244c3b468d28611014e4e64d16f493da9fbd1af671c571e425fee9ecfefa07c27e71a33680bda3dc881a4d4 SHA512 c044cfe59e23399c87fb9c5c6a637cc9f8be706180364e8b88108bc452900611460d19fc8d2c53ccdf8a6c708e8c38ebd20e61aa99c20416fcecd197996171de
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
@@ -170,27 +211,32 @@ DIST github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod 33 BLAKE2B 18725478b6c6a565
 DIST github.com%2Fgo-bindata%2Fgo-bindata%2Fv3%2F@v%2Fv3.1.3.mod 155 BLAKE2B 12f1f3881e9759533364a5140d065784b0c9e8fae5d61191f73c985bd08c5a7018556e7052c10713308b36398193bb13583c9fd3523a63517223e7cba39ab2e2 SHA512 a635cb6eb0b8d690c45dd8892f0474bbe5d255c801bd242a2282751ab6474135a1e6395161ce6faa057bd4eb168d0d85208908fc5a723cab1f10ab92f413887e
 DIST github.com%2Fgo-bindata%2Fgo-bindata%2Fv3%2F@v%2Fv3.1.3.zip 46496 BLAKE2B 86407eec8ce6ddabc1f6c707a1b04e7ca273a8d7e0481f13e3dfd2c77d5e45eb03b03278200320e629314ba02a845c56ec687831b860471ddbe285b85a170f57 SHA512 7787e3950c291b4c3689021d4cd81ae4abbcef14cb1fe458a89a7cbf2336c28d9ca7a360a96d4ab0120394a30c93a5a7ed97017bce228b7225f1a0546669629c
 DIST github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20180628173108-788fd7840127.mod 33 BLAKE2B f3047b593a38c87128a1304a48b8bdcaf8d5c06d275460f5e0908eb499259b2228754404015935d871f529697b1153c3a86a151cab4fa7aded7d109b4c40f48c SHA512 ea09ddecc4d78f7e9e0407c02de1e3754c68f5efcefa2ea075086f26c203c6cb9551a4d4fd0241b86b14000dd9501bac8e3d9857a98b56445c371a882caeaf28
-DIST github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20180628173108-788fd7840127.zip 41849 BLAKE2B 58f58f1cc24a3c545cbacd610f7fa94a276940deec4650b32f57834eda8a0c437cc9fe2087b9a50ba68c1963c1445bbf49afd6c30c963fadabbf13a1a35bd00f SHA512 4628f7fc8594cecbb851fb60338645ee5bed40385ff768366368210be886e848911623d806fa68484d5041358aa7e7042cf5069da3e58aaf775e438f4af4d29d
 DIST github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod 35 BLAKE2B 088adc516e2f6f0a693c745963d6daaee2c196b1407e36a469eec392b232ed26b03f9c515d422b8e536c2b2ac8bf199cb3db5ba4ad19ab71fc338919f57a3a53 SHA512 787962ce037cb9143f496d5a7dd11ab1a487180cb57ad498e6c24a8da7a5bf36737b0b2730d2e0837c60a08bc7467ffba744026ce6962885fecdcdd1bb6c07b7
 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-kit%2Fkit%2F@v%2Fv0.10.0.mod 2670 BLAKE2B 211a6d7642da991f148a7998fd35875f316a143c62337214ff428b4eecc7dee7db044e42f337edf531edc70b9aa99f46e349821864a63d384c7d050e414a608a SHA512 fdfed8273d2014838eaed6d4d2b0d92ae905fd796a0fec6c5a0eb27d15ec31c72e1e79973d909a1ac01df1a2e5afac99bf17d5cc7d08f507474c8e8e7ea88ef8
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod 44 BLAKE2B 0122d72cea88331beb9500849a0936a966e7a48abdd2e76363151bbb124e35481e7248fd896523eba3c51c5f4575dbc13304c2471477757c1eb2f8fb2eee9cc1 SHA512 bfebb8d865586729abcb0dcf4c19a8938f06f9b502c78bed92d01c18d1d037f7df44cc1a1fbd4ca094b1835b8aefbd48fb5988e2884656ca44be0aa83206aadd
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.mod 142 BLAKE2B 54253a74012ab95ea6c91a438b815a4350aeaf4bf2ca1792cefe7c240e563a261567eda5338f05e4fec09e6342229ff00f09098919d1bd00e1cc73ba05d84a59 SHA512 a40438b84b2cbe6be587841e249d934f84f3a05335859ae5406f206e69b972095b51629c55a492114c4fb24c0f7b70ceb7650d97af73fe820b4f781e0411df4f
+DIST github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.zip 60633 BLAKE2B e76daed615c3d3860ac3f9be08600ff24eac095d32978d0fac5e4e2b70a64b7ddb1ffcf194c06321643fb473af6f1cf3fb68b6d4260bf391fa5152b12ced3439 SHA512 24c04030cfcd65739754d258ced5e15509ad049fd8d73d3895559bc96871b7500c436279ba8e59e0b41ade83f5a9a167059df6cccfa21abc59d41b60c44ec286
 DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod 42 BLAKE2B 79541bfacd3378a6c6dbe9591309a80390444f2dc2419fb0137c723c6a2ec1e0588c00704ce3c19dc93297b19db89f79bfa09daa2632f6674e35e76819473cb0 SHA512 b9aad4f1c1d4f2c43b293b0c9ca8a600a37ca407ba8b22b0f826c8355828cb7860a96a85df84f720fe8aa2840974807ea7ea7b790790c6dafed794e761f1f26b
+DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod 42 BLAKE2B 79541bfacd3378a6c6dbe9591309a80390444f2dc2419fb0137c723c6a2ec1e0588c00704ce3c19dc93297b19db89f79bfa09daa2632f6674e35e76819473cb0 SHA512 b9aad4f1c1d4f2c43b293b0c9ca8a600a37ca407ba8b22b0f826c8355828cb7860a96a85df84f720fe8aa2840974807ea7ea7b790790c6dafed794e761f1f26b
+DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod 34 BLAKE2B 92cad2efe22c009b9447a03343841c211ee06e0a78939c6ecf3e367dbd50c725562f6c09705f8fdf8131a9264a814d6822d3724a15682f446ed869b97febe388 SHA512 38d3341ba73f1537bc4df9c5a3938d1e0effb065122b4b1ebb3277a33c3e70674b28a32ffe8a79ee8b6a353233c6ead616b7749244a3af10306bcaac678aca8a
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.zip 2678507 BLAKE2B 016de242c488728027e7867b9e6bdb79547c315035769b9daf9f35200602e2eaa9c7f86ed37da6524cc4913e8a0ccd8306f9439f5d139ec00eefcc6c72da3eed SHA512 0dc9193de5a4dc03e31a128d3eaff02072f6a8cea64101adca52fc66be93374aec522b511032dc19514aa200ce5672641304fcb812b26b26a18326868a527358
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip 2698974 BLAKE2B 5fcb1c66d3fa55efca631fe5def383ec089fab784cad7d6a031ea390463a0c552f5fc4698f7648d271f40fb0ae3eee525f149347bb409c951d15d86b7f560e16 SHA512 c7e2170eda176da203ca64e402c11489c1fd183afd3359742e373927ff228d62e445f5dfc001a471303e1708862998c125ad4c2db86919596297b11cae4aee9e
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod 215 BLAKE2B 0077e3bcaad8a354f484c15844594107eb1a56d551e7ec55cd75e4594e50af02fe3850d9d212b0bc425da71c20bfd7dd470aa37be046b4eb88c28cb6bb63bb53 SHA512 8f928dfbe495a84c91744bf72527c5662422e608125f8b58908803289a39abfec1823d4628a52b987ab5150103ca588509ae0074fb08799d075e7ffc4157dc33
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip 2700673 BLAKE2B 84605b73500cebee7cae122f45003110ec3a50074d0649b9e7e1e25915b1c5e789017c628e8305523edb28d8f93733b9032f5b20a186b4cba4a38f90c0add6b6 SHA512 5d27fdbda403bc5ca722280af1fc331e48e45dc97d6e0b9f99f0d48d2d173292ae88904236f43851173528d0523fca86dc15a633dae218bbe05bc0fc22e1d477
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 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-20190702054246-869f871628b6.zip 39652 BLAKE2B c4c9dd2930eb417b8c6bf129489c3f067b5d127ed0194808d8e7594b477fd13ef20154508126708fc69cf855ee298cd4e9031bc34d3ab8025d2b2fc67ea21f78 SHA512 e23a4491896904321a371bb972437a0b55df33fe7fc31170967d6b4c0ccf917e34f94753112d4623518875ccb4e4da2e58cad54e0a821dc4e07528021a814b3e
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191027212112-611e8accdfc9.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
@@ -198,131 +244,154 @@ DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.
 DIST github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod 30 BLAKE2B 342057d82bd6cfc545f94289ce6dda498b35f949a3e5f9ad978910e5fcde556edd6e7a3847d136c5ef40115d99d9718e0c2bd2f420ed4ba72a4cbfda31db4c6e SHA512 fdf76199e91b2db4f75d0f8ce5844df0c4d0ea77319bec31ea1cc12f67121ebdee9f236eac8f6410313e84e3d4d625b92105802b8f1bf25de49c870aa6574d49
 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.2.0.zip 77887 BLAKE2B b83e776eee00d6209b0470b2a68588faf8d0a73f3624ab036b6182ef413326933bc9265a2435984a08c7c1ca95731cd8a81c215c322f720f3a9e5affe7dbf689 SHA512 772dfb4b62d9091afa15ef6e0e12f23844db25846aeb113eb513da1b0bbaf51d11afc327940d8f5520be2d239da0c7cbc02844f3e26ede26d70ac3428bcecd85
 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.0.zip 95677 BLAKE2B fb807ef51512d0f1099b43e9cccf9a64ebe19eabcade8403ca6c033631790328922bb32360a48a7d0a3529e169e71dc8ad4519ec3bb87aeb678ccc0d2d48e87a SHA512 68bf6763cde94ad213a27d17ea5abc474905643274f9cf5ca46083f86f96410958504dc84224e4cbb307b223f70a0b6732373745074231ec6a0c95e944c2501a
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod 102 BLAKE2B fc65ca5527061bb3ae4b156ab646ab37acec93f14ef00beb21d4ea93100e13a7f25e7d7bd3860b603ba18923075ccb2e106376f6f55ff261cdaa37ae325c554c SHA512 4e386a43067044e410312e3d6015ae59d6e77506b0db35d08fe7e6cda7b3908a5bcf6fa7432fbc5391252dd4dcb346bf359727680250af1311d5c839a4cbf4d7
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip 95367 BLAKE2B a94e0a99550bbf412c113e9721d41b4ebd81f0ee0ee1cbad9240abfbdfc91205a32a4d26676ba2b77e3b74fc86a739b5f5910aa0663a820757e541e6c889c0a7 SHA512 0097c67ed2453ee0ecf7571f15f229ce49ff98a9f7a9df8f7bb374fc693c784b6a74453c57509bb3e006833d341da7cdb9887ef3ad7e55a4ae8681e73b783931
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.mod 104 BLAKE2B dd86cc7833414ad225f1dd2a51af2e5a1dd9511bebc712dce749d1452c52d2806a7de626eaf0a2c8e2f8a1796d1d394ebddfedac37f40159d37343c5a2709b2a SHA512 c1cbaa009d32793f323862b87efcd1e32324616df8df19abc7103633a215962df0f9038d1b52f7a715cdecd2da3b48a98e30618dc58532a1654934158ed160b6
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.zip 124156 BLAKE2B c1f55bccfb7f2cd10dc421b6d7246e2ceb0d6de6d5cffc8e5c13ef2368824839d449440b9b8729821b720170e17364b5e9080b8f81513a9045bacfbfb16655a7 SHA512 7fca057ab9ea3208388ab23d8102498fdb7eab796e8a20ef84a996e2074185c92f3b4c0d3558e4c63dccdcfbd3169d5a785025e848dfb50ffe76bdde21e459ad
 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.0.mod 229 BLAKE2B 06324a68b7cc3b2741d14958d1cf1f99d36f066f325d54eeb46b60f18536e0a3dd1d50849f5c45a28f7e555ef1927339dc5b6992f6339115e8afa5e21faae063 SHA512 32c223b7df4e7f40b55bcf3ffb031bf370166a636ef2de985e12bbdca16589caa4bb440c934e3e228b08cd72f7fd6005a6813419c27646b8d855c21cc46bf1fd
 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.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
 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.0.zip 205991 BLAKE2B 75d746f36cc90088b863fa6c00c6ea30f071c5704593de0fe37b810c530170f6062c35460717a52170f7caa7e6c015ce2357384147fe4a12a9d695add2915394 SHA512 4542c6a57361c255ab89d2330c1af61cd706edf82c02bc48854e6f4407911a1657151ecc286b774e25be93bef29d63d2f031a99e24ecdb212030bcb1dbf7b17d
 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.2.zip 206762 BLAKE2B 13c74350dfc3bf39540c37f6b7771f18930d6bfd6a5c83c27c723065da6458e0de544a6fa4d57c027e6c67eb528493c620228a56249b889f00d67a064218dbb0 SHA512 3d92469995664037149e3e11363db685b3175fff01f4ef3b578ada273853a16131b3c97899b497ab75ffbeb6191fe59a28f073779828f719681b8e15182b6211
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod 129 BLAKE2B 15d140a0b2b22d6c9886ee9e517f923fda26ee8179755702a8eebf1ae8cf75be48e8d28a1df1bf875a7bfd499075d83a541c9716601856abe0e7c850a3ec68fd SHA512 467a3f6fb4c941cd55d8d4b2d6a2015966c60a8614691539c88c4bf0da2f8022055be8561cddd0e60b118f74f010be5998dd128b7b136f14edd2674e5650db2a
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod 192 BLAKE2B 08ac45ddd213c260f4b9d33fec4ba9758ce949c699e2d8d6c7b31bc0fbd7498618cd5144a6ccc3e1b852e9f1a6b7d00191ada7d464dd5784d132506c9a8639ce SHA512 44c996ad31bf02aec42bef934d7cd65379ae5eca4d1069dab8c478be169f9479cbd55f8f72bd9567e51535d31c9f65cd1d56bbefb8b745f96cad0f5953f8c420
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip 206858 BLAKE2B 42c113333104cf0335d16d24748ca111dc44a52b3c6ceb8e11388c85b8ac80c5c324ca9c6d90d08c07dc865909eed4510fb145153024890e4e160cde2b877269 SHA512 6df84a92489b04e55e35bb2334f7e9e55f4fac646e9ad904eca189d069443609fe1affc4cf5e92d0f90ea9c75162a72f134c6298f828608efe9a71b6e496eeb5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.zip 70555 BLAKE2B d83b37593eea44bbd11100af9c0c41bc2b55e14d06ef1fae1dce5242bf8cea1574c97a7148e7878385fd4bafbb433aa26fb4fcaa47e766353b2b6c179ddda124 SHA512 3ecebc76ab8e8f3cb65a95065639f3e90b5d722ba1aa564b42104e83ea4bd67af65e52c73a33b9b327b9934553f2c5b7324be8229f2c2e95c495065360a37c54
 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.0.zip 99332 BLAKE2B d95e04036796b0687ccfe18e2cae196efa87fbfe7a763a219860a82117f5a7ac594af005d67698289a9fa0f19b9c397f850ebcc8f6b2e2390fcc6463e95dd47a SHA512 6922e27a1a67c4e858880ca338f68ed80bc01175801b2194a900ba265c00eb482c29e785c564e9afb8f60288593b315ae8af6c8f366d35475678003440115d26
 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.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
 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.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
 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.0.zip 125740 BLAKE2B 53846b62364384c96a4a1038e7c04213e5623fc97365708174ba705781fa07760fe7726615901bc18a2fa099e90b7e4a5f9023daa5c5a3db8c421360a730e97e SHA512 6ad2ac900d1a8812eb6dd037a2ad5342ef74a339eeb490f23acc207819b8ba9e0c53185364908dfb65e57510146084c7e35e75de0a9fa4bf0898112f8ca8f551
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.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.5.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip 130974 BLAKE2B 6e4efb8abb584c3839c7b1ab80c8060c125b695bddddd44c57f72c0fbf9de85d40595ecff57f57ddb533e34dbe72a95e0e8043d91d462d68818699f194766e90 SHA512 9cff1690cb177e70b1d67ddd305e4317e3d1ef2825f5f3ed4639210f7f2ee6e89ff03970495757b922f16fade5fafae5cc14c8da2b95694faa3fa48c63f3313d
 DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
 DIST github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.17.mod 162 BLAKE2B f0ea72b4c8365cef78144ea87199e276b4a17384af7d060b7e94df9506259d314532d5d522f163b63740971036828a400b4642d1d96b9379fd09b85a80704b4b SHA512 860ad8012e5103242b1a02208c224120454a4ddcb9930d9fcb9bae989df136080d32d397426e4c2556e6fafdd16f2fff6cf205e983107ef2f70b87e1b4e23da3
-DIST github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.17.zip 1032631 BLAKE2B d4dba3c5f53eae21e2a10e3264d2b7580884bbd9b13983ce25ed77f1238a67c0456798a829d5d7ce19c5ec9b33058de34402e7fdf1563fb3f5ff9a3281ba442b SHA512 5afb49b688dedb8375c002ef172230a69f48628729bdbbff2a7aaa6dbdf5b275992bfb0761aab6f651c578d5fe1d29a95f9825aef102a6652b7df596d7f8a3ff
 DIST github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.18.mod 162 BLAKE2B f0ea72b4c8365cef78144ea87199e276b4a17384af7d060b7e94df9506259d314532d5d522f163b63740971036828a400b4642d1d96b9379fd09b85a80704b4b SHA512 860ad8012e5103242b1a02208c224120454a4ddcb9930d9fcb9bae989df136080d32d397426e4c2556e6fafdd16f2fff6cf205e983107ef2f70b87e1b4e23da3
 DIST github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.18.zip 1088297 BLAKE2B 9fcc0fb4ed635cb8ee65544bfa3989f971cbd4b8d9082503249c232a300bbe5e9b4faa217300eadcab79ee92d6637795877425a3796630385ccac35e3737cea1 SHA512 51c41ec4abffbcb25eeb49ae691e9330e9b0585cfb3ea3b7c35ea1c764f6b332d90ed3a17055dc59639f99e9fa5f10bbdca4f6b5ffed7255e6b05c3094b7a450
+DIST github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.19.mod 228 BLAKE2B b6e042df2dc84fdc5bdaab1c1c0cf8d0600975674cfb01f1e763b556cd393d1827f51385732d1cb3c9ac3ed8b46fbeca4f161e01d33f5c49f764031cf4718a2b SHA512 ea7b5bd6f46eb77033472c60126816ab16d76356277ae30c52464399477babd893b41f9bf994b59f9df87e2a8e35fdd4293dafca304a26c4bd02a3648a3d4886
+DIST github.com%2Fgoogle%2Fgopacket%2F@v%2Fv1.1.19.zip 1104735 BLAKE2B 3c33cfd5cdc1668bd78b7616b864d739ae2d360304cd5147fe2f166b2155d7f607fe6e67acafd95910620d35f606363fa147f3fc8edd01947e9bcb3211052cc2 SHA512 f7a0ba744009bcbd024c9b5a7d41e6cee4cd42a9320f9fc2fce3c67666ef34f6826445eccd685fcaa31cdb8574290f31b95ec9342d56618276e8752ffe16b62f
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
 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-20200212024743-f11f1df84d12.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
-DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip 21638 BLAKE2B 63e755faff06cc528386a19bdc3396a6deccf4872ca8d20484291c279b7c93bec50af19c31d6b41e37ff9144085af7e267ff63490bca1f2524c52a52e28c645f SHA512 b4c3f39d7ef5d42eb89e78e7924cc6edcb682062bb0a96295742359089fddf2806557877bb8ad609ee9c53ecf9d0fce15d0c8366d193ae89a979f834bec64ed1
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip 21941 BLAKE2B 94e8f4d50c0651e1bb47daf76c642871e1e3c53b725910aa101991a7a9b83b8042f76f20be54323b66b5dda1900a7fa5c3708ba0ef02fa2a72c2012efcfa1644 SHA512 eef3b3444dce760fb6cbca5e22f3fcb33fd418e2b54509e80a2150cc644f41a05a59f0acfb7fee386c994dca06d96f4cd023fa192aab368be08ef20eac4a626b
 DIST github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod 36 BLAKE2B b84f97e1dc580fd7a509f321486bba195bfc339dad35ec7dcecae4b44cc20690b04077d51cb4f70466a19e7edce89a8a50043ddef355c37fb4e529b81b99efcf SHA512 3f00f698f5b9c8c859553086638f72b732a210572ab7319c1d641a29962b317e4b424ee213c2421c06ec76c70e1252d7a770f43d4c46b999c5b371017a3c54ea
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod 79 BLAKE2B 00b450e2752b2b87b8c630d67af470188b9c3bca1cb1b7b1d619a573f59f3cd4652a6c2dd776db493323c7152454123e2b5d532161248e025cccbc5f55528b30 SHA512 b6f6f34a079219d53b3d4aaf2bde9a5f9b6b9e3265f4acc98c19ac150b6d0c8888a519c0a17a1952f8339b93118390af403fe3a259d10f4d830c030480706059
 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%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190430165422-3e4dfb77656c.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
-DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190430165422-3e4dfb77656c.zip 271834 BLAKE2B aeefe3121b7ecc2743f4f2c6d3c02f543798616aa10787ed6638fc18823a6bdf2489139cb7885cd244f5b47eb1d59e235da3765bee4f72adfe2a7507a37b4d16 SHA512 d4d15589ff870b69c6a81a478107cd594309679eb85034c24d77b530643896dfad09cc945426f298fb6a20016c1cde6f03ed30af73a724a9074d481efdad4df6
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190812055157-5d271430af9f.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190812055157-5d271430af9f.zip 266859 BLAKE2B 50d9f8947a6aa6dec084088e20bb6fb15c3f55e741609be0e0bc13c53a069d302ddce02f767a8bebba89c18e17fb83ce208afe3fda89ccbffbb737b870da4383 SHA512 0c95b8842bc2ff2cede1b3614ee8e705a63bb1a77ea0eb73f34bda34293def3317d49d79a089a2da225fcb0eaabba1c20fdd766d4e4bb186059af9899ae66d2f
+DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
 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.1.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
-DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip 79215 BLAKE2B 25312a1d971b0e214f92e88846586f3cb96a23a8df927d2fa73e37cca6eec4d55cd88c3757831f37661ed82a0681a9d0c3e1edb32e5182b1a0b8e349e28ebf79 SHA512 8de80f729d0538295606f5900e9f70a3f77c4b6ea7782c9bfa8520ec89c75b6a7ae08b42b6ad0dcc261f9e9a298bb58645fc97c4e5c2b51cbd6cbab62401a2ae
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip 79096 BLAKE2B dfe472a48935e77689778e60ac3379abac11b1fd632c35033f4ba19afc601175a26e38bcdcaecdc56250d1b90aaa2f7f499010040eccc49e477dc904202de4b7 SHA512 4506c31c8d95fadde5570686eff451f177ff4bcc80469a5bdba92b65afcfb2597d05f14ca724e8dd40b43b867ab9eef1f62d98d7afed6bf93cd33b689d646c3c
 DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod 46 BLAKE2B a909a61754bdc458c27211bf62b57f4ead8065bcb84511f4fc8c6fa77f56d78ca714e7e311035c1544d92f596de2fca56bcc767f9aa360d8d2cc36b7301fde21 SHA512 b1c1ceafb509b0b3c2b1c5fa0a28281880084a63a071a32f6ea4a04dcd2b2c455c9824414da7f767b1e039a079b6a40c0505a2e71991b9e737c1ba01947ea434
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fgxed%2Fhashland%2Fkeccakpg%2F@v%2Fv0.0.1.mod 41 BLAKE2B 6c8ce7dc8ee3fc1f0a4eb30c5060f295c8363280483e9139f6677f4349070907af83a039a262e6e4fd93a73457f7d5f19290a28e21bcebbdf8bca432545ffd07 SHA512 48609c2894e08cb9f5e3be29056184854dbd7a7a62d4827828d42d1ede7287c1b3e4931562c575daef710acfc56d507771e1a7e1bf36bfc7f826d975453a4fa6
 DIST github.com%2Fgxed%2Fhashland%2Fmurmur3%2F@v%2Fv0.0.1.mod 40 BLAKE2B 41be101e4ba6b9db1ca8301e1256ac23e30fa8332d6dc882067118b2d2098462dc0c04a7893421b4bf8b52227931cca02bc39a24b41f41529a14e87e8a48ca11 SHA512 9148e51779191302dcd14e9a9aab684ce14857d9dad31914dc69b4b5708cdbf6990315e119e1f3b11640ba7dca07472d25cb6412405675d34aaa80c9389a7e69
-DIST github.com%2Fgxed%2Fpubsub%2F@v%2Fv0.0.0-20180201040156-26ebdf44f824.mod 30 BLAKE2B 636c54202f2dd7ef66b5a47ea963cf2e8688dea8f08a8710cbc6348dfae0d6fce33c0ed79f3d1eef8b9eb024404cce4d7fb88348a90289fcad14d8909c1855e1 SHA512 9b07cf356b10c0eee6022c5f418c7c3b4cafab75e92da1540caabb5a581351e80880dcae09f9db9516c59a8053f52c91b1023522c959585c86a30fcac97f5085
 DIST github.com%2Fhannahhoward%2Fcbor-gen-for%2F@v%2Fv0.0.0-20200817222906-ea96cece81f1.mod 281 BLAKE2B 7f97feee949f94c009ee4a4ac3e749bc4dabc33823e64b800e5dbb3c6d7fa4f2833aa8903a552e69a0f486a4a0bb167bbf364a05fc0a147a0d32f88f4145d3aa SHA512 a9c31ff2b509efb93be052c5f6bd05a262e1dbc8586fc57f7d42d032fd622fc4b800fe8b6a68950ddea330a8b5cbd24e76be38ccebfa486f1830abd1cfc9a511
 DIST github.com%2Fhannahhoward%2Fgo-pubsub%2F@v%2Fv0.0.0-20200423002714-8d62886cc36e.mod 290 BLAKE2B a1ab5301591d54ebb3c37be7d2b57f47af15418a9a1a2f4ce365de391d4ae529b3ac34bf49cf6887140fcc2a6b9b12837d0307bed73342b8bd208b3da9acc1ec SHA512 8eb906c72d5cd8f19e3799a99f3d947fd5848979ca4adc04f90ecda6493793046a5912ce0e6b556af41e0975fb14093dcf5bd2127f51d418d46c95f280cff96f
 DIST github.com%2Fhannahhoward%2Fgo-pubsub%2F@v%2Fv0.0.0-20200423002714-8d62886cc36e.zip 6657 BLAKE2B ee69b05e6565ff16512d3460bee87950ff5b4ddac46be75e8392f8b4385f0322969e789786cd1c3047707cafa1acd2c214cb9c06e7a6f93e4c6a7134e972e2b0 SHA512 11acedc68dd1a3287274f1a4a6b0a0349b48ab29145f7c2792a82c0ed7653238091b356eb6114723d62826c1d72094c1bf7420c9e22e0bebf4fbd1ee6655eeb2
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod 449 BLAKE2B b4fd520f53e935f4e33630427d57ba97a516afc5c20d4b4c62d06cefa9f77c6f2a043afacf95c9e496e8ff573c8feaa638987ffe014d4432555725a9c9f920dd SHA512 ef9f64ec39004adc78f354ecd2c614f0c76cde23549fbbd778b458699f4aa104972fb2e5c270e7e223fff6354c309873c4c3611c8d746d2045f2a69dac861830
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod 96 BLAKE2B ada026bc3e6104973cb7900d638acb7976ee8301e98cea55548fc800d8954997b666d0c605dcf1de0f639932c8834bd13e8f8512e74529a818d3de978f0163d4 SHA512 7276c308f91ed52579965e7e83e839351f2170cef2b58ef67887d5eb926dd21fd502f98ddc84ca8e6f16c81171490c1e2d9a131569b5d6d56a1e2ba28f227451
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip 17595 BLAKE2B 06dae93e8077ab6235d59b57646a162ff31e044624bab3b6ec86c7aaadf49c36b262b957704151db889c515c425630299d396d0b76919403eabf4a3e71098ef6 SHA512 aa4b145476a80d7be7959bf7d0a9a278765496dbf915d083fbc40c5b216a52126af9ba12cf09f9cc178ce53987822ed61c92e2a0295fa977f8a460262e857c30
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod 96 BLAKE2B e834b9619a59e85905dfd9a50233e959874706f35026892af8ab385b2fb78a8f876aa47695fd896fe241c72db5c306da0d7c24f49e3bfcad887ac9e2fe5deae8 SHA512 d44bb68b322c8512c135ca9689bbc603643a4a924dd59c168519761878fff14a394f365fe5d88114f5552a9ed1791f6f9e3f7cc44be08b412f0b3a5eb3efd67c
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip 19419 BLAKE2B e8e9f8e23c550256e8f31341e2a575675c4dc0b720a701023898ba9bd09f1be375d21c9843ce26767fe5b7e7bf6dedbd4807f58807c3497efa1a1d19544e07ae SHA512 054679ee890bfb4f268a614870a100525b996f53bd48dc914200f2f18a4dec30cda59e26c16478259d1e80c35864df6090901595b59fb80a209f30d909e9e9d7
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
+DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
 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%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip 20160 BLAKE2B 19b98d09d695d9d1d999e30896d7bc6b5f7266adebcf182ea18cf8bb379ded400d2200e22ec4151831d4e124c4cbfa0c6332678b20311134d5666eae24302f07 SHA512 f18b267cf4ebb61f56c726f2e6b7ebe33bf97d445d44648d41a5ba9734fd7ef7dcb034ef8881f476ff2ce843118703ecaa01f9925c2fec08bc642cdadab742b7
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
-DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
-DIST github.com%2Fhuin%2Fgoupnp%2F@v%2Fv0.0.0-20180415215157-1395d1447324.mod 30 BLAKE2B 0220225ac49e562c121d582bd6fc7233ea2939b7d8c9268a25fbc395f078bf8a982e6f458d04d9f49ec9ebad3abe9b84d5784d224f9093cbe57ba16d9576d3e4 SHA512 de7877cb78323c0945f123a18925f07c1faa5d7666be2e5e5efd6a2c7953a2e9af7da41600396344332c4ad564f8717b17b0b0c3958e049bac4043b3acdc0cc5
+DIST github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod 29 BLAKE2B 7cd37a0dd89dc331943531c8477a4773980f42e0c135a159bcee3ae6bd82aa8f15c4d67e7fa60878a35c7fcb69d647738095087775e18c540059fff6f4dc192a SHA512 28dafc16202503db863783e4701ab30b34c71b4435a4859329fa635c0915f0ca408dcd8c73217e0751f879400845d8136e171bde5d0cf6b7fa7ec4ae3ea97f69
 DIST github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.mod 193 BLAKE2B f2487263b38f57fd7665951860e05a081f1456b3c3c2a8234b8056f972896551c254a90fe5a427f3f3582f5ffe1b607c82c879113b21201322ab23ca0eb36dab SHA512 fb2883f42f2e1213b77af90b96dd97cc7b8aa303c08c2326fd126cb5c5bc40d000cface357006440b152a1bc40c751d14c2f49208294e80ab870689ea02ae7a9
 DIST github.com%2Fhuin%2Fgoupnp%2F@v%2Fv1.0.0.zip 72318 BLAKE2B 74b3d91b06d4b220896199646f0bc9cc90990ae913ecf4f0a63e6cd3af53f76fb88c294ab84328f08e83c023cca672337aeb0bda5467ebfb40b4aabf93f1b232 SHA512 5833e9edcc647ee035f733230a388dcdfaa7e2d9d64be882ad2783fba3f1a4a08187675de5d2b4c097ad822054a412f0651fcb867dc126b1c41333e0c6877656
 DIST github.com%2Fhuin%2Fgoutil%2F@v%2Fv0.0.0-20170803182201-1ca381bf3150.mod 30 BLAKE2B a65905095d4e228a2e51c6626234e058d8dd1477fb99917c8eeac3b1eee371e8dba4231c30bc70463794afd5419ff5762361c8ddb59b3d69cb7a197d1424976e SHA512 2ca1e0cb3cbfb97598f12cca770d13fd161c4c78714c0cb5fe4fd329f3ae41788373420776608682fee1ce883c403769ff1dbb9478e9978a7a09c4483008684b
 DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod 46 BLAKE2B 825c65ce0e045d5c764d3ccae81a25c6224c44656bb8ceb93f39d06a0c8d766ce7562e5ea1ceed903a5d1ad4c035e27ee84b4311548d024e108a5cd6ca142508 SHA512 324450602d8234231b0cf40b07e8936948487354b8f6e92012f3e65ba3c646b0993e4722d3867a12d0bd3749c8dd6fca4a1118393e2ca682170e500b3d54e5fd
 DIST github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.1.mod 30 BLAKE2B 897b4bb38b2b17c707587cbe576d0624b6f98c244c7da90bf27df097df3d15ac148ebf961e6376193c80b027df6334832649841729c4dd05e830ea8fc689cf29 SHA512 0853c35fdf0d770d9f85b78d3eb3069d0ce993064c9b2889c97b14d3b4a07dfcece550cd833009e8525b36f62eb407f10fe91c923749606bfde5f7f64fdd5c30
 DIST github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.4.mod 39 BLAKE2B 8a83281a278e4d22086a6256c032905ab2c93f46393d45d411df2b5b958fecc2744b12bc4adc73bf4d6f7d36e79733c6bb11ab61aee167d6acb4840c66074aff SHA512 aa42664c464e5f1bd00fa5038e6128817d3bfdf60d41b8c3f6d2e7c516f5680591d757bdbfbc1618166aec56136f1831437c94f4d2e61816ac1266672c3fe8af
 DIST github.com%2Fipfs%2Fbbloom%2F@v%2Fv0.0.4.zip 10972 BLAKE2B a1425d0b6361ab463100befc84538020127cf8bb77fb593b21b8825687a7ccb49eb4e3548aa9a9c17dade9f3fddbfe165f53ee3cf5a5d3ccb6ef1856a3aeb1c3 SHA512 41f60088c4d51ef6ec71cb3c2f1a13cf58e1709005a67e97a6ce84b468b9b23a27d013e45a412d02625b36b51794aee4510be8dfc65bd7b9230f7e70620e5edf
-DIST github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.0.3.mod 1283 BLAKE2B bd79ac047ac9f952d5d25b330565f4ff1da9c2b322651dad789d322c9d4f89239fbc636ae28ce8bce2509dac7cee5ce453165f3c6b491d4ec617e92107e3584c SHA512 65173694276f58fa788057a52e674895ed1611ca0f501d7ae8cd0edbe4c9fd3f89f2b4bfaf9e963c06324cefbec0e690a8059edace3d6bbd30268ecfee2f11d6
 DIST github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.0.9.mod 2199 BLAKE2B fe20b6b3344137f1a1f852fa494f17a213754aac450ce03d801a4f410ffee929eef593db52138a666f645d90add930001310f16c2d8359383004524a67befe6a SHA512 c20db38ac2fd0f4c3b55be87f2886066e2490d519bf174c37183950c9a8a162c22caac294592ab93fb654362cc148a70ee8c8dddd157affeb490193be27f0d79
 DIST github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.0.mod 1435 BLAKE2B a216e99998042b443055d1e3de0ff85ce4692878d4930d4f67b3acb903c1ff4edb2a53b13a22137af179fcb316cd080dee91ff1a26a84d5ab5ae2669195781b3 SHA512 edbe93e6a81ddbd0ab3ccc81daa9fb78edd563346fdd14fd867d15750bf3ff8da9601490aef3e7ca2c4d73aaa9b56613d110404581b7e4056f764f8ed587bd73
 DIST github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.2.mod 1585 BLAKE2B fe55ddcf7d388596d1d24c0e98941b4741944bd7f284a4cff7b7579d72843543381bec018aab6ea0ec2b92bdc647799c465dfc0651245ad5be3b976965956ec0 SHA512 a55775b242a59f359906638eee4faaaaf5e9377908cdabea52ea2723300eca1fa04e62cf92cef1d4af59551596c47217b747000ee2f3fc45a621731d63abc291
 DIST github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.3.mod 1585 BLAKE2B e6719a09214b6d908e1e6bc133fa79c8084f6f727c2cd4ae65629bb19ea37a35516cbf0ebe7bf47a94078012033ea6ff724b57e7bc6006df36bb8682ddbda765 SHA512 bca6921d95f082f5cd043db39ed74d557bb20a2e1fa20ca7d4b8652537a6c6e497be0fabbdea1f35bf691a2fdbd2c2aacff4900d2ecf38696a87aa51ca6afe63
 DIST github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.1.8.mod 1614 BLAKE2B d9db3bf4a67d0be13bfa612658baa0b17e857e97cfc235d5aac79e6aa69459f02d8a75e416b6733df762596c3dcd4c3949482207ad628edfe5e4e0ccbc2245cd SHA512 a1cdf9f18b8b85fa42fbc66361efc3e91a43465f217a8492a19b227a825a8e5f1969707cd16ba60ae6025794e0feeafe477b3e3d5ce0610ef7d61e60083bd8bf
-DIST github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.2.20.mod 1154 BLAKE2B 7784dc60f64dbd28dcd6f4b525a9d6352c40b9738d5e854184a5748be55707472064f7b6e008aa95d002bf47a8e52622fc0b7a3af90280d95d8bcabcc19cac78 SHA512 f18193f339f7bcfaa5c252009fc549a1203cbbb1a3f29e51209d38b369774f15e4947faa362b0ce17934a457eb54922bf6af17a28eac3332ca1902bf27883df8
-DIST github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.2.20.zip 274471 BLAKE2B 1a6e4d302428a091db58ef1556796be259dae361e37841ebccab5707c97a91d451ac35bbad69bb6c3265104a90967dabf82776574d8a52e01a0ce67411c0eeb3 SHA512 f4d2af73de09bc90f1944d22af5b6867d1f9a1b38680dfccbee334972fee70dc6b275063ec68fa2589f23e2984f6704519459d94b0bb36d47e2ca46872d3df60
 DIST github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.3.3.mod 1108 BLAKE2B 8df89e63aa6353f30613e2b9dffbb561f9685c9aeba5fb63ca0f724100eef2730a37161c5bba9757162016c98709c468e8782673ab568f82ca132b4904a5076e SHA512 4a6c9010376f1d7c795a74f315347fd60b1fa873b23c8b13b4d22292b5666225108e3f9bd0ccb6bef52d50211ff99cbd055cff4839e3f09c300025232d53819b
 DIST github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.3.3.zip 281523 BLAKE2B 99e97a1a1835fe701d3cfd89150f0397ee8a53fe6661d43cabf870d85baaa90e2669266bc61b2d689bd37b03ba23b3c16eb2ddc9db1b411ea68114bb0db64021 SHA512 118e2e878e6b209e09c5d1b20b3fa9a714fd2e001e741231b5dabacedeccb904d31931f15e1a2920ba0b9d03dbcd87bece0a1729ea31f35b5aae1de777d7d9a7
+DIST github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.3.4.mod 1108 BLAKE2B 2a77f9c0fd8518162515ccd2d88affd8ac9631848ffdb7927d685c28859ce066e04847e08a04cdb3e2038d0c325ad57fab27b8daf3981d150d3ec2b2db19e589 SHA512 a76ec757600cb44ce8b7f81b6efa0f02a5f81e9899b5c89408883985d9b7d3e782bd2d3b697559b4786c62a5f263e13bb0f64f99430e1d593bc537e958be66b0
+DIST github.com%2Fipfs%2Fgo-bitswap%2F@v%2Fv0.3.4.zip 277320 BLAKE2B a22608cdb3e3defbdf0035d42c7893c8392f2935023d887026527a383d40f58d0b9513736006407d2036416667c8b554c242154a2cb5f6a8e9ad5a094193576b SHA512 70b4244ad7062a4b6ff4cf81fc1bfaf60be235b5a6ab7aa0ff167de1955773db3a9018965c95a5531b731ab1fe12dd0f3e9382639ef668f1040a4c5022ffbf65
 DIST github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.1.mod 39 BLAKE2B 715142a153f0ea8823ae09f4417506d5cd13b461f6ea59adb42579028a338e874a131eb0eece8807a9b3c59ec98d74e8b8c214144178a19bea583581fdf0c8c8 SHA512 d8e46c1deaa00f1b7690aae63dd3710c0ae9fd407e4a24bc035eacbe677890bbd5bba8f64634d7ee9a47bae96392f2406ac99de8a1e19b8710907f5408f802f6
 DIST github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.2.mod 165 BLAKE2B 6ee87d24f36bba4bfe57e76f3a934a8297797739bfc01c5f89f70acff3b508cc0b20962f1d56ad6f7ae9ccbb219968ce8da79b07f918018244b87b9c2e164d93 SHA512 685db8e6b5880dce0470fe327c2f296b153fc9294cc9a91f5d37b7dcde57d17f237e65156f4af0ff6bcbe8ba04452453cfafcfbd79a6d60c983f4ae628593b55
 DIST github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.2.zip 7084 BLAKE2B b3358f2867ce1d1292bbde743c9274a4ec11fd534b3e35a36a0c34b77c5c16360c12f8db014ac788df8659f1bd9be093a6f06582187558791bb62105eceabb98 SHA512 1f476440f490df00ce69247c5b545993cb81ab555007075544f0ec2766c5cde98488cc915999b7c964ecbf36c9cf5e5c768c871ea3131deb8750e4ea4253e7a2
-DIST github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.0.3.mod 634 BLAKE2B 4c339207e3399dd94b24421d348b4d8407452847dbdd13ea74f0e10b6aa05ad10068b29514174cc09ebb81da9a96dfb216a28f455593ea012ebd288493b082da SHA512 4ec55f751698136caa647d2df3d085fbe8673febd9a4fe400b60691a9ea0088047c2c772a0ad7fa1486c234debe7ea1e6ed45be165f573a928c64006509323a0
+DIST github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.3.mod 166 BLAKE2B b4cce4f8892cb0ef8c1daee62a79f321bfbbe8cfe1a478a6802e55e3140123d2d8b630a48ca7204be87dcde126cd5aea8e6e3ad6af2def4a3bbbddcd3215de7f SHA512 ad6ec57a7f986a2191a8edbff14405e5ca95d1df1439b44a750a16635cf8242eadc9e1d74048f3b14231d69f049976602997eada30add73086d30404bd11304c
+DIST github.com%2Fipfs%2Fgo-block-format%2F@v%2Fv0.0.3.zip 10239 BLAKE2B 0a383dd72659e6319faba94e787d4cecabeb6d728751f4c076be159e48dfa073dfafc9e80c9854348b2e562b281eb280e5699ccd15f93e37d2965e963b79e6ce SHA512 56415d81077d0a299a7d3512cd9acc0e130cc6e647cb41d3a4b0e32d13eb6f21e17137072e4e70c9511981b991c1cb10c5d92c1954de16940d32e4a141683f1d
 DIST github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.0.7.mod 684 BLAKE2B c3b19953c89435e4367a62ae041ffb763b5e5d0e91eac1dd3c71a6f45b4a8fe26d12a45b6b8c882c121a19298c802ef04ca250b0d31fcea946027b4d5e991bd9 SHA512 e6a3ac8f2283bbf44d0521e8f452557f3156a3100d77851d54468f9155252377f46a5322604f7728ea78768c795b222543286f65646db93937f91c2ddc2c2760
 DIST github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.0.mod 563 BLAKE2B 9104c7643c55f2c27d92d82a76b56cd262df04b4f7d9edc3876f297415fc5aa3398043bb48d1b1f244539aec097ba0eaac9bd677709733102f0e3aa3983078a9 SHA512 a4dad0c089d1bc79ebd2fb34b6d9d2c43ee8a3e40b21cbb4012c6fa859458230edae104890172d6b81fa9dec584f21c70640324f859f27619d0694363e8285cf
 DIST github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.1.mod 563 BLAKE2B d75f3d326cde9ba74bf1a2c71a3584b5d3f31281677d58bee5158c3e44ecfb0b7c3d75ee723a2829d6325929d29c3002b2e65883dd8cca178a7d4f25315516ee SHA512 8c0d65adf05fd2cfc26f5a3c87e781e71c9c50c3789c303cf304598bcbc53fd1168b4bf29b147e0119a227f757d2e91c52daca40a8a4b78416f6fa1ab3a94bc5
 DIST github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.2.mod 563 BLAKE2B d75f3d326cde9ba74bf1a2c71a3584b5d3f31281677d58bee5158c3e44ecfb0b7c3d75ee723a2829d6325929d29c3002b2e65883dd8cca178a7d4f25315516ee SHA512 8c0d65adf05fd2cfc26f5a3c87e781e71c9c50c3789c303cf304598bcbc53fd1168b4bf29b147e0119a227f757d2e91c52daca40a8a4b78416f6fa1ab3a94bc5
-DIST github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.2.zip 22519 BLAKE2B e5776d04f8bc60778ec54aefda91a44ac961390a8694dca76b6606ceab5addf1583ae815485c5d5efe4fdffd42a8af9236c62ece117e6f593388c443d356cd7d SHA512 2e2b77e019425ab1e3e0c7cf27a29c2758e509addd748bdbf5a9c58c1d3115150282c1baf6537d9e855a8b2b562e8482718e9ffbabc4ef422cdd390df2d5a21f
 DIST github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.3.mod 572 BLAKE2B 4bbc490443968d82a85206b7a8ec5f77976aa40c2f4103c5e57d69bab1f4a867640c0bb619d4faf672bb6d5fb2ace40a1fdda6f05534dfe0ca17fa04b3905a4e SHA512 e3582b92ad5c316e47ffe1fe1c269924ecfbdb039d043957acb90993d6db11b6145d2db9f01afcc2677458c2525fb3919d7b78ce806c1b11f552275b33d63cce
-DIST github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.3.zip 23532 BLAKE2B 7efa20beb388756060b9bd06af9b2a87a4b8c1d44db1c1b3f45766f54f2b3ba6634711ca8a4f44473952419e6c0de593a9735ac3a09d085dc81d77528db76f86 SHA512 5a8064a735de15e774a6373b286872a2fe625b927bd64ea2f16c0861bd29bc70a0536b6fe1a971dbcb203ee59968aa0ca3c0a475e5603b8793929bd1b6211e2a
 DIST github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.4.mod 572 BLAKE2B 4bbc490443968d82a85206b7a8ec5f77976aa40c2f4103c5e57d69bab1f4a867640c0bb619d4faf672bb6d5fb2ace40a1fdda6f05534dfe0ca17fa04b3905a4e SHA512 e3582b92ad5c316e47ffe1fe1c269924ecfbdb039d043957acb90993d6db11b6145d2db9f01afcc2677458c2525fb3919d7b78ce806c1b11f552275b33d63cce
 DIST github.com%2Fipfs%2Fgo-blockservice%2F@v%2Fv0.1.4.zip 26072 BLAKE2B 4d61b7a9e767cd146759a7e22f980bc27b09bbb414c8bf795ae237fa2d4963f864448252355e0c96e66d6e2bf4ed50d75fa54a7f5ddd5ad1f5096feeb0e2704e SHA512 6fbddc166d2ac6d48a1d47d9855a02f1580687cc0eed79cee224eee115382aa0de9336218bcaec726af4fe0fa30f0e6e04d52624b1cc4522d9e31e346723d4bc
 DIST github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.1.mod 133 BLAKE2B b8b27151ade02e67e7f196c28365347ef42f8aa5af4d0b51c1e079eabf3f5e79da0acc79af68de123d1adf55c4b10b048695a53b54f03b242b162baa607ae34b SHA512 7ae26370283c2e8aba4990adabb568fcb0e033b93f1d2e167894478d36746c7a5a7598ae941eb1e21571a35f15830d6fd6e06825615902c839c561609f3e7522
 DIST github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.2.mod 133 BLAKE2B b8b27151ade02e67e7f196c28365347ef42f8aa5af4d0b51c1e079eabf3f5e79da0acc79af68de123d1adf55c4b10b048695a53b54f03b242b162baa607ae34b SHA512 7ae26370283c2e8aba4990adabb568fcb0e033b93f1d2e167894478d36746c7a5a7598ae941eb1e21571a35f15830d6fd6e06825615902c839c561609f3e7522
 DIST github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.3.mod 133 BLAKE2B b8b27151ade02e67e7f196c28365347ef42f8aa5af4d0b51c1e079eabf3f5e79da0acc79af68de123d1adf55c4b10b048695a53b54f03b242b162baa607ae34b SHA512 7ae26370283c2e8aba4990adabb568fcb0e033b93f1d2e167894478d36746c7a5a7598ae941eb1e21571a35f15830d6fd6e06825615902c839c561609f3e7522
-DIST github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.3.zip 31259 BLAKE2B 10cdcae9545fce41c5e4fce8d5318363e09f735133b336f59ee3f558455c93fc37a18dd68f64cf0b95de4db75293d0afaf9607601aaa1e84b844ecd33da4491d SHA512 10a5dfd223859dfa21541e0ec12aee6853af96de309cb787bc8eed58b65bc4954e2874c65bec505617438a589aab055d4b29d7cc7ecb8f7a604632e5c428307d
 DIST github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.4.mod 143 BLAKE2B 0cba4c104ec50ef86e4b1c3b2d11b439ad7c64df44d6438bfe63e5e8cfb6370e803aa8dcf070f6e7f5dfe47581bf403eaf4b13451edfd4acfba639b5f0a95985 SHA512 5a38a36afbb1f5a5686bcf10251dc10439ec660770b94df18f46506ca6ddeab81edcb7d23f1ada05a1d96efe3ed900fb685e371a935bf374653bef74137109c8
-DIST github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.4.zip 32039 BLAKE2B 9e566de4c7265a0707f822870a1d2bbc5115ac0eb15cbdf2406f9907379dd1597f473823f30877f41fe32943dad6cbb453e58bcd25fa3cf650f35cf65a347da1 SHA512 b3a4364e9218f80e23c9e77d811410e2ebe1787f324fb63ea2f651f4b8f1a788417a2d212a50eff414d56c36ebae0a92ad383a6575a63a09671c37931c96d0f8
 DIST github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.5.mod 185 BLAKE2B 172b8309e3e7566852a53169886f013d1590c8dbdd7827c4682dca00dc259c517833ed8a780d4497d9971b81487eb4673916e391991960ed6813079128062956 SHA512 c95da8328481f501081e8fe8ca6453b98bbe1f44cd70ab4546eb10e2841d1b4b0c2d82597ea7d634198bf387c2fa99f065b95ba5ecb095106655e96982b95248
-DIST github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.5.zip 32160 BLAKE2B 6e59f91c22d479ecf66b6882095ef7fb49f0f3f6f0a4c900091855b7babf3e37535933d06fe90a238d633851eaa3e1ccdcde159ece56af7666e2434a4a6554b5 SHA512 8a18ac2de2518c2b5d002a7966268ed696572d49eaae719b50cfbe8b836d2732d25107c555c3a7a2c120a5a0a37005b2b6e8eb770c24b426bb8c1b7cd3872212
 DIST github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.6.mod 185 BLAKE2B a21810603a1d1ae039b83bac6cef5a9f0ac437f5fae6ae1fd9fe562b64c7170513d2591f1c2cfd89a9fa93d00be0aed251b645e488506a41114a09a163b0c01a SHA512 debf6259e046be62daf1d947cb9b255ff3caa14f3bf47c0023f19a53a16a203f1937c5a541aaa7ddaff368e35649af2b61e043c20b0f416b0fc3f81ff167bbce
-DIST github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.6.zip 34143 BLAKE2B 9ec847fd278e3a36a427f0bb8e06750b19e411baa7875e77850a4d80352cc82cef587edfc474a204cb28c37bf18f92b5e590254c3ed190ecd2519790157a2d68 SHA512 e82e839818556fa1c6d8fb5bc8e96d9d6a7f0535f3e4b78dd7cdad312938e75d8807c03b8ee0aeccb9da4a38641ac77726bd3c29b3ce412632f14fafc8cc469c
 DIST github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.7.mod 185 BLAKE2B a21810603a1d1ae039b83bac6cef5a9f0ac437f5fae6ae1fd9fe562b64c7170513d2591f1c2cfd89a9fa93d00be0aed251b645e488506a41114a09a163b0c01a SHA512 debf6259e046be62daf1d947cb9b255ff3caa14f3bf47c0023f19a53a16a203f1937c5a541aaa7ddaff368e35649af2b61e043c20b0f416b0fc3f81ff167bbce
 DIST github.com%2Fipfs%2Fgo-cid%2F@v%2Fv0.0.7.zip 34166 BLAKE2B b04f956631810964194d90b6de52cea357a87917b869cda9fef4cd5bf9cd05ab0e47712cbca0056d4572ccacb2b7b5ec9f869c03fa850cc1a732ab9d73d9a325 SHA512 81cb814bbff621da519cd8e64fd1af1214687f20bd5738464cf06e5747ebc5842224feba0ab0b2c424eea5fea1ba1ebf87f67f21c73c714b10ba78b99c953a93
 DIST github.com%2Fipfs%2Fgo-cidutil%2F@v%2Fv0.0.2.mod 168 BLAKE2B f72342430cbb090a7bd4569724668d7b56ee9291c2732bb5ed7d1893404b19f65985318c6f53c06b8a26b8bae5c71692d2456fe99572aa1a83a473c3f38ce2d0 SHA512 ad683cfb6c9797f40b7f0e451ade6035c94c524794e82da5217a490f5c0034fc7e1fb3904c409f2b9e9c8d80eea3a795ff0b3bb2dfe1a56cb9763a6b6a427d5a
@@ -330,40 +399,28 @@ DIST github.com%2Fipfs%2Fgo-cidutil%2F@v%2Fv0.0.2.zip 13245 BLAKE2B 39094105b22d
 DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.0.1.mod 379 BLAKE2B 68262e69237ffd3e3fc3403384f5af39bca79ce338bb06eb17e1c147e140d5b2dc05a1edd0873eca37b25d36d52f9af56d1c74dd1e5c0826109c64f4ef28ca98 SHA512 1b705f3964ebec3b88c0b12c91eb6d577af2c09c600116439cdf2d1933178738827e0e73dbaaec844c786817415a4c3707ffd5a59ed361c232e563ad58472d65
 DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.0.5.mod 379 BLAKE2B 68262e69237ffd3e3fc3403384f5af39bca79ce338bb06eb17e1c147e140d5b2dc05a1edd0873eca37b25d36d52f9af56d1c74dd1e5c0826109c64f4ef28ca98 SHA512 1b705f3964ebec3b88c0b12c91eb6d577af2c09c600116439cdf2d1933178738827e0e73dbaaec844c786817415a4c3707ffd5a59ed361c232e563ad58472d65
 DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.0.mod 379 BLAKE2B 68262e69237ffd3e3fc3403384f5af39bca79ce338bb06eb17e1c147e140d5b2dc05a1edd0873eca37b25d36d52f9af56d1c74dd1e5c0826109c64f4ef28ca98 SHA512 1b705f3964ebec3b88c0b12c91eb6d577af2c09c600116439cdf2d1933178738827e0e73dbaaec844c786817415a4c3707ffd5a59ed361c232e563ad58472d65
-DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.0.zip 54181 BLAKE2B cde361110611435335aa96cf4f156fa7cc95234ae36b7d0db709715b109ba60d7736596b1c81d5a9f779b715db542968aaeba438a2795abfdf1639830efeead2 SHA512 bde4f54b6e6f0395706e7052e8ec531518e7642ea2e249b95ce2e24eaef944daad41484f86c6873fcacf55af7a326e237959f5826eff4eedc22a716694277da7
 DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.1.mod 445 BLAKE2B 0a1b11c73bea757e14cb27cc7862a22fc40578a91cbbe41087ff79e1a0706839fea9208e384795b8f1aee5467605f8c23722dbc88e325ab1d0cccc5a92fc60be SHA512 85273c82896cc0fdaaf9d6d4c64ec199f907720a7f9c903b147fde3199b0b4d189849f6abe392f5020e8d0da1e84a4847912c008eadc55033017d0c4058b7315
-DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.1.1.zip 54876 BLAKE2B 5a1859041c98812e0a9520ddc19d0817f5b19ee6af5e82d2bf3cb62214036f3ce5bda3d8e09da7208ff33abc734555364f12ea075f0a8f324178ffabe9748f56 SHA512 67dbc50f094715d383cbc71eb71f67ddb88380f7d5c31023dd9749773257154f79a1a7710f2cba6060d7b833fd43fc2de5d7bb598c1707f0cb446ad3e9a99dee
 DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.3.0.mod 445 BLAKE2B 0a1b11c73bea757e14cb27cc7862a22fc40578a91cbbe41087ff79e1a0706839fea9208e384795b8f1aee5467605f8c23722dbc88e325ab1d0cccc5a92fc60be SHA512 85273c82896cc0fdaaf9d6d4c64ec199f907720a7f9c903b147fde3199b0b4d189849f6abe392f5020e8d0da1e84a4847912c008eadc55033017d0c4058b7315
 DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.3.1.mod 445 BLAKE2B 0a1b11c73bea757e14cb27cc7862a22fc40578a91cbbe41087ff79e1a0706839fea9208e384795b8f1aee5467605f8c23722dbc88e325ab1d0cccc5a92fc60be SHA512 85273c82896cc0fdaaf9d6d4c64ec199f907720a7f9c903b147fde3199b0b4d189849f6abe392f5020e8d0da1e84a4847912c008eadc55033017d0c4058b7315
-DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.3.1.zip 57199 BLAKE2B 8a17c5b9df60c05886f02588c22be6830340b139c741aef1e545642ef80e78b921801b0b7f9c83fdd56a9e7e12222420627104ebb7f8267b0111d4fc29c8b50f SHA512 9860927cf2eba2e9a27767b03c8bfe1684ef4c6d6b20fcda8a21314d1e2ad1b30d4cf89790a53077bc57eefda0c48c0a5a3cd6aae011e079b3f547abe2d8f5ec
 DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.0.mod 371 BLAKE2B 623b36e1a86f025a1a9492769f3848a7f0c929ade5543d8078d23aecaf781500f182dc35fa439fa297a6cb1732eda10977cb1236ac95651a54a8286ad9e76947 SHA512 adaca7f52bb8f22c7efe401f615ad43ba46a4058f799e2bdeb1a94f2c4989c8343f8e34f4ee4b2eb40bdf0e95e28a6e99113844f32f7c1453fd91c4dca8d42aa
 DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.1.mod 371 BLAKE2B 623b36e1a86f025a1a9492769f3848a7f0c929ade5543d8078d23aecaf781500f182dc35fa439fa297a6cb1732eda10977cb1236ac95651a54a8286ad9e76947 SHA512 adaca7f52bb8f22c7efe401f615ad43ba46a4058f799e2bdeb1a94f2c4989c8343f8e34f4ee4b2eb40bdf0e95e28a6e99113844f32f7c1453fd91c4dca8d42aa
 DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.4.mod 371 BLAKE2B 623b36e1a86f025a1a9492769f3848a7f0c929ade5543d8078d23aecaf781500f182dc35fa439fa297a6cb1732eda10977cb1236ac95651a54a8286ad9e76947 SHA512 adaca7f52bb8f22c7efe401f615ad43ba46a4058f799e2bdeb1a94f2c4989c8343f8e34f4ee4b2eb40bdf0e95e28a6e99113844f32f7c1453fd91c4dca8d42aa
-DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.4.zip 59161 BLAKE2B 02645e994a42bc5f7db8778c0cc176fc299b8ececb6ea0b50671f8777fb8e20d9e67445645776289fb46f54b563c3210783bb0a100ae942506310059e81ac85f SHA512 6b35dd7248e3d8cc5056d411cf85e2c058d1a34f766841451b67db1c754e95bbe85bdf5c7253f278512119504b297dd4ecedc1f15913847e2feefa3ee593ae90
 DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.5.mod 372 BLAKE2B 2bbdb5d2e35edfab6071bbb05e5d011a523fcc56d79c916365b2c15ff0e39ddebeb739d092e46aba9352d240ec3fc0c22fdf8b94067db60bd3505f469c95927d SHA512 f2396f952bbfab37680f7241e2e398313b219c7f08aff88abff2cda739d808a0b9bf7d392cc1e95ca1f20a6c3a9d1a1f66d7db08e7dabf2defe02d4b0b12c001
 DIST github.com%2Fipfs%2Fgo-datastore%2F@v%2Fv0.4.5.zip 63291 BLAKE2B e1bdd03f9b20df5e41a60ae7650514a892210e4fa87c2cb5c9d17fbcaf019aa4fe01e88ac08344b64e6a16d015d6d0b5f34dd6ff0f386e56d65db4858bfd9c7a SHA512 af2286ba9a5816746e888e129a293af4b60db7c1341b66e98a12b3b707a44ba9f24f1a47cefaeea80777a5ca692d4b364ef3df0f2ca088a7c47ec4177be9d885
 DIST github.com%2Fipfs%2Fgo-detect-race%2F@v%2Fv0.0.1.mod 38 BLAKE2B a901e8e26aa87a8c6725cfd14922ce4db42df82498b6fb22a32ac115e376564caab0e7acf11796101ee2101292ece74be300590470c390ec9ddd0340d926aac9 SHA512 b91b0241071953445b7c4bda376d2b45ae73d82c590764a0220074bdcd4d0b53fd73a9596eb07ed1fde77b7d9303f4b61db984c1abd2697d49b72077d4e49fd7
 DIST github.com%2Fipfs%2Fgo-detect-race%2F@v%2Fv0.0.1.zip 3910 BLAKE2B e357173dfa2fd7c403775ceab418a4ae4f266e9aeca1906062e4ad6d4840995a547811f34fbba1af0d96c8e4b2055f0ffbfc57ce540d3bc2919056ee97cadfdf SHA512 d4aa6117e8d0f504d2dc4226132d12608969924ea845acb79f62bb1635bd232eced5e8e1411f2e10c17dc3ebb64f816be1728dd703e1279852868752bb9a5bd5
 DIST github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.2.mod 580 BLAKE2B 8c38a160b20578a2eac31549d6b443615943381b8e4b015350677602c49b1df9ed3a6e41653b29f47b65ac7e557e38135e3332339d9e5ee169b22fa62c98b3a9 SHA512 e2b01a8c26bf7baa9c966172396ae19eae6ac0ed7bcea6b446da256c33935cdf3baa2aa86df16a5bd4aa54e0d6163e62eae6749872cd0bac1810c3231a348137
 DIST github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.5.mod 221 BLAKE2B 4f96ab71e8c0360ec923dd6bacf108857cdefdb711c84a8300a62c90d0e2e76872210ad5da45394d5aad44316e3ef638b73c5b41d410c83964266f9c71c7c3fa SHA512 6609a9ea360e5fdf9d51b225312eff68405a358682a943534b3ae51ec8237c6bc4b1d547e813dcce8a49f3b7322e744c1de1fcdf525b3499b53e4aefc5101971
-DIST github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.5.zip 15441 BLAKE2B 0651a0e1ea66ef0fc50f9df1f735a410ea0b596556aaec7d515a7b6a5efc85a45698fc322fabdb3d0f3ec83794e93258a4c2d2fcbf4db1d6c27ebe9fc1f12031 SHA512 829278096bb62f55ea83afed345e8aa2316196d46a80ecc5f5405af62413aba59b9e8fdc5e5d59851c1758f5c308c16b17403d743bd26d364cbf78306d570570
 DIST github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.7.mod 226 BLAKE2B 5a15718354c040d9658e23c403cb330d62ac9975f2050025fdc573dba42b28ae3dc46469090247d5ae136bb0d5dcaa60a3bfe63ce0b3147b33021b45dd1cc25f SHA512 4da6c0d64afd39ad9a930bed77289487a57abeaa9d97906decb8c2599bd658bae72141f78972cf545a2cde2999bc46ed3bbcd7ebbd1fc02e5d95510d33288bd9
-DIST github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.0.7.zip 15512 BLAKE2B bab92aed22b99863147300d4dfbaf24bdbd30358905cf0b9f65cd282b423c0b340668ee3ad6b437f1138d9cc6530960ac0675eb4118d6a256be1890d44924629 SHA512 1cb6de338cd7178dc2afa301271655b8a2a238cfa86dad135d799410760e400487383c095239c469474e5718f6871d81fe101c8d1ec027287084dbc0f09b2d0b
 DIST github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.1.mod 198 BLAKE2B 909b6ed1252280b914e0422f4811c43afd21601481254ac4ec4129b73859698aef8c0b1dc761b3d96ab4fc84008fecb8c06a3b4387505f658847921f209adbc2 SHA512 ad47fc139bbe78d852f1a380fd150770bd74502ef4e29a95f9a6b32c251cf3a1fbdc187de0a1a5fa1fa1d93403626d9cba1d3c10818b7936c4dd643ebb45515f
-DIST github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.1.zip 15670 BLAKE2B 18aa2c4dc9deb45bbde18a1c26b4e31d5b183926231c62d8c2f298afa67ddb873910ece91f71bb87fceb6822d5c4ae2c6e29e1bc67a492e1ed6fc7d8b97c387f SHA512 36633b3afd1cab6c7f841f27daaa9483a1ffffe3644617c5cf8ee9a7e638bd2d6a61d51c1a312252972e4ca28306b077f6dba8377cde194e6cccac769285a4a5
 DIST github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.3.mod 198 BLAKE2B 39086c7747bb89ba2d419812c176b380d5d250718eef888b4248bbd3891d9360fc8d6a4ce97507e84c5d704fdfc36add04e38c4fb30d5c5d0dddaabee08525f5 SHA512 0bb1bf1406b13790b7188a371c4f9df6f7c083d5fa2077825b8f6e1a87e7a8a26fda5d29b039896af7df4b010b80de9fbe95323bea8e79851299bb938e10267c
-DIST github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.3.zip 16596 BLAKE2B 0e058ce09b70f46b4fe1eb1ed092ce9b102dd95a6d87cc10229e7219e9e24368d3ef915f7e89a44ed59c5b5389e3bb1a9760ba97c0c93f273d9c93e2d8c1b894 SHA512 5e29431eede0a30e2a97514fab2a1081053cab6a0dd0f7beca7663a2beace39eb4c886a05a283a620e235e5c6707eadb786912f27bb78ee1e023d70c8c7f6d27
-DIST github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.4.mod 198 BLAKE2B 39086c7747bb89ba2d419812c176b380d5d250718eef888b4248bbd3891d9360fc8d6a4ce97507e84c5d704fdfc36add04e38c4fb30d5c5d0dddaabee08525f5 SHA512 0bb1bf1406b13790b7188a371c4f9df6f7c083d5fa2077825b8f6e1a87e7a8a26fda5d29b039896af7df4b010b80de9fbe95323bea8e79851299bb938e10267c
-DIST github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.4.zip 16591 BLAKE2B fec155bbc40d5e0417dd57f30839e00e1f7ace4048a4ddd9405c3fd801c614a723ad4d11563dd2360ca338811be27679962b1e5a35aa3d79bc423d45c39bb8fb SHA512 5c2f2cb16c1111ce0ee665e36868b43fa8b187b29d15d5dfc54c1062758ecab20e17c0862db2e49794f0efdbe8a1bbcb65861f8ad705acf9d4850b48494abafc
 DIST github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.6.mod 201 BLAKE2B 988e854a7dc638608760b2a8cb252fb324be18fedd35d1322866b744f91efe66ddae73b664a5e52381bc3680be01dc49ad1f558d990601640e3f7cd2f6243a26 SHA512 a00560d67f71fc8e4aa5e54cb5326a7a1e2a1299fbde52f69a72c628355a5a59db0f40b31b5e8d6b6df840136ca42470ea35898c63df6ed20a177ae5ab7e6086
 DIST github.com%2Fipfs%2Fgo-ds-badger%2F@v%2Fv0.2.6.zip 21599 BLAKE2B 03d35feab28fda969f61f2b7bbe4596caf58d62419ed0b9f5d96ae455eee341c1b5505cf49acef9963a3579025967ee1f557bce4b14b8f9c92cd4b33fb28af8f SHA512 2318682cdb637f53baab38ab158ce2d99d1cc6f237f62541523a226e50f24cf792d39d38a93df7172a60a4219487fca35770836c98b98e02154dc9332c6455f9
 DIST github.com%2Fipfs%2Fgo-ds-flatfs%2F@v%2Fv0.4.5.mod 235 BLAKE2B 6ed1ed2b206e1d3f1d7a10407eeff0acdb66f56b772ce4e225b185d897cd9abe8c5e5d7cadfaf89f72b9850239f2daa5a763789bd5f29b09f45ccb74d9eee3ce SHA512 155c3ec950f15f0e49380a3d06fa24d1ef5f684b5563eb2c4e9e8a35bdbbf0d8fd41750bd6d671ac6c06eeb3c470fe639e3d646523d2149d72513e29c8a07ed5
 DIST github.com%2Fipfs%2Fgo-ds-flatfs%2F@v%2Fv0.4.5.zip 35666 BLAKE2B e5cffe612424e2c4e53fb9a1b87a4ae82d6d2d202effaeb7bb55c98f3ff0815b4845bfe6debb666003dcba5ce89a8c1ecdc2c49164e1c8f8445f6d9f03634c5a SHA512 10e45b2583e02afcb26ac5e8f87956e4ad6fa5143b3e28a3068bd515fa90ce8e8874d62f610e4b3d34cfb63e8f373a6190e4a36a75b9e760f32a70e63e998791
 DIST github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.0.1.mod 187 BLAKE2B 46a16d43de9b340db0e80690175b6014cbb348b4463ceb238951740089431a39c9370130361852a1a88279724307ed3e0e2b88bbae1df4c60344cac949f691c1 SHA512 0c17f027d3e00148d258d7b7df388dbe9914a7b1d592fff27f41fa28cbadecb81ece716743bec1e1ffe59f00cd8104fb9ef9b2d682f9e18a82c008c9a1b78195
 DIST github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.1.0.mod 123 BLAKE2B 2455c462d330379f3e1b404ccbd7d772a343d002c358903a20d7b4f52e2ede5d9f0e893f6d34a841354cdc6a77560fe9774635a4d2463da56f943b1c0c1b1c48 SHA512 32401cea39a0efc5578660ff1173137d6fdb7fc82d40baff20e469f9cd5354989d6a65d56bb3fa2a7e34129373346b6ff8ee1518e9c8e20081bf2f481b3e8716
-DIST github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.1.0.zip 9568 BLAKE2B c68f641b4556d754140dfd1ec2823606e1b7c51b6afdebb71431c8359b7e4cd54ab8f489eebba86d902588bf27e35afac29af0610137f69110b5e762d0464f68 SHA512 c9c70b312993827c2fda07e25dd627019d3b1658453c21fc87f457a5bcb39c6f16b0909186d76e4abd09a816ef7cd9f0816e33075da6f1dd6ad95dca31f4e115
 DIST github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.1.mod 132 BLAKE2B e0c3da80a578d8c7de5f39d20acf616c825823f62a1c9637ec3299c23c830103c6135e2c10fd0432b6974f5ca7b506a400d45814e5e214035fb3032192b6e41a SHA512 806a7040b1231d2a177e8d0fd78b3a176bf64e55781488536e7da91a69216509636989425ea679e5323d816b96208568218debfa4b62d4cedfaeb740095fd46b
-DIST github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.1.zip 9384 BLAKE2B df0e8b3f63bf5cdbd93122a0d9d2f2bfc592b1621ae1fdc046b802c571af997d617586272d6fc5126e4de08201894e619b06ceb1cdab33b6bf894a9a1ce62b22 SHA512 39bf83e25523f4893e7ce1c99e0386698b088385136a2eea8cd02b05b45c4acfe26dc1963d28ca9c88e4f008d3e215175a41ece0ee092bbf398a061ae7c6dff1
 DIST github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.2.mod 132 BLAKE2B e0c3da80a578d8c7de5f39d20acf616c825823f62a1c9637ec3299c23c830103c6135e2c10fd0432b6974f5ca7b506a400d45814e5e214035fb3032192b6e41a SHA512 806a7040b1231d2a177e8d0fd78b3a176bf64e55781488536e7da91a69216509636989425ea679e5323d816b96208568218debfa4b62d4cedfaeb740095fd46b
 DIST github.com%2Fipfs%2Fgo-ds-leveldb%2F@v%2Fv0.4.2.zip 9716 BLAKE2B 23db952f83ad1245a86a51820109ea542017e3ca07bb62db7cb377795ecc3d71ce2546bf2a49f321fdb3f67f002a7fdc0dd8aded121f7467062db4216f31cae8 SHA512 412a8aa9c1a95b59864ba93c232097c98e2714dbf691db44cb83f83a684dc96336b2ac956d9b5b451f8193a7ef5d316f2efbe403ea24c5d457531d47904cf95e
 DIST github.com%2Fipfs%2Fgo-ds-measure%2F@v%2Fv0.1.0.mod 141 BLAKE2B af90d04a9cbd0fca5282c46d91899474dbfafd7acf1447d7d3cbe135eb52a0afd8d138c6e411fb25de04946ac5c5457ee3122d29ffd0c12bc66f9322605e82bf SHA512 f4e1db496f757d20be999cdbe0d35ecd1dfce7d81d41f7abd6f621bd906270b632e7f6810f29bc972726f4bbf110fee8b38604400183e5d30ffc13b3570219a0
@@ -372,47 +429,42 @@ DIST github.com%2Fipfs%2Fgo-filestore%2F@v%2Fv0.0.3.mod 390 BLAKE2B 6a5eea505ca2
 DIST github.com%2Fipfs%2Fgo-filestore%2F@v%2Fv0.0.3.zip 30181 BLAKE2B 0567c9ca5e1173ce978f8cb7814fda1bdb34cc7a1f2426329c107cb052755ee5cc23ea127124e163b2ecb551b83378b694178517580610cbfbfd93a091fec944 SHA512 b5ddfd4ad3ba31da1e9dd15bba715cd106ab8e6e91bfbde47ddf02c237fcca9f709fda9cd5202b86e2e01fe60654e72ff275a295f008e4aab3d149b033e42cdc
 DIST github.com%2Fipfs%2Fgo-fs-lock%2F@v%2Fv0.0.6.mod 168 BLAKE2B 0eaaa8bc2ad28b5676a7819b6b780c91d2c8ea720ce84a6f3d411c68777f99bc96c1347d58c49ff2e30ed3a03a307c1db6033732ed47934712c3fdd1960bc858 SHA512 c219a379ccf187bec63abe7ba7e0daab3991370c8ee9d2309667bc4e759b314684aa90b47c744c1db9a29f950cd95c2a8e04cc81be64104642d44335652d39b6
 DIST github.com%2Fipfs%2Fgo-fs-lock%2F@v%2Fv0.0.6.zip 20467 BLAKE2B ad3afc06a873d5a2cbd5d51bfd2df7e207455945637735efcee8415fbd453dfa1f99ac9f53a5f7c1474c3873a9584b4505064232c2681c22c4800f25b3867282 SHA512 cc136ced0efc35bacf043c9c4d10400736c98674d7875f4f626ace80f11222760e3bef5970d4c7822c1001144ba7dc6cb73861829a47b072b23d0ef1c96aa1cb
-DIST github.com%2Fipfs%2Fgo-graphsync%2F@v%2Fv0.1.1.mod 1844 BLAKE2B 10ac461657506608f1dc254a687dd1543b535406a95905cac0f5370a3a2a1fc9f91a60e142224ffc06a170b85801ca7cafd590081f3a749978d688ecef6106e6 SHA512 8c7832606129332b677480a4773de19ccc0edfd236db1239c6ab9a45f477e0b701e9c9d1d5ab1a466841303cd6aa008810d8fed19f2e6bf75fb2043ded7abd66
-DIST github.com%2Fipfs%2Fgo-graphsync%2F@v%2Fv0.1.1.zip 666357 BLAKE2B 48b3d092852ca7675d496f1ecda34c1b7b58355b6bdc3380dc91bea9f4a3fc121315596065167f4515117bb113bf67fda6965c16a41cd734c92924e104936b1b SHA512 626fa7c8cb851b74bb47e79b3766c1346ee28524d7db1c9e8811f7291d67d1f3c9be0bee07935abb4e28492c79a0f2bff14de4a33749dd32bb56c1d1910a4e24
 DIST github.com%2Fipfs%2Fgo-graphsync%2F@v%2Fv0.6.0.mod 2091 BLAKE2B 693207f6e388572563e0d89d9cb85f511eacb863863e32553dc2eda36a24c6f05b72c561928f461a5a7a81fb4cb0a45c3b353ff823a453ec8f251c64ce766f57 SHA512 f2e8bebd6dfceabe03ff6fcf608142cc5354aaede3ac5452fc0c2035e8d9328bb7ac20d08ff62ff4aca0a380c7bd7becf66f0770dca391a949c681d7bcd9c2d5
 DIST github.com%2Fipfs%2Fgo-graphsync%2F@v%2Fv0.6.0.zip 721225 BLAKE2B 946d3ed38fbedcb19606da13974d7bdc6cacc0d810da8df3dd82fb5221c6346778629de95526536493a58989b1d9b621e288700e5c7824b50c2e5a63ae192742 SHA512 ce200b1166e447897456d1fac7023665edfc6bd76b396d58cb20a3b9c14eaab30555219241b2405c4b66ee34dcdb1fb3bdb7935a3d57108a2fe3e6b6bf8260de
+DIST github.com%2Fipfs%2Fgo-graphsync%2F@v%2Fv0.8.0.mod 2062 BLAKE2B 7643a6ff2d2465f27474c494646f4f5337bd357d463bf4084d2048ec2e46a471ee7a78bf8d7c5659fef4d7af9ab1f260263ba87af512cfacbcbcb1addad6e612 SHA512 4e5c4fa656f75370a382335de7ef2408301e1579373f2551a3a6b942f179719c939004712bf3cb79b4cfeb753d3b9528580319b6c6ca75e55cd4419daaaf3d3d
+DIST github.com%2Fipfs%2Fgo-graphsync%2F@v%2Fv0.8.0.zip 685696 BLAKE2B 19d2a20c47cfffab54e0298e7a5d9e76f48b13a13ff727a8413c018146ee9f8ce8b21011495ea6028d0f5dd9604d6a91688239b82c09124a9cefb573362c6403 SHA512 80bf5a9a19ea15117fd9a2505e0911d70de6bf614e3bdc8c5e5482956a641a29839d8505fb5e98f20d7c675e04887ed9e75fd6f7c25e2bed927dc5aa6a6e3007
 DIST github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.0.1.mod 432 BLAKE2B d4793309f3c0b98332cefde219d6845a6804a9a307e4fc9df6620f13e9033438097885c638aa4a1fde5f70e899bd58e558f6a4191ee5a898db69d0c73b28e0e7 SHA512 88bd6d1c1ff00d4c314398dfc7b29809572578679c227d09f96b7e402fb7e1c3d87e490997a7b3d6aae6453a158a9420cdad875b5f12559b73440b9953c0f339
 DIST github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.0.mod 432 BLAKE2B 39574ead189f7cd4b401d62ea5c3e8ff35fe94d3edff32be4250ae0d20d9bab382f2b6695b39b31143d8dcebe8a2c54a4169b92cacb6289d4b7e50439f89bbee SHA512 e4b01a9528fadf8e69326874088d39ab4892a47a7b53de0ee450d6fd8167f7a2afb5b8cf11b17d5882500b662ac879b43260dce850ec7c7e14862b6fddb81bdb
-DIST github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.0.zip 21073 BLAKE2B cc1f15c59ee56d469fd8b3cc9cb9317ab2dcd118831c7a07bb03653f7bd54a8a851d2f8e7786b2c6f6566b3ffe1a9051915c43397aa0d335b9c355a7328c7dff SHA512 0aa86eb19a0a152d1082795b56a5720492a93d4c9e5477b54d5d82b05049a1e9c96c4d22f9cd568ed1a990d8b43727c5acf152bad6b52eb4c8889652e12aafce
 DIST github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.4.mod 442 BLAKE2B 3f28a0f19bc98e52abccf9c3daab5d93377aeec893fd420a0533ecfaa3bee44b4ec6acd425d462e223c084b2254d55f139fbee37a111e415203fb85e62d55d59 SHA512 2f3570b54f2490715506b8c01071413548f4ab9208c4c237b2e8175df6189396ddd5297b0884d663c60745c0ac30bc77163abf58a2b130b2f854b8c1af0d8870
 DIST github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.4.zip 22095 BLAKE2B 2c13bdeca09667dbd550c838fe773caca65ba9f6edd3ebbae2238687853ce90d57cc58b5cf23c48a25d47649468a3feaf1f678b6d11fba4b1df62a0b2ba95c90 SHA512 b64c0e8d6154e8ca92130b500358ab0fa03845e434ef44068095334208b0fd08455c698bd4409354a84a908698bcf301cc4f95ff9ee7d85f63678329977b6a21
+DIST github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.6.mod 442 BLAKE2B 3f28a0f19bc98e52abccf9c3daab5d93377aeec893fd420a0533ecfaa3bee44b4ec6acd425d462e223c084b2254d55f139fbee37a111e415203fb85e62d55d59 SHA512 2f3570b54f2490715506b8c01071413548f4ab9208c4c237b2e8175df6189396ddd5297b0884d663c60745c0ac30bc77163abf58a2b130b2f854b8c1af0d8870
+DIST github.com%2Fipfs%2Fgo-ipfs-blockstore%2F@v%2Fv0.1.6.zip 22102 BLAKE2B 9094953451e2bbf6ebd48b16914d2199c8116a2ffe05377d44dc2dc36b93c44e849ae6a35a4c88d0813da628152e2e91dd5b76d7bbfa75c492ec39d54b4160e4 SHA512 1918965e9d90086cbf87410cc6ca3c62e4bd60a738778dc9617647b52302eeca48efb95d0a10007bd660518c90fce8213961d43b3cf9c7566904fde62f8e7cde
 DIST github.com%2Fipfs%2Fgo-ipfs-blocksutil%2F@v%2Fv0.0.1.mod 90 BLAKE2B 5f055caed5fd1babdfef6839e17ac53ef29a39369f6ad7910889d62f7476d0465e0ffde9a8e24d1921622c5fd4e84120f6ff0cd7cf3ae4e61ea5a46fe474051e SHA512 e147cec13fdc70ae540336090c0dc95fa3cfc7c88ba2feb0007dd1e8e525e152f5f3e5109c9db3dbc27fe86ae72a9243ea7e7052ac26f52be5a6410e53cc982b
 DIST github.com%2Fipfs%2Fgo-ipfs-blocksutil%2F@v%2Fv0.0.1.zip 5917 BLAKE2B 73937eceb9957c17f064283f83df274a1f6ce7ba37580c48dde78583cceb9e873acf671be54f6a959c5faac35026b06abb3819d4ab7f7a17e34cb4c5b184a106 SHA512 b14c306cab0a71aea1dd87d7c47378ad6aeafd4e34f277bc596681c8bccd168f0d08d5920cbf3d579e00f85ec4d38360dac806e6aaf4dc9c11356c8a6e5f4a1c
 DIST github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.1.mod 270 BLAKE2B b2263f6189b6b56f91f0270badd26ad9ef8aea225bb5d0312cfdd3a5e9d07da898d6a1ae54dcb31d92cff61bbf8cd67aa3abc525ba8f94ac3b616a2abbb62379 SHA512 c497b564de8aa700f3b81dcc4c5682d4d1aca8cb95b631ede4f82699b6fe52566f7f4a243cfa16b38c7a33ffc5f6e8b0d92d241a5352bba16b0434b231ba2d35
-DIST github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.1.zip 12272 BLAKE2B 89eadb7fddcdb3467934bcf49e864f2f5fcc1661e68a796ac8334ff86990ab882fdf1ca84d0e997c2be18e7b9cac37b0c434cfd6f29722e4e0c410bd5db8c00e SHA512 462d3dce73e3575d32cf419c102645a6cb3dd06bfb32f8df7c7dc4a8a737ade5d02852f16e03abc14f97adcde52d0d96058eaa410eeca0dbd9124a7adca5aab9
 DIST github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.5.mod 279 BLAKE2B 20cfe5b54ac6a03cafc363fbf4d81dca415380a1db7e5a910aff9eff542c4d6900976e1cf896b2ae7863678ca8f069af5e8f77bf8c57ebf28e14472df02881e9 SHA512 9b34d7f59a02015688f43927d6f2daa5f2bab88128c06bab069f13c914ca3be9870c184873ed3eb3988144ee3800908eac4d66db421066acf190f572bd2d3b4a
 DIST github.com%2Fipfs%2Fgo-ipfs-chunker%2F@v%2Fv0.0.5.zip 16229 BLAKE2B 051b176e1c529f04f8ce0cc95c80975faeb1d0d9036e7a5d3202b1f7c962356f3cd4fd59d3910dd547c70275d3f1bc15ccbc6c5ef379d55597f201ecabbf1009 SHA512 684943b9eee65044548b11b2f6306fbf9a18b9dd1ce5c4b1e0a04b481a602b6949d69ad0afd280e4c94fa06a527133889d84adf514794bfd671aea431869045a
-DIST github.com%2Fipfs%2Fgo-ipfs-cmds%2F@v%2Fv0.4.0.mod 327 BLAKE2B 523b6212785ef7414f1555bd2c9483a0c3aa078d91e5719c49aa218d918d6b815e482fdd43bf3123969353ed4590fd830f58322d090d1f8d589cc73c5399aa50 SHA512 af0986d6981df212e7892f1b30ece2358c2d111bedfc9db3f6893509de935ebb0a34d6f491818d26428641e966fd63b7df48e6c63361010b06fce7574d2ec5e7
-DIST github.com%2Fipfs%2Fgo-ipfs-cmds%2F@v%2Fv0.4.0.zip 96072 BLAKE2B 52f54cfeebb28fd81412af69f0bb5822cbb8fcb95196d0eee54631348f6abe1d54188b231122b2d4c1264736393420a9d19d6c07efb46122306fff64ef88b20e SHA512 c7ebc5d2549feae22eb426b0671e8370fea2cf6144335bdbe6f4d2abb4d3b0afe8a3d40bf43f2c75274a25e52ac4f9925de4e069028ada992de47de9efdaba62
 DIST github.com%2Fipfs%2Fgo-ipfs-cmds%2F@v%2Fv0.6.0.mod 327 BLAKE2B 523b6212785ef7414f1555bd2c9483a0c3aa078d91e5719c49aa218d918d6b815e482fdd43bf3123969353ed4590fd830f58322d090d1f8d589cc73c5399aa50 SHA512 af0986d6981df212e7892f1b30ece2358c2d111bedfc9db3f6893509de935ebb0a34d6f491818d26428641e966fd63b7df48e6c63361010b06fce7574d2ec5e7
 DIST github.com%2Fipfs%2Fgo-ipfs-cmds%2F@v%2Fv0.6.0.zip 97737 BLAKE2B c098accc82b463c8bbe7e945392a2eb3490104b771acdaca44579a285a4c205e951bcae6a235f489d3baeb04d7f1d8d1d55be0082fdc698e251b6994e92fffea SHA512 d59f94b531aeaf15179c362cfddfe797a0f9d6053253843b38f58734d77c1c0d857ba97d860d9ec3821a91a3b144e19e658413a6e53e141a2b01db3067e8cfaf
 DIST github.com%2Fipfs%2Fgo-ipfs-config%2F@v%2Fv0.12.0.mod 302 BLAKE2B 3552c21f879a0ca367f16de6b6182471beffafef28835afe586a05eb25085e0d90d6959ddd7536668e732bbcaaf5251fc52dbcbd21bf0775f6e95c93154e8636 SHA512 d0c8b090f621c8326b53b6d008226544e512e12a782ad8a6ec274d77728e173a5f427d19eee3673f2c33d0db54f925df2c173943d67063e1761f9f165fd5b986
 DIST github.com%2Fipfs%2Fgo-ipfs-config%2F@v%2Fv0.12.0.zip 48447 BLAKE2B 1fdd1b46a63e0cf57c0417529294f2c34eaba46e83fcf009f4b25858c26aa65725885baba189a9da31f78c862ce391a1c0a333b514bb3b1d11ae4f765fea1f6d SHA512 e7dbfcf0dac7a8aa244735908174f73ee7449bc19f2ad8b29b176aa75ad979bc4e5aa6b95a14003fef26a61a0b961c7807463a4aebaae9cd801e6b8568d042a4
-DIST github.com%2Fipfs%2Fgo-ipfs-config%2F@v%2Fv0.9.0.mod 302 BLAKE2B 4234c01e30cb45a6e86cbfe13b727a66ebd47969f5336834e15de8fa0d1afe8d7f80ae42a2bb828c8c5585f68fd8ee60ef9dc2a79642b5e58aaa4988586343ef SHA512 f5aa9e34056a48d6f983545da0422f7cbfba65e100d37c3e785d5f28cb0c718cbc440e80b05a2605267cad7f518d186a81cd7165278a6132211bc17667cb91f3
-DIST github.com%2Fipfs%2Fgo-ipfs-config%2F@v%2Fv0.9.0.zip 42323 BLAKE2B 8d542ede4777f606675b5ce96c2569f12fd360d1b7350bab48c058d2cac73b6148fa7960a2229ac02b4809e3036b99470044c238b0650962b468d739fe523064 SHA512 6fb9e7fba7444a193cee631c9823a82f5099840c83f2dbb460cd7c2fc828645b623d8195d81cb99c35f1201654f9ca30655613a81586daca3e4d86290cf68169
+DIST github.com%2Fipfs%2Fgo-ipfs-config%2F@v%2Fv0.14.0.mod 302 BLAKE2B 3552c21f879a0ca367f16de6b6182471beffafef28835afe586a05eb25085e0d90d6959ddd7536668e732bbcaaf5251fc52dbcbd21bf0775f6e95c93154e8636 SHA512 d0c8b090f621c8326b53b6d008226544e512e12a782ad8a6ec274d77728e173a5f427d19eee3673f2c33d0db54f925df2c173943d67063e1761f9f165fd5b986
+DIST github.com%2Fipfs%2Fgo-ipfs-config%2F@v%2Fv0.14.0.zip 49222 BLAKE2B 8cc2eeebee3ae9ec57a271f0aaeebfdbb8fb9c9e95cbc4a88dd17571c22035640a243390252c65c299bc3eb30844262c25d33d7609fbe84c206445aaf23daab8 SHA512 c42aa83ad915069129c9c8a8c76c49e7abd8f0ab29cf0d24116be0dca088f230d5c002f940e9a971ae719fd2d7696a4dc5074f639df600da613546fc53873d47
 DIST github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.0-20181109222059-70721b86a9a8.mod 37 BLAKE2B 5e6f830a59cb1b8b107c22fa33973fbca971cbc4b4847a00a893008ee64da10eb7c854af9e3b51d28fac8e5cb231906f415564326611018d931c6eeb00d9efe6 SHA512 0b0f78bfc8db354d3465f743a69c542d91bf202389e3698430afed9bda7d8e2f179dff3cf69044b93e7358b22579883dd56e31aef3458d5a69eb30c62283405c
 DIST github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.1.mod 37 BLAKE2B 5e6f830a59cb1b8b107c22fa33973fbca971cbc4b4847a00a893008ee64da10eb7c854af9e3b51d28fac8e5cb231906f415564326611018d931c6eeb00d9efe6 SHA512 0b0f78bfc8db354d3465f743a69c542d91bf202389e3698430afed9bda7d8e2f179dff3cf69044b93e7358b22579883dd56e31aef3458d5a69eb30c62283405c
 DIST github.com%2Fipfs%2Fgo-ipfs-delay%2F@v%2Fv0.0.1.zip 5966 BLAKE2B 416c61a135d2a086380091776d952e13a5519d65cec048905ae9257eb3ce5a4dadd15b72380f013e42cbe45c7440564436218a5a9a83b17cf4f5fa2c403c07bc SHA512 a87773dec15998836ed762db218bd39fe1fa0647da470e6eeca0be7b6454e8659844e37ae32efd33ba24cc2e5a5101fa633d42c5f3f5ab9dc68a544c215e4449
 DIST github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.0.1.mod 162 BLAKE2B 7f72ea52bb48b2dd9e7c72d235b0976897da8d959d5aca446a8d37d92308ee3590b46589895d0d4775c07c1a6a1a8e3661f112fde5ad91cfe2e078a87ecc10b3 SHA512 9182f87ca28cfca32ff5aa2e776cb503aff01cc6bdf0c63e4637836298c23a23b831abb3f7fd40f3212840874e5dbeafc95aae7295b21a93f4ad969f0d2ae06b
-DIST github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.0.1.zip 6780 BLAKE2B a05dedfc93976141ef060bc81ebcc77555dd35bce91488232f66b4a388eb7c234de28163b36123582ccc11e93f62e7f9e32471eca0c3131a2ff890887c3ca496 SHA512 96b6a5e8977e63fe548423d6f6dadff239362e8bcc814f61df11b478ee4efef2c941ded9189d1f96c417f32493c92367cbe5dbda14f4913e01dd8a0b25bd2c23
 DIST github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.1.1.mod 162 BLAKE2B 89ea2e362eb76727d61504a371b28c3000349ddc9c43b9afcf60c446c55222e4241bb491365b0199b87d83d4f2c16e198d358e95ddf050c96ef1be46bc0eb149 SHA512 a94b175b1756b6b1e3c0ec4368e288142dd152eca12c2f30b8547b0c41a864a44596ddaedf139143be11ded9bbd5040231c99e65291c2858774eff0a066093af
 DIST github.com%2Fipfs%2Fgo-ipfs-ds-help%2F@v%2Fv0.1.1.zip 7136 BLAKE2B a9a7dd3cc3b8aefb61709ca8c9e44bc94cf70ca314146a30e4cc021f0754e94ce65670508fce60af34bcdeb6bfe237f1b9436edb61bf2b36a3253fc2290f06d6 SHA512 4d265ae931401e0b285d9a54b093a202ba9386c78de3f0d71731d23d527d625e38a4bbe47b18fe77fb9e423f05f5767d5450959833dcc4010f683451c9480963
 DIST github.com%2Fipfs%2Fgo-ipfs-exchange-interface%2F@v%2Fv0.0.1.mod 134 BLAKE2B ed35da45f5a552d26fd9a78119d538994f0e563f56d83aae6eeec2076aa503bd003e677b33971e64d7dc5e2f190470e33760c068870b7ee6d4952f4a261cb6e7 SHA512 c742dd6a6f077f39f44057b708133c12819acc6968cd8c555a4ade18417f4f525329cbee8bfac1dc6cb8f8fb5ddb6fa52ca2a208d47ddc9aee48ef309f1c4a72
 DIST github.com%2Fipfs%2Fgo-ipfs-exchange-interface%2F@v%2Fv0.0.1.zip 5712 BLAKE2B 27aed07bea15c49d5f7a0ecccfa92156d350a1d9776dcd819502f43dca54cf42a005488a37ebd13ba274b15fe9fb153a02536d8b83d17a2a4f88f946bb2baa0f SHA512 df6aebd00b29e6748d58ee8650ea98283fc34f774ec44d57d3e4125b8692b4b9a2104754fd9753c8034bdea52d9a7b7bb354a72432874de82b873e03981c2fea
 DIST github.com%2Fipfs%2Fgo-ipfs-exchange-offline%2F@v%2Fv0.0.1.mod 343 BLAKE2B 5098bf5d71fc4d31b14754371498cbc8cfa50a8e7333199e01f30f9824462e12150ade8f856738e32f4d11f187b2a719d8f4f391fde7c9894720563fb407f4b1 SHA512 861ded55a2d9e834e1fa6c849ed2079780cdc4ac545cd7069f81bf2d5156ac3740a2cc66bcf6edcce1e6dd4fe40ba525897190406134e9434c64ff5d6c0e0902
 DIST github.com%2Fipfs%2Fgo-ipfs-exchange-offline%2F@v%2Fv0.0.1.zip 9631 BLAKE2B fe65e528b58b2b5655f414b3e83c6c872ff3976dc33f61ac0744abc46f77e4cbabf46026fba71e6cda9a2cec756d1f44e9553d8efe8bf019a42f33303eaca7e4 SHA512 2f78c0c3d5f515b0d7c4642f2672c8aca9b12237db05b212b6d6c871281dcf9dee5a7cf7ac84d0f05c90577f8a83606ad96401d6f034f0c510647bf457e8bd21
-DIST github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.2.mod 98 BLAKE2B c7ed8445dc0dbd0a10314437192631a667e2166c7a7a5edc4d23fa9773a0c20614f5ff0a0a6cca0cacd6afa57a34e22a04ffcb1cf54fcca59d7a35f405b80c1e SHA512 755648ba658690c6d81072d3dc9618d74b209b25c8e40a2ba7bf61e04dbc12c15028500a69ec399fc74ff605708a2b813197447ed13e3e6cf6eb34298bd57312
 DIST github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.3.mod 98 BLAKE2B c7ed8445dc0dbd0a10314437192631a667e2166c7a7a5edc4d23fa9773a0c20614f5ff0a0a6cca0cacd6afa57a34e22a04ffcb1cf54fcca59d7a35f405b80c1e SHA512 755648ba658690c6d81072d3dc9618d74b209b25c8e40a2ba7bf61e04dbc12c15028500a69ec399fc74ff605708a2b813197447ed13e3e6cf6eb34298bd57312
 DIST github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.8.mod 182 BLAKE2B f71239caed5d433dba9765f1f446651648702dcfa03007737aed6ba01e62829ef1b42f4760f3270b7502a73a751b2c987d38af94a7ca179b06728db335ae9452 SHA512 f9991a1817f31167c9b19a82551918c7124232e520e4c4c9c692d7c4c3ea9e3a7122afca0681d15eeeb6479d76275d226c795627cc8c0b08365c2e2c5804cce9
 DIST github.com%2Fipfs%2Fgo-ipfs-files%2F@v%2Fv0.0.8.zip 24395 BLAKE2B bdfa4b8e3832721564e8b674759fe129ebf381a709b370501f6570c14d962a406c8ee4ed315ac09e5aec8ac2830e5906b513f40940df7bd91384706e78938b8b SHA512 43c182e3e5e1391b49480402aeb59da141a1f06dfee158b0c520762a4e4650bcdc3703e8eaff8868ac86d3a0ecd9563e9a67d13bd149d85efa3d142301def978
-DIST github.com%2Fipfs%2Fgo-ipfs-flags%2F@v%2Fv0.0.1.mod 37 BLAKE2B 39aa6b52e95540369722f2089063e6b516b6371021f43c6b16dd4d182acfae998831f4a9beae1deb5040fabdeef261151481a8adf13a20839bb269f4a59ad7bc SHA512 870314a6806355cbb496b5a8612344a006f42ea85076b9e9baeb311d1c2681c89df57e5cd5e016e6e320a62fbc8201d0684b85a26d214f07e059f17e95477c95
-DIST github.com%2Fipfs%2Fgo-ipfs-pinner%2F@v%2Fv0.0.4.mod 437 BLAKE2B 79021a20a05feaf934232aba39b0525c6060241a94c36c3d31633163f1ce58cf73d7a633679b2c37909f2d74c990f2bcee558ed920340aa39defdd42dea6cfef SHA512 31a90734e1b54482911051827fc7575ed86b6cfc9567bde511dbd62e334bf29e129b5b7fc7dc07201595004cc8dfcafc515d2a113cd3c28f61b86ac50e40333c
-DIST github.com%2Fipfs%2Fgo-ipfs-pinner%2F@v%2Fv0.0.4.zip 32950 BLAKE2B 338f5f6b942a427b703ce1ce22fb3dfe52e20533fdcf6af07e08648e1a970fbebb01515b34eb23c8212094f6ee1666fd074733ebfb5ba6d471d88172f21fef20 SHA512 bb9295eda8274e53673c06e8cc9aae57d176dbabfe88ff163b2db1031c02a8e119cfd6af2ecb4f4b1de0c43652f4d11cdfd78114f67a1ef8000beb14eb5af238
+DIST github.com%2Fipfs%2Fgo-ipfs-keystore%2F@v%2Fv0.0.2.mod 134 BLAKE2B 42f94d32226b6203a77b237b6256139788b1bc5e30dd1955c1b98b4a93d8ec13ecebc7f5641234fcbf9068393fb9ad07fbb619e5fbe0a47948e22fa2f1bb60b7 SHA512 4d5d9d00f53dbbe5978e16847a82b3597351e2226e2c43dbaadfc4244016fc4de99461d2559990dcd6e3000c23c40f28613e5e1cd329f5d2f95d24b2cd68795b
+DIST github.com%2Fipfs%2Fgo-ipfs-keystore%2F@v%2Fv0.0.2.zip 15711 BLAKE2B b99a2e772fb25847f37bbc1b6f4c9e1ffab31f00b5cda17bf3b4f42ddd827423f5a2ad0cf49a15357825bedf07acf4f8401d809b95c0002df931a4d75d0ba258 SHA512 7dd4492cfd3b4cd52a1859fefa9843c6b81762be0c1639eddfe754f2e3d1e947711913a74285085a50c7ffa6c709c3d724595bac5da95279d1a59e83f20d2581
 DIST github.com%2Fipfs%2Fgo-ipfs-pinner%2F@v%2Fv0.1.1.mod 582 BLAKE2B d1b8596c3487a2849822e3fba3a858ce00e28f8501144d898598361fe9bfb206a5cb56067f20f433e0e6db2625368fcc82623f232c001ab5c8ed8b46cbbdc209 SHA512 39e770ee171a70ca8d8b3c43b98ad31e03e5720202bd0471d648d4733e9ad94fe441c28e1844e2caa9781a38ab0a4d74cae2e180b89f8be4cc82eff5c20dff24
 DIST github.com%2Fipfs%2Fgo-ipfs-pinner%2F@v%2Fv0.1.1.zip 57526 BLAKE2B 4cf32bafd8196e8c1bbff8e5b062691f114652a93b5403ffebd8b8f3c5728f6a3543b33f6efcd3c9a567919c285f1d684e571bb9dab5f41118e468cd4023aaff SHA512 922d96fff8cd5820668aaa6213513719436aff26962fc68c332528215790e0f63e2890845344ac0f9e14f7d3cd0a479de3c300dd7a6d9c6284b074e182a85214
 DIST github.com%2Fipfs%2Fgo-ipfs-posinfo%2F@v%2Fv0.0.1.mod 86 BLAKE2B 9806289d763999310b956c32fc0de0230af6d8262954cdd73a95b968c14ff7f8a92d3ab85843e76c01067332f397b6e51aa74334da3b556130dc785557ad6293 SHA512 fb0c0728ad8b85fb792ec273cf755e51fb15a627dcc5b72b39a269f4eb38db15a9628eb657232521b938d7b5f828864c9648f37ae72097bb6a5dbb59e854905c
@@ -422,59 +474,52 @@ DIST github.com%2Fipfs%2Fgo-ipfs-pq%2F@v%2Fv0.0.2.mod 34 BLAKE2B a3b343eb6f5d149
 DIST github.com%2Fipfs%2Fgo-ipfs-pq%2F@v%2Fv0.0.2.zip 5628 BLAKE2B 733004ff4341c8ad5390ec00d314c293b7c67f7ece6b7a75e6df15e860b184dfd4e1305e3884a5c17cd4f017442d53682070f1f0881700f82070ec594b866ebc SHA512 f79347e910c7c7305b7a758b6da2eda270a3c9111b0807e9617bbba13527f084659e1ff344cd2d43db4770d86f08f936cb5b12042437759af17be9c28c26dcc6
 DIST github.com%2Fipfs%2Fgo-ipfs-provider%2F@v%2Fv0.4.3.mod 739 BLAKE2B be2c0202452ef662d84d3577aaa109e07f37e184e157e04edcb91b04faf10fdf6ffea069b3ecb490c915a78aa9d918279204158765513dc905d4a4ee5c6d82fb SHA512 1c648b9bd3bf1d9acd9b30d7fa235f050580454622140340dd038db38bad5ae82cf2d9b615658b1ae5d11bedfb64ce6a62b40c5ad199a2792b8a06c032c16db0
 DIST github.com%2Fipfs%2Fgo-ipfs-provider%2F@v%2Fv0.4.3.zip 33387 BLAKE2B 7a872c4816ec491796f17faafb69c501d32efcb3f85b5f1f9e063af76c392e4bcafd373ddf9053692d977aae96603ab27aca01395e28aca3c1ef203c31c2994d SHA512 646b2c0b2e86cf56e58ddd70c61007381e2a82a365475cd140c531e7be06558437f4644fe45dda700c6cdc530b8a4baeb7986ccaf1b8ff494d1f9aec3abac429
+DIST github.com%2Fipfs%2Fgo-ipfs-provider%2F@v%2Fv0.5.1.mod 766 BLAKE2B 9e9a82a824098925de65729041615f535d44930e86e1e4ad80c6305a4be1fd1e34d2048b413f969c7c5dc84912578b06e9141fdda7ddddfc351675407dcf0775 SHA512 96f9dbc62d12531ad9e843de01dd03fe5b1d5031b6d03e113f96f6ef7800a23bacb41efaab85bf47498bbee98e54e89edcbeea34dfb5ae4616922de858e80313
+DIST github.com%2Fipfs%2Fgo-ipfs-provider%2F@v%2Fv0.5.1.zip 38078 BLAKE2B d2bf3c3213d7e844da4779b330d067b9697a96d8fa8e64fd8ef3e782a0f8716f9c045b55ccb84603e7a6b79dfaa113be157d54bbca75f819ef3da277bd5d1958 SHA512 1f279773397c453902b4a79a06cbe4d9f7c13501a0ffc3d8acb7303c1fcc6e84d697210005795984b38589176017c0d06a5054b375b16fbab3f49b0551fc84a7
 DIST github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.0.1.mod 642 BLAKE2B 3a1b4fcc17a0f2a4424c1f993a3f0b83f1ea35cc75cf3c3b094be0b7dd84540458096bd4f475abd0c1eae79fca88f90d80869f10cf858bc0ab8e93dc031fc13b SHA512 a7544d8684e12cd30f30b379693904d0a52e517ff6e0719de859b993d6c55a9ffbb3122c1bfc1b81dc8f9d29a8672c447cadb095b7d1db91381de1b4904df4ba
 DIST github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.1.0.mod 517 BLAKE2B 5beb7e711008fc1c026ee95b18b191716c04ed7fb5e0e2fa46926e98bad5474fefd59111b8b5e18f04b3036d857a16e45b517ad18636561fb5fc37c690f74650 SHA512 94bc87529b47d9d0045d7d9f35397357b65050d986ecbe482324b4dfe84c451bed1923f8e827b1deaa8eb62d4940cd56bbd5545084f950a274a60c91d3dcb48d
 DIST github.com%2Fipfs%2Fgo-ipfs-routing%2F@v%2Fv0.1.0.zip 17039 BLAKE2B c6b57da51d866d2792d92e06fa5e42db66ddc358973b069978c952bd84b470f3270a7d575b5b8c7be84057f244099bd38f418a135f80684eb544db61ce62e709 SHA512 7e1deaa5f86a9bc4ae612be38c84d3179a322edc0cad0111fece6a862cc15fdcd5f543403449c82ffc342dc81d84917b8fa388745fa4d38e0383131ce95acd70
 DIST github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.1.mod 128 BLAKE2B dc1417a0498bda006324c05edc8da5650010b255aafefbd062f14ebb712b02433454c4372c7ffbd5d7aa4e5cdf79907b1f2d0e5622d3a9bb1940858edb7fd80e SHA512 45f56f0c666348316ef9d80cadf2e85065224e67ceef9c2ac0bfecf88e256ebfd2a0e7bed6d155802e0db268c55c818bc3ce57dba5c17fa52811fc365186113b
-DIST github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.1.zip 8502 BLAKE2B 7bb64bcb0c0215a259c395c34eca748ea428baf04413fa525e9926d1e6d3344125b6b22d302a0c43c28b1f408c1f6edd0b7c2ead62acf8235eb93a2d0e584aef SHA512 690381207ba8e3d3fee6dbaa220211bbb495eb213c4ef3732a518f76bcf821d90ecf3efee61b69cab1be0dd2dddedca9dad52b6b258574024c31f99f7363f815
 DIST github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.2.mod 138 BLAKE2B 4e32fe4aebb29d1a42e44ee55dde29798c0e90020a31ef6bcf81a173cd30461e68118d1e2e576cb9de2ea0934bb1b1796cc066c977ec9f9b6a3aa683a92419b9 SHA512 e4b99f1740db2caaff415ba11c8bf991bfaf32aa22e85ea53c3d96dcf606ec420b1a7e1713d2b2cb0ea7e7da17cabbd8291b1619c960e9567d66b33f369fc0ff
 DIST github.com%2Fipfs%2Fgo-ipfs-util%2F@v%2Fv0.0.2.zip 11252 BLAKE2B 7d8faaf604c42a3e5a74ac641d45eed68597695bb32ae1d9a6f00d817b1a4c291af102dcb03865501b68df5597dca45e75bfe0927a22f95fbafddeddf239f2b3 SHA512 5db8e6f8cb7558e75bf123fbb83deaae3065d7a1d649cba028dbcea646dde39e1f3cf878ab0c59627694d6da92298aee39c28344219b500742b8ca1531ce74cc
-DIST github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.1.mod 461 BLAKE2B 7a6a5e0fded630305ed3832b316a0485b10d98c8b30f9a97fa95376f0343643ab34f2beaf9902577b91dd2564ad58bc5d0c2e454be39d3decc817cf83a346c7c SHA512 73f8c02583f55d71bca5f7b76b9f50553134f7418301e1656cfe5481a0db326efd8a8a6b4b80ae79e8f945ff619efbbedd11957016c58d6ba9f39a1c865b4314
 DIST github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.2.mod 461 BLAKE2B e67176c11c59fbacb1b9a33a0e6792d38340bd84fbc4fdbacebfebc04416810606fbf2b742423888b5463589c701f11739709204577e0073c96473268df3e2e2 SHA512 199993d4fbc15a79787e4c66c4e32bc9d19bf1d3fa327a7162cfd14df3e73af9162f1220f3d66ed9dcf34301ea9c8ab9f00dfa0d6992fa667c39e00180870133
 DIST github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.3.mod 461 BLAKE2B e67176c11c59fbacb1b9a33a0e6792d38340bd84fbc4fdbacebfebc04416810606fbf2b742423888b5463589c701f11739709204577e0073c96473268df3e2e2 SHA512 199993d4fbc15a79787e4c66c4e32bc9d19bf1d3fa327a7162cfd14df3e73af9162f1220f3d66ed9dcf34301ea9c8ab9f00dfa0d6992fa667c39e00180870133
-DIST github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.3.zip 23581 BLAKE2B 294e7192b3c633f2b5eaf9b323000fd48636a1b51c9b162e7334e08100d3902e97d6547e708e7da3114de4d6c8a8a160422d8661f85ec774044d401d9ff4c4dc SHA512 9f288a33393f77adf579f49f30965c8da2273ccd427b88567d57c9d67fcbc457ca2864265dc457330ac7cab6416c789c31edbace82d33952e75ad96879f4135b
 DIST github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.4.mod 541 BLAKE2B dfcc5d4526ae7b0cdf0296b106ed7f587d04f20ad829934cc561ad7190bd3cb4cc00c41071e09f9a5e6ddfb406ad69c1c040a491d7277f3bf59ea8f1e2dd5af1 SHA512 2737341e95ea080f3548438036cf026118d17d34cb1f8678d67cbbbb37d3f81ea7d05d9954ffa4b5421c2c9149d506401defefcc09f200104e5845acadc0e40d
-DIST github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.4.zip 25649 BLAKE2B 08241d17b45e541bb3a384f7754bfe10ccf314ef66cce25d5bcbde8d8bf5df59cce29f021a0bdb5d1fa08bdd19d3ae2ca7668919a3238f6ed96fe23740b32c6b SHA512 6e6aec37804cb3b3c32361075e79128f246a201bb469ddcac6198aa6a1eca6b2a1079e71c946dd446e160b2532038ad331ec83e6e3682e6368df392b5b7304cc
 DIST github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.5.mod 541 BLAKE2B dfcc5d4526ae7b0cdf0296b106ed7f587d04f20ad829934cc561ad7190bd3cb4cc00c41071e09f9a5e6ddfb406ad69c1c040a491d7277f3bf59ea8f1e2dd5af1 SHA512 2737341e95ea080f3548438036cf026118d17d34cb1f8678d67cbbbb37d3f81ea7d05d9954ffa4b5421c2c9149d506401defefcc09f200104e5845acadc0e40d
 DIST github.com%2Fipfs%2Fgo-ipld-cbor%2F@v%2Fv0.0.5.zip 28728 BLAKE2B 3dad7abafc2e7944592bf5528188fb8b8e64f14898a301b6b054849832482412cd8d059468d3bf8d052daf673f1172f3c8a46cef210c70739e56c02f17ed2e9b SHA512 f61673c96e41f0e0ec201e78b8646639167917579ea2ed2208251841f0f59c362d5422916127aa99151e8470fb5f25bf88ea5d15ed19580fdf8305d72e0a841f
 DIST github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.0.1.mod 167 BLAKE2B 1c6c2f5bfacab67dcea158f31e88f937f960b3ea7b8bb5c4d47aad81c13ea8b3b742b89f53988666acc0b6fc80463b0a5ef4f244a0ad5ebffa3da76ceb1075d3 SHA512 00a7c4d1e6277926861452d31db6eb0daecb8526867e2026adcfa2d33ce4b572dd8536abc5ad8b8776611dccd3bc6de9ec7fe7f5064dbf9751ec7b754b9a8dc7
 DIST github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.0.2.mod 167 BLAKE2B 278160452736e8ebbbf073b2fed2c57ea901dc8c8e2aa396b7da484f55835939f2eb3a7ddbbd8e8a67c4b0dffeaf54e16ca7b4e0d03fed20a026b39d90562aa1 SHA512 9e0bafec31d2ba017e80757dec5b47d2276c4293d8338cb2d036eec74ea29b0a515901f64371578d75572491e8f8a130129c824dbcc1accdf87b23412b305713
-DIST github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.0.2.zip 23636 BLAKE2B 3e386dca86fc3770542f5f701eacd93fd7ed21d2e5f640e9c0136956735378c1527d16c7181752dc67c1de48c847d616b8b670ba46756861091caf1f2504e2c4 SHA512 9ed011ebc324608631a9c2047a2d3de47345dbbaa9fd2cd6ae1054d6e854a3c5e6f54a2f8629e3d7a4a56202c8b7f97d3a145dc01fd03eff5118978dbb073fe9
 DIST github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.2.0.mod 229 BLAKE2B 45aa5fcc8b2b6b91ea6a06803eb048fd6d5e482c784d336b508798b5c66b723c9acb6f28cf14179f05ee49910617c58907fe10d9d59e03a17f07d293530da88c SHA512 0352bbee0003337ce1ae7d4bb156a5a1c47b00a174f5fa1e407ca1c843b8f32f2b5a830fc2386e8181f60e2dea1ca9367a0188bac2cabc75b821dfabfc1fadac
 DIST github.com%2Fipfs%2Fgo-ipld-format%2F@v%2Fv0.2.0.zip 23855 BLAKE2B 2c481dc1af7b46089215c5c208da169cc3495a37b91aba10ab14fd83acc3afbbff47763f680a2492a0cf9d72ef59dea6a7d070b33e799c3638148f3599a640c1 SHA512 4f90a052733dd322d223e89b2be8da97115a563743699c60913f8e00ae94612591603401bc7504e577d6a3afe4f38d314cfc92f21852a412c9af118a4458a09b
 DIST github.com%2Fipfs%2Fgo-ipld-git%2F@v%2Fv0.0.3.mod 203 BLAKE2B 3f4f9b59bf86aca3e751e9bdd1d123ebec3abd1dcf2bfc9ccace7a9e0ad30b7ade5b6872ea618d345427ee6f8737b4416a96afeac28e1d7bd9598ab56e2ffd8a SHA512 51f3d8ea1842667eab03e4ce7d5f7a9bf0bb293d5828c799f1a3a59a06141cddcd017373f5642401b148493163ac83d165f157aeb3cffbb4cb1347e5ba5fb59c
 DIST github.com%2Fipfs%2Fgo-ipld-git%2F@v%2Fv0.0.3.zip 29976 BLAKE2B 6c3104ce3e87e7f0cd9941bed53db154ed1af022e5f75b5978923dc7aa42014e3396c024a8b93cd74491cbfc02b97ee0e49463420b4bc11df1dca1018aaed2ef SHA512 84ffd8de70248e9dceeb4c760782432763b836e6ded750c71876e80db638cefd6a9e9ea9cae1e568af7b2aed32870608e799274a3ab221adf13b72af8673567a
+DIST github.com%2Fipfs%2Fgo-ipld-git%2F@v%2Fv0.0.4.mod 203 BLAKE2B 3f4f9b59bf86aca3e751e9bdd1d123ebec3abd1dcf2bfc9ccace7a9e0ad30b7ade5b6872ea618d345427ee6f8737b4416a96afeac28e1d7bd9598ab56e2ffd8a SHA512 51f3d8ea1842667eab03e4ce7d5f7a9bf0bb293d5828c799f1a3a59a06141cddcd017373f5642401b148493163ac83d165f157aeb3cffbb4cb1347e5ba5fb59c
+DIST github.com%2Fipfs%2Fgo-ipld-git%2F@v%2Fv0.0.4.zip 33260 BLAKE2B c0288df8c9324a5bb36bbeff70894821d594678946ff6505a9e54e11debef142084ded1c2bb9646bb8817ccd013ceff34493ef79037dcc2afcaba31e7e3eda20 SHA512 6cf74b11c6fa5386046f9fea806e3bfa1e1dc1f62096dc3bee3d30b8d716ccb50d4858ff49c59da83e09d50759e133f2dbcdca05ec13146766d5718a57c88ec3
 DIST github.com%2Fipfs%2Fgo-ipns%2F@v%2Fv0.0.2.mod 284 BLAKE2B 18830339b089781caf2d8d145898fbc132d8831e89284438aced0f641fa7c5143f2ac98f02a046ad2d0145601cb60f9ba44279ebb3a878f8fededf0c5d5af2e8 SHA512 13f41b4e660ea39ee20736ba9eb9b377962c0ea394faf78c0e027683f40ddf4d065837403a7481ca5b6921617fa209c0506810bec013190ed170935c6ac9769f
 DIST github.com%2Fipfs%2Fgo-ipns%2F@v%2Fv0.0.2.zip 27803 BLAKE2B 36ab439045ab1db440eb9912633af496aa7b794668627e32b68b2382f787166644cf88c38d2d67a2f9d4c0be155fc36ecc9709475e3f865ffff720b56ee858a4 SHA512 f6d93e44b0991ff0f9c9df90c0070baf8adfb57cf091cd5d8c49b00a25878a640ff861f799826c66e298cf17a0ed94cbe5f906dc56f7e6b090c6d366c55d2235
+DIST github.com%2Fipfs%2Fgo-ipns%2F@v%2Fv0.1.0.mod 398 BLAKE2B 6a6f49af667c78726464876bc7e66a4a0d4155be70f8ab16bd91dfaf32d86d874099c0ab970ac96fe48f3e40069cdc13752ca973f265295db931efb886d15124 SHA512 0055bb26a7aada26fd1178e86d2866b20b7c22bab255383fc3916b6c8102743867b203ee2d7a052f2e2917389ed59637a1b884ebd52154645c69082958d3ee73
+DIST github.com%2Fipfs%2Fgo-ipns%2F@v%2Fv0.1.0.zip 34851 BLAKE2B 3482d1b66bd1abe4b48b01c3ec5a1baeafbea5cd6a07c98df8a97f0652817f032bf751f35ce8ac24a4cd8de66fb731b4c75f82c41880955a79f048eb69e9aae3 SHA512 ee6dc9b11a5fd7a4b792eeaa6a6d52481fad9ab9f4e3c7cb234925de9a057b62ede8e0e2ff0172aa10fd25627fa86b134ce8dfb7601179ef87d91b4b642d1ba2
 DIST github.com%2Fipfs%2Fgo-log%2F@v%2Fv0.0.1.mod 345 BLAKE2B 5114c21b10163a82815a747a5e06ccb49e872ff66ec824fb3103a95997f9524cfdfed3355c7aea5f1233ca305ac455c09bc2323a074c1550b6fcb705cd779d02 SHA512 26ceee384c2a1edf4d4611a30d7e7fff22039dec08e33de28ccdacc89243746202eca4523c5350f87586c126c43e5fdf9a677d5f73a7e8fb6746f82d8ecb2bcc
-DIST github.com%2Fipfs%2Fgo-log%2F@v%2Fv0.0.1.zip 42796 BLAKE2B 7068f99ce6b082312c146366ee8ae77a9de0e9cb1c96d7d24c3c44132801687bea4980c7fe44dee0f4ecad9f8cafabe0bc4dfe0acfadd09c9e4307d16fe040f2 SHA512 4ca424215ff6f7fe552bc52808753380b56498b185101aa37bf76a2b485926078b64d42077ee78abea6d717784edd7417c3b40399861fb0ad98ac762b2db69db
 DIST github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.1.mod 190 BLAKE2B e1a73319de7af940fb71748a54e687e8d27d54e8cf93ba3ab56a5322a291722454fe8b919ea88191361db1b466d3764ab4e15fea285ae6a3e3c0f80358a35d36 SHA512 e02e47e7bb1a3962b8a066238cfb745435020c500111f20167b862e4687af44c2649b4c731bddda58cebbf154cdedf5a0026bb5fe536bf5448d91261f7b9cbfa
-DIST github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.1.zip 42746 BLAKE2B 15eab78e3ced6371a87cbffab680098c7f1d0d78087012970d971ff0056dfe71474aa914d2c1b6fba41985a3ea6da81ca7b2c09aa66de5a685c8c545bebd9836 SHA512 7962c7d700e3ebdb4aab17fb8d2444d500fb36f10e20a287f0f929cb1622260509271d19392bea3fb8c50a4bc2589416d01bd7a1a06942999fcf49677f224bc7
 DIST github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.2.mod 190 BLAKE2B 0d92b9b211d493b47404f911ab4a1a5c7248b53580ddbbbbf1565b5809931e9fe930d9858d0856025c1f60df0408ccb5031ff8deead018089a4acda9b88cd615 SHA512 416e4b325971a2bde8b4a2328f4ee5fe4bdc63243c4158490ed3adadba466568250009de7f88ceab0ce0d5ddad6f0fbb52418059e6227479751af1d36495a2da
-DIST github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.2.zip 42015 BLAKE2B b376d6c14a5242c1c6e3b54bfb45c4293327d0b07e1d0f5560beccc7c72f41789c5ce78c90c3595a7487f08817084a9d04b12fca9e15e268c978c9327c0846d3 SHA512 ef4fa6fb13d38eb35cc137ffe9e6759f21ae2795176c58bc2d3704b2b93e5ed60b1e130dd3a00a525b24a02c320f06593e8066a0608d2dcdc963424677372b67
 DIST github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.3.mod 190 BLAKE2B 5fb76cc5594f046b41a15315fc2ae954023d449ee7dd523b76ff1e7f36f42748800f6a53fc472a29d2e3857d15a7ac017f6c00c62d1b710930722e9fbc343c71 SHA512 a43cc8c1a8ff54d1aa2aeea0ea04e198250d2df3b3a86397fd7a12f697848fe94f1913e5a2d1a0843ab548096033ffbdc1230234e04c5fa183233c8f07d0615c
-DIST github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.3.zip 41993 BLAKE2B 25ac40022b7bfd2098217406f44f9c61ea0b0a91cba07728aa4006661b0495365bcc06a7114f1672022887424032d78ca74bc8a780b10ce74bf835cdf4524f34 SHA512 25637ef35b022cabf4edbe50d945d7facd0a08f4511cc49eab5b69bd3fe94c328b3a9b1e19a9d0b72abd2ec05cdd9f78224041e39a8d4adfbb02f37e3f7fbe61
 DIST github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.4.mod 190 BLAKE2B 2afd07b5d4777b6510c3f469aacc63b09abeb7f2d8c2a8c0f14139a4a655d21106991f9258f874a6612414c042631e411511cc5f0132e3aae14269acde34a352 SHA512 6f1b4bb9690b0d87421b77159b0afb299dc568cc9f39b2b1ef0b5dbb8f30fe92784738cb0d0157342f84da119fc4c7e5d13bff18b44af310298418b96e5325a0
 DIST github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.4.zip 43642 BLAKE2B 12dd8becf8a847066461fe682cb9d001892e310797e6a989de14c99d60f16a3879435359711739a32c1f2ae2e2d65c6b7297e33ba40b7d5ac27a95522af3e2a2 SHA512 6beb1617d2e732ace32892f45b4ff929f897cab5c16c26aa9a88c2d5a166467f516f88cf28dad6184b8dde3da2071ec546324ddf7d75a377ad81620b07cc90b1
+DIST github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.5.mod 190 BLAKE2B 258299f732cc4d0477b52acf9982042bf1901097293674c31d86a4da2bcc68149bbf60befcef99a466f5b4ea3673b06e8c0fa24afd9ca11f3e1c459e2736a496 SHA512 1444868aa2a9891755653f8a79202d465e65f57a02b2b8116feb234355241b35054576df55f8c6fb4d4d7d81fd0411a1edef18e5ec1f244003607d7f436f87ed
+DIST github.com%2Fipfs%2Fgo-log%2F@v%2Fv1.0.5.zip 44098 BLAKE2B 267a845d07c5264cca29ae03e82ada53528e032a17ec19ac6175dd482094c84ab6eb9e141fe5756a9403d9f9202609f74934d48e5c3aecbb194d6f644459ff2a SHA512 e9037265d116a0eff7381dbcf7dcbf9c34543944e9551654ba5174ebbe9ba78260fd10b64af92b4eedf9d75be9f1153e899d900e3fe9adb7c6a47f39b0a9ddcc
 DIST github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.1.mod 329 BLAKE2B a4dbd0b60c2871d963ee5578194789a0f67af5f29c4c473643f3524122817d18408f665a23c9d2e12f0a3eca9b54443c04be04be5dba9a7e3e5ed6f1b87e26eb SHA512 c611ea63e168dd663f7ef01085dfb7cd88b4c3457393190f44ae4cda4c23a5e7718ca4ccf36ba52e1001814312fbbca429d3c2dc0c28d45eb4a9de16d7cfc583
-DIST github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.1.zip 8986 BLAKE2B 5c9a345e39a48eedc4853f26b1433f9cf0e6d0d2aa00245b65c403d5b452e90cb897a9839b6e3cd5f2b551db066c3e476a4aafc413f0719b56071f40a81fd7ea SHA512 d265cf67292edc4c23430e42cb6f1ad9230da239938a3e0ec3a0b53466042f222a4b41b2258e3b5a3715dd9c85685e859cccd687473347a8dff4841a6b0a6c95
 DIST github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.2.mod 329 BLAKE2B a4dbd0b60c2871d963ee5578194789a0f67af5f29c4c473643f3524122817d18408f665a23c9d2e12f0a3eca9b54443c04be04be5dba9a7e3e5ed6f1b87e26eb SHA512 c611ea63e168dd663f7ef01085dfb7cd88b4c3457393190f44ae4cda4c23a5e7718ca4ccf36ba52e1001814312fbbca429d3c2dc0c28d45eb4a9de16d7cfc583
-DIST github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.2.zip 8981 BLAKE2B 8c13a5878b342303349d002576099edb50f49fef634058a04a06ff550e91594bd8b289c87584d71513f0a8cd53cc9778a4e42bfdffcd27b967569a9c0b2b4f35 SHA512 df547e32088affa3a62310950c044512fac2d548a0de77ddda44b28e9088163d5195e27d48235153b59e86c9209f4e533b634770983ea274a0137a1daf9ba794
 DIST github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.3.mod 329 BLAKE2B a4dbd0b60c2871d963ee5578194789a0f67af5f29c4c473643f3524122817d18408f665a23c9d2e12f0a3eca9b54443c04be04be5dba9a7e3e5ed6f1b87e26eb SHA512 c611ea63e168dd663f7ef01085dfb7cd88b4c3457393190f44ae4cda4c23a5e7718ca4ccf36ba52e1001814312fbbca429d3c2dc0c28d45eb4a9de16d7cfc583
-DIST github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.3.zip 9841 BLAKE2B fe008493688bddc75b1c94b4c8a27738155bfc0e000ceabd61681774794dfe3961e95058b99fb2cd5e7a02d37be51c3d3bdcc674ca55eec7a2b9199feca98073 SHA512 5a8b660bbd21eac74f1ab31805fcd94625ed71f425c00f97b14894654d9fc21b6780845484972f7b7dfc1aaea22a5e1cd43c1ca64b4d57c597938d88c0a36359
 DIST github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.5.mod 75 BLAKE2B cb011a5efd29f66b4843bb821f28edbbcc0ac594d99be8e32fc167b83427ebd74a114c0703b6847b60f20d3fc40ee6fd9db55fa9a9ffaa50b8616883047b506e SHA512 a0d626cb6b94e05f5792c18b7fac2bbdc9302fa01bcd55ccb58604d05ed82ba1e30c00808627f8f55143ba26a4ea985563e3e09166b1e0948ff868b7aac6aeed
-DIST github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.0.5.zip 11204 BLAKE2B 5ec41611c18cb06b990a831de661926661888d8352d35152e3b04a9ea0f26d22d464c6a46c20fed80aaa316cde0c90ce802238a40de388f4954e4b24972333c9 SHA512 a7469966e9b8015972675b3b11ec2a1e7f68d00e03440f546fba05d82687731e3d169f5929a2da4e9b1dad96fabd2b2d47c67d336609c45fa8171849902bf784
 DIST github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.1.1.mod 109 BLAKE2B 447967b394435e4da38c0d03e6073b51c89ea62e355f954b021af1265379e79efda7af1092a3dd46387fa2a4429e6c33e060eb2d450f32de269322237ab4df0b SHA512 c482a10f9c32ee014a299601319f02a6ed9156a48384430b5d15961f6783883a15f4bd9d37315b52d10cd745fcbf0486d4b3bedebc32ba99dfeb3c731ec60798
 DIST github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.1.1.zip 19385 BLAKE2B 44c4c7259ec3dec47f141386b9280c74e65dd133cad0201e755bb5aa9e0ec1edfe800e04a8361206bf58de864acb6fda91b01f9eb63ea4e9e963d4a547f4b997 SHA512 0ee7ae10845af513f0e1345cf06ee9e0856bfa81ff8280af4b07396eba937fdf0a60b80036ebf0ff4eadf73b42814dda26a05eccc14486a5eb7b7914696b8cfe
-DIST github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.0.3.mod 480 BLAKE2B 0b6f373079b48ba127f529b75fa9ea70383510e597eb35bed56191da32c397f6bdd4a31293203c12ab016d8fa9042d2e25a0a0a1b9a84ee63f7c943b2d7169e6 SHA512 e7c99258f759f3c14c9250785ded8c6b96f0f37d17a390bd7d1897f0008961f0d3d247322ba1aa504cadc7f36a6f7776ce96385a6377b9f21ee366daf303b6c7
+DIST github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.1.3.mod 109 BLAKE2B 456c439d7fcc480f99ca301c39b20231766ff2f5d07790587b0781f29defb505fe85816d0e7e62b21793a6c987a8f4a2b6bbf2ddc50b78fbe8404a2be95c5b0a SHA512 727fec0896b81c3d9a38510bc48352ba4bfec2ed612ad0df81fe3c7f68e88faf622ba160862e96bd1eaa5133d6fccf401d646456e450befc7c37c6d3d3cc8a92
+DIST github.com%2Fipfs%2Fgo-log%2Fv2%2F@v%2Fv2.1.3.zip 20210 BLAKE2B f17a45dad07bddb7cc818227a40acebdf952060f8fb577cc43e7d373a9ee354578a88f95bc0e68c7597f73f981173b4c705f0af8e6a1fe7b190f12d91024e7b7 SHA512 1d3f8cfb029ece0ab80f24acfd0f9fb254d32e1726988c48cbaae5c391afea0a0fc8343f48af70fd6fa094470c71d59f65fd618a3002ed55ed9ca8c9be728770
 DIST github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.0.6.mod 480 BLAKE2B 24860c2016ee22800fe71014a95d81f64d99c6fa063d373e1e2f88c62d7b3e1f1af06b2c5094602e41cfbe662294c338e4e4272db9fbe2d0e29af7035e6bc503 SHA512 35b27a39923baec5b44eba0810e24d9c6f2f2dbbf7e5b33a698ea7ab9359f6af84258bce37a3da90e4cfbe51388ea0ef5a718efe9050d84967c82eef5cd5a3bb
 DIST github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.1.0.mod 480 BLAKE2B b1ac58e4a56cce8893e11d0fa64b403659d4e55a84aa6103725ba95edfd8be52013a3845fb41567246151c98a7326c5d4f3a660d831a85c4f1b9e966c2ba5b3b SHA512 5b485e2cbbe25fadfc651044d709f82ca194047b62e2355d86137bf7a27e1d70785d252a9877d9bd4f23e0bfb47f748ed9e90140f3f275cfd6b54bfa0487d1b5
 DIST github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.2.3.mod 480 BLAKE2B b1ac58e4a56cce8893e11d0fa64b403659d4e55a84aa6103725ba95edfd8be52013a3845fb41567246151c98a7326c5d4f3a660d831a85c4f1b9e966c2ba5b3b SHA512 5b485e2cbbe25fadfc651044d709f82ca194047b62e2355d86137bf7a27e1d70785d252a9877d9bd4f23e0bfb47f748ed9e90140f3f275cfd6b54bfa0487d1b5
-DIST github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.2.3.zip 51609 BLAKE2B 90ae4cab13b278f68096e635d11071e963f1e073439437dd85731ce8db7aab4cab4c8365cbd0c773d578e483b673387cccc7a2d9320c01b0bf648b432176190b SHA512 180594faf46074301f346eaca8ab23ea88762c71394e1449ffe620741f22207ca974be2a6f0d393fc556278f64709400a72301330666910e2c3e7e7ccf6aef09
 DIST github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.0.mod 489 BLAKE2B b6ea5233608f890420aeabe7b34bdeddd8c06508d2c71281942b31cccc941ebbdb8cd3d47dc0550378e998d855826cc0fd76a4889023d915033b48fd5e6c243e SHA512 97fd560586524a3ebb83d0fa9bc2d8c244e10aa7018ddee95af1c75b3d2ba8c1c5b2ab7f46bf3ea19bf7968b686163b033212eda91ac35269815b10773cf9cea
-DIST github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.0.zip 58422 BLAKE2B 691c39ace96f20d2e16ae3a19880f7bc908f5bf2eb044b96f8e02896a6ad407f71acdaa130531ac5a3c88ed720914dc4e6f002985c6669da788fa23215cc6e9c SHA512 41e4bae7674e7f51d5fafa1795cec7f82eef674c890871cb5713d5d25b02aad7cdc1d880f220a0e22dcd88fade452a7559cd0fb6199d8f36b3b5794effa12e37
 DIST github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.1.mod 490 BLAKE2B 2ea6eda24f817b2a71fa59e723ac85746cb1139fe82a68c72a86bbc7d51c4a385faf34e15828696625c8925084dd0d1e8b9d524347ee132e533ec1c87aba5939 SHA512 f82a95b705accc6f275b11d2a3709b904e308aea43660b503cb76847e5c06a766d52dc474885dc3c56c0a7404c3f1747fe660e889c8b6a66b78ff83d317123bb
-DIST github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.1.zip 58960 BLAKE2B f492c8aa3e428393681d0f4c68ba4029faaa1e8e7b2d56ac5edfeceadc19d95b4fa1c517fb632144604c6de8976da981126a0d6aaa2b097d9b5b168b91edfa50 SHA512 dbce68162c2ef79c11584f09e8cf62f4596b0c1275d72dc130a3b9d5a7cf13b60583348981b5e5eede96f3ed5b22763abb162515f3872b6d1f6cb310784f6fe8
 DIST github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.2.mod 490 BLAKE2B 2ea6eda24f817b2a71fa59e723ac85746cb1139fe82a68c72a86bbc7d51c4a385faf34e15828696625c8925084dd0d1e8b9d524347ee132e533ec1c87aba5939 SHA512 f82a95b705accc6f275b11d2a3709b904e308aea43660b503cb76847e5c06a766d52dc474885dc3c56c0a7404c3f1747fe660e889c8b6a66b78ff83d317123bb
 DIST github.com%2Fipfs%2Fgo-merkledag%2F@v%2Fv0.3.2.zip 58939 BLAKE2B 53959fc70d7130c9402acae3d0feae974f6b754a241187bbe87a3f7918e3d4d333c331c2956a9f659a467ecc578e0bf08689250a632933fb24550f152ee8da13 SHA512 02f3574cfbb123b3e04bf3ded8a0ec39975b20ebb9ad82c3fab57df668b782da66ccf528df303ee83cfb1a48e5f0f5715e8c64ef1331eb9ae6a31144a77d700f
 DIST github.com%2Fipfs%2Fgo-metrics-interface%2F@v%2Fv0.0.1.mod 44 BLAKE2B 80b79e8658486ddeb981cdddf9768b5ce9698d45d1c27c88f1beb3dd79a02ca978b5d0e0d30157363462d7cc4036998d49320bcbc8cea1dab57c71088bc1355c SHA512 5ad88c260792c7814e17b5f60d7a07ffdff7dd321e56d069f69d58c9844363f9a658a903e074f06ef0779522c76160e2bdb4698177d77ca5cbc98ac5cf3c5477
@@ -483,11 +528,9 @@ DIST github.com%2Fipfs%2Fgo-metrics-prometheus%2F@v%2Fv0.0.2.mod 178 BLAKE2B 3bc
 DIST github.com%2Fipfs%2Fgo-metrics-prometheus%2F@v%2Fv0.0.2.zip 6216 BLAKE2B 378341f45ffb2fdf48dd07c84712253d035076bd38281335281c888299cc753c1d7b4880b5de358782a0758b0565139ab61e6e36b3530a7a3e97e037899b2b86 SHA512 5bcda9125d9bb2f3b4e46552af1465d85ec14bd42bdbdbeed3834a2579ef3f3fc65a80d37066d33c895c73507787b6268da5c09d297e10c95a22bb5674ff2eb5
 DIST github.com%2Fipfs%2Fgo-mfs%2F@v%2Fv0.1.2.mod 546 BLAKE2B f4a809827d106c29bd8de5c403baf14ed9a537f5f5c33ee59e1975b7aca8db20e52bf719dfd05d1634cef07cdbfe17caaf41d4ec4701498d5874b99cfd1286f0 SHA512 63c41de32deba94a745ccce5c66a30428cca129b00c3dcdf54cb375db2f8d1e81d47e3e3953400b172c044627ae99098b5945b048c29d4882f238d0a511dfa2b
 DIST github.com%2Fipfs%2Fgo-mfs%2F@v%2Fv0.1.2.zip 48692 BLAKE2B 2dde96325bbfff4884d2df181d067c30ee6d6cf773f6a78cf94ed266b03afe1cb2560769de8b026e1d5af1400c7c352d6a5f4182afa67407dd35401cb717b17b SHA512 e3b0cff0fd419ee09cd88b0ed223995a56bbf0fcef4e98c6e5871750f24bd8242096b3af163f8427e3ff101b3f863c407445e0ca3ae4f5fd557ad29a450cd2bb
-DIST github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.3.mod 182 BLAKE2B d39d64e467802ce3a049545a99cd6f8b27f01507fda4a99ae9b097ba3f6bf8a2f5a9c14da609703e1a9c66f93536cdd8f2e7f5c8db5a6c87de59ccb294c0ee58 SHA512 0816ae085882dcdb285141284a323d6f00c76d3421901cec8672b7fc5504903dd3963faf674c26dfb61231a110944bed1074c072f51e05b883923cc4596a581a
+DIST github.com%2Fipfs%2Fgo-namesys%2F@v%2Fv0.3.0.mod 990 BLAKE2B ae1ecdeb9541ef316e10ac9009b332d3cfb874d72b1ae986911f816e9a4f1b33225e024c986786aaf535d5c6495fb400abca593b8623c4a2426fd8a50ed0bbbe SHA512 2d6f545c285e49bbe0d7d67affd8dc9c483bbb178a38f71247689cc2568be1c00a0499fc663ebd24b8b175bc2ffd4190791f5255ceae135f5bc85989b2290b9b
+DIST github.com%2Fipfs%2Fgo-namesys%2F@v%2Fv0.3.0.zip 64281 BLAKE2B 2dff0a7b42db174e6d1e54aacf415816673569bf26d825d4a40b36755197b31305a0ee115cce3c18a736cf24c257e8a1fdb93d64e60ff2c60980111753d95075 SHA512 be7d2d9acabea4e31e2b99a313120bfb10440e61b47d0f0971924a563bc7509f4acd355069f21cf92746e9264a67ff713a40d3d6f6d981476c14eb650ee6b500
 DIST github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.7.mod 182 BLAKE2B 35e66fd6023b845cef6f981a49e6dfa5eff86d3c2721f45e7dbbd1163ce30008eef89f8f4e6f5a081b27984816ca42de735bb4f3e804669531a1fa473825013d SHA512 bd78a805f1966f34ed65ad90f53eaa6be266d4e525f1e8cdcb15058111fddf5fb88baf7ae8adf896b973c7aef79a0527a6f1022766c2be82dc014b9cf2c171ad
-DIST github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.7.zip 25646 BLAKE2B e63cf6604e8c8471315d4eabf43a6c2099610168dc68d1ba7b8bf6afa7e321b258329dfaad16ab9a09febd76d1c3d0692d454309a267dfc0744a81a70bfb19c1 SHA512 88b9ead64a121d819eaad8668d512c66abf3de9f6aec218d3313e5cd6c36333124168037814875fae00447e3b20b5751d2242f19ab0f56a004928aee45de7376
-DIST github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.8.mod 191 BLAKE2B ba1c0e5ff885ade011ccdb7ec81745698b48c819f45eb5908587c4c3b89b61149d08f0eadf237b0a12643dff175abad4e422022868d331a18a066d9611435791 SHA512 03d03fac0aebd2775749c62195a4ca7a62083bcc4fee7031054984d9e7e50cc576ca290df92d4d152284bd1b9ba02774324d97f21d3ca87447397f8ab6019511
-DIST github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.8.zip 28277 BLAKE2B 41ee47d5860542646f6a41f6779528984b71f08394b60a4fcd799e01c57a741c0e1f74a588c9fae9515fa15a1fca4b102abc36eadaaaad9c05ed14a6bf1a0b34 SHA512 3ab957ee1d5ae153f454348a694fd4bcb47eed0b8505a7b7100c38fd15d9778949e4c47ea821e1f92e6770035daf273630042b29a80501b9547032d443a6a93f
 DIST github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.9.mod 191 BLAKE2B ba1c0e5ff885ade011ccdb7ec81745698b48c819f45eb5908587c4c3b89b61149d08f0eadf237b0a12643dff175abad4e422022868d331a18a066d9611435791 SHA512 03d03fac0aebd2775749c62195a4ca7a62083bcc4fee7031054984d9e7e50cc576ca290df92d4d152284bd1b9ba02774324d97f21d3ca87447397f8ab6019511
 DIST github.com%2Fipfs%2Fgo-path%2F@v%2Fv0.0.9.zip 28616 BLAKE2B 64ee3a039e3053f714994e99008e8620188d538ef1d8a6d2bd4dba96f43d8ba65892ec90111fcddb0699e93ef381fdc3dabf990222584e94df78d634c155b0d4 SHA512 4d81f644257ebbb3a7e24e1d6bbec8b7d74cb289903aebad15bbac528ca8d814d6a0491efe3130f7b671d5a23f44bec61296c197501813279287c3408c88e03c
 DIST github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.0.4.mod 138 BLAKE2B e74a348e85c548f0a86caefae3790d7c856fb325c020f3fa8a017308c734d684563611a1136666ed8a90443f8f150eeeb55949da9fad76b30178878deb47c144 SHA512 dfcb7f218bdbaa713caf14f1760176a1dfbbe4ca6c4626ba1158f1787859f2263870bdadcfa2a7f97227ba1802b7279f377ffcc6c0f586a24e8ec2453d02a631
@@ -497,35 +540,34 @@ DIST github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.2.0.mod 195 BLAKE2B 1f0ef850
 DIST github.com%2Fipfs%2Fgo-peertaskqueue%2F@v%2Fv0.2.0.zip 18025 BLAKE2B 14694a0115ae50b7318eb85d4086c6cae74ac03a83f1e8cc3b6ce63e162176f7621f9ed21b7e58e1eadbd735c643ea068bab46fcd7d9c0d075cce7b60cd01f25 SHA512 473dda01d400225b10a3a90c7c6d7893a0a36002b0a61ca729d3403865a504e647b6ddb1ef5024cb16a3b8abe8fcb6493c97394dba73474d66da7570ba4f431a
 DIST github.com%2Fipfs%2Fgo-pinning-service-http-client%2F@v%2Fv0.1.0.mod 317 BLAKE2B 42dff5a356a11068f45820e094711bd64a601a50169f6c3c6c4908480b4b8d4248605f45686bd76b87c8ed1ef19d213c2a0a1c79cb1c2ebec00268358d338818 SHA512 a9b97cdecbf178e12a40ea6e05829d4253035b87cf3435a9b9c693b9f0ca95f85781e437488cad40d0dfd80b6bc675d9a023d87e2da2a79f83cb9590052c6275
 DIST github.com%2Fipfs%2Fgo-pinning-service-http-client%2F@v%2Fv0.1.0.zip 83427 BLAKE2B 01bbeef92474f2af680d8420729c7b382cd602c4e8acd9f80e701c6a27445da1d24451c708622960e6e4fd797f1d838153501b4471238d3ad14c6d65808bddec SHA512 cb05d9eeb2143991e53b614ffda7c3aa3308bcce857364ca97327b506b34ecfe2e853fe88cbde80367caeae58aba9604ff21c9f4b48549b87036af6850d6e2ee
-DIST github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.0.4.mod 520 BLAKE2B 3ea8708eb6634e4b9efb3445fb406a2c782ce347c9813685763bc6dc0929d36d1a1e9cfdae48388883f316ff78ccc034834d269301b9edf9841ec86c958f5aee SHA512 20212b2934eaa3e9d16c123809d97ee86364b3400b148fa8ad02f4482ef96beca8dc06264a680444de59b4665c8a988fc29ce32d9d0a7d4c4d89d6a659c6b7e6
 DIST github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.1.0.mod 876 BLAKE2B 4c9f51230a25d7b721bbc01dab332e607485d86b8b623a6b8b80fda136227b2ef58fe371724f8c067f7aa87aa41a91e80fdf593fd42a1594a7d07534c2499bf6 SHA512 40fc3308ce7fede3f16a88ad9a4999749e06d76a64bfca70683f0221d5405f8f1154aadbc2b68f8d75412f02bb0ca7236354111c1dc3d94bc3c842030e352853
 DIST github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.2.4.mod 885 BLAKE2B bd840c7c5a4b93570527984e2494afb234858eb9a52b0ad64604bbf6ce7a86d80b2d0517a87ff2320eaceb6263eba8c9ca263359a2219b1b371a91d04de5537f SHA512 1e02cc242c3a3824de497e170e0435db6efcc4ae1ca628496c92e9cc1f0ed1ee6fdab43b7d5d0e6245fe12e774b13a6c5de1568bae34d3dead556f62de9ee909
 DIST github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.2.4.zip 79661 BLAKE2B d86e91a17ad0b83af7ef73fd763860cc32c8b8522a7335de58c919905ca2c1e7c0bddda3d59b520631de6feafde12194ac4aadbee38eb62a76f949045567b3f4 SHA512 da9ac4a4011f82fb5c995be38b3b4dd22a17106230bbc469ff88be827632dae1ca4d51b411c9cca4ca6063cec58f77d6282f056054d2678ecabef26dde6e17ec
+DIST github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.2.5.mod 885 BLAKE2B bd840c7c5a4b93570527984e2494afb234858eb9a52b0ad64604bbf6ce7a86d80b2d0517a87ff2320eaceb6263eba8c9ca263359a2219b1b371a91d04de5537f SHA512 1e02cc242c3a3824de497e170e0435db6efcc4ae1ca628496c92e9cc1f0ed1ee6fdab43b7d5d0e6245fe12e774b13a6c5de1568bae34d3dead556f62de9ee909
+DIST github.com%2Fipfs%2Fgo-unixfs%2F@v%2Fv0.2.5.zip 82131 BLAKE2B 2a15c515c0ed122559341c13c86113d3517ab0beff3ff8ba9358eae3ee3ab5c62ee5c8bd0b33ee6548133d0623f07b67a26f0c153f3e3347695be04092af0423 SHA512 ffc6ce405530fe8c21b707dab0a37b7ba6f898ebc6a445e242045ab95c6a748f309a083c7ee0cbfacb5a15dac6e7c683af4c31d0ee0c8f39338538b4cf13abdc
 DIST github.com%2Fipfs%2Fgo-verifcid%2F@v%2Fv0.0.1.mod 124 BLAKE2B 488e4b5c60e340768bf6297e23442c54c49dae0d812fc6d3d5c4f042c54c73f0850dec4941aa4c7a0ad4db3ce01844245385125d280dfaaec8d6f8957b08005f SHA512 1f7094e706316fae25a165dd967743829ae631bca8999d01a84be738bd250d0d90c1c7efc95350b0873a789813f8c31302b30459b8fa963f586420b1a99335c4
 DIST github.com%2Fipfs%2Fgo-verifcid%2F@v%2Fv0.0.1.zip 4312 BLAKE2B fce223ada80ee68a184deae87dbf8c14917afa39fecfb5e56f9a584833c6f88695af44a96e4f8a24125000f2ae452ee8e2e1dd0e9bfc6136549de0aed6bdd948 SHA512 9a9206aa7e182c704a20e772ce7cf62707a1391bb6d14f8ad1a311fc1c19381df4b3134dc301cf58d4153aa982324cd3a74dfd08b0e7e103a51e05661a2be174
-DIST github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.3.0.mod 447 BLAKE2B e3bbbbe8fae914698261cf6875d94bed92572db0bbffa0df63a4b14a87fa34f0faf1b5fa89439df5517e386121b9bf573ff6e5a0dfcc4ca26848a66a4b1eb8ed SHA512 c3297b632a5a30eebb4d8706abac3c5abc4d5318db1d30fb56e8273cac5db1167decc4b4a6a005510294c3eb1c090806e1edce2c9c8004d44d6c98df84e600b1
-DIST github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.3.0.zip 66955 BLAKE2B 03d3396a0de6d59db41057589774b31e483bea000d3b74d1f23d55af05d4d72786d787d36d7664e77d79c7631cab705e349bab5fe9b362d1b2bc489b01b018c0 SHA512 f90ab992842ed388f4d5b82826332731d54b0a103c22c39b021be2697e707d887f16f7b88f9d19243c5f392b8992b6d0c229feef2c18cd0207f3b9709b52f9ab
 DIST github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.4.0.mod 493 BLAKE2B 97e0de538821bee1debcc186701f3ec09c6a731cf539b749db89b698345d82e750b8bb9576adaf82692e3444a12c5872f4f9bbbfecfe6ceaca884a176909ebaa SHA512 2bd8246ee757df2474875153cb7d910c73efb63fe5d0f86f4e857f1ee4d8407f54189637922651a2abbe869fe9bc130428dd69faa76f8b09a0fdd5243a44bd37
 DIST github.com%2Fipfs%2Finterface-go-ipfs-core%2F@v%2Fv0.4.0.zip 72653 BLAKE2B cdd97ecd9a313eb7b1cc63b614779fbc0ab78be25ea9e982e5f29339bbe001fd03dd7d001d4065817f4131e467ae51f5a5194f95753bf0da3f0d24295ccfaad7 SHA512 0ff2055806935a0d0a1b6cc7299671749d70d18c0c4d2b6ba98a358fefb488b97a0d9e469672dfe29ae6e41ab02f0d3ac661a44a316df525acb786100a8eac40
-DIST github.com%2Fipld%2Fgo-car%2F@v%2Fv0.1.1-0.20200429200904-c222d793c339.mod 458 BLAKE2B 11adc611561dfc8bfd1f9b0f433ed4a111a695a06d4839b1f9ef880f4ee59ef31ae764264c86bd14a359d4d2f5b8377e7cc9b017474d250c50017f039cefd437 SHA512 e82f0bdf4e96a5f273bdda7dceccbd632bbc915a41f1198a4751a1fed882759b89c3e2350210d1b6972ab85f8319f7de374f9940a4de1a18767c1a6dd5ea3e53
-DIST github.com%2Fipld%2Fgo-car%2F@v%2Fv0.1.1-0.20200429200904-c222d793c339.zip 27568 BLAKE2B caea76ff99d2350b89f49275fcdc71fed767a252fbb7a7ddac5bf1f98495340da8722f428d00a908bbbe6f45c6157eb7bbf707ebedeca3a7acee5774d5710679 SHA512 f6fd548d761c87364f859aa6b274d99dcb25f0c4265d21b13c22d498bccc5cf03674cea4c724dab276e491863e29b4aa8daabce59ca752300dde7df2ecbc9c1d
+DIST github.com%2Fipfs%2Ftar-utils%2F@v%2Fv0.0.1.mod 86 BLAKE2B 236fea111c479b317a56a675097c731dc93703ac6caef94db1682a96f7cd398077081bc75ed6affab71c1bf32a96a38afc517d83410e1cd633ac5ed4b5a5abf1 SHA512 7ddb0c2132a8567133064a36925ece7b422500ab777d985355f3ad7579eb23e7088c27790742301802fbbdb83bf9f8904fcc25d595ed0becfbba2df326735549
+DIST github.com%2Fipfs%2Ftar-utils%2F@v%2Fv0.0.1.zip 12224 BLAKE2B 71846a22a0aa81bf111e4db309c5da1274a260cb45322c7e41664b981679b7345c290f77ab0e5719bce1264b7989eeba19cd2a3c97eb01439aa061918ac80708 SHA512 d6892d88a939449dae7669994ed46d3d91c2e8e613a62fe623cb1e65c35dae2fed45b0eb029538793c4cb819d0eaba381980383783930e25ab6bb63fd8340c6a
 DIST github.com%2Fipld%2Fgo-car%2F@v%2Fv0.1.1-0.20201015032735-ff6ccdc46acc.mod 458 BLAKE2B 87e5f719defae231c90851037be562a511e586cd30d1cb4b2b11334b3226979a097d18be794980906b99fb9fe207054e00a4d3fd0caa525d8a8575a39e85afbe SHA512 06a013985c7acb8fcafcceb72e51feb2cdace469ec1018f2452c25f694725487b610497ee637c9d1a1d6be767d9948bce8e464ad22d7f7c2477c3c69881d5e36
 DIST github.com%2Fipld%2Fgo-car%2F@v%2Fv0.1.1-0.20201015032735-ff6ccdc46acc.zip 28461 BLAKE2B 70c59151d2f6e9d2bfa917e03bea71b87c9963cbe2249dd1dac71c06c580e5ebfc0525fddbf499b7e2d4dcb46668740b58d2ee61244e65841acef7fd06739da3 SHA512 ba8e0fc459ea8048e743f505e459342e90408aed4b8272dbaf63532f75bdb59a9bebbc6cd9e2da1634f4ed5bc1e8893d5d0c50ba937860faae107865adbcf165
-DIST github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.0.2-0.20200428162820-8b59dc292b8e.mod 551 BLAKE2B 6c6e320331a52ace256e6b9e813caf0084ec6de0f3c52848d2c9d4652e8f4a2a310c4adf09496e27ae31221bcac99b1f8ba3456a63e4dfc3ddb3f0da46c0d670 SHA512 f601cba042ca44805c5bca6f09109a43464d662df7559d4931be7c2b5f09dbe9a3a40b9ace57a6bf87c7138c36302ee70bab25f6cfa74c7970ef3a60feb56159
-DIST github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.0.2-0.20200428162820-8b59dc292b8e.zip 264025 BLAKE2B fa66e4dfddb463019b20d2234ff37e0bfb66987c61478c78b8efd4a8f2b7b9d40e142bdff20eed3b03a68e77432abc273a97153ff3444f4ae7ec235c05cbdb92 SHA512 18fa25ae9d5a78a570a85c739fdbd8f5d84fc2ac47591c1ab86c3b9ec04e47ce74af1337bb6b62c9e87ab975c9aebd63b7196d6575cb31230e148d551201483a
+DIST github.com%2Fipld%2Fgo-car%2F@v%2Fv0.3.1.mod 395 BLAKE2B 81c9c75a8f356fd3a160c7a7624dd6a563b6fe3fae41c16c42c22ae5598a1b90f19fcc9903e011695a8b5cc72a2500f92a603d8ff841b6a706c7b86ac3583268 SHA512 3da3948f8da08fcc1998c083c82dee4465bd8ca93c89b9eed06dc1c4543ba24b1312531d8c16a9241069e7f4099efa5cb5ce5397968cc61b0f43d0997bf83c08
+DIST github.com%2Fipld%2Fgo-car%2F@v%2Fv0.3.1.zip 32773 BLAKE2B ccba358b4e1a9eefe46b156aab9ea3c88ab1eb9f2c15cebef6b21e58bfd3399cbde129eedea935bd8ab360ea53527cd1f2960b41681718e8391a40e201077c3e SHA512 9bc1dee83e49f6cec8ef98870dda7c2ad3e6ef511c0bc4a2ddf110532e2a57b56babbe480e0df7bdb92e3fdb56ed431a73db19021f198d030d054e24368fd450
+DIST github.com%2Fipld%2Fgo-codec-dagpb%2F@v%2Fv1.2.0.mod 348 BLAKE2B 53fba9d9dfe567f2260ab18a9963b414492d13180d2d84fb1de87b498bd85c623c962eec0a0330204c13a4e43ff051dab726f2105b91777dc9914a97973aa9c9 SHA512 c1055093848794f73e17edc51a17daa2ca8f85a8e5e4eddaca37e2cc42644b0ef1741caadbe463dd5194fcbaac7168871950656c2040893a175be6f4d2ba0ce4
+DIST github.com%2Fipld%2Fgo-codec-dagpb%2F@v%2Fv1.2.0.zip 34190 BLAKE2B b87c33a7bf4d0fee4d245fbc493d849cedc40d8d6e6c176fdd50d400ced65456aaa341424bd3855c1439bd3dd6122e684744020a0449bc152483c64f595d8e0b SHA512 d28ec98f850d3e5c9b73e30f60f07c0d2ca7e9fd4b934a64bafe3848c336ad269f628b055b7669a7da83b0f8e493ba900cc9e79dc4bb900678bf6340e3eef57f
 DIST github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.5.1-0.20200828233916-988837377a7f.mod 498 BLAKE2B 1ed47d8d6a1637af85f7343a4a1cfbd201ee5de5d98e6bc6fd6a5a2faaf5be3321731cad628a63ce89b5581d83fd12290cc2468abf035c0086793c255194235b SHA512 da87f8c7dfa6005d5d610efbe74f4441334a3c32e5491a777bcb1bfedb8d665b9dbac06108763d036a771ee6f6ebc2fc8b2974e82cd5308be5bacc18629ba9b1
 DIST github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.5.1-0.20201021195245-109253e8a018.mod 498 BLAKE2B 1ed47d8d6a1637af85f7343a4a1cfbd201ee5de5d98e6bc6fd6a5a2faaf5be3321731cad628a63ce89b5581d83fd12290cc2468abf035c0086793c255194235b SHA512 da87f8c7dfa6005d5d610efbe74f4441334a3c32e5491a777bcb1bfedb8d665b9dbac06108763d036a771ee6f6ebc2fc8b2974e82cd5308be5bacc18629ba9b1
 DIST github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.5.1-0.20201021195245-109253e8a018.zip 415657 BLAKE2B e613d327611bd4854507139ff8fda064661b8759cf4e4e8135bd6329d100891cb0ac16acb38925b1aa53c4c9b1f29f49e2692c00f1aa76b6a6da4e2ad28d0ce6 SHA512 99766c8f02c4799d6dd8b5d5106142bf182210d65532f3fca49c7319f4fbd34294eda6515e567553541c34b1fa7a3aa04ac7eb94e74e99aa44c8da383c5c6ba3
-DIST github.com%2Fipld%2Fgo-ipld-prime-proto%2F@v%2Fv0.0.0-20200428191222-c1ffdadc01e1.mod 735 BLAKE2B 90434ddc2f5b99bd0b7651e2f888bb15afad058b924dda150734fbf5d2671c6cf4c5b48bc2d678e7f7bf5f73a20e67ca21370ce23988297f7601e9921f624149 SHA512 4c9f83f57d641db0ab2daf74bd19f5cccd6b7a430e090e5c0d2c7d5dcf952af6ba6201f353f3d86e82f6bf092090a0f7bf9949e4f1a02b48bb9562a7bf9293d7
-DIST github.com%2Fipld%2Fgo-ipld-prime-proto%2F@v%2Fv0.0.0-20200428191222-c1ffdadc01e1.zip 42206 BLAKE2B aa37bf2348a567c94bcb5e4b08716230044590f83c522732d2fb9249c83035c8831deeb6205b1b77c4add3af6b55215094e502af931a8930fb8427fa19237787 SHA512 59afebb41ae1c4e07429a4189b1e355ed0023c99da7be287e44dc570d8aa77016a898b1fea9fdd56a8906d2d4376d5ac6894ef881bff753d37f5000aca34df06
+DIST github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.9.0.mod 355 BLAKE2B 048945d113e6ec2c458fa06fa140d2584b7e78e792c9e73d2eeb06f614a49118c541630177e594150ea8673eedb244f363a4678485bd5d90ee9e0d565e4377cb SHA512 f0f8874410cd9dfa82197e722ea10cbafcc4d66cd79ca33d8ba1c5e38455f899b0e29fa09dc2e3446cdd7beeb1d679c3b40cd975125f1d81842977b408ecf8b0
+DIST github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.9.1-0.20210324083106-dc342a9917db.mod 355 BLAKE2B 048945d113e6ec2c458fa06fa140d2584b7e78e792c9e73d2eeb06f614a49118c541630177e594150ea8673eedb244f363a4678485bd5d90ee9e0d565e4377cb SHA512 f0f8874410cd9dfa82197e722ea10cbafcc4d66cd79ca33d8ba1c5e38455f899b0e29fa09dc2e3446cdd7beeb1d679c3b40cd975125f1d81842977b408ecf8b0
+DIST github.com%2Fipld%2Fgo-ipld-prime%2F@v%2Fv0.9.1-0.20210324083106-dc342a9917db.zip 620854 BLAKE2B ddaa0f3400c10aeb9143b24ac802e2f26739c798ea1d408fdab14a28aa05fa73cc25b705c9c6e4c17a54952489d381bf1424da48a5cfb0ab5fbbe9004efb962d SHA512 cd8b124f7ad55eecd13892798536d90f54f2bcc50c360047f369a7162f2b53eaa09dcc3aebd68aa7d2b08654b6786ca6c552f6bedf55a333eb010c78012fb9db
 DIST github.com%2Fipld%2Fgo-ipld-prime-proto%2F@v%2Fv0.0.0-20200922192210-9a2bfd4440a6.mod 789 BLAKE2B a0839ac582b93d6fe328643f9a5e9c08cd09fd75a5f3658b8ea59ea9eb4bf069eced10b70b439db25d14b970f763cd494131a8dd490e446a65dd1c2390bd65ab SHA512 27a9619bce04da0200134cc23edc13ed18f3b16e672f7ca1e6b97064e089aea2b76bf42025ff07a07460654220941f1a717f79649306e7e4ba6869471417b6b7
 DIST github.com%2Fipld%2Fgo-ipld-prime-proto%2F@v%2Fv0.1.0.mod 735 BLAKE2B ee0e981b452661b23a3f5256e1260adbf467e3d21eea4aa3beb78915a5bd66255d94e2bb867733242ffa8139ec9903baf1e224af6098ae9d29a0fc00c6923620 SHA512 198e37b69a4f0e61e1bd023577f43600bacd4b88979f7e638dd436da5a5e7ae250a0f411364fd81710398a6577fc4919949be775a19e422d7745669e4018e2ab
 DIST github.com%2Fipld%2Fgo-ipld-prime-proto%2F@v%2Fv0.1.0.zip 54131 BLAKE2B edc451731cddeb42e00c5cad8a45d8d602b60c34ea0acc03cef8494917dae89218be1c79ce5306d0fc9f4e14dbaae164c0d0f8e671925d914b394cf055ace329 SHA512 d9b3e580396f31c092a826566e1b99858e288c55d46be06416afbd9b316305a04c627cb9f6af8d37d3d80255699a60ab3939f93bfbf75270bbe3c31822ebba0c
-DIST github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.4.mod 34 BLAKE2B 696d74ba109247fd088f7ff14db1ae77a4a755dacf04e355aacd8c11e8e2646c2247f3f3ac947289a36f293615d40ae25bd1c3cab656e884183c97e46fb44056 SHA512 be55172330f6088410e969af6a419b9d30e8dcaf6f1c240b55e97df38e1a8d85c8e84ca1ddeca2075f171806371fa524187a24945fa6cce0e8612acf97ff60b5
 DIST github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.5.mod 34 BLAKE2B 696d74ba109247fd088f7ff14db1ae77a4a755dacf04e355aacd8c11e8e2646c2247f3f3ac947289a36f293615d40ae25bd1c3cab656e884183c97e46fb44056 SHA512 be55172330f6088410e969af6a419b9d30e8dcaf6f1c240b55e97df38e1a8d85c8e84ca1ddeca2075f171806371fa524187a24945fa6cce0e8612acf97ff60b5
-DIST github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.5.zip 7343 BLAKE2B 436bd84adabac44091873102b8c5161098a67f8799166cb6e11dd82a5e0781a8c138df286d73feee9998ff46853d0c37a6ed28ea14b88de0e42f57704a17cec3 SHA512 6b8fe83e5833685d0b274bd97212d05f936f4637eb3251b9d4babaaae4c60c420ebb8fb206b973e2a56eea470e1c4709439516e7e2afc23d2cadb1fcbc441030
 DIST github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.1.mod 37 BLAKE2B 6679d72e6167e53e5fab71f0359b872603f59f3847be944ac7350fa68c9c6fbf600187d168b666cb491f45ee9b07bb670026e4e19a8ff80da85417240dc004ce SHA512 9b33a2f10bdf31fdda6799d21d19ab5b0d4b6f7945d06fc56b73c8a73eaf7b3bb786a8992b0b5a98b178ce5993dc3ec6fa87f4a02c65dea2222a1675cae518b2
-DIST github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.1.zip 6125 BLAKE2B 08cf6039744d2b74891c4e20129921207d78abe85c90e6ace259eebb9150c587a6aaf72885b17f0b1a9267cb7b2e35a30280c4f35fa4c45b73527b2d6ef8d4d9 SHA512 683e8a701acc56cbcd48595be55989bba93d9ab2c13c981ded662efe88a54bf775313181ef9c32d25be418bd2ec1275f39e92a24f41d788455a4e9cc93fc17ad
 DIST github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.mod 37 BLAKE2B 6679d72e6167e53e5fab71f0359b872603f59f3847be944ac7350fa68c9c6fbf600187d168b666cb491f45ee9b07bb670026e4e19a8ff80da85417240dc004ce SHA512 9b33a2f10bdf31fdda6799d21d19ab5b0d4b6f7945d06fc56b73c8a73eaf7b3bb786a8992b0b5a98b178ce5993dc3ec6fa87f4a02c65dea2222a1675cae518b2
 DIST github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.zip 6553 BLAKE2B 71b7387607bb853984ef72c2d381c5f830dccc2df5795a228a53abe5b4534338e5a09da0a402eada76c827d6161c73b9c514286609fb08542a3ce20aabd28db2 SHA512 5d3f18907b48533c9d8478ecf151e8e7eb34994e817ab8fe9ad2a216fc655e5a830ced5715fb5576caf5ecb6ec0b5ff4e80b31aaebb9f6ae6a5001f2bab717ea
 DIST github.com%2Fjbenet%2Fgo-cienv%2F@v%2Fv0.0.0-20150120210510-1bb1476777ec.mod 34 BLAKE2B c2e16dadb99eec1ea0e45c4e1d08cd7e19b67797aedae41a8b4ab2a84cb8ba4c3468cbcda4978b12be555567e8fed4373215e0c3a51d7aeffffa2d2110f5adbd SHA512 dab936b3de2ed8fda8f8355ccfa5ca364774a76ca78d6936bfdc681d4ad12a9a0503f8bf9b4b6ab12823950de48ab461dd5878fc5f4e61d986f3cbf6e6ff165d
@@ -536,52 +578,60 @@ DIST github.com%2Fjbenet%2Fgo-is-domain%2F@v%2Fv1.0.5.zip 13418 BLAKE2B 909b312b
 DIST github.com%2Fjbenet%2Fgo-random%2F@v%2Fv0.0.0-20190219211222-123a90aedc0c.mod 35 BLAKE2B 8464955b40d739b7042c889772a3f339ace8349ac8714472cee3d9a6bbba974485e32f39f7ad90ecbf8594982ebd47dbf41f80127309620773d0a3a0f5e5e237 SHA512 6d4d220075f976723b7bf6988bfe0a24fd9659f291f4880dc82917e1609de11f65af1a19f596b0b3e564df8af2334a2f1105748ce9b00093e85be3b4cdb7eed4
 DIST github.com%2Fjbenet%2Fgo-random%2F@v%2Fv0.0.0-20190219211222-123a90aedc0c.zip 5144 BLAKE2B ad04ea68e7fc4141abaf66645280bd837dd143072329f678223b10f61a5482ce437466f1953511cec249d8a32117b53d3cb626f9dca24eb4af01f94ac1d734dd SHA512 a17226f3066d1d26dc9f33aed3ef3788caec37d00714484da2237fb9fe6952d7b01774530e2ebac976a869438b32e500045e60921bff8378bf475096ca492463
 DIST github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.0.0-20150120210811-aac704a3f4f2.mod 45 BLAKE2B ecfef6e38aed40dc632d320effebd8e52e42d1325f81691d03bb11979c7c07566e1bdebfa8f7751561026a0ca8c4213414c8c5341ae058d4ac2baedad668bc56 SHA512 39fe2d35ff3d163620e01b24eb4c39b30f8bb109b8ac89f0a61bee604652c85cd026399a35e37910b57a445041d4a1a222455086e44e66d1938ceba0af155eb3
-DIST github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.0.0-20150120210811-aac704a3f4f2.zip 6283 BLAKE2B 8befc80be68b67da3c7da266f834a5480f1e94214efbaf53623e567d2a8bb12619a7de65590a683147394e0a8e0e9174776d1eaebc514ab0ef2d1c8c30115a30 SHA512 379c7769655af403e8a618a5b1f4e1f23fa491e6fc7fbfc1ce92918fa44bb65a599e213bfe5bf65b842b67c15f834a3bad5f828b2c0ac8f07bf7c49f78313dd1
 DIST github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.1.0.mod 54 BLAKE2B c98d354c414f26ded48316affa5dc894a074d0017498cbf85df05b6bcdd336cc493a3b76b0788d25a893376f845ff9ae93c49c06f5d6eeebef664bf6a1066aec SHA512 eaa89784e1c758096d699edf7f1457f7571037b78673081cbbefd5accb542a1548e09101f1bfc902720e67c717751b6d09a288feb04dd15790f1fc1f1d1dadca
 DIST github.com%2Fjbenet%2Fgo-temp-err-catcher%2F@v%2Fv0.1.0.zip 6191 BLAKE2B ac00f2510bd406d7a12f58f4b87e7fdd69760ef4a6227aaa47bfccb0a48028fd0acdaddea3b2ec8d95473e9a8a4f7cb319333cbfb0aa26f19ad616cd12d15412 SHA512 fecf5fc10b9aabdc4315d2131e1c52ccf0bab9ed82b9d858d7acf1f3afdbeec7b9d565ecefbdae6bc468490323b5624683e8ca53a13e623b9c73aa985308508b
 DIST github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.0.0-20160826012719-b497e2f366b8.mod 35 BLAKE2B b49ffebf1559a5eb050b6b3623ccf41a1c85d4701119311c5d13b837d7430fac7ceab7e78b0a9ff3698fb8d4e99af7d5feebc34b3199d75df8a106c8fde5f993 SHA512 8e1441ec3bd770b75dc70eb7b6ea7006e84b9327295c1da5ffbc927b5e20f4420e2ceca7a15e169b94cadd970dc659e070a004a71a0dda0bbecff3e89d329aed
 DIST github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.3.mod 87 BLAKE2B 196a568be44071802dfebf68a6c850845a96314de31e6176478265b87eaa604a0dbeff37639909deca5184cec3d119ed6b5e23eca680f03b90e318177f59ce9d SHA512 549ba7ee06044ae34357dd02133dbf8585d5761c3f06a1fb248505ec862a50e57927298a37d99846e4b4efe229b42ce751d58ffbc9ecb06715c9c259e4b127a3
-DIST github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.3.zip 23709 BLAKE2B 865178efde16a50d6ead37b10fb78b97cecfb994d5ba2b994500f70abaca8af60fa5c986645cdf90a0c01f2326be4dfaf3815763d6048fb82d1c7372cbc9baea SHA512 a48b51928b9c788a5a12cda2264f5103c282b950669a858800e53dfc0f91b2ec89bb1f8466723e83571fff87c2b8d364cfaa0055de0549d9d0b4f94b391f50a9
 DIST github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.4.mod 87 BLAKE2B 196a568be44071802dfebf68a6c850845a96314de31e6176478265b87eaa604a0dbeff37639909deca5184cec3d119ed6b5e23eca680f03b90e318177f59ce9d SHA512 549ba7ee06044ae34357dd02133dbf8585d5761c3f06a1fb248505ec862a50e57927298a37d99846e4b4efe229b42ce751d58ffbc9ecb06715c9c259e4b127a3
 DIST github.com%2Fjbenet%2Fgoprocess%2F@v%2Fv0.1.4.zip 23744 BLAKE2B f09dca3ad526a7cad611f4706a0f080e2cf93ddc8b5a1285c7f8044b6dc3429631a5063a63d6d0618f5829307f830ae1d989f5b3fa1e0e67336993fc583a44b4 SHA512 1e44d42647a66ce78c51a0a4f9d22808c3b6c3579e5d1e054a9831546ffabe9037b2d9b30f9ad7b1d1de20c575a7a5f6c1bc7b8a7924136c3fb5ada05a39b0f6
 DIST github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod 40 BLAKE2B c5cfc13138ded13b58e87927dab91ee13e3c849559ef067ff5dfc7886e454946daed9a9c916fc33e7ca2d090ba3e20b66d2b3d5cce1ad52455621659ada6ddcb SHA512 400eef69c141ebd20b3b38df86e95cceac1cc214b0ee7837ee84c6c0acc96097a459add9ff20622f1fc7df10e7c525fbe1b573a0b0e7597678c9a8ebe52bc564
 DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv0.0.0-20141203071132-1679536dcc89.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
 DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod 44 BLAKE2B eb9ba00998f4a45590f7ab28d94adcda4e2b511ae7078f5583bfdcc792d34b6eded81b8c0f71ced35b782cd1bf344542673677915b44b9eb31873e9c5d69e133 SHA512 4d591cc0f2d11ba450f294361950972fe0dd71bdff5bb0c3e72b673cad6ea990335680bf7650093e1f9978bc8556a0ef9329ae2e8a14c10b7de668aead7afe33
 DIST github.com%2Fjrick%2Flogrotate%2F@v%2Fv1.0.0.mod 34 BLAKE2B 3554aabb23c972e7c781764a6567185f03aa6ec5df9bef7efb4b8de72e636f05cc46fd9a69792890947a6bc87f2487acccd632b04bdbda33c5defd722599c2ca SHA512 3f05b1093804c352af0a61ba1d85c7a381096fa2677404521fa607ad4603f8034cbfcf1c813399449b8d443107eaa8bade87f87b6db4dd957c938d832c97abfd
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 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%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod 51 BLAKE2B 2e102c58874af58833146011d2b9d64950522530e5bb51d643b06f98b258d7cb52efa2caa36a1fd4d39d4307a37712de7f22d45990ebab7a755b7cacedcc861f SHA512 e208321653fa4f40d2af68b6db37a368134e27463a45691a1642bfbe67186efa2a6fa41cddb3e443e465c7425d8d44cee8364953b39e1b08fc16b447431cecb3
 DIST github.com%2Fkami-zh%2Fgo-capturer%2F@v%2Fv0.0.0-20171211120116-e492ea43421d.mod 38 BLAKE2B 117e60517606bdb278aff6b6df77e9fbae55c629a3754597ecc81cb2c15267fbc03f0024a4f9b644bddc345b9fb173db06350fd32f515d093a973d2c62e2d6c3 SHA512 b6056c231cb3d50945dc3f221da90cfe6f9b04fbe895193d842a83def58fd45615ef8b22926043e4737cbcd260efdfe13c2255ae80c7ed5bb9088b278236a031
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
-DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.zip 21331 BLAKE2B 9e5e52229bde22035a34b7d3883106b3a663daf914560887db12c6c1112b8a94f13c4d0067d1a0958df57f0a4b0c3747ad61005501505c5eb63faa547ae63c96 SHA512 65d0271eede1389084e66c6d1bb547b240aa97747d6b7e74b5edc99cf0453eee10f24d64865b34c29a6a536c138942bb6d070b639d23bc3e78af3a7eca6949a1
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod 107 BLAKE2B cd132ab287312d1ae53abd542a75e6bdd5cecdcd46c5311be91da88d54e1a114019440b12d71a9357851585672f440dc66eaf359a99b7682ce1bd4ee03869325 SHA512 302828b5c2b6eec77f4a2ed075cd8b721da8d62a8747883d4382d5674a7c82dcea01a7de664d15d5eeba7e35b9667347dceae9b4ec93858ed3acf8adee692967
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.zip 25141 BLAKE2B debeca10f83ceb055349bf601ad8ebe432f4b7f066aa00af096395451935039e6a70d970edfe0be1ceb3b7a7a9263c3b701c7e6e6b00d537b46b3fe0f775d6a9 SHA512 e6d095116fee513da08586e53d97606c8a21989845923e43e24dd76ef4a8e937392b6be114e2287641b89083cfadb59dc7d12d03841cd75fcddfc82943f5090a
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
 DIST github.com%2Fkkdai%2Fbstream%2F@v%2Fv0.0.0-20161212061736-f391b8402d23.mod 32 BLAKE2B ef8053acab503fd01809102291aaae3aa8b492bc3bee24dd49201ebd8ba17a68c7d86e44326692b2f9bdd7d59a5197963eacc8f8191ed51ff77baba2f8e25ab9 SHA512 3d3b4f2ee0f2a150983cd17b60e1056fee31445c544151a1051aaa8f9355796ae569d218aeb717893807ac4092ba2e96901fa376edd20cde64a63628041f6ecc
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.7.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.7.zip 17534766 BLAKE2B 9449a00a40cad1a8926576d04ab3da6fb68aef403d207f22878ed8ef42c3e35e5b66fa1bce5ca674eed715a218e637d9b3b2721f1234d076f11fce719f8874df SHA512 4fb82bf9208a83e0a1ac5d9fefc76a4f4c93b46acf6a3eb92b8280c2401a590747542d7af29828919bb3fbb1bab9679d94978aa3d900af7899fdf1bec81c9e8f
+DIST github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.4.mod 46 BLAKE2B 1b395032bc9be34d676b49f478c04109fe1dd010544690d6c1bdacc28a17489dce66c8edf61ea9de139feae36bf393c0180dc2f6b73d54e5e0884a7fdbb25b37 SHA512 16bc59642bcbc705e57b1862066193a922b9c98b271cb1b2c3b98886b06d7d5f6e73b272e61432c809b569fd9715ec00725266f5a4954e0812855e093cd87093
+DIST github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.4.zip 347138 BLAKE2B 3447f59486cf0aff3aa1c0a436e0a44382bbe1ca7cbaeb85b14f10cc22e2b4d982aa16efb50467a03bbe7c425f60cfb5a49bd691d60563bd7f4246d7ca1caf30 SHA512 2f1b25216a4da6dcd67521efafbd422208a92b99ae1f01c7068289c3ba69cea7e6b0888c77a8d6c783e0faf7f73d64e91a28c8d9eaf8dff29e55a0fb701f7a7a
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 3567 BLAKE2B 80b7bf217df9367160180d44c1fab6a9f10154bb9a6455538860158a08c5bf8c794fff973b899b1376e4e65764a9aa0d6b8b162a6d9ebe1adb1368b9a2a42786 SHA512 27910ae03fc9fbf573ac31454635c43bfd771d2a91325eca544f7be0e24b43c2798ed8e74b4c31e8c20c1a9cd266b835017aea3a3e24c2ecb43a14a6143af8e1
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip 3966 BLAKE2B b638ca22c4f9df8cce5b84837e4f72b009c1ead300c08807b8268d26f04d6cc5476d9af56f676d8f4ac046c78c333614670e0853bee13de3439b5d89b96bfbb0 SHA512 ff98f8c05d8e23fca69ee5ed780e728f9d1779ab55cecd16bff890a91d14af81ae7a0304f34b3e04fbcbbb61e3c97c044dd9c190bd8359f3b19bdd31f8a37329
 DIST github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20180514024734-4a0ed625a78b.mod 32 BLAKE2B 08703857fc49c129e7dab411d216e6127d8918cfebfbe4f1ce2095eaca41d1acc2c7471571ff79c77b7494846f44c7ac3ff6402e4e4b9b8dae1ee4268f44d6ec SHA512 5d586ffb024fe93b485e355ab197ddd7e3743e87355b94296ce42c6761f6a8b3a31d23787429b4a9e52a6f657025ec573942a7756a0ca5387007fccdd2470ac3
-DIST github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20180514024734-4a0ed625a78b.zip 16451 BLAKE2B 19bd42867a679cf4368ed2e5c85e6dfe7a766342f37e67fd5ecc0c5a3389c1e5b52e1d62605c84d2cbd0fc2c652cdc2464a20d743768184f77086abb5b26e516 SHA512 d1b5dc39f9478356531d4950592237cd8575f6b330e06e3367da454f3705281aff97acd7fd92c5dfafe517d928c8a4460d5bb545d7127b3551d2fc917525d39c
 DIST github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20191105050749-2e1c40ed0b5d.mod 32 BLAKE2B 08703857fc49c129e7dab411d216e6127d8918cfebfbe4f1ce2095eaca41d1acc2c7471571ff79c77b7494846f44c7ac3ff6402e4e4b9b8dae1ee4268f44d6ec SHA512 5d586ffb024fe93b485e355ab197ddd7e3743e87355b94296ce42c6761f6a8b3a31d23787429b4a9e52a6f657025ec573942a7756a0ca5387007fccdd2470ac3
 DIST github.com%2Fkoron%2Fgo-ssdp%2F@v%2Fv0.0.0-20191105050749-2e1c40ed0b5d.zip 16532 BLAKE2B 5281687d4195cc7ddd62fae6c46909fbf4eb09c8e878e456f84c3b2c3d97966a06917543ef76de776ca341d89284d19d8fa5ba162107e231d429d25dae0b6c74 SHA512 de2a23b80bf7b8cafdf7e9a9cabc51b4440e496dfe5c59456ec224a64c97341811ca0a9fb07e9d70c0004b9c52792510549702cb832b435935f1accef4924375
 DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
-DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
 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%2Fpretty%2F@v%2Fv0.2.1.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip 11508 BLAKE2B 609b34f41f3c1579ae15bbdd5f9632dd58e9082917acce355ffc5402c33ea45bb0bda32d009a0a58c6cd60327aa87008453e0c4c36ed2a1be41c4f5337de72d9 SHA512 0f792e6f960b0cb8f9a30c25d3a3f30e7c459a05d7f03f68c98cb581967fc48b377314cb83b990c9509cde5680389bee0ce2b0b1efedbceb5592f38a9ae6a3ec
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.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%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.1.mod 215 BLAKE2B 5985386dbe202af63b85e4c2f8cc314d7c52c351e23756d21237e548bfb7e671dd07474836726e28bf011e34af5960820769f4e215f68f76f7d322f9731c6908 SHA512 e8de94e6e8493287d759f1cdde1aad773baf7f0419e1e8f3483fb9c3b7fe32ba4c95c193f322c82cb7c0aa7df6aacd6083679fd9b060c7bfb890fd15b4a84e9e
-DIST github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.1.zip 11312 BLAKE2B 77a8326a8ff400357f73e4e391bfba9d53322482ea460b4c58d9a0492c255dd075d54a5ef24fe2a817043e90eb09ba9d3b7c634406f2593813a69b19d548548b SHA512 6f317dd68c03108c3f8eb2b1b9214fc11581ce3d5ca3a8ca2f3ac0cb621af1326c536781ca9ffce69cd10b43d8b0901c6418de82ae0782c0904427ca98da85e3
 DIST github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.2.mod 185 BLAKE2B f1c386524ba3bf35fef03ceac61aa01057c1a3ae40d9bd117bd32db490185a6f1e82ab7ac65bcb51e1093db2f569e18a52b0c5ca0b587d8510e7369ea3af33ff SHA512 e85f16734a43caeda0aa046557772ecd98bb75152a1fce2b70abe95d18db65e9d1bc85aff943a0a9b6c7d335358b4764e8a4f834419af395a6f5dddf19fc1743
 DIST github.com%2Flibp2p%2Fgo-addr-util%2F@v%2Fv0.0.2.zip 11443 BLAKE2B 1cccf7f07bdeaef7d24c7ce7476ab4cbcb28e6be1a1db20aee7ca06f20fd7e74217d2c4859e71153a47d16aed5ef9a1a29a73c2117500feed8a8593b710461db SHA512 e58436afdcee50c6f07c827a9cfbdeb1078435c192d0adc5984a9c3e658610fb03d94457505d4500412b9d404516376e6edda2835deb4b1400dfb6bf42c3d113
 DIST github.com%2Flibp2p%2Fgo-buffer-pool%2F@v%2Fv0.0.1.mod 40 BLAKE2B 9450ce15c5660f81e3f94cce868daea79d498081eed118c045deeb16bcdd4e1a033748417305cec3f0f69fe27122b1c8ec63a85a129ab309693a7e7c453d4e7a SHA512 27997073dfdcd779c6ae7ab9540d417af8727f96aaa0b82a4c8b4f38ac32083d19cd4899288c72a5028f54fda674612c5c0e54cca66db0bd5b29c3f0c9be45ae
@@ -590,79 +640,54 @@ DIST github.com%2Flibp2p%2Fgo-buffer-pool%2F@v%2Fv0.0.2.zip 14858 BLAKE2B 4c8ebb
 DIST github.com%2Flibp2p%2Fgo-cidranger%2F@v%2Fv1.1.0.mod 135 BLAKE2B 8e65f4494c83acf7e04bdc0846d7a1907615ab34082cd0f0c5438f81b4218b7360b265e1b740d332b95b5cff5543ec6b144396cb3b9d7e9732f5063cd35b0132 SHA512 eef22acb730a6124267bdbe374db009cec18074a17c0a04c416b465c44a9c3920f11c4e22f445438278e29adaa2256231a0f88fec8fc753950be9241d8a26716
 DIST github.com%2Flibp2p%2Fgo-cidranger%2F@v%2Fv1.1.0.zip 32382 BLAKE2B 36c3b3e1978fb846a3ddc604856279f8daa18655fe1c3b3a3865ce2cb93de44bd10058adec08f13d68546375d98d7cedc16bd16fa0182af147da083e631d717c SHA512 12224122fc4fcec7d99b15c18b2a28e856f399f7b65c2bb183902651959d08e7645da888689fbb225921a9ebeb398528e51b19a158a002b4ba82e3091ec175c8
 DIST github.com%2Flibp2p%2Fgo-conn-security%2F@v%2Fv0.0.1.mod 179 BLAKE2B 7b2befc9ec06d713774eabe7eead87f9f779e9f50b18ee0f16fee1c01b4bf95c122bb4a3ece253f9ec9cae6df94215f6728b3871a9b55bf83896c256a98c5b95 SHA512 bbd891d8f6cb5186b6bb0069535013b5895a6185e031ed1e35fb654657c48c1fa5b2907a5ca50cecba922628888b07af743f8054283321328b97b0c9610f36a1
-DIST github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.0.1.mod 198 BLAKE2B bc7d367a8c184443a2e30204a9cbb409c300588e108531344278f731720c948be6fd87df349d57429b8a1c279b0d87c05913d6c19a5e8171e0dd2d9ecf61ec2c SHA512 d43df5e3689888d049fadd8617131ab88eb527f04a620f1a228708074dd6ac0ec8c1da47284f7f8e65a1dd50a94aba000ef85cf8b2747364da00b581a8de6f2c
 DIST github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.0.2.mod 198 BLAKE2B bc7d367a8c184443a2e30204a9cbb409c300588e108531344278f731720c948be6fd87df349d57429b8a1c279b0d87c05913d6c19a5e8171e0dd2d9ecf61ec2c SHA512 d43df5e3689888d049fadd8617131ab88eb527f04a620f1a228708074dd6ac0ec8c1da47284f7f8e65a1dd50a94aba000ef85cf8b2747364da00b581a8de6f2c
 DIST github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.1.0.mod 208 BLAKE2B 20794444d02f60b38a593a33a82fb567bf4588ebefa570f49349dcbe9eb97c9848e76f35d560e0ff90e128069c5475e0c72b40b1996129035938f2634f3077f0 SHA512 c8689cace50665d64a7413c36c3bf32890b673cc6dda315737d94b5d7380c0428b34ec4b37ab11e523233ea910784470ddf17c79b860e61c9241decd64601e46
-DIST github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.1.0.zip 8971 BLAKE2B 86c642e1703c333b28ff49c7c784130855bf8c5ae57ed357933ccdeb923b5ebe2c7959788a39a4dfb0a42348cfd8d4a98d6d997e9d6993d84b0a6ef4695582e0 SHA512 f5b360b261e60261afaf400cff8093f819f98c1148940394da6294cb5c43184814e0e06f9e761c207779182dc90b4c3791acf9902b52eeedb68e52fec73643f6
 DIST github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.0.mod 208 BLAKE2B 1d43b5733c5aaaf5d2a217314254acbe7eaadc2bce6bc6f08c80ca53f1cbf2371554a5512d627908fdb26f8960c96806cbbb55477d5b54df2af3f6c8f6070f51 SHA512 bbfe4be3a4da09b40b18df9becba4511fef6494748e6126dee6515b186a1c964cec2ae35ccbf2f8be3b21d3c8fdeb0eceec47c26ae7556d52f6bf1ba4402fade
 DIST github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.0.zip 13661 BLAKE2B 130a82f254776f0b72d8ad0d6f860532bd1e231d3d1918f4e4b4b23029802ac1a879c90b1e92a4f3f816f17387c96a32711fc3329c5374464f9534659a769114 SHA512 c48c5b610eb92ef219f9f9578a3486b901ac73cbcd12214f7084814c0985461e3d7847f59772b35e81d1f4f25b88f29b989f5dabfc81b9e50f85646f335f9e6b
+DIST github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.1.mod 208 BLAKE2B 7734ac1096e2482b985f106959e76fe3aa0b5307ff927a6a422958a55b93022f6d258a4b953fc84de803e86a95e0373f9784ed765d817f565002e0ee70460635 SHA512 154d6483aaad2c3628ea03ee89fb16bdfb879a4bf399fbd54a80c5f10d38cbc0e236c6f5291c59ba0bf75c1de5c77537b60ce762c8e37203dafbe23148ef21e1
+DIST github.com%2Flibp2p%2Fgo-conn-security-multistream%2F@v%2Fv0.2.1.zip 12654 BLAKE2B 7e865e6522542998c0ab278ea52377c503d432ea76d374b320c19368c8adf13b7729638d5c160a430e597f78baa12cd214811edca71f6e33ba4872cd598f5631 SHA512 66120fc027926f10693005c47c8e8c939fc0cdf3762a87fdf43082b145c67257b7da026ecc1bf05e017348f587eb555ce81b1b880bed904c783547351764999f
+DIST github.com%2Flibp2p%2Fgo-doh-resolver%2F@v%2Fv0.3.1.mod 243 BLAKE2B c05b737f4fc2cc062b02785732421c6de788392bb787a663358f038801ef9c7c8406d4c694b81db87624a043cf4ea7b04e9e1bec500722b8e84fc57f998606e2 SHA512 5781cc4ccfcce49e1ebf1eecec7114a97ac476b80f7d1f365c0d7a10e1e8bfb199609a5cab6506cb14402ef04a3f822d7f6a2f4fec541efdb28b1c5418ac3694
+DIST github.com%2Flibp2p%2Fgo-doh-resolver%2F@v%2Fv0.3.1.zip 9355 BLAKE2B 2228f8343aa597e9e45513c41d8a79f0f39d6a5f1fc7c6f6b7f1739bfed2ef33db68e0abb3c407c2e99e0c7fbb8c187614a7904e7a19bf03ecf291a0bacf917c SHA512 8ea0f4503df87488d5775aa09a7a5a2f244c264b09fd4584a670e50423d87fe1ccef57bbc0fdfa3b28e2fc914a9810c2ff85a28425713410ed7434fb43545718
 DIST github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.1.0.mod 144 BLAKE2B 8047426b39d3a8159dd07aaa35af00ff9a08e17fb4b55d60d9cbd8ea17cf89226b58bd58af50b2322396fff67c97b24d1b23603a05155e093dc88c6327ac9206 SHA512 66993162120494976016ef86b65f52dde96349a0fc8d48142fec9d5006daf9469100f2d7661f928faf81e7ce83f21d14b174944d7d83419efddc03de81a9ee7b
-DIST github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.1.0.zip 14474 BLAKE2B 6b63f139cac4ea6ee863aba980b7cd95be36aebf5097e5305134b4cdb192682082b2f13c97745f266e29452a378fedf15d560bf1826233ada308db945322d7e8 SHA512 d7cfd4661cf8533a1c9afe9deb5d1b8fe1620a16e22d1abcbe5ac5c92ac22d095d51c5409c7c4528d260c5c1857d497468309f46fe6690a1bd80415d0ad09793
 DIST github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.2.1.mod 180 BLAKE2B 48c65e21815ba47049520fe1159a255005b28054ecc397c367e6ccd2e22c90c3936cd4a43443782f708eeb89644b27e3404a85cfc07eefe95da53a7f4a536ac4 SHA512 7e089b42526126a0ef23a15b7863c654b07bad199217ce86e083ea9a4f1b83829215ab60fa6d646e64424829534b60ee7ec74795feb990e45aac165d0794cfc3
 DIST github.com%2Flibp2p%2Fgo-eventbus%2F@v%2Fv0.2.1.zip 16706 BLAKE2B 520e5fc6ed9eb4e96bad68b90dbf73b657386324e34c47bf25088f95e946703893f6eaf9585d1a44d65b54e948f12324a63fc7e3c94a3043638e6ebb548788fd SHA512 d92e5fe1f8f3e5816b7a731375049cdd5c738382963db16ec4f49ad97976f85522b2c244d166adb42d8c35d55f4ab872ca8bd82f8d959ccfa122dedbc8944312
 DIST github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.1.mod 41 BLAKE2B 9adc454b9eb840a7057ed748f8aafacab344da81cff1a1bb70149c8a11f02f642be0c2ce7907467a95d56bf41fdb3f742dec6fad9cd0281f122dd4c35b51b201 SHA512 360014563365392f768b7c81d96a2df8b347c6900ece142b20792cdf3d02c67c94d2365745eae3cc68f004096095ca031fc6a6ed77c967f5062024863552fa45
-DIST github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.1.zip 8453 BLAKE2B 71e466a6fdb05f64be2078d6824df418174bc3b7b60031d1a547d5e4a6327cfc5793177c06a282d4590ddd9d54456ee795e264ef1675c0503f21852baa365e11 SHA512 64c318560e21c08bf4b87e9c1efdb41c25fc3d01652c1ebd4bed063f9dddd042386b8284ae40e0f5c2549e69b649ac042569f59136bdd5ac795fd87ad6da7421
 DIST github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.2.mod 50 BLAKE2B ab071941ea2c76834f533c326432ed37b78a13d0e9ae3036cba1a9d65e127d751b98ffbe54ea10c1d509d95fed2288e054aa1e395ffef5a1ced367e21758e2d7 SHA512 52e84183636b31f3904ed24667a63f59790cb66858e66e155b6b74f490854243041c4b0a0a229049139a77d532162aa13284c7821045518cdc683ba0207d4eeb
-DIST github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.2.zip 8974 BLAKE2B fddb03c8ad0dc29dc3dea8f8603e54228e63d9ee46c29951d8c912907a2d5de40d27034ca5442dd6c67b84ad0041cda65d1cb59066bc037cab64dd586edd9b94 SHA512 d0ba804ee1b5e4bc6395daef1d39cfaa038099a2d1634ca2602e22738e467af8cd7e2f61297d3d0452301491a17e8754c1f5952092ee0692a742c3888975c8fc
 DIST github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.3.mod 50 BLAKE2B ab071941ea2c76834f533c326432ed37b78a13d0e9ae3036cba1a9d65e127d751b98ffbe54ea10c1d509d95fed2288e054aa1e395ffef5a1ced367e21758e2d7 SHA512 52e84183636b31f3904ed24667a63f59790cb66858e66e155b6b74f490854243041c4b0a0a229049139a77d532162aa13284c7821045518cdc683ba0207d4eeb
 DIST github.com%2Flibp2p%2Fgo-flow-metrics%2F@v%2Fv0.0.3.zip 9565 BLAKE2B a24d27fffb4e9f16bd9757f00bac175d65826f89aab53a857e09dab6de2deeabaceca6bf6f7841d4249633e302414297fb7a87a9de84f14e76ae22de659dafe1 SHA512 bf55dfcbb5fac9845ba22f1d99018fc3c7a0b61ded2d0a66b1db6e0f5e1375eaffcb58f8cebc376be1cc3a463206e33b7396aaff491da0d6838bfe8c49ac4875
-DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.0.2.mod 2020 BLAKE2B e7373ec12f01413ab5cad351e52c48928168606534a65843f2edfdf1104fc50993ff856eca2bb7756af541d3f7d11d15d1e4819d6ebe3f7c5c901fd21f40f1c8 SHA512 dd0b8d07a5a43fdcab83e143a021b7b839232f2c816507fa6694e3518740601104d98aae4d28430fb5485648f52501cc012120b5a124009c5e59fffd7369b2ef
 DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.0.30.mod 1975 BLAKE2B 725bedc6f2b7fdbdf46a4814aa4433f8284133bab40834b2f2ff50466ebbcfa73262ea6ef755648f34225b7190e7a4dfaedfa27d9d077ceed132fa0de678986d SHA512 0ad3b04799db128189a6dfc521fbb6a4ad9550e33723bc09985949009ec3d596f834949b45c49e6233cc52f4d00fb6000d597644dd8c5ee8ebb5e5f7f41758d0
 DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.1.0.mod 1488 BLAKE2B 407010dbc2154d9a6001f9f95226e4025ee3b5cd27d69d4fa19b4a84b13de865d8a78f0e8f04625460cdba4b2eea635e323abe2daabb158515c6f451d069b579 SHA512 5af28a05e196c613fe79dbd69e235445f5ce873ba4531887187b0c1f1d3d05b7a645c6465d1dda8021677446c8bb76897caf267b4508208f95963c4b2842e1c8
 DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.1.1.mod 1488 BLAKE2B 77fac695a85466e05dbf4a8fa77669aa09c61fe208cee6eea34a9757d7ad6b3d6b045107ce6daf3a2b1a6c32206a42dd9e9d610875cca1a565208a387daf26fe SHA512 a32dfa0bd6f3f4f904390ec3458b22c3cebfd2af0243cad06380f2e7c5437197080683f8e1f491ee42bfcd349767880dfff15044c83fd55d887fc0698e398a59
-DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.11.0.mod 1773 BLAKE2B 7b7413b9ab6bcde505173a2d70dca9c6c8f9f216229f57d9f18feeb6094c5c8bd78120cb7428ed49fb4dafcccc562d02d00944473374365943ba75accccbbfa8 SHA512 871ff5fdffba2504dd1b42e2af90b4bfcd8cae1a59fd9b74d907fee35f521e3870619169c975525a9ee103b7d0335c6bf776ae7fdb805359f3647afdbed45026
-DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.11.0.zip 157027 BLAKE2B 1f9c8f3e9b29085b83cdd8763e03901056a0bc822cff66a066d4339e3c7471e03d3c78147fc62c0e1698d7bf4cd9406fb7f5061af61752b232810822bcaa340f SHA512 7b16a0c652d20d8f7808667e6971e9767edd6ba62e39aade84279a9cc7b10f4c79d7a702dc80f5b72641d490c6b86e81d7d4bfaeb591d14abefe6d89e9d21d7b
 DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.12.0.mod 1761 BLAKE2B 7720141c562701be20404f928f467e7f999d71f7eb64786524447d06eb36a2a866e69aee287bab83ea8ec1542b62c6566462bc30d4d24a8aa300a4e099a95403 SHA512 1f5f67f134f31822e56b2e70ca6946178528c1e249a378fd4b71a6fb3cbb4e83a6db177ae3c83050824e39d4c27305da3beeb7040ff582e02753da00ecaa5494
 DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.13.0.mod 1761 BLAKE2B c9d3f36fd3dbcc42c1520badfa9f90444ff30c7736760ea5f942b49013fffba13a7507288f7564949b848d3a8e62169f7162afb1c2e24d259a387b94e35aace0 SHA512 e78e508a35b3124de7ec7344cef23cebc44ddc9d244f52eecb877b8fcc7cbff2e5aa6dc28a4d3dc9f55c9fc4da306af05e095d298290ad5d0e029872e06659f2
 DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.13.0.zip 163303 BLAKE2B 547eb5d2e23b8a3612c0d6cf2a50f1275b2ffba7dfe53c1d33ea556d86a7bda22c42c680355fe4a11dcc27f4d987639e7cb71926c0134214d307fd7d3ca5c80b SHA512 075236e05aa77df9e6415462285d244f71fef6d03bd09af6da5a14011b19e60c031d321391a4e5aaa3d4d4e03de5e5d0c02a5e25059094206ab74a0bfdd612f0
-DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.6.0.mod 1734 BLAKE2B 980ba656a7de3f03f76e7925e550a59058f9911efe7cbb52559feb77a9999b2a815241e974ccd464c22fcd6f8491f2ec84f282c6b38fa8212b7bb757674a68dc SHA512 c798cc47112cae8761eaae91c533a6168a708acc59522abcb505e389c7933f56ab2687f3f133dc0cc06f857e9b1239910cab6072da39caf12292f74f6bd22433
-DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.6.0.zip 132433 BLAKE2B 3d9736641236a18e18db18a8d4e69b2140c349fe5ab5e6425053428807df47cbac57bc536a816db84726b2ce5b15b3a1a405c0294ecb84b71042c1b808dfa36c SHA512 eab46495491b391227977fb9c5272b7fb09ceaf9f725b8d3a41d2d2685e9e6b84cc1a1e25f8c286ab2b48088fe7c7a2c184121c55348936ac2ca16f1d11fc19f
+DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.14.3.mod 1753 BLAKE2B 179e778793c41f40594929f2225f736fecb15eeabb306c2b2e1f00282729c7e5e2d390b308c98d34d00a7d9cb12adf559dbd88fb98e15b27da1d76b20ab988b0 SHA512 dff57b21493d89e6d698cf3cdb8a910e0cc90712f6f92bae1b7fd6c104f87aaa526aed6db920b33f77ddba84d8e20f6f021899741e81fffadec6efc3a8a082bd
+DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.14.3.zip 183282 BLAKE2B c3d38f4711688036b9fb64d4faf2cb05aed1ef0a22ccd3cb106bd921cba76e47ce2f8dfd933dc35b74d41d432c5b951fbdba459c7e70979eaf2886fccaef79fc SHA512 e98879cdde8a0640fd63bc4fcc4370ef3eaa03ffdaaf446b3d32a7d125cc3de4ec2ec2537392837cdba5a54231daf5199ed78c56e23e4ef5110e1f9e0cec0b00
 DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.6.1.mod 1734 BLAKE2B 78147b99029c4425396bbbf96ddbf7e8dc0cf70dba02752225a2117b0527d0d86c62acbe845bc5e99f54524611b5cf31cb095eee7c04598a605e01888048c9d7 SHA512 1cee8542f6102c39fb1dd161a1c673cf7a1b148a01bf14dc53649c92406cf5539719eb255975fe5b3dc7b51394b7c9b2dc1ebf231e1201d42eae23f4d74c155a
-DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.6.1.zip 132308 BLAKE2B 45b6be7f25faaa001c3e6ec6b9876f53cbd41bdf22506426fd6ef724d3e31cb22ac7a184fe7f4f984a2998abac5784e184f2703b7fbdfcbe92513cf494e1538e SHA512 ff0d75f6f7b10f036f5e3300b350bccb732166cc9646dbd1703e955f27164e7d9268f1dd97163e5e7de7a06d29a3dc45a1aae774b63c76076fa0ec11ab16ce32
 DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.0.mod 1535 BLAKE2B e092f433781a5656ef74aa153a1c9bf18d98e0d483bcc81062bc7a0b1abf642ac2f381f95eb00bdc1a6c166ba32619d567b354645edb305de85d32f690c89fec SHA512 a20defaa9c90972952500e18db12785bccbe5d0cddd07c163d5aaa0d0e99f9baf3571ce2a5280304715b71c13851bcf3a2dc1b565e8f4fe7c35916f91f075d5e
-DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.0.zip 132787 BLAKE2B ddf9298940219820d15445f6846303e4bcc91e64369893fecb45ce0dc7deebcc7926ebf84f5f25f9a0d915ed1a7ebd838d192900aba94da80f1d043d260cef7a SHA512 f7ac4439c3bde9dee1699872114733429fe5138a4e17278588d53819ea61723dc699e50a3564799552ce33d6be4fec7c22199204bd649978bcec04f9d57d2e7c
 DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.4.mod 1493 BLAKE2B 47ed90a279bba3a3b8b4bb13f7063b27537c12c4a83c1f70fe65fce54851d10d409fef6d65ff5d18450eea9dc9337791fa10aff79a46681b50a892aa46f5aab3 SHA512 d9ccbbad4f2242be5aab1720de84e4bc89ff1011de7b9464008d91ef1cdfbb5545c96ba32f1e01311352257d65134f3c51fcf2dda345ca223826f8a369496c23
-DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.7.4.zip 134743 BLAKE2B e5521b58d35c67c1c250e16b78aeb7329878dbcc622665d6897baf547d0ecafe09762627914ab3709bc9b1acec3bb7d6004e8eba5800db0c0a844b4ed694bef7 SHA512 c980b37d0f41918f8889fe4031c9e24d8161c55b3d42f7b4028409e511608522d8c4ef9ea8380776c2261ec3c24431a1d54a34d77c3098ac7adaa6abcbfe431f
 DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.8.1.mod 1569 BLAKE2B 66648ae30e0dee88e8a0d34a717358da5ad153d3126c47af50b116624b753faf0490fef6b4c2ad84aea60e6ad67721d7f12376b03590e06d31babc691f402ffc SHA512 6053f5b7bae18a79f028ff9b478a1d68ec36eb7d46adb8d01d23d9d721688cff1c330b14fc67ad9835a2c71edb73659c84d14f6b2d1bb2d19389677ee952dde9
-DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.8.3.mod 1569 BLAKE2B 95a86dabd8e43a1be2e5f654b6a2675d1e3e7bb429ec4e67f51ef829d9e849dd86982a39a600ab6f473d50f3707c999eea7c41d50125ad85e66740c660db5cf9 SHA512 55b3169328b6885fa6df556a0b182eadfb89d9dac212afc34fa3b1dd0eb7b7f7e5f20e06d4f688f2650523890ff53c82ef8acca2f6ca3a1cf674b094ec8a6dc4
-DIST github.com%2Flibp2p%2Fgo-libp2p%2F@v%2Fv0.8.3.zip 138676 BLAKE2B d001727e0baea6b7695d79c0d9fae4a83907053c6220551f5df0621965b29dcebfb633fe160c0ba6aa32d4e8f0bc3a13a718c2aed4ca7ea4578cfd4225b36756 SHA512 637cb430587800b5a689b090bf4a58a7406fb7aa73986a5da9e633d4265029630728d5bbed2327d305a39b9a03fdc4604c316f73d9aa45e061d5b1ed0460dbb8
 DIST github.com%2Flibp2p%2Fgo-libp2p-asn-util%2F@v%2Fv0.0.0-20200825225859-85005c6cf052.mod 178 BLAKE2B a8f41d94a771395efdfd78e44576a931047ba0fbedafb3693d8184c8cf56dece9f7cf007adf572b2653e3aac64d5b3c6769b7abfe9d4c1e7afb79be2dc548579 SHA512 1adec4f1545702612d4e34ca18f6786c3897dc04d966b6716d6d6fa15a48049dfc4e80c49251ae4902de15a2960d8776ab2ee4f47b1291184b8a8617921327d9
 DIST github.com%2Flibp2p%2Fgo-libp2p-asn-util%2F@v%2Fv0.0.0-20200825225859-85005c6cf052.zip 1555634 BLAKE2B d37ed05241f3542296a449d9b4e3cef9233c2ed61c4f8b2c46ce8355ed7b7992f68de4eeaa05ccbe46e4e0d9cb5a3da70cf75fdc5b711628f5962ff631dffe3f SHA512 a93e0a380277935af25cd185507f8e1f701afe5dc464e1c4738d42efbc8b42e967defa775c79b9712d20956817e9ad3ce0bee19c1b0754b9c7a4be7696a7d2bc
-DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.0.2.mod 421 BLAKE2B 4167c5f54ab745bb354f1c160509fbad106c2b3d3bfa6de427945fd5771280d8f13096c61f7fa8dceb9503cb27db0190b6e3b57490ada3193390e433603bf9ab SHA512 d7c8a0315bb8d5700cb5e1df631a1677af8b0fee61b1a79226e7b303021b9eafe0e4542f4155e5fb2d34c8bfd73c3f7f4cc867a047c849f1a0b38b1069b49c2f
 DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.0.6.mod 421 BLAKE2B 14f8d2ce7c7f2e3eb53e48c16f679b60ec488cdc72170ca122e1ee88213b0c75ed0f65e3e3a6a41580311b60dbefad7e041747a1b7b544b0079182dd84520e21 SHA512 bbe7a2dc93f71505fb6a9ab3d58270f7fd95094d19188e73dda02eb038bc42ecc6ee8eb47c93d8ef7188eeb30f6769579e6412fdf469b77d17a664e4c591a9bc
 DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.0.mod 294 BLAKE2B ff58584bb4a46b56c26774d842edccceaa39549fc0646975555bd28fb1915baa41e1e6d9c417cd0e3489eb27f44fdc9972d7b58f9325ed1a7ddaec6b586102ca SHA512 f1cbd0bb375613c1c5239b81c9f18654ea3d73c53ca00d6d7e17bda92ce7bddb8c668b6f89e9fb600ac62f7a1b421f5a200d8bf8680da17ef34d842cfd37b4ae
-DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.0.zip 24168 BLAKE2B 4cd2866f74e8699353e42a6686cbce31c95b437b4e04c2c87f2fa5b7490657ea53fa668da7bb29232861ffa42a70764187ad4bfc56500e7429bd30914262fbb2 SHA512 8fb5548df9356b263737258e43d00141af90cd744cc1ec9a5d86a9ea56b96b5f20872bd6ab106d988cfe1a545bb4b6b2e8ab509841f2c67ad9f96a60e5776dae
 DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.1.mod 303 BLAKE2B e4ed5e54a44d6ac6a0f4ef7300441e1fb4719ff26c191c9c2d72179e146719beba37a47e9bf68d91a55ee9bb6b5be5a7872f03e6e53f1bf2e302f6316337658b SHA512 58906a07fa4729d58d83a23382d53003645407f30017d45ad8525880422f99dd4a9738dd608a93822026bc6389a2b102d2a7b096e63405922360ca1932543287
-DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.1.1.zip 28898 BLAKE2B 6da472d032009261dba170f09b9d243bc9d274396e6f6296a50a7ca5e0313c861333105af666bd30c205c75c452302c6ca4c5a585fb061ca3affd2530f794c0c SHA512 5911d2e546a1073f0234a367f33ea762fe1587fdc1a243fef9178fe474a70e2f419a065d845d4f8efdf47209783432c9650138c09715fac7af1fb1badd07694a
 DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.0.mod 426 BLAKE2B 633d79a501066bb39131eaf6d111419f25b7a734134c75520204b874ee5c76f0abddd48a762b694908502b6a7968d6ec902fe0c3afb79c83d8aefabf157e2703 SHA512 f1fb5ded0974d852c266c49fe24816821ce0af52955368ea2ebcb0afc09e04c54ec56287a9682e7b93c484827f19a73efe60aa98fe9ec2a0647d59e642be05d1
-DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.0.zip 40603 BLAKE2B 89161588513678c9568a6d2b9a2155141883929d53af2a736e8bf7dcbe2d08f560ff65ca1e357d0c543300f9b058eb0e9ccdd9cc8fb593e8a6859676e1b29da8 SHA512 fb6fd1ce3b1a52bcdab4ed08362f4295057316fb7ed82cb4fd2364003fb9025d8b85a4c7de91224a7f1cbe16de77a7d9638f70d084e663740eaf156f9c7826c0
 DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.1.mod 426 BLAKE2B 85f2fe69a476b7986a24c2df5b0d8243e63b6d4f6e7cde530585b9b1134f02bfcf7f45a263ea59db7ae87162a956c6c2a6392a7cc8f73c4f72037ffe25f414d6 SHA512 4a9d1803653b103f06ed3dbbaadc6e70ebafbea100f38cf882fb20e7d60bdd35512a00cf0463a724e4b585c944c171d9a30331c70f83e1a97749ce14d114a869
-DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.1.zip 43463 BLAKE2B 6364a66453cc99fbd0041eadefdce5ad0e6f0afb0641af6ca119ac0767f0f501a716c908fcef9a5f182e611a312e95236e7fd25dee128ae0175c62d5175cf8e9 SHA512 e52891106c10f334512363d0edd31208c50322b9da62ae99fa9107943d878f3f5267e91db2ffdfd2a848be68e5c09420192e37fc9ca0ce3b63a0866dda15338c
 DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.2.mod 426 BLAKE2B 0727349d0ba636b0c0b4fb7ef9a9c166298435d97dd0094d81939dcd60b866c320b83b0c7a6e1942327b036163d968c89129743ebe099cc587274c4d4b6503f8 SHA512 2501b7b8090058c299c9f50ba43df260208ea290eab12132325f53a3f6f3267654926d59f7249f6d1a9250afb015a148b4bec9edbd1fbb12a91cb6e8ef83828f
-DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.2.2.zip 45335 BLAKE2B 23fd06453a3418d6cc6deb229c67dafee43c8bdec1a843db46e43974cf291614f073f67e7d83104210e2469191174777a9c49703e3aac963d8fcc7f19fd8ce55 SHA512 da76b3982e11a6501a206260d3ad0b00449accf0556ff91ba64ddaefa354261daf988ab2525cd5d47d59f1b4d07e6e0d04d85bc65e9cc8e68bcbfcf559298ebc
-DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.3.2.mod 425 BLAKE2B 405282801c16d5254b19dc3f3f8d899f9ed3575d649cfbe32371f03b8a641a8f4d59050dc1135afdde4775e824de2fcae51be3a4e05df230b429fa9888655255 SHA512 732827fb8cf189540a8cfcf261b37c73e8d9c1d78bf673f1a0a098366cc33c7a978fe96fa490b1d26cf9186ce040a52790b5e282e7586161fb528a446fdfa8ae
-DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.3.2.zip 42230 BLAKE2B 4a581b3dd36bf1170ad8a4504d75a34d5c270ee806eebc77c20adcf32e5c946bd8186e33aac4ce52775657da3f5fcd29fec11dbe0c6ed4334222a89be27aee01 SHA512 b6fabecf9eacf85bdedf1f58e78d103c6f8d533a331957a1104fad70e9d869314ff7eeba6e232c5c429cb91dab0713db1f351d4dae8790402481554f6f3538bc
 DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.4.0.mod 376 BLAKE2B 31101fbd932bfac89340f40527264668fa3905cef55b9b4f32fd60f9befa5bf695fe4b5c90403de44f95ac750cae6e3a4b6d781f81bce8ce73e00b995994f243 SHA512 07b9d987fd6ea07dd85b31e503221099d62c2f67c57c1f0b370f2e14d5037376938311bc54c717af792a62087b84d257d732f4e8ff19464677e44ab905620e0b
 DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.4.0.zip 43735 BLAKE2B 9735e26c9ca7fa0ebde2893a8e7b5a2c60a6d8f3d5f3ab6662a242be590a10c26f8bfe4dac29315505625d47976ef3569b7cc26b5400c1ffdabcd647932d6b48 SHA512 b24ed43355f93cd1c5f063c67cd55142ec5924d156b3bfdc58cdd1166c70090ed459ed6c3feba1404d50c3b5c3d2b13f8458eb8e99356d052de035deddda1717
+DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.4.2.mod 376 BLAKE2B 31101fbd932bfac89340f40527264668fa3905cef55b9b4f32fd60f9befa5bf695fe4b5c90403de44f95ac750cae6e3a4b6d781f81bce8ce73e00b995994f243 SHA512 07b9d987fd6ea07dd85b31e503221099d62c2f67c57c1f0b370f2e14d5037376938311bc54c717af792a62087b84d257d732f4e8ff19464677e44ab905620e0b
+DIST github.com%2Flibp2p%2Fgo-libp2p-autonat%2F@v%2Fv0.4.2.zip 42242 BLAKE2B 87dd65a2bb2384888970ef9a212dafaf512aaf994d0e358bc0c84caa3054937c6187a53a477c70239fb24bd2418998c12264c7d8c2ab9a50cab5a214574550bd SHA512 b2c5308d863d379c75bc5fbc13b5d60ec2f0e4dd6c24a80817edd5714fc87650f15f1220f957985af2a76ef9abf06dac1aa98d0ceb286def70afe8f6a5911a55
 DIST github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.0.1.mod 448 BLAKE2B 3d8e93652255c38b9ffc4b1f53b0d197b780d28b8d0b4f0afb5fbf99bfbcfd8cfb145cf0eb9f21718e3aed1e355637b30cc3395b96895dd712ff84b1457f323b SHA512 3b86b6e33c62d7a3b91de4c270367474c77d76ea448ef257f2b25ea77fdca8fdfbb99f23a83cdb5576d4b2a8e22524ecce349784342f5eb0b4a622bbf06dd286
 DIST github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.1.mod 222 BLAKE2B 60465d35de4e4e64ced99b75efd0fb16a22e65846df5fc96a481d4677fb275bd9392b9112d5c424aa3b51664317075679d81796bdc3f056fc106f14a36fd7546 SHA512 a4de88f9f2cd28a67feaa2fae569943f755e375bdd6fddef2537f00d6e9974c73fee024616316ba079a5e470b985424db06ce9c9139363ba0cd495d58c5e809c
 DIST github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.4.mod 260 BLAKE2B e7a0ef17f7fe288086934cb0cd14bb04cac7bae1c091896e8406973e96ebc9af878d622a28f54de1d6786d7f0f94ce005e8ec6f46b9b7b55c3c76dbb87a23c30 SHA512 84bb7076e667112b0c73e394c1f52896a3adee9b017cd96711fca5eb963bacb010b59f404f8f359939058d2d9cfd76d580b71e4d911336e549a62e5e4ee2a132
-DIST github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.4.zip 11532 BLAKE2B 69d3ab1f3948fe354a81795b2216fec4909d998b17ffab0072a13619e1efb85326d011b668eebe135dfae21b61aa36c7d6b97bb76f213ab71b4b9904a1d00fbf SHA512 eca05b0cf6587604585a5d2b66d0cc19a71607b8a3dd17492f57894f775bd076f5bf5e5742871955591d535a70c15115ff8bc00b716d9c9548c9ea726ce7c705
-DIST github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.6.mod 269 BLAKE2B bf6b3b381b4bd534ed4619b29c3c21b4aab4e46782ad577487b8ce17586ac11e2ff5b8b77bb3f3b2cf9deb4d76444416bd42a471cf96f58dd20aafeed4e4572e SHA512 6f695a317289e79630693d88f11f971e17a5b39a237636f9b44cc45ad06a3c0bcf802b5d1ca18b9fd16bf9853347646177479da58ab3a0ff1174853c876cf3d3
-DIST github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.1.6.zip 14556 BLAKE2B 66ed49b727c0daa897d10b70b05f9b03941e3d2028feeab6c36f353e26020a36c3c9cd5544776ab50fe32ff641451be89b3842e7b791c15fd131332076452b22 SHA512 c25aa7d5f31c2e722b866b964c98627a597946434d99dab5328fa1ec81973e7fd3048a221f3becfc2e4a7e26d80125e3cebe5e3609eb8ffd3eb24ba7f0bf882f
 DIST github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.2.0.mod 269 BLAKE2B 15fb979ac9628dd5c85ec522d0be6882222dbbc4f8e39af93e67bd02df6701c6e488c1f44e7d3402053f9b01f2338a5c6e42d066a23b405aafb5cd3b60c58250 SHA512 02eb40c2a4f9570f3d955403ad6fe32ff62b2b9f6b92bc1dba50cb7dc731eefc26032cf6d0977c5d89a5e08fd4934c44a789ef8af202337f8609506372a89d36
 DIST github.com%2Flibp2p%2Fgo-libp2p-blankhost%2F@v%2Fv0.2.0.zip 14476 BLAKE2B 17ce27b6917e47cb837f962d41288a508b0be368bbaddc634339e5ce8f6ef36fe3ad94cb1be8e74fb17682f68a7d6623ec79031465ba29bcdbb532e3b398423e SHA512 cee3df3337b8466cd6fe40fa006db851649dc3aeb68d2e7334ff10eefb8ce7a309fb2d5a94160d95865acd974f8e339af1eefbb9a16bcce6ca54c4878f6fa0d6
-DIST github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.0.1.mod 571 BLAKE2B b672cecd5bf5095d479546111514b0114b0f579e979c7f03e5d7a4a55efa05b40b4af7255397225ac859dfffd3f3966121abf46b0b2c11eae07624b7a094b6db SHA512 1469cfce89becb378f7193f28712e8b66559965d020f19d0e675c4d10ef429a58607d92bc1bf15c641fca8f4e4b173b6a541e46c36f097c2c9e77265c34ef639
 DIST github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.0.9.mod 612 BLAKE2B ca41c648dd9c4d8daf5932905b071a512cf938c8b62f1a6346538057404f4c8588b9669a5418c193fa7b6d1fb736627a972f7ed625fb1c4564dd7813b04dc98a SHA512 16c91139d8cf914580ffd944f4b3e2ef038be7dd3f5f4f13f7b0c55524c01e1c9559faf6822d8c82d18e37b684c1823fc2a1644ccb4e12427e6fc1bb807a0457
 DIST github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.1.0.mod 439 BLAKE2B b2fbbfb414fcab5c23666d60402129a3d051d11183f29e36771ae05cea7765f616ba88d6045d2f34306c0667fd3be266b8e2b681e26eacc9b16c6ad3ec535752 SHA512 a57337d984f20789d74ec772a1ff9b706aec6d2076e5339405bc2bb97fb524ed2258702ee16ab4ddfa3043c0805087edf547e94c74f3ac6431d297603a7d0bc1
 DIST github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.1.4.mod 448 BLAKE2B 234566af07daa1352d847b712a271edb3158195aa3d69d8fa8b8cf87c43b65bb51346789039f89c348f3e8b404d54951e18cea950d3e192920caa8d9ec92dfde SHA512 51355de4661f9e7164bc1e17400444c8b8a717eeccac444dcede6719e48d397608eac9f910aa2123cd4f85c79b67baab2fd48d4afa3fbe7c4a46154d8d865cbd
-DIST github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.1.4.zip 35730 BLAKE2B e126ec0888bacb9c2b38fdd6cf51777ab5ee3c2176be84fab48cc5aa6bdfe9c0601ef6909e9fab6c6e7774b089146ac940b8c8dcffdf08ce4366737524cf4afb SHA512 9ff713aa882c958978d8173175485ceda7d3ff7c5921b569c5697246b882e561fee3fc4e5d4b323a3a07758d5ba968ae54d1cd132d87440c8d3420cffc5df381
 DIST github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.2.1.mod 448 BLAKE2B 47c41b790226ef3cb415bc69d8b8922dfdcf447632980823a94190286b7926e8d800eb07c80f0d243e61713e7ff56655bb2291e5eff96220510987796428dc06 SHA512 09b2167ce1f1f2cb9e03c9646976e8f9062915aeddbeb5cfe39f440ef9ed5b8186e7cfdd925456a4625368a07671a97ad8a3cb3b0a3e1524122df142fed48c0d
-DIST github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.2.1.zip 35915 BLAKE2B 010c498af304f23eebd2b7ced98d021593ee483267d15fbf57a6c4fb93b9ce551de1192b67be74df34eff69a50e6b93641f1f916b0d115f675090f535c49245c SHA512 72daff5e3e2715d2bc57435602477c2b9a7e7e24145b8d2c03769eabc0dba3369cc8bdfd6518ca7575592b8ae020bf073bfeb2971b5b0155ea4b6b4c463402d6
-DIST github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.2.2.mod 448 BLAKE2B dd89c3b362a181a8cfde5444798fb6b027e0f48f5c9991eb2a9233af7f0ab8e772be52a857314217f28b60181e4f0bbe99bef18f77bc4ba1aa0c4794aba0ca17 SHA512 bd970dcd898109f0f5b27bac84f70fd555dab3d48c726a02be4434bdfd215f1cb428e2d976248e2807ac44df00218fec2f68642bc3be7b829c25133116a12c2d
-DIST github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.2.2.zip 38326 BLAKE2B 656baf4c307f7922760ab0a92ca79fb53e0560f8b0d7049ea65646d7e11fa87ae242af8ae3e9516d754a220382c40c526f56d891eec552a79c93834904124555 SHA512 e3e0e0fd5f8b60f4f582cb4dadb5062ae13b1ddc88a6502dfc58100151a4c2388e4397f0655538d4405f5d2a4f48f838adb93ff7b17f2381865e71d46806414a
-DIST github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.3.1.mod 525 BLAKE2B 1d101d2ec4fa5f3e686cf844f996c06fe91f1825fb60a0740b32587f0a1799a70603913a06c458622e464602774e44683a35eacbc781786fcc2dc800705732d2 SHA512 0a7e1973a1824e5a5a5b48d410a1508c3254740f99063af8bbf08d1f63d6c7a67dbad356426eac8e779b696363cffb1a00d52eef85e95b0dc315a0061d1e2c1e
-DIST github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.3.1.zip 37390 BLAKE2B e4c9490643a1bb4b148028fe46deedabad8b02381f7cbf2db85677dba742753eafedb04cdf74fd95c7c174411588284ec234a1f009418a69e987493197174bf8 SHA512 ba0c35a2cafb736a7f63135c80c04c49ae7683868bc1def3a7920a92f0482200a97c78b7647e6454c21565aaa329019cfd81b72fe5b1386f598649cc3cb071ea
 DIST github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.4.0.mod 476 BLAKE2B df7ad0595071660d10eb64135f18a7e0507b9c5f013218086e37e11254321ef3802ce47a912b15834fd34a0a9fcdce53899ff3b32b4543b68661a8a4c2239c09 SHA512 ccc4f023316606fdda9406cffa6a437bca4117a964f936f56816ac404ad4170324cc1c8629ff06af00a373f7b2dabfb0ea4869b8d2dabe06cfc867413b9f2ad9
 DIST github.com%2Flibp2p%2Fgo-libp2p-circuit%2F@v%2Fv0.4.0.zip 38060 BLAKE2B 20e54c1c10e0232bdb1422beb44a217bd785dcbdff9596f8bdf93a12770113afd9959a5758609de490125f11748ace0729c6288f1943c9614e94055b54242823 SHA512 65425d6e7cb66559ed3b8eeefb0a185ba17501b3219fdc03181fcde49b8eb7fd52be7c765ab15ac65a3568310b7650d8303170cf4c805932292fb67bfb3490a6
 DIST github.com%2Flibp2p%2Fgo-libp2p-connmgr%2F@v%2Fv0.2.4.mod 294 BLAKE2B 044e6cf5ead60dc70eec1ef642311f592de0d4c8ce76e41adb3b8fe65a5d31fe9cfcdd9b1aa51d98fc6a878291c84d005fcf5ff491e09da20ba64e6f092e4428 SHA512 7e073f2d29171df6316396ce4b337e7f4cf464b00fb77f44b3c0d9e80266351dbfc7fd5ab56dfe6187a388b2b49690c678ea1e8451713409199609da09e21507
@@ -675,58 +700,41 @@ DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.0.mod 673 BLAKE2B c86bb01d
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.2.mod 641 BLAKE2B 56e30500314194114823c43dafc551e83885558eb427614c6fc888719e4c483ef2182ddb3740e0d629bc1e12fb3a73d4bdb5a662187f3107af4ef2bdc4a347a0 SHA512 15360e22df091e86e04e4ee6604576a3179040fab3a9b4f36cd61a036db0501dc3ef5f4c04de67ba4bfd427328e9b1d1d243941e2d7149ebdf746055e4dda771
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.4.mod 650 BLAKE2B 96e7532a2e5ca57f3ea04d61c7b4138d67a5a55966b37e8ff853797a6c200ad21803cb86622c2617ff55eb45f9817d42c59d08eacd93e2e590ae6c09d972064e SHA512 40f60e0864629388eaffe75b352bbfcc35773a2058f4f5e0786e0810997e9ec0392684c7a3507119fddaa6cb6646b4cf67b02980c94df168315bf05f32edd5b0
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.5.mod 615 BLAKE2B 19e15d2e62d13beba4ca700e0db44925bb065080956f528a53711a77cf5db9898ec8bcf9000f028ed3ff8fad4b91ad485d1d6a371cd1378732d6f412a4200b94 SHA512 41e613a6c499629b9022d493e27087a26f41e32081adcf3779bcb91b5df97bd60885957946036b5d1f2759450daa991d41b7752ee9554cbeb2bcf82bb247117c
-DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.2.5.zip 95756 BLAKE2B 25d08c64a64ae239b324db3ea4ef2a928468fffbe7955d19b9d7d28ae483c69cea5ac203241f25c44047054163e52b1f72b2710a02f4f2cd58cde778671210b0 SHA512 87368041ff851fbff7dfa155217503ac38b471fccdf2a57d093c84045506e548ce8cd2687575ee0cc0879b9bfe92edce11aea13aab8e219da538a3627c6cc953
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.0.mod 538 BLAKE2B 6605f8e10da8e478dd11cd14fbe71ead158ff654091f8876b372046608dda0057df6e32cc25cf4ef097951452941fdb9dcdcecfc67ac3d2d85a5a960d6e208eb SHA512 c18d62a2cfdc391c79ed34b966711ccf2573fb9b0c28258885c06063a6bacbf14af8d01a686d78636dc64926c804b10151923e2d32242bc4ae653963164e347a
-DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.0.zip 97127 BLAKE2B 5fdad0be210c3669dc1a47ddf5cd90a9a09ca8e6cea91d992175ed057b289b8e989527e69a3cf9d59ba2ff6016bd2ee951d6c7b14297c2d225654b05659d3229 SHA512 53a5e52aa6652f78b9898eab06b5fb4f22247a6658177dd782fd3e5dba47456aef1ac49e9a462f5753ac68bc88b7e91d25bce7398b40e1d6a6c0653df8e6ae6c
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.1.mod 538 BLAKE2B fae932707dcd41451d66d477f64c15375cefec6a25193f422eb9988f08e77b85b99a34c14631e413ed74fa7477b7e091a77189704b8e540c887518636db231aa SHA512 c4e3ac5969817fcfbece693cf21ee44408703e801785dea0a71a8baddf24818ae8133a0b5b17dff83c6dcad7e182ef6eac656c7232b8e6b39d24fcf1109b1b4d
-DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.3.1.zip 98537 BLAKE2B 0f7e785267c0444244fa94387ba0a3951f20f3da228d77268359effd0983d312572d4c687e478758d783ba65da3b52048c4e1e396e5f0df131c66b8e7fc6a269 SHA512 de2979ac479dd1cb44028a3e4f2334f28e2e76b720014595d32c50c9777979a68a5fead7bd240a2cf1315fbec7928a411850000ab3519e80046c3a08068a873d
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.4.0.mod 621 BLAKE2B 7b85d08b17b132fac3ec2d1ae497bf90ae25bd2abe46000d179ccac974ce6b25430554065d4a786241dc57cb39afc36ea5f265ba905523d099e7a5f7e0d02fec SHA512 11a526fb8161745a3ca6ce05fbd1ce4ee12d28112907905e7fb2339244bc063401123d1e2c764ae576f44e2abd5afab7899119c8e235c3b2383e63c0aace998e
-DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.4.0.zip 121896 BLAKE2B 84b41308fa3d226fc9a4a90e54e925c36141b76fcc4b6c7bd264b2b9e9e557f50f14b04bb8633f67592b1ee3e52c6ed90a421fa9266f836726b740632495ccac SHA512 504b7ab29e5a7d330eaabb6dc6efa4e4f758ae17c5c036b29984ff4e530dcfee5a4d23c02684d93f6ba6eef5cfea1416af2290f6116ece94a8bd16c6e40dbea6
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.0.mod 621 BLAKE2B 7b85d08b17b132fac3ec2d1ae497bf90ae25bd2abe46000d179ccac974ce6b25430554065d4a786241dc57cb39afc36ea5f265ba905523d099e7a5f7e0d02fec SHA512 11a526fb8161745a3ca6ce05fbd1ce4ee12d28112907905e7fb2339244bc063401123d1e2c764ae576f44e2abd5afab7899119c8e235c3b2383e63c0aace998e
-DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.0.zip 124250 BLAKE2B 2a4cf019ec50277016f7382d3125fbd1a0c7896b3a8a922683bbee4ba25dc9665a77e59fa1091fa5b92f104d25ca06ba977645203c48a5d8303aad439823e8e8 SHA512 530b466580651a18cda8dfbd6fea2919ac29b05ad634e6a6420816b6c48036cce314e7c93b89854719cf27ec75abc9b6a2b0bb44e3cd357764000de5a6d5cdd8
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.1.mod 622 BLAKE2B 7b9f8d3db99025ad311a410605ae7d7b45263ec3d9a918c417bd0eeeeaccfbc72ea60caaa8960a74db3f50629920bd2a35eb80544c15d08f8e1e628f2f077db4 SHA512 d9aaacb1d06d9cf3d44512852ab53cda9ab26bf8c50cf1b83874abae6f9cbbce203aaedfeba578e62abf4f44d705b6d76bea44812f58267f5929d610cde8c110
-DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.1.zip 122310 BLAKE2B fbe21bef0d1b8f69e3aca30582f2d3a5c26d39c2767003f7879fc4816c175c3746bad46b759b2786302584721c7137987ccb801986f4d90d85e197bf8ec1396b SHA512 34cdb7eef202729c25e42b73df701e93f9690ed8ba66a6a6b2581a2547ee5927ca04a578bc73b918d16bdbf507608f5ca10b98a87f3d01a08f341b0fa3586040
-DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.2.mod 622 BLAKE2B 7b9f8d3db99025ad311a410605ae7d7b45263ec3d9a918c417bd0eeeeaccfbc72ea60caaa8960a74db3f50629920bd2a35eb80544c15d08f8e1e628f2f077db4 SHA512 d9aaacb1d06d9cf3d44512852ab53cda9ab26bf8c50cf1b83874abae6f9cbbce203aaedfeba578e62abf4f44d705b6d76bea44812f58267f5929d610cde8c110
-DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.2.zip 122467 BLAKE2B 3853df5d8f202e343a5851601c2c70bd6279001f1910bd838bd4dd22958d20f9d54bf1d4b4260b05219c0e9d6445859f2e7aa717c34e718df499fbbff2a1b17b SHA512 de46bc9a2cc831f166a4b447fb08c987f0822ef5aac6e526380db8dce90e778bf2f74799cb65856e48c26ef41df6c84c883827ec0ae5ad0dd6852e8d89d954c4
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.3.mod 622 BLAKE2B 7b9f8d3db99025ad311a410605ae7d7b45263ec3d9a918c417bd0eeeeaccfbc72ea60caaa8960a74db3f50629920bd2a35eb80544c15d08f8e1e628f2f077db4 SHA512 d9aaacb1d06d9cf3d44512852ab53cda9ab26bf8c50cf1b83874abae6f9cbbce203aaedfeba578e62abf4f44d705b6d76bea44812f58267f5929d610cde8c110
-DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.3.zip 122556 BLAKE2B f6d0534174e261909b8763c51122d9a85eee44810f2f388bb185b0ed37773ec8c91906ed8b924bbc5f4b3d68e2e808e48cb677d56f7f321c6d449b8cb900653b SHA512 e0fae945b1f8fef9f4d373f0341109199bfc22d711ef2ba66ae6097cafccf27c5b140800f9bc9abf74c6326758c779908a1a19a23b688404daf47b9cb547ab10
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.4.mod 622 BLAKE2B 7b9f8d3db99025ad311a410605ae7d7b45263ec3d9a918c417bd0eeeeaccfbc72ea60caaa8960a74db3f50629920bd2a35eb80544c15d08f8e1e628f2f077db4 SHA512 d9aaacb1d06d9cf3d44512852ab53cda9ab26bf8c50cf1b83874abae6f9cbbce203aaedfeba578e62abf4f44d705b6d76bea44812f58267f5929d610cde8c110
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.5.mod 622 BLAKE2B c19455780d99925268b9513f5136773219e6d0dcd0c054a5423ecaac4c1888c553cdce28cbfd4798129fab6d40381d6b1664f46d205e1f200acc23b384e08cc6 SHA512 84fddb63c043140ed952a388eb91cf53b0d1880373f37cfa2d84f53fa0124fdfafec7c570d0dbb833be54c983a8093a408771032d49c59fba394f154fe7e3b1a
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.6.mod 622 BLAKE2B e27c9dd1dd7edf04d621238b305559fc2ac56c89631b30e485986ed37c4477f873caf081efd01940ce4aae46c534a6cf27248ca19d1fd3ee542b8d806b732478 SHA512 a8a80982d88d64c4168d97dc9af516d8b6b063a7730ea3ea3b23652aa4d7f0f9f5477ebfacd72a0e05f40ba87ee6947b0c531f81304c07ac07dfefe902ed3f33
-DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.6.zip 128105 BLAKE2B e5d4fd33a4cdfe82934b04f82d6cc2a560d77dfe449b2d282877550f6409b776d53a6f3fbd9bcd844c0668ee773c7eccbc8e252c83d8b7dce8e65d8c24037562 SHA512 2c12efa01d4a1b3d469113800ac9f558d26fb2b1a66c33d8a95d72e97d2c6187f2dad1c186dd29f3d87f7964414fab7af1957e67fe32fedef463e3fe8b64e8f8
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.7.mod 622 BLAKE2B e27c9dd1dd7edf04d621238b305559fc2ac56c89631b30e485986ed37c4477f873caf081efd01940ce4aae46c534a6cf27248ca19d1fd3ee542b8d806b732478 SHA512 a8a80982d88d64c4168d97dc9af516d8b6b063a7730ea3ea3b23652aa4d7f0f9f5477ebfacd72a0e05f40ba87ee6947b0c531f81304c07ac07dfefe902ed3f33
-DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.5.7.zip 129011 BLAKE2B 990657cff416960f7539cd21ec47d6ea851e0f2ec3b3e77008b2620263e92a33daeac67591945fe2d8992c01bdd75f5e72628c1bfd29b123fdbc65cb5935b276 SHA512 5c2d660d246a1f37f9cc3f1dae92587ce5e3382664dc8de5e435670f20987958b364d9b6d8b0cff30e09a20f98afabb60549a188610ecf3d0911c04f801a25fd
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.0.mod 622 BLAKE2B e27c9dd1dd7edf04d621238b305559fc2ac56c89631b30e485986ed37c4477f873caf081efd01940ce4aae46c534a6cf27248ca19d1fd3ee542b8d806b732478 SHA512 a8a80982d88d64c4168d97dc9af516d8b6b063a7730ea3ea3b23652aa4d7f0f9f5477ebfacd72a0e05f40ba87ee6947b0c531f81304c07ac07dfefe902ed3f33
-DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.0.zip 161222 BLAKE2B 69f70ce70eb4a50528a6d4632685c866581c567d3f13e20a5ecc35434a3e469b9ddf7f66bf2939d94718b840a699318aec1bbf55ff56ea50be72d9c567979c0e SHA512 07008f934c39f74b71adfab38505ac7b7152a31ecbede9ce2f040bd8a2d81f3391d4ba790cb219c939ebe2ef67b0b5be6c8831fc472b530701ad97b2242dfd8b
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.1.mod 622 BLAKE2B 7a2dabb0e238480dc7d6acb0c3003cd5398252360c32af37b8041fc37d33a5cc610b89e4f53b393833fa2db6d1b5dfe26ba09bb8bee4a25a7e0cd495d851164e SHA512 cf5dc1e0d86b993b6b0192269e9779ab14b0cb4cb0c30f70c465b164bfab4f2e879d8d90cfd648e9f00f851e98c9f1fc0db361ae2bb2f2c9bad186c697cf14a4
-DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.6.1.zip 161394 BLAKE2B d244a1794756faa955076c19b2a96bff08af77ee120b2cca12bef008990a45859ef0b01ca5f2e607466b26efb861f9168f26ee4c6c0c8b0fda9035bc2ed6781d SHA512 c90e83475660f863091b2fba70bb9f5a4ea6e8344addf59b0dce80a00cf6ec5ac67a730aa697291f61f2224b6a64fbf28e83d35ad4a36a5570bbe0f46fa889e6
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.7.0.mod 622 BLAKE2B 7a2dabb0e238480dc7d6acb0c3003cd5398252360c32af37b8041fc37d33a5cc610b89e4f53b393833fa2db6d1b5dfe26ba09bb8bee4a25a7e0cd495d851164e SHA512 cf5dc1e0d86b993b6b0192269e9779ab14b0cb4cb0c30f70c465b164bfab4f2e879d8d90cfd648e9f00f851e98c9f1fc0db361ae2bb2f2c9bad186c697cf14a4
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.8.0.mod 622 BLAKE2B 7a2dabb0e238480dc7d6acb0c3003cd5398252360c32af37b8041fc37d33a5cc610b89e4f53b393833fa2db6d1b5dfe26ba09bb8bee4a25a7e0cd495d851164e SHA512 cf5dc1e0d86b993b6b0192269e9779ab14b0cb4cb0c30f70c465b164bfab4f2e879d8d90cfd648e9f00f851e98c9f1fc0db361ae2bb2f2c9bad186c697cf14a4
 DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.8.0.zip 159694 BLAKE2B 5e94e87714eeb1d699f586a77eb0d57aab31f3867ee41d470bfe5f0a4be602b24dbb4676c41629d0a9c87101c0229b85a35133e88178d95f06168b643e91e1ea SHA512 50ead981e7aecb79a0209b5a38ba3fe7a6665c7d1c43c6b66d9565f6f6a1939d82ca768d6cfc4074a21344d20d61d0214484dd52583173c28af8c2e6a9a0df95
+DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.8.1.mod 622 BLAKE2B 7a2dabb0e238480dc7d6acb0c3003cd5398252360c32af37b8041fc37d33a5cc610b89e4f53b393833fa2db6d1b5dfe26ba09bb8bee4a25a7e0cd495d851164e SHA512 cf5dc1e0d86b993b6b0192269e9779ab14b0cb4cb0c30f70c465b164bfab4f2e879d8d90cfd648e9f00f851e98c9f1fc0db361ae2bb2f2c9bad186c697cf14a4
+DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.8.2.mod 622 BLAKE2B 7a2dabb0e238480dc7d6acb0c3003cd5398252360c32af37b8041fc37d33a5cc610b89e4f53b393833fa2db6d1b5dfe26ba09bb8bee4a25a7e0cd495d851164e SHA512 cf5dc1e0d86b993b6b0192269e9779ab14b0cb4cb0c30f70c465b164bfab4f2e879d8d90cfd648e9f00f851e98c9f1fc0db361ae2bb2f2c9bad186c697cf14a4
+DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.8.5.mod 622 BLAKE2B 7a2dabb0e238480dc7d6acb0c3003cd5398252360c32af37b8041fc37d33a5cc610b89e4f53b393833fa2db6d1b5dfe26ba09bb8bee4a25a7e0cd495d851164e SHA512 cf5dc1e0d86b993b6b0192269e9779ab14b0cb4cb0c30f70c465b164bfab4f2e879d8d90cfd648e9f00f851e98c9f1fc0db361ae2bb2f2c9bad186c697cf14a4
+DIST github.com%2Flibp2p%2Fgo-libp2p-core%2F@v%2Fv0.8.5.zip 162392 BLAKE2B 1583779d8cfbde7c488ed13fbc56f454eaf4dfc0c8a5f8361c9d56e8660f84528a0e8d0648a93bbc02651eaaefe82ea04a592877eed63a0fc50355bce85151d4 SHA512 060cfe0fc955d8132a8a820624c5077eda99f8519aaf71a2bf0d0845134b5d208c2b9f6fa3ca52926098f77530f2d5d8a934b9bbcdfdaa424291cb6a5aad2730
 DIST github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.0.1.mod 270 BLAKE2B 29d34d864c9756848704d251dea3ae96061fa1e0bd48ab42c2844e3757ef28f298d1b8cf8eba7035e237277206407a3a806ce36df0c376153f64c2e833ea1adc SHA512 38179dc26d1a236e6c1a15b66d08fbc12c5a5890fa7a57ac0c5af94e0c858b483a29313bb4e34c4b7cd70fe5c8dbab64386d6e84470abe18f23ccb371b7e221f
 DIST github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.0.2.mod 339 BLAKE2B 930a6b8fb98c02a0f5f93870a6135be2b302531be5523b7ad0feaf6bcb473746700597467503ea2bd2f2871c8e9cddfa3394e2e96eeb32754d3c03a5312a6eee SHA512 54a28e1b771958260d612cd3b677dfde405d407fccfd7ca9ac72f8f687857d9f87f944d18bf20b3bb56aecef9c1244164ec2779d888a76b3bb33d6d2f00a0c02
 DIST github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.1.0.mod 91 BLAKE2B 531d67d38826354b10e939dd2230c2c6b4082c65df0e00dc7ac69cb590ea04c671478d1c3a6f7c2a614ad7185a1dd0aa3332f50cf241ec5b765f2c2a652607c3 SHA512 dd5d900f5b64917e41dd811808a74a3983fd8a73f85915a982b423c8ee3b2105e5fa5d8bb5de26b8f29ef32b2fa02278d4edc06a939609e35674c6ff36e7dd78
 DIST github.com%2Flibp2p%2Fgo-libp2p-crypto%2F@v%2Fv0.1.0.zip 10504 BLAKE2B 45975ddec72fd8b74e9ed7fd6f6d8123c94a055c5cf941a2ea699d6f32eba3d72c4a0753ff24411d5ef7b29f50bd80a085a7947bb187e62315faf72a9e1920c7 SHA512 18fa308e07d8a045a94ca6a45cf9e3e747733c87fd94406aa6aa8878b2b399530731d111e0561bdc94d8bd8fdafc4e1b055b6db35addd97ad95cb1f194438f0e
-DIST github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.0.1.mod 425 BLAKE2B 90cf4799de9f82df3884d8e66cf764738360eb0768deea148d0500a3fb71235970c017e85e96c3aab3531b50d32f6d166483076f2402cf6309218f2b7bafa182 SHA512 aa4b042d915114f1c4ecc2135c4c87cd2fb2b39d1b3fdda39596e15c9a077328f743937cd5be7f9da48d11713a40d4a4517e93c289ca5bddfca1afee1c9058ae
 DIST github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.0.5.mod 425 BLAKE2B a8bf396f7c92143dd9499133d368420a265fb617821692f3d169e768ea191e2ed8c0d68fcbd0451d4e980b320b4b53907fed313b7023ddcc4c4bbf920c510dfd SHA512 d330b36c579f2e2e11326d5d4c7b0a4d3714d33205195cda3a6ae89da2b7459557eb51f6b3da266215d6617d83fa559ed0162dea7224778dab4dc6e7e5b95081
 DIST github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.1.0.mod 294 BLAKE2B c5d32943b408457fd1bdbb5624593f024375a8a9ba5bffdf1dcbebff069bc9d28a9851c9c371794c0fa70036eaf03b12ea27888a26fc85b4518a1ae2b49f7988 SHA512 22833eb0577e6aa47bbb99d3e92a6dbfb5a98167111c9c2f12ee5b43f3671f3a4159a0b755a9a0692fdedacc8a44535196795cd173e121b04403079276ed1fe9
-DIST github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.1.0.zip 16001 BLAKE2B a0f5c201521ce1592d893b23e40d69fe765f9089ee7fb0263b30aea625d3226837383174ba5e7c0beddab0282a6472a281d810b3973f63dd9a28f527232201aa SHA512 26a3333293d158c1e8cb6986b1c1380f76a88f99d4caeac99331b6a2378444b24ac1be01c95b164b1d2541dc72d81fb365b6ff7b2dac25d232b5ab6533cce293
 DIST github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.2.0.mod 389 BLAKE2B 2cde1923146d3f63edad7a66392469137598d8a6f4227cd5c44500b78b5d8d3e7f16bdd24e9189548b13c9906831ea6dec2c96ca9150fe1954a88516c4a7f711 SHA512 71abdcc9b2e21bfbb51b7f1b4ffaac30a54eb83381cc790784e9e040aad8736ab04695767c1583e2484594533705542e20f772db5a2ef708ab40e8e2a82a0647
-DIST github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.2.0.zip 27008 BLAKE2B 56c1af4c7af3b3dc26c43a1fb68df1ea469cd96d3b653d5621a0f29672434ef9ae953456e18f0121887762298fd7beb9195534889a3d37128c9002b584d304df SHA512 cf69a80902c3d818d0c4a42451e4bb33d1dc1e819713ca6ef13427fa624d5b7193ced9a1f48bb2e754ef070c0ad7c92815793e4330d16d6dabde217f0cae5c22
 DIST github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.3.0.mod 390 BLAKE2B 60ac6b51f8508596b6fc95808cd717492c652fc22821fa109005b747ac69e611513161888bf70c6fdb6e68196ba6e6b15aaf39a37ce263f520ab36998d4948e0 SHA512 77af6e288e09e47980e2bd4c4120a3cc430175ad5fa9bcf9f08f6db0730e4bff487dc8058db4c734c52efa02ad317810a1d6a1a1aea1b67a199dd9d0a605e930
-DIST github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.3.0.zip 34430 BLAKE2B dfd191dd0a3f8138e053b58bd3ed1f39a20006a5e091a679f24dc127992035afbab62d5318b355af0c6a71f35a21c07e10b4958e7d85ff51d7c0a0993442de14 SHA512 807b5698d888d2fbccfc3f4ad38d96e01e86fa1581e801cdcbca941eb06bca6136d6446e13810e96d16ed993aec880816640c3c362479148f190060ce287c75d
-DIST github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.4.0.mod 444 BLAKE2B 132879253142ab05ba7f66eb979f15f8379c0741e364017751710d241ce3f4ec44b6fe066d59df6505c2c19e06273d0f12148abbca586016fce9cbe4e4894554 SHA512 e964caa65517ea0a7f3058c7a0532a575266d9477b6a04fb142316a2c32afa94b07373e71e5f812a8220b28b98336bbae9b33ba51988131c3fb9e1fa96b46175
-DIST github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.4.0.zip 34991 BLAKE2B 721737dfd4fec870f5579e40548c23fde7f3cf0cee74b621013f3846181606d2b641ed9b92e87bbcef5a3a8ac3e5c4bc48f0acfded103cafcd230048a1499004 SHA512 3dea645811f1642a8b8a4ae93726b954d7cdb0f6cdfa6f4b24f1a4944906c9e6a800e5cae8d5966f542838350f0a042eab6190eb54d3546bb056424243401834
 DIST github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.5.0.mod 444 BLAKE2B 9a6a9868fb785f078be969215e5eb0fcbc659d8497ec4c499f589fa47fd348d009556d64783ae6f07aeff5b997ba936b44ce03fa3dad3ced6d58cb8c7f897c09 SHA512 c9fc07e5b5b9dae932729e54b812557fba7acbc631f24a3c852687e6d549ecb5aac4e6a3a15ee0dd6951f37df30922ab19b558129d2d91ac7e046c7b1b7aaffd
 DIST github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.5.0.zip 36408 BLAKE2B 5f6d584162e577bd0fd7a11cf064d587c44781d78e18d2e41336923087dbb6a29f9409a7e54e047b600913c6172d3fc149eff8bf79001c3da2b2f2e513d12eef SHA512 e454c02e8e22c9352e0390b2d639a6ed57959004a1db4f18c1bc6f046991243b544fe0524dd513d23211e0dfc05c0ef20604346326e8eee6ac92eb897379431b
-DIST github.com%2Flibp2p%2Fgo-libp2p-gostream%2F@v%2Fv0.2.1.mod 188 BLAKE2B 07f8d02114a42648b9592c0357b5c7800ce9a0ef591c5fcc62f180f6cee9131621fb9e36a264cc4f51a3f1ab9a04255f4a8e4b2854152b4f3ed1ab587b0761d8 SHA512 7ff90afa0edf0c998dd70bb35808ce93ccf9631587518ff3308c94e4ae1a906e96a5288067c6e37cd0de1e29d657ac1e404f5e05f46b77ed6e0967d914313c9c
-DIST github.com%2Flibp2p%2Fgo-libp2p-gostream%2F@v%2Fv0.2.1.zip 28961 BLAKE2B 17abe4023008187c2daa9a5e50fbc66a8eefca09fae5cc3bd4d2953222a053bca4d3a666c50cca0612fe5b269d48293b45c1bcb00835464dfe721e6a0cae801e SHA512 b1137cd13054656369447e49bd5a2d15f60ec3bd2c96bb7b53356be85178965b49da38fb38ced9ccdfd2d8b9ba8b23b2235ae884e9dc7b0d1aee34dc19a6ef22
+DIST github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.5.1.mod 444 BLAKE2B 9a6a9868fb785f078be969215e5eb0fcbc659d8497ec4c499f589fa47fd348d009556d64783ae6f07aeff5b997ba936b44ce03fa3dad3ced6d58cb8c7f897c09 SHA512 c9fc07e5b5b9dae932729e54b812557fba7acbc631f24a3c852687e6d549ecb5aac4e6a3a15ee0dd6951f37df30922ab19b558129d2d91ac7e046c7b1b7aaffd
+DIST github.com%2Flibp2p%2Fgo-libp2p-discovery%2F@v%2Fv0.5.1.zip 36756 BLAKE2B d225892c57f5101ed3c8307f03fe7d40cac9ebc87afc89aa9af7e173ffac75b2f242cfaf8b24752a18d186800d2931e3a7f4066b9aaaa5a92b892d96dbc49fec SHA512 e91a1c33e80dcb357521f3fd87480681e92f8dd92bb022e28811b1fc9ed6fa8d79c8e729ca22de7fc632910754b148a92efdeb32b9de1fe015b813dccd10ecd4
 DIST github.com%2Flibp2p%2Fgo-libp2p-gostream%2F@v%2Fv0.3.0.mod 189 BLAKE2B fd8b3660d5e516537876d3814002637c4aefe90be26f2757fe7ef4b1ffad6c2ab4f654af36d68609537f432d419fd659c251ee604bcaa98783846e9c5fc2a76d SHA512 9ddc11d5d24ec4851819541236c4e53a8189aa90dbedb8db1ddd2e4763570671d44a6bf89bd12d39efac06aa3e4ab42bd54dbb1c3112cc48b6931f6912efc9cb
 DIST github.com%2Flibp2p%2Fgo-libp2p-gostream%2F@v%2Fv0.3.0.zip 37878 BLAKE2B 7ef011d676a69a2e32bf6f2b8e07839ae5074689f4fffa65446bedbfd8c24c141fd08243e4d762f645944d1e2d1ffe68f066c90991d4039c8dfdde5cf5be2113 SHA512 d8abe9f5bea82a7c15648108e4f5cebaa0b6667c5ae783fdc4e7c4d846483e74e025aae5ee2b258001edde06e0229c24045329c65fbc87c2ea79ae38b83a6b52
 DIST github.com%2Flibp2p%2Fgo-libp2p-host%2F@v%2Fv0.0.1.mod 407 BLAKE2B 8e2fbdf71d8aa6b1f38752de1da9b8bcd4f0ac34125ac94247ced72d53fc5dc56c83bf050f961cbedbea3e5100634aadaba9b17df6d53da2f6e497a841c7e8f0 SHA512 053324801a99342c773b2b0923b384f29a1ef2f09fc6a120b12902491b117277ad6b26eada7cb140fb73c9d1d7b19cab565d3027efb9cb20dcd235210b22e4bd
 DIST github.com%2Flibp2p%2Fgo-libp2p-host%2F@v%2Fv0.0.3.mod 437 BLAKE2B 0ffba920b484c9c8f74210b3de36799060fe4bcf84d1bcc90c2a53eba4d6f1257da7b2e3963831cfc90b8792eb4d4c681fd9d98baa250da6594ed52edaac9517 SHA512 305f8b72609955622f91f100d7e101efbb503963b49e590b04d0af019c4102de9b0dbb19384de3ad7ead24deda771396824eecacffead35628e127c691c564f2
-DIST github.com%2Flibp2p%2Fgo-libp2p-http%2F@v%2Fv0.1.5.mod 229 BLAKE2B 8632547afe3bba3964a626ab4e81a892963798071ed9b1c8adacb08011eabe4e8042f79f85e16fc639ebb648c6e93a192e4fd11412341c83256558812ebde377 SHA512 6d537dd7e6143402efd273394c47957645892312cc7b80c4e0d58c21a0d8873600687c3f5229270c8098fd08a48c101b034770c18aa2176401c5bb70a167c8a1
-DIST github.com%2Flibp2p%2Fgo-libp2p-http%2F@v%2Fv0.1.5.zip 27381 BLAKE2B c852c00c162cfa6a4e392f3d016a092988432979227fe14ac78d7b6af8aa37e49210ee131f780722352311f11b2732328fd519f50eff6b5d6f01bba8c110904e SHA512 d814fe96026631a9948639f9c5f92efb1bea01b479779fd72d72fa7cb97004ecddd3d9877d30826a8308e4ac078889c52ffb2b49905db919c5a1a2e350d03585
 DIST github.com%2Flibp2p%2Fgo-libp2p-http%2F@v%2Fv0.2.0.mod 230 BLAKE2B 4b4a6ac2e8e4f7bbc2a1b973f4a502a0d9c0709476ac471f97b6f98f7235122553765ab2fba124f87fd17887b19aed0f503b64e827e0d0247365b3882efc15d3 SHA512 2ec136aa29c6ccea729404a612f8525c35c9d9a0333d6be734b7bc754306019c38403a066e37ecb8aa02065cddea4c74daaf47bc26f635ff4031cf8449851b3d
 DIST github.com%2Flibp2p%2Fgo-libp2p-http%2F@v%2Fv0.2.0.zip 36210 BLAKE2B baa2509beac8b9d2bfa336a6996cd32096e23f83ebb1ef563a0733a80b2d731e989e19ec3e4ea85c43a12d90bb74ca1e173bead4d90d0df5b42eb2fa7df1f188 SHA512 6b4026ec88340dd148578c5e5a58af3e42cdf63d32e89e4e4b1a2a47a877a26f1353a8486710d4ac07e9b37aad765ae580d21af18985c8d6451f7e813e7879d8
 DIST github.com%2Flibp2p%2Fgo-libp2p-interface-connmgr%2F@v%2Fv0.0.1.mod 192 BLAKE2B 1abca5f8b1cb8ec08c440a46a52def7b6351a5ad8094d4482e6c04f2446a02ff7efdf2399ddbe3119c0a8db3bbad8e4d47d04d4bd5ba3643baa57a5ad691cb4d SHA512 431f5960363d13a2cb1e989864c2491dd1f7894fcb1d6bc8040a07003b0f508ddf1440cd0f03e679d816b853ab9582bd7c58ef82869539e91e819c84edf7e50f
@@ -735,8 +743,9 @@ DIST github.com%2Flibp2p%2Fgo-libp2p-interface-connmgr%2F@v%2Fv0.0.5.mod 192 BLA
 DIST github.com%2Flibp2p%2Fgo-libp2p-interface-pnet%2F@v%2Fv0.0.1.mod 50 BLAKE2B a383e6475ebb9734977379ef6c0e272dc993ad8a688fe7e73ac04fa3ab6ec0c2782bf754a1aefacf64f5c8dd7681b401850a31d7321c37f348cb1dd6e2e6adee SHA512 f90b04234a98e243c6ad250819e221dbc6a33c7f869edb60f8d9c564d8c2318c0a84e62c45c94097ae0ea318ac13dae09beb5e94aa7d38c5a8409b751495042c
 DIST github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.11.1.mod 1336 BLAKE2B e7b486d0429f7f84ba8da833a8292b35d108c4f820523fc33dd0e98f2e26272ebf4e5c6e692766c70c46c0ccab1337f269dc09201e253fe28208a54d3722b4da SHA512 8236873b65bcf41270e9c64a49b765d82df677f358bf825104b0a4bc355f9105949c22ac1cc2237137445cb43c01393fe172f6a058c9e769cfb2a0c9be9cf763
 DIST github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.11.1.zip 131436 BLAKE2B f1ddc0f18dd4f5ffd5cb39e67228f8fd121115c5d0bb8d5c1f9359be87e33e7b8881cca7e7c8d3c866cfc890bc5aa67242011f7492d9c3c813c8428c8233f09e SHA512 d047bc215bab0ef85769ee437c5e14e6a3b01d4167931f1f66e576a356d93a09adc2cc64d5b8a3eb5cd183bffd8248d21cc00fe1ec40cc83cfe20be84bc5266b
-DIST github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.9.0.mod 1336 BLAKE2B 9a5e628e3efe3bda6063e138a2c1935ca5d7e1fd6937d98a9de6f63c402a4689cb2e30c850ea198ca278c8e545f8674a005e2adb134288fce346aa3bad329edc SHA512 a1fdd734beb7d94a03b16bbdcc104610ad2ee6ec52919aeb302637e8d8051f123a979fe422f3e8ce9756a6fc2739a1e7d023e2e3275b238032063b526e468675
-DIST github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.9.0.zip 130131 BLAKE2B 71377f706005f24a95c35318d75b7b481cc7848eb1952619a5e8ce95d77cfae509137117e55980d2d042292926efd686d7cb6c5a7e6027820d5d841d94f4cade SHA512 386a85e9f614bfdb3e4813b68c4d5ed048fe77336d6ed4fea9d3ddff5dd6c716459d74d816902f338453a0830e6c5a783b3966a9da37f80c2941e868a7f2fd58
+DIST github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.12.2.mod 1404 BLAKE2B 841f446ad43b870c38b8703156f8eea7e845a45848833de3f80b68e92c56ed18cc0eee4a554934e7bb0a2a7fcf56115200df270019235b435272a80ebf1c291e SHA512 7838732ffe0e52fa6a43fe16bd4597fe38c37ec8f215c93f67f2b1d2066cc27665d56eca1097fc92cd378863baf52d4942418dd3d8547f2fbc7b68b422c9c9ac
+DIST github.com%2Flibp2p%2Fgo-libp2p-kad-dht%2F@v%2Fv0.12.2.zip 154760 BLAKE2B d472bddeb29ce5c95826fd5df26df267a56f63ced8a059ecdf99321a6fe81c63706938ab48b771285ef40d7f68aa4747798257949dab042d062ceacedba179a9 SHA512 5384950ef99d389075dc8bfdf9d419782ea42fa81c75d43183881c8bda215052c895fbb5d1da63c21a41b99a0e1d64fe1966e049ef7b489f7ba709ba69bc47d8
+DIST github.com%2Flibp2p%2Fgo-libp2p-kbucket%2F@v%2Fv0.3.1.mod 443 BLAKE2B 55dc4c9504a36295b4d384b59b88241c02cb3a881e6d1c22252115d75566b6992acaff961b01ff7d493fc0762b126026c506a4f41c805a0bdf15c5c33d275913 SHA512 e1fb14bf75ea37549c7d2eddf953453a4c7811f5fd2ee553774143261b343353a94e8a999899e08425a1987cedcce39ca26a92234fef172b9bb4461a1299d7b6
 DIST github.com%2Flibp2p%2Fgo-libp2p-kbucket%2F@v%2Fv0.4.7.mod 496 BLAKE2B 2ac651fa702034285730a9fff069689a312a3c360dac254cae04c89432cfec57191a0beb323ac74a265a9b5321806cfeae957a9fe428bc3dd6367cc57379089b SHA512 d08935fdc6acd8a2080855ff62a48b7a703b14948168cd3b13b9ac701f81069fd0cfb23e10d6ff8bf7b9b79b1a1d96267c560c9f076420edf860a0e8c22d1591
 DIST github.com%2Flibp2p%2Fgo-libp2p-kbucket%2F@v%2Fv0.4.7.zip 232497 BLAKE2B 7686b46c3f8626532d3245163717caf8d38a3a197e02ebd0e051d28e59177664a9ced03031349adf5dad5a3121faea2662394e6a096aaa89e89d9129123fd147 SHA512 584a0196184182e0178f08777b862d5f3c01efefa6173e6d3de6a7a04f9658dbafc2daa3077bbdf7fbbd581ae1a6190df7d3d3930c45274717f5b27368fe28f5
 DIST github.com%2Flibp2p%2Fgo-libp2p-loggables%2F@v%2Fv0.0.1.mod 249 BLAKE2B 8d016da23fbeedfd61a60943a8a4ecb2ee57f314ec5bc53f69b52c425d4ae575c3d36b97b0c1a89be42b1ffb8ee946f44fe38c334de05ed292fb75ed38f49deb SHA512 723ea37ad4d4c674f4852cb0bbaa0394701aea1cff65e5a8de34e53375bdecc0531dfc52c3c95a56e2c1b9704785a3cc2cbf34d89b289fc860de6bf19025a42a
@@ -746,22 +755,14 @@ DIST github.com%2Flibp2p%2Fgo-libp2p-metrics%2F@v%2Fv0.0.1.mod 184 BLAKE2B 675ed
 DIST github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.1.1.mod 140 BLAKE2B 6e5b91d8000c50408fe687a90bd9d2b3d0ff1d2c4b91ff56139b6d502211a3543663130f923a4d2b42c5b860eafcbec299b7031f013e14333e633c5561d1692e SHA512 0a13dd0b585d3cb2035cf3f3142844b29efcda7f8b7c7fd52acd1ad52325db5c45749ab381a71a6d4735b60a4deb931e10cdeb6af22e1b90c2aa3d91b67d82d7
 DIST github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.0.mod 183 BLAKE2B 6e6a1159182732bda38bf492d6ea434a837875c57aba9bdd1d9f49b39a8f1e6e53e10dd27ab95b5a52b9899ad934f89bdf7b5e1f0cfa5185d183517f11d05576 SHA512 73011362bbfe6449149177922ddc236c68db5d3c4123af666dc12dccbd24a0c090011d0640c073bd93cf00d3911d0d41cb99791e968dbcbdf1f5c3daf993fd13
 DIST github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.1.mod 183 BLAKE2B 2ae5b5f1ddca37787975b2abd0373322d299ae56ab58c1c665671cc17ef81175aedf3b4d93b88f21360b7792671d1dd80bfeb2933d481aa5a3c0175cf26c83b4 SHA512 dd46372ec5a2b42fc605b0cb173e6ebe04a8540d30eec6d58bf559024d9444b7d90e6663bd3a31ffe435b089fa568437a4aed90b8197abff2943394b02e3152f
-DIST github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.1.zip 7939 BLAKE2B f97333c27c504e8bbac276adedcd1afe06a1a053c6b0a0bb83ada83342237158589c541ab53e25d3aa0fffcdd2d4509ef4a5da911e0cd2ade4d3f1d821925f7a SHA512 cd6161cc5bb58dfdfaffdf255197d786bc3cdc6e10958bcfc912cb4d139270af7334c33325e3ca60a2440c7cb3e80148932ae719824ac31bc189801c8b16a38c
 DIST github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.2.mod 183 BLAKE2B 895b9a05f1b9fc66f9dc3336dbdcd3f526e0ef0a069ad0298b1ea7e3d857b868e1f92624e91b7c9d7fa0cf26b305ca16233f5852943c97912ca80139e188a899 SHA512 d450afa8438c6f1987f951bc79738eec494cec8bfe33e3406b8aed95109242363c54d0aee1fe6feb77493f907748082c446a1c14eb783663d68cbf0cabe3e69b
-DIST github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.2.zip 14743 BLAKE2B 056699b2b2800347115ae01538039db47979d83e5da8c10e8a39b646c4cc420284879bef7e1a4e7bc08e3e2835cc9f27130f3f0be128902a006b19f9b534033b SHA512 81b8f3babd33201b430b165c34b1bbcbfc922e97e9b6a42855d995dd8484c9695e8e9d1c8944a3a70dc366fece6b8d703d72eef134ff65edc5fa8fb82b71751d
 DIST github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.3.mod 183 BLAKE2B be3ce9f7d1c3ce83137a7aa2740c1a07006b88273d2be5dd2ecac5f32bb9c790bd84e4cfdd9b6636c65a643b221776569ca6fa59e8b83b27c2165fb3a7113daf SHA512 da6bbe10c3297f8bba4f1bbf9d55958ceda36fb008c41ba6971cb185859ece9fe52b87b6f1a91d0f239e39e6d99ebe7c56b3db19095f56384a827df645fe941d
-DIST github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.3.zip 13570 BLAKE2B f7c90f07cd3f4b454e493e7962220a587cfe7ad711c7e6c258b97bdf431a78d4912cc754db9c38b85d6a17ebe29443f7a0501bdda2fb674706fd985728b1da13 SHA512 81f1cf4f08e4f4c763163ec62c9c56afcc32506c28a264eac6a3e1ea23fd66a28fec1e20fd0ebed5c932713eafc1000b0c979fe973b7ef3bc31568815bf242d2
-DIST github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.4.mod 367 BLAKE2B d88d9a37f8294536baa18915825196c2aa4399042e91d11ce292ca532c969f3d8e92d7cc77bf6a9172fbffe9b56b113bc1351fa23df4ef30d9fe18bede8461e4 SHA512 69bd8f918c5dbda190e9709b0b55b2a782314a283691b992f2f9eb440b61a3515414069773f3c93b81a33043e84bde4444493051ea2241d3d560ad838bc5b646
-DIST github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.2.4.zip 15142 BLAKE2B f5def093796b0b358517f63eb00358973436e101cd11f65ec7ea78f9f41838038a1aef3aa88c20516ad7558495b2abefe01b12784c5eb20e841648e4576346ff SHA512 a8b126242496f183f16f83aa2e966514e7dd625ecb32d4d4fd60d0a4f2d2b740985c8f2ae1e41127274abe178129516c9168761afd3ef18b17706283c08cd891
 DIST github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.3.0.mod 183 BLAKE2B 868758c17075bdf9632dbeb334a4db0299f3e46efbeabc0501198cc2e68312f1ed6110a7c46adc4cf73d3fa314a3d88ce97a2bf847698c2bac30ba973484d8c0 SHA512 768c3fdca8d7b20da303cfecd7e035827df573cff3f19dc91f1643871afb7294920956e27f96f77abfebefe28d56ae6e0842cf1abf880c75efb8a4dcf39223b4
 DIST github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.4.0.mod 183 BLAKE2B 14fd8c6543c21463196f3fb6d8b42ad0b6ced68f52ee3d51b55b70009f6f53986e4fd0590bf66d03e629f36fe3059a0d0a9176755545b811d8eaf4e7c3edb837 SHA512 42931faae9f2f3bd97bde2584543beba6b0ae92065c965c3465de5bf097d28b4635d85d3f290468b322b0cd15bfabb2eb641c8f8075f4b971b0e4a1d1478f152
 DIST github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.4.1.mod 183 BLAKE2B 78183b9e6ae7cee304e9b17bfc17b70c39d030a0a2d0973ba30eceb51f43a4629e2d3def72b2cf1b4f804bd28a3df6850c46202fb8cd13388127ce1cabe05b4e SHA512 05c7bdd2e60a56e3baa27d70774a5c29adf469e318dc23970e4d9d1a3c842cd2015618eaffb189dd82ee3c28b07d86c120e639da9a5cbd20bbdee8dae0bc024e
 DIST github.com%2Flibp2p%2Fgo-libp2p-mplex%2F@v%2Fv0.4.1.zip 15283 BLAKE2B f3bd035a9e2f2412bb330553c35498b56d434700f4ca90874119bb901212499ccf48d672b8eaf1251e4964fdd126582590d09decf8ec66b9504cd96b3977156c SHA512 9b44299e0f256563f72d817e042b55e296346453df6f0dff6941e33a929ecd2ef12e87602af8c6a6af2e946fc1d2c95bc5116c6ac07d5d9a9d2ea2d0adc858ad
-DIST github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.2.mod 324 BLAKE2B e817a45327fb283bf11f123bf95d0af19d011db8f22ec335f068bbdbeda2cca0d5884b41e68e442a82607d6c146f24414985143aa496df75f053e3b98fb482c5 SHA512 8fc9b27588f958b0e1f40925f89809405fdaed75cb61abe5a9bc5abcbd530ba017a7d6209144df5c68de2f5b11d0f032287424c7a9d3f3da9b178050b7bd1d07
 DIST github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.4.mod 328 BLAKE2B 05d413c8e29820fa866c650850366d3f625a4fea86dd0c5c907c3be7700efd6c4bc67f4026fc6684c8ff427ec88c10db3e793c613b8033b0e16479262a8efbd9 SHA512 563317f58414406bf9cd7c5df8557fa32144f40f2d1dedc5a6a888d0729c016094fcafbd1facc6867e6cd5783afa93b90664583d1ed2722584cf3304dbf97583
-DIST github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.4.zip 9499 BLAKE2B f3fbe3592327ff38392d2f2a0d1b9c1aa4e30256f3e2a9254a6deb08701fd5c517ae4a8e912f96ac0af219a135f11d8fd6663c0af7fd75c34de97eb22bf91ef1 SHA512 eba22e49572199d7a3b6cb75c6d68af2b05c037323083c23fa88563eeeabb3da0d5b6489b9512c008bb4c9f88a9b3dbae5797f188fdc9e5da127f20a3f3b0935
 DIST github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.5.mod 264 BLAKE2B 8dcde58f9f2d6f3f0bab9d6ba270c6d25ea65fe5c81040de83aa294fc6460a96263d5437827dbe77a0eeafbf5046f06d42134f709d81874e4428f077c918f410 SHA512 f490d61ce4ebc6cf71fc21b76bef42b7698b2bc6f1f7eb3a3bec1647be67d903adef907b5574001841c69c59e6d5e107b32d3260eeae7a2e47b6833245bfcb2c
-DIST github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.5.zip 8441 BLAKE2B 8a6858ee6273187695c29becfaec70530a4ff55d26d77ce548b1de285fe6219ec44ce8a3e0046bfe067d2d7ae2380dd32986f6db75a43b936eecd81368e104c5 SHA512 a0f2ee0fc87462f143edc060acbcda6ae2845f14c15326abfbb8127f7823e2e693d8070a8f958cedfe4ca5c04d5543f55248262cc5127f19795e2ad0147e6be5
 DIST github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.6.mod 161 BLAKE2B 4a8d93410135ec18cff51a782a912b0c18f5beaf9a02dcdc9d410338edd867b32691698d0d7815fcd6deaf3b7fc1e63e01afababf03ee469603c39d23e55d17e SHA512 3c153a09e465fe3cd16a6d36ec380ecefdd44c578ef855457717bf24435f05e19a27d0d1e717b166968eb41d2db225f73d405a1be039d81824f087c3f05cba16
 DIST github.com%2Flibp2p%2Fgo-libp2p-nat%2F@v%2Fv0.0.6.zip 9058 BLAKE2B 78eab2866a3602daf38e84a908179d06a0973b451bf95689f27875cb20e76c38e3f0dd7da9f943a6a874119900ccd93f0f40216437aeb5c4b32e33fcee9b8eea SHA512 5a6549fc43e2751e6838cfb13514e435c96ada4825af9854b5fb2bb521fd6e6b3be0d9f2ad8b49687d9c2636f0d9bb8dd6c6fc131875cf5083d911baf85cbd80
 DIST github.com%2Flibp2p%2Fgo-libp2p-net%2F@v%2Fv0.0.1.mod 378 BLAKE2B f952dff76e0654ccf928c26a7cfc89e52d0d623d54cf16ed5592e4a9278fadadd30b2652d0126158884413fb48dd9014aec0ea75276582c76c9775c9ad2e10d6 SHA512 c23b6098529918b34de5d91d518d239663539a6cc9d137fbc4516b1a5a48a02941e3b13080ba3494200ab426dcea4ddd309dcb716adeb8d10e9cd4eccf9bb5a6
@@ -770,9 +771,10 @@ DIST github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.0.1.mod 254 BLAKE2B d6f04
 DIST github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.1.0.mod 217 BLAKE2B 3065f327bc37a609e3c370864f59a98b2d50e09be65e73157fdd4a9ed2e44693e45e9c3ec11c418a0ac9e354a0474a4159c515d87b6409f66efab0e1d1b449de SHA512 de073c257f366028c8cc56c46fdbf858439f99ce05fc198406fb76eecf3b4c24c845b198bd8f28c3edfb629e96a4b994fdc4fe9c28e67b027c89f6da99ee6ade
 DIST github.com%2Flibp2p%2Fgo-libp2p-netutil%2F@v%2Fv0.1.0.zip 9044 BLAKE2B ba6d7d1d449e73895bdfe896dd4eb6c986a72785cb573224810ef45c7fc7d613b66fd0f97f4a9b3c6f11097e6c9a65515c6926b77ed2ea57e9d6ed226e73c474 SHA512 5d0d23b6b0b1a5e30d28f1257962943f68b3bdc627cfd32db8ee1a9fce8232d1b6582b57165011a1e9a1e39bbf9dd42baa8cd8f46e29ed6927f4d13440dc6c03
 DIST github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.1.1.mod 409 BLAKE2B 72154052efd224fe6a5366cfe57f33be02e0c4cf74bfa41e65c3b58cb0f1fb6a4e361f00ad34bee2ab0052658846e38efb227bd36e981cd3fa4996f481315847 SHA512 d33c1f6d949974b9de6f1aec1da319e240ff3461bf8e2e84ecb74df82e7b234fe6ea75b07c23fc0c1e225dd1fe9d2c22a90eafc20c7a1ee5bdea5a2bea28bd83
-DIST github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.1.1.zip 40288 BLAKE2B 48661251a91221ba76f489f6d503a0320cfd5d2ca7247396748e016e48791f252473ce509acf19bfd015399eb1df4b09b1039cad543c7488fe8cc7422e27c802 SHA512 0b3d80b46243fc998302d6e3b70e9a11d23645f19f64a429c5dc2b4d9a1e3c90cd775aa91813d70b818822b69b0e41d227a95acdc2229cf8a2b69645006b1250
 DIST github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.1.2.mod 410 BLAKE2B 89a42858ab793e8d7e07bcd801c2455633ee258e11e10ec3ee7c43f78f8b18d3dc904cbdb3afbdd70805d5167b18edadb4d3b1d2f1c8c9ce66bcaea523359743 SHA512 682609a3f73c2c66e0d47ba19fdd743e9cc1c04513e0a74d32a1a9fd69bd5cdcb1106723829b9f19fd427cbbc693a9af24e8cd93959f7b87fdd2bc0dde33f9f5
 DIST github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.1.2.zip 40403 BLAKE2B 3df2f4677e6b3da4afbcaf853683e7dbd0606360ac98b66d4dbc170f26f69ba883593b987f7badc552152c361097535358c622c039f76d7a23567dc8a4d9d03c SHA512 e517eaa19863e6f8633205197f870fa221677584bf4b9ebdf004318b0ff9fa156a8db4366cd701dd99820f01290dfc56ce1a6a1fced09c89ba70bb671297f1ce
+DIST github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.2.0.mod 382 BLAKE2B bc18388a7c674d0ee1e1382454a0b802cc78f2aedb45ddfb3f7de63a0aa473c702803c0b2e59abdb48c52d3c084d1f1c54bde286ba2be711ca4315388e240565 SHA512 ec2d61e555a5102c6168aabe28fb3df1290b6dff8786b77e79a807f5a2461f0fcecfa4779eb5d2cc81a3bdf9c23a51752357f6cd7ecb19e2df3638a6c081f34a
+DIST github.com%2Flibp2p%2Fgo-libp2p-noise%2F@v%2Fv0.2.0.zip 47657 BLAKE2B a8be650a43bfdd11cc570b1711c1fa2c9a7f62f9bb7f7bbb81ce0604ef65f843c49a2004611b7170a69ecddcf9446c0be8d179aa356d39571f8babddbdcc4efd SHA512 4a4f97ae30b31d4238eb467d0b7c4b1baef19e2d3e99653e0d97d86a11b58929cead839cb78c27991dfa9cd6048969992be0af36b9765bee4e08498ea9603e82
 DIST github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.0.1.mod 175 BLAKE2B 3c08609fe1ef0f34a6b86a1d0931f951e229fbce7330b9a81f844656439fd5f7c0b6bf237d15345d3a55d6509a1e0ca7d2eff8848770c0f925e0e385b2bd437c SHA512 5b9b9ae5115bba232deeca14deb24731dfb41df537df70e3a6f7f54120dd8310d0e55ac2f4092650fe4d161e187107c67f1ad3e0487979db91c34aa156492125
 DIST github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.1.1.mod 175 BLAKE2B 52445791cacce98d4a1769ed48a6f6571b96f2214df9c190c696e146fb998c478f22809abf87927b6e9e698e89a61a7493d41a7ea8607bf26cb87360440e7cf2 SHA512 7bad839a80868376645d2cebd06e48c002ccddde04d3d2b86008f90ec2d52773844d2a660cf9ef9a05749ce24af3c50785298357ebe9d93bfccc8c033c74e2f8
 DIST github.com%2Flibp2p%2Fgo-libp2p-peer%2F@v%2Fv0.2.0.mod 202 BLAKE2B 81570714e1bef726f8a36a7cd282248854f66fd2253b08db8246eb18a4da9779e72a2ea07b06f6d2e9e0fc7f665a6b7c6df05011f451399a0541e751d0e1ba84 SHA512 2a757fb2b229c83b7a12e9d4afe29e6964375b8ac69e52c4bd9fc71967e0e4bda104c9a6e791e1267fbbda81031c3a826191998925046b731369435406d4a009
@@ -781,241 +783,204 @@ DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.0.1.mod 722 BLAKE2B 3b9
 DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.0.6.mod 722 BLAKE2B 3b914e118763ce01ab0cc75f2d6106a9bbc805148b6c5a545a0133b4b52581e528cf975ca3e104da84aeacc8300fe2c9660f9ca80333263c7482162409431207 SHA512 22696799356119c5f09841ae78e9c7a86e8c5c56ac6329fce19e4e88f951e99b5ee541fc4fede0df723d07b2925006921d048c7849849f0ff0327154611de172
 DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.0.mod 763 BLAKE2B 44c0f270dc205a790debc987fc317ce8793303f95ee4a16cb305ad4e1ed947dcf715dd1e7b45e58b21fef41997bccb067b994a8c9821cca89ea5f789370c4375 SHA512 53a8329c87880d34252b7695470bc6cbfc38d950ee73a9204fabca4b9c976028c8908c296d52f9d9679461eee9c5a24a214d77dbcfa15aeb4068b3895744131e
 DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.3.mod 679 BLAKE2B 48322936eea9a9f1851ead046dc37bb79db6021a381ee394f270cbcec5e7f2f8f2759ef1be3a522c7556bd5ca6e8a3ab4b86bfeccac5f7d6043520337634577f SHA512 7f2c63e214a9fc6fd1f3f78ad435d957444964debda6a00170c419b7394aea0375b55fd067d10669245abd4bcab689420f5690b7edda49dce194a1abfdbdd522
-DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.3.zip 62093 BLAKE2B a7538f0845ff4452a24e106f10f2d0ccc6f87034750046e90dd6e7702e425f7ae00b28f1812fb5de4b2fc82af83153f9249669038ac65e378e3f463dc6ad500f SHA512 5618ee5d134efd4e474bdb2899c0fd5c10fca3fd64a0d045cc8035fc2ceaf3557d882d48b25936cc083fe85ce496a8bcc1cb5632f7eeb3c6003f15832cce5da6
 DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.4.mod 698 BLAKE2B e1e652aff7ca0034fc6e9d9bc939efcc0926fbe6838279dcf7e076e1ece07f58c3f85dd3db16facff281cbbc7825f116b92bbcfbeda055920108371a563cdb77 SHA512 56eb61cb7772046b8a6e3e455595f57c0ecbdde6597957b71db0609af44c660c934eacc0f46de2690c9618cdd06ff777f5f8f27b1a19df89d07421e8707ea43c
-DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.1.4.zip 64674 BLAKE2B 1295f09fa242b276106da6ba9a49680f72ef10cca5ea25fbafe011dbd37dae7218e18cac3cbca05b12d2123c3fb43100a9c7b4f1e755ea67ef78e11715e74262 SHA512 1de881179fc52ee9ec5fec82653e6d790a5282d79f56e7855c52e5d1dd8adf2838534ce0a126ea8e4ec10e4540b0d57f933206c8fbfcc3824e881394d587b869
 DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.0.mod 764 BLAKE2B bd297dfa89314d1a810bfe03c6f4082fd6b758704eb52962661615bbaded7088d00f6d4685396dc9714d03542832247627e42ca20c9558cf4a4e7d2acc16d90e SHA512 7886e362c234cfd2bb668e985fca70390476015e5b1854ed1f622bec76cbe02f6cd55e4d0d16d39a2589a705d45168905e0ea0f85ef64453e918657e10bcbaae
-DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.0.zip 69469 BLAKE2B 09dbee8cf9a1dcce852bb2a37d8bbe89804440e8fa5a7325613dc7c719efb6d51ba3ddf82f9c160c2947681979cf00e447e6f628f1e32f01a3a31a521eb865ef SHA512 d87ba15c3363a8590d528d1b8074e53d75d4070f15274409ff4305ebdbd6ae3a1061832f3b567c2724655b31f526c3b80b195539a6e97390154e5a12a50ce476
 DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.1.mod 791 BLAKE2B f86efcc756bf2ce59fcac9029a47d310f1c38b95ea0efa9b384772f40561bb9d164305ed9ca0378af47f7fb21f6b7e6741665ac32ea9b7ac805bbb6279fccaf2 SHA512 afbfdaa95a5b9af153cca280c763abe55d51092e48cbc46552692402a55aa8c4710f2b504731557023e76e84f819b11c201021408c8e520754c00a89f18d7172
-DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.1.zip 69931 BLAKE2B f07281cc219e2bb2ceb2ae5a5db5232fbebbcf736538b607bb18600ca1750c7b432627bb736b7f917609cdcf8e92f48702034d2dbc6f1f63afcc1a59891ae0cb SHA512 f47dc867a3d729012da78d0c7ec1ec9a007b0d3a034c9071012d8f23b01da0453f78f178f8e43a9be5c0d47faff789d7ee6e8192f86e7b8b8b6ebd3589043d8b
 DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.2.mod 791 BLAKE2B f86efcc756bf2ce59fcac9029a47d310f1c38b95ea0efa9b384772f40561bb9d164305ed9ca0378af47f7fb21f6b7e6741665ac32ea9b7ac805bbb6279fccaf2 SHA512 afbfdaa95a5b9af153cca280c763abe55d51092e48cbc46552692402a55aa8c4710f2b504731557023e76e84f819b11c201021408c8e520754c00a89f18d7172
-DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.2.zip 69849 BLAKE2B 7ab5a5e631f02a7233cd63b02a6ff3f9862350212ea4af0e4a5c9e4d36c91cf616adbfdaf4bce9117edd22bf4254565c218eb04cf4c60c977fb666e636fde417 SHA512 52e2026a8a74fc6e922af752eb39bdae30175648eab00bf4201eec34a38df7b71c299162af8d8547d726397a9e81894974ce3b50b22d74d80db0e8495c683eef
-DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.3.mod 791 BLAKE2B 1d4727431a080a246574ea502776184bf95771b60b19da836a67ed91d4821a5798a658576047882e09fc7986201c451cfd28e416c27f7814c279c1bb458a353b SHA512 fb5f555e598a0d8ff5e07deaf0a825e20028ae0ed9afc8d79f44973205f69ba91ca55c6c32243acc594ad0acf3a768c5a815b29b7592844c7adcdc70a3a9e0ff
-DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.3.zip 69919 BLAKE2B a5c853f967c93b1417f6fcd09930f5a6fe6b200dda9baca27249417c43eb8a71e2ccba62610ccaeaaf7df4c32e90274a96bbaa5bd3af17b70f2a229552921b46 SHA512 99161f2038d66f3ef5d67cbb36c98994016bf9c5cb836b279b89986d39890cfb27ea056619f394fc26dbb9107433fce47f583be0c11045e8c448c8d578d6f58c
-DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.4.mod 827 BLAKE2B d9afcce6ba50fc582135fb3d5a3eff7526e717f36e709ea516496a26767d1744a26f5253c3b4cce82960521da1d7aa88605c14c99fa0e185b85047f5c643a1dc SHA512 7a06abb0a41f7ba51937d22d25016228991aedc50676aa89b588e770b0d588c8fada06769638a1996a3d2c63d05fd85981b731088b2eb82cc67172e49feb0ced
-DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.4.zip 70247 BLAKE2B 0350d1770e9f603399f5092fd04c2f0b3092cc181a2d809ac916915d4f00cd68f4e5ee4f1cc2e4ab38748150fa40879d29690671ea2f22c7d349312dbbf59ef4 SHA512 93eec352d47d081826d25528fa3ff6faa37e3e17be7e2b1f70d8d3bfea0f8dd2eb4c771fdd24d5dc7cc413e7dffd2af82a9a3489b2f3b82df9951f40a9beef64
 DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.6.mod 827 BLAKE2B d9afcce6ba50fc582135fb3d5a3eff7526e717f36e709ea516496a26767d1744a26f5253c3b4cce82960521da1d7aa88605c14c99fa0e185b85047f5c643a1dc SHA512 7a06abb0a41f7ba51937d22d25016228991aedc50676aa89b588e770b0d588c8fada06769638a1996a3d2c63d05fd85981b731088b2eb82cc67172e49feb0ced
 DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.6.zip 70353 BLAKE2B c91a1c2d8aa824d070c69a02382970d7c911f927fd5361c08ac6da37b44ae3eb705fd2a6c957342453d4daac82388c4ea6ed3f9f2fac045ff7933c88eac21d80 SHA512 d1b22f81fe21b1514d61af0d75eb96a3bf34bb25ef1425004f14b090e184cb3c73cbed07dd4502ed87801706cf507d3835c65563f90360d2f2740f5b98394d6a
+DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.7.mod 827 BLAKE2B d9afcce6ba50fc582135fb3d5a3eff7526e717f36e709ea516496a26767d1744a26f5253c3b4cce82960521da1d7aa88605c14c99fa0e185b85047f5c643a1dc SHA512 7a06abb0a41f7ba51937d22d25016228991aedc50676aa89b588e770b0d588c8fada06769638a1996a3d2c63d05fd85981b731088b2eb82cc67172e49feb0ced
+DIST github.com%2Flibp2p%2Fgo-libp2p-peerstore%2F@v%2Fv0.2.7.zip 70396 BLAKE2B 40cd117fa411797580eb164b0ff90298e1627f05e8c26450974bfa9c08100a9a313d60fe58fd84f5316fc33ebb61f00b95d8a6a43427133c49712a0b82adb03a SHA512 a893dc01d43849f7c0f3fd0bf4fee4ce2ca38f3527a59bf99d599610d0818db959659afdc7f3e746430677de332f28710079074628bc22bb1b2d9ae75300a13d
 DIST github.com%2Flibp2p%2Fgo-libp2p-pnet%2F@v%2Fv0.2.0.mod 212 BLAKE2B a537d605640e7162aea3e8627008c68f17ceb1cb618233c385eb6d5841f1ab8d2aca933b752ec7b2178bd58ca9e6644b1ca0b9eb49b2abf625d77e47f6b8fbf8 SHA512 8dd0cc94669ae09b41f3f87c70c2d0d44783c7aea7b103bda4f4b429e44205394c3490e7b5e970f37de4ef6a2b0d674105abd3ccfa2cabca24119f30700bd3d5
 DIST github.com%2Flibp2p%2Fgo-libp2p-pnet%2F@v%2Fv0.2.0.zip 11504 BLAKE2B 4b98b38dbaef061bd55e0cd8c03db1d585a245eb111be0fbc72ebd2269f4f4ebfb1267fa87aa56b1e6302921fe4847f7fdb795929e521187a519a8d05bceb1aa SHA512 9b40df326943fc74174b4d0641a1f1c23fb62a9fd6c2f95eb000bbb9ffcef9f5d53c5eafbfa59134bb06c28cce14ffd4b34174fb7e6364a33d7f368a0e02ba1e
 DIST github.com%2Flibp2p%2Fgo-libp2p-protocol%2F@v%2Fv0.0.1.mod 44 BLAKE2B a169216703e70b926bdc6d021a3ac7608d4cc13464f3f2b07f3a5511e675ff63a22f43382a0741ba886d88df4740b6f1b58cff532ec0799885584ee7f1170b6a SHA512 8e19e375e53e8b723df4dc6e4afe040a2d9efd9fa3220fe816215ee32e291a175a6ea640c38923f5777d05aed894091de0bc25c95a6386005579d4685a9a65ca
 DIST github.com%2Flibp2p%2Fgo-libp2p-protocol%2F@v%2Fv0.1.0.mod 102 BLAKE2B cc5328a0958a27bf0389ef11daf678e61a8f00ccca7b962c52581a6f6a89e1af412afa321eaae58ff32bec0d9ae3760a3bda2d00edcf7b64a5663e59824ffa8e SHA512 62d09c3897be8ed667863f3947071ea7212df0647fda5d348589a9f01226ae87fe0015ca9ea8edcac77daea2eab1848c530da2abb924464669537140aba7bcc1
-DIST github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.3.2.mod 873 BLAKE2B 950473b2e36df13b3595b561e298087b3b2d850786c7f8c430641bc8bb6c30bf4343cbe434257ddb3b8aeec4280da46a615ffa395cc596b5724199628ea56e3b SHA512 53265a53b9b1673950321a904151f45ec8067e3943ac2b77ec9decdc47af982d04655a3f1861d986d1e4220cdb743eb3a5ef207efc0412730854c1e52f53a6f7
-DIST github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.3.5.mod 631 BLAKE2B 50e9b9d9a5b2c4d071ee4a0ee2c99b0e2c0165d9c6c0ebecb8a533475770b78b9b5bc55d0e8d1470c60a9506aeaf985daf8b39b01919df0f64120978f183b771 SHA512 a4821571f9279c2bc046a49e9dce60a3145c5c3605fe86ef026c118a7c1f2d308ae6f6a73345cda226489b6bc858f138cd015816409fce0da6a37387e3bcff52
-DIST github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.3.5.zip 154956 BLAKE2B cda2dfb1a1d2164fbf12d9ec430efa1deb3183fe682d215258ad54a458536fbea245f82f19bf90571b21968e20527dbf34fd4a1fa151b62c861917f5e3b833c5 SHA512 fc6ec9fdc285d2318b097d9664a656f4f5bff879d8346ee6468651cf60956262e9f07c3949abd90006f3606e38fdffd225960fd067f587cb664a2e524068f402
 DIST github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.4.0.mod 582 BLAKE2B 8fac955259f2a1f500dfe45284f0493c72233b3aadd6db061ce3bc594917851acd3909f8f6993c872c9ddb093303a269645edce20ce02f4ee91c94ab8047e697 SHA512 e46d12fc34cf08c32097a836441c9c790a3ec288d0dcbd11bfb00eba2f86d95d6638a9432dcb6f47464605b6987439ce41084fcc07fdfaec7517b5b15ef094ee
 DIST github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.4.1.mod 582 BLAKE2B 8fac955259f2a1f500dfe45284f0493c72233b3aadd6db061ce3bc594917851acd3909f8f6993c872c9ddb093303a269645edce20ce02f4ee91c94ab8047e697 SHA512 e46d12fc34cf08c32097a836441c9c790a3ec288d0dcbd11bfb00eba2f86d95d6638a9432dcb6f47464605b6987439ce41084fcc07fdfaec7517b5b15ef094ee
 DIST github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.4.1.zip 170221 BLAKE2B 32aa8b61a42a7b696efa0b867500a74f23d1d43c0cf2f8c01a5299fa609fe67d4d0726f986d5e1c454ae18729464a544f46826d510c58ebc41fd5f42de355138 SHA512 f84d28b390a1f7f4130a7c98747e92187a65c5c625102917eb165958d57b3158c2409f1e6ba8a4915fa05a067bda01ba310ce05af821e8212f5c392d6e4a9ee5
-DIST github.com%2Flibp2p%2Fgo-libp2p-pubsub-router%2F@v%2Fv0.3.2.mod 519 BLAKE2B f1626fcad99c1d1b07a76b85ac5b200d706e6ab92d319cdafbab76b661be8900e20c5773c36c14f433e248a95cb7f0ed552f1fcce8fd9f6741b3e97fea31a6e0 SHA512 caa8d8e14079e675fa34ecd5ffcba42d4d3535b5e4377cd215417885ee6bd37669e3d820c7dce620ffdc72a2a435abeea5625c329ad67eae64e2f4174c44990e
-DIST github.com%2Flibp2p%2Fgo-libp2p-pubsub-router%2F@v%2Fv0.3.2.zip 36897 BLAKE2B c3b5456de832de302f128eeed2f1795aa5560d9fc92916e37dfb00902d39485f240735f77e9c8ff7ae9eafaae037de2db765d0af5b934c5fddccc199b15ae1dc SHA512 c5b8eca0152bef988af190618fb706fdeea2a38831d9fe7e665738472bcf1763a8490b5dfa1c92937ffbf03660d79c5aa8403203165b34caa66ed7e40f2f4bb2
+DIST github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.4.2.mod 582 BLAKE2B 8fac955259f2a1f500dfe45284f0493c72233b3aadd6db061ce3bc594917851acd3909f8f6993c872c9ddb093303a269645edce20ce02f4ee91c94ab8047e697 SHA512 e46d12fc34cf08c32097a836441c9c790a3ec288d0dcbd11bfb00eba2f86d95d6638a9432dcb6f47464605b6987439ce41084fcc07fdfaec7517b5b15ef094ee
+DIST github.com%2Flibp2p%2Fgo-libp2p-pubsub%2F@v%2Fv0.4.2.zip 170782 BLAKE2B 4b37a9b129545d8b6e633e9dddb2cdea4b58bf33bc4733865fb8699cff859bffc5f0e8724427213b4c185093f92d43cefdd03a506cfa2b1ca396439a30741562 SHA512 ca1924d58d6d1068dbe3ffdf213dca1532bd04c8f17efe96b81eb8ce50187f33f51bce0d1b707c4ecd9013215235423073e3e9f96c4505ae0293bd1beb67d7f3
 DIST github.com%2Flibp2p%2Fgo-libp2p-pubsub-router%2F@v%2Fv0.4.0.mod 519 BLAKE2B feb31dc33514eab1788d398fda3573e2207f6ed5432d6bad16ff96306a3ac0f75c9291a11baa1f3e56bff3d560f2bd24fd708e480d49ab4301fe657ed23e3d01 SHA512 0962d0d315c2436393cb2fc1f2d8bd9b7135de0daf50a15dc5355b590ef787c29754f0aae5ac1ec3762b3334a6a286ebc4bcb7507d263a22fce09397363b1941
 DIST github.com%2Flibp2p%2Fgo-libp2p-pubsub-router%2F@v%2Fv0.4.0.zip 36121 BLAKE2B 306b2c3fe0d678e18a7bc7977e2a99493a100401324f46c2e2c64d42ac1fdcf9376a2b4430e0588daf00316c5cd075a38d17ffd54e25cdb9f91579f5ef8dbc9d SHA512 2c7d03fe6291ba9dc61f501f74398c118db1fc31400389816f8fc3352cc8ac2681fd0c9c8b9338484e76cd7d42d2f3285bc67cc4610ad36e00e40de403f31f3a
 DIST github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.10.0.mod 601 BLAKE2B 22772562fb5f1ffa4cc93b2176120b6a73e6c1c82359dc1ad21e127bf8c6a30ca96819214f310bd8f8d4dc9f3bccd4e892ca76b27da92295c83ed680585f7812 SHA512 cd85af5f24b24353d74cea61a3470b482e6b094c9e13d4bbe795ff30e446e445217cbeabd8fba69e40990e646f58ad9f1606bc4fbf98cae4a4c58d736bf83c86
 DIST github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.10.0.zip 49793 BLAKE2B e8bc87c7f29180917b3d378af118c00cd89d54a523f28f5127b09178a99a4c204a6e43cc1d500c993f3cf11613da2b7191b5a934fd8ba1ba93a4cc277fc602ae SHA512 aca0628e60932ae7fdb9580ae6a373e914a86b0a02c8acd29c9d81e1c6863da10d7b9cc851b5ae5fa3e7e6f7dac32a6d04c2b8fddc86961cdddd583d0e387ea0
-DIST github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.8.0.mod 565 BLAKE2B 34837dd6fd8f8fa707991e402da981e18a2066b7a3357fc88ae26c259ebfd895da3aa8188cb07494877813b0d4acaa2a6f863a09edb0e69dd391fda6ffd27f4a SHA512 5128b2eb282126094a479aba738edcc183e073f960e0471edcdc5b1cbbfa071a0c0eaf0c5fb9a37a04ac0b4d6e7d997cc55690904412c610acd33c7e652db7d3
-DIST github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.8.0.zip 40784 BLAKE2B 6732dff86fb24387910b3a3ad33231fd66ee9b28375f597d3e071b606be7deff610b2a9608e921bd2175d3500b66b8178cc6685253c97c18484712e86fc24dcc SHA512 17a88ca84810390b0566e9720dacd42315e0e2b0c3b746db367f56e0dc9d53669d430ab6a9ca72c8f2b7da80ccc3c784338bdca0584d51c33d96ecdf7927466a
+DIST github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.11.2.mod 749 BLAKE2B ca12ef58ef8e2f677a9cc8e6fb1b4b740fa2319e593615645182d4c84209d4ce3034acc497bc71f2658201709ea3a060a251fddcb7e2c7967bd7eb5acab4fc6a SHA512 9ed2c9dcee2d84308630dfab7b732e1fb72327e08b4e5447840c1aac82115721afed3f1d1abfed73449d52b3954df128b5655951bc503dde7a27f44009de949d
+DIST github.com%2Flibp2p%2Fgo-libp2p-quic-transport%2F@v%2Fv0.11.2.zip 64167 BLAKE2B 10e8c56823123ee752da63766e98133cd2468c57d0adadb23cd13d4e579b91d4346992cd3497612475a606f787a69e02878f47f4312511a38c29682408e5cb78 SHA512 fd993e9e727d2fb9c0ae03bebf5d60780026a5ae4ac558e3d57ac7935ef2b7a19cc9e5c32f858da97cb434770023f5693dfc57f3e31f73c3fa84ef1f6648a7dd
 DIST github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.0.1.mod 244 BLAKE2B 93f07be64fbd2f3d86f0ab542985516f2c18fedb73466a34109a8326092a18aab7653eb03f4b72ee95e61f81abce19070e6dd627be0dabc3044911d4ae993386 SHA512 7b116edbc6057edada68014b6d58b9c41a5f5e0dc1ef5563c9a79d4ec8f8b29d9282fe557e14595b76137910c62843859a60333a2ebcf479627006026366700b
 DIST github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.0.mod 242 BLAKE2B f694b2bd565193622abbe800a198b7769906e2f6a53fe332e202538103fc7a205a89313c23cb232c37d7080d38e62efdf3b9a74c03229268d4861e372222ef8d SHA512 0c8c31fe13bf7152d53990bacdf46c230c712e135eeb3ce3777e75f1aef99fb6d3e73d5dada78e22fb8b4839f18a68602a4c37f9e3ac4079d2cf91947bdf96f7
 DIST github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.1.mod 242 BLAKE2B f0eb5a9083b07529cd1c2069a507594b2f020342809b4fb8c373aa2dc2dd69528f3bbd33cae6466cba23e02d80c90a64487074a63de73d506e289bf8a5103808 SHA512 35c08be09ae0295cc22b58123c2ee8b9ecd2e1012f6b3155c27c92d39abe7041f1a20cce9125f5287a8c19510851a1772e3f375dd66bbf19730ca987f7f22a86
 DIST github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.2.mod 251 BLAKE2B 3b75d291300c0bb6d8c40121c86a7ce21eaf49c42b53de49724295b64320d9c7861d7ee7729653d820b4f70f9a2f85d680ab1ca43b908396c208fc43d3c6e718 SHA512 55ffe156141d6edbce7148f494fef8feff3b18b1174d3be20ecd3f3752c5f1942b1bb95deb3b3ff511a20161815bc0231b4ff4fa072a2e05f7c9c051d6e7d994
-DIST github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.2.zip 18173 BLAKE2B 5afd79f3404401e94cb708dc5b74a4dd9fac58c30dbb96917e6b83d4113f9940d8a355b7e68e84ba7146156c6064171dbd3c3ac6664e27a81de998981a214312 SHA512 01926ebd76850069bc3824b7397626c367c021ad0ae12183cf98baa9cdf7f7292f0a75675f466fcf0d86a21108ab15665ab0677d7533bdcca63ed4f636aa17e3
 DIST github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.3.mod 252 BLAKE2B 770d2887d4fc0e62391f6b3b0427aa4fea3455d578c49742695f92efaa2655a5747e1d62d9bae9a9463a8f4db68ac77b6781b0c1150c7bff9fd460eaa3cbe146 SHA512 6699586a5320227e9c4b7d456ba9eb06f3c3d42269bdad7a4149c52c8a1286c5c34f55a345dc5c245bfc0cc96a4599ff7b460166cd8a017766b56e372381a283
 DIST github.com%2Flibp2p%2Fgo-libp2p-record%2F@v%2Fv0.1.3.zip 17789 BLAKE2B 506d306a617c144b2bacb629e646240dbe2563f364f7ea53e9c04f1fdf02a8ba487b27575a780ce2731e4e62729b22c2da5ff26741e9d87c5521410c847ec6f7 SHA512 819e6ac4fd121b894386f197b2e8e36c45be894ef83a1424ac7c50f04675a84482dfd6d77fb9665fa4b4689fb4940ee1348ec8c628a6016284a39b6bf4b58540
 DIST github.com%2Flibp2p%2Fgo-libp2p-routing%2F@v%2Fv0.0.1.mod 217 BLAKE2B b224be174ebd22ec13b2ed89c31b381c5eff6117554010164cb26c8a4820828886ca14074cbf82c2aae90d4ea998275f2f8bd5831539cef58dc6c169c93d1b26 SHA512 b6dfcbaea451556ab8899ba957bb0e08b24d8da0813b822f9f93b5361b6714bd4855c869244785aaacdd716e8aa98fd1778ea69684e39c64295ac3e798717f12
 DIST github.com%2Flibp2p%2Fgo-libp2p-routing-helpers%2F@v%2Fv0.2.3.mod 314 BLAKE2B fa4656a2ef9317e9c391c6057b6f5f7444a383241086aca521c903c0f5b846b6f52bf9f749854ea8e0bc9c9c99afb52ce0dc8c4912a42da3a58b393c151228d2 SHA512 959c4738abe70411c8b16c492a80dbb996dfa4cbab9c6f1998f49b5c6735e2d93dad91f1e115d72c36fe8d13483a1de9701567f7bc3f9949917c17582da4fff5
 DIST github.com%2Flibp2p%2Fgo-libp2p-routing-helpers%2F@v%2Fv0.2.3.zip 29366 BLAKE2B 3c560d2cd0aff7ea6e22011853d34cb3e94733119820e9396dd0e21cedd0069242d16efffaeef276c8266cf808a3f740c4aa421c4c7daab203e47c581cb5f2c6 SHA512 f606c4923d1fb30cc622adc953fdab033bd4dfba88a6774f3f0ac3d7950d419bffb42a549c5376f181388199f8fcfa860a1af86ab624b8e59d1d6eb1ec2d0a62
-DIST github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.0.1.mod 487 BLAKE2B e8a0e4aecb34064a4fec1678cf6b370feb474a22a853d12e869082161d2458d1cc0225f1bf1608277a7f156609dad1869fb93dd2e9ae8030e242670221c99182 SHA512 a0ba4e5bb606b9d2b987f5596269451f112dc16a3c19d5d6482a5a63bdbb26641e24f01c8c3f6bf2745f7d6f25355f57894ed88942c5b59580638ae989e83855
 DIST github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.0.3.mod 487 BLAKE2B e1cdf78b2636310da39e954ce2b7325a87587d016b4f101d8700006c678ac013e895884964bcec15b87a49362bf90d35e1e290ce55dc4c739bd397e2a9accc32 SHA512 aabcddc8cbfdd1d47c092ff40c24994425bde7e97607f8e3dcbeda6fea5034881c87e2a75f95bb4ee237bf2a558e6f7e5f9d3557478e6f2c67463d185f4896c6
 DIST github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.1.0.mod 426 BLAKE2B 97bc357d33310c922c45cf34affa487122e96f5e02c523597f00932839a6b5b6718b15f48ae8165222621548f4bafa985d44ebeaa9a189567f1f47071ad2abd3 SHA512 a02214ec5a3ae40b80303f0b57b5c388ffcb3b8752cc68d72cca116e603e482957e650d51effe8fd404f215c0afaa0244e0ec298ed0179b7c12d82d81cce34e6
 DIST github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.0.mod 370 BLAKE2B cbcd8cad65a7f3eb072687961391545a6b8c7355e112d856b84ff44dbd7a0d405a2dbeeaca642852ad09db20da2d55770d7389bb9b2ea46b7b3b9ebd8238e4b8 SHA512 15f15a5422b9277de92fbdefd6e181914a5b36f54e09e298d3f5b44f493862c1e15fd1737fb04a7fdb44adb9528b07300fbfb6f7285afa2558f83c37b06ff2cf
-DIST github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.0.zip 26139 BLAKE2B 60cbf95157024bcbcff5e42153b7420fb8ce54cfada12343606a1e5343dae792a6e53a0e977fad9ac598a4bc0bc967b2123e13dfb087ae885d4796cb4d7c9adc SHA512 5a69b1dd512479fd387fa13aa3aab9e6c8284ac77711557b64d9d16c1d1ab6f7b7dd6cd3640bfeae94828af768e9f4f0bceb5f57b6c101c15100704390834060
 DIST github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.1.mod 370 BLAKE2B 7c072bc374114aeb922d62e38c05267bfeb4a5532807dba3c71e10d05e61fb7aba9bfdc906abcbd5834b8d01c6c72289e15be0ec897e8c2d7288519ba01f609b SHA512 f0e02ed9a9ec881dde6f2495ad5e66aba3b3b6bb9864d609db508bbb31be6d5f6224df415b342b6f4fe6256757c25a54a076a561c8afb3aa60fc90960173f127
-DIST github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.1.zip 26998 BLAKE2B 174dc0e9e6f5842c036a304e06dd0461c978a3a713e3ced8dd54d7ba96a95da5b61b32a720f3d5502dbe149003a7c7c49accb47b0949ceb367350ea068c5a23d SHA512 502070373426b4b359fc9ac0c545fb39604372a2d10b088c5a0a29195444a248fc860275caaee38a12fe19bd3e602b36f6226a4fa686b903c1f3896a16c7dc08
 DIST github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.2.mod 371 BLAKE2B 69e5e96ee1cf67df912fb7486f5d14904d58e7b16f2488a2f5de66540b22e96673d295f6836e0d1e06ff21b7dfb52f87a2243601c450bc7ccdcd5dd35cc2168b SHA512 13cf781c80b34ee7c32ff14ef6f9c3935501a7c1869a46af91e36ab6414fa457a01ac380ea56e9d0e9340f141bc8a9d80a7fb4921dc6a5b8a6baa280f40aad29
 DIST github.com%2Flibp2p%2Fgo-libp2p-secio%2F@v%2Fv0.2.2.zip 28990 BLAKE2B 30b1ed881329a793e72eee3d077fe9f442cda5e64e7176cc3d6d69338c119b9b72b30fee3af23c80ba990fc3f01130310d37a88b656ce221c6f0ae297c8ae409 SHA512 a87fb7997c7fc30e3727b47f84bda8525a07017f450a55f408e8459fd005affeced2063ae7167feace9903ea4435fdcbae051e187695ffd9390269cb6c850dbd
-DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.0.1.mod 1244 BLAKE2B 6fa55c21570d5b18eb159eac782cb45d081ad95279ff1af4514fc63b177a198690b76ad1395b2ac4a0b0c0a92ffb0b82db1a3194cb4fe89ae70d58f7a7f73230 SHA512 4c3b9e06ffde9c18e68673936848a6804027b5dd07d6cd3ecf6186333c585173cf3fa9cd6be003a8915162f6d3f6cc41e0e9c63ddc7ae32be37db3bb088a7a12
 DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.0.6.mod 1144 BLAKE2B 8a18cdbd4406a6b8eb1ddfbdf619cd41b0163c2a96a28a880d923cdf1833e8dba575182cd74de9e5aebadc68acb47867a16ab774036a92b117ac539644d27dd8 SHA512 62ba752120f55efaf65883f816a5231ee53697c55b71b7195e2a640521a47c42395cb8986a7b5d602b2f2386d0f92a116a45bb1082de00a621a2499f8145859a
 DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.1.0.mod 881 BLAKE2B e4716903c49e7cf131d1f31da0a1c33e29938d0606c2bc3a082f5069473bc67e870dc8f977817720b775502f9132be06d5e94c291839b675086f7debda578c73 SHA512 050d842bd3e7d2a9fbfc89d92d629695b17d066c11882b3a173341010b1291b66e751e8e56c73c549ef5c283579d7255751f5dc8532dfcdf885276d2337a6eb4
 DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.2.mod 900 BLAKE2B 3a8a011e06d7788339fdbc400b288e42c420a83acc0e9735978d98d6e070555828c440853e4393ec7821746d97a812439d6b0cb9b98213979497851a3e5bafc2 SHA512 447972b33579fe67a56a3427c0fcb71c43bef49b1b8ce7806cbe9a5a595f1d86c43a25279473b01be76f87825e20724df8b31b2a9a3b54a4c5c436c3a4cfb12d
-DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.2.zip 56242 BLAKE2B c01e67ca5d30bd738883848bc4ea19119b5fcf7a9d2cc62a79f0f288c63352924caccd597a27a552ff833f753c21f195ed4ac4c648a9d7652d78d64755f05f4c SHA512 7c96a63c0fdf732025af2d238f8b3f3f71a98a490a6ccce13df05f9e54e18ef89d69597a30c6702c415624a871b6a04d9581c84c280009111da6e3e001c68bda
 DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.3.mod 900 BLAKE2B 15de1e090ffed52a6ef76337e2ea2b7b0c3cb595edbef9719225709dca69bec19eb4938e56edc0a25a2ac05ffd229be56da7aede10201015f215a0f113676db7 SHA512 ec51d90df11e6f9355d6e1712ccde418fede5d972dc6cb0af649959791cce444829f97917d91145fbfdafc5cf6ea231e3026b723ae62fa71a9d4d9c2f53557ef
-DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.3.zip 61105 BLAKE2B 566b232c1b0c8f5b7abe73b467a7f3dd246358d68c22f141418e747bea029e0e718b1c0ad55b1431a586dd7a157612613f94dc2bbf6327c583db0450380f458a SHA512 eaca5a463fa3aeb6d9f7fc92da806f70bd29e2a4c31a58a58d396e0ae580b0cabcf48adadd505ec3f9afbb3d4103e106825df31709d46d5223ce4097eaa6db61
-DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.4.mod 962 BLAKE2B 0aef9dfbd860fa979887c421a0496188b27b8b593430dc6f0da166c7895589d2984fbb024cb49c177cf87ce19fa025db4ce92f49ec67315b7e1a9f6a064f0ed7 SHA512 517f2022648d3b444ece11cb907e04df315133235018d6a01a5edf88df62283c23c2a46ef3bc65e6a25e8627a291d4b0992c3f02ae4873da3b0ba2c6e3eaf11b
-DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.4.zip 63224 BLAKE2B 78c1801c724abcf9c9ca4b58c4f13a5d39d5fd157f4c6193a26969083dd0b24b8f7c4b398ea98a4a84cdabd8aadb99c11aad730920d411844f4c90b00497ec4a SHA512 8f91995a2c04254d2db3066f30967877a06ea47ccf72d49a775ac83390b515a11a5967e3f36af9ea56ced060ef6c663dfab0e439179c1cace703feba990cf23a
 DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.8.mod 852 BLAKE2B 3efceeffe895220558a158bc3c99b8f5cb86487f527ec4cd64aebd02c21da849b71cc41bcc073d1957b7a16c6cead567825d11fa9e201986748af31aed3e0f4b SHA512 5621eab118bf6b6ea0fa482aae718e08746dcaae0f6f42de5e89fee2b993e93a9069a1336fd290b44dc5ceda4a78058909c8351e33c732135e4c9df390f7659b
-DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.2.8.zip 62829 BLAKE2B 7729e879274fd7fcd37311a655bd28625b79151d18d2a67fd7f9c316b563f2ea9f4dd3550928118568c29f28e410b0aecd9e76c35a380bd07d45ce2d9a70a02b SHA512 ed93c1e6e4d03e35afe71ca5f239056c5c7435b566af8bdf2e76991d05ad685a134ae1bea060fcfeb41a7a950b3b996267e2d19b23c38092357fcdff2ec3d801
 DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.3.0.mod 803 BLAKE2B c921042c6c38559fd3a2ce4b3167952cc42b59503f6e514cdf796addbb86b362a066b78b34a116619166e2f2831f823e944f27e871179041e3ae72f0d85a337c SHA512 ab31bc91ae7c2c744d903db83f198d216336a49cfb93c0dce97dee16d250a529553caa89ed2f8b4d24b84439852090991cd558b4e89c61de270931bc53201a72
 DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.3.1.mod 803 BLAKE2B c921042c6c38559fd3a2ce4b3167952cc42b59503f6e514cdf796addbb86b362a066b78b34a116619166e2f2831f823e944f27e871179041e3ae72f0d85a337c SHA512 ab31bc91ae7c2c744d903db83f198d216336a49cfb93c0dce97dee16d250a529553caa89ed2f8b4d24b84439852090991cd558b4e89c61de270931bc53201a72
 DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.4.0.mod 803 BLAKE2B 2af101c5affb2b8834285cbbce4747d4dd4dfd7d2862875e7e8d9e45cb6359c05ac9fc7b927617ffb8d07019d1eddc10d0fd560d5b404d9c9657c3c9deb11631 SHA512 63de4d67f6cfe16fece869794ea257c899e65442c8f1930f7cfd278a6a953a2894328a4ba8ead23f063b69c2ffb14a9a1693785ddd6e4b5b3b3108294d90498f
 DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.4.0.zip 65138 BLAKE2B 657a8a297b5c4a57bc33bcbd0887dd7286ea9ce2770b901be67691520c8e01a07ccfef7abbf9d38ae4d70ed8e2bdd2621f5d9990db67a5b013f6f0ca75a339d7 SHA512 61bbe31faa47fca330513f85878e7f6701c7764315082788b61062b7200700713980aa54e4fd624a3e924fdbdd5fd88c0824e1489e2936643da625c42ad264ed
+DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.5.0.mod 851 BLAKE2B 5b0d65ada1c9a46538c42c118b8f1b2ab077f576b23cb67d02bcc70e3eea3ace96c9b8a606607dbbe8ba82d2d0f507da33b1945cdf21a13b80582b7096e8606f SHA512 ce2a2c9c703365ccca68d46b625a98a4d643c6cd11974b2b2eeceb55bd4367bf63b59b791d889fdfd87a232e97d438538c31fa98eaaacb0d0e9e86a0df011635
+DIST github.com%2Flibp2p%2Fgo-libp2p-swarm%2F@v%2Fv0.5.0.zip 75037 BLAKE2B 4e2be7488633994f36856ef04a8d4a1ea9d376efa235c0abdcc288ad90ca3264054102396a35b0e99237ea3279778c9443323ba3fbd7bde90238ac57cc4e5119 SHA512 a965c8b7c596af26d7435d219bb6de808e2de844d2c0265fc1e5ddb439b5afb48f57e4871a7e580bbeb229ad4d3250b0cf035aae6325c2126d180e3e100ff3c4
 DIST github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.1.mod 151 BLAKE2B ab94a6e4dc5b4e89772ca808a493ff31fba113ad84ab3cca1da6e4218296b47fc995ed9404599e1da395f6f70b2ca7d741cac44f3d483c8b623424cb687c42e9 SHA512 a9181c88fcf8cade820596ce2891e44db922987557e5fb7adcf083d85d9901f5f28dcef8d02e533bfb83eefdcaac892eeffada67727c623306edf5b0a671baae
 DIST github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.2.mod 151 BLAKE2B ab94a6e4dc5b4e89772ca808a493ff31fba113ad84ab3cca1da6e4218296b47fc995ed9404599e1da395f6f70b2ca7d741cac44f3d483c8b623424cb687c42e9 SHA512 a9181c88fcf8cade820596ce2891e44db922987557e5fb7adcf083d85d9901f5f28dcef8d02e533bfb83eefdcaac892eeffada67727c623306edf5b0a671baae
 DIST github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.3.mod 151 BLAKE2B ab94a6e4dc5b4e89772ca808a493ff31fba113ad84ab3cca1da6e4218296b47fc995ed9404599e1da395f6f70b2ca7d741cac44f3d483c8b623424cb687c42e9 SHA512 a9181c88fcf8cade820596ce2891e44db922987557e5fb7adcf083d85d9901f5f28dcef8d02e533bfb83eefdcaac892eeffada67727c623306edf5b0a671baae
 DIST github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.0.4.mod 151 BLAKE2B ab94a6e4dc5b4e89772ca808a493ff31fba113ad84ab3cca1da6e4218296b47fc995ed9404599e1da395f6f70b2ca7d741cac44f3d483c8b623424cb687c42e9 SHA512 a9181c88fcf8cade820596ce2891e44db922987557e5fb7adcf083d85d9901f5f28dcef8d02e533bfb83eefdcaac892eeffada67727c623306edf5b0a671baae
 DIST github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.0.mod 151 BLAKE2B 773a14b6dbe2e983afc8df2678deb5ab6ee5a63a90723b928fe4456122715f3261f0f4dfc6ed68af489b0871c8c15ac6a9acb3a6ff83d4a4388c2b3deaec5523 SHA512 0a5c1ff553dd96d100afd3ffb15a0a62308f37dd8e37c738b8f188b8f98a755f9e3efab5220eb2415255143dc1fb768ebb044c65e3fbe6929b5002b6bd38ff71
-DIST github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.0.zip 25231 BLAKE2B a35a9f31994fc4869eb240a248d30b3364df1891eb43138f3ca3d0cb06afa95c25eead170225c06f013f1edcb248f1edc1ab6f7f72e3841745368dd6bcf53978 SHA512 dc618ee98dbecc026237c48c69573332a6ea998ceaca678a1eaa6a699a86acd85b9b8530abbb4689827990f1305e5f9ac605126ac95c79d11968e09bb5d2ee09
 DIST github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.1.mod 151 BLAKE2B 773a14b6dbe2e983afc8df2678deb5ab6ee5a63a90723b928fe4456122715f3261f0f4dfc6ed68af489b0871c8c15ac6a9acb3a6ff83d4a4388c2b3deaec5523 SHA512 0a5c1ff553dd96d100afd3ffb15a0a62308f37dd8e37c738b8f188b8f98a755f9e3efab5220eb2415255143dc1fb768ebb044c65e3fbe6929b5002b6bd38ff71
-DIST github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.1.zip 25230 BLAKE2B 237e7e1c7f50995d21de69f019f2e13880221d9bcc175a37f27aab7fd028c641aa51e334e0e898e9bfa586437086c4657f02df30407af0b9b96584ea1a21e389 SHA512 dfe18f973e90787bd7b0e00585a373c5a1f66da6bea7c7bf05fd4f563d3bba822aa03a465c4f3c15507fd065291a3570341604d6783c8d703923623d96d8d606
 DIST github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.1.2-0.20200422005655-8775583591d8.mod 183 BLAKE2B 7a63c681412c6544f8abf6bc61b8bfd8bbed86731c3694ca9edaa92a08f85a97a9779d10421211e93b3bfa3e316073cdffe78cd8f59840c3460b4711d12dbbfc SHA512 2b90a6dfdb96aaa9d57a5378ab8b81f0ca18ae65ff15f2ee272ce32d0eddfca879330f9f51fbcc4b4e83b09ba8929ee62a76533064e1f442594b5f2a296df744
-DIST github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.2.0.mod 183 BLAKE2B 7a63c681412c6544f8abf6bc61b8bfd8bbed86731c3694ca9edaa92a08f85a97a9779d10421211e93b3bfa3e316073cdffe78cd8f59840c3460b4711d12dbbfc SHA512 2b90a6dfdb96aaa9d57a5378ab8b81f0ca18ae65ff15f2ee272ce32d0eddfca879330f9f51fbcc4b4e83b09ba8929ee62a76533064e1f442594b5f2a296df744
-DIST github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.2.0.zip 29000 BLAKE2B 541c5979f58e3d703e825837a3ebd71be740439ca7b4ede78a2b6aba8ff957b70efa14a0e115cea79f073c0d35bc374cc79e47bca724b8b464b397bc978e15c8 SHA512 bb0ab70900844dfe01d4b79bce4231e155769dbb736f13f60854e91cd32c81e19ff54a86dd76ba0f826c3489b11ee342a285b6060d1831e00f8e122b63240684
 DIST github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.3.0.mod 210 BLAKE2B 61464c6c06b125c02803bb6b6bf5e7ecbbc61f347613a316a611a92e8e4a616fbca2c1dcbb21c0cd89662af63cd17a8a86f18e0af0c6eab291bd3afd35351be5 SHA512 1504b61459dbfb6033a80e8cb9d71f4b6ca0fc56a65ab1c1167a150d97249ebee5106b445e23869895e4906983a56be7e10ae1d2565c3191e2ada9d72a08bdde
 DIST github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.4.0.mod 210 BLAKE2B 2d60cd8b81b0f50bb501c3972fb5691e84570793cf3ee730ada68b5102584c868023a8edc41e98dd082218c6bd7f5db207afa1b1dea24941fcf204042df81ad9 SHA512 c73ef680e94917d594bc505002259602cddf225edec011bdc751959e613567faae60ac98af69e6da21ed9e2f0b7ee3c6aaf59fc5574c30a656d844fce6a94481
 DIST github.com%2Flibp2p%2Fgo-libp2p-testing%2F@v%2Fv0.4.0.zip 28388 BLAKE2B 129abb8e47688e8e30285a325614271f6aa3a40eff799cf9ebf67f7142d55ede1e2029b83e5856f89b6718a388711f2d1c7c7864e79cff7d5c4bf765bd1441ab SHA512 a2530ac57a943ef9f8690a8ca829ede469c7c96890c3e69286aae5b5ad726aafce1ec8733ebeee303e51ea06e248fc4db932d800c9ae3b8e57010a0585e33ded
 DIST github.com%2Flibp2p%2Fgo-libp2p-tls%2F@v%2Fv0.1.3.mod 217 BLAKE2B 0df158699398894e1432914bf4772be920df3e394ec57671b83ca78ec5849a74f445633c3497f29b219dedf9a858968997c5ba7462d8fbadb7d7df86f325bcda SHA512 2f1110e3b6a5f54251745ec3dc96027820ca56dead02a971bb37e299dfae62a3f5d7b7ed3dfd92341db9e0e41e9108f284ccd06c0b88fae8c41152b337e27eb2
 DIST github.com%2Flibp2p%2Fgo-libp2p-tls%2F@v%2Fv0.1.3.zip 19482 BLAKE2B 5d219d71c67681933566d50688deaacd32ce21da86c5a8737f1c3fb0ef148e01f21c651a52b043f22760fe9bc9b38c50873327f0d1203325da725e4d78437540 SHA512 52fd0b2b9898e13cd27ce7addcba7dce1251957c4a22e55170a85dc164acfd296d6632732f0d493dc98014dd10f6a22bea9f58cff5398a553586156f063ce6fc
 DIST github.com%2Flibp2p%2Fgo-libp2p-transport%2F@v%2Fv0.0.1.mod 257 BLAKE2B 2dd3f1957f0e53f00825e340c929df2846173c4398590487acb3f30981ab9cec0be500bc16fa359b4a88c152926abf894e74409e33d24f5779ff57b9a3fca290 SHA512 e6539b92fdd2d64aa5904edd0538a36793c6a8e311e934dbb6f6c88e1f2d36c0a3a2524e1722647df6c5670df02bd3bf39d56749dd3507771dd1d3e841b9eed4
-DIST github.com%2Flibp2p%2Fgo-libp2p-transport%2F@v%2Fv0.0.4.mod 296 BLAKE2B ee23b921f17010c5ff0bc0f31fe41e3e92b74b02798361675f6c5ab1f31987c7eb18f2b9565f51b0733144adea240981e91dce530d176649fc5bca489aadf160 SHA512 b034af46139751d9a5f4518bc8b9af23fe351b33354433508cf7ab36bade313a5b23a9e5a61cdcff6c5418676dd21a6967dcec4ce8507fb7eccdddd64e7cbedd
 DIST github.com%2Flibp2p%2Fgo-libp2p-transport%2F@v%2Fv0.0.5.mod 296 BLAKE2B ee23b921f17010c5ff0bc0f31fe41e3e92b74b02798361675f6c5ab1f31987c7eb18f2b9565f51b0733144adea240981e91dce530d176649fc5bca489aadf160 SHA512 b034af46139751d9a5f4518bc8b9af23fe351b33354433508cf7ab36bade313a5b23a9e5a61cdcff6c5418676dd21a6967dcec4ce8507fb7eccdddd64e7cbedd
-DIST github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.0.1.mod 745 BLAKE2B f9990f603aeebb5f824d9184fed0a3ed31d4cee46b99c04fc5a71c8a781ac7669138aa82e8e3f13d74262520dd67012bbc5686da5b40bce31e4a6c8f4fb317d2 SHA512 f0338230268a337327b5f203f6a81eb5721b512f01d12d0e41501a19ced7e4bef0aa65ecf2f902d12430fcc9e262e8f747ce34c7eba2af5d18e7235a4c42e00f
 DIST github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.0.4.mod 675 BLAKE2B d77b929ecc2a2c86b84d3e6372c2378a5504e0ffcb7feb8f4ccd7678a5c733a1521d6ad93bf293f30c0dbabf84589113e942a960283c1640d9e7cf9a560a015e SHA512 e979a9e6b7d29207dbd9a08837dfbdd5cad8b254df07827a8bbe762ce67228467ba3d94438b92857c567d17a618bf6ba53691b62d1f998f59efc00ad98a5de36
 DIST github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.1.1.mod 453 BLAKE2B 23bdf0304e8905575c4b2abbf64d7f8539d08eca6d800e41d92d621601b1c3aaac8a47a760b62bfd68dac464b4012b58e7523438a683afffc3ebf31c45ac4d96 SHA512 378d335f58f7062f8eb1fad1ddd5c5d78a5015249d7af42e5c15f994999fe751a68dc35081073237460b03980a2d45db5ddc2520f426825c036a12838b44238a
-DIST github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.1.1.zip 17039 BLAKE2B 47084883584df9d3e55d0cdc50f4e50c42e2571d26a5c8882689f1dd7ce7dc7290d47976430f8806ef6e7254eafe63a45d2555ca03f75132a78d312bd32aef8d SHA512 270ae270056aedd92de83d7849acdce682fd7832d9bdbf31064c8a0e5c655a3bf51faf86c69e638ac4f971c33a946301221a363034dfb6b47e186cdf1a5a74e2
 DIST github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.2.0.mod 504 BLAKE2B eb43b7b81611570a93e726d2ee990aaffe48c7bdff2ae982df1a71ed5d8ca96e96934b2ec2c564572cb78412dc75c81c1d9094e3213a1840325d4b95896c5a67 SHA512 71e2cae7c074ee3f97f295f4c100bd072dbfaf737900d3d6a62cd14685f6fab8c202d94f5178b5f29396410aa26d646f89607e77f8cac36e373ddd83687a7409
-DIST github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.2.0.zip 24230 BLAKE2B cae8a56586d9fd995784195fbdb989938d6101b3c5ed71bf97c5d496d6226a7d36f97a3150835ea8ce3dc13685de2d56c11f03af4a92fadb71b106981ae60d84 SHA512 fe47cd250c9de4d3bd819d3e5bc069a7d74f379813df3a347f4de825402f68cfa5827679c6fb91c68642f34b99669bccd7815fe0b70b14334b7a9d0c20372e2e
 DIST github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.3.0.mod 407 BLAKE2B 467c0eca96bc9d1e010d2ee538431331670e976c798d525032ff5af6ba46f84af2bbb7bf27edfbe1d029df8d03272d1114d7802901a76bf50ae09e8048788d75 SHA512 679f607f7a3e9599993b7b43b915eca05b0de30d2f663d0c96f56825ddd6a4c7e61835be15a88ec0c0ecdc7dbf8fc9caad8a828e496da5e3ce5f296e44173b2f
-DIST github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.3.0.zip 24016 BLAKE2B 68836f529925c45e1c1e7fff504eaa2b113bb877dfd68cd71d1e9bbac65189f4756225ba0cab244ff24f6db9ce8a3815c40a0a101bfae2dc5977cf686c88b2d2 SHA512 c8d7295a9ca5da456ff36b121dc33e8fcb7ac3fc04b5c19d42c54c8b389bd41eab2c84b37a6994121f67419d3109e26d29129ef468bc86bc1af26b8ecfb4e682
 DIST github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.4.0.mod 407 BLAKE2B 5dc57da27b3b2338ea865e581f5295d7f688940c77153ece85768e0dd9c9cc7ca828154e3615473921ee89361c22d71ad34d74f4d7015a29b70abb9abc4d1b87 SHA512 0e451df53b333f7ba88a9b09ecb48c0b8ebce36485e35ed3f3c389c86e940e951a68ec0d11da29819bc0085b13a3041a62d56814fb78def72717e6aca068ece7
 DIST github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.4.0.zip 24851 BLAKE2B 7196a92791cc8b4eb057b074cd46edc512743d68607e641b916658f54993db6b7cc988c66179f2e521c554c6d53a380c79ddf9108b1ae0c4048c7df637c016a8 SHA512 206aa1e04213a4e1c9265ac1a9efac23efc8b9f3b0d4e86446851191d8ea7bfc9409567540a71ee923430f2573bf1325bca166c60a679015e31ea329fca567c5
+DIST github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.4.2.mod 407 BLAKE2B 110d7624b588e5948249196710c2b9600196d2b3d579b04af19fb8270e4994e026a9a8dc22c7a036bd8326c1ecd15ae9780057498d11e57f951595b08d61dd24 SHA512 c447729c3929d1cebf1fe49bbfb4eda61f16311c2af536b9e48a85392f4f1cd117938b87989d680022f0edbdac16f841993d5387339058dc48d2804849758bc2
+DIST github.com%2Flibp2p%2Fgo-libp2p-transport-upgrader%2F@v%2Fv0.4.2.zip 24791 BLAKE2B b70f159fd530e79c392980753d771063c506a6d103483a2de3a90f0a2d65d68ea45ca13d401a94a355d3f876895b0454d4b63fc994df118976bb25be703133a6 SHA512 72d9360fe4c70612cdca7501255058186404734699cc29d370b00b1abf052dc7b2bf6405c83301ca76b8a2b0dc8ba86a0eba6b1431d024b9fabd43d3595aaf5c
+DIST github.com%2Flibp2p%2Fgo-libp2p-xor%2F@v%2Fv0.0.0-20200501025846-71e284145d58.mod 100 BLAKE2B 9b4bb12aa2ee162e8a89d52977174b2584e74db3c988293ebfb7f850d86eb3d69fc2c7a58b20753ca3f147029e78401bcbbb56654c5c6adaf7b67cff756ec413 SHA512 b31e959a71cd3c6cd3cdbf4a196ddf2802ce5d081e1048dee2e22eba52bc66ad2651b6bec08f1c667224207fa6d2ad30a5255b179cceec9ae7f226938e9739d8
+DIST github.com%2Flibp2p%2Fgo-libp2p-xor%2F@v%2Fv0.0.0-20200501025846-71e284145d58.zip 29161 BLAKE2B 02b7a0fa3e86af04a0874baa16c0cd0afbf42abdca2faa4dbba8b5ad844616fad62778dc0a7141f76d5a17d0b51e472930013c5468d10f17ad16636f0d8f7ade SHA512 629e6b2593111bbaa939308b2553bd423537a58659ef82f593622b9a0f15a0381212002201e236ba52777ae6d10187604cd398c74de22ed591a27872ff063216
 DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.1.2.mod 140 BLAKE2B 5398a8b76084c6d003bd938399937663408db2fd8af0493e84ae1948261cad191dcec88ef3a9707dd93a6997e4a6082dddd772aff472020456b25dba06d26096 SHA512 6752dee08f85436ee1412ad61d9defeafc0fe0d52272defca25cda2f01dfa4befa39b2a1e3a2aa5e872ca7c3e737e0ce008e2cf282ba6dbb4da3b5c175dc7dc0
 DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.1.3.mod 140 BLAKE2B 6031119e3ea962fc61085a0fb6cdeae42dc242fb2432b1eba046dea82d2433e3f7c9ff3edb1d513a3dbd8d2db52906d54d6c82fcc77be745ac383b5ea9d08914 SHA512 6224688e130bb684e33b6b46ab3afa6fb0825f11b27862817cb66a88f69e88b6fc880ea176d67c98a1035d4a4d47f5ccfdedeccef384cee2e8d1f0b478254f42
 DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.0.mod 174 BLAKE2B 0cd4b51270dbf49a3afa632e9f6c3d544bcbaebbb38115c32c800ea006bf7cfa1d129a181a369bb8110ca937c54576ee26c69afab967ef123810c267662d60ab SHA512 2610d7e8f568fb7f19be75590386651d01df7f3bd333b9c10b9ae9e6d938c149a8b72f6e09b665ed45dcb29aeb3a044f0a5aa0b117019aed8308906ff568232b
 DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.1.mod 174 BLAKE2B 372c582ae5832b0608c798e2bd4c4042149e72f29b0cf08a36f75bf53aa18e2e7ab6a7d6d046f6ccb85782b436c647a4c1cb41bf7e7c8009ac7ed8d99f9c3026 SHA512 8dba2e169ec0e1fa40d7150b809a297e93d8925026d7a491dc1a4f8e65d5947b9c8fc7885c74cc90bb7339a17c76cee003062fe4d6a7a88150ca220d975aad67
-DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.1.zip 8152 BLAKE2B fe730757278c1c8ece4d91f09669be6b0306d6565a7d5a1acee80408787d873f7c68a31bca273c65293213fb450d1f8e004e6bdd9aaba2225460f25358b69b17 SHA512 8dbf7f0787cab80afe61ffe31c80a3b40d890d228b1549e5cbd60fe6b20c7c9108c0f3ce5a29a3b335ccf7e13e42ff7d5584757ba9e3e111fd81012a22b3e832
 DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.2.mod 183 BLAKE2B d72d64bde4002ff728043ab935b9c51f9a694eb43c29a3c9c3da103b42066d193f5b713617e2f215b5540244cd021e0ac2b0da71175c4f9a299fa4fa3f10dfb1 SHA512 7b9d190d1878c9823ffd107513d45d5ef21579f24129a29c7444dc89d06548a920e2f152fe628c77cbcfb1c90f57dd861eca89ccbed164558fb61c727652824a
-DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.2.zip 14307 BLAKE2B 5d47bff9307baa726e60a5e348426948fa0fc6261e60e74cd0428ff7c7169879fba2dd83677be4486349ead4095f7867137f8b35d96b50f942e826a88d09c9e0 SHA512 c2187a914b79852dd127b9c7586992e6ca3cb3539b54f96ff5b7818b73a040239fb4e0369194e89357df3db5af55d8360f79bcccfd97cff72ff238a425e46a02
 DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.5.mod 183 BLAKE2B c07a5bd3c2f27dfe176703ab6df1da9f9334581c0981aabb5e1e223c5e2d93502ca10eb878335184c5c290203a96cc4b5887582e0824a96ea7c772f0dbb04070 SHA512 886424863a7f85b15ca32fe852508f5942015f0a3d7b59a842c73645f8afcb8c2ba3b360202bdd87e4407b6907154c65a5b7619fa181aa11fc7fd45918ede07f
-DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.5.zip 13125 BLAKE2B 3ad77c05bf5f9b26082f158b21587cb1914080c21195e2b59826d20e3f1da7738594f379670cfaba90a77902709b722e190190b83b5c3a532ff11244bbff1929 SHA512 3d2dd9640d79e35a4d26ecd67d46c63a7307f192fedec2bb4c025ec1b3fff36591ceb120cc99cd84bd45edaa552a19af9ddf2af143d99a3d3cf25c509804bd62
 DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.7.mod 183 BLAKE2B 590f4c597dccc9b39415a1dbf406da5502c1259876f2a3e1c99fc441cb4b4e7682a1ed9aa0b45b41d60a30c4516906183bf9308df781b533e9fd237c31c8a4e3 SHA512 3ae06c29160dfd29083d9184e5c50bfcd03a1344be58b70282e2e2ca2b68cb5c3ecc899f29bcaffa29f7379d14a689e461141b958267ec2ce9c1890e1f35277c
-DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.7.zip 13045 BLAKE2B f14d683edc84aca00ed9a58c5a0f4689d305540676ec5f96d274730318e1971a93c804a1ceeb3fe7ae89d33dfad97950facbad5f166f66a8414df6885447d74d SHA512 7dda4bab620d34b22dd20158b114c263123f6241c2b2a861a8961858eeee33f327c8e5b066be99d5f83d82ef48c2df8bd30b32e21b9ed2a2f911d2adc6049261
 DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.8.mod 183 BLAKE2B e2687fe3c79950f3e064050f9eb521e541dcbbcaaf0109e9f744340c8f7cff787a8c859193e8583df4ca6cfa40ae1641cf43e4a41d59c4aec17bb9d620bdafd3 SHA512 aa1eedc8231c4cebe2c8ba2a78415120a256ef581f90326fd4985f089c32c8118ab7df81d551cd67d9febad7d7f374aee7f95382325c9e9e6b78bb1346d9f05b
-DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.2.8.zip 13079 BLAKE2B fe1db1cc0ccc208a22eb5ed0d41e5612383e6fd8abecc836f768188e8e6981648fd895fd29af286df99ef7bdec9c01797ad2a1c4c972365500c026d9f2f333ac SHA512 e00e3c740ea3dec26f3a1ba76a44b467fb8b830c6fb6b8ab80f5fa4673ee60fc432de52a6c217d548b5a3e7ad78522ec8070a48beb5785474e7e4b4059000284
 DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.4.0.mod 183 BLAKE2B de775b0aa5925844f213237ea1dc8ef51371aff1bc170f8bd5acfbf77878605484700038f58fc5debf5a9dd0e186cabc62388a5fa998ba2ac813ab1101615b1f SHA512 24d7fd3994cd9639ee022d8551c65b6b2caff5987c31fe75ac564a5e55580cd92e0e19cb1fdb84ba6939bb07b530a06419da58fe5a1040266cf28cae7f949ff0
 DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.5.0.mod 183 BLAKE2B 86c931eb75eab40d897ebd3bc4521ad3e5c2c0582434788fe15883a99194bcdf57d5bec1773d5484f98a2b6e51dcb70df8516426bae0724afa6e0211a7b8eaa5 SHA512 cf83656a3f67782ffcced1bd308768e981305c121084cc7feeeac85b61eb90a05d2b21f5f2164138431e8ec2bad6a3946ab2d3416961d1ee019edf4c342c4424
 DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.5.1.mod 186 BLAKE2B 25b71dfc048f7968421c2ec2d40e5ff9b3f13251bcbedbc11ee163cdeb9085b1b354b63f9dc3ca84e656c9d55cef69a82d5dcbbff4319a3a0c0e66ace968762b SHA512 b6b70fec7a35db48720c191a6b01ce2098be3319a1b3ee73654e454745212d97ec078f6a1c0acd52fc72e0e529df25b2a24d1093137218c4c15b503a208e0be0
 DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.5.1.zip 12215 BLAKE2B 55f0c36b13e2b6a8f1fade72c20c9e9638bcf630795f9f368702cfb6552b77fa411741023534f1209e411d885747aadc7cbd851b2653d861b3f09cbfa60d37f9 SHA512 6119e2c25476fda3e81c197ee6222be2bd29a56dcc8505f10506de331ce81edbf40ea0a1cd92130f763053d7c64969e6745732a65eac11e42671791d896206ca
+DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.5.4.mod 186 BLAKE2B 1f97373745f811f1254ebbae676b11ed09d77d422229a403ee4e2049d80f7ac0cf58beb06ac20fe0576acf6c771787c8512d9689e1e8d2b781f54c64369dc83c SHA512 b50102e54f3c999f69cadd05948d7eef37dc7c17fd47133ffdd1df18a8081d25cee1317e91e1de4347cc831b39cd6994598ef0ff0a609ce6204314b9a55178a1
+DIST github.com%2Flibp2p%2Fgo-libp2p-yamux%2F@v%2Fv0.5.4.zip 13654 BLAKE2B 899d28c3c0d6b6bc6b5a594987bd775711b67af310da09dbe79d055a35559e4249c4de3209a58ead138412766fe9e5c1b566b40c0756f4c884760be05bc8205e SHA512 93ba13d012d610a0680a4a0873d19d5468dd6052e981e3ec8bc18fc462660a80d5e547aa7f69f3345e6bc072c7ffafc153ba12980e8a8d906bcaf7729c82bfb4
 DIST github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.1.mod 148 BLAKE2B e983ade37bde0de5f97afe5e6046e1c938f0c356bec4636528b4b73f5b3d46b857accae67d3d2f6b62a24e0e43f88d55e9433969c184d131d1abb0906a8d0b21 SHA512 f9bd4f5114967c8dafbfadc921afa519383c456651a15f8cebe9a66518a12e5cd32286b219bc1fcb32af497c2ad86b761a074679df92e6f3ed758f088673e535
 DIST github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.4.mod 148 BLAKE2B e983ade37bde0de5f97afe5e6046e1c938f0c356bec4636528b4b73f5b3d46b857accae67d3d2f6b62a24e0e43f88d55e9433969c184d131d1abb0906a8d0b21 SHA512 f9bd4f5114967c8dafbfadc921afa519383c456651a15f8cebe9a66518a12e5cd32286b219bc1fcb32af497c2ad86b761a074679df92e6f3ed758f088673e535
 DIST github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.5.mod 94 BLAKE2B 7b317e20da581e6a50453b0f1b90e655e852870e31b44da19ed5d3c37c222b7cb5f778f7ab48ee914a39fdf1155335ee6ce07232ffb8a2fbc5af914a66fb8278 SHA512 58625487ae8ff7870e9760b960b12dd89f690e2c3534538e093577d9658bb9e5aa5f1da72c2ecc75599a3391f3205eca514e61fca453dfb0f2932ccebee9e8b5
-DIST github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.0.5.zip 7259 BLAKE2B a002d5af744997f316cf2c587aafd7c304c293b130359621d14f378f4e577477dc4440e302f31aeb7f0bfac772f0cee38fcdd334e8e98bb42ba089c5876e7b10 SHA512 25bd5967e426057f292a3992fc95647b9e64bc106d1e40958e75318b896e7206de2b6d07cc731bd3b7c423f2e469edbeb326463776fe8b59d737f89422d7f19e
 DIST github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.1.0.mod 103 BLAKE2B 254384a1dc888541cd55d0a85490f690553504beb3f9269dfb2e1a75a8dc04793f5f4eca82fce1ee3ef04e0566c865da859fd7f1ae41ca43698fc599a6bccb9b SHA512 54666f876fbfddde4779319fd3866298e298f91340f5db379878fc3d25057ea9301483a76c124894a4e81b6f599d25e19bbddf1dc59be46600074d40ec959a3d
-DIST github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.0.1.mod 161 BLAKE2B f7751f1af8249084803a1937c3beab2f5f39f62d653a66ff35758cb2b686045ef36b1d647aae1f7e4f65cc5409e27715f33eb7a76ffe7b4fb05dd2832bff03d3 SHA512 6939c895fb3cebc2476e2502f2e4de511d2b8a766dd914078467d59acace548f3d97eb3679406c326e13bbcee307226e0bde27dca6c82b2ed5953e836db8d56d
+DIST github.com%2Flibp2p%2Fgo-maddr-filter%2F@v%2Fv0.1.0.zip 4753 BLAKE2B 4a84cacd6cc807e4740b5f41c66a4d787e0a28dcf855247c74290a5407370303b2502639a972b40193e4dfe5a62b4a1ee5c7d6ea554e0e6f17bcbbd6eed8ccf0 SHA512 c632c8cbb5a581f91ac5a3325ace21b14dadae75f1dc5a66010d4180b52ca12600bf65e57160c9b5a1fa641c80af7752b47f11bc80a413668085a9ea9fee3bb9
 DIST github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.0.3.mod 161 BLAKE2B f7751f1af8249084803a1937c3beab2f5f39f62d653a66ff35758cb2b686045ef36b1d647aae1f7e4f65cc5409e27715f33eb7a76ffe7b4fb05dd2832bff03d3 SHA512 6939c895fb3cebc2476e2502f2e4de511d2b8a766dd914078467d59acace548f3d97eb3679406c326e13bbcee307226e0bde27dca6c82b2ed5953e836db8d56d
 DIST github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.0.4.mod 161 BLAKE2B f7751f1af8249084803a1937c3beab2f5f39f62d653a66ff35758cb2b686045ef36b1d647aae1f7e4f65cc5409e27715f33eb7a76ffe7b4fb05dd2832bff03d3 SHA512 6939c895fb3cebc2476e2502f2e4de511d2b8a766dd914078467d59acace548f3d97eb3679406c326e13bbcee307226e0bde27dca6c82b2ed5953e836db8d56d
 DIST github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.0.mod 160 BLAKE2B 2e9ba9e10feaca3e99686a5d5c7769cc93677c92f2928f81fb31960fdb8ae130d0d16601feb74a651a94d16f38c6bdb86e6ba9ffa40439457fb5b3d5523f4ff1 SHA512 6d03110b53ba5d919cb9aace04e22c81b7922c04bebfee181ca415f5610384286b20fc91776878819be83ec59487fc2649800992d32f581c01952cc36a58cad9
-DIST github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.0.zip 20883 BLAKE2B 1ef6ee810f6b711a26a80469add691ce78bb6ff3f9e8f8f30513e69920cfcb20782419c446a831fba6d445c6059c6030fcbdbb04187d5b2fd5cc97854b0a5569 SHA512 8d977f88e3c6a18be05d311c5c16a177dddb6df5d6be8d6ba6d74fb125c56f17541d04e14fa5340dabbc14de829c7986b3dff1ce64600e3d9cca6cdbc2dc4d60
 DIST github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.1.mod 128 BLAKE2B 36d898d9ba6be5c5113274f144fc4f143e803fef4b9554b4f7616a59ca191e1f3c602645270f3ffa111dcad85d6f940f66511d3158a3f10bc6e07542ad69be2e SHA512 702de11d210f7e75faf55013d0f018f48ad0baea4107c6bc802aab36df1b28990fbc232885d9f06d467dc5d1a797738bf61bf6a37446f26d54340b1bf60b2918
-DIST github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.1.zip 18611 BLAKE2B f5c75d185f6b68406e331d2dd0a10f61f4efbec030ab72d0f96b290bc826ead148599cc12a5ce1de71c3cdc85bfa8018aec0db09c2494123e27040ab64deb73e SHA512 b2bb9047e1a8b8cbbaa1e3fde8ded329f905bfb4aae494e176dea7c68f6a4a835e1d2c5fd53a0e1a6013c7ba46342336ecab7679aa53d7518f8c8a539fe880f7
 DIST github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.2.mod 128 BLAKE2B 36d898d9ba6be5c5113274f144fc4f143e803fef4b9554b4f7616a59ca191e1f3c602645270f3ffa111dcad85d6f940f66511d3158a3f10bc6e07542ad69be2e SHA512 702de11d210f7e75faf55013d0f018f48ad0baea4107c6bc802aab36df1b28990fbc232885d9f06d467dc5d1a797738bf61bf6a37446f26d54340b1bf60b2918
-DIST github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.1.2.zip 18672 BLAKE2B d7804977de183efc7374e3751c0550c558881f8a5a8568f5535c251897948a2443692c809383f2d5ab5134340dd1ca055b8d7a7dc399b432f1f2181473453207 SHA512 d1e7ccd751d2156644c2163738b5fa1b7117319cada40a09b838c3145f3e79f34ca1013d8a98ebfcc23c118ecc2a706eb3bd9ce3451fe5ccd0d68d0e2ce606f5
 DIST github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.2.0.mod 514 BLAKE2B 0269951b494200c217f73dec948b91f11a4a524ebf1dd256552ff1ce9c3bca632a934054fc3902e8d6bd643a32fb74e1a7f57d1790823eec0aa1b315e0265d8c SHA512 83e6765436c8ad6ee56dd7890ebe2532a4fa0f27a0d946eadd5b0ed655616cb90d318f206b883772b9cae8b85799ff877671ed0d291fb8f999c15ca65e34fb99
 DIST github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.3.0.mod 514 BLAKE2B 0269951b494200c217f73dec948b91f11a4a524ebf1dd256552ff1ce9c3bca632a934054fc3902e8d6bd643a32fb74e1a7f57d1790823eec0aa1b315e0265d8c SHA512 83e6765436c8ad6ee56dd7890ebe2532a4fa0f27a0d946eadd5b0ed655616cb90d318f206b883772b9cae8b85799ff877671ed0d291fb8f999c15ca65e34fb99
 DIST github.com%2Flibp2p%2Fgo-mplex%2F@v%2Fv0.3.0.zip 29633 BLAKE2B 709b04d3073b8542b89ed1f1dae9713729096514b3ecb0c7de76d006f368faf04a0e436e408d6a1afa808e1d83d758379ebb2b46d10235ce72b63992ba531785 SHA512 a3507b1b53e39760297ee3b0d4c83b9cc3dffa92907b4f68a527a008acee2ba0603870f287b79756308c83585505953356106766cecdfcd4eef79e2e91e2f9a3
-DIST github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.1.mod 83 BLAKE2B 010d91f15d52d855f0e69e4158c96616ef33839f92db1eceda945bc992912a1b8612d16465dfe248b5598617dec1ce0f94c01133345f757d13bd4b3b6fba7778 SHA512 9413b94d559014eb1e626efba47768212e29bdb9289037ee3b5fcb4cfcc7bfd59948aaf24e0653015a116f7c19421563dba1bbc52dbed4d3b3f2131f70f877fa
 DIST github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.2.mod 83 BLAKE2B 010d91f15d52d855f0e69e4158c96616ef33839f92db1eceda945bc992912a1b8612d16465dfe248b5598617dec1ce0f94c01133345f757d13bd4b3b6fba7778 SHA512 9413b94d559014eb1e626efba47768212e29bdb9289037ee3b5fcb4cfcc7bfd59948aaf24e0653015a116f7c19421563dba1bbc52dbed4d3b3f2131f70f877fa
 DIST github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.3.mod 83 BLAKE2B 010d91f15d52d855f0e69e4158c96616ef33839f92db1eceda945bc992912a1b8612d16465dfe248b5598617dec1ce0f94c01133345f757d13bd4b3b6fba7778 SHA512 9413b94d559014eb1e626efba47768212e29bdb9289037ee3b5fcb4cfcc7bfd59948aaf24e0653015a116f7c19421563dba1bbc52dbed4d3b3f2131f70f877fa
 DIST github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.4.mod 83 BLAKE2B 010d91f15d52d855f0e69e4158c96616ef33839f92db1eceda945bc992912a1b8612d16465dfe248b5598617dec1ce0f94c01133345f757d13bd4b3b6fba7778 SHA512 9413b94d559014eb1e626efba47768212e29bdb9289037ee3b5fcb4cfcc7bfd59948aaf24e0653015a116f7c19421563dba1bbc52dbed4d3b3f2131f70f877fa
-DIST github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.4.zip 15557 BLAKE2B 12b01e9221a1f5f9d9967d411fce5640214ac84da57cb8ebdc8ba7b0f5c7d20c833b48c32ee2429860f08ccf586a990ecd4c32f9ca617e588edf6def74fe8cdd SHA512 7269e224fa155a1b4042ccdfe611d8860f20aad93e294d454b5947cdffcc277b01a65f228ddba7e16390d68dc1ff2249d921ffa9ab714b8dabadf56a9c3db8ec
 DIST github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.6.mod 172 BLAKE2B dad6ec4504ee582926400877959151c3f531f4866d8604d338ade9f193c4ba2a8be133a773f92b71bd73a20af923257c7cbd9272af9501f14880b0e86312417b SHA512 5d91b38d7afece82c636f1404d6c5607429426ad42967e9a32f9839c65e72c92d046222bbeb2b5f8530b9c94fef9c27f73fa5d25ef0f228b62ebf6b224d098d6
 DIST github.com%2Flibp2p%2Fgo-msgio%2F@v%2Fv0.0.6.zip 22124 BLAKE2B 22b82c472759ea43a75536222edd32ce0262bcea2b3679de7bf1e133ea86c8813c660a4f43ef9a8b084cc389102be3a2f5e8f6642e65c117f2f02197d9f584cb SHA512 10db1d01a14f3314ba903e6acea10ee6c002365e061de9391c5f350c11bd9e155a34279e8d96b112628a043b792180e7eb4e0db34dae02b7137be19c291df8e4
 DIST github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.3.mod 210 BLAKE2B f07fba01f64107091ce5ba51ee97fe3029dd9f7630215d4be4d7e6356a0c3f081a28f8673346d4218381ce88cfab3de40d56ade9ad0d362f714432d6a60d9238 SHA512 f9be9d2a2c173555a2ab64b7d0173cf69dd4303d95fe7e849db7356396db703f1ac9bcab5f4c136ddecc36461c817e89516e01db80932ba00797bc7103392980
-DIST github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.3.zip 11061 BLAKE2B 2f5ba9e2ba1e0728c65e9d3ba5038e39bc9dbe0590a457e4325b7f88af4ad108040980688920172c4d1456f8e06f313c9172edb3d2d28518acc8cdc1084a42b1 SHA512 ffeef5ece064cc8e4e4b19d570929174231e28cd6273d35fe1380869c3a710b93f739bf2803fb4d0774e8bfc62196bfd96e1b98df15c47280fc810b66123fe06
 DIST github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.4.mod 219 BLAKE2B f8dc154f7ea9404adb5d93553ab17ae89b1fac0a34edef52b5aec4d3d11f0db150d840a43092a410198d79b234844efd9a0f7bb6351ebc173d1d06005477ec97 SHA512 90d45d455d26bb05efaa654f0728dd5875a3047dd1af22497af0744ed1aa1b1084e36001faaf36f03543e69d3fcc976c892411dbf5872148f0880441d0eb4962
-DIST github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.4.zip 11057 BLAKE2B 7247dd24f687c637efe5f7152b6d0d0fce703c937f068788b87d84c911d498f4a53439978afcd59bcb7d24860e5ded52852b797c40c68ef8ef0a57bb52a09e53 SHA512 799d252ad94c1dd42110cc99f7229d43dc441b6110b6440d25e38a144221aea81b704c1e33af4b8956ff5cddddf938f8d2f0d6de445661955d79c67d4a8f64db
 DIST github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.5.mod 222 BLAKE2B 00b3fea033168f607aa4989c8f1a29256663bef83eb788923c4ee24d420ad558fa44683156f628a51e56a2912f0d67d1a591c4a968bce2f92dba5c45c6195592 SHA512 bb4a933b34cfc3d0fcff1d2306401431958b43d8cc85a1f42b2f45586cbf53b1a0bf875ed576d8433b3fa5f4b5cdd083728d57900ccf16b475fc01e36536e6ad
 DIST github.com%2Flibp2p%2Fgo-nat%2F@v%2Fv0.0.5.zip 11895 BLAKE2B 5df0dcb2432132adc83b13964df3c7baa02d8d18ec0bbea25943cb657f1b330be9b18c203f0ac895e9189fbd8b4fd184c211016e58c6ba72e2cb7678f982b521 SHA512 ef2d80d330adc193b7dcb382e191ebd6e6f63bfdcb345eaeb2e8354bdf6579b3848cdf8633f4c40c51a45fef94abedbcc10ba1d1b85c6569ac1b5ea4ce8a016c
 DIST github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.2.mod 239 BLAKE2B 81c397c2ec547d4ba506229a6ab0d9356bb3d8c9a605b88242625f7aed723dc2b66595b5b769ce5681177a414e6ce410af1dad7a6456df92abb30d06c66b4459 SHA512 2f39be5ff46fcedf4561bc39589778dd886ea55732618ab7629f0c560af12e9d0af4eeb98d232eb3e1dbfec6fe5b99429bc1317a90c03f406dc0f78ea4b0aa60
-DIST github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.2.zip 11593 BLAKE2B 0c76c3fd2e52d52579eae41a3ade6698099a7b62a190bd82a6a44ecb4ba1c4e58aad5e437601674a0aafd54e9baf25f557f9e289cc1a89284b98506dc2f59a61 SHA512 19ac2717e2c2cba2ab2c68c966f7c377a58f03e682d1384bdce61ef4fd2cef7bde1d7ee326c9dfa611b6099237851763b09886050d89b3747526ae5c2d871861
 DIST github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.3.mod 239 BLAKE2B 81c397c2ec547d4ba506229a6ab0d9356bb3d8c9a605b88242625f7aed723dc2b66595b5b769ce5681177a414e6ce410af1dad7a6456df92abb30d06c66b4459 SHA512 2f39be5ff46fcedf4561bc39589778dd886ea55732618ab7629f0c560af12e9d0af4eeb98d232eb3e1dbfec6fe5b99429bc1317a90c03f406dc0f78ea4b0aa60
 DIST github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.3.zip 13219 BLAKE2B db1c013476abed8fc1f57b3be438109a1c82f3821303d8e66efa6ffa672773a62a7c8c9a687908de8c51c385addf9a4d119ef75b4924e2d414cfd4caa9be7d85 SHA512 683a75bca5d62477967414afeede488197b4b3460d6c5df8aca18c26a6434f5be2ccaf9e663d64a302575fc8f87a5f9f6c1f406b5e588b59e7123444b6913891
+DIST github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.5.mod 239 BLAKE2B 245490a72c8a58419de54e9d4c89f6ca5631f04294de7acdb4b4aa496b57c833016e33bcd0577a8385df8e91a5656aa7a805536773280a2e23e616a94b17b39f SHA512 6434fcfac0c39bebca58a4b32924c5ccff31493438cc865a047b8271d868bd92acb4a926af715e9b5f96c7d683e46b802499c2a38d5a66d45207c00a2eb56a0c
+DIST github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.6.mod 239 BLAKE2B f882fdc8a2126c6e8e59588fc240a685c06f1281d4aec9a8590349d507074031c826ef255f5bcb5e0176db229cdffc8ae88786f14c99752ae7614f56fdb3850d SHA512 bd41ae3881214f997bcbc97bae23f5f3534fcd87adcb43ddd3c587333950b2ab58411275fa822225da3a62692600517b737d469f7907c84fdc4b0f3b6b338558
+DIST github.com%2Flibp2p%2Fgo-netroute%2F@v%2Fv0.1.6.zip 14340 BLAKE2B a3acdc2ba6a33f8930dd1391516a3abc2822e5d74466943e58ca3659b28ffd10d64133c642d1b8b0a58eadb02722c8edf282bc259c3811128cbb9fa8114a03a2 SHA512 47116c4a251d85a4710a947f3dbae5ccd070ca65ae988dfd9fe46adfb196151e58336ece3811d2eee8e0ec6e70f61a4e02c5d9e414571e2e626b3a0d121bdeef
 DIST github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.2.mod 184 BLAKE2B fc45e0bc02a14629043654c66893410a567400bfe220ff6942a42893c3c707d3ab5dcb2a62e3c0231745c293f16d5398756236f1306aceb8d74d4c00657bc9ea SHA512 52fa1e80a5c28b1122887f8872a867b7136043a204d704027857c78233c74cd45783ca1aec8d2dc39835f560edd8e6b06ab712c73120fb8b538f326c0b0fc362
-DIST github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.2.zip 93559 BLAKE2B 1610175e1c42bb68e32ffb53c67faaba95547aa831e6e3b4855ea6dc0c1f353c0224bfab28f1060c56833783de2bbca6ea8ce68a80c7bc9375243b2f1a074e03 SHA512 782f73e12b949003c2e188a6e911557a026fb74c3e6b90a79fe4c17e369b933534f190ba9d5b4a34ae4d5e3ac942fa55128d52c949c48617861fe4c9047695a2
 DIST github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.3.mod 193 BLAKE2B a21fd585464abc7fbec1945e57eb1af54f04393bd55450ba1f14d6569d8950755250c39e4c144a0022436dd6d633531c107099071b8f50c10625b65be4b82eca SHA512 7e74e43025a5ad61cdd43c4908b548efee39fbd1f3e6be18d6651e643e5b32b4b41d0f771e05ea43fb2c40c25af5d4af86c5065caaa0b2cb34a5571534183579
-DIST github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.3.zip 93723 BLAKE2B 6f50fd11f14e6cab39ff530fe18023325104ba83df6571bb1758df1acc2ee9b4bbccb56751fbabbf3b5621b5261ff61cd8ebd6f4a1ddb2367f40287fcbb71f37 SHA512 2a84378a57de818d62350817f6f83e821d1eb8d042ca2e4b61366763d1595de88ef033e0d40dc0d35e94adf77463894009a9243213a6aa976be643f62504b69b
 DIST github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.4.mod 193 BLAKE2B a21fd585464abc7fbec1945e57eb1af54f04393bd55450ba1f14d6569d8950755250c39e4c144a0022436dd6d633531c107099071b8f50c10625b65be4b82eca SHA512 7e74e43025a5ad61cdd43c4908b548efee39fbd1f3e6be18d6651e643e5b32b4b41d0f771e05ea43fb2c40c25af5d4af86c5065caaa0b2cb34a5571534183579
-DIST github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.4.zip 93732 BLAKE2B d7489177a171cf6e0c92f85276d77db5a6b0f1cee5c6f6fdbd8cdbe901640c7b0c6e2415cb5739b868062638b5bd288647be62efa26f59f96181b53fc104df83 SHA512 ccbc5f89681b59a0e87af73082ac600355f14354cf5482f2a56c27428113dae3723d2006515f26fae3faec535cc62e78d3497a0214351d4997930f5b8f9d9a4e
 DIST github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.5.mod 193 BLAKE2B a21fd585464abc7fbec1945e57eb1af54f04393bd55450ba1f14d6569d8950755250c39e4c144a0022436dd6d633531c107099071b8f50c10625b65be4b82eca SHA512 7e74e43025a5ad61cdd43c4908b548efee39fbd1f3e6be18d6651e643e5b32b4b41d0f771e05ea43fb2c40c25af5d4af86c5065caaa0b2cb34a5571534183579
-DIST github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.5.zip 94460 BLAKE2B 392440f36fb69dcd7d1b9f83d247247b5c1e1d4afe296df5405b15ab9547092758ec3f4f6261aa21ea5041bc5cf6cbc2922df4712b3d84b6b60552c0c8395d1e SHA512 3088cc901aa78909807afe86976c68d396592e8cf8ac89ce20f7dff54d87efc360f1ce5532cbe0974ce4d4243e62a1740794d3a4932557a0358cbd058e6e0ad0
 DIST github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.7.mod 193 BLAKE2B a21fd585464abc7fbec1945e57eb1af54f04393bd55450ba1f14d6569d8950755250c39e4c144a0022436dd6d633531c107099071b8f50c10625b65be4b82eca SHA512 7e74e43025a5ad61cdd43c4908b548efee39fbd1f3e6be18d6651e643e5b32b4b41d0f771e05ea43fb2c40c25af5d4af86c5065caaa0b2cb34a5571534183579
 DIST github.com%2Flibp2p%2Fgo-openssl%2F@v%2Fv0.0.7.zip 95768 BLAKE2B bdc96ba1c8fb5e4cbb617a95fd0dad794d4ae724071e61927b2f41a716ba7aadc5f24127d1cc9d1addad587f9a56df26b2fd2d9d2c87e4eb6fe22c9c8b03afd0 SHA512 4a4cc7731cdedcb9a092121ceb8340f6481ad1199cc98d48524acda1570084a6835f186c1737440636e969c270be8f3979e6880349dba113fcfe2cf2aba01515
 DIST github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.1.mod 170 BLAKE2B bb948d1a67bc2282def5d9da6a9c72309e45fd26f7cf3eee67577fc848167975db0187f4548aef76fa8f0f2daf7c2a9cabace4b3ae261848d682740fa1382212 SHA512 83b0b69fe553a7818692b7fe99d1ef3c94e071b50984a3362ad6cb97b37fc0ab8e8a7658aed32b4ddc392972c8af45a640b60c4bb250d8991e9e886c7cad9b0b
-DIST github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.1.zip 8348 BLAKE2B 94625c6f483833f6af072e5acb86d0e56fde5c987d331396d1d896b11815128d1268b1b35ec16eb566ca26498a20a4712b521aa8d6b199e81158fd6c019f65f0 SHA512 f8074a2c9ad65bdb3b58d4ce6b8f49e586f60b4202d7054c294628cd78fb358fae87d2faa78e244385a2eb6ebf6b495d939f1511079c55b51c9f2537f983e809
 DIST github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.2.mod 170 BLAKE2B 13f23d96f1115919fd4f81afb8b717be01808fc5582bba0332cff84693c40e92476921a4aec84fac4899f091cb1157bb61275204c298c10265c8ec7d4f5ef4d5 SHA512 2eb70b0a3bfae1750b6312863a10b9549bb0e2d5a276d54202d59c5f03ead2dc2158e5fbd964b20c1397620580003e378be9975a5a100b5e91beb5d9b7b989cd
 DIST github.com%2Flibp2p%2Fgo-reuseport%2F@v%2Fv0.0.2.zip 7534 BLAKE2B c5dbbbf5711ff3c1f499be9057977bb55b1c33bd2c65917dcd9f11e8f8859a540f1c3c27c1f15d61e35d753e92089f0261ddce3935912db53e1f30365c372c1a SHA512 cbc73e1b3afbd9050688c36f2bef5cfc714c7cf2d16f4a59d68ff309ff24e15f937d96b5e48e9d3a6caa435a3dd211cfde5092cf80e5efe680e9dfbcded1a288
-DIST github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.1.mod 225 BLAKE2B 77c83e0698d95e156b56440e615b3bd0787464dc4bfbdff28ab60d385ade1f4727b6c94ae3665e2d595d8de563266f1009f0123ee0029c93e2be49599df9cc4e SHA512 9a41124ccc8278cb36957c3e5f212b42c3b544754111a224c54b2957cb9f64dbd8e4d75d312552a7b2950f60d4f036f861cedc2ef74480e4c89fe70aad982544
 DIST github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.2.mod 225 BLAKE2B 77c83e0698d95e156b56440e615b3bd0787464dc4bfbdff28ab60d385ade1f4727b6c94ae3665e2d595d8de563266f1009f0123ee0029c93e2be49599df9cc4e SHA512 9a41124ccc8278cb36957c3e5f212b42c3b544754111a224c54b2957cb9f64dbd8e4d75d312552a7b2950f60d4f036f861cedc2ef74480e4c89fe70aad982544
-DIST github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.2.zip 14875 BLAKE2B e763044f0def2a32c976b029ae297027f4bc7433816750efb395cc5bb405b402f528251f5f34728732e8c4a7f30495350862aeddeef92dbb95667b38a17efb27 SHA512 cd33da4583a7ab60d60a53d4b2bb40ef27f401757b463d567ac09398c1ba73c4d9e66a4c05b2acbffae0a9908c1c1c4e3dd691dedc80e470171fb182f76f89f4
 DIST github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.3.mod 272 BLAKE2B 818d275ddd33b4727372861021c98456366f32c053cb90b90158d983bad66226617cef5bb78652e06f3fd5bd67363c55079b67f75e86a738e42e365367e088ca SHA512 98bb330e6bd0291bcca9476ef7c940ea4d73abd7adaffa1cbfef4157355f6c26f1c1a0be1044660be416cb9e8242f182cad2a3e883266ad8a2c047c6f02192f3
-DIST github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.3.zip 15027 BLAKE2B cc0fc08e453a89e6558976f88de9f74deff4df47b248562f8cdbde3d0a9de0bf6f15f75ebdbcce08d9825ab8bb58f13866c297d87f44bbed4b599c7dd46c933a SHA512 b749ac3f02aa039bcaf08f1fa3f28637fba96509964202e73f8e42ac678da9f57ca9399622ad46edb4cf3ac07acbb1d81f2f9e450339a57121e62716d2346e47
 DIST github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.4.mod 272 BLAKE2B 8b12e339f1895690006850e8055651cb6f8df24af0f8d4cf0c1eca57d7e9a407009086cfebda6932008085ac97de923ba0856aaaedb2683b91895fd7c16af798 SHA512 e0a4bed74759c7d140face1360014a151fed68b03c5e0781321777b3d2d8bb8e7e2173d03f8c4bdcef70dd88734f62e39fafe1439fb6829f84102477bdba282a
 DIST github.com%2Flibp2p%2Fgo-reuseport-transport%2F@v%2Fv0.0.4.zip 16399 BLAKE2B 79f0663aa126169e0e693c1099645e6a56246676d7d99c81c8397f76d37db792691a630ca162645375da9f395a93583fc9ec1c7c65cf454fe7a463ba8df893e9 SHA512 05539984fa95babfcfb12005fc5b3a9e9cf651ad76347e2c3108763ec29751d2e0790eb1e80df76c60ed01e550feae2c7e467f5f33eb173faeb0aa797020e7f6
 DIST github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.0.2.mod 107 BLAKE2B 443ce0ada5af2703ce3b3b1e8462c1bbaea680e3d286ad5d26c8de6de0bc130407c2bb91d0455cd3ddb6d38d2d00bf569d9690bcd75ae231893ed2d3b7585cd5 SHA512 803ca00d31589f83dd13694c6f71d90cc8fcbfcd247fc4d160d2bcc23844c5a8172703f6a8c05ef3ba1b294cc1cf9468598449fc52bfeb15e59e6148b38bc233
 DIST github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.0.2.zip 11417 BLAKE2B b14e0a109c2df77e011bb3e35118497b34888931edbcfd50420c0c35e4d279cd51ec2b89163a2c8ad12714181e170f71d3f38de4218ef031395547cd40dd38bb SHA512 330b5aeefd692e37dcc63f09e95433cee63232a4679cb24dc31cc673bf5a9659841769432191f7a5f3c3b12543ba0f47700276abb7fe8b40de74cd5634016d75
+DIST github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.1.0.mod 107 BLAKE2B 443ce0ada5af2703ce3b3b1e8462c1bbaea680e3d286ad5d26c8de6de0bc130407c2bb91d0455cd3ddb6d38d2d00bf569d9690bcd75ae231893ed2d3b7585cd5 SHA512 803ca00d31589f83dd13694c6f71d90cc8fcbfcd247fc4d160d2bcc23844c5a8172703f6a8c05ef3ba1b294cc1cf9468598449fc52bfeb15e59e6148b38bc233
+DIST github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.1.1.mod 107 BLAKE2B 443ce0ada5af2703ce3b3b1e8462c1bbaea680e3d286ad5d26c8de6de0bc130407c2bb91d0455cd3ddb6d38d2d00bf569d9690bcd75ae231893ed2d3b7585cd5 SHA512 803ca00d31589f83dd13694c6f71d90cc8fcbfcd247fc4d160d2bcc23844c5a8172703f6a8c05ef3ba1b294cc1cf9468598449fc52bfeb15e59e6148b38bc233
+DIST github.com%2Flibp2p%2Fgo-sockaddr%2F@v%2Fv0.1.1.zip 11038 BLAKE2B fb3bcc08eae56c47fc8bc0204d3a8cf2a0cf2484c330f7f54978d6d562db465d301d75c3fa1279259ab554871de85cb4df84ecae9088c27aebe6bc223dc56923 SHA512 d74b4eac23d8597307bc9bdff2abb003bd0529ad6b94501f9cc91327cc0c77840c8d6e681aa110f1c2a042ae4153f765a708dd1ce6ea568136fee37beb2a91be
 DIST github.com%2Flibp2p%2Fgo-socket-activation%2F@v%2Fv0.0.2.mod 190 BLAKE2B 0df8f7b13f97917cb7392cd894cc0f667d5ee270b3792eaec0bc686ac087c5e5b28438c3811f085028b60e81941e2dd0062a688d34ad1c852ed7cefad4ac4355 SHA512 18ab3f60f11c8af5573cc7d90f3fd4053a21a3e8849e70379622199cc869c63b0b5155b832cfd92809a54b1419c85b12bc9bb54fb8b6b34c865b71c1eb9a8cba
 DIST github.com%2Flibp2p%2Fgo-socket-activation%2F@v%2Fv0.0.2.zip 7945 BLAKE2B 7f9e2347c69d62c0ee0ab272e5b2126e97f353f86b3cd92ed447c2315797b8a19884d93a6de7bf46344b1752ccb462345d0387cffbfe44633d43c8da981c2ecd SHA512 8839472eb8c3b19cde92a6de3e294fb0d22340d73089b77a60e5b6e66d9250cc78409c1876fed7654c9d37cb62e59119e1c5d6c2a960e08e836f32654647c041
 DIST github.com%2Flibp2p%2Fgo-stream-muxer%2F@v%2Fv0.0.1.mod 41 BLAKE2B 7dde19f4924372e2d1cf22c59330f8eaad017bb70ba2c6e6a7bfa17a76d5ad4108ed4c6ce9f5aca1c6b06b6ffe04aa572851ae8d545779bbc5083f5692ef8f0a SHA512 aaf375a4457cb1ca8237eaef67c627204f1d7a9fc75e14cf0ca5d853880d66ba0837a02074f2f8c1c9b8414a42b5c0bf4d10717b4d20fce7d61b5547c637aaa3
 DIST github.com%2Flibp2p%2Fgo-stream-muxer%2F@v%2Fv0.1.0.mod 139 BLAKE2B c3997e7f037606111660dcb2461e7c1664a36a6ca883645d64791368c1415cd61c5d39828a28ac530e7ba2d3cec85dd62ecd367ed661dc1c26cd19d5fa929458 SHA512 c04a0395231b175a6ff5f8eecca18963362ce60e8e9e5ae650bea504508e8cda77ab9d1adb8f833645475271eaa8c464996aa3f6b0d6ff7de8ceb0f88c15076c
 DIST github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.1.1.mod 164 BLAKE2B 5aa5821c9b0a95ecea7ed18ca4aa0012b239d1c8f7257ba9c087892ed400d6dafabb5486f13539fac43df7d2b7da5ad9eeec3a40929fdf41f5a03e33cbe735af SHA512 655345b387bc4245a4333229f4a7d05f232acdec2dfab84565a9c797a19d5e7a826339fb82f5b9cd014da1b6ff7d3a4d88c6816349a443a104480a1ce43c76df
 DIST github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.2.0.mod 163 BLAKE2B 4cb76e93346e05a850f9ea2520644c6fa62d88c304b82d66075f403bdccfb27c3314ca0356e3024646b913c483a925ddd7164f2ac28c8c5937be47e8295f6d6f SHA512 b30cd01cc062a891982fa797e41a1718a9bbf1d608d592a85e3ce88d3f831fbdeeb4dce748376c53fb38f3fcd70889ec9d1d8e9296c68c88b2d306f987f66d62
-DIST github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.2.0.zip 7035 BLAKE2B 649359306dd8f46a35899b645fe8756f25d44311126e7d4f958382a61403d8a68229a02f260f1e65b9e534adc7a3b581c33d949f8ad30f266807bf4734384a7c SHA512 e4a3acdca2e170078dbc25cf719114875f73e41d742125ab690e452a4de69782846f0c1f2fac578eb5f34cc04e7b0d7875002a29433d7c07233a39d1b06c365a
 DIST github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.3.0.mod 163 BLAKE2B 873d0b56d4e33b660cdc48944a4694f11877a01bc868e8bd53e69eeec577fe90aeb8e7d94f6816158207f8604f5fcc300d49d0c86af41929bef539dea48fdc9c SHA512 a933933773d2a5203a09fd242f3c02e1e31228550cfd3e09bae879f7bd083d8b9b83b4f902d0d9fec569737711bd149f5e8ff50d2c2ce6c05018c37b3378f3e4
 DIST github.com%2Flibp2p%2Fgo-stream-muxer-multistream%2F@v%2Fv0.3.0.zip 9768 BLAKE2B 288939bc1653297134c6ac201f59e424f4a850083808f7e03f05cc603d5bd4f07fce3f5ca9d4240d64664731f1802e7ddb3c9ed4e0951f7db7641610d5a65ec2 SHA512 79894cda5385a71b44c00d463c941bb3ed03233dc8c4be42e6463b8d6452343f2f45329bde681f73b072740bedb4a509fd794d0b13aafe498889317a01753526
-DIST github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.0.1.mod 557 BLAKE2B e36929c1f25bed72d0e109f7e06d7019a31cb844ce8b53fa086af6ee596f711d626c4a2c440b917223dd243ca4c1869d684698fd6317ce6ad2084f517226c5a1 SHA512 da4aa298c426775fe97fb84544e195650256aefdb866b0f40e2ddfe13f0a01a1aa3b04382a25a77d8323af17f6415a0e88681842177c55b1a3e02c76773e1e34
 DIST github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.0.4.mod 534 BLAKE2B 98d4c476e5bccc71fd5745b96b05ecd0458aa791d39adbfc7d15e9e368d4deaa95c924aa8b8ccc4a93e70f0d86e5a62b39507ca71030501524a137fe4897e2fe SHA512 2fe38d7bd67143adf4dc4461112a97804f30ed1b7dd03b98511da65807f5916893eef59d56e483b071b046c5223c99f155db3bc77a746471e57d5b60d3628bf7
 DIST github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.1.0.mod 556 BLAKE2B b894aa7a440c927f1c4486f6f2001d40dea7a12548436bc77ad58025377b2ccebf1bc9a9662d6ac90a1018faa8bf89c82a18ba1d19b30bf189f2e1801dce53b2 SHA512 84b573506ed1cafd95094e61fe111c2979ddcd3300d2af31eb2f079cdbd2193f2299d02f2154c8c980673e4807966e90371165ac9f1d3299d8d3a35b3b8aefd2
 DIST github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.1.1.mod 508 BLAKE2B afa680cce5f40210a01f40304e2660e55e634040bd8deef7284cba455cdba04dea180fe1c3f6e0721a3c0d0a2ea3be08f969a1b8eb4ba72fd0cc87a713f06276 SHA512 ad5f20c8caeda811266287179d6678631af9fbdb77082a7bb3f7a3f7023bce74a7e6dbe7cd9ca6a87e1059ef36a189eeab530842b2ddbd12012027e161b9e5e1
-DIST github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.1.1.zip 18103 BLAKE2B 6f2ba9deaac850cf0b721347286c0ce8e29906ced5adaead1dc6e5df98246020d92fcf56b2f4adb7c899aa14610ac853a8ffdba61860327db505f62047ace568 SHA512 3150e6aab4fa96c528fac7e6bee5c900776e966d5a4459214bebf94a2a6faf10269d766ca7ba34ab92b52bc8cc3e9c316b23aa73c67b44585a62df666dc11318
 DIST github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.0.mod 508 BLAKE2B 7900f753b91a89a7b451c77bc5370dadeaab4b2bf97929f3cf64211bc232b9b6a6e714c5c1e3ccfe5097d54473a134fb281cb70cc3a849d276d62f7026a3f829 SHA512 a4b4573c0c7154eca4e415106876e1399f00a69fcf6b58e67eb01500366d429c2d51e6ae7a46ed26f27f44b98b91fdcfc829f3762d3fa0b9628b9b34d013cc31
-DIST github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.0.zip 21195 BLAKE2B e8fa8002871cae6b36b28948fc88404fd1d4cfb94d7bd59ef70aa9045044c98703dc373d0e923bc7ca5c1a58901f035bcdb4e52db4783010567536d6de36fa9d SHA512 d14fb211a487334155cc9fea647d5a459858c1bcbd8652d4510fe2009af1277794b61c37dc6175267abcd4f5cab92e7d9a5b4290601bab9157d393d5ba046d70
 DIST github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.1.mod 508 BLAKE2B 0dfc8dce210b24b7ebda84d0bf4a1c12a52120a20fc27e3f3135513b2976c030a62ae062de72f3cb93b424018ed347a63d761abbcecefabb245b8eb9d1188e39 SHA512 df0937be6010edb4b81b1da036b8f233fe70c4d9fd4ffcc79b24eda03913d0ca6e5fcf408171d37d41e5e07491e4e26548a7355b2aa4fb3b2aabcd7cba4a3931
 DIST github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.1.zip 21471 BLAKE2B 8514e27acc8c7386112d0422aa0489750370c54fd95850b09f1984c9bd72b6876f4350e99c0f1af333d04dd1331de81e877f34a4f36e1a1caef72510341142cf SHA512 3649b11f80d9e892a8db7543ba61f7832ddfdb5b26e2dc1c2f68d613a7e5a4c11ef668dcd486e1174f9b9367783d1d43669fb932f69144c3a167d0138bf4805a
+DIST github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.3.mod 740 BLAKE2B 32dfcbe684f3f3388052a10f6ff29f3d8dc2062461776102b9a5a794c6ea6af68f2ac08376a305a08520d238c1c658d4abc0f7926b01d64e9b83713ea793103b SHA512 602c2742cb0a24d476c2f41c7add995f6aa9cf0d2db4a0948d39c65462fe4940044fc3d81e8d04119ddff1bb1c902c377f76aa28595207d64537be33fca1842e
+DIST github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.4.mod 740 BLAKE2B 32dfcbe684f3f3388052a10f6ff29f3d8dc2062461776102b9a5a794c6ea6af68f2ac08376a305a08520d238c1c658d4abc0f7926b01d64e9b83713ea793103b SHA512 602c2742cb0a24d476c2f41c7add995f6aa9cf0d2db4a0948d39c65462fe4940044fc3d81e8d04119ddff1bb1c902c377f76aa28595207d64537be33fca1842e
+DIST github.com%2Flibp2p%2Fgo-tcp-transport%2F@v%2Fv0.2.4.zip 39476 BLAKE2B af75f7508db444dbd8f1d72a810444430659cdfb7b72b4be0189abf94218aabdc1188937b5339047076a0022679951218ddb739a141a52ca9998a9a895fb8331 SHA512 fcc68579844e8699dde1af9cf3d552db9b6d3714b1e852c0b9aeb638e050583baf6ca365d373a4ca6234ac4bba4c79bce90a70a2c90059064570aba8e8e25892
 DIST github.com%2Flibp2p%2Fgo-testutil%2F@v%2Fv0.0.1.mod 224 BLAKE2B 3703bba0bdfdbf377beba4ba79fe2df2a9f2eb4f9d3d38bb7eae3dbc0e920837fc7125984377142da6100a72a74437bd93d4a96bc80d65f6355521160ba2546f SHA512 7158c0bff3e8a95b9e05be3d2ce5dabd6220059e1c8902ee42eefc26f05f806406cebf46038d7202aa1ef71cdd631ac72163530feef94df8cb23b31deca611ab
 DIST github.com%2Flibp2p%2Fgo-testutil%2F@v%2Fv0.1.0.mod 245 BLAKE2B ccab27cf3ba7ef02cf1019a730a37f4f0998d3e28e7e96b86a54df7c314ed09fddc129db083e9ad38bb9ba716994598c9832014c6287a7891f6a105ff7492773 SHA512 53758b00d58252492edd33633fd4be6d4367321328568dc67221560230e0fefe67e29cbce5d7dbf7c830381963d71338e96267b381a8062fcafaa048f35af403
-DIST github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.0.1.mod 474 BLAKE2B 1b4f45cfcd6170e8e5f54ad3a5b100be3d0636da6727cd5e7b632ea7f177511b9489282a3bcc3604bc2966886229bbe4e76360fb1b6e47439041192fdeb018c9 SHA512 7b3990c90d76f421e8a03be51c68cea9c48d24e54c8f45b069657df670d2ff1fefa6ddc516035871bec5d5778f69bafbaf86af191274f081964c53b55dc92dd6
 DIST github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.0.5.mod 451 BLAKE2B cbeb1983312ca463ded853b34f074cb983afbf384cef2d006179fffbe991b859d21e73269514990b32ff441bdf70d14c87e520756aa9fbad3acda9f9d3426b99 SHA512 a18f85536fc00b26139df8afc39eaf638f9309bfbdaca2c38a123cc4de1d723d8aa6356e0921c551a299adac340450c4db80d07cef523db8b007402e75bab996
 DIST github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.1.0.mod 406 BLAKE2B 7f361ec54e80f829f3608ae5154e08ba5622824ee93a2dc70ba7f4a0d314b683363e4e5a047cf7fffc383059ec7b3cef5918c70dcf1bc8c5372c604fc276e691 SHA512 c4162953440ab7b7650651d440523faae587b1d72ea302c615e79d59acc5ed9325fa7cd1f4fc804550dc36c722dc804b8f0e3225dc7ff62548365bbbe7cc56c4
 DIST github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.2.0.mod 481 BLAKE2B a3d3cf995649b54e92d9a6382dc9dbc864456e610016a367f3bb28ef178b235e70ea61cb6520e6c1b53dd0eaa6a73e09b31de047d3b7b214d57c02d0564fe377 SHA512 9541be02ec243b78fe9d2cc71936dd6ecabbf86e4750a488aabc10c63867c7f6ba4e551c4ad4595dc47697bb67a523f45f4f24ff158aeb9fff837823b8942803
-DIST github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.2.0.zip 28018 BLAKE2B f1c7a19ea54570145d9e89e501b8d2bfaf624782bbb407f69f143794c06907fceb6b043b92b78d0592d435c1f907a6cfc39765c4098acd4b9e4e901d3de1baa0 SHA512 dad80bdf083de231b39540e2a0be04f4f5bc880f2f5ee3d0e80f16cbaea33fdb6375795a48d2a30135656f20ca29c79c678f03efa17dfc5b6940b24eff71d3c5
 DIST github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.0.mod 425 BLAKE2B 39306d94048c87fdffde14a0692a624f625e957102138ea46b0c999dac26144b569b0a0168dff5b2b957e3ca0712cbda1105b4554a2fc48e8cf35223d18e5b12 SHA512 51a8d04bbb363a38d37ad7e2e63023dece7e966de1df45d7ccb681992597a9aeb2e8e97be739eea030810abf64b54175374f7f265b507df16fdb3faec0d594ab
-DIST github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.0.zip 30371 BLAKE2B 6dd64f2af7d29de58d5888250032bdc0a9294b72cb4c64829ecbb5fa65bcc2a11b273293758ea4debed500878103c271987961f921d1cfa3a0dece1ef090f31f SHA512 afcb691d871bd5103e70a2dced068442dd2a300f249065e0b1d0067864373f88185a86349f092daa19d7be9ac214472395e467de679fca98237ce7bbcfd86fee
 DIST github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.1.mod 425 BLAKE2B 39306d94048c87fdffde14a0692a624f625e957102138ea46b0c999dac26144b569b0a0168dff5b2b957e3ca0712cbda1105b4554a2fc48e8cf35223d18e5b12 SHA512 51a8d04bbb363a38d37ad7e2e63023dece7e966de1df45d7ccb681992597a9aeb2e8e97be739eea030810abf64b54175374f7f265b507df16fdb3faec0d594ab
-DIST github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.3.1.zip 30509 BLAKE2B 787e66d8dff27f3d049ad15e5790def9e4e569a66764af25aaa86b0d66dcbbf5661a80be296cd3381d110eb1a6c8408eb429535a416b6fbdcefef177bb33bc8b SHA512 42822dc71a1381222f7afbff293fa79ee47979b6d1f48404f54bbda6c3cbd0e7a5efe62e187e2c6307f556803b30547376806b1b3fd7f0a43a3a1f4d4ac8eb3b
 DIST github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.4.0.mod 376 BLAKE2B 0445f5293eca15cb13cfb737785883018c6438a035fc59595518512f3a955ad301342e58c8fb88a813d044ac31e3d72f677a8af8070e5f07982202301fa3cb58 SHA512 c7ee6fa591ef0bc3d122bbcd4f085f6e8838555253e6f8f5a47e0688bfe3546ffdf53ee969c4373235edf3984bf049a3112af15115c96555f53f3d82eeae0cc7
 DIST github.com%2Flibp2p%2Fgo-ws-transport%2F@v%2Fv0.4.0.zip 32267 BLAKE2B 9024d450324ec16358ce17c0cb19c239adfcd9b3d0e51763f9c25a1e1daaf53f67817229c1fb91f0e537a144af334ad4fe961864503f387792fcff14517e7b13 SHA512 f37731f27957350f67299d1cc0e05eabff2794e65b66dcc9afc2b2d8f5848bca01ca8bb41a3db6d4b54b4750014a35cc643208f674f3562d5d593fe4122c9a14
 DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.1.mod 92 BLAKE2B 918406dcee85b96af3dec73ac72da981577598bb71d0e04cc55ff7391c50b93da71220ec13c05c36cdf226b6aedfe26a6ac45cc4e082079a227971acea1d8a92 SHA512 296f048d4a4721418b9b71bfa782484673985b332d65c739c522277f525b8764abde6c83158fd6a4b06b120b659a557994ec790ace203a257d48177ea1953bdc
 DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.2.mod 92 BLAKE2B 918406dcee85b96af3dec73ac72da981577598bb71d0e04cc55ff7391c50b93da71220ec13c05c36cdf226b6aedfe26a6ac45cc4e082079a227971acea1d8a92 SHA512 296f048d4a4721418b9b71bfa782484673985b332d65c739c522277f525b8764abde6c83158fd6a4b06b120b659a557994ec790ace203a257d48177ea1953bdc
 DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.3.mod 92 BLAKE2B 918406dcee85b96af3dec73ac72da981577598bb71d0e04cc55ff7391c50b93da71220ec13c05c36cdf226b6aedfe26a6ac45cc4e082079a227971acea1d8a92 SHA512 296f048d4a4721418b9b71bfa782484673985b332d65c739c522277f525b8764abde6c83158fd6a4b06b120b659a557994ec790ace203a257d48177ea1953bdc
-DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.2.3.zip 31713 BLAKE2B 3f0c9baf5542088304936fbef43cc445bcd09d04631e711ef3d1552c9794381dc89f558c2ccb390b5e7f2ac2e94fb6744a00055e827566a7b31475d78ddd4aba SHA512 e628a75cb507db1c5cfaef22ba989148e621cf60e07d6163b67cf02df2bd650953dc7966e37697c1b98ecea9bcd08253487a683df558a5f66e83f82c4a4b1f0f
 DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.0.mod 92 BLAKE2B 918406dcee85b96af3dec73ac72da981577598bb71d0e04cc55ff7391c50b93da71220ec13c05c36cdf226b6aedfe26a6ac45cc4e082079a227971acea1d8a92 SHA512 296f048d4a4721418b9b71bfa782484673985b332d65c739c522277f525b8764abde6c83158fd6a4b06b120b659a557994ec790ace203a257d48177ea1953bdc
-DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.0.zip 31616 BLAKE2B c2a975c24903db5d992337f438ec6c8dff39969ccc0c20f59abcf2e720f218b8cddd617e3468c9227e83c69cf573daeea10894b2b9ad135bf519ad2550dfbcf7 SHA512 80f7d3b9e47c9b4c9faacbe8eacc6546efd866f84027c57721ecfec4840b561209a7d179cf6cbab7c7f429ecd6c2479cd37e7232ebeb25c0c26240a785618ceb
 DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.3.mod 92 BLAKE2B 918406dcee85b96af3dec73ac72da981577598bb71d0e04cc55ff7391c50b93da71220ec13c05c36cdf226b6aedfe26a6ac45cc4e082079a227971acea1d8a92 SHA512 296f048d4a4721418b9b71bfa782484673985b332d65c739c522277f525b8764abde6c83158fd6a4b06b120b659a557994ec790ace203a257d48177ea1953bdc
-DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.3.zip 33746 BLAKE2B 6e029c4a5a1dfd5a8ce9d99cb1cb9876f793e1e5f539cfb6e6da27ee43f271bd2eafd9fb70f6a4f132d5fc9e62f3b46540beb207b3c9cdf71729e99ad2258bcb SHA512 35c23793764f68181eb77d7197030fe1154c67d4141fba5b4d20dc7c1b3ff555482567e2de19e0d4c8d28d846cf804371ea3193b262de1d0e0b1aac719d142ed
 DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.5.mod 92 BLAKE2B 918406dcee85b96af3dec73ac72da981577598bb71d0e04cc55ff7391c50b93da71220ec13c05c36cdf226b6aedfe26a6ac45cc4e082079a227971acea1d8a92 SHA512 296f048d4a4721418b9b71bfa782484673985b332d65c739c522277f525b8764abde6c83158fd6a4b06b120b659a557994ec790ace203a257d48177ea1953bdc
-DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.5.zip 33596 BLAKE2B a855084aa0ed6aa53874bb60a73a735c0889e5a33bb5db6791fdc120169949a3ff0a395ccf1b678714ce59481867d28c03ee5410dead0b35fce0edce06cc83e7 SHA512 d48a0db22231c65391dab315afab88e96c0018a2a56a89497b04be2d4e1255d1a21c806b4fa6303d8a3eff35eecc2796cb2230e2c152ca26a12e8cfd1966a946
 DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.7.mod 97 BLAKE2B d476d83340b094779cac233dbd4ecc00654cdb9c2def657288de66eff594bb85710592c82c7ddc512defcda42d19962f574b422a97e580500e0a358fd0443690 SHA512 b76ca092dac3df061ef31d82f97556b269086b13e9f2e8883d20f0ffc363b0b3ed44ed48aae3106b9290523ff07095a5635bacb947f733008eec6257e35b822b
-DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.3.7.zip 35705 BLAKE2B 9e26172b5a3d6631770046aab2c20fb4972c544d127c98365c5cf2a6ae43a470bfd15e29be8393a7471c6875a11590b420442a5eea57a593f384b554e3a5bb03 SHA512 1c3627dba65505aa632b55c2192904e1c2e68403e115f97b4348acbae7085a5aafa1272fe56a8c616c2f739f717dff47cb52c54a22a805c1b395bb15f8c59608
 DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.4.0.mod 97 BLAKE2B d476d83340b094779cac233dbd4ecc00654cdb9c2def657288de66eff594bb85710592c82c7ddc512defcda42d19962f574b422a97e580500e0a358fd0443690 SHA512 b76ca092dac3df061ef31d82f97556b269086b13e9f2e8883d20f0ffc363b0b3ed44ed48aae3106b9290523ff07095a5635bacb947f733008eec6257e35b822b
 DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.4.1.mod 97 BLAKE2B d476d83340b094779cac233dbd4ecc00654cdb9c2def657288de66eff594bb85710592c82c7ddc512defcda42d19962f574b422a97e580500e0a358fd0443690 SHA512 b76ca092dac3df061ef31d82f97556b269086b13e9f2e8883d20f0ffc363b0b3ed44ed48aae3106b9290523ff07095a5635bacb947f733008eec6257e35b822b
 DIST github.com%2Flibp2p%2Fgo-yamux%2F@v%2Fv1.4.1.zip 37526 BLAKE2B f5f45985a2b6bb5c9c99076a52fdb850400723a2e69242bf688b1f182ddfe9d1caa3996050f25c74b1ab8a82984d7a6450ac531a20296c28ae0f329ca9393e27 SHA512 43fdffca6295d5c38a85d1ba974856614bd875d30917413c3440f6a1bb69d0204dd1b76a2f0b76ad05f5471aea7e0ef3ff959e32de6d49a132f908a23f537f75
 DIST github.com%2Flibp2p%2Fgo-yamux%2Fv2%2F@v%2Fv2.0.0.mod 95 BLAKE2B 36b7bd836568d9126f3b0ab1801f3cf0e55d66369dd978ea4a1a4ed470ebdb264ee5bce98ba7419e789156fd0943005796eab9e7288e7696e320e82242da38fe SHA512 e21ced9238d80de65d3d68c9cd2c0ca244b37a7634d93b0b85882d755674525be69920b250d77e2edaa5adae1eae0d924f60c657bc848a982a670bc838b37493
 DIST github.com%2Flibp2p%2Fgo-yamux%2Fv2%2F@v%2Fv2.0.0.zip 36932 BLAKE2B 3c09366de758d6cf817238bd9861554c4413001c54936f74a204b4d311bbf8b4eff361d732838e5d09d387cf4727c8cecd546e1143192d18e7b523eb640ff6b4 SHA512 9ec4444a243f2ebc8a459e673e0f78a752f6e74a8caf4ca9f1c30be8c4edee38c7091d658e2a02fafc67f2f871d17a1abbc5e02b834d8826bb48ae3424903dd5
-DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.18.0.mod 761 BLAKE2B 39680bc99714d194fa22a44e4f163d0e3c9b575a23fa359d5e591a63f542b11b703d68df1b3fac5b0b798fc41179ab8f711a64cabac5376e664000812a952ee0 SHA512 bf0c06b3495d22616ae3bdf7de7fc80fc5594b231bb20ad247143028b9cbfc852e6032cc9aa2641fb10fb9a0a599a6040731ca3aa1562c26535ba6b2077ea9fe
-DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.18.0.zip 731256 BLAKE2B f0e7af8ca89b7b440ac5c0a49e952ea4acf469b48ad33c92bb3818ca5d0c24782ff4238818c203071dac7c0a24a559318fa6f6b2c6d5d29d74b3101e840742fc SHA512 c19474c55c571f50e4556dd8a7b1778d9eb24db323e2ec92effc1189695e6be2dabd92708f2c500f5c85a5ad7ebc1b335d31271d16e4be0d2d9475f59eaa456f
+DIST github.com%2Flibp2p%2Fgo-yamux%2Fv2%2F@v%2Fv2.2.0.mod 136 BLAKE2B df3ae2af97971f748515b14d8d5504620288ca71eac30ff675df100bb67af2aca2ba37aa37d3cbd873c9f258f3d2248f30b16033be5297a1835c324b8b03a8aa SHA512 e0c97b98d56c247dfa85d8a5b481d29f6a553160d03be423863015bca946d392bc59f41c75c8df9da0b09b516aed5c9ae721c9162ad473891986e65563a0e59f
+DIST github.com%2Flibp2p%2Fgo-yamux%2Fv2%2F@v%2Fv2.2.0.zip 40455 BLAKE2B 602769684ad68c5d28f982383a6aa77feda00341b191e71a1b20b082a686a721d0372c738ef936b7cf071ff0a858343d34e5e1d6d717321f6909efe4c19893af SHA512 32aaf520fb1cb99f1e2b4351e195264180f831d10c1e8e3d501ba53c15ef75170c2e5e32a94845f876e49b5cbd7cdbbbe01da23d93d8fc4c6ce3a91577c7e47d
+DIST github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod 267 BLAKE2B d2298b42ba1b8aed99658a846dd1ff5cadf5403411766efaa880ecd043a56703ac1089ea5edb04b391d710d99f9b1a1471628043be868fededf189130bf852e4 SHA512 76b19a140339b43774f3df87d1de97dd4bbdbf5939f523fe39faca051dd2a4b9e719dc147a0a2f931fd30871c30eb6a628d58bded12271e04f6de5d9dbab497d
+DIST github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod 414 BLAKE2B c0bcdf3e0a6f510eb3649030349e26c3d78608af9ea46150e891c17463491da92c544562b60cfaf35b8e6e11cba5b43bcfe0a8bbc3e3cf7832ba6114ba8cd9ae SHA512 1ca2109c477bea717b8f66a2d57c35373adea2fcaf4223d85770be21833824334e4f9010c1257db95e345d1fcab540c96a40e9abd7bb51cd993559c224e79500
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.mod 814 BLAKE2B 110bd6c2e87e936b8574c0bc0a765dd34cc747c238aa88f6e595cefeee516df985bba5a21fb9dc9d871e543b097f08f413134c16d22e18aaddf5427b88de1199 SHA512 3c8afad992ae7ddb5a98dc28d410465b8b46e660f69957fb8dfe3451ebace00bbd8fb7b9ec9998ce6129df3300b2eb8153edf26181641d44f9c9c063225b62f2
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.zip 728621 BLAKE2B 74936af3fed3ccaf9ce932a8b75b5dca7c23fac9295dc69a133277da579ab9e5b6203e3dc0fbafaf8ee7fa84c514c2e347d8e527bdf466836b12d1392765b383 SHA512 791bb623c9decfb027bd450b7f789616d737ef7ddbe1b4a89b33e9167dce8b65be66820fb82171ffe30a8ace37c9ec14060cc936d33a2264f08d160aac33266d
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.21.2.mod 697 BLAKE2B ca7272f288d2ddc7d207c4e07aabd3a7ee72ce709bfadba36543c268ff260e7b16c1e2df4eb280a042df02b8134596fbaaac8502924d56283c5be4ffc62d8bcd SHA512 f09e4799139ba0a0e635ba159b6381205d8b1ed98073dfb7a5760817a7a43ad330c79d485c8a0167ab900795feefb9c9450257221980bc54d81b44a3f8d958c5
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.21.2.zip 744841 BLAKE2B 185465c601ae7bf31411b4ef488a84c9c57ab2ec33de4996d6eaaab977fe62b5d17264dd84cb78a85084855f3882dd716159709eaf106bb17baf90816e972c9f SHA512 53ca5aaa23df41b83795fc6afdcd1d2b910e33e146393f20751cafc2050ff8a53e6795e0f307bb81d54eac741603cbbc2f3cd8ccd2ea1408d9a7f4fd061f6a9d
 DIST github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod 37 BLAKE2B 0d60c4f85be76a6a73bd4b6403a73e12378ceaebf9dd48bba245ab0e14e846bc1fb480671f959ff56d52c5e2b41db8de0804d4258fb4cb58d6b0c618c1401104 SHA512 6a0913935e88940258478e250207882eb1df8727e18e66419ba5d4a06a0b2c8691642ed379d4b4ef16df715893b35e59d1e967d5276e6b0ea75b1f481e852a65
+DIST github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod 43 BLAKE2B f49107f68b9d73c573cfe976efad9dfb5b4555aecc4b15eb4b1592d1ced4cd1cd09f1d2483e7476f8732dd1404a07d9d9a35df84c944cbe21b46409dc5802265 SHA512 f4286a907eaf928904461716aaec3d5e58a826f2f50c6568f70aacd2f14c9d226bb633ebf9fbc8e492961ca23f459be0c49b1ddc644fadcb7e90e99818fb03bd
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
-DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.zip 107870 BLAKE2B edf45f679d8c1bb83441f243feb0b31f19f88759e919b333c82e4a6595f8612e5d1c9211ad2b41b8fcc95646d6c546f10eb9a21f146634cac0c44e24e2b178e0 SHA512 e7ff9d061aa69f1f62aa3f64942a7a4fb7d515ce112d9e5502d2fb041fde4e90b38789a4fc666e60400691e2212737b779dd0f0d9174bc6892002268ba430f57
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
-DIST github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.0.mod 178 BLAKE2B 1044039faf6fb3c3d61c9b00ebf83caa7812cdd7b7787945b7f9f106b88899906d646a6f00f81361e14aa48e053a2177309cd59f1a63cabb706a832d5a7cda6c SHA512 3db41fe780063d019ba2e84c08116f754f5cf6de31dd4432364c7f9f808d802218d3eb039e10eec0dba6fe6ab836799663c5f3789a12f308605d0a52934a2960
 DIST github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.1.mod 178 BLAKE2B 1044039faf6fb3c3d61c9b00ebf83caa7812cdd7b7787945b7f9f106b88899906d646a6f00f81361e14aa48e053a2177309cd59f1a63cabb706a832d5a7cda6c SHA512 3db41fe780063d019ba2e84c08116f754f5cf6de31dd4432364c7f9f808d802218d3eb039e10eec0dba6fe6ab836799663c5f3789a12f308605d0a52934a2960
 DIST github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.mod 201 BLAKE2B 12946a417b352c690b676012121a26e6dd80839e5bd7452262488044c17988fd094b1e1fdbacb5c15b156a6e50cc4604434c452a75c97081bee15de827ded57c SHA512 df90f7153c82b58c2141b2a59dc4b1cf145cdc99cc1b2eefc881a8924235c02eb5ba39795f394c4e90557fb3f74a79abc98ff66d07e4f915740a63ca0b3f4180
 DIST github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.zip 578850 BLAKE2B 0403309855bbfc905bc149f1ebb375f5b7f72eb7e432c18dd91dfa220f643d9508bbb9500597ecf8b2ab6f96a71e19aa752a67999af84853a5fa55cbad8c4bc2 SHA512 2b8b9631ff73a30f6590ba86a21a77ab531fede897a23658d3d7720b24da008006178e225725eb46605b968e5678f5d5410dde24a4b10d9e0b404b53a1c284a0
-DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.0.mod 207 BLAKE2B 5b3d5ad841a5d0141a734651988d7d4fe37edf8f0452606a9368db7ab760986d6910a62c1f9fe404c02eef38f24b01ecb89da7131b8dbf29f771032bf0b26306 SHA512 a1596052f6915fbb2d54b6d5ec302f4005630d26952d42dd645a9beb62dfe65a80715a0de4bd64b04712c40fa3d67bd6ce4abd0c98a07ec0cdf37281ffe91f9a
-DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.0.zip 589816 BLAKE2B 690313edcd713bf57bbb66b18922d6d6d5a94a68bd4321c910e80b69b7a2e1f8c24ebf7ca1200e96027d603578aefd02e4036c9c02229457da2998269e4cd8d2 SHA512 ae2f6c302772afdf93cdf44f51c9c7c230da984fd2ff2d48715f522f6bb5a37f7ad8129eaf654c1e2ec1f4e018ee9296fe8d3b1f73a0c35313b49d0137a20b6d
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.1.mod 207 BLAKE2B 5b3d5ad841a5d0141a734651988d7d4fe37edf8f0452606a9368db7ab760986d6910a62c1f9fe404c02eef38f24b01ecb89da7131b8dbf29f771032bf0b26306 SHA512 a1596052f6915fbb2d54b6d5ec302f4005630d26952d42dd645a9beb62dfe65a80715a0de4bd64b04712c40fa3d67bd6ce4abd0c98a07ec0cdf37281ffe91f9a
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.1.zip 589961 BLAKE2B 4f183f3164e6b7dd14c868d2999b31176e68a5a8b5614bff9c170ec41f27a9fb387243aa3b6ce138afc462ef129f2352587d11c8def51ed2565dc1c8c6bb483b SHA512 b2537252e8de3295e2fe3f64b6141686c822b371536eda638be7d3754e3d805c43b6814942c7ce16ac995a478bf321f7161f52d9a96705d097ba0e69d533317e
+DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.4.mod 207 BLAKE2B 5b3d5ad841a5d0141a734651988d7d4fe37edf8f0452606a9368db7ab760986d6910a62c1f9fe404c02eef38f24b01ecb89da7131b8dbf29f771032bf0b26306 SHA512 a1596052f6915fbb2d54b6d5ec302f4005630d26952d42dd645a9beb62dfe65a80715a0de4bd64b04712c40fa3d67bd6ce4abd0c98a07ec0cdf37281ffe91f9a
+DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.5.mod 207 BLAKE2B 5b3d5ad841a5d0141a734651988d7d4fe37edf8f0452606a9368db7ab760986d6910a62c1f9fe404c02eef38f24b01ecb89da7131b8dbf29f771032bf0b26306 SHA512 a1596052f6915fbb2d54b6d5ec302f4005630d26952d42dd645a9beb62dfe65a80715a0de4bd64b04712c40fa3d67bd6ce4abd0c98a07ec0cdf37281ffe91f9a
+DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.5.zip 589922 BLAKE2B c9c8041d110dcafe7df0fd532ec2435e3869ba48643eed17589fb48625981a61bb39699a88789f1526085a08372ce6d803bb5a2bb805952b0bf5ff430edde5a1 SHA512 dbdfd1395bc50605da2f7bea5c1aec1f09d0e6f097e1b2d986fab925e073e972eff5d90937c5c92f0347b97be55dece1314d6799c2142d491b85f67428d05105
+DIST github.com%2Fmarten-seemann%2Fqtls-go1-16%2F@v%2Fv0.1.4.mod 207 BLAKE2B 88686761625cc8faa400c84dcff15769a2dce8f2557ad34b2c3012f8f52d5f287ff8654bb0c6ddfb389afbfc8d473f5d3e707e10d281136ed20bcb7ddabc189a SHA512 cd2717403e092ca6f2083031ca3abd1d26c0b8b5c73250e6f9ecc4380ef61147a85eb98bc5d1e8879b2ff2850a3a7622c8a56b57c17b7c48cf60d4fc229258d9
+DIST github.com%2Fmarten-seemann%2Fqtls-go1-16%2F@v%2Fv0.1.4.zip 589598 BLAKE2B 1fe2f3ba3918c35d457b474c1c1df604446b1f138f6b1d489e65410e51b1759885520769e6368d4d8bd133953501782bbd862040b71dce9d73dbae1708171723 SHA512 bf432876f4e7a3d18d2e53f65eb79ee4e69771b77016246d7ad843d54b8ffc8ee50defc7257535763e81c8692c42e3ee2bf3314039a96f0a36757c60926614e1
+DIST github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0-rc.1.mod 265 BLAKE2B 49ca5d356079ead8dc4a49f38f4eaf1feb67bb0cfe083d0376f024b15c523f2ddcc970c6f526b883fd8815a78308a8ec2feebf90920bb33600ddec5cc062c04d SHA512 59e5b0998f94410a46225005f90d4f9099785ed09214c93b2436e854342a5565c454d5e499c52a55de7cef6832d8a6b541d7495f332cac0aaf45df5f17d753fd
+DIST github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0-rc.1.zip 598543 BLAKE2B 1359c71d62d5fa6b48e14d5bdd63475442b5cd35fee36d7634d2605f024bb7632583e571e7025fdc95d21dc26da6e690463317630b3c76b8f39ee7db7c3334fa SHA512 275e646081d13ef4fe9aabedad7b49947e72e41bb6578c6a4e1381fd385f2a2445c7f90bf0bfaf0f9b6bdb4ad5694bd7c1520644827a636694dad68ffc5c36e7
+DIST github.com%2Fmarten-seemann%2Ftcp%2F@v%2Fv0.0.0-20210406111302-dfbc87cc63fd.mod 293 BLAKE2B a49b7ca0e96db60acc326459ea3004d4c04f14fa6d7aa55b108ab5b2e81b97a5a4110dc47b2bf6ab5317db029ea33271360ed49657ca8d5c01a25d53b4b9302d SHA512 a87cfd6b681edd3074ce03aafd77e0bea9168b0294eee2e83fa6c7bcef96b7e8fa0532752c4619a94ab3ed94ff819203b4e7cafdf36eb49c6e362c358cb6b921
+DIST github.com%2Fmarten-seemann%2Ftcp%2F@v%2Fv0.0.0-20210406111302-dfbc87cc63fd.zip 40826 BLAKE2B 3e6560e94b3b639b4237f5ce3ba42c7793a68448941ce24be3a9c7a214c1f31b05614987f8f66907992247bfd2299f33f865616ef972fabefbac6755499bd495 SHA512 6c3858d85e70a3708fae66bbcc42a314b478c8ed97eee8a4c5bef46efdb8a6523723cc6af1b5f6810025a1328ffb708e3da418f4df0e171448bc6a1d7de8035e
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod 80 BLAKE2B 60990a438d80f62d28312e2ca1f07f9ce277b9d9d52ca762201f9bdb4e9bc72bf7ae95b40f1a249126f70db8f296059bce4d7a098e82d2615186e1267e51eec9 SHA512 89a2e1340f04d1aa40eacc84c94ae2723fa34d2fc5772c60bad2d7e00512adfd5f503896aee75440173037f4d50ceaeb98f7266e80284f29ce00692d15bdd2f9
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
@@ -1023,11 +988,13 @@ DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d6
 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.11.zip 8885 BLAKE2B a9d15d5bb4264391abb906ef4b8ec929ecf61d0bbc781ad37aa36e236cf92f5a97f2035c0c08bb49c85142df10ba129c4c1755ede5bc8ec71743300f60af3d47 SHA512 4430b33d70f0fe35d07aefd6320ca0d8e49b71689d93b49e021e1893f8f9f043f8a6d16705e5517a600a538b3f35fed8f14a69a985b2955e8b6f34c19605c83f
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip 7430 BLAKE2B becaf402e397202c86c156c3a5b7ee8f785290ca134d87cb36106a9496d18b1b45e97d306c6280c7186976a18307a7ef04d6ffa29a2e6cc2a3dd378fb400ff44 SHA512 1a7efd886840455b37b44b4d0c048b457eae14e509a740455db995e84c98f8fe94449e7dd11c544ff241e784ebeedf0f60c87838adca21fed08146fa3adeeecd
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
 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%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
@@ -1035,13 +1002,19 @@ DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 4437
 DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod 29 BLAKE2B ced49475e4e8b7199364d477553bbdf91390d5969a6840e688e9d24d70afcf28ede7ef8fc09c89f23a32bfd65bc0bf9f9b58261b693e5162189e37be03bfba2f SHA512 93e7d64e25fc66cfcf514bf546e618198e32d2c35fadaec01684e9488489b484ee402efd301435eb2f725f086ea851ff0445fcdd26775848db3494795a09183b
 DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip 7444 BLAKE2B aa8d4a83365fb9de2c184015be855c1bb9a82772fc154390a13cf95bf5a755beb3544111e90e02121e5251729bbf0fe072de7b6f8f8ca6eccb2585430e88a839 SHA512 fcd99a4e9294362485d8f1f66283416c53b3079bbfdf3e9d1849fc1a9ebb61970563a9fe479f84fc9037f1fa7b820291026cf4072a3c81df2555876d02d99eb7
 DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod 42 BLAKE2B 1d5bc998881315c3b4507519cf19774b640d614dd686c11fdd8a9ea8f75b7c361a5bfbf13e4d005e768f6d8646a774000e3eac16d817dd7ea2d04f617c7eeab3 SHA512 c3fd7d7dfbb06289594cd16f09122e73d8882153ff54e1fcdf6f7c009c244fbbd7eae3f30154207f99a06c3fdee761b74cbcc8423131f714c626556d75ecaa94
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.12.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
-DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.12.zip 210318 BLAKE2B 5ea827599968ec234e9ac782e03c9e8572faee4e1106a67b77a49e0b69c19986486ffd631ec3ae2b08bd5551f844a2491dd6d6821a26f28d9eaad266c6e28d99 SHA512 742af70a48adedf9af2f09e0b6c62c7baf6a155a5724bb40e730b2ee6a649e11a3ddb3d470befd723846181917250307ba20808d30ce00e9ef68ceb7f1f4701e
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.28.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
-DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.28.zip 218729 BLAKE2B 9bf5e20fa089e56483c8d1fcb4d1bde5fe64d0905073cdb4360282151ba3776d1868b48c1918493cf46c0d5ed3ae779de0dcbd8d63f04c6c3c4d45e6ec0d674e SHA512 d4ae3b313247bf4308b61057bf729a7c39fdb4fb4840064f53589fc98d50dcbfae1bdc9a1262b9489df708ea16ad0826e90f7db7d9304e724a303331c1060cd9
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.zip 224434 BLAKE2B 7719d75840f11f1c547a91228ea7472b1774560966f9b456aaa3c19095e9bfc51c4e8655aa0a0a02590a52f0b06c2ad6ce3c0994d23d64f5a324539d7a98eb0d SHA512 d60802ce85252ea35f932efa2c04e10ab19bb94d56e6e7c84b1c41b9a43124b9b9e082f0eaa1ac7c903f31d70da9b8bb1f537edc71c0dfb19626226860d52a4f
-DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.mod 210 BLAKE2B 1f8fa2bba38f34095585872959f404b3a82f4ccf4d7665f86fa573ad62634420ac4efc8e5eb99f3a44bd6cb7aafaef7b6f4e4202fc956e36eda54d1500493702 SHA512 b4eb091abe317866a323b709143ab9c8c806ec52d14a05f6765e6be4ab33bf1bf8c5977530e017a72d668cffc8878f93f7ad89bf9241817fbf8789452e66e544
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.zip 235845 BLAKE2B 6e927f0d5a67ef81c17db697f4b0e2a804c7699aec395229899d4f7b8a7dac9dd2e062cffa7bb0e457e9be1276e709e79bcbd9165d762211e8d2a11a63a6d446 SHA512 536fbe2a387bb4f771762a6575d2dcdd970568fb7f2f3b8495abd4f0cfc5edb3efc3f058aa162948a6f33d91066257832749a72c212513b1f7cf13a704072ca7
+DIST github.com%2Fmikioh%2Ftcp%2F@v%2Fv0.0.0-20190314235350-803a9b46060c.mod 29 BLAKE2B 9ba66b20cd41cca4483e18652d50ee9cb9326dda366199167083f384eb3c73fa47344c773e17d1911d6c7848794a4e91c3fae8c25d1582927c764b01c5005ef6 SHA512 46f7c9f8cf492b9e03f014f95ba57392e46b21e24b4b67f445abffb92318a41aec6eb528a6d9d492fe05d8b5acb65710ee9bbe9e3b75a031d927081f28858aee
+DIST github.com%2Fmikioh%2Ftcp%2F@v%2Fv0.0.0-20190314235350-803a9b46060c.zip 38666 BLAKE2B 27b13f8fe5e3b109ae0f04f08816990b89ef29c63d0810a30d5c089f31d52a275ec6dcdad9703c84ed45aa9bc0dab37426553754b9d94eaa8126f43bbc013f24 SHA512 03a8ea0601561910e30f3282ad9b5a4f4b574781d8404832de357e89cd360ba4aefd082c2bba00f5b30e62792f880677219b89bd9e33cc49234a9bc671789eb5
+DIST github.com%2Fmikioh%2Ftcpinfo%2F@v%2Fv0.0.0-20190314235526-30a79bb1804b.mod 33 BLAKE2B b122fdb83f5a738c6367e9da3a3dfdf31454a02d4bdbec8cef820aa44223c84320a160f9c9b6b4cf03fa23c41ba90828ac4c5b62518e56dd9eab3c03c204b634 SHA512 1e787de71136dac51300dd05461f0c82600c95335b5f3d34982e15bf1ef85a1370fe6c22d67404bba0397f4b88e9bb0eb108ddb5b865c611167f9652c47c017a
+DIST github.com%2Fmikioh%2Ftcpinfo%2F@v%2Fv0.0.0-20190314235526-30a79bb1804b.zip 22643 BLAKE2B d30e54513b27ccbc9290a16e4122efd464b4e00bcae673e3fb1f193e9d2624acc1dfa17efb3e5a57722f2fe004e6fbd798b70ec29f1c9966f94dfda74dd061dd SHA512 e2c45c5d0b2d827370ba9a827991a97270cf8f3ee657e71d981c051ce273655875838cd4d560411931ede36350db41a2512e4e06ff7a27aba1552894dfead660
+DIST github.com%2Fmikioh%2Ftcpopt%2F@v%2Fv0.0.0-20190314235656-172688c1accc.mod 32 BLAKE2B 4a5a440801b225a231862ab1f2563b175bc4011919669f0865d6937499c3d15d6338e6b9737df638de5451099ab6dde6b54f731e7fb5601ff743e362d1cbdd20 SHA512 04f5af656d6db7ea4be9747e18458b1a2d99abad073210a992d1eb42302e14b0babcea4d7c2c40e4be72d48d7ef1c810853012c4bed71acda7b0ca5b20377599
+DIST github.com%2Fmikioh%2Ftcpopt%2F@v%2Fv0.0.0-20190314235656-172688c1accc.zip 23419 BLAKE2B ec10893ff2d5723228d6245e60741e685c50b0b408f7158dcf6a0c10f294f6b09e30a726407e1b67577f23c4423ca7e866580ddf3d11618cbe3db5f29ec616fb SHA512 076e03656c4b2c62837b18f221a844cc6e42a2c3c06ad13d89d30cdd60598c97c6039d48f6ef5c700c52d9a1b494d1eed0bd0cbcc0d3a66c6fcc65ae8e146078
 DIST github.com%2Fminio%2Fblake2b-simd%2F@v%2Fv0.0.0-20160723061019-3f5f724cb5b1.mod 37 BLAKE2B d1b7e7255c332c255ffa69e9f5e2801b5fabfc79e87d65f74215102ee4e4377d3afaf52900781613889f4cd1efda90aee3380290de613771ca8d256e4c1d4027 SHA512 d9a6048084adc484dd2dedf9796f0a3e6d37841327ec4a7a01ef0ba34888ff821b72bf6bad3d6fbe29fb9c265208e2e8fa6779c9d0d32c9b99e65de1ad5cbddb
 DIST github.com%2Fminio%2Fblake2b-simd%2F@v%2Fv0.0.0-20160723061019-3f5f724cb5b1.zip 74110 BLAKE2B 596141be30939245a7709e22df94d99afbf410c72660bfa6e79c2174f43d070fc52fd9682e742f4766db1645b9b9fe43a0b91b53520eac528b73b0724ebd0daa SHA512 b17105ae601242ab326d3b3c0ed90bfc07c28dc61f954cb4290078de46cc2a9ccf7dbb32c03c8fa538da77d77602206c52634fc3c6471a51acfe4351f8fa7fac
 DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.0.0-20190131020904-2d45a736cd16.mod 36 BLAKE2B 3d65012cdfc89913335409a75fe4cb6f5990765bd58d38d6daafc45435effce7cf4b2533673ae724b31284d137261d3d4b4a27f1bb3791f9c6283871e43a253a SHA512 a940acae8474af5b295f2d77782cd0af2940086115fcf0b71e129668faaf76a9472767fe0633918e668e998465b5c9409fb120569b202ae5ff1644416148a8db
@@ -1050,8 +1023,16 @@ DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.0.mod 36 BLAKE2B 3d65012cdfc89
 DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1-0.20190913151208-6de447530771.mod 45 BLAKE2B 4868e4a4afda265cf4dd2e7c5a25657237687b3b1ba21d24f280174a05dece76ba902c1447586a7c632a961b8454a1d1c8a0e7d523fabcbf98dddee26d26e341 SHA512 2341ff459cb2432feff920048aac90868260d97c5ff68724b0b7e22c8e5c65da2b4055026d74578983020e24506d2f064e47e3fa247a4560a37951e205cd0a15
 DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod 45 BLAKE2B 4868e4a4afda265cf4dd2e7c5a25657237687b3b1ba21d24f280174a05dece76ba902c1447586a7c632a961b8454a1d1c8a0e7d523fabcbf98dddee26d26e341 SHA512 2341ff459cb2432feff920048aac90868260d97c5ff68724b0b7e22c8e5c65da2b4055026d74578983020e24506d2f064e47e3fa247a4560a37951e205cd0a15
 DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip 84306 BLAKE2B a22f077e8a63a951ca47f6d62a6de017245ae81ad57f788996c9efc722a5df7bf3ef9cda993ac8c524d75a95a2218732471d46d21e8bfc56f324ed8b126ba1ff SHA512 7732e181c4a620e81e77d261addf74c7d7edaa50fe41f13512124650a572ec258ebac8a4144bffa3107115f9c65968cc67a3aa5de8c8dbfffbcffceecfccbc63
+DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv1.0.0.mod 91 BLAKE2B c40808d77e89a1e769b288ee07fb360cb2e15384a0399078f503636dcef28a9245df2a68d84099aeace0ab2d8e265816fcc8c479896e161417a7e4a522a4751d SHA512 77d7d01b59a5d1c318f1e0be06f02d80f46b01b53e137853677b788efb3d0b8f955ed69393b37970bc3eec577fb2ca1ce843172bac07cc3b0d3620545fdab03c
+DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv1.0.0.zip 59020 BLAKE2B 83d3bf6e6092751c4db0f100e5393b8e2c0f9e80d7d6460d5a508f5d4415d4743024cef394b58abbd5b5174b34212f2a2b4e7fec39fd046f80ce5d3f14371597 SHA512 aebef3a91d9d5db1dcfea0a6d76bee471780ac26a0da34c6aaa9851b22cb7aac14ef5e38d5cb10e61e5dcbbbaf4ee80350113f41947e8ccc46069068a6630028
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod 32 BLAKE2B d511476a16a86c50db84dbacb40afb4b30ac3f72c4fd5a8b20fdd8bc6de1c46592bd16b24f77bd037dcb23ba86cd217fa740b59a784c6fff0fea1720d2045695 SHA512 451fbf9129c151784d97cfe6af29d27a277b6821411cfa5b23e6730ba0f5d5a830054eb6ed660dd2192c16abd54d5999be5b80e39bbac3499c3198311d01ec1f
+DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
@@ -1060,9 +1041,7 @@ DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81
 DIST github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.0.mod 33 BLAKE2B da4247632d66672554b324ea0d72361bbf87549000c055de8757e7b179a58fdc0e109e9705114204cb810eb30c9c451afae31c49e43558ef7b907cc32eb4673a SHA512 56aec1c287c16b6688d3bece372a1c696eeb7b1b19f68196967eea91bc7fe49b8b858a76deeabc0af4b636d4697eff141844f7b9543dc0cb860e4703a4a9d489
 DIST github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.1.mod 33 BLAKE2B da4247632d66672554b324ea0d72361bbf87549000c055de8757e7b179a58fdc0e109e9705114204cb810eb30c9c451afae31c49e43558ef7b907cc32eb4673a SHA512 56aec1c287c16b6688d3bece372a1c696eeb7b1b19f68196967eea91bc7fe49b8b858a76deeabc0af4b636d4697eff141844f7b9543dc0cb860e4703a4a9d489
 DIST github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.2.mod 42 BLAKE2B 8b6b5ef5a28ba690292225e5a1a0df3d33db308148735b4447c6d6048c53589b9ac0cd9b96fc8f9498814ba1f7674166641b398f587edc5457e289f8a370a71d SHA512 f49084ffe1c559c559a4f1a27480de073d17ac4aaab2f6223c23c80bc252520504d8a90d39945a59a28e8cf349cb93a1c15da2c6de4ade19b19d812e72c94465
-DIST github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.2.zip 13264 BLAKE2B 5a98270e8209feebe90c7c22f05c1c5b61702508d14baf6405e30f2285452a86399c7dbf2deae0fa8548ef58e47d40304c25b2250413fe2c348e573bbc2d326f SHA512 47138e83b371bf33f982201143defc095680a3b45f494f8bcce6fd9f3424041e724c55d7e03465217362ddeedfc9667c9d563603d1ae146e3e9f51d7ae4e7d91
 DIST github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.3.mod 42 BLAKE2B 8b6b5ef5a28ba690292225e5a1a0df3d33db308148735b4447c6d6048c53589b9ac0cd9b96fc8f9498814ba1f7674166641b398f587edc5457e289f8a370a71d SHA512 f49084ffe1c559c559a4f1a27480de073d17ac4aaab2f6223c23c80bc252520504d8a90d39945a59a28e8cf349cb93a1c15da2c6de4ade19b19d812e72c94465
-DIST github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.1.3.zip 13725 BLAKE2B b411a1dc291595a182806dee05ef19800f0c6b098d7ecac4baf3843b2bdb29b874e3bd1326e2ea647718f9e58cbba2209ead2f423cf7889f6443e79fc21fd123 SHA512 a2f3c0f4bd6ea780f167b66b19d81f99b10c4df08baef04f750919b3a0ddb17fc7334be8dda160c8a2f74203b6195b9978ac883b673105a2a9d5edc163c68f4b
 DIST github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.2.0.mod 42 BLAKE2B 8b6b5ef5a28ba690292225e5a1a0df3d33db308148735b4447c6d6048c53589b9ac0cd9b96fc8f9498814ba1f7674166641b398f587edc5457e289f8a370a71d SHA512 f49084ffe1c559c559a4f1a27480de073d17ac4aaab2f6223c23c80bc252520504d8a90d39945a59a28e8cf349cb93a1c15da2c6de4ade19b19d812e72c94465
 DIST github.com%2Fmr-tron%2Fbase58%2F@v%2Fv1.2.0.zip 13770 BLAKE2B ecc0d9203b213c3be0eab310fd93b425af2ccbf0f195f6ea31ec216c7d6addf800e20c1805d75e652e2603dd5330469990f5a416328916daca29fdd53b1b95b1 SHA512 f92d1f2f49ecc754adc3325eb5db5a21163774349478e4cc0c39a0658089943b23c406eca21f709bb462af54082cdb8772abb0d8ff5cca267ac671492298bcd7
 DIST github.com%2Fmultiformats%2Fgo-base32%2F@v%2Fv0.0.3.mod 41 BLAKE2B 09de16704a78f75375b0e8bfc8b33935292b4c092ce4f52a83da67487ae22cbe2e8943579d764b27f9c939aa71c522225b0bffc7a3cfb63fc33574e9e9a30932 SHA512 b4e161d4785471e76d71bf2e0543088197997cd7516adeb6e24e4d25c0759fde8007339e5f596af88cff2c96954643171fa73c4ad60bbfadef8dc206676705ce
@@ -1074,153 +1053,193 @@ DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.0.2.mod 97 BLAKE2B 866ce
 DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.0.4.mod 97 BLAKE2B 866cec73577b960da5d69c5762e6d990517153a2fcbd66d605ea9cf9c3f2d2697d543bdf9169f8620dbcfd4c294f4259497ddd96231917d57418a7465b4a2540 SHA512 2fa04779ba9de4d3dc921fdc365f220bb8cfdea5ae5e4882929f4e9cd6665a5c20bfaf14fb7d99765275e55f1d7597264d5a44e7d4fc91257d16c5e6e54a8809
 DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.1.0.mod 97 BLAKE2B 866cec73577b960da5d69c5762e6d990517153a2fcbd66d605ea9cf9c3f2d2697d543bdf9169f8620dbcfd4c294f4259497ddd96231917d57418a7465b4a2540 SHA512 2fa04779ba9de4d3dc921fdc365f220bb8cfdea5ae5e4882929f4e9cd6665a5c20bfaf14fb7d99765275e55f1d7597264d5a44e7d4fc91257d16c5e6e54a8809
 DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.1.1.mod 106 BLAKE2B 2ba71241c36fe02cbfcaad9cc4413fbdb49dfb0ecd72b3478fe8367c3d0f0248aa6ff85264b7811e61083107d36143ce4d840cdd9c9bf9e5e0be3f1854a0a684 SHA512 2bdf82ee7949135650ef0561e0f76a45c7490742a3aaa71324048084677134ce3f01138b96eebb3852beebf5c43238c05afbe402a93277fa2f0f058f4b3a7cca
-DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.1.1.zip 27810 BLAKE2B ac3d676c3103f0d74aed558399f172a34d8bcd1c34bf201bd7fa7152df018699a805c5ace19ddec32948190f582cb3baa3b755f2cf85bbd72e9aff2e174ade55 SHA512 169b3b5491a240c072c284a6b6bacf016bb8003adaface1159d38d6ab309a594303af329e00ad8dde151ba1634db33d987343707781e6e02eac967b37c1b75a4
 DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.0.mod 153 BLAKE2B d43557a84e8279e71e828b043edf505206fe2363df6f2667ea7647b84a78dc9a762381c567169eaaac03183261821cd57d35fb340a739bc5dab536d862c0fab0 SHA512 83d156cea997749a20fd6debf94caa6f95c2543cfd12815cfe3d0cb9aa8e173b89969e831886cd53e35c56d2459017cc94188fd7712c05edae915fb21a598a5d
-DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.0.zip 27319 BLAKE2B 1b419cb32cf1d240621ea39f4172882a9354e29116a2abc7c77c92f28234b3a6b7f5643964e09dfd44b1d067bf8fc5f4b7b2360310005bb3504d7ce48fdaeb65 SHA512 f39b728ad41338cc58e37d2b72515f2063b0a36d7a89dec8a8198013c3c1b0c2158ed201e7104e4ac5ac3717c0a3594c03de133d22ebdb904846ef441d7e0bae
 DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.1.mod 154 BLAKE2B 712d84c019009e27c757eb2247ed7cd4425221666f3a1fa15f59162ceb5de0ea589fb6e4886cfc5a4dc03cd48afe9761f44c2308cf19fd59bbc41fdfb1290688 SHA512 aa329b170abe104e900c8e6a43b4a686d14b0b6602245dc16ba24afb5e217e29b49113da2c63252cd49b2c32d0252968540108329205a7cd182400c672523802
-DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.1.zip 27595 BLAKE2B 4517dc62e6867a99f1b671f488e3a51fef15a6d92757354e294a3b03a4d4ddab28255fdf92c42a2636482a04c4293cb244fc3b93b239863dee4fee4e17cb2b02 SHA512 f1a92ab27bb09040e2bf4604ae4f2935a384fdf70466a799aceab0e95f9a3ef39a816ad136accbec5afe79c3b62ce1e937fde7cc084402010a1a6599df2f208c
 DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.2.mod 154 BLAKE2B 3a32e31718ea5c91640cd0c8f5481b72d506e7bbbc2acb5c11491b965cf83ada96f77454a5c4a0a1686edb78c950499c46e52c1bb84f6f2b89980fddc3549c36 SHA512 115538df200d13bf498fbfdc86f25414dd52b665510c91188b65f90df4023b5198f457a732ddcf6105c935e0ea2aaf58bc072e9fe206ca0599264c60b90dd480
-DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.2.2.zip 30396 BLAKE2B 63c8aed9c99b0f5308e86a91506d1c2a260ffa700cc416fb66ea61533264dd45f0eef87091e218586bb7fe45955b4d3d4c29a913083b4b8fbba313623c5e4058 SHA512 1184df683f41b30a58eb195ddf4f994f2346e3efd34ead1d6c4af87c29110a5996d2b832072b1aa65e48cce849fc61f1c0eaba0c81d3c072c29b5cdc9753ff88
 DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.0.mod 185 BLAKE2B f3b1d3152aa166c874d1ab23ba849eb0921580895a0e06d602c7cf29f0532a0e170d70129263f9c79d97ade3fc2d286ad61a7744e387d0006dba5d354dd5d37c SHA512 39c8b46c27992c95a6b8a4419bff2f0c206fad585a670211f00e31cb3c4daf9f21871628df4fce7ad1e958aae0ec40d2cdfe57e160d28c6b8ff1e38a73e6bbc0
-DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.0.zip 47275 BLAKE2B e78b6882473da9b1eafd76ad32066abf8b1ca9b80a45e610073859755f8e2c19baa08ec7ddda06a11dd183634335330352ba524c58a78850a9b0d5fc96e868c9 SHA512 52fffc11d2ab6c57829456df7c9f81d9887471ff6d86ee833f1c2af8967b2de4aa5015168e47d51f7813c201d9479b3fd6864ac4d11245a64eb7b2b97f3533d4
 DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.1.mod 276 BLAKE2B 6a5f20f367f43be7df9c2e6e1df50a730c9de33f5554d77f8ab7cb0a61fd9d9900312534e7ef5bdeb2bce2f11d8b78a974c256210f498c6e05a3e75d5c52aa6e SHA512 9de3f9a7c1b47859fbb83768d20013ed5a2fa120749494188cafb6ffc0de09dc8fc904b60830e572833254b03575c45805a2638b46fb126f861954189d5b804d
 DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.1.zip 48597 BLAKE2B 67b072e997019fc27fd20284365393da0ffbd1a21525f7b88a153d7cc7953a1f1713da8ad99e3baf6f596cf8329f75db690c7be23b24a99c65aef4d15d3a45bb SHA512 2331ac55119f871f63c1d9a9102a28da14ee60be5094e989db3215e60a10827648155d8aa129351d166e4e1c6b7fa0d70f9f8fc660594e47ea0c25b6e7c9195b
+DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.3.mod 227 BLAKE2B 8c7711a8fd6471827366ed9443febe46bd4a643713ca4537bd2418c800263dd3e3b926b8f033cf83988c44515d0d8cc4d26fae36367cf7d4b389057c23a77d80 SHA512 9d7f72a0144c7a9f09f86e64de755154139e1e3ae6a91bd1ef3065a416187e3b70de38a1fcb22c0744b1f97fbb4e896950e5fb7432289ee10cfd3c13bfd68ec0
+DIST github.com%2Fmultiformats%2Fgo-multiaddr%2F@v%2Fv0.3.3.zip 50851 BLAKE2B 8b8feeae8f0fd6cbf09856d8724eead538207e9d810f070a29f11c0bf7a28b4c3c0387a0afe9fe4aab18af72034cff3e99ae1f31e7e7169e22b37e04fad80363 SHA512 d81ae26ec74a79df9dc39f504494891175a161521a33fcab84fd408ecfa9d3331ee50ad08b66f33bc6ee61e4689cd01d3980d590311004ceff7a9d73ea7014e4
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.0.1.mod 101 BLAKE2B 6f73533073bd430dec3c70b907e4b9dc8506a97766397ae73a30f7983f91cb82371775dd0c639ef6fa1b981943a6fa1c229dab4fc46a429d09013efb70cfba4d SHA512 470b7a4c94acefd4fdf609876eb86b2f7ffa3ab7efb066dd5926dc9c2ea383620a0dbfb0e75b512bcafbd8092c5f6c00399934151dacce9d741e4d25986d7d97
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.0.2.mod 101 BLAKE2B 6f73533073bd430dec3c70b907e4b9dc8506a97766397ae73a30f7983f91cb82371775dd0c639ef6fa1b981943a6fa1c229dab4fc46a429d09013efb70cfba4d SHA512 470b7a4c94acefd4fdf609876eb86b2f7ffa3ab7efb066dd5926dc9c2ea383620a0dbfb0e75b512bcafbd8092c5f6c00399934151dacce9d741e4d25986d7d97
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.2.0.mod 110 BLAKE2B 8057f4cf068446b03776ae38cde380b17966ea8f64f00bb33f1a7efa0c5ab24585ec3a283f8636f4ee96c71be14aa8d1d6171ba123a5505d99243750e7b3721d SHA512 b08b53b3b3f8d10ae8c169467f5af03c475033054e66c74b2991248c5d4d9425549b067a68b07105a68becb989829b3f1f6b960f740bf219c65696a8b81376c9
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.2.0.zip 9550 BLAKE2B 093e34422abe509ee4f3212b4f001da76e0777feac027ffaf6cb8b8a15b0f317f4654ef84796fafde55f932f00f12d3c7f3cbd0d663e6a0736c5205698b021e8 SHA512 307ee3cb563493a2e65528831719cc06f563868ffe7a24528a5687bab22cb959af2486d229e71c0811f2e1f15d373e010f9e3e0b146c2a3b930065f12fa93c44
+DIST github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.3.0.mod 110 BLAKE2B 2930933ce6916f9b4710f0cd3336f5a40ea97c04cc99b0a22cba2996ff4cf0e1964a5e099b6e4a444a62a6fbc3bf545deddefa9a1fe4263a80266bc25e1f0c4d SHA512 a5fcd5ca2b2b62ef9c0e79840454e509d279d691ea18f3826ee7dd51a760f3f9a6f84c6e3856db28978a380cdab6904ef3b1e0abacf50e7f528bfac7fe7406fd
+DIST github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.3.1.mod 145 BLAKE2B 2b67f61bab09e82bd32c12e9d23e3190aaa45ba2ec85f9b65d7839bcbc2f257d7273c98930f709457049463917eeaf7fbc844bd98458d38881706f4cdd4e0b27 SHA512 9f6bb9ded45469a318dc2612af120a9db9ac05d990d6b02ea3aca64f6247430f2ec70dfc96bee7d50ee41ea5777df37211da87ac76f94080917a76144b2e8f19
+DIST github.com%2Fmultiformats%2Fgo-multiaddr-dns%2F@v%2Fv0.3.1.zip 12035 BLAKE2B 3c7a8005c78d020eb7007654ed35a7b291dd326f7fe7b338fe2aecf9d649e7ad90c24a2c0f8b9df14d38da4b7ba3ee8df81644570de54a4b1ba3c0f71ab678fb SHA512 9d02e7b6f8420234c3f00b332c4fc231b308346c215d97870db889813b053a575d5c4413cee2d9e9840505129e57602b725b7737056b57834570e7c1d475fe94
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.0.1.mod 155 BLAKE2B b844c33eebc4c53e21a9fb4c96d33a724d8fa5253b2b8c9b1f3c464e1e53303d1cc37c408419a2a7affe33121ceff5e18082d1d103d8725fb3b911055ae2b610 SHA512 5c2b079767ca6dfabdecd2e5d78190bbda5a21d13ec1580a226541eaf8a3d8dd32befc182cbe9e46c69070e0ec1012cd163444ba7ffec498760443a22b15232f
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.1.0.mod 110 BLAKE2B 9a662c95ab46198404d8a13c48f4883899c3953f0160e630f02206f5436936e1ede4fcae6f12ac7e56e9240300c2a77fdca8e25ddc14384753bbbb43d55a932a SHA512 128a9bd512dae3f4560bbfb8042769f7167877777807e6141181238f8e14dd8d2540df44f99f12cdc293f2383a4288ce388ccd5634f4fca119bb4ff98d92b162
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-fmt%2F@v%2Fv0.1.0.zip 6565 BLAKE2B 73b4282b1940372464eb833eddc614ad03b98604947eac942d923cb404a78edd1860a9b4d51a6f8654ca64750296486153f0aea11a465c323d83d7aba0bd5e32 SHA512 e10144b85a7c15a8d85f57f6cb7fbe6316e930b8c3ec40383c9f6c72b439dd7759bba1689ea7d109c3628c6e318035e06df6532f6a925e18cbb2510a03712262
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.0.1.mod 155 BLAKE2B fad7444d7893397163b4cdea593df954a4a9929b149c6855b5c15f75fcf6fc50b34964a557778a4f0903aeefd1fba3cacb7301eb6581dd251569ca566d8acad9 SHA512 923957a0ade68d712e5f21efb00901b4259b31e60f959a40b87236256b5eb34988a36187e60a3acead41ce7d91d2c3b01dc380042550af4711b44227a674a199
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.0.mod 110 BLAKE2B b54b2cabf9f8fd1eb0763611b291e6939bda0259842ac17f7bd54d6d2018b48055980489c061c571813098a426bb4f44beb747a654ed495d6f1c8200d11b4374 SHA512 7517cca34434d31d5731a656da8a336667ab4c4e49c9392a76f29e562c06225ac8bc314e4a21ba5cea1b0aca0a57a8bb03709ab4cc691422164ceb22281bd992
-DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.0.zip 22441 BLAKE2B 859bca0ff124b9bbc9f9f0d1037be23a1f64fdc5786b5e72de8f363bebdcc28987820ca28190205c4268cb8bb6c39161bccf9ca6464cbbc0d23dbcef8283dae5 SHA512 ea309d602bce01fa7df08d8545f68791cfb7ad0d619bfcd813a19f87993216a6ea41d7955554c7a3484d67acd4a572544e4f3d26e262ed7719f3f1341b3a085e
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.1.mod 110 BLAKE2B b54b2cabf9f8fd1eb0763611b291e6939bda0259842ac17f7bd54d6d2018b48055980489c061c571813098a426bb4f44beb747a654ed495d6f1c8200d11b4374 SHA512 7517cca34434d31d5731a656da8a336667ab4c4e49c9392a76f29e562c06225ac8bc314e4a21ba5cea1b0aca0a57a8bb03709ab4cc691422164ceb22281bd992
-DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.1.zip 22715 BLAKE2B 970feec97c9385e9b03b164db6ad09ec30d76510c21af5724627a1994fcdd8f094f760973abb8a664c328a1b2475ea94c3a342fe7ef8ee49071d0801ab8703af SHA512 f3a02260fa7dc6a61ab5fdf8fa5342b7cca6479608ed5c3807daed88a489ab2dd9818cecfbbe2314a363ba51e0081efe51da904d7c1ada37ec7d100c38e8a5b4
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.2.mod 110 BLAKE2B fd0b8b16d06ff44230c2e965505eda252c513f2076da14d0fbce1c38280f3bacf23d7428be3a8356066e76bb1b15f5812253a618913582fdc9cfff5bb91894f7 SHA512 425cea9d95c85586c4c64f0c46efcaddcad6f882aa209ea0ce15f1c44888347b833ab8c3aa4a8a67a70e74fdfaddcc32ce895e55842d22665b41712c018be5fa
-DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.2.zip 23083 BLAKE2B 874b50f3c1dcdc3c76eb7eea33235dd4fa4f779b8b23d21f13835cfb2f0698205d9735a17220e2ea477a51145cbd220bd60c8ca345d6148d4e8d37f8b23c19d2 SHA512 ee202c94892cc8d6e205d59ba2e4cc480821cde3899c20660a97c3308cc7de4ae8594089959f4bc05b3f53946413f363740f3811ac57d071f85669a59c985c06
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.3.mod 110 BLAKE2B 6e509371afd193bb7f9ee226f345f4c51ba8d37803aa2c13cf90c1531496cee59993dd48db44a556fb37f84218c22f05241a80f75ad4ac3948dd4131c08255af SHA512 5abb8d3ef50ba4dd28908e545165773b92dba58295fcb97e1a4b263d9f960ee19e8a0c3e5b011ba7a14ad38c9c1ae1936cb4c30f741d588792abd1f12be72723
-DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.3.zip 23490 BLAKE2B 1828f1733a19e3aff13552e61c2d10b373607bd147769b89b555c39c6ab650a5dd757d4e9333446f45689877c7c232a70baa217e1d1a9a142db2bc517fb91d8c SHA512 3f6b26ba92c5222326816110bdf42a5a9b80a6727a19a2b798a73818631e13f214a7430df801baeaa772f8f333055acc09bf3e543eceb7ec031b7739dd10015a
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.4.mod 110 BLAKE2B 6e509371afd193bb7f9ee226f345f4c51ba8d37803aa2c13cf90c1531496cee59993dd48db44a556fb37f84218c22f05241a80f75ad4ac3948dd4131c08255af SHA512 5abb8d3ef50ba4dd28908e545165773b92dba58295fcb97e1a4b263d9f960ee19e8a0c3e5b011ba7a14ad38c9c1ae1936cb4c30f741d588792abd1f12be72723
-DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.4.zip 23516 BLAKE2B b431746088f618d0c36bc0c47c0f09c3aa3a47566d9a64af8724d8167e9809aed32a95e18bb2bf9d89e15271608f7fdaa46ca8528243f887de65cef2eced6d3d SHA512 d3aad46f559db16a444563ece26d84474c23ccde964ef921aecb28bd2d5ef6ab7c933587353be4024977e79f537528c3034fc9342ef11b79bde88eaf75c7a147
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.5.mod 110 BLAKE2B 6e509371afd193bb7f9ee226f345f4c51ba8d37803aa2c13cf90c1531496cee59993dd48db44a556fb37f84218c22f05241a80f75ad4ac3948dd4131c08255af SHA512 5abb8d3ef50ba4dd28908e545165773b92dba58295fcb97e1a4b263d9f960ee19e8a0c3e5b011ba7a14ad38c9c1ae1936cb4c30f741d588792abd1f12be72723
-DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.1.5.zip 23569 BLAKE2B 443bcd85065b230a31ce2e2214002419c8f78bc1350c5e8d23d15139ef10d788c90990d69b2e7528da9192968c02c0fd470ed5afa4d058b0061d8beef541cf37 SHA512 98219f79afa1682b48ace99ac00f9584c8406c46db687b9bacf6327e0b4485c25ef3137efc6ef46f781a09b7fe4eb12eb9adcf3130c27fe3411ed9898c6cf46d
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.2.0.mod 110 BLAKE2B d517da320a019bc947bf655d2eb57b2047affb084f2291054373eaed241e1dd15f911f0c43a0ac64055da2b1975245281a2424f2848c9f47ddf37b954b16b7ea SHA512 75538a837de6b9253cc4210c5ec0463eb21c3fa39f3010a7263e4e6f13af6d301408c722d84ce1a8fc9607cdf6bc6f4de46d32965812b752537aad91f9904169
 DIST github.com%2Fmultiformats%2Fgo-multiaddr-net%2F@v%2Fv0.2.0.zip 10746 BLAKE2B e8764f0b1c82dbe58ba91b917161decf653a3bf005e3d2280fb629a2027bb1f0c06c0e6416cdde42dd0f0382041001fe1d24ed3637b113ae75e4588bc75e3882 SHA512 bcd7f65c0d8d352b341589f07153aecaf6e0835a247aba58aa2ad286210c0295403edf3cfc857e048c478727fdf359ae99cd2e636aaf2b1d05287d3b8b2fe99c
 DIST github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.1.mod 133 BLAKE2B d030369d62f597bfbda78d6e3f47d0476fa5debe2e46d3df05bd85f8bd0baf6282a2642c6f69857212e51f7c100ac14c4d5c72d608f684d0c664a4b36350f486 SHA512 c29d62c16dd537b9d8b35bc612d6cfd9dd55218427d0da02be811c52d5fab6fc087c0296fad907375bc8172dfd7467790b1dd9019013b322ebe135453d4e24f8
-DIST github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.1.zip 13828 BLAKE2B 8cfadcc0a9304ab00ae0aab1a98c08a3219f1a3a4cc6f781c12b068c4a0b680dace48e6f3b804814604f0e7a8067378a399b2f18d436a3d38991e5f47f7b2af7 SHA512 859174d8a21db1b835834a81f0627fc47d539c2e2754297ab5eae57bddf9cf17648504c3992a06ee5203cc4209d2943c147602b343b6b94ffc36121efc15910f
-DIST github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.2.mod 133 BLAKE2B d030369d62f597bfbda78d6e3f47d0476fa5debe2e46d3df05bd85f8bd0baf6282a2642c6f69857212e51f7c100ac14c4d5c72d608f684d0c664a4b36350f486 SHA512 c29d62c16dd537b9d8b35bc612d6cfd9dd55218427d0da02be811c52d5fab6fc087c0296fad907375bc8172dfd7467790b1dd9019013b322ebe135453d4e24f8
-DIST github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.2.zip 13822 BLAKE2B f6446b0856adf628b4361869bb2ef12f72e93573a29328f6b580561917931054727fa0788193d1e4895f64d9f712f6673511da6b537e78bc4e6f1c74e8efa2e2 SHA512 b6161f3c5517868e5e15fc5300293fa598ebc591759cedc6f23bbddbe6fa2f00f254fb89390975c6bbfbea031c9d5c6b8545ee4282891b66c39029d39acd3904
 DIST github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.3.mod 184 BLAKE2B 7b8169b1cbccd4778a779bacf5a92152ccf8e3736345ec19ec80e972837a01d4edc6d975ddda2f0a8293c6ad5087ada9517e30dc2b208596b35fc7232c4f98a4 SHA512 899ec024a514d6010402dd9b4a21c0171a05972bf5ab0e59bfe3159c90482018d6435449c66265adf9caa9729f7fcba424907a1b00d3cc2f8a528a7f3cd39586
 DIST github.com%2Fmultiformats%2Fgo-multibase%2F@v%2Fv0.0.3.zip 13825 BLAKE2B 941e4e5adc48a9178289e5679448da4a610e8d444d334bd752e12ccb7dab62a67ff648aca2a6e7d11e7d985094c71e785f322ddc557fb62967323543d80713a0 SHA512 93b7e6acd96d63796e3aceaee6cffce03bacb90bcf6bffb480674fd74be5441438d8f8deb5b9293e8cac737a73e502b26b7eb98a254d2816d436d3bbf7779113
+DIST github.com%2Fmultiformats%2Fgo-multicodec%2F@v%2Fv0.2.0.mod 54 BLAKE2B 59a5c171f3e7b5f706932f22500c72355110763c7367b06c766770e4f874b65ca90607e394195f7e2d8db8a32d5df9322a47b303b6fac08c8bf6d5c13915e662 SHA512 204dcdf1941ccbcb2f4748719b4a15594ed7e918353c9f95ae84f73979692420f4042e7f585fa35b61a848f4a3c8b774224badefaa098c302fbe5c57564224ff
+DIST github.com%2Fmultiformats%2Fgo-multicodec%2F@v%2Fv0.2.0.zip 21293 BLAKE2B 192253f0194efc456a479b7f9d25b8ef08d908547712940f389a7318620904143b55f714e01bb40927c477fc04fbd3d6e3fd5c1bcf59453b824a80fa4469ae40 SHA512 cc287a6053469147e942a2b5804aa60067a057ae9843f6f464f1f65fbfa3d3c0ad9cc983cc699ae9efa8d2ff34ef16d15eb68544cff898c851c5e1a4ee6c0fe8
 DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.1.mod 426 BLAKE2B 0207d5b80ab74fad18f34613a9fb5489b10aefddd7d6aa8d3e0172c7c6bb586c5d7a917d034396e67f91565f7898bbf51b649266675707d0ba2b06f3a50b19d1 SHA512 0c2611faedf5e01cd5e240317b241ddf92a00c4b7b138350cae3b145053f2fc4809b8753de3be3ab0015f188a41e8b69edbaae09f0547406b1f64e82ade20548
 DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.10.mod 326 BLAKE2B b1b305b239819d7de057dc7de09facc661ad8d8a7667ddd4736735d4411856e31c09ef39d38f3a933eb4d169cac1e013142d3b713b4d3df2e2a07edf7cd3401a SHA512 567a8f6956142d569bb42c2082e608372184e677fe29850ff101b559bab90e899777f141f011d2879e2251af4f855f3f3c7bde993b38bffda64d83f56bed7242
-DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.10.zip 30701 BLAKE2B ddf6a188747b9d36ea6bef74e63e34d8ef58fbb1833616b1d7363787df520aee84f045d8d831a008cfd00253dd93e335abf08ed0a12fd4f1acdcca756a8b625b SHA512 59ce1403547ea259173e77709e6408b02a256c8ead0f293dceedf1a9c32467fd176c69c5aa423005eeb1fa6d3b57134da834065f1a5f42b2b189670b05ac5325
 DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.13.mod 368 BLAKE2B daa5e79c1d6c337a47c6cbb95fdabef6b577f942eb9203581d8a2c762ad38db7d354b55ade753dce15d80f58b10eeb23ff000442ce282f08e33d9f2c37ec99ff SHA512 f4574aa23fcc101f579ae9dd73b8fd6087a2730b8d9377b4498e6deb556e2edec1068fbca0d8720cb50b3cbca0b250bb16ae5458c14865a0c27104372cd9f900
-DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.13.zip 32440 BLAKE2B dbf325756117d1690243647f5d96b7ad2faa53d2f9a013e72193f1b4b9ccacc3ca83e330989742ed160dfb5d0510c6a262aafedd17494b7e63eccd03902e38e4 SHA512 b5aa5fbc0c0177e5ad13183a5dc08fc705c9129960961d2fe30e6b0e1f734976a5efd7aa2920484f3d902d8c8d6f250840871ad07a7c3939f410c7c2c8a81584
 DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.14.mod 368 BLAKE2B daa5e79c1d6c337a47c6cbb95fdabef6b577f942eb9203581d8a2c762ad38db7d354b55ade753dce15d80f58b10eeb23ff000442ce282f08e33d9f2c37ec99ff SHA512 f4574aa23fcc101f579ae9dd73b8fd6087a2730b8d9377b4498e6deb556e2edec1068fbca0d8720cb50b3cbca0b250bb16ae5458c14865a0c27104372cd9f900
 DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.14.zip 32883 BLAKE2B 338820445c1117501ba9aa4bcb2f14f83984c23c710543ccb6e63406fa6a47bef26bfef55956b0815e6190f450bf04c53e9c7280df2e2cda1f8dd6ad9bb862ca SHA512 261028645ec68016a50cac5479fdd8b0d32f02d079440016a1bb6e146ced0d2bb9f659c251c6d9fa27a1c1f7a89cfe89564848af3fc724e193f514dc3fad05b8
+DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.15.mod 366 BLAKE2B e6f652d260d7b38771f29320714d040ac7c1bd6a8eaefd085ba16dd92928789d3de8838373107b2efdada70af39c69785bb1e6620b6580ebd437e95a65f8987a SHA512 98d68b7be23aa1929bca6133d25534216afdbd58624139820323661afbbeaf8d3d952eceece187875aa24ae40c8f4ef26ac759691a30560424f31e8d23edf847
+DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.15.zip 38335 BLAKE2B a7a0492d817acfe2a96aa7cba1dc8d80ff0cdcf40f8ee3f9d8896f584c21b288aa1dc72259977e7d6874609c643cff42ae8ab2b48aab6b2d50a824028f5519d2 SHA512 b751e28e706499a7f337d234b5ddfff7013d823bfb757f254c1ba54bec88c934258196f596273b97feb9ee646a2f4a93fab7d445bde9db2581e8dad759068617
 DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.5.mod 315 BLAKE2B d173e9dad06c7155fa2906cf4869d31abefda5580704b8072c6072686d32f7f3fcfa85538a7463f268c8311d8ede80c780f1d79421e9096116d6ed613c98ac60 SHA512 d9615581dc92f34762f37fff4a459fc193e61538c7a414152c7bfd252b6cfe67ec12a130ca306ff7aea58e7a0ef90ed1f7100d8c7bf92a348207d506175c066c
-DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.7.mod 287 BLAKE2B 19758fd40af2f8f5e42e47c271217b3e81dfbcb093083e67a47d344d1e828d81c88c48d4215fb0f919d5b59f36aefd42b28664724bedf43c1d827788d86d8c62 SHA512 e2aed839cffe430728779dd39b16d64a3b8be08ccecb8d74463bdaae5848779ce5b2b11d9a68290a1aa9aa396a1a7a2523b7157b2ffc31b1d23c0ca85d578427
 DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.8.mod 326 BLAKE2B b1b305b239819d7de057dc7de09facc661ad8d8a7667ddd4736735d4411856e31c09ef39d38f3a933eb4d169cac1e013142d3b713b4d3df2e2a07edf7cd3401a SHA512 567a8f6956142d569bb42c2082e608372184e677fe29850ff101b559bab90e899777f141f011d2879e2251af4f855f3f3c7bde993b38bffda64d83f56bed7242
-DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.8.zip 30257 BLAKE2B 3e0c0b5e7694fd4214e1719cfdae845e55f216ad741c698dfff0789b48733bb4b5c008182d51b7108febc43a491d95a1d0f9d65b62491655f381deeac76bfd7c SHA512 7d26883d1034f41f53f0b47c493b34b8d02da3742691b86b10cb4f3ab9e47517b72fe80e4a7f3a9338592dee3438301313408be5c09f944be159a01afd8a2c06
 DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.9.mod 326 BLAKE2B b1b305b239819d7de057dc7de09facc661ad8d8a7667ddd4736735d4411856e31c09ef39d38f3a933eb4d169cac1e013142d3b713b4d3df2e2a07edf7cd3401a SHA512 567a8f6956142d569bb42c2082e608372184e677fe29850ff101b559bab90e899777f141f011d2879e2251af4f855f3f3c7bde993b38bffda64d83f56bed7242
-DIST github.com%2Fmultiformats%2Fgo-multihash%2F@v%2Fv0.0.9.zip 30525 BLAKE2B 78f2b356fc58365858cfc681462803cef15aa1d155b0408ea591106ca1228347ba474359903b738488643b2132a78e26f1e7a509edc4891f02a3e936926ef361 SHA512 90a6a2020944d7af307f59d41bb6c7109b9430d3d1721b9dbc0bcd0c82132efad9a1a745341e4df38d5f4e0e625c5ef4056c7ab99d77dd944d203866c39ae6ae
 DIST github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.0.1.mod 46 BLAKE2B a892fdf37f507ea7ad3f68191a7202c486796b08a63c9b60a2fee65c6412303449063a13949101400710aa2266cad8797d5ee57d6eec26e9ff502b244b435759 SHA512 9ea624d7ef9c849eb51b568bc9497b97790dedc2da3f1368bd575441c95cd5ff90c35939d1a426e0e39f19a2e30e6a8628a8f8c0b924fdd793f4f48c8bebf21c
 DIST github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.0.4.mod 46 BLAKE2B a892fdf37f507ea7ad3f68191a7202c486796b08a63c9b60a2fee65c6412303449063a13949101400710aa2266cad8797d5ee57d6eec26e9ff502b244b435759 SHA512 9ea624d7ef9c849eb51b568bc9497b97790dedc2da3f1368bd575441c95cd5ff90c35939d1a426e0e39f19a2e30e6a8628a8f8c0b924fdd793f4f48c8bebf21c
 DIST github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.0.mod 46 BLAKE2B a892fdf37f507ea7ad3f68191a7202c486796b08a63c9b60a2fee65c6412303449063a13949101400710aa2266cad8797d5ee57d6eec26e9ff502b244b435759 SHA512 9ea624d7ef9c849eb51b568bc9497b97790dedc2da3f1368bd575441c95cd5ff90c35939d1a426e0e39f19a2e30e6a8628a8f8c0b924fdd793f4f48c8bebf21c
-DIST github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.0.zip 2355069 BLAKE2B bf6339dba73d26d98c577e76a42c349907965cc5750143216160b2dcf9771cacc930b484314fcfd46ece27424a23ff9b350962806edb5482187ac1b3af2c700d SHA512 5c735c37678481e148501f0a5931b76c322487ac8c33a482026ecfd3f1e190b5007c47cd4e260f4bf0a25807b2c26a97931f19945b0f09356c97a2495730d814
 DIST github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.1.mod 55 BLAKE2B e5e324428b8793458f0ed33503265aa4660d0d7c902dcc6dd48092922fe78e29a08c4cfba47281f3d34bf8427c8072d22ca2531d549732fc4df3bb6da52c86ff SHA512 f87be6a60a7f7d2a71c9486e67e0d769eee1cdf19629e923be9050ff2c9e687ed4c7f434b67d3306326dbca324c3296e72e98f518dea50655d4ae8d06af042fc
-DIST github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.1.zip 2355146 BLAKE2B 5e403396a7aaf48ea03857315c1a122d577e92787b1e66c68cde5208f1174032126d1896b41237c5c9a7e9767cd5bfead7270d43c948d19a6aab0b98fb01e7a4 SHA512 46d6ab5749fefb68a582158e5a91cc2862223ca24b96d3aad712795cebe3a65c8c62d4412584b3083b5dfcbec20e9244317e21ef6e20dabb788f8bda0c0aeadf
-DIST github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.2.mod 105 BLAKE2B 5716edca2df8d820c67fdbaaf4119c6aae87db7ff8edfe6b3236a471fd99b1a8d9d70b6a148cea90fdbe3eb802a23103d990c9e1442a6d0143e9ceb0417a25fe SHA512 4fefac23779921ba59a16b012c2c59406c76fad3530cbe6c250120339e8f840688c96a4a6749c514ae6d3be66397e1d90dc2253f27a67fc668be36de2326a8b8
-DIST github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.1.2.zip 2355317 BLAKE2B 0c76eecbb8c9b7cc2da9ea77ab6ba814aa0119ea256d3409eec94a660fd27d7a701cb373383031abec85f336ecd7b6f92a35c11671a036d9a6b2ce16da1f03f9 SHA512 c9d80842b17222648367513ba7a21def2e36f0737876bdfee4a62395e977c7fac0f2f51acd0e6b6c744c79144cd5d08e958fd915daa76782dfb98ead4b9c8499
 DIST github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.2.0.mod 105 BLAKE2B 5716edca2df8d820c67fdbaaf4119c6aae87db7ff8edfe6b3236a471fd99b1a8d9d70b6a148cea90fdbe3eb802a23103d990c9e1442a6d0143e9ceb0417a25fe SHA512 4fefac23779921ba59a16b012c2c59406c76fad3530cbe6c250120339e8f840688c96a4a6749c514ae6d3be66397e1d90dc2253f27a67fc668be36de2326a8b8
 DIST github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.2.0.zip 2355970 BLAKE2B f6432c01aa1f355ffc0d98b0aa1c6cbc32145f83dd35321eebd6984ea3c752f7a3ca5d9c7195de8b57c6be3dc09c0f3ff203e0b5e9e25502797ce94dedf29c2c SHA512 13728339487c1c4d9714edede89308eb08c36b25eaa2b5c080966a7d3590a83a0b358c5c7488cdda3afdb4f4e27f8a256754f0701220ba2e4d3c8c0be78d2ecd
+DIST github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.2.1.mod 105 BLAKE2B 5716edca2df8d820c67fdbaaf4119c6aae87db7ff8edfe6b3236a471fd99b1a8d9d70b6a148cea90fdbe3eb802a23103d990c9e1442a6d0143e9ceb0417a25fe SHA512 4fefac23779921ba59a16b012c2c59406c76fad3530cbe6c250120339e8f840688c96a4a6749c514ae6d3be66397e1d90dc2253f27a67fc668be36de2326a8b8
+DIST github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.2.2.mod 105 BLAKE2B 222405842d8ed63bb6dbdb55970b6134a5762de8b8b6f7fe8ce649c16fab7864896250b4be64d2f1f9e9eef8ec5da18eec3fec864bc63d3005616863382fb4ec SHA512 42c82a58580713ed61fd8789b40b52403f22cae620144c03744cc5538cca79022abe3722de245be21951aec500dfcd7210cf3cab38b68488a29fd7b72c410f49
+DIST github.com%2Fmultiformats%2Fgo-multistream%2F@v%2Fv0.2.2.zip 2359849 BLAKE2B 71551d57e3561f67ba853d4240f78ff73c8dfe6a7c8230db5d5184aabd802428b6eb621c89d5a774f04f7c6f1a6024ce7664cad0e85165c301a7b21118ea43a0 SHA512 d1445a964d813dc1857c4c058e80bc807136bc7db0a2920bf837f13d8ca45396560f45c7e83d5fb67c3d9bc982fd418d10d0233f172d386456702db65342ebda
 DIST github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.1.mod 50 BLAKE2B dafc6e6293ede20438a91e9a6b1bf66cdae8b1636c525d0ec04e0912fac06def988de0be701dcbfe086684679e67daac943bdf8cbd44b70217f2f7af58878699 SHA512 ff1e77ca2511fa4e6d7bd76f0733e89eaaa1be8df68b0b35ebe0fc794b29e371418eb8fe5a0aaff766fbe4e9251c3aac6e8b32be4cfbd90093cbc4d12742d515
-DIST github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.1.zip 3854 BLAKE2B ab7a6b08c13df70e60aff0812609bb4910cb86f6625ace4ce91940b6e9e05581d88926948b532f8a0c78afdab3d5e3bf4b4c302321faf506fca7f9ebd9f5ad2a SHA512 ccc05ee16226e69190770c09fd76335a3e64556639188f77d2967f99f47f8f0ac83b935b23ccc09c2b3ef66c5ea57b96691e7bbc01ee34e10dc8868ce240646f
 DIST github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.2.mod 50 BLAKE2B dafc6e6293ede20438a91e9a6b1bf66cdae8b1636c525d0ec04e0912fac06def988de0be701dcbfe086684679e67daac943bdf8cbd44b70217f2f7af58878699 SHA512 ff1e77ca2511fa4e6d7bd76f0733e89eaaa1be8df68b0b35ebe0fc794b29e371418eb8fe5a0aaff766fbe4e9251c3aac6e8b32be4cfbd90093cbc4d12742d515
 DIST github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.5.mod 50 BLAKE2B dafc6e6293ede20438a91e9a6b1bf66cdae8b1636c525d0ec04e0912fac06def988de0be701dcbfe086684679e67daac943bdf8cbd44b70217f2f7af58878699 SHA512 ff1e77ca2511fa4e6d7bd76f0733e89eaaa1be8df68b0b35ebe0fc794b29e371418eb8fe5a0aaff766fbe4e9251c3aac6e8b32be4cfbd90093cbc4d12742d515
-DIST github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.5.zip 4726 BLAKE2B 3a345393fac315c759555282160db27f7c894c68b63f7b71db4323a35604b5780234d69e98ee910af1a466b819a7606ed1343b2f1aabdbb8c1a0dfb761828de0 SHA512 60f9f8179c1b65f00ccf61e7b7d6bd32f7eaa5b7861165bf291c9f2afcdff7ed141a28c84b1af3ad66b6a9ce7386a7d1272e3e7457ad14bfc3141befd8c602da
 DIST github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.6.mod 50 BLAKE2B dafc6e6293ede20438a91e9a6b1bf66cdae8b1636c525d0ec04e0912fac06def988de0be701dcbfe086684679e67daac943bdf8cbd44b70217f2f7af58878699 SHA512 ff1e77ca2511fa4e6d7bd76f0733e89eaaa1be8df68b0b35ebe0fc794b29e371418eb8fe5a0aaff766fbe4e9251c3aac6e8b32be4cfbd90093cbc4d12742d515
 DIST github.com%2Fmultiformats%2Fgo-varint%2F@v%2Fv0.0.6.zip 4998 BLAKE2B b304945d5cbed5491c53d9e72d517ad0d4689e8a573b2f62b011d4e332b544ed5f6aa861041dfa4fb89e7f67759ee362d6ed9829ea980adc8fa7bd6b4407fc81 SHA512 4300f75f8a1ff5f3e70f0838726389a7ada60ecc138124e8f974d45cb551cac7f938bafc91d7a1f602541463cd6a13f2d8314049fed16faf55e07ac6cfd39975
 DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod 71 BLAKE2B 01b34bcadbbfc83fd26f11a51b23b66f59212c6c9f9f669ddff2d19c7d563df24839933473705b86c235cc143732398d11f0ce2af1979cebc7594a742e325019 SHA512 8df11664ca01688c0fb0648e6943c13fe0c892ddd94cdf88da039470449726ecec8b0eaf69f0e41f277e9248502325093e698a8f949a7fb2ed9b59fa28bfa4a0
+DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod 71 BLAKE2B 329c114697ca9dc1dc69c4fcffbf488631b0a9648533db756495778f7ceb6de109798fc9c7e473c3cdfec6a049d6e21acb10ba6b1e2ec11cc2c2a99c03f7da81 SHA512 8745b75071b79f3dea777d3eec1e0f74cdefe5b202c8075994f7e68ba8e9bb87afb70d494fbf55944b12182d480da1c1f45c9f057c789b82ec2da81eff6079a2
+DIST github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod 341 BLAKE2B 96093120c73925e7a1705fee52cb06904bdb530d8f730f6ca7832ab0646a7762e012019020ba01d3781765cd3ec849bcfac3b6e903f2dcd53104c87bf845ba73 SHA512 b555bd66ca72fd51b16a45f9e21cea01a748c44c5dca1ff248efdb5dcd36b61a7a5527f3afa9d50415f6cac56d998aa8590f65e7c0a7f90888fb174fde83067e
+DIST github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod 143 BLAKE2B 946454f6ede7f2a46621597850fa560fdfa9b6a08a53c0aa95652fc08178dcfea523a57fc8030e5fa101128d697794f5a3bac20a3d92fd436f960975c3b18d63 SHA512 9937550a5df4b906c0e3af1777b64d119f6adc98f73738c2a8d376d665baa7bd4d0e97da7d93f0622325d80f84c3fa374d72e706bd945e50006b10f8ccce6a4e
+DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod 96 BLAKE2B 071f4237c2606c161d8fc6160c818259807572f1e41dec9b753653b9dfcf4bab8c2c7d201f35d803ed876b99da693d15c1f5ac4075b556bfcf78e9fbec4d2dae SHA512 eb91e385e6161b3bc7e3e2e337519c1435a368fd98a26880cb37f3d52bdaaf23d7b07e1c7430592d0c960050a08c3f94e0a18576da214e50fe7047f2324b0ea0
+DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod 96 BLAKE2B 071f4237c2606c161d8fc6160c818259807572f1e41dec9b753653b9dfcf4bab8c2c7d201f35d803ed876b99da693d15c1f5ac4075b556bfcf78e9fbec4d2dae SHA512 eb91e385e6161b3bc7e3e2e337519c1435a368fd98a26880cb37f3d52bdaaf23d7b07e1c7430592d0c960050a08c3f94e0a18576da214e50fe7047f2324b0ea0
+DIST github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod 31 BLAKE2B 294aaa7492b6b42b366e5130e12ca72a84223fe02b4f01281ccbe3ba68dc5b515428ce95a9b575219b4688a42aaeb1a5e0dfa3bc06a1db47b8afdda282cbb991 SHA512 918b829894cfd626c011f7ff13934a2c1c12c3482ed61652ec2c59f5b94a0e8c8510e3bef4f5cbfae977df177f8eb9a123738d7382a6a6e2f8cc582d50eb10c9
 DIST github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae86.mod 38 BLAKE2B 22b67e9f112f9074c978cc35a361c55f49e38ecec057d0e02e21957c2abc39a7992a487dbdfb22dde3a1e07ce95decc222708a8872e07756b62bebf103a21e02 SHA512 640533d437f3ab00bf4a436007f3ece53f602142b44319d170d5714da2defba70ed0f8ae93ff73c5d699c8db8ded1dd9b77a21653c3325b500b75eccebd39a9c
 DIST github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod 37 BLAKE2B 627af5df50cde39e7808cd6bb979e0b1d2ea9733dac6c36d7cb0475ee6b3a1e1e6c20d6c1a34a08e2e5f59c9b41d7a8488f56cf57fdfae110508a54ee8cd307f SHA512 a089301914088a4f0b1e6905a8cdd5748134d1834d0ba34b95c41bdb463dbace1b33901e727257f3b03cd8dadebce33c3301870f0b7ccf63483a71fc63a4d045
 DIST github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod 206 BLAKE2B 67500c3221887c3dd9f65540736ad077a412eb394a302c2dca06abe3a9313ef8fa1d42a24f5df385bab8146a2e291728bd0fc4da0069af9e6919588c630abe5c SHA512 b8aff850aff011830e02c0ad21b0c4bd70bcd09dae13d720262691299a180fa1039365a6695bf0329ad1a9dfdbd71ddf28ce51a7d3289248eef51cf472cb3a00
 DIST github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip 25231 BLAKE2B 507e1c3dcd006ed29aba002827bad1ad129a97f58fd1e5847d0cc41022716965401c5c3d4027900bdd3197caa4c0e797805a146b841bed1a80b3779fd74e3e24 SHA512 64e6ba58de56e5b305c7ce64285cef1375360e87a7fc506be637ea347b63a2a89a1b56b8db3687d16b0dd631f8faf9c107c2b473b630e450aec92cfed1040695
+DIST github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.mod 141 BLAKE2B e690296e75b3bd7a25e31adbb55351c991d61666c6ecaf13439ac29b8e0244726dc0fa4f3f5fddb9c08b24d823274f21b57157eda90809ad5f9befc2dad2c628 SHA512 e28417ec57ad5bd2062351f8fd71e3f70036a09c8033931c5598e601ad497053d768ad7a08982d8cf9ba2ea07293856f154d99b934069385a3d2befebc87b5e6
+DIST github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.zip 31499 BLAKE2B 87b7a109ab2a7780fbe9b85814b0308670d613556ee9316ead12e5b826172ad33a2f44f94020ea594709d19d1ce84ba0d480bf461a182e7dce1d21ed2ce484c6 SHA512 44bc18f913abf245a32b79bb74e8a6517be3db9ba38ecba0f019f242e1b8f7dfc776ab40edd8b9683cde5be11a074d04f975053e8684cbbb64729200999f48b5
+DIST github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod 30 BLAKE2B cccdd5811f1be90eb22900329526d699cb97bd2bca45cf30d8b2eb7fa1f2539f107b3f5ac4a93b4c38c44abf88d2957fb3e625d93544d9e726ed4b2f7a01a9fe SHA512 cc0a9caf1e57dcd87dc0757fb61c2b503e72195e089d758278323ceb46d06871dfc15508669ac95a470386987c6410cf72d0729140d36d9a445a038ea79155a9
+DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod 28 BLAKE2B d1f2187d0457fbf3087b388af0e41fa8c7a6c1d54c9f22fb631a144f42adf679bd372b5fc45f8d6f33d7e3cfbd57c1b7da2c4e969ae32185281390db58e9acbd SHA512 41e5c366b775318a4162bea00a6fa4e3d5a23c2ddb5c2707e4a4fb77c42855ce407429a7cf9c8e506bc79493ad5c56423c70dab081187ea6c94fbdaa0d5040d7
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.mod 168 BLAKE2B 5c8f6f90e14aef57fb8fa7dee546f60a73a2b1c16f7d5688d6a0b40a3d04ce308a8622f64242d60c1a014e3aa9264c3069404cf764026016d746fa7de031e236 SHA512 c73c807f01657cfadb139db3684cf680e40ebadd4db38cdff690407741675556e534aee37c96e4f54be64283937c81114856225f3d3f64999cecf5df11cce2a0
-DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.zip 247496 BLAKE2B d869b0e31f60dbee0cb306ec60f7f77d75dc44214be54f295a525692ab2153d979d139f16b87b071b7382b4f9299a59c4795fd78bc1f541ed98bc3b869a63f8e SHA512 c1a57fcbe01ab401f55b4e6ffce452fe578c5af100ae5e3c2234e5066cd7ebb0da98b7033bed9b28f7ee2c33457b450c0869355fe05c4cc86bba0210eb2d56ca
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod 166 BLAKE2B 8fad24303bf57553db631ffbce484b05ac3e7db117503b7ce555c55053a0550770ba6d7c6b831e3daea69a9733d98592e98f90b2e9f5b5f3020024b55c3d5cb2 SHA512 06e7e8754384929043159942b2d873ea872b974d9fae1971465592e44eeb26b072539de290adbd79402bad2a2c7fa38556a7597f5e8157e82d7576cad6b49692
-DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.zip 248478 BLAKE2B 9d49c8ed01d4785f19d292861727337cb75603854b65a5996f59b2933e55e6c6bcb6cf6c71b9cfbb1c20e8ef7d1171eda17c9e3982efe48b5ff8d984aef313d4 SHA512 45696a0287921a819eb38ebb5d29a8fc8f174ad03f85c9768928fc94185c2ec275a10a9e7fe8bd2e5a12d8b378d01ddba9e8b96c30e5fdcf4357945ddd005276
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod 254 BLAKE2B 30062eca1c156d706683b2d2b88c70dee8e38da4d4bb8785c3894d7d496838f0628095fdbd020961bc619c8a653216f0efacbcceaf0909820f01d070fc1f9d9b SHA512 8a7b93a80585453b3795e1c536fa232511c6eb797125f3600ab8b1f613d9334559692425855a2ba95e329595bfdd38e8eb3588aad58aee8464f71aadc56f4fd9
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip 258725 BLAKE2B f40083a2965a442ea70d613f2fad5b4541cec4816b2ba6a28b92e6ac679d8e68a7f17a7c990b2db50583017668f355b1b242fd7019e26afc5160cd64dee96458 SHA512 42884272a9d723ca5d78c4fb5adfcba500eb4c6fc8fa22d11a2104fa36bbd4ce3c751b4a99f850c01efcacf3462fb855607bd26ece1f6182e1ddd68b29a734c4
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.2.mod 288 BLAKE2B 54894e7b679e652f482e824318ac795dc4500cdfb48a4a35f606726d99206ca9d4992f8a4199aa4bb60bfc06a95eeed797507772af168eb6884dd563da3c886c SHA512 1d886d0bb74668946d7aa2cadf770235d83447422d91a020ec2e049d19ebacb01799d9cbc22e4a2e190f205c1398a495d2069790ba30d87d8f4cc6ccd76ae04a
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.mod 366 BLAKE2B 4e856abba9dd7eecea1d60709494e10b84b5875047a823f05d523c2f088534ddd5a9c03213a2a49a6d3e5191a9e53f0909d9262a034055ef08cd1a469a76e276 SHA512 2be99360d5e1ad7f911dd9bfb96b08fc53ecf8ad7cb09e29798b417677b788114bf1b254ed8aefdd0e0af5d4d380fbb939070ad3190beee02ac6288867fe29cb
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.zip 287470 BLAKE2B af59216b4e377e4a59fe63ea849a2dba7a156ee117ea6350ae7c3c6cd20b2ca1e5347c26c9109b2bcc9dbec2ce2b3957dd922272d708cbae4e3b46d41f75aa17 SHA512 5963fb1a1373c128fa570c2e84805695ed10f6065f6aa6d121c8752bcddd718c287a04070219fd0686e5c2706e72ade578c57375d3830bb24a66718a7d6cff7a
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
-DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.zip 241037 BLAKE2B 6496c984a58729c6d0f0099f22d1dbd9c160639f3eb15e473a3ac62df5c6bb3dd6ec3a70da85c75596e28c04d0ecbef7a2e3ca858e4fba0247e85fb81e15fce4 SHA512 90cdcf9e8aa063711cee273792a94fdf4929c0dac94255e28f5c51894d91deb71284acc94d733c11d38c503c5f1a4770180582eca570a0530d215418eed9fd97
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod 245 BLAKE2B 8ef01845f54a49336d1d911ec510a912ca5960eab195d6e193a4dd052d1e4158d2dc90a1c89749ab719e3d017decccb02a6af9e6d761016d871ea6498845f936 SHA512 2d89b68a9f4c3e3bf9d46d23d5b9f906d05a3c6ffdca50e83d2e07eb2f280707393828f8f12110cb64c28e96673b76fbc0235a6108d8ebe0064aa6fdf4d33f83
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip 167538 BLAKE2B b6ab81d8dafa47bf212bd61697aadb4f969fe78b5c0022aafa855f864db4989e4a06ac2966e4cc27a6b595eca7f09c4a171a30f8c31787f9366e278e596fd3bb SHA512 028f09b7234ad1a7a2788c4d9741e140fd4ecfeb6a9650b941577c5605512336848c86a17b011ca2bb48ebd5d34e6164ef568da4e3ca92227d39cd489025d430
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.13.0.mod 197 BLAKE2B b5a4df38443c9a98e3440ccaac22bc6ed23bfae91f553521d18ba3af06037ac145cbc7b9d7e4173429d046aeff7fc8eb517d0d1fdb7aa29059396c80b976b1ba SHA512 df0e3adffe3b888e5888e5a646023ac828e4e20d024aff2496a20c26157f56e5dbfdf577ccc4ba833f8cec9443c73a68bcf1bdbc5b5fa11182eed22832d52a29
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.13.0.zip 209427 BLAKE2B b4cfff52866694e1f6d40b45cadf2b31092f2b8c980c78f1b2aa17673024284f540050c92b63b02e76ff791b328023627bd49e4882028435c9ed0e6ca64d70e2 SHA512 0b68cbb1fafe64f2405200e1432cdb43a3119d152be7057ab5f27e1c535baa1681b815306603737608b4b1d1c5c7ab18dc31ffcc003e6c1eda24655550b693eb
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
-DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.zip 154143 BLAKE2B 077779c5b91e3263fd0c30d65b0fc62f8c49d0ec6e8b3be13faf1e4536cf93d4c725f34bca7cd285e3ca1256599ac81ba61ad9d171bbc1d80dde7b5335b6e90e SHA512 446d3314c4f8c26ed361b682e49a6ecfe012106fd177fbe420b5bcc6780d382ee0f426276443e0d66a47fc72dc2cd8768157fdc3bd769641c17abadef8217101
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod 556 BLAKE2B 8e36edf565660234a9c939b93e99acfd61c30620cf45619158d5a87c102492333387de1bda35aa226695f913358a4385d1b8b768527d8a63d056ab8f13cdae61 SHA512 3c48b6f2cd9bc71efc218b11ae432776164936d4474df73510a785819c417fc894ca71f5783da77f323754ece56b681f8f1e9dacd5bf309f189997ba0b317dfb
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.mod 613 BLAKE2B 5c582ba17d40173653cf739137d0bd6cb866c34fa1f76bf8f0b96c1d05304c5ea52247ef99d6d31d5c6f41bbebdf5ad9e0fb21e275b2cb888098e0ca3ac8f30e SHA512 1a7624cfc159a3444be19238a2aacd003e1b0c6f586d3f6862adec175578e0bf40fca303049a15ae3cd96a1c61395dfded8427f867e1aed4dcca180417fd80f5
-DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.zip 162928 BLAKE2B 57b8631946af88b368834e7fb04f0f0dfb9c2c8f0edf2f53d6578cf569f395a3534289d1401d2b76e818949ab695f8716874feb84f3e7d16a7045fb326eb8b90 SHA512 c5e494b291ea08f880b0ad557bc712059b94dbc9514d3261651305f97979ac66f2244cfc9bfae4393ef6311f3438c30433f30ee0f64c05d52248dc3ee40277a7
+DIST github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod 32 BLAKE2B 0037f79655226dae67faa11b27847001c422534de854283b8124640e72f9209ddda65f4fd601cd35399c0d6705b65131b94c8bf8dd8a15c2bdbaa0c4404b58fb SHA512 76f6ad85ef60c0972b9193af3395e586b8da352614049125ea6b39ebddaed94fe3b6a5deccb8a4d33890f292795d2c44a3563fc420106bf24589a1d838f35649
+DIST github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod 45 BLAKE2B 4a11e9a4a24eb8e0603b2e708591792b76e8523cfe113df480a67bbe95169d1b1e30ff8267ed6530684369a445f2d15f433f258a7c36b7b03381154ca90e1ae0 SHA512 33ab2af09dda0c6ad1d7b3f85dee520f18971c9c0e161d260f04b08ff3cce9b0633fd09b90c46aa5770a783ab7fe6871e6f8a5a0ed90bf56d555bf325beaf46f
 DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
 DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
-DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.zip 44929 BLAKE2B cbb592f6d60d1e5906d0bb0b89431713851582a17f092a7bdb7a508469013b99567a6d6f44807fdd79bbc6e470b01c6605d74b79dd62215111d2d4d5469a5fdc SHA512 a813adce63d0ef8b5a2d95c86099967bf5fdce2c7e71e1bc72d760e1235dfc430e650bb6dbbf1d42987586f496b1a5bfa6af8d20bd1fb1fffca786319cddfb22
 DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.mod 98 BLAKE2B c02a87e814d1c714464668cb563452e38abdf990ce032deeb5f7d5a7aa4975a6836943318cf7ec829d26c702811ec7fcee6c6c27ac3056722926dacc5b12e19f SHA512 00dbc2834d06b7c97a79f10cc59c588f37bf8f59658a2fcb16fc773507077d09426563028c247eff9bf2b5b849af8b0d12af45f9cae0b400263e9b49b868b56b
 DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.2.0.zip 49529 BLAKE2B 2d53d01d52d4e08323b8d59b8425a5ea43e47d44fb2872c69da6473b33b39f7303d464cfe100e9d441b1767185f875d8c6d3dd183c5f9b0523192efce6a81bd7 SHA512 37bccafecc500372653d1dfd7b03448242399cbce9cf21ef0b34831672332b2272b143ade48346b7d1914d017ce94957ccf53b96daf9a110a3f05a5929e0ad73
+DIST github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod 50 BLAKE2B 45544c1be596ddeb8fa01c80e7d96799912343c885784b18c114716ffdcbeaa05a772d819b9a762b7f155045be1ab3409d423c173356c6fb61b9dbf810c606e9 SHA512 edf1afd7200a64b2feecdcb8f1007e58444ab9737bc0e9d4cea67cf286116fb0ebd4d9b9ae10786bf71265d9b813b175f78deb0b416346736c9a7e39d741b6c8
 DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod 39 BLAKE2B f2a29cf2ce5b2862bfb3d894f36035e27c8cbb4ac1a1fe78cb4a0bacb1e3fc20e82d38b9b6c5d8793229cdf5d5a21975c936de50e6e3d395296d7e116a346d23 SHA512 b4a425d5f19203f3808000050e56a197965f4f26b8828ffc5837b7ee2fec2813f7c38dc242614a7a2d97b5fbfe63986c0115bce38b5a02eec6c60ec7a4568114
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod 1010 BLAKE2B 6bef0142218537a9452ead65865ba25d9bd2c9773cd87e199a72ec57c7de0143088044bb79e23c2d7a29d4275713efaeab457d8fe2b519006883b0c15f11e24d SHA512 10181677125b9bccfca933fa3ccc84c81381548b0bcbbf1c7423822f13902eca3907e06d9cff462126b4795b8ecba9fd0525e4dd9f90962697829b99dbc20bc7
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod 1033 BLAKE2B a6a88217fc248fb358f71cea9af2fe5a4346d51927e75317792cda9e00896e20f70ac060618bb1a648a05c5d214482a2cdd4a4ed5c5685ba583fb17b7d7d9a10 SHA512 44a8be7c11b9055ee26d0386c31f27d24d7d82b5be2594842a5338007f9d7a0d2bf835a5a2ed20c3dd78a0f8188f7e1d2d2b072acae0346d170612d38df4e761
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod 1033 BLAKE2B a6a88217fc248fb358f71cea9af2fe5a4346d51927e75317792cda9e00896e20f70ac060618bb1a648a05c5d214482a2cdd4a4ed5c5685ba583fb17b7d7d9a10 SHA512 44a8be7c11b9055ee26d0386c31f27d24d7d82b5be2594842a5338007f9d7a0d2bf835a5a2ed20c3dd78a0f8188f7e1d2d2b072acae0346d170612d38df4e761
+DIST github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod 369 BLAKE2B 96cb4a6ca9813f733a4a86753a406716bdffb636c0df7a43227c6eb5f950cf9fc8d1510a02a6ac9f75198609e377a6f4c3af16650527345d9a2d369ff6792d39 SHA512 cee2d00b0b1b1c3d09c27566af4f47243360366597b3b101656cbeb4293ee3e36c38ed046d193bc28dedfc86d36a9d24343c2b0e4f231aa74b7528e1c302617a
+DIST github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod 42 BLAKE2B 96c6dbda3f5479e2687e4dd71f0bda96d8f25d2edf4665e5e4b742c942fea4db9d879cb039442672cd9aea2d1667091355d745156911bdc21a3344fae5e52752 SHA512 64c2746a75d99c6637221fd8244cc1a07c805f055f4a1f3c1408e3b6c96471343caf438ae1b797c424d59660777011201f47f262ac7210aa81d37c6c3f28bcdd
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
+DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod 70 BLAKE2B a94864739ead6676f2defd1020645bb86b8b77600037227aee95fe3e82070c31814fd055dad1fa16ce1a00f64f32be96a97968259ef43f70f20e8a55cb9943eb SHA512 aa2a52cf55149c10f76a8e535dc75ff9bc18b4f2515a31e8720a26a5f501459c736dc73548d2e37f348f27b78974bf0a3b18080df972eec26222fd8afbbcfabd
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod 43 BLAKE2B 22517b91de93a0e72290dc3599ff8b4fd4fe2807e175e3778c0cb6977db6c02857b9a331e2e07b21851fbf35eefaadb2e05f36c2bda3c2381f22e23d4f24b89e SHA512 b2a58daf4ac906cb34db04bd3815766a74ff25c40c4f4b70edbefac0d3368f1a26ccbff3a5ea910c399ecad0213a2eecca174827caeabe3027e0c99fce53bb23
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod 69 BLAKE2B e3c2bc67965f266f7449c37a9cb421a8a5464cb18b54ec9c81223c81b3e19890e4b628e3d14a7904a6de4e8a83b53a21c01ae32f774fb583a8739eabd00daaeb SHA512 7b303db4973d7804f48fc036bd427a8258d34aac8a8ec95252e6602c7053be4428b5e15642263913686c3207cda00316132ec668bbaeb2748e093b1f359a1620
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
 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%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod 30 BLAKE2B f5ef9d146a30ae9c67d2f7e86eef366821045d1f7b6442681377ec8d4528e315b661373ce82bedce6dcc74bb3dd9b7b2e5d59c6d5fe6aae8302a09656bd61b04 SHA512 a8742602593700ae7d9d1bb18e567d5784239e9b158b2c9ffc0c16e1212013bb9fe49c4bdfd58fd2e61e1752b5bd0390fd6910d66e5ea8917450a3e41609d54e
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
 DIST github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190221155625-df39d6c2d992.mod 33 BLAKE2B 256a9a9458b7ae5c74d742e08c96e912ac6c0b67cb6d9dc17aa5926d1073e112e113053264807eebe81b9f96082c70b5590213b1676c4a5ddab7fa3c11757785 SHA512 fc4984200134640570889d9606b48bb88fc1d93c982c060a0a733a2b70e147d2fe2d17bbec2d11bb18e877722512da4a350c6317f9d7d1a166699cefc2a412f4
 DIST github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190408063855-01bf1e26dd14.mod 33 BLAKE2B 256a9a9458b7ae5c74d742e08c96e912ac6c0b67cb6d9dc17aa5926d1073e112e113053264807eebe81b9f96082c70b5590213b1676c4a5ddab7fa3c11757785 SHA512 fc4984200134640570889d9606b48bb88fc1d93c982c060a0a733a2b70e147d2fe2d17bbec2d11bb18e877722512da4a350c6317f9d7d1a166699cefc2a412f4
-DIST github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190408063855-01bf1e26dd14.zip 161442 BLAKE2B 1fdcc668e2555596391ca7b2c1275628d5e7f7324f3008f50d336e6ac770c826664a0a584f397f176b44c3667852592daf7d9cc302cfc4126e54ab078ad74557 SHA512 203e53bd20d07b562137a76b7cb12a3646ee0cf17032e510c2d21ef3833c7285c3c1705dc299552710c808317f2fcbca0b8f238b4e78a0d02dfcd9a4b95ae2d3
 DIST github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190807091052-3d65705ee9f1.mod 33 BLAKE2B 256a9a9458b7ae5c74d742e08c96e912ac6c0b67cb6d9dc17aa5926d1073e112e113053264807eebe81b9f96082c70b5590213b1676c4a5ddab7fa3c11757785 SHA512 fc4984200134640570889d9606b48bb88fc1d93c982c060a0a733a2b70e147d2fe2d17bbec2d11bb18e877722512da4a350c6317f9d7d1a166699cefc2a412f4
 DIST github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190809202753-05966cbd336a.mod 33 BLAKE2B 256a9a9458b7ae5c74d742e08c96e912ac6c0b67cb6d9dc17aa5926d1073e112e113053264807eebe81b9f96082c70b5590213b1676c4a5ddab7fa3c11757785 SHA512 fc4984200134640570889d9606b48bb88fc1d93c982c060a0a733a2b70e147d2fe2d17bbec2d11bb18e877722512da4a350c6317f9d7d1a166699cefc2a412f4
 DIST github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20190809202753-05966cbd336a.zip 162643 BLAKE2B 9703d73eccebc6f5de93ff2e0d86b530456aa4e4185e42a6cb39927504b6c5c4a8ffbee1bfd27d67acaa7f6e91f0f7927262e0bca3d1836a0135aabc4452ca92 SHA512 b985a88ed9c655cee21f5a858567f0241cb3636b92ebc25130148f24dbe2e7b35244adfc4077fe204dbd7247dabe47a3233a8a582a76fc5fa7442c2a41c40719
+DIST github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20201211092308-30ac6d18308e.mod 33 BLAKE2B 256a9a9458b7ae5c74d742e08c96e912ac6c0b67cb6d9dc17aa5926d1073e112e113053264807eebe81b9f96082c70b5590213b1676c4a5ddab7fa3c11757785 SHA512 fc4984200134640570889d9606b48bb88fc1d93c982c060a0a733a2b70e147d2fe2d17bbec2d11bb18e877722512da4a350c6317f9d7d1a166699cefc2a412f4
+DIST github.com%2Fpolydawn%2Frefmt%2F@v%2Fv0.0.0-20201211092308-30ac6d18308e.zip 163244 BLAKE2B e8ef73bd64a738f4f83dcc353ee12dfa2e1e5b8941b2719259e5cdd8b2c4e4601a2cf7b043cbab96b5a9af47012416ccb319517da47de3c811d541b8d4337777 SHA512 9369096e5d679c904dd09f37bdac1580cd91a9128eeb07e2ef762c9a52182f9c6acb6bac46f72c1762b4e98b433afbae9d879f4b40b33d11c31e4a4d811bfa8d
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod 540 BLAKE2B 4d43a0901fa46da74e62fa22f61dfebdf6468f2766bd43dfd487d7a5434f961d181ecf26015ff9134e8d3f9c2dc03da6abbcd0030348facda3a499af9a04665d SHA512 9add81238044589ae2cf38042b963953d507e40945118fd62ac1cbf41bde1b001a69423c50b7045b721488b3d53489b4ce3c544b68f6c4e31e340d2581f7c8a6
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod 443 BLAKE2B 2bc1a0ca986dd17787cbf528312efc6e721d3d9a46126b90537b7cae6681192e74afc83f3b64f8835314a0608a3f146e3fb74afc3339bb7b009d16ba04208cbe SHA512 e45c711b58e0453c63b899faabfb662fe743085dbc82782ef730ef6797fd8d372208d4fa887168ac920d6b1d15f7f65fc9a3fbff25a4474915d858411a7adee8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.mod 377 BLAKE2B dc1cdf5c083f87f165dcdfd61ba38bffecb85e0706995aeb5bc3ea3c9ae4465e86cebe7e089b4aaf1ec9f79f5b3d843db14d19b62ccdc32f09afabd41d3fede4 SHA512 01ef1e7e81764709488bca1ea7434352e33eda89dfc16aff0735cf16e774fdcf2507b3565c62c31b17c60b52abf3edb95afa0034596d4d07bd315da843d09471
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.zip 242496 BLAKE2B 885faf82949b17b3c6aa100a4bd0f65a6bb9597516766f401ea73bc59b4728b839024319e1457385f7e37c2053a09ce42fe471d7c348a66896266ac723748cfe SHA512 2f1d44c4377b9fa66d65bc3b744b66e522e52c89c5d54cfb251e7e07c821a164319de8c628d4b4650d646177c49ae03507eab5aa10bb2b198bc6b45cce513513
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.2.1.mod 403 BLAKE2B 1f6b768b530eedeb17d97fb568df5a39f5d71fc75c5851b0a07b2cd6dff1884c5d42a4b19eb7ec5677699c4f99858b9d7301ec8fdb02b36ae6d401bc38c17a4c SHA512 fe961ef0875e1251f0387a7b1a49e41d7ccd1150e01d383c6893f020c8b0f403d87a407e47d96b498b92e61ec93cc5e1da681e35e586b3d63b4c54d1d4dd685d
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod 375 BLAKE2B fdacadbb6c23350ffa04e625324420df9b523d9fe5bccd8bd1d8f6d592d7ef5a2b4620c1d16c78bbbbbba2716f3edd015cc16ae5b0c3c31e5959ed12143ff3b2 SHA512 e98ebe9ff7f5f5c893ce7a54c12b3d5b86ae1f99a5117875bfb78aa2b59d9e9a95bd54e45e1a16e8bdfa79f38192626f49366a0ea4e36a25681e7448b544b144
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.6.0.mod 568 BLAKE2B b9afafc90713d607700297bf306b19e65ab9e250e4dd8c4cb437fabdc08fe1f7551e334245950107a6f52eb2c0db5ee62967efdb9037c89a49b102737614efef SHA512 3c53048eb63a00ce6a692d95f285790f7eca72e554262acfbaf8a30122efbc9767bc09abf3d6c16acea65c81e4a94c862fb8b627135711d92f89566cdec67d8c
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 569 BLAKE2B 0c975c1c48f40792b02fd8756be3b6bc044ca05725ae179445a858baed4861011ba76051aa25fb10be23c6cf14738cb9cab928418be49d8ad85211d398089ec8 SHA512 6fe81bf3c591058f2ff968b3c6656766d9d3fd74c8577b3e7cfac17e463392eed3268248237d252c98751b2f97bc7c48a8db15bfc3fbcd4afbbaca0e2970819b
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip 226158 BLAKE2B 899457f410f559d70cac7131e9c6057bfd749964b8b133943635b0ee78a12485d933718569d085f51dd34f831114c2f74986818536cf21ad642dac793b00390a SHA512 5c4d5e70be8984c9eea4211e06e1f9478fea4ee4cc227167b9a99d87fa773e060e42aa4866eaed39e58a251821840643d5117b12006a6809902daa08cca14b2b
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.9.0.mod 377 BLAKE2B 51ba08b9e8ab65c350bc60bf337cf786426ad6e51d2548f5358622b41608b7cec408d264ef87810da60f9ef0a7e6ca972cf048d0d5c1fb5df748f0e342d75cc6 SHA512 f325dde1f371b028a8f9e3a1464e8f90982aca72a9c262a3eab8edf752110fb1fbca55650ac48e7575a5e5ba98b371df47f2178ede11faeaafd68b0d27515641
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
-DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip 69217 BLAKE2B 738c4f5d28aff0b5e5eaa04f50e9a4e4671bb0a06dafb2174720cc0e6fa79ee87123f55776cdc051124434a3889232d512b32d08b1db1d2cb7f54e251b617e94 SHA512 6cf7daa3b86c574afbf5d91d3d4f372fb31c06ff93d59aa128d8ef025b5c22fcbca5a148b21637ed97127e5e2150305e48c241be1ee4c1b23ae32a09f19ffaa0
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip 13785 BLAKE2B 2cd44410ea7af88683792807b0f2c31b0943d8664a4be050f2e422095ef3674e6d42f4b9b6a76083e13bc9f44be1578cb06a7389b4a4b201b5a88e756b40193c SHA512 db2396362357b6d5e99b21bd4aa8d8dc193dd2676a8f437c62eafae849a56a53875bce7411d58ad78e4fe36445b72ee1a34360b174a23ca84de911f5df189354
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod 817 BLAKE2B b4cabfb93633359c6ac6dcd400484e6162bc6b609bf0edfc4a82a2cc0137edef114d0d3e9c55bc47d1abd906d9ac00f9d84f07ee7072452c570ba9f98118f4b2 SHA512 7e1b17c424c8ec889d0efb0f5a171043ac0fffb48725144836d8ac635c036e877e65f34f75055359747142051afd00374cec9e39911175adddca2c50fde4c893
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip 163523 BLAKE2B 6d31ee2f8495605c967a41b12da3e854dadf4666641fa8a324f9926d1e965cb2693e390065f34892876c2eae5c1909b5bae8c11e484dd948b7c80983c8adb551 SHA512 74273a10b05fc2e0ea263ba57a52783c147e1f0ee6a1156879c387d0823f90d2c0072b5eea4325116fa621de0af1d5c2ba19e5dc188315c60ecdf74ff8ddcc99
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.mod 739 BLAKE2B 6a475498d76be0ec42814e1d5a932c707711b9538e8507afaa36a3ee6d26b78392f750e9553f960cd9768f3ba6a88b3d8c338b102ba48260c91b0f5b48e1cb06 SHA512 5d321367c7b93f913cb524c688dc515dfe28a0cd712665b61ac12dfebac8a67fd19ba578f8a3666b557b41670eb9f3cc718fb93ca413851552efd695859b7c4f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.18.0.mod 739 BLAKE2B 6a475498d76be0ec42814e1d5a932c707711b9538e8507afaa36a3ee6d26b78392f750e9553f960cd9768f3ba6a88b3d8c338b102ba48260c91b0f5b48e1cb06 SHA512 5d321367c7b93f913cb524c688dc515dfe28a0cd712665b61ac12dfebac8a67fd19ba578f8a3666b557b41670eb9f3cc718fb93ca413851552efd695859b7c4f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.18.0.zip 180122 BLAKE2B 3642e3d3c5efd36fb2b91f9839fec53456701ee525eaff659704e029c04bc5ce4af8eb6b52cde95f58fc13183bd83c5e396075862542fcd5a445f2653ef3b45c SHA512 04822cb324c1f82ff9738648c28d7162fa7816baf0d58770e127a446bd11e980da42f58f26721388a72fc6bab8f67add0e228553c945633ceb4e34586db2f32b
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod 857 BLAKE2B 4c4486d3772ba9c4ecb347940a8e6c84d650847e5e1d9f2a0165569bf062c2a2060cd01c8325221a0c59da8864881c35bcc1532acb0b52f617a02a28f4ebcce9 SHA512 17deca5d2ce10cfeaa0f8e0b1d83317023f4c9841149f9b989cedbc9ea2cdd2d05b2dec1a6323f6202290c7920a68d35da1d4b064892072fb056ba3a767129d2
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod 829 BLAKE2B 14a7c9b3754cce16715135e33ee294058d999f343d74281b9fd111a9c0a5632b90b6594d1ed220165b58614a695b2b2aae27b2ed9aa35ba1acc768ad12e46ea3 SHA512 4cb3dba50a3b47b9db735de9df4bd7b35d02464065919502bb1e17236c2f6b1bf1e74f312a8d0127d2d570344c30d58063d62031d3439f52a6dd8f47b29b9996
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.6.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip 262428 BLAKE2B 6334337329e564dfddb576464864b53d4da3cd7c0988cb6b0eeefd3ea9141f36429f09c1f75d11560dc12e23751fe5c52a4c7d46cec0ed3454fd3684562bad72 SHA512 8dc2a0f05fea67aa9a64d2e91807cd9fc111be3ad4fcde2b8f53757ed38a478467f5edf68f990d124e1019cdcfef133cbd0278600df8abdc1c0971808d729956
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod 198 BLAKE2B 954749eeaffd58f7885eff94ed89b9c933b2506dce66db05c8aa640fc7e8ff21032d855776ad091c86d43b77bd9e2d1db3cfa7b176f2984ea66c4a49b4373d9c SHA512 539fdd264ff10a459bf00eefdfcd2d3d079426cbcce7c4ecd27e1191d6392e0451804bddd5a39f7279e3c91e63a40ed882ebe1bcce7e71913d6109b7b6ba403b
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip 282768 BLAKE2B 22c62ac51bb14578571aa93f0acdecb984ca370b4617122078b28b8ec5ab4ac8cbd6e986d60335d5f9848028f51f94d8fcdae3d8b428c8d3c8196d97cb2f04db SHA512 1b73a550dfdda98e41da9ace048b230ba05bfe7518cec7b5f877c11afa58bdf9d53ad25fa848e316fcb5b25ff6eabb0a2d2688c1cfbd9642a8670b72c3f90a92
 DIST github.com%2Fprometheus%2Fstatsd_exporter%2F@v%2Fv0.15.0.mod 460 BLAKE2B 5d83d3f75e58cf74e0272459a5771b3814fbaf0c3bbcda38161b15a3ab41f152f41f8577a6a1e31c65221300305920a6ed67f13112712a4b4ae9c2cab7b3c6e2 SHA512 f3d1cdfe9ed6844efd812ace747fcefe3a62001c4f0d2d02437967de51aa400b110a7eefe81d29fb6431c064beb3bf5a53a7265793edf1801c502456b458ab94
 DIST github.com%2Fprometheus%2Fstatsd_exporter%2F@v%2Fv0.15.0.zip 114767 BLAKE2B 60204c3f45c8910b1b32f5191a6070453d3d407e2a0013b7fb2bf8ad0174ef8d21e729a685f3190bd9fd23724d4ae01868fbe2b238c7bad0f574c6a621e295af SHA512 9101f10a043715cb354778f9bfa5286cbf85cb6776203d1a09c640ee84a4b25f4c45db4c2b098f6e8a7db199fa4deffe90bb9281f3af1c13edf344150798cd13
+DIST github.com%2Fprometheus%2Fstatsd_exporter%2F@v%2Fv0.20.0.mod 652 BLAKE2B aaabd20c603092d749f40df440b0d13af0cb95cf2f4db72159ddfa4f88e9128e6729fc398893b3e850bc738894d3d0f3ef51eed8e4dce690dc83b2932fa80e37 SHA512 ce965f2951c1c660f1a29053cee3ea9de04b6d6b7076df43d0957ed5b23c4eb16b6a278a1d786ea9b1e6deaf2a06c2779772d1b3926ef47dd2361df775470ac2
+DIST github.com%2Fprometheus%2Fstatsd_exporter%2F@v%2Fv0.20.0.zip 148541 BLAKE2B afe304ecec0360d1970b79fd91b0598bba5172161680b78f147cc81c588569f16d91ad5d1f493161d7e4666ae700823f1fd44918c46e7963a45ba76582505668 SHA512 372cd1b7ba8349cd3a285271f5cdb528865e2c9b23bc823c70a9bdb356fc28c1bbe8b9e5882d259464963c51cf28e3dba71dccc999ee25057a29ed0db79a7198
+DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod 26 BLAKE2B 8b06c3629b4e4371ae833fd22ee446fb963e300c42e4a92fb215f10500a826df54285a3d9718546fceef0e47f949034d0de0bf8aa9ca49150cd2d58e8272b1e0 SHA512 306c53774adbaefecb2283f1d90c11b088d9a45a29215ea7c627ec6d97027192bf5fe99a3cb473415ab47764802859ce9878e83ef38fdc4a87b4c7b0c5226a71
 DIST github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.zip 19727 BLAKE2B 013a8f40bcdf2d1ca9cef088fd6cc2ffbdd9bd452d3514fbfe80f4cd5f7ef2e27f08ac9ccc575ac567649060137ee1d97af33fa5962cb79d53094439948f931e SHA512 533e6e55dbd95f9f79d794ac847b1db90c0b4515e9fd1d8d3d003a991ce8315012c3f8eb8a943f8772434b1e20b34562ef02630e472d31d8485e7c8125a47fb4
 DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
 DIST github.com%2Frwcarlsen%2Fgoexif%2F@v%2Fv0.0.0-20190401172101-9e8deecbddbd.mod 35 BLAKE2B 7251cfadfa22c0c57f7a488965d5107c55aeec8daa23dc37d845248b4c2659f6dde54ad64873a38f2bd6ae32324bfd01d5734591160c8dd2faeab2cc4f12a72a SHA512 631314183e232ea80b4cd52fe6b2b8116af4960427e7cf71b1a7c6a5884063f39ab649ff8178897d2a7ef14057e1aea53bb2e6f85a84be90b89c17866987f878
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod 38 BLAKE2B ce3c91e2fcd6c3748acf0e0f6355a0af01db3c7b36a793fc07b94b1072133f7f25f4c49473bb27007ba2de7233454a3728f24eacecda76388570810e62a5d161 SHA512 54235e8bcd2f98cfbfdfe187ee4b2cc7d0efe155710474100709b1a8c2e55cc2e24a16559857fb9edf484a0b76debbcef69d5c182efe52594c9858a37b6b10f0
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
 DIST github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod 37 BLAKE2B b725084a49db41d4011b5eeb41b04efed95731edb148e25aae8ffb93d2442f094c033c5090594a607fd7b292ce7aba297faac83a908dcce6edb38518edb3d93b SHA512 6c421a36f72cd46edc731ffd184180e7d1843df9f18d9d009d0555489672ce0182021c3b71ec4cb604b788745c7a5cb0066f5d53dddf129e0119ca62009b63f4
 DIST github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod 34 BLAKE2B 01ee764606aacbfed1d971205eade7257d4a1d34e93bf0e90748210bf06b4530c08ce0cb700d87cddffb1b16484a4d40501ca3f5323f6df5288927702c4f6169 SHA512 f9bc01067de82a71b0056851e1c1e982c0447de0a00063aee820366943deb29b12674778e3497f787e848299b7b3109c525ea183688c471300743015f41a6574
@@ -1248,20 +1267,19 @@ DIST github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod 301 BLAKE2B 5322be7914862368eba07f521c046dbd7580edafd47ac633116b8c9f4b61526d0d63df11ba6894223590a1ffcf4bf478c394a335c305010ca9fc18107d4e61b7 SHA512 8fe5a437a5f3f8c1ce0aff067ee261a946d946d7640aa5acf7c34b9c8c4ee65128a6421aa38bbb1feeba1339b356952ad58b4bad98f1c89ac455d94e86684a8c
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip 65802 BLAKE2B e0487985824efba7ee61c5a73df7b591d625dcda32f833ae276191cd82bec8f3db30cc2ba217d80cb56af1436b8954fcd22ed3f861c6c7fcb4a94818357bbde3 SHA512 abd13a98d10b6c996918712443edacf97ba5fcb9ece7615f59458a583130f68920dd313533ff0d8c84c6011fd2c4d221783b1250e3250b569a6ead9d7c02f7a7
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod 52 BLAKE2B 3986b09ee44d8abc94fc0348107b410db374fccd11d77b9b0b7790b376a0f79b53bb3c70537d8d68b336ec007774fdb248237b6867b1a5c1802216073592fb0c SHA512 ae6455f8889d8aeea4b555e5c34c9583ffc5990e1772e75e5f6376d9e4d7d9e5f540ed0b04bcf142523347dfc21ae20a57d6de089718877d7db4387d9dc62319
-DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.zip 120718 BLAKE2B 4caa06b2d4c8c61d2688000ea73b7203e52a9f4318d4ce03be8c524389b719870db5fe61ef431131372d1ae1752d5f14b20f4c62faef5ccc630f92f66e746790 SHA512 60eb1355065dfa54084b5c59b88c98f872a94c75541cff15cdaec5cec915f280156d398823abf578853cb54360c3f20e98c090f6e109d1a94f018e88bf7d139b
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.1.mod 52 BLAKE2B 3986b09ee44d8abc94fc0348107b410db374fccd11d77b9b0b7790b376a0f79b53bb3c70537d8d68b336ec007774fdb248237b6867b1a5c1802216073592fb0c SHA512 ae6455f8889d8aeea4b555e5c34c9583ffc5990e1772e75e5f6376d9e4d7d9e5f540ed0b04bcf142523347dfc21ae20a57d6de089718877d7db4387d9dc62319
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.1.zip 121005 BLAKE2B 96eaf62f63fba6a88b185762f0940b41b0775ac5e5e76f9268b796b8dc1aadbd9fd9827ccc82c65c5a54de4f9df6e24a58be4d09ac17365d67fd7c985a17028e SHA512 5f38713c2b92ac95a93d592c37f3ed0315ff9e563379944008fdf465b353bdf1f688a9e949ad4e0f67a2268af50d86e6e0da2785492cf3671408f3a5b638fd3b
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190222223459-a17d461953aa.mod 246 BLAKE2B 1f831472c97f821af45c0fde298f22ac4ecc8332a2273bb3bcb6b94ba578b97703292baede7838d341f5c3df46e4cfe8d1dd10444056e8ac8f92af8f571c199a SHA512 85ef875e586f0fb710078b39c6e2ab28ee7b2c894c5d0031a1c4e1b62c39106ba54c70d3a9e21698003ec4aec9b3702301229d9d8de2957d958cff58e221fed3
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
-DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip 1529663 BLAKE2B f5bac351e33600e56b635602a487b592e9d54623bffdccdf9c6d9ca8eff7f358c8a1de307c2ed6dcdad5c94b9d569ed7efc3eda22044a2ef8aedfba985d7578a SHA512 e3504b80d856f46158f6997bce909f8fd6345d5177b556ca63b63be5d74a7b108e1dd621483478f20ff03932551132a1a80578f3561819072952fafe81c23993
-DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190731233626-505e41936337.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
-DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190731233626-505e41936337.zip 1529654 BLAKE2B 721d8f9b3337b148496a2489cd0b5be2b9eaebafadab6037ac4b4e097222d2ebed6aa3328c7406d01bcf8776051bb22e93a659e0d652ee11560209611837444c SHA512 3fcff7e19707df4b5c92519b4b3dfe0bb0ae656234b83e668645cafeaa2b998df73b04ddb5a175b2547c3ae1a39655f5335356fd2237152fde33fa9782eb4bfd
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
 DIST github.com%2Fsmola%2Fgocompat%2F@v%2Fv0.2.0.mod 952 BLAKE2B 6495bf3040018dea516fea1d786940d0b87c1ef689e7c73ea893448eb9a79b2a327919c2f0552096cf23d28e2d8a2558fec70a0de1bed88a6cbcb99433916bbb SHA512 b79f489974939012a6f9d2acc193da9b03a7dde46068c39f8fa906e841e193d9c91bde2c565b3691e3a5284b02b094fe579d91787c573ab58b921bda8ca7f041
-DIST github.com%2Fsmola%2Fgocompat%2F@v%2Fv0.2.0.zip 26261 BLAKE2B 2952b45702ff76f163cad4543c884ae3542a76cd3388ebfbd69fd459e225f2685ab90e81d1aa016be50375cecb9b75dea5fbefffe45f9ee1264bc8ebcc4f0064 SHA512 c3af71069eea51129e665d34df95da84ea9f0919fe08b45e9dc546343bde7dd5023e17f2ccdf98c88ee4de31f7fd2f055439591da204b8ad2c3c502fc4c060c6
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod 86 BLAKE2B 93d8710c720a6abfda7ce2f81229f4ba96088d4563b163f02fbe05c962e698f1ab1771ddc8a0296e8eab22a1e65f64258a5b3ad459f53de0d662e1ef3ca9edf9 SHA512 de0d160e304d1e1341fb3d3769ad300b61879ef491b3a293ebd1874ca259dc3fe95a3bd3f41b04e382cac8391174a54175e08b8422f243563e845208cac15070
 DIST github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod 39 BLAKE2B 0bf074876e4db2c76b675966ce28a4a32e7ac8a50c44f1f3c7f1cc929c682fd00d1fbdc5dd72d9d6dee2405d59d6699f1a8da4ed69863260258dd2574b81e924 SHA512 a6e5d41a24eded17812fae0ac1815c4e41dd3d60ac3ee667475e1801c3c654416346077d2473193be24dbdccb5d4fe7ae44acddcd354420d6a312a03df9daaf9
 DIST github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod 46 BLAKE2B 44bc49585092c685651bf48824262b655c9bf38fcb810ab934c0318324cbe62af85137efc6066eb30e5c132c8a2c52851741dec0d76b28024548b122621e1ee8 SHA512 183674d9c991b53d241664459b81ef54f1c2bd4c1b841af62ddb7bd72aae76ee21514a178a0d7e17267d6a958d3eb231300969bbf3db2aa266fe2a72cb265eee
 DIST github.com%2Fspacemonkeygo%2Fopenssl%2F@v%2Fv0.0.0-20181017203307-c2dcc5cca94a.mod 118 BLAKE2B b0789ebc03c4f451786dfec3cff4383b88988888a1789af90028d7a56697fb34a4aa6d085ab63f247d56768d47ea68ea50e1882fabcf7d03642c87a9ac141c0c SHA512 aec3d6f9133868c462db999c321ff21982eca0d15962a80583c98b1f7713ecd919146289c865998ed5f4904c4dc6356b2b1b9b69638865453009dcef990f6708
@@ -1272,22 +1290,23 @@ DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip 9830 BLAKE2B c5d27e8b447082c0a1756354c0a414079fc3b03d0649cee8353490827ff50882a9321b89fdae4e341da1a4718f6db4c4a4c27e937c9bf31111085a449f56f282 SHA512 aff4d1c9bab0fd619496fd6948f05bc88e4147af2fb171c4ce4e44d81c114257abd55f92fee27c4b6d96fde21c6756735c32257de7b00bdb0356509cb4b97374
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
 DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod 310 BLAKE2B 851f2542f28849f4f5c33155e5d9562aa9aa2645f1fb57e6300e2c6e98c39e0728e01a5e26d4a514435245662fccc55b8eca4eb2633a21057a6c4a5d80d24fd4 SHA512 dfde1474aedc5f36508bed07a01fdfd433967d2a6c0acadc6d985ce862da5e1cbec7ced13d55073512afbc2d925e6ad3e3cdee9511ad17b14ea8a159d8adf8e0
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
 DIST github.com%2Fsrc-d%2Fenvconfig%2F@v%2Fv1.0.0.mod 34 BLAKE2B 5d913b427d78844e8bea5233e2d5b49e1f81b471b663a3f03ab1d2b45759294e014b452cd515bd4764c307d78ffc061884474e360bf8ae7e9df733a9596f3aec SHA512 a764549f5020a2a7552183ba9baad7089a9fce5abf529f761dd49f36194dbfdfb3043d6625338b62e3676265eeac83a0b541783bc43ed7dbc29a6c17c72bd0bc
+DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod 42 BLAKE2B 528d17f9ad90612c6004aa88eb138daac467c3cd82e8f9a990e64ec956a9e50ebface9db66bb7800f74e7923a647999a9332d871f08d78a7eb09883e0fc6c811 SHA512 c5b104556b88e433f61bc94d0b61fabaa86fc25f3089a03f1360fe61b2b3487a5f2c6c3086eb08298d48cc05860652b58075c51d2767c2c4f2a698069b7dcbdb
+DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod 42 BLAKE2B 528d17f9ad90612c6004aa88eb138daac467c3cd82e8f9a990e64ec956a9e50ebface9db66bb7800f74e7923a647999a9332d871f08d78a7eb09883e0fc6c811 SHA512 c5b104556b88e433f61bc94d0b61fabaa86fc25f3089a03f1360fe61b2b3487a5f2c6c3086eb08298d48cc05860652b58075c51d2767c2c4f2a698069b7dcbdb
+DIST github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod 34 BLAKE2B 8362ffab206b4889b3d3c3842042d4504d5e040313b40a66022477a6edb32b377f4756a8c783c1950f1ea60e4ed0f9b616408908e44e571fa340c75639f50e5b SHA512 20d2c6658f5ad6e033e9532ddf6944e168fd2296acf434999967932ada1f80b6ef2e4f433dc033f745168be3e77c07931d9ae95c7f48c9a01eea2f6c2a7a9855
 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.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
 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.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.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
 DIST github.com%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 github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.0.mod 207 BLAKE2B b3578856c4b568f9e23567c8da567675f81f1bbc2ce1ad2838a1b13e3af24c4fb934cb42a981e7b69c0258e64468a7e563804308b9e4e188761e3d51c3e396d0 SHA512 ab5490498bd7094429cd5ad92115675715f8d70493b8a322bd816a87952d922350c64d3d2703543fa7f36368c901a5ca6bcff5d79d023b518f134b2e21787631
@@ -1295,103 +1314,97 @@ DIST github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.0.zip 194781 BLAKE2B 6d7bb4caa2
 DIST github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod 30 BLAKE2B cb0fc1336f2738d7d9c55f460d3983d043d78c13f79431b0f01530b780e27d3f44d7eaba3fc4170e60fb5c5a86b26a5a41f4e27fc3ba1c1cbb88ae23f5bce5df SHA512 729bbdce95d05166c0793f65ff5abe5178ffe5305a79d06ba2f447334ea9a13404ced5ccdf4d83b4782d88f46fb57b299750a14fd2cd16629696f5f7bc8a8baa
 DIST github.com%2Ftexttheater%2Fgolang-levenshtein%2F@v%2Fv0.0.0-20180516184445-d188e65d659e.mod 49 BLAKE2B 6414991cd5e3f6aba6690dcd897c3956e8862e455e3daa295b2a7d95e6ca669b11b2976e9e30b718bd7edf0d9def37017c6d71135824a5c49aa0ddb5739254cd SHA512 a4fec2010563245ba213a0888226e65b1ef2c916b8f423d3b5e0c3fb1c148c0238f1d946f718062cb9e180873b0b38da940d3db9f6ea3e254f9fed0e9b9888dd
 DIST github.com%2Ftexttheater%2Fgolang-levenshtein%2F@v%2Fv0.0.0-20180516184445-d188e65d659e.zip 5805 BLAKE2B 582f3ef751432b3b601251887bad9961154b0bf32670e8c096287629a6d6b99310655e8e475033aba82fcc44b4160b10dbaae2752ac42184f050eb950d5ba74e SHA512 505f8b938f0bbe663950a11046eef233f1056014638ee25332042f6444275083157735136508b5fbae529d0e400fc6a83b2748626b33995e449ccb5343daf1f8
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.mod 41 BLAKE2B 378ab9c63802f76983c723f6eeac15d66879448bb4f5356a2c3946c0a8364b28254740e767c1e93f4ef184e281da6b492ec80303408f2a8a195e91b41523d41c SHA512 03629fc253c30ee850ded4bf4704da2fb8f9225038cb061eca49948215df7f924d85bb9b31c9d5726015d08e4817be6754f80c7db1186ad306853a208efc06af
 DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.zip 3754 BLAKE2B 55e0026b79ac8c2b9aa9871194b3722732b37c67b61c8cda2ea865b2a7d051d6012042480e91e9ebadcd638192ebdd42f9be2e1c0e938327ecf70c5614103bd0 SHA512 8163ab76d5b8212659f38a6b63c5d7868f05588456ff04aa9dcd63394e637ebe2c7448c2082beb881e6d2816dbfe29520a723ec4d5afb7113f74f4b621012a3a
 DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
 DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.0.0.mod 183 BLAKE2B 43fea991eaa4bf055a796d40ee3a72557fca99711c698b3ef2feec5d175ff6cd1af486f7e3b08c6f95b6035ea5a6c9bd76478264102ce85cb0bf08f22b841957 SHA512 4630a9172936eba1e550a8f6e95847faff6c2a3687900143cb8ad593df1b1f7f793969efb94dbf42a529074f6a4049554773157c3bc4eb7179f435d0af317c90
 DIST github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod 33 BLAKE2B 18c00dde36c8f43d69eb58d5bad8104b2280b5ad61eb2e3f7b74f410c5ec3c59dd629f4687274f8dec7f7ae90ebce5dc422ed80e0aaa747e4b6b8d4eb1d6660e SHA512 5f31873a3a87704b5ead7c17eaa3c0ad90e4a2f313ccb838581b5989edad895cf438b8540dee8edf373ecddc3bb70ee747cfebca300e9d8b724453421ca78d3a
 DIST github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod 32 BLAKE2B da1ff9607ba3c4e6714dccf16e1080d4e62e4fa478ae4e9832248716f7ab751d180b8fe3529167097834e4f103b2446de6b7bff0d28aa220a204b34a253ff185 SHA512 800ca66deb2973a44b8443d5c8c7f762c637144b0a441697077e1396c06c66993c9d81e5a8856e3ba33f7d12b099bcf13b1349efc096009a8ef837da1fe96d51
+DIST github.com%2Fwangjia184%2Fsortedset%2F@v%2Fv0.0.0-20160527075905-f5d03557ba30.mod 39 BLAKE2B 2294b23592934abc3f2980317744c287e11f8409885c12667cd7cf52520e2475ad0624c9dedfc55936ffbd374a91cf900ee4a26c9786237f1bce2e0242ea15b6 SHA512 48dc4c7db3e05f5ff67f17a4e9e28baa901804205a27a6cb48edadf796a81f7a0d7094d513e87bc85bf724b5c02d1530f1cebc389742d91317b970b80a2dda39
 DIST github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20180510122957-5ad1f5abf436.mod 35 BLAKE2B 93145db80f6a2b30ae7b81d94b17c38a8a7dc1e56a45d99138c269c1fa4bc314d798eab6a55efa287650c0c07f9cc275cfbbf947e460adaa55574b2746c54ff7 SHA512 a5bf81af8bf2123aec3d1e16448f5ccbe2e8b40efcac12c97daede604549315963b59102f99c518cc2cfd00763ad92fcf45bce697d14853119ffbc81a04678fa
 DIST github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20190328234359-8b3e70f8e830.mod 35 BLAKE2B 93145db80f6a2b30ae7b81d94b17c38a8a7dc1e56a45d99138c269c1fa4bc314d798eab6a55efa287650c0c07f9cc275cfbbf947e460adaa55574b2746c54ff7 SHA512 a5bf81af8bf2123aec3d1e16448f5ccbe2e8b40efcac12c97daede604549315963b59102f99c518cc2cfd00763ad92fcf45bce697d14853119ffbc81a04678fa
-DIST github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20190328234359-8b3e70f8e830.zip 133914 BLAKE2B 07d71b0a5a19a16c5991f876cadc3c2850055a5243aa3ce6d16f4726278bdb4d5b2fdf79fcf7b8b39a755203f91e24c6c07c7165037ebb18f878d50c36823f4c SHA512 0ba4a68b1d5ba1eb59f7c38b29456b033ba24121f5b61b622690f244868be27dba882c58b6c565a51584e43d6dc39ec1dfd5752810ff8dc9dfa130762e070414
 DIST github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20200122115046-b9ea61034e4a.mod 35 BLAKE2B 93145db80f6a2b30ae7b81d94b17c38a8a7dc1e56a45d99138c269c1fa4bc314d798eab6a55efa287650c0c07f9cc275cfbbf947e460adaa55574b2746c54ff7 SHA512 a5bf81af8bf2123aec3d1e16448f5ccbe2e8b40efcac12c97daede604549315963b59102f99c518cc2cfd00763ad92fcf45bce697d14853119ffbc81a04678fa
 DIST github.com%2Fwarpfork%2Fgo-wish%2F@v%2Fv0.0.0-20200122115046-b9ea61034e4a.zip 134455 BLAKE2B f06caa3a9e9badc1e6c9feae64a955d80e6e03762ea2971af6fe85ee44571f22172b126d9393cec578f5eb88a0d36a197a31adc767a4902e7b5d6a7be7b4edda SHA512 83abce503d6e5016d5b52a9883851fa6745a5b98fa5d167a598b756c2085f8e838e463389f552f6fc18e68874f87b58bd8befae8c4752a799e378c5f671be44c
 DIST github.com%2Fwhyrusleeping%2Fbase32%2F@v%2Fv0.0.0-20170828182744-c30ac30633cc.mod 39 BLAKE2B 592a08d7d4d2433a33eb5eadf8f8f28d4176e532ca8ad34a1115596d7a2a59f84a873c76004bee6175c312733e37a025adfcf7977da47656d05471a308a0939f SHA512 69322eafd25490c1041e7555bdb5f83055aead988ad8c34a37c053c7850c63e70f319167a40eacc1503517c6781f6ae0f56e2bd88054021a298217650abcfa4e
 DIST github.com%2Fwhyrusleeping%2Fbase32%2F@v%2Fv0.0.0-20170828182744-c30ac30633cc.zip 9582 BLAKE2B a640f31282c54476b84b62f126a57091e07966bb4b984cfe3cc842843c60837ddc8666b82c67e442ce0b37525be89bb3cd0c5ad54b16688f3114212991666584 SHA512 60b7fb1406d2646facd62cb8af075323f8ad96398701298d137fc7f5a9c6965bc72da4fd93e3004de604a306218c62101758c4c5b2c6581d93648710f7b0a2bc
 DIST github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200123233031-1cdf64d27158.mod 184 BLAKE2B 4b582fb070ebc2e0ff91eb5e9ca5e018cda5089612862c53a39310ba169ce3fa89ded4c28484502dcf9a4e822d250faad1f6547878fb70e55525b7a7addf83a8 SHA512 081a51357b175ac03f790e15f6b6aa100da276a5491ecb703f582af4a4eecfc52e78a7e6a4aceb846049c3ec29ef0ea558a9c64d25960dc7e82ce5790781df4a
-DIST github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200123233031-1cdf64d27158.zip 16804 BLAKE2B 17016f71017bafc8a9238aed15d3e1a494b99995b1756171cd0cf0d1327568ce07dd020ad35d4e2f3097a378d2a77de0c01114358077b1d7db1475388738abec SHA512 c0dbed2230c72a3c606eefd3e579bd0e4880d163a96d8ffeb56c7267a240c81840a534e9d77fd9521704e84a995878448c012d285c45b47ed692e62ec76c8bc2
-DIST github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200402171437-3d27c146c105.mod 184 BLAKE2B 4b582fb070ebc2e0ff91eb5e9ca5e018cda5089612862c53a39310ba169ce3fa89ded4c28484502dcf9a4e822d250faad1f6547878fb70e55525b7a7addf83a8 SHA512 081a51357b175ac03f790e15f6b6aa100da276a5491ecb703f582af4a4eecfc52e78a7e6a4aceb846049c3ec29ef0ea558a9c64d25960dc7e82ce5790781df4a
-DIST github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200402171437-3d27c146c105.zip 17967 BLAKE2B 1b296f7d4a305dc3c8a786f8226f827c6a1d866dc1813f8486109c9ab415aef535760316e7ed3c57ec82cb66e2b95e8c960ba015359bde11921a153dc6de4d95 SHA512 e773b4caeecc79d14d38bc2a9f0d192f0f3c2a17b0c591f84f198b57b49e1298ee6cb1ec852192f46972b94b15817e44afdb69c451a848927e770b6c61fa85ee
 DIST github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200710004633-5379fc63235d.mod 184 BLAKE2B cb24cd9adffc9c4f00d6ac2739b48d9148811ca993284cd5fa691683c2c535817189b8fa3e58b9be9be426467a37524f99215369fa7c91c4e68d103a8d7b8056 SHA512 8055648086df4a3f99db7d926d74550d863425854c2f30a2be0f80107af7d306e681ded38acef107dbf7169713053be2d39a428c9238c90b75d23f0086b5a157
 DIST github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20200710004633-5379fc63235d.zip 22563 BLAKE2B c463a5e875f9c49d4520cc52edc83dc6c77e36d506d2a8608fa67840e9d02e19de4dd564eb7b7305eea8582e1e05166ebcadfb40aea08d6df580813439697016 SHA512 e010f8cfb042ee222fa14ee9358fdd84b4399551a2138d7a9df57c0695ba5e15a992efd01d37cd5c9bbfbc6a1ce4b56c2a577971e1fe7e98e9194a794c4fa84f
+DIST github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20210219115102-f37d292932f2.mod 184 BLAKE2B cb24cd9adffc9c4f00d6ac2739b48d9148811ca993284cd5fa691683c2c535817189b8fa3e58b9be9be426467a37524f99215369fa7c91c4e68d103a8d7b8056 SHA512 8055648086df4a3f99db7d926d74550d863425854c2f30a2be0f80107af7d306e681ded38acef107dbf7169713053be2d39a428c9238c90b75d23f0086b5a157
+DIST github.com%2Fwhyrusleeping%2Fcbor-gen%2F@v%2Fv0.0.0-20210219115102-f37d292932f2.zip 31467 BLAKE2B fa71f4632428a4bcd7091ecc810eb7fbae5ba4e49e73a03f8018c87cf1f23b42d1108cf531fc238868e7173d6cbb6c2e87baaad47275a62a425bbc5295f88109 SHA512 e330bd6e207297e1a07a275a9db075c075683d9d5d2c0893a074477fcbddaf493cab0b2a6170be7a882e9888063f9d8850c400eeb821e2954d216ca5b9a1e4fc
 DIST github.com%2Fwhyrusleeping%2Fchunker%2F@v%2Fv0.0.0-20181014151217-fe64bd25879f.mod 40 BLAKE2B 76c7f5e75dffd0bfaaad89b05e8145fd9a99efc6181f6affe3d818d2af7d7fe15c598d2605da386f055d303668b3c64aae8d794ccb63dbaa49d97840bf555de8 SHA512 46fc7096c5a933da10bb6d54f6a741a05461a4e3758a3a07d6e8aca82618e164671a8111f811818c739eb3f5d73d5574e00ab34f97e68d396d5f52d547a890f9
 DIST github.com%2Fwhyrusleeping%2Fchunker%2F@v%2Fv0.0.0-20181014151217-fe64bd25879f.zip 15872 BLAKE2B a484685778e095d3e2851c882b20cb4c5c19d97746d8155e0017b4713820cbe7bc62d29760f71459abf791dd435a9641708ff4a7ef3c4f9da94dd29b2dfef21f SHA512 29a62aa2e149fa7bdf5ef010c8bf7ba2cc009986108377095cde97a850c0ae6d5e167cc8d382eea4e224cb2f096d29b5783ae693212f93f51768939dad312a41
 DIST github.com%2Fwhyrusleeping%2Fgo-keyspace%2F@v%2Fv0.0.0-20160322163242-5b898ac5add1.mod 44 BLAKE2B 5205c42551daa4051729774a8de8c696a5392454b5c2bf1a28eb61342b2e9432873f6c78fc249434bd1b35a60b347462e70bfec64f2d2894eea576e54f390064 SHA512 7c7e68af421a25d9b27e46ed1c210fd4a9816a615409b338659693ecbfe7ce9598b87774585f466f9ff792ca8bc2d07548bd996491b0809e3e7986d571d46e2f
 DIST github.com%2Fwhyrusleeping%2Fgo-keyspace%2F@v%2Fv0.0.0-20160322163242-5b898ac5add1.zip 5629 BLAKE2B 3b52409bba3b81c2c98b832ce6dc7f23a50f65997811bc665a40b6eaa7c9b43c5bc7b8ef255a5a17b614d7847933d2fcb00ec4a93782695223ef0a483e556f41 SHA512 684614fd38e2733f1e4456e04d9abdceefef35aeef089fc4538d56c96354dc917e7f713a7032328ba01b48a50627163299c543c6e0e4aa30f8f9696d1571a085
 DIST github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.0-20170515211332-0457bb6b88fc.mod 43 BLAKE2B 3a73fa0aed38077bd4bd50c2930364c1245597a7c2444b39eb7f0549fd3bcc6e019b5cdd6c38f38ea42c5933190ac04d505d62e9747e78a046e0a660f2d6ee39 SHA512 d8d023451e8f883a0865c17337e858e2be292096ff0a379a08fed1b773d2a22d2733f54fe72a32cc95765198925a95f81241800451e70bc2521cd4a47e8d4b49
-DIST github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.0-20170515211332-0457bb6b88fc.zip 43473 BLAKE2B d33be9e17f592696f66bddcceb08e412d83cce0fcc49646a1459cae6966f01aa093c30c03fe90da3e2727f8320d840c9f6569be788366e3bc47fc81c8c3908d7 SHA512 a913dae339fd87b413bd8eecb38d4aff02a0714ea0685400bcbedae8a71759db55f8b1a8d23cef765fa3f36fb1092360b89c44b6f869a09de3075c1c4e19ed6c
 DIST github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.1.mod 52 BLAKE2B 32299a8911ac5a82d6c9a67805dd63444375fb3bf0c12cde0621fbd551d97dafc078d3ff643eec9b8cfb89caccd43f561d29c393fb08a0d9c7707e104c59fbee SHA512 0fdff97e391f603ca7bc522440246bb2b71ae14ae1834da1be65a30489ecea9d7ffc33aa127bf3be93d675c053bef31a83295d83e690339bd45ed8c6c3b09dfd
-DIST github.com%2Fwhyrusleeping%2Fgo-logging%2F@v%2Fv0.0.1.zip 42645 BLAKE2B cbddcae02fa95f97c18be4ecad16d0fabda4956e6e6753633dbc554703f5cecf12532b8e3e2736684d8e6a78e936180481a3757a9253538f7b7577b126009a05 SHA512 e14a195f9794dc9e5bc4f12dab3256ac04c87028ae60f244594c5732edb50eb974e2366d205d6f87a2a97b50234cb01fc4d6fc48bfaf1ce779742fe0478eb5d4
 DIST github.com%2Fwhyrusleeping%2Fgo-notifier%2F@v%2Fv0.0.0-20170827234753-097c5d47330f.mod 44 BLAKE2B 3f258e70113d8588b852ba34df136477029e8937924344571ce553c26a2061d991f2238342fb516697cba616ab8dcc280affe9b26bd2cd7aec88d94a3fc77046 SHA512 c0458611ac7d80a58d92b9768c45b6b8f32a727b647af6bd7d07ddc545cf623de4a248ddee7b9adfcac6d69547c2708f3a9219a03919d5090a313b794ce612bd
-DIST github.com%2Fwhyrusleeping%2Fgo-notifier%2F@v%2Fv0.0.0-20170827234753-097c5d47330f.zip 5305 BLAKE2B d7c76c6df53e38080331371e4e09a79e9808d6f63c2f433d2634ea03596e59b5877fce7be87ddb70d749228479e6f264834243138c4567bc60552f9596ee7736 SHA512 fe82fc86c6d0ec991f05fd48a877a0093533cfaa1c799c5c68ecc0262de97da7a2773c53e84c8dbfe4eb7fe10be7e4fc0e2b7c3507744b593a9374475e0ff97e
-DIST github.com%2Fwhyrusleeping%2Fgo-smux-multiplex%2F@v%2Fv3.0.16+incompatible.mod 50 BLAKE2B 68c589b71bd83301e6108250827431c1e445f5d77c620877868f8bd2ddbf7ed8268d747c4029994ea240b5b3a7d4fa8d1bb046ec53e79a7b5a13e7ec479ec083 SHA512 42753b8ff707832138fd659d2cacc44b466a8baedaf050ca29c59140eb6963918c5d7b0dfef9016ef67fc9a152a4669a79da8b89e65563e8544e8e018181d06b
-DIST github.com%2Fwhyrusleeping%2Fgo-smux-multistream%2F@v%2Fv2.0.2+incompatible.mod 52 BLAKE2B 0c8035daf27c33b1c2245e85fd38a1978cdbcb096d1a19413865ca0e1732db98d2278a5de17278a884712339307ee4a11c125787b0257cd7b6456023ee0741ee SHA512 f816ec3ddc7f652731a310c90d9f50de124ed9d499da1a8d067717e840ba834036a72798d6ad7e19d9f9d12f451c1edb062256ffc42238d8f7bd418511a8b9d9
-DIST github.com%2Fwhyrusleeping%2Fgo-smux-yamux%2F@v%2Fv2.0.8+incompatible.mod 46 BLAKE2B f071dc75aaf846d5c9f98e2a490ed0054da4be84afdaf27a157f687de9aa51297a240e4b840ec73dc92e70cfddefc1b28491a76983c5adebbaaac4f90090f72f SHA512 07b3d924699bd8272cb6382bfdbe0c655f2ecf410aaa7d6df92efe238452d3ee51469596020bfedbb736ffdd6e3e8de3406585c5b3de13718f58b6555a269580
-DIST github.com%2Fwhyrusleeping%2Fgo-smux-yamux%2F@v%2Fv2.0.9+incompatible.mod 46 BLAKE2B f071dc75aaf846d5c9f98e2a490ed0054da4be84afdaf27a157f687de9aa51297a240e4b840ec73dc92e70cfddefc1b28491a76983c5adebbaaac4f90090f72f SHA512 07b3d924699bd8272cb6382bfdbe0c655f2ecf410aaa7d6df92efe238452d3ee51469596020bfedbb736ffdd6e3e8de3406585c5b3de13718f58b6555a269580
 DIST github.com%2Fwhyrusleeping%2Fgo-sysinfo%2F@v%2Fv0.0.0-20190219211824-4a357d4b90b1.mod 43 BLAKE2B 4427965d1613885418c7b1840064b2afb6b25f8d2548ba0fcc2ca2b3c1c93be857cb41a1ac5c3f34ae2e0fe9169e6af5f1af2b125c9ff5df080ea00a9ac5a97a SHA512 44aa456980844bae90b7302032e9f98c760c4b83e648b56a008c6c706f5e8d76650b4606e7a882fbd81fdf12a1ee7b37378f0430befdf59d7ff3187df3e98703
 DIST github.com%2Fwhyrusleeping%2Fgo-sysinfo%2F@v%2Fv0.0.0-20190219211824-4a357d4b90b1.zip 4171 BLAKE2B 70cec05a0b109dd8e7940e56967afdd0c0a7dd71dd69fca6123314e209eef84c8b8fced287d5b3f999f3ec9ee27bf90726d27502ab9bb0f27b2dff6b7c4f2bf3 SHA512 4892abb92413d6a57e11ec9c68dbedfc22b30a318c9cf7acb651acd7d34aa21d68fe330973e60131336420e6fd32e279fd11b1140859fbb5376a25e8cfc03cd7
 DIST github.com%2Fwhyrusleeping%2Fmafmt%2F@v%2Fv1.2.8.mod 38 BLAKE2B 25a834ee4f8f0cafb4875f5425ce94867c135ea2ffd0804e1da2836225d6acb7e13794268245e7a09f8893de58840c68c8971dbcba6d30d034fcf4904ebecdf8 SHA512 898b1270401caefe114a1c95dad985d18bb3f68485ec0bf00b1dba075cebd850c9f142554376d3868305e436475ad1dd95c5e6b7674d244e7e5c0b4ba65bfd5a
-DIST github.com%2Fwhyrusleeping%2Fmafmt%2F@v%2Fv1.2.8.zip 4358 BLAKE2B ec3161d98201b1814d492fd77dc014d1ae2dcdd82c79665e06ce4f021bab62af5518e5342950f631ae50122517ef7b4b70f0d33e75d5239c030e12551118fc8a SHA512 d9e8cfdd3ad5645e2c174e4c6ff90d7290f0516bb47cdd113600d1446b6a9d2eae6413557b27de4931cb86e94f3381b33e4454d9d266b62476908bb45f3cb29c
 DIST github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20180901202407-ef14215e6b30.mod 37 BLAKE2B 2e503a60b828387de4ec2979cffa8178cbc3f8cf8c6fda7267740d4ed7b458f693813b9c6b6a7f345155691885abf17d65592083beb7913c78a568c45cf2f95c SHA512 f8c2325c44a3fe4e20e86f2c8ff0776c85254cafdaa3a7411356b01ae4a0917c6e33484743438f3d9820eddae206136a024021f1c3a64c35ffcdc49b12cd48f7
 DIST github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20190826153040-b9b60ed33aa9.mod 37 BLAKE2B 2e503a60b828387de4ec2979cffa8178cbc3f8cf8c6fda7267740d4ed7b458f693813b9c6b6a7f345155691885abf17d65592083beb7913c78a568c45cf2f95c SHA512 f8c2325c44a3fe4e20e86f2c8ff0776c85254cafdaa3a7411356b01ae4a0917c6e33484743438f3d9820eddae206136a024021f1c3a64c35ffcdc49b12cd48f7
 DIST github.com%2Fwhyrusleeping%2Fmdns%2F@v%2Fv0.0.0-20190826153040-b9b60ed33aa9.zip 15133 BLAKE2B ca6d9b5f0b139dfc138afd327d88c4c2d5a23b21ab3511b6bab3e6a2e07f63814861b680bda7768561afde5958d8971c6f87aebfda67369ccae93a25975b8120 SHA512 5faa02be71c2bf170f45fcd1e76cdb8b4f38593d04826e8931a1a29b81af41e7df5da226d7c937cb56950a95ea4888df584361b072c7972931305269e12e8e52
 DIST github.com%2Fwhyrusleeping%2Fmultiaddr-filter%2F@v%2Fv0.0.0-20160516205228-e903e4adabd7.mod 49 BLAKE2B 2182f1e71111a9903588e6ead7b525b24628b73fab93e272db86f5a2040d66351202380dbff144a54d593f60e8f96edad9e81ffcc167638960ff86b8e2097d78 SHA512 c857a20a88d06d2695bf15467e27aca89d1df76b1d6521139d0506fe77f306e1fddf21f47cf3daf461ab9af3459bd0d17f8cce495ea3e69dc846848f81c8953b
 DIST github.com%2Fwhyrusleeping%2Fmultiaddr-filter%2F@v%2Fv0.0.0-20160516205228-e903e4adabd7.zip 4435 BLAKE2B f83f665de6150eaa23ce363d815453468b6711eca401c9bf66cee6d819b18b7de31520a4cb2d6ff44e9c2617045c95a91aeadb2a0293bfdc33a2547160485e69 SHA512 28145b76f87719f8321c0c0df6562f8b59bab8dddd7e9c1a201320a0a543bafd92ea1bb24b8cf97ea4ec56202ac6d132ce2a62b59e4805ebee11eb3aed03a584
-DIST github.com%2Fwhyrusleeping%2Ftar-utils%2F@v%2Fv0.0.0-20180509141711-8c6c8ba81d5c.mod 42 BLAKE2B b4c783cd4ddeb16679d0f1644f8968e4ddd2893cd2aa4044f491e186365add120076354f691a19729a2aae84a36aeaf43e132c12bee709733ac6106627d8d13c SHA512 7027e33b034a39b42c9732d5dc1003d160436d10b2b33a9237d8052d5ac4eaef812b5af5b78c6dc19f1b5bdfc5dc478af3e1d0a408e0480814fb4bf5321d490f
-DIST github.com%2Fwhyrusleeping%2Ftar-utils%2F@v%2Fv0.0.0-20180509141711-8c6c8ba81d5c.zip 5906 BLAKE2B da39078e2765f37826342308f77ad3a109bf80d2b82ceb1d87af58b2636b5d485c79c6832bcabde9e88e45ca228d2fa19dcd45dc180720cee058259a37ab446a SHA512 9afa60d0733bd6164e85161efec818950e540a3a7b81028b74b0d8088dc95e9d5ba84ffcf13a8709c2eb350ef5bb4e7f15705ef810942812cdd04e5bab54ab8a
 DIST github.com%2Fwhyrusleeping%2Ftar-utils%2F@v%2Fv0.0.0-20201201191210-20a61371de5b.mod 51 BLAKE2B 5ee4a5d94e1ac64437293285a9607dcdaebf276d789825dca0e2377cf14b262a0889c052848d8f999f3122845dd8ed31ee42984ea11bea4981606d0a7909544f SHA512 4c0492401f85b458ef25479806804f9718303655c7499661c3c74b1de8862e78a3f05a657da9cbac40377337914bc3b6157d2e12ac3fe8ce4c499eccc57abbd1
 DIST github.com%2Fwhyrusleeping%2Ftar-utils%2F@v%2Fv0.0.0-20201201191210-20a61371de5b.zip 5477 BLAKE2B 2e66b78dc06b980d352cff6f66be17a61985aaf7096b8998a195caeebd735109500974f8865e1e24fe769d095b2951b01dba17eee3310ff3161c774566b040cf SHA512 ac814ba07d45f6c8950ac227695d6a2e7cef6cfa2c3c3b3b2a5b8cc1f813b67ddd2e8b183a988ba764ae495fdc5ee2fdaca11f0da0a19e717cf9bd80890ffc54
 DIST github.com%2Fwhyrusleeping%2Ftimecache%2F@v%2Fv0.0.0-20160911033111-cfcb2f1abfee.mod 42 BLAKE2B dc7c21a0120a7ef307200408167c085b8d2de188e6734fd4e71a1024d7e246872a0f4876c9c185a75dcf1b52d43ecff640a7d88de883fee7edfc05020a9b017b SHA512 80a0b7bf1c99e43eb8ced124dc93d58f91124474f78b3570982bf90cf68529dc58d59210ce8d16eae4ac8e55a97dd9d4ddb7a5e426eda37d6a0966dfe654886f
 DIST github.com%2Fwhyrusleeping%2Ftimecache%2F@v%2Fv0.0.0-20160911033111-cfcb2f1abfee.zip 3263 BLAKE2B cbee2850bfa95d4924cf4205abc701731a3501acec452a8e61daa5d858a5d26ec851455aae9496dd0cb6ae936fc1d4ed8db4944ec622d56ced23a108bed6c523 SHA512 e2c2760184d5e7e482f83835958b4fc8bf280a34aeebc9291293be4ec0f030206a8f499e219277d6bfb2b0c14998bf9375645ed990852ea05a9ed79ff0d778a8
-DIST github.com%2Fwhyrusleeping%2Fyamux%2F@v%2Fv1.1.5.mod 38 BLAKE2B 1daa08435f8c7ec0418899d686c860591f7cce8d5cacac9fcb2eedef8326d6ab9557218df27ac761222185328feff53cce8de3a06b3b97f3381bf9c93bcf031f SHA512 2e31d149b358aad683e05cfcc72527039f8399c1866c0d3689071d33863c32171b900c6abac563cd13ac103bc405e7ab3f5a887f6811864ad888735d4c2231b4
 DIST github.com%2Fx-cray%2Flogrus-prefixed-formatter%2F@v%2Fv0.5.2.mod 51 BLAKE2B 7534a111176a6c08207d0229dc8709e1fed08bebaa2e0f462ab190a2e1be3eaf7a47df9b27a75b6bf5952dddf751980c966ce38ff46509cc663c48213becf365 SHA512 7a7c4f4015880f15e35a156ee33d868b087806b6dd34a848efff19df73daf3a9546bfa1b93c73f4ebccf7eb31e10b7ca4ca84a54b8021694a7750919b08c4841
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
 DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
 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 go-ipfs-0.7.0.tar.gz 1809980 BLAKE2B df6ce13348563c8362735a06adb715fec1f467359bd2be7fda4ad1d54e3bab6fa7e03573eff96245bd0e5ae470c8f9fa137b8bdf39a58fc1d896a512f336d794 SHA512 68c104609765ab90dabff8ea6af44b0a04fdbb9240febc5fafe3d092ec51a6e0fd9e0e9b3e8308b908e4aa912b4ad910ab2b495a23321891a93e5d284c9c0b3f
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
 DIST go-ipfs-0.8.0.tar.gz 1840636 BLAKE2B fcee266794ddd2fd80ea712ba3a0ad93124228236483855b503465828ccec6d4e8682efddbe6ffe93fb4da12941c011233456714b432ed938cd4cc84ddd22697 SHA512 b8b21852cf433c225a0d7e820ba5ac97a54abffb5ad228635632d7a2bec02c5c113b639355fbad741d04bc482655e0b8846d2a08bc088ace680f9a50670875bf
+DIST go-ipfs-0.9.1.tar.gz 1876934 BLAKE2B df9746556af52dc083745c702004d8ca3be1bb9a5f5de37a073a9e0ef707d50d26dd1eb7f4c33b58a534d1b7c4d7f1b0bde66810e77b1e5ca6989a15d4508f46 SHA512 bbd3e4607f0f73d72d1ab1c67023a4a96c31bb336a050c034208a8a214d6992b818e5cf26199e7c9cfc5890f1992b3948738bc30284038b8fbf34fbdcf776a81
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod 2182 BLAKE2B 024744c8c4b0f296f32ce1af2407eae0eb760a443d43e2a1824254c9b2aace62966a2f0f5b5dbfb0cdaf66f2f00740ab653a2b429cc9aadeb3e48421dd6e180b SHA512 904249febd483a4504d49a1b769ded804042c34acd6b7f76503af9f43c76c53063888a7d0e15ee457107cf688108d2bff057330d9d44548b2a30979336370f09
 DIST go.opencensus.io%2F@v%2Fv0.18.0.mod 1118 BLAKE2B 55892f4e07819a81da5ad96866ff71d2195b51051b5786e11d1e7badca1804f8e7dc3231dc17f99c9d4d00df45e7825ea389a30be8fd0f0670e9620b551efb97 SHA512 6992b5459b8f831b93b69588300374d1ee59e27056887687dd52baf61bb18c41e2ca75079cb17acc339a9d94da79bb697aa96e68af966abd73408a724ab70d2e
+DIST go.opencensus.io%2F@v%2Fv0.20.1.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
+DIST go.opencensus.io%2F@v%2Fv0.20.2.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
 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.1.mod 442 BLAKE2B ad5fefb1dceb9f4d1abeb0fd286f84078e266df6a832b0d13bd637d786eddda77541ee7aaf6bb461394f6eaa20dd0e9b9e6b064e6005c578e39adfca92cb190c SHA512 35fdebdd1414cf21ada15988edecbd5b9b3ed45119610063723639b0474c4eddf394765045d65f0dba192250df497510d74ea13c4be0a3c0cf84188d7c1aab01
-DIST go.opencensus.io%2F@v%2Fv0.22.1.zip 292348 BLAKE2B ea956ee6b5362cbc9e980a1c2a59da2c98ee9de47813badafbe1648da63456ba6ab3e137e5a20b4c4b03e2911cea3bce55b58e48f5f4176a2704cc20df281e2f SHA512 036d96c1f69a0e930d222f3410ec2d28aaa85cb049bcb20ccfb926af98606f7ccfd800c2a93d293bd7b89d702fd8f0117db7ab7945324255ae2c9fef75501dea
 DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
-DIST go.opencensus.io%2F@v%2Fv0.22.2.zip 296264 BLAKE2B 0b0e20eb2f10b81748d55b843f8489ffb8147a8b17c063cb21fe505fcdb46feb9cc0830f3b3a91ea7034b1e7ba78df27b0b235b8500b8c1ade19f6837366aaa1 SHA512 c98a43e1bfc9f4bd1e54847dfd6b07e9af14efdbcd8d61b70c9f9701541ee2405f800b1e33cf115615a43030accb735a1235e2b7d81f54efd127e2fe5c992326
 DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
-DIST go.opencensus.io%2F@v%2Fv0.22.3.zip 299798 BLAKE2B 6adc76c28569e177bf40cd2d4c7de912e92bb679c29ce669bda7e001d33f8e758d3f2a413857b2b74efc676d4d0cf239e9c7acefd2cb7cc502121f07b31d640a SHA512 99fe389fbe5fed1db31068ce5c4ebf597ac5b39203e3c5f13b0f92c3e66ed0b1ee9f6f3ec0d953a7f5d02d2db46969b8d3cb642703acf43cc0df5cda61c3e355
 DIST go.opencensus.io%2F@v%2Fv0.22.4.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
-DIST go.opencensus.io%2F@v%2Fv0.22.4.zip 303399 BLAKE2B 86c43ff5f92434a5f549a1d7e1a4e9a64075cc5ba35a3b2bee58bdd3e264ea53c6bf5372e597e01f6ed8b2179b40c9aeba691cd165b7e26464e4f58b7f304759 SHA512 33a8ca783794ac23e1300971bd6d4fe5b41b8a444c6ed5a83669134d523565c5e58289ee2cb5938a87c1e9d257b3f756f17949d1010107e769fae6961bd521f0
 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 go.opencensus.io%2F@v%2Fv0.23.0.mod 300 BLAKE2B 768900ce7738c5e1de5c550f1dadf600bae434c89eec337e532e50542487226c79bd113e2b8223c63c241be631ebf5b177441b1b583317425f850a0efc6a02bb SHA512 67849dda4a765e79351214a3641bf601dcdb404f83fd48cde5c6b4fd7249868567424b9f70e0bdf041f6e50f6fcb82239600be8f62253835e4c7c8a17c8d8871
+DIST go.opencensus.io%2F@v%2Fv0.23.0.zip 309862 BLAKE2B cc1876f2670ad970a82ad2b58cac621086428e29145ec62f9917902100236471547339be24e2656fd5c3d6ed4b2a10861edb5879e85c0bb9308b0b334df0f4d3 SHA512 90ec312a3ef194251f06ca8c6535b97b0303b72c55cdb602f6f33b1c691188fd5289e4c7323d01d5c66b15411b28a4fea4bc817c41fad6a7d206448fbfa498c9
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
-DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip 17248 BLAKE2B da92637915783bd89117a7b763271151c72f3494eeebdc23d4a0197f5ed394d4ceb3b105e1eb5f0892ac61e0fe617050c1d741b17ea37ff8eff42758329ca68f SHA512 ad71851217d27e72d13db4d8aa1accc069f5ad5ef3fb9ab922c79cc0e6f0ee10025d499478d99e2f46418b36b4410c5bbdf8ea421919d6f60ec95f08c904b267
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
-DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip 18762 BLAKE2B a472638d7d9fa9cf5fa1ad2bf968c1eef4b2b3e8bb6fb53066a85a7139fc8621954ff21ae09aae6887803621dabfbf00069deccb9c208e39776052d13a9f0a6c SHA512 73bff83189e7a98b144cc407d4cb267277e68f00827f86d24d9b5586fff66691b6566ad2fce11525b11a5bc3b8f0ade753ea996c7468ea5bfbae682aabb2db95
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip 19110 BLAKE2B 749dab9cbf012066f0d8eb694b6592fd4d1819dd3b27052a76940502d65900b39820091e683c1c8561f4b65262dade55db6be331b1ba8517c22ef7aa39ade990 SHA512 21b8036b73a07887db6ffb620557794241c085e01be44e45c93ffdb2aa6b47783151f37fc4023bf847e091e1150466e84a67394070d945cc4a35a771d278f61f
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod 131 BLAKE2B 0abc8845d865fa3a1e96e938a9df81733f6d658b39592df46f26eb3292431b0db554eb5db00671f12471cc3c0e454bdf227215c0f9adb182493b5c146a12e3ee SHA512 ac727a2635d02ba4d12c9af7a9ca2d27c0f1bbdb2f2ef797a2852cf569d33cced35be8ce3e95e2ff3b13a0085b723622656ddb8731c055719fbf62cf10caa4df
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip 53254 BLAKE2B 55083a93da944305baacb592cc1145f191412b4fa0a98ff3f4180484d7a3bf4dc65561d71670b8a462126f10ea82a3ca2846f73bacde8c9d8c485e895b329598 SHA512 127df97ad28854e4db92b6ef8f147c50eecf49e6a3f70dd0524325f24aa6bfe977127513443cd8926589587654212acfa4cb8f153e2290b8b27aaa09dd846368
 DIST go.uber.org%2Fdig%2F@v%2Fv1.10.0.mod 202 BLAKE2B fe07962afcbe21701aacde26366721a54a871f93c0313b4ea11717b4dec60c6a182065060c7c46ef57c63663e5567701e07254ba7ea787c4477f33f31a5004cf SHA512 1ccbae01f57503a0d215e26f856df8951d7b63f53f1986cf80e98810b88107ddc856e18f9655af9494ce35ce98431da978270ed66f311894f228d3ac1dc87975
 DIST go.uber.org%2Fdig%2F@v%2Fv1.10.0.zip 97120 BLAKE2B 0a6820e91989a769927e30f7869c460ecde8899edf182254220583c0eb1102f5415103c0ac18a25030dd75e6b7f3d2c31e09885eb497061d70048b7f05f24a3e SHA512 74c5b818f867e22c1cb6fdf42553c76c6b8099239389dc5400e91b7642c66846590da9e43bfedc500bafa1534e4bd1f1efe21e935a130aa15fccb4c1eae0d47b
 DIST go.uber.org%2Ffx%2F@v%2Fv1.13.1.mod 283 BLAKE2B 39decf1f0c077a91b1e1d0eec80d2657c7eab2d1240ed27537c1c78ea1e5fc7557264602a5bb2f50c0345c3b8c89cc959f6a3066c5a9a731bff476906b9e4209 SHA512 ef5dc2a339c5caea21bb39b3f34dd8338dfbf95b1aec57dc71b3d1edb3a8bd559a6fc930a12e57224b05174bb2e5a23031fe96d8f5f5bf42c5de666f9e8a96f2
 DIST go.uber.org%2Ffx%2F@v%2Fv1.13.1.zip 85580 BLAKE2B 99bbd6b3e14e1d96b6ef5005a97cf47fda5cdb10c15b81775e1f632cf4f5bcd10b4443674b228dd72a5bcaf6361dec757143bb6340e5d89af3308b3ce11305d7 SHA512 efb4a540d5bb19ab44cb5e8bde2230f1798e66e9890bdb164373ce699fa9b18c1db35cde83650ade214382b8838872ace97cd853bfdfda93466488519b5a0a42
 DIST go.uber.org%2Fgoleak%2F@v%2Fv0.10.0.mod 26 BLAKE2B fab0da84b238a586768d6a17570b79be5d12b4c2853a3f56d38a5795f971fc5d9c3aa67a69deee511a17bd1ff380a6e91c49ac0e1f74ae88f1a4f21e6e8d958d SHA512 3486b791eda341ef0be103eef291246079ccf8799b50277bdabc75a7a57d0ac196b452e28fa72493e500055b49a4f7651a634f741b7c66ba61640b196b8f7bf4
-DIST go.uber.org%2Fgoleak%2F@v%2Fv0.10.0.zip 17218 BLAKE2B db837e552443d3018a594ad6fd2e80f53037361527c182aac10fa80bf486f288bd2d87985ac3e3bf0c145e713142bbf3912e1c91bfe2df02b7ded0aff569d860 SHA512 fa32c61b9572926ad39c6325fd63ce54c9550ee4e26947671c75b0c0140662d779e093d670ec741706bde6832c675991b5f0a8ca14d59e2310b1729485546ca1
 DIST go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod 312 BLAKE2B 16bf4900b2afadc331814e16a34fa8cae0cfdc78c7ea9704312f121e166c93b7811db3604f6c167fc526faefdd1eb0ffca1dd09581094bfea4847fe0f62ecd91 SHA512 8814a6b8138027c366f3ebeea9033a71019990faf1cb613d75a25498a3a74d61fa2ba662302254150370a49a2a6f56da5c54889d4465117cf8afed4ec6cd9f63
 DIST go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip 24023 BLAKE2B 4e847da3c0de521f65e74beb03b24f9f3707abf1ccc6740b18e9109a28dd0300effc7ec181546b5cae7a8fdd5e5358b753d69e0a17ce5f18151e6e2c6c930ff9 SHA512 d8bb8553e96f2c7e4feb404db453a35c1ad42590f36a6e294f238282c8c02bbae2e8f524767341ac20ca6d864b58c46572c3e2236c24cb8d10c710528f18161e
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
-DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip 14488 BLAKE2B 3bb8df1a459b2cf1dd63ab200f06a9f41f968f828b815b70bff899972a4c913656dbd3856dc6f4626836175d32b63c439e32a5aeb6a034f4733e2d09ef53f7f9 SHA512 d5fff733045694509ef1100fb8701526002b0841a11b5e1acbdea7e186c80738f651bd973c5eba2db5d2b8fff1b3057ea5d7d0e46645268b2f3619656238fdf4
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
-DIST go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.zip 20167 BLAKE2B affec5465b2f84ff7796c959588b35670d48a8ec1bcf77f49c1a661bb08e62f051ba7d792738cdd857b26232c13501ebaf543ccd9b72012511e25a198ffbb874 SHA512 dec66c833797bcad5a7e458130b81cf6d7312f72182fdb26ad90996aa9cadcc264bb2c0fd62564fe18529f02a5e22d048d07d564dd72e8bae3430d7bef5f6d2f
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod 324 BLAKE2B 46301f4e5db74421da813b0c2d3d178417435ede42a1857da3d3af84b5ba353f10cad25fd48b777325dc33edd05f0a17b019a9f37c4e13f28e7ca5ee833c0d5a SHA512 aa82aeb1b0559b9c9b2585b8d584d9be60b6d6aa48e9613cec7ca440e267b93b2eaf67e3e88fc2faca68062792f3f6c9b03d080b6f13dc7f967e1b403521a909
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip 20218 BLAKE2B 35528c5c70a5f9fc80cee48c0d983b0fa9b23ce5e8273742db3a5678b9d0a56bfb93cc904c0a8678114d114af5cbde5e818240751904873bdca4d7ac87cade58 SHA512 4a52ab2241ca171cce47c0ab5dbcb8f57d6cb0355c5d372d75822ee866536c4943538543fd7926846085d4a91b5d154e54865f32e9c3a8ac485b41edf217bdde
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod 113 BLAKE2B 9c82de4ac4a30a4f5ef4881d70b75dc7433664ee90632c6d4dcd1594f3c08082aada1cea4740d38b79ea7753abe47cbba9a173051577c2be869a45ac1e90902a SHA512 850531fa2e156bb78b5a66f4afe89148f048e90ad6753308f4d36aa886f5bd179d2dd5ca67c99cb98976ced5aa6b14e4e463bb27f0d002b8a0e1814fc5316873
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.zip 17500 BLAKE2B 5d8607a8fde2c57caeb30459232e9d33bcb9c8cb3d1f046f5714510467ddecb6f82180959ec7d28c15053615390ea2ab114ee472988b6ccfc80de7247e74b0c9 SHA512 ab8d76e47875c4435d00d346ab4f9a04f570711f9e03d7eec23abe6a8d29dc49c4538150397da95e89276dc9ae617b8ce90b90422694b38d03b7773127bfd8e5
 DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f
 DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip 27032 BLAKE2B 58b337663e7a5625521925deadcd0d686ccbaa7d04925852bee0ff1cf3ada22c078e9715930dd20858b16bf51632a4e4d7e76986b0092107bc07ad46d132840c SHA512 b0f1b10667e0e600a4ebca7b4cd9983a27c3ec5f2c54cd46eb055cc0a07504642bea7ccfd0e0f6e3d007422633506efe863817b7c7bc9d18eec3642c84b28f8c
 DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
-DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip 224175 BLAKE2B 839e4b40c818d9ed889cb4f00b3b4c1e1a21add9e4732da956da63d77e5b8c2211443c9c2528f3c7a6886455d94d0818932e19876cf5576318426451d10eebb5 SHA512 deff970d323e0023cb39fd3aa38c419ccafef4c10af4edc8e9b70671e5892d60229e47f176495bdc4602b1cc4f344e8724e06eb740dd7858fde006bf121d5c1e
+DIST go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod 221 BLAKE2B 586c82887d6cf6582837fb495a46030e1c582b58305fc70c7b88a29e570610e693a298fa7d4eac80bc86231c7fe6f6e27d3fdb5afe084363eb918692a1ccbc59 SHA512 2a7413f6f83e66456c340536502d855772e6de433ca4be1a9cd1572caf5fba7cafc7d377ef529324b5bd8af97830c9eae75768f7c45d4676b455e3959acc82c1
 DIST go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod 257 BLAKE2B 2e5fab0b1a188fb7fffa1c9ca0799fa286f74732ceb0f45a904a3620f636af45d8b30d199cbb54ca46114aaffeeaf66bfa04715abe02711d6af46bbdba9bd6dd SHA512 4922fb6e20d2f5d2fa00888b8d644c51e1b558edb69b9f7d70a883314c3e971b6f8fc707b072aa0602d4c451ca0f20983796b65edcb737e5090dda1ffed0c757
-DIST go.uber.org%2Fzap%2F@v%2Fv1.14.1.zip 223907 BLAKE2B 753367cf4cb824f280cdadb38d53e80fe64909f167e443941d573ea57791f9608a47bcf0cc9d4f24cf83fd78d9ba9ddd1ae99ea3074950e29de260998d01484c SHA512 94a725d0169b78ce842b6a9f69e178fc651ce8d10a3eb54e905ce13131420cf1d6af79e32ecbcefda166ea7a50ce51fe02c929ed8c008fc33c04b1088759f7d2
 DIST go.uber.org%2Fzap%2F@v%2Fv1.15.0.mod 257 BLAKE2B 2e5fab0b1a188fb7fffa1c9ca0799fa286f74732ceb0f45a904a3620f636af45d8b30d199cbb54ca46114aaffeeaf66bfa04715abe02711d6af46bbdba9bd6dd SHA512 4922fb6e20d2f5d2fa00888b8d644c51e1b558edb69b9f7d70a883314c3e971b6f8fc707b072aa0602d4c451ca0f20983796b65edcb737e5090dda1ffed0c757
-DIST go.uber.org%2Fzap%2F@v%2Fv1.15.0.zip 226617 BLAKE2B 8f21641500327ea1bed28c3820f7103773d8955367dde6eee133b92e18631c5b5adb09a3d9f3c441f32e0ed8dd45acdccd211417a51be3be87e3b874f90897af SHA512 3fa001713fe2b81add9e841bac8ea606373d3c7d58941cfcff3f6535f252fdf608a573d614aa19981a2241fc4b7393427c1ba3c37ba4c617aa409b71ed9aa8e6
 DIST go.uber.org%2Fzap%2F@v%2Fv1.16.0.mod 282 BLAKE2B cd8f8b009c9a5c34381fa6946d29e228ba21595e3e5ac25eab1f2546a30b616ec885ddc5659a363856b9112a7c114088702b9c0f5f844e4bd180676dd6f696d1 SHA512 96c2bd0ba8c620be099d5bf69e5fa91309538ff29fe26836a6f74a9db5b9d7d00d3bb372222860744bd6644c89dc1ed7fef56daecedad92ed0cba5cdaa1e4c95
 DIST go.uber.org%2Fzap%2F@v%2Fv1.16.0.zip 231211 BLAKE2B 3a325fbc884563de82d57f4c4060dd01c236317a4e075c3bad03664a19a9e56587dff4fd8a5fbc60b581ee719239b1d45eb1cc424c35acefc84999ab85cd33eb SHA512 da2e30804aead70f6a865de5f5774bba955aa3728a67a322e22413641c75abffffd830f1e5968d6ba241c9012708758a1f1a3629d435954f20602fa9b435c909
 DIST go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod 15 BLAKE2B 00f2fbcebe2e9f068ba7e7dc4da2bf2e66f09203415957a1dcf8d5ca6aee422579cbaf2efdb4383985742c6e71d41029a8c68c20a074819666d2db732cf1ed13 SHA512 5bccd8605a1e1d8381adc2f52e27c600732590e7dfe261521b149fb6519693e1124e471c61bb7e6bad8f683d684c7a652f5f11ecc766c84286a51e3837cea6af
@@ -1400,6 +1413,7 @@ DIST go4.org%2F@v%2Fv0.0.0-20200411211856-f5505b9728dd.zip 215180 BLAKE2B 5bfe47
 DIST golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod 4407 BLAKE2B 01f20c6ca234f03f65fb5bca568f3f86c4fe49308030dbd045434025ceebeb168508b7d104143fa38c8476c4a926cba29bdbdabcc7d8a1f8bbb1fa7d4bcadda3 SHA512 a207bc1fff631a38a2ce1e1c041548860885b201919aa2d729af31b9538f7616b61f695c3cbed18146ce5bb79c72823425914050b5b75115f9889fc94d29d1c6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20170930174604-9419663f5a44.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
@@ -1414,21 +1428,22 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod 146 B
 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-20190611184440-5c40567a22f8.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190618222545-ea8f1a30c443.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.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-20191011191535-87dc89f01550.zip 1844911 BLAKE2B 512a7175e03c2aac9c4f3a454a5f428e2567e2d862e362480835722c4f80b8aeeab1880510658da9b219741dc161492096ac2124ae763163103ac22255e52f78 SHA512 fc5402097646068a495867d50f55b00c2a774ddb99df373dc860c175383f8f1ab5c802bbefa55e013e45201a3077cb04f5dc8831f3ff320422623167d8c38568
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200115085410-6d4e4cb37c7d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200117160349-530e935923ad.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.zip 1870169 BLAKE2B d77b65d467395373431c09d1318cd73d2dded32c6c7bbcaee6e59aaeed4b8ce1c183e32747f8da207762d82aa07c186af4b9c06dca9d4b5cfcaeef3bd07b3e16 SHA512 abd93a766353b4c36ff9527df785cf9789317755de2fd1d951a1847c4a9b43de197f6d7cb41ec6f17fd3b50617cfbf8e1d8c93f59f671be578a0152da0754ff3
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.zip 1874180 BLAKE2B 20899757b255a90730b8f62f656f6edd1f41539f3e6b5ff1034d274b0f47ca81b862072b9a619120befd2a3260e8b7f84aeb80b51aeb126d5f2ff5f3bb843ecb SHA512 e04eeee38e8ab6ce597d4a342c71823940cc227ce5eab7c245b7035c194ac1bcd33472f1f07ffd125dd3fed59e878fb95857ff93ce90dcd49d26bcbe77d22a64
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip 1871909 BLAKE2B fa2d419a5bdff43385f70e3c6e61f8c1b3528b6c4e21c3105f66dc358515b6336673188ff68b27a792be9ae69d77cd26c82b7e30605b974e4435634f961c7583 SHA512 de179d887c4ed6ebba0a1cdcfa67b8312b8b2dcd9bd04589d581c872f6fa7a8606ad1376dc6933dec41938781218a91f31fa27331d80cbda30542b8cd14c5af1
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200602180216-279210d13fed.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 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-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip 1864231 BLAKE2B a7261951977aa8143153915d72e608ef263a760de7b4977a11d0d2ead32f88ad370b993ada6344556616343a700a93edce3294df354f93d51214cfe888b97836 SHA512 1b7237562a92560aedb2527d8242b46c5a421488f638c0049812ceed87144828ca682bc4eeb87869db947479ac9e1350e5abbd31e1ff3e53734d4ea25bf5c27d
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod 209 BLAKE2B ae212ac1167b75a96c3b74f33594fa85e980530886edcf3bb58fb5e077793d24e69d1015e8581caafcc78b2d41cc75e4e17e82b2d3f76f10058ff5a715f00641 SHA512 c2a45c244884d6ccc5c4f73b6b3852d28c9ed1d3acd4805ff36292681e5011284af42ab75ebf6274cda4cc3bcd426496515db7eaca2a529500c0e896190f26a8
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210506145944-38f3c27a63bf.mod 247 BLAKE2B 66c7bddf0c6300cb14884379a13eacf7ce4cbd1e86cdd94fbef5f67bbb27e263ecd4cc2c936b7f95751b7afadee561629014be9d997159c742be2e5ce7bf099d SHA512 36d6474a79deda7b8749681b46e682e0440d07b3e8930279c66a45c0d42a6f2c6dd75b7bc7c3cc1ef50cdeff988442630af904ff0f58bb2def5f49040ade16cc
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210506145944-38f3c27a63bf.zip 1874428 BLAKE2B bc63491e97e9a528a252723dd16ac8e79d7dda0a022be2f0b94ae68017f14759127bbc398b721efbca6f270ccf4ea7146cd267be68898369a81bb2368cc367e6 SHA512 203fa97ecc318bc5a6de3a79380d52863b7280eeb7e1509f092d04bc6c1d6f89e32b5c836622adbee2031f2482d4d63e0e2e2523fe1c610ce6eb08f338fcb523
 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
@@ -1447,31 +1462,36 @@ DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAK
 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-20190930215403-16217165b5de.zip 45710 BLAKE2B 7349ff19c5695071b04342199b7694af51d7a63b2a9940c72abdc8e2a03da41260da0ae09b039f1cf2c3752c7f2256164a3f0f4ce00410adcd5389cdc07e5cb9 SHA512 00ae7262d6a4f5839915a648e09a51fd939300b9f0404f2c13c062412d059b8278e3c40b2db2a927bffe74a940295834c18b77fb7dc58e88401e0b7606c13aeb
 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-20191125180803-fdd1cda4f05f.zip 45839 BLAKE2B 7fa2da9301cd760ce923164ca73b1e5c528f41421aeab0c9b90915b72ebf70f350766db083800d7f552c9253452dbac8c5dd48f8701dafb206513d46389b5638 SHA512 979b197fbfc92f81d4d376c4fcb0845a9e86a7a9350841d88ae2f3059c5192e2309df2e19edb76ef96e1e33bd957a83f95fe5c439d72731bd05fa29dda589e23
 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%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip 46076 BLAKE2B a3611608a1963ae2e1e326da29671c30a1d44c7afd2698f85081aed84ae5699c16362af284e299bd4ed721d20052801a79886f0b1305f91b17a2bc5a091a3f27 SHA512 b35cfd6b7640a526780db3c3bc62a89ec731793e350a49894c1de278b8033c4105b5534b09c1ffbfedc8e020fce2f42757808550e98e0ef5d493891f971bf247
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip 46110 BLAKE2B fa560c7a47a9724e278b64c4c96c4f28fbc5d1163a8e919f4e656527871420139d0c521172d9e7bf22401a21e6a0d4a802df9e7c6326f45d159138c5ec46b780 SHA512 393b1eb08da86deb3931b57743706b705567979f1e5f5b72520afa4690ad325ce6ae885520594683e510aa26889000fb5c042654612d902de092f29cd6a65786
 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.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
-DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 126236 BLAKE2B 48caec10f6bf4b8da7028b0358645ab0414b5526004479ceececbd68380586bfbc5b4cfb9d43f8c608565f30521a0dbfe005669db7d5e245a1b63ddc8171d3e3 SHA512 2735c124a735b4cba606e4e3de5bb39c889aae2516525f778764d987b58677dd263cb286604fee63bc45636662c11e3dcc2c9726dcaf85a26e072ccd56597b93
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip 128895 BLAKE2B c2543ab5e3e1eacc16790bcae51ef70962f035b9b95de3797a1fa1142726ec00c66e4e79b717e363fbc5dae3e91b79f05826d623f9251c0648437efaf007d018 SHA512 06f329247189a6a61e54902e9adf7f309b71818150f2ee43ca7ead80b8f03070edb31c4646b7a379b31e1a8aa81e15fcdb2d0e92f9375fcb4d5a8e2194b954e9
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180524181706-dfa909b99c79.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip 141789 BLAKE2B dc517e61f7a9c895d827ff139a36b319c7dd335e85755dc394d01ceaf8b3ce07ef13201bf6d704c31895bf7d91c15acbc4ac75bc8cde065ab4f81839453e0c5c SHA512 6376ecdccd2eeaf828a2c1f560e116c003caf5e09fe68e94a37d193697c93b18bee14abbc06edca93ca57a924f9b270bbe1792df84a7bd66e3641ce6aecbc9b1
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180719180050-a680a1efc54d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 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-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.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-20190125091013-d26f9f9a57f3.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-20190227160552-c95aed5357e7.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
@@ -1484,11 +1504,9 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190611141213-3f473d35a33a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 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-20190620200207-3b0461eec859.zip 1421786 BLAKE2B 15782d84b4fd3576df5ae0c6540880b3a87f5ed47d66527ad88bbdd5e96cd1b0fb321b896b686de67d4518d3c6eecd008f1e49f48fa29df962a4d01f6e08653f SHA512 e79353b8f6b6866a14236eed278aae32ccb02eed040a557dda219cd96eecdc0174a8ac29a5509a33f6f0f9e5aa16f7d1c6861167d9798a5cb1eb01aabcee56f2
 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-20190724013045-ca1201d0de80.zip 1421740 BLAKE2B cd3c9ada6f26a62d6b74386e6ea23a2707a14b744da7ce34df3dbbda69971cfbc7d55ee57f3554b5a551950e999fa3a1b132656d16a8d919abc846d585893e4d SHA512 3702babc276d2ab50e806b863bce608f89552b42cbadfb1293e601667ccddf093f369b2eeda2bde9dc8205e22e31a452fd62a3ae482504d857ad91d0c6b92cc9
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip 1423356 BLAKE2B 412d4c362e9d11899790082861e26002ed0fe500b4d5d0b9caa1a00ee9363337d1e47cdc6a232d858d00ff10da2b581c000d20208539098a8fe1f83d012fb00e SHA512 dbd74ce99432faf080dc0980624adfea31cd74d53949a4b747e14d6464632c48e78c40a1b862305bb5650cfb1b202f2c024f44f9ffdcc104555e9f42b4eae30f
 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-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
@@ -1496,9 +1514,16 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.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-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
 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-20201021035429-f5854403a974.zip 1503642 BLAKE2B 459cd4c9e103f489e029f1d7a4073b9af288c7feb34a7290a4b2c430d7cef6d8d8f85904d13e2549dc64ce47b9b3741c3082c46827988f085d3b32fa44eb81a3 SHA512 3f81ba470596bf5801cb9c80cb3ad84b61ae8d9b7a43d43b6c81bad14a2f7c9f08609a3205811ef7b4bf67d06f3474a7cacf6b42c06b5c9c88082f68082db67d
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod 179 BLAKE2B cbbf790357e705f6b365164e871ec1a61f38f08d3657730186e53b1e3a3d802cc0af8032be7f59252707c6d19dcdeb6f8b9ec3d4e7af74c1511bae31da54046b SHA512 22eca632a9bff1e24cdbbd1060a6c8a1aaf3bf7e06aa96b40f1848877cab00b8687309b9466f703664c4988264fb5a62ee99bc216038bf1096bc21fa27ef988b
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod 179 BLAKE2B d4f0ad22973a6e0a06b186e217dedbea3abb1800b259c56a29da9075c36808160620b42b0a485127f713760b24b4d9d6d9a61119c5739927340436bac307f5c4 SHA512 f48731641ffad3b90daf0a8bb79fdfc607c076961dbda1c51e71eab787dca0681e5984ffce048bd655ceb56052fa64426b30b32e6ee32957c92418a16d1c9f06
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210423184538-5f58ad60dda6.mod 179 BLAKE2B 48e3d89e20ae78bf2300c3004911d5247c6a682b66e213cb0bb23e516b52d75215bcffc85a1f8cfeef888775b8eaf7c90f850bca034e49218c1f93e6aec6a7ff SHA512 98c9784c584e8141a9a51bfa8e4b361f3b8a62b83a922ee4fc02e0da396250d6d4d0ccd2a8ac6d1dda8e445859d09760010296191e95b86e15088425a2989b0c
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.mod 179 BLAKE2B 48e3d89e20ae78bf2300c3004911d5247c6a682b66e213cb0bb23e516b52d75215bcffc85a1f8cfeef888775b8eaf7c90f850bca034e49218c1f93e6aec6a7ff SHA512 98c9784c584e8141a9a51bfa8e4b361f3b8a62b83a922ee4fc02e0da396250d6d4d0ccd2a8ac6d1dda8e445859d09760010296191e95b86e15088425a2989b0c
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.zip 1557827 BLAKE2B 65969f3f9638c2ed7d5a36d862bcef3cf15d0046371faee37dc4da6848c197d2be4fbd132fe7ad9b2c40948c88b1665430be8d50522f3d01ea81f7e9c9a23ca4 SHA512 d6252d06c32f8edb41add604a696721717a817f2b372d528065ef78ab8caac395f9efb8948a153f9dd10b22c3505766c43edef42ff7bcd950352e8d7aa2152a1
 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-20181017192945-9dcd33a902f4.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
@@ -1513,20 +1538,23 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAK
 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-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
 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-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
 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-20200317015054-43a5402ce75a.zip 27020 BLAKE2B 0ba91b5129426896f009357980019a5e1c4cd5568108e615346a2d65421a6a595035069e6366d98af40260a020f90f6b55214e273a7dc92a80d3faee540bc0d0 SHA512 a9408e27c31248e5e6b24c0f255512c97e73e0a972a94e0bf0b0181eae42c1213e02e6988a71178abb05c2624da2e6b7beb12f2a494b630753a083dc3133b58d
 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%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip 28673 BLAKE2B d5a34f311e12038daf9c89b646bc5caf5566c08fc563fe2af3d113596d77cfe759942e35314e5b595c5704920d12b273ac30de865256b406287868d827d28938 SHA512 443917030bd593bf9ba4fee7748b5d9f15c82b7cbb21a586fc9a326de9c4f8fd8a7caf29131b0c8cf9fbf6a1363fdc7c8dd2ab897b569d3adaacfb55ad0d4601
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip 28693 BLAKE2B 3d6a34fa6da642f5ca71c930bd69a41439013f20ee60dde5d4dfab4bf688f1edb150a0477cb006670424c6c59e90d4bac9e5eb34f9fb4c518d903dfd26fb6cb7 SHA512 48b983589bd682ff9275c47733ec73637ebb5e58e1bca0c7744101229237d5cb34170efab63db0061aec857052cce9ef03c3497702b90a86287e6be88e1b33aa
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.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-20190219092855-153ac476189d.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -1548,6 +1576,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190610200419-93c9922d18ae.mod 33 BLAKE
 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-20190626221950-04f50cda93cb.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-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -1557,33 +1586,52 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191113165036-4c7a9d0fe056.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.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-20191210023423-ac6580df4449.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.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-20200106162015-b016eb3dc98e.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-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
 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-20200509044756-6aff5f38e54f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.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-20200602225109-6fdc65e7d980.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.zip 1478946 BLAKE2B 798d7aa002eaa8b42880345aa5c09b0577e29e4bcca817b184c0fccca25a1def1b50cd815df20b3368ab117f831d56e33177baefdebafa018da052454330728c SHA512 9a5a239ed5e708b41be86984343c66e8e8f11e8386bcd8db9ba91a110e7390206790fb8e6099bfd2b51ba59e49f81324eac9b870f884f67aae05015b20da1531
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.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-20201214210602-f9fddec55a1e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210112080510-489259a85091.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip 1549338 BLAKE2B 94514181eb8c63293bcc8586586ed12574ed1aeb1f64247ec4953c4a591d8cfff3f32f8cb919eea69b67ee0b6edf406d65b7676dc27db2fea86549148f372127 SHA512 8ac070589db0adff74a784cf233ff80bfafbca77d840fc13f8f5c03e66bd62c960248e13aeee5d6b401282c913adc5d42ab3e4eef64ed199700c953500309ad4
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210309074719-68d13333faf2.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210317225723-c4fcb01b228e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426080607-c94f62235c83.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210511113859-b0526f3d8744.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210511113859-b0526f3d8744.zip 1634357 BLAKE2B a30240d51cb13049e8705df0160afff8fdc3707d2287e32261b5d909e60e02af13e292be839c3731ec3ed75dc3215d809d21ac53d46d5118ce928ad3ec6a2488 SHA512 79105ca14bd2eadd6351300b7adb954129597309246e1a2e8dcd8ca512113e576c3198c28441069bfa6f4ffc4fb4072e86ff679ae4b168dd52a6c36af8698612
 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-20201117132131-f5c789dd3221.zip 23282 BLAKE2B 9bfaf8ea78b49038403d7a49abdfa9ab6cfc4fc2d71e693a15368da8cbdcd99437898f72f8a240ec7484a7f2a11405258e4cd17bab00aaaed291e2a1d1566e3f SHA512 fa88149897dd4470a7e36683de33db945e219819ce74f39f384cad03db8fd6829d47e2711dec895fafa7aa24d576dffc7cb8594a499cb1e66abeada196d502be
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip 23281 BLAKE2B b2fedb31c347f2b5b8bc3c0311f5078ab84359736379206227bd7ad4378cffb67f39cf078707a7095ecfac3c243bbac54b64cf41375a4261fbc9af9887d134de SHA512 267fab133c0ae306a1f484d17a9c3bc7bafb1ae77df3412ea4047de34a940b6425524a93b7b41d010cbf32160482fa3a370f93654e4ff73b6d11e45463bc185a
 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.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
 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.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip 8610726 BLAKE2B 78870544de29f5cd9216befa8822c2387654c3987e09994dccf55d210ad7c517edb93bddcc68bd981f2c083a4ec5e012d558b0164901e2d74f6f447e75edfadf SHA512 494d58f2bc02819ec24d8e55f668a06694568e63bc4b41064a7e44aefcb2778c74983fc9126b50277845da8e6739e83fc1334aed989981e8e53b869878803d17
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 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-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -1596,7 +1644,6 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLA
 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-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.zip 2564153 BLAKE2B 17b70a9d5cff84d5b12dfe1165aca6f2abdb38e2d9f83daf8b715b9e4b16fc230f8f82612f9502a4118ed63104331a1d3eec4e324ef8a57b9c07bfce5b056f04 SHA512 2e381b4ddbbc3e31256170aff49d38475ce26d1510615793fe5d23d99cfbed1732e75cf6419375b491e740397af39aac664d03d72e2a93b2b5293d7fbd394cf4
 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
@@ -1612,30 +1659,27 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191030062658-86caa796c7ab.mod 212 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.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-20191114200427-caa0b0f7d508.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191114200427-caa0b0f7d508.zip 2914364 BLAKE2B dbeb91ffa5a02b24e51298a85d7fa07d32b55c322a30e07618faa0c6745f0a2744bc90874365877ad160bf5ff2590be86a73251dd5ca490c2c159c5f3d7bb784 SHA512 d8549a653e26f88b46903a4be38e41991341f0c0452f12c91dbdac991209bfb0e260adc732f31cf4f7aeaa3ba02524a8061819b193140b0547d0f94190573839
 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-20191125144606-a911d9008d1f.zip 2908295 BLAKE2B 2dd707c5fcea8b16c24aa85c6ed98c0cdd26440a04a3f4c61d55e315f1959e133af3644dd7b0480c007367806e56b64e2a80f0680551d77c57b84f8a810725e8 SHA512 4f1931e839f7ccbdefde629b5ace77a463104179b58818963eebe42548185b5c8597c0632735ec25a6d0eccf85d8294eabcededcfda12b29bd21c4fc7e84aad5
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.zip 2919721 BLAKE2B 16a17a96f828bea7eaf46111e42e6cc7cbf722e0580c5698637a325f083b31e7a132d4aceed0c9bede8bc3c7aa89a9d71321221f0fe5b0c829d0067d9c8cdca5 SHA512 087d2ac531dc56f4b72183ba20540140345cd7b5782d1934f1cab9d3c8d35d755bfaa6eb0ba520cc48cc77154d63154f42eec42f56e7ee1bec7501a7a48366fc
 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-20200103221440-774c71fcf114.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-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-20200522201501-cb1345f3a375.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200522201501-cb1345f3a375.zip 3136793 BLAKE2B eaa4ebfadc3ee8e1faad5abdc83c9b6766dbae7fdb9ceb7fee5f0fcec1705e7ff873edc0c05b8430fc7b786db9c03fd268f22ac01250165dc5775b04f9d06ffc SHA512 0a2f478dcb70ce5e8b56f676324daf389a2cf548a601da6be4076b0b8f2d3380c72b84625446f26d1a562fe7227a28312cdca3954ce2e5a297f283fbd5144a07
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200827010519-17fd2f27a9e3.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201224043029-2b0845dc783e.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip 3360420 BLAKE2B 8292263b751ee7d31e19e81f0d579d777d055ad5ef2528c41015d021d200674c5f189252053a59ead0306907d4c23b07b38145c06c00094364b4a833a873a6e8 SHA512 f8c20e84c403c84de01d202c1b8e68e10483d6db36a06e3271412aa5843649cbd3bc70c5980b254101783e29314d679c5b11b8a0d2ee156cd149b7ad46da20be
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.1-0.20210225150353-54dc8c5edb56.mod 323 BLAKE2B f73b278de777b65f7dc950c2ab415ed5bab41e49fb69e5295f1ed459b89cc4b187a567845d059a6e04188a0727932e06f852f06739ac00b32586bec1b4d2be2e SHA512 30ccdf0111de87fd56000c0e1d4d8879cf340418df7bdda0c26cdf6808dce38b6ef5b9e2cfd92c0e92cc414f594d2c054dcc6bb246cb81d617cff846b960ed90
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.1.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.1.zip 3430655 BLAKE2B 0e1cd589418400190ec2ceb2743cc24e33b7a38d100236803d2f2013247c606b06ca23800c5f0febc31f4b25ddf912c483204045e32019ad9828d766625770eb SHA512 103a8f8af03efd9c4ad0a49a29422f451730b1c963cd4bc9209795fc66a0a20e381c3f664bee1ff89a2fa19962c57c72cdc35ad1a54f07ec008198bed34c2dab
 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-20190717185122-a985d3407aa7.zip 20009 BLAKE2B 60e04979e9fdcb37b8dac7d3a1703d9a8c3bf399eaab76a7bfb1041c1e974cfb83aaa97fdbb258758b17813f22a44ca6355972c4b54b503dc5b2a96ee24dde27 SHA512 aab0e6fa0e68bfa59aa0b217e4a0f5910190898f5d24e172de3726bb6d2e70102c114ae37060f797f9efe8702a935300726205328cd8ae2656b9031b68d9aa50
 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-20191011141410-1b5146add898.zip 19898 BLAKE2B a1233d14bcda685e77649385f4cb03d5c0c0e2491dd01db12a81d3e255e0cc2636950142ea3f647f8177390401ad6236fc05af3537e9561e2e021a4c60ab612b SHA512 464d0f5e1ce45f303f0cf3b6c109629384cb23a8d1e23c5cbf16fbaffb19ae1641da4457b1baabd0e8d2f9784fda64774adfb4c1baaae837877275396d0f22fa
 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-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
 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.0.0-20180910000450-7ca32eb868bf.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
@@ -1645,6 +1689,7 @@ DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a
 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.3.1.mod 506 BLAKE2B 106ba1eae2f79ddc10b69e21988215a1be000c5b32a4bd8315d473748780be8785e89ce269f1560dc23a8afcb199c8a0428aefdf8035991051021443c17fd206 SHA512 37d49dd9c576465cc9dec58fab5cd9c0fa84ab472d46c961e64f34fcda27f88c45925da72368268f857db22bc9cd1378c6595933ee33ed5a6253f62c221ca6ef
 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
@@ -1666,6 +1711,7 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod
 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-20190530194941-fb225487d101.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
 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
@@ -1680,54 +1726,64 @@ DIST google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod 903 BLAKE2B dd9ff44489e2a944c07f3e58c3246534b472b407eb15780bfcf9a30370eea7353a8ec12601a6c3e0e39edad1de6651df1c959f86a528a0cb53ff7d2e8514d1e6 SHA512 1e7c2190023d06747cf81e4d6f25aa284a250912ac304e3d590e1b85f5ca3ad3d9963a0ff7106e5dc55f82f58eea953c72f131f4baa6618b46017a575669742b
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod 832 BLAKE2B 9de27394e05cf42e762a8b7ed42b6715244ea1086acd7c44f71b04bc0dc23c31ab236e6474fea423953eb3001dcaa357938daad1d54debfb5d52bdecc1de6bda SHA512 ac90f3fc374cc1ac7706146efaa8488a59634a209c30bf87453fa150bf8849870db2ec04e854438d59911ea35930a5dd8f40f5d5954786d0e0565907fc42f711
 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.0.mod 979 BLAKE2B cac1528e7af91a98ad2e1fcaee0892547eac67d1d6ce29473c1114eb2c373acebad87008124924adc3f1a98cc4a2911c1679cd7f24f025ffe0d4902d123a6639 SHA512 558a4f5d7910813809d7edead3f7e2300936a262e289905dc1e33ba293d89d9bb590ae0f8b00bedc1e30288257ac66d7edc2d3f3f657d2d31ffaef7ff0e24f92
 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.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.22.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.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.27.1.zip 1142481 BLAKE2B 2b5b18292c24f142fafdffd7ca4416da8425f317e195b3c59fffa6881eaf42ee90722ec7d06f8dd39fff3b582fd5a08248d967d58204d5c55161900c01164d56 SHA512 0ba3e5799dc97e3cae5765bf607742bc3165ab02dcd774290b2a624518ab503c3110b9ea7bd889b9e898344aa679f0bb13f05fcd94514090f7d408fec81cd1ea
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.28.1.mod 532 BLAKE2B ebe5fc28123fed2d7c497a7e237039a4a90f6eeb389b61650cede1d3bb850a1cd09c1574ee57fe65b6f4d338bb440a67ff802a28805b044bcc78b39ce2acd5b6 SHA512 85a0f6a03de8c151aacca3944a75738ac01ba368be98d6e4756a772976fccfd0faac55df170feb51ac86a10241a613b2ce1ac7d7c5cbef41ee2ed8eb93416801
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.zip 1219303 BLAKE2B b68b50b8901c49456fe4e6f55e25ea0ddd9294b729b9191c6b0d75a73894e3fb852903eccddea083729be5b04bcdf9e7434fbb3b0a84c5302fdb3206cbf4da49 SHA512 f8ba6649bf1bf9619b45afac841184aa4b335c878940af368c343aa4d161d42ada823d2a238e4c81eeb2c8d1a2780215e1582517de22578428084a1d52de753f
+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.21.0.zip 1456574 BLAKE2B 4957a5322065e982e12220a4eae758cca1626e9e158222acba41df0bf5fffaa8256e4efc832d90c4853d29b46fdbc8f4af9702f51cac93f92d25fa0f4d7cd603 SHA512 739d87735445d8c7bc877774ad0400570a3bbb67216100fd7edab615f11087225dda48fd16be53f7e6535c16f1cd686716c262567954e8ffc052b11125bcfb13
 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.0.zip 1491602 BLAKE2B 7fcfd0d05fe509a3e30885304b7ec76a538fdc9cde84d44fb90a32aebbd14bdffd5f3f7e36f9ba24ef87decec89fa824963780b152faf43f3799c8e64e822f34 SHA512 91a070430e3a44edc4f66d6b2ecfcfeb4c633a07c252d1494ecbc9a37141483cb7bc9bfc641022a59e740ccfe9c4ed52e263d59eb85b5bc37a66088bafb6ca8a
 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 google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod 83 BLAKE2B 0e4901ba1d4e31ef22f0f978ee7b7d926ac2cd3a1cb5d8d8a81a33e02f9dc81aad6508280d65659862c3a9bc0667c334cb6cd8c0c532d5fdb3735a415c2a5eca SHA512 a7b2aad691925341e3d1f6d1d1453b68386902a4e2e1c0deb406bc157d04328c5519a01ce938a33a6e358cbd9dc0c2f862c9822bde5314d2eb9d416d7bf789d2
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod 123 BLAKE2B 73f875413489557d8f0bbcd665c06356b900f87e2cd9ef0ee5aba218a3a910842912d36dc9e653afa538c99cc723d28327a8bec6eac1f6bd93277d70fa891339 SHA512 d618524aca1cb3e525060bb66b0c8f06c9ad6be5389be228d265dbcdb368442f4f0a7e98f8c9082916b2579d77e627a550904f0b1c058b7d5e45eb7ceb77c2e0
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip 1557709 BLAKE2B bc672854cc46d48461bf28395c5be02fe99ff9da1d23e212078e549bf3e2beeaf953cc185e059c73a374f3e2662cb81fd6c3ff53472934964b8461f370b51a78 SHA512 de309c033d05be35503d6073e14ead585db4e6b75d478a674a37f93c7757e914c67bad446cf7ce04ccd49659d1ab2f9a024ee639a7536480ef92bb6b8b52dfdb
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip 59626 BLAKE2B 5fb595a10b7068bd2e4baea5fb28eb84f1f00960ca5ea964cd1812800ba8a34e62b3b71554dcfbdd727d5478eb5d91a00bd2bb7e89086929275e15e9261bdf2c SHA512 cdfbb32c7280c5405c4df41f00fa8b4ab2966285898a122a20f3c5f07a9e87095542be12efc09a67e4d90baa1fe51cd41f06733db7617949634409ea20e58dce
 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%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
 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%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.28.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
-DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.28.zip 18118 BLAKE2B 554da95a16c0993b4cf83b7cfa01a09f8a74c5d6ab80b3732bc066e82fa73abb8fc49f92f6d73acbf7296346f335f202de0d10604ed3e42b4d32d8b4169a0718 SHA512 6575eb0dea6524b8e5072a7eeb8d57f57ea2d6c6354d137b28befe9a85cc13bddf061fbe6f0da7d418bcb4ad293b38a3664424096930eadf5e16c4554cdd450f
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.mod 71 BLAKE2B 0a639f084a90d74b70232aeeaf4be7b5bb421913a30b3b97d97186022dcd1d1dacfb07eb7681369fb408793b8c7233ccc92caa77451f24371c64ce81e7c0a8fd SHA512 a2f9fd465e2e0c735ca80e04f2002e31cad434c5a3771a3adcdc7f9502f0caa7b27a5f17ec2cd95bcb214e12ac1200a78139db063d4384b864bd290cb6815e87
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.zip 42835 BLAKE2B 84e1f37c859e0d7ec5adc4cbbd4561186446e6bb75dabbfa73e44f44f7d21c2b14e97daac56bf65d2acbfa9c8a338ef8c23d75bbfcf26e01bdd87c3880c4a6e9 SHA512 b69b95251b63b6fd0ed1953dae01edefa52126e2168246bc2cdf067879ae5f830df4e610da45f5ac5aa4789f70d79da8a9bfa7af5b3786ef8f1e665a8b397e02
+DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
 DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
-DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
+DIST gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod 24 BLAKE2B 2e460175791185a1eeaec63e12c62c4151b0dd57c9f1e21a2849d834d762c928c843b59a0ec9a2000e8bcf6e86a4c3cea4895c40b99451148e9e4ccd95ffa815 SHA512 cb839ecb3ad2ea4ac9f449a9a0a71dddd03b6988321ccd655cad1d66e042fe2618c635a8ce5ee6a96c5944a12053ef658fc13e54aeb69a5649523f5cd0252252
 DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
 DIST gopkg.in%2Fsrc-d%2Fgo-cli.v0%2F@v%2Fv0.0.0-20181105080154-d492247bbc0d.mod 32 BLAKE2B 40bb1cf8ef2371bc1a621ab77476799c673675de3e4a6aa969eefa017c056ca25eb57a71b929562942f0d2447924a6bcaedbadabbad99e018ba6935229b1c9dc SHA512 97aee49958d807f34c5cbb7f2c4885e68908535c83b20b130d46cb3ae80803d6348c98de23b259d7b8cf8fb8fc2d8fa7d3f3a43292c5c88d49874765b7743f4f
 DIST gopkg.in%2Fsrc-d%2Fgo-log.v1%2F@v%2Fv1.0.1.mod 32 BLAKE2B efd3316a0eadc32b60898b0819b45fe8a116b779da7dcfed7ffe11279244af9cb91e783279cf4a6f61d17835016988f2bc2863915726416add7aa91949e9e3c3 SHA512 00ad96b64c5be6c85131ed4d0917a066fe4d2accf35e3e78d74e5304b35ab7268932ec023746927ba267a614bb4c4973e6a3d62f34e2dcf170a303d1f7c37078
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
+DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 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.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.zip 80253 BLAKE2B 175e08dfe0913765b5a913c23cf2803dbbdfa007430caaaa5a8e46cd9df8e1c48e3b84ffe248800422b963ad2d5db8031c86df926cc6f413b0ce05fa21326113 SHA512 371da5f4c32800cadd40127a78d4ae29918f4477ca87e42c414bdb7adfb9e9ab22e5f22e821d76f543204b0be8b9297dfe1b4e20814ab8015088492309676e0a
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add43b21ffa058b58fef60e8efbf973b724273cda2496ef0c9b226ad14bfea17f141f077d3bd98dfe3dbcf3c2938fd64570abd662b2 SHA512 2a89b2bce856cc11f3b71edec9e538048acf07f6aabbe27236b663b284c086c5862f086734e58727e9db8912a113fea51f72dad1a45a9e85860764f9c27b19d2
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip 81183 BLAKE2B 0e3222d715fe7e9e8e9a10abad817f75bdd095f9af250d6bdf1ee2881930c739111de8b526175c9204995c48e0ade9852541a7f22b0ce1261f473986a2739182 SHA512 d6f4ac547609c943adfc6b518ff03ac09da566ba2b29466abe8f6db3d5a41ae7e5c187068dce4e77271905b1aa88497ca49a43bb9bbf9c94011b7ccf1b4b2f42
 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-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
 DIST grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod 20 BLAKE2B e14762111ddcb60b4b0d52ea4ef58dd26501463483aebf674713b6cca9a2a7a000c77f212c0fc0764ae69891b0c307c97bcdbc3bfb1f3fa5032582689bcefb89 SHA512 2a842877eb3d9f5d1a51864053d1dcafc6f74cf834cf597d1c167da6040a3842d409f4bb8ceaec80049ec0f70c4b42603016bee64539616e2f988160c5409afd
@@ -1741,8 +1797,10 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip 506912 BLAKE2B a38cb31fd8
 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
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
+DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f361d08bba5f5689a0e8b51dc17f11fe893c1fb3c0b671d323c6f66448d0c73d26b64586ce2236cc91f44839eba5ebf2a858b04aa85b5bde847c5956b0a519 SHA512 ef74bbbbb50cb01b861dc25c1a1ee276cebb64a383a31f4acf3f78db0e1b5fa907c6ecb9a88e4819d4aa7d5fccced97b574c12e147c36677a8d4e5f73b55d04c
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
-EBUILD go-ipfs-0.7.0.ebuild 82738 BLAKE2B eefa46f1053c9716dd43a8ae120736781adfed53be40f9f9602aae273aa9f1d28f28c05c50721e4be446b9ba6bc36a046aa1f103d6031ff643aeac597fc22bc2 SHA512 38a823e3878a19fbef7be5fe8356606b34a1156642a5940de9b38b28ef7da656dad9f34b1ca3a40e92e6250219ffe8a575e2bb0178a2c6bb63c69503e8a09dcf
 EBUILD go-ipfs-0.8.0.ebuild 75130 BLAKE2B 4831e021e5501bf17e2e6b0629dbcd02c4b8d66cb05b9d988c1886bc2ebcf22170c7337feb5ebe150bb7dfccbb12bbd8fe0fc7ac223e172cc1c2b3845d7e45ed SHA512 3dd920602303f27eb6bdfabd6535aad97d7cbb4417aebbb4be5d2c8ab82163037b43ae3d699113b432d7aa200e446f069048945a40329fc9c65e9e3d57940928
+EBUILD go-ipfs-0.9.1.ebuild 91227 BLAKE2B c99c50a4594bb2e280acd8f0b2c68254c436775c4325d914b4e6906759f0cf3a9bbd0f634e9e6c9fa10d0f27f49d12558e84d475b12dc1e70237fbb447c3899a SHA512 e4d991fc506da37fca71b0141df5e70cc20f2fce0d07c81fdf70b4bc26a3811e946aef75aebd19fcf6c00ce711e35073ab16001103c020497bf241fc1224db96
 MISC metadata.xml 521 BLAKE2B 7d136cffdae521412f8934493a623e3ac749f70b06c90cf76937dd12ba26ad3b3565d8350626f906195f85961e6bccab3032680012ab58cc344b191823ebe4e8 SHA512 ac4f1bdff15ad8dd25faa2ad2ebef168e372b45ee3cb4268e1c2484a8dc5eba554f42919e569cb39682855732397b639152025012d6fa177d691a7d1155e09b8
diff --git a/net-p2p/go-ipfs/go-ipfs-0.7.0.ebuild b/net-p2p/go-ipfs/go-ipfs-0.7.0.ebuild
deleted file mode 100644
index 9a0de18ebba9..000000000000
--- a/net-p2p/go-ipfs/go-ipfs-0.7.0.ebuild
+++ /dev/null
@@ -1,1624 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Main implementation of IPFS"
-HOMEPAGE="https://ipfs.io/"
-
-EGO_SUM=(
-	"bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc"
-	"bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc/go.mod"
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.31.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.37.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.53.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/datastore v1.0.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/storage v1.0.0/go.mod"
-	"cloud.google.com/go/storage v1.5.0/go.mod"
-	"dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod"
-	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
-	"dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod"
-	"dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod"
-	"dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod"
-	"git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod"
-	"github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod"
-	"github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod"
-	"github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96"
-	"github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-	"github.com/Kubuxu/go-os-helper v0.0.1"
-	"github.com/Kubuxu/go-os-helper v0.0.1/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/Stebalien/go-bitfield v0.0.0-20180330043415-076a62f9ce6e/go.mod"
-	"github.com/Stebalien/go-bitfield v0.0.1"
-	"github.com/Stebalien/go-bitfield v0.0.1/go.mod"
-	"github.com/aead/siphash v1.0.1/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-	"github.com/alexbrainman/goissue34681 v0.0.0-20191006012335-3fc7a47baff5"
-	"github.com/alexbrainman/goissue34681 v0.0.0-20191006012335-3fc7a47baff5/go.mod"
-	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
-	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
-	"github.com/benbjohnson/clock v1.0.2"
-	"github.com/benbjohnson/clock v1.0.2/go.mod"
-	"github.com/benbjohnson/clock v1.0.3"
-	"github.com/benbjohnson/clock v1.0.3/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/beorn7/perks v1.0.0/go.mod"
-	"github.com/beorn7/perks v1.0.1"
-	"github.com/beorn7/perks v1.0.1/go.mod"
-	"github.com/blang/semver v3.5.1+incompatible"
-	"github.com/blang/semver v3.5.1+incompatible/go.mod"
-	"github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod"
-	"github.com/bren2010/proquint v0.0.0-20160323162903-38337c27106d"
-	"github.com/bren2010/proquint v0.0.0-20160323162903-38337c27106d/go.mod"
-	"github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod"
-	"github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c/go.mod"
-	"github.com/btcsuite/btcd v0.0.0-20190605094302-a0d1e3e36d50/go.mod"
-	"github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3"
-	"github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod"
-	"github.com/btcsuite/btcd v0.20.1-beta"
-	"github.com/btcsuite/btcd v0.20.1-beta/go.mod"
-	"github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod"
-	"github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod"
-	"github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod"
-	"github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod"
-	"github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod"
-	"github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod"
-	"github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod"
-	"github.com/btcsuite/winsvc v1.0.0/go.mod"
-	"github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod"
-	"github.com/cenkalti/backoff v2.2.1+incompatible"
-	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cespare/xxhash v1.1.0"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/cespare/xxhash/v2 v2.1.1"
-	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-	"github.com/cheekybits/genny v1.0.0"
-	"github.com/cheekybits/genny v1.0.0/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/coreos/etcd v3.3.10+incompatible/go.mod"
-	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
-	"github.com/coreos/go-semver v0.2.0/go.mod"
-	"github.com/coreos/go-semver v0.2.1-0.20180108230905-e214231b295a/go.mod"
-	"github.com/coreos/go-semver v0.3.0"
-	"github.com/coreos/go-semver v0.3.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
-	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
-	"github.com/coreos/go-systemd/v22 v22.0.0"
-	"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
-	"github.com/coreos/go-systemd/v22 v22.1.0"
-	"github.com/coreos/go-systemd/v22 v22.1.0/go.mod"
-	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
-	"github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3"
-	"github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3/go.mod"
-	"github.com/cskr/pubsub v1.0.2"
-	"github.com/cskr/pubsub v1.0.2/go.mod"
-	"github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018"
-	"github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018/go.mod"
-	"github.com/dgraph-io/badger v1.5.5-0.20190226225317-8115aed38f8f/go.mod"
-	"github.com/dgraph-io/badger v1.6.0-rc1"
-	"github.com/dgraph-io/badger v1.6.0-rc1/go.mod"
-	"github.com/dgraph-io/badger v1.6.0"
-	"github.com/dgraph-io/badger v1.6.0/go.mod"
-	"github.com/dgraph-io/badger v1.6.1"
-	"github.com/dgraph-io/badger v1.6.1/go.mod"
-	"github.com/dgraph-io/ristretto v0.0.2"
-	"github.com/dgraph-io/ristretto v0.0.2/go.mod"
-	"github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f/go.mod"
-	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2"
-	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
-	"github.com/dustin/go-humanize v1.0.0"
-	"github.com/dustin/go-humanize v1.0.0/go.mod"
-	"github.com/elgris/jsondiff v0.0.0-20160530203242-765b5c24c302"
-	"github.com/elgris/jsondiff v0.0.0-20160530203242-765b5c24c302/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5"
-	"github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5/go.mod"
-	"github.com/fatih/color v1.9.0"
-	"github.com/fatih/color v1.9.0/go.mod"
-	"github.com/fd/go-nat v1.0.0/go.mod"
-	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
-	"github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6"
-	"github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod"
-	"github.com/francoispqt/gojay v1.2.13"
-	"github.com/francoispqt/gojay v1.2.13/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.9"
-	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
-	"github.com/gabriel-vasile/mimetype v1.1.1"
-	"github.com/gabriel-vasile/mimetype v1.1.1/go.mod"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/gliderlabs/ssh v0.1.1/go.mod"
-	"github.com/go-bindata/go-bindata/v3 v3.1.3"
-	"github.com/go-bindata/go-bindata/v3 v3.1.3/go.mod"
-	"github.com/go-check/check v0.0.0-20180628173108-788fd7840127"
-	"github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod"
-	"github.com/go-errors/errors v1.0.1/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-kit/kit v0.8.0/go.mod"
-	"github.com/go-kit/kit v0.9.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/godbus/dbus/v5 v5.0.3/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gogo/protobuf v1.3.0"
-	"github.com/gogo/protobuf v1.3.0/go.mod"
-	"github.com/gogo/protobuf v1.3.1"
-	"github.com/gogo/protobuf v1.3.1/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6"
-	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-	"github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/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/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0"
-	"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"
-	"github.com/golang/mock v1.4.0/go.mod"
-	"github.com/golang/mock v1.4.4"
-	"github.com/golang/mock v1.4.4/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.3.3/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"
-	"github.com/golang/protobuf v1.4.0/go.mod"
-	"github.com/golang/protobuf v1.4.2"
-	"github.com/golang/protobuf v1.4.2/go.mod"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/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"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-cmp v0.4.0"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/go-github v17.0.0+incompatible/go.mod"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/gopacket v1.1.17"
-	"github.com/google/gopacket v1.1.17/go.mod"
-	"github.com/google/gopacket v1.1.18"
-	"github.com/google/gopacket v1.1.18/go.mod"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
-	"github.com/google/renameio v0.1.0/go.mod"
-	"github.com/google/uuid v1.1.1"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/googleapis/gax-go v2.0.0+incompatible/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.3/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c"
-	"github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f"
-	"github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f/go.mod"
-	"github.com/gorilla/websocket v1.4.0/go.mod"
-	"github.com/gorilla/websocket v1.4.1"
-	"github.com/gorilla/websocket v1.4.1/go.mod"
-	"github.com/gorilla/websocket v1.4.2"
-	"github.com/gorilla/websocket v1.4.2/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod"
-	"github.com/gxed/hashland/keccakpg v0.0.1/go.mod"
-	"github.com/gxed/hashland/murmur3 v0.0.1/go.mod"
-	"github.com/gxed/pubsub v0.0.0-20180201040156-26ebdf44f824/go.mod"
-	"github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e"
-	"github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-multierror v1.1.0"
-	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.4"
-	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/hpcloud/tail v1.0.0"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/huin/goupnp v0.0.0-20180415215157-1395d1447324/go.mod"
-	"github.com/huin/goupnp v1.0.0"
-	"github.com/huin/goupnp v1.0.0/go.mod"
-	"github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod"
-	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/ipfs/bbloom v0.0.1/go.mod"
-	"github.com/ipfs/bbloom v0.0.4"
-	"github.com/ipfs/bbloom v0.0.4/go.mod"
-	"github.com/ipfs/go-bitswap v0.0.3/go.mod"
-	"github.com/ipfs/go-bitswap v0.0.9/go.mod"
-	"github.com/ipfs/go-bitswap v0.1.0/go.mod"
-	"github.com/ipfs/go-bitswap v0.1.2/go.mod"
-	"github.com/ipfs/go-bitswap v0.1.3/go.mod"
-	"github.com/ipfs/go-bitswap v0.1.8/go.mod"
-	"github.com/ipfs/go-bitswap v0.2.20"
-	"github.com/ipfs/go-bitswap v0.2.20/go.mod"
-	"github.com/ipfs/go-block-format v0.0.1/go.mod"
-	"github.com/ipfs/go-block-format v0.0.2"
-	"github.com/ipfs/go-block-format v0.0.2/go.mod"
-	"github.com/ipfs/go-blockservice v0.0.3/go.mod"
-	"github.com/ipfs/go-blockservice v0.0.7/go.mod"
-	"github.com/ipfs/go-blockservice v0.1.0/go.mod"
-	"github.com/ipfs/go-blockservice v0.1.1/go.mod"
-	"github.com/ipfs/go-blockservice v0.1.2"
-	"github.com/ipfs/go-blockservice v0.1.2/go.mod"
-	"github.com/ipfs/go-blockservice v0.1.3"
-	"github.com/ipfs/go-blockservice v0.1.3/go.mod"
-	"github.com/ipfs/go-cid v0.0.1/go.mod"
-	"github.com/ipfs/go-cid v0.0.2/go.mod"
-	"github.com/ipfs/go-cid v0.0.3"
-	"github.com/ipfs/go-cid v0.0.3/go.mod"
-	"github.com/ipfs/go-cid v0.0.4"
-	"github.com/ipfs/go-cid v0.0.4/go.mod"
-	"github.com/ipfs/go-cid v0.0.5"
-	"github.com/ipfs/go-cid v0.0.5/go.mod"
-	"github.com/ipfs/go-cid v0.0.6"
-	"github.com/ipfs/go-cid v0.0.6/go.mod"
-	"github.com/ipfs/go-cid v0.0.7"
-	"github.com/ipfs/go-cid v0.0.7/go.mod"
-	"github.com/ipfs/go-cidutil v0.0.2"
-	"github.com/ipfs/go-cidutil v0.0.2/go.mod"
-	"github.com/ipfs/go-datastore v0.0.1/go.mod"
-	"github.com/ipfs/go-datastore v0.0.5/go.mod"
-	"github.com/ipfs/go-datastore v0.1.0"
-	"github.com/ipfs/go-datastore v0.1.0/go.mod"
-	"github.com/ipfs/go-datastore v0.1.1"
-	"github.com/ipfs/go-datastore v0.1.1/go.mod"
-	"github.com/ipfs/go-datastore v0.3.0/go.mod"
-	"github.com/ipfs/go-datastore v0.3.1"
-	"github.com/ipfs/go-datastore v0.3.1/go.mod"
-	"github.com/ipfs/go-datastore v0.4.0/go.mod"
-	"github.com/ipfs/go-datastore v0.4.1/go.mod"
-	"github.com/ipfs/go-datastore v0.4.4"
-	"github.com/ipfs/go-datastore v0.4.4/go.mod"
-	"github.com/ipfs/go-datastore v0.4.5"
-	"github.com/ipfs/go-datastore v0.4.5/go.mod"
-	"github.com/ipfs/go-detect-race v0.0.1"
-	"github.com/ipfs/go-detect-race v0.0.1/go.mod"
-	"github.com/ipfs/go-ds-badger v0.0.2/go.mod"
-	"github.com/ipfs/go-ds-badger v0.0.5"
-	"github.com/ipfs/go-ds-badger v0.0.5/go.mod"
-	"github.com/ipfs/go-ds-badger v0.0.7"
-	"github.com/ipfs/go-ds-badger v0.0.7/go.mod"
-	"github.com/ipfs/go-ds-badger v0.2.1"
-	"github.com/ipfs/go-ds-badger v0.2.1/go.mod"
-	"github.com/ipfs/go-ds-badger v0.2.3"
-	"github.com/ipfs/go-ds-badger v0.2.3/go.mod"
-	"github.com/ipfs/go-ds-badger v0.2.4"
-	"github.com/ipfs/go-ds-badger v0.2.4/go.mod"
-	"github.com/ipfs/go-ds-flatfs v0.4.5"
-	"github.com/ipfs/go-ds-flatfs v0.4.5/go.mod"
-	"github.com/ipfs/go-ds-leveldb v0.0.1/go.mod"
-	"github.com/ipfs/go-ds-leveldb v0.1.0"
-	"github.com/ipfs/go-ds-leveldb v0.1.0/go.mod"
-	"github.com/ipfs/go-ds-leveldb v0.4.1"
-	"github.com/ipfs/go-ds-leveldb v0.4.1/go.mod"
-	"github.com/ipfs/go-ds-leveldb v0.4.2"
-	"github.com/ipfs/go-ds-leveldb v0.4.2/go.mod"
-	"github.com/ipfs/go-ds-measure v0.1.0"
-	"github.com/ipfs/go-ds-measure v0.1.0/go.mod"
-	"github.com/ipfs/go-filestore v0.0.3"
-	"github.com/ipfs/go-filestore v0.0.3/go.mod"
-	"github.com/ipfs/go-fs-lock v0.0.6"
-	"github.com/ipfs/go-fs-lock v0.0.6/go.mod"
-	"github.com/ipfs/go-graphsync v0.1.1"
-	"github.com/ipfs/go-graphsync v0.1.1/go.mod"
-	"github.com/ipfs/go-ipfs-blockstore v0.0.1/go.mod"
-	"github.com/ipfs/go-ipfs-blockstore v0.1.0"
-	"github.com/ipfs/go-ipfs-blockstore v0.1.0/go.mod"
-	"github.com/ipfs/go-ipfs-blockstore v0.1.4"
-	"github.com/ipfs/go-ipfs-blockstore v0.1.4/go.mod"
-	"github.com/ipfs/go-ipfs-blocksutil v0.0.1"
-	"github.com/ipfs/go-ipfs-blocksutil v0.0.1/go.mod"
-	"github.com/ipfs/go-ipfs-chunker v0.0.1"
-	"github.com/ipfs/go-ipfs-chunker v0.0.1/go.mod"
-	"github.com/ipfs/go-ipfs-chunker v0.0.5"
-	"github.com/ipfs/go-ipfs-chunker v0.0.5/go.mod"
-	"github.com/ipfs/go-ipfs-cmds v0.4.0"
-	"github.com/ipfs/go-ipfs-cmds v0.4.0/go.mod"
-	"github.com/ipfs/go-ipfs-config v0.9.0"
-	"github.com/ipfs/go-ipfs-config v0.9.0/go.mod"
-	"github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod"
-	"github.com/ipfs/go-ipfs-delay v0.0.1"
-	"github.com/ipfs/go-ipfs-delay v0.0.1/go.mod"
-	"github.com/ipfs/go-ipfs-ds-help v0.0.1"
-	"github.com/ipfs/go-ipfs-ds-help v0.0.1/go.mod"
-	"github.com/ipfs/go-ipfs-ds-help v0.1.1"
-	"github.com/ipfs/go-ipfs-ds-help v0.1.1/go.mod"
-	"github.com/ipfs/go-ipfs-exchange-interface v0.0.1"
-	"github.com/ipfs/go-ipfs-exchange-interface v0.0.1/go.mod"
-	"github.com/ipfs/go-ipfs-exchange-offline v0.0.1"
-	"github.com/ipfs/go-ipfs-exchange-offline v0.0.1/go.mod"
-	"github.com/ipfs/go-ipfs-files v0.0.2/go.mod"
-	"github.com/ipfs/go-ipfs-files v0.0.3/go.mod"
-	"github.com/ipfs/go-ipfs-files v0.0.8"
-	"github.com/ipfs/go-ipfs-files v0.0.8/go.mod"
-	"github.com/ipfs/go-ipfs-flags v0.0.1/go.mod"
-	"github.com/ipfs/go-ipfs-pinner v0.0.4"
-	"github.com/ipfs/go-ipfs-pinner v0.0.4/go.mod"
-	"github.com/ipfs/go-ipfs-posinfo v0.0.1"
-	"github.com/ipfs/go-ipfs-posinfo v0.0.1/go.mod"
-	"github.com/ipfs/go-ipfs-pq v0.0.1/go.mod"
-	"github.com/ipfs/go-ipfs-pq v0.0.2"
-	"github.com/ipfs/go-ipfs-pq v0.0.2/go.mod"
-	"github.com/ipfs/go-ipfs-provider v0.4.3"
-	"github.com/ipfs/go-ipfs-provider v0.4.3/go.mod"
-	"github.com/ipfs/go-ipfs-routing v0.0.1/go.mod"
-	"github.com/ipfs/go-ipfs-routing v0.1.0"
-	"github.com/ipfs/go-ipfs-routing v0.1.0/go.mod"
-	"github.com/ipfs/go-ipfs-util v0.0.1"
-	"github.com/ipfs/go-ipfs-util v0.0.1/go.mod"
-	"github.com/ipfs/go-ipfs-util v0.0.2"
-	"github.com/ipfs/go-ipfs-util v0.0.2/go.mod"
-	"github.com/ipfs/go-ipld-cbor v0.0.1/go.mod"
-	"github.com/ipfs/go-ipld-cbor v0.0.2/go.mod"
-	"github.com/ipfs/go-ipld-cbor v0.0.3"
-	"github.com/ipfs/go-ipld-cbor v0.0.3/go.mod"
-	"github.com/ipfs/go-ipld-cbor v0.0.4"
-	"github.com/ipfs/go-ipld-cbor v0.0.4/go.mod"
-	"github.com/ipfs/go-ipld-format v0.0.1/go.mod"
-	"github.com/ipfs/go-ipld-format v0.0.2"
-	"github.com/ipfs/go-ipld-format v0.0.2/go.mod"
-	"github.com/ipfs/go-ipld-format v0.2.0"
-	"github.com/ipfs/go-ipld-format v0.2.0/go.mod"
-	"github.com/ipfs/go-ipld-git v0.0.3"
-	"github.com/ipfs/go-ipld-git v0.0.3/go.mod"
-	"github.com/ipfs/go-ipns v0.0.2"
-	"github.com/ipfs/go-ipns v0.0.2/go.mod"
-	"github.com/ipfs/go-log v0.0.1"
-	"github.com/ipfs/go-log v0.0.1/go.mod"
-	"github.com/ipfs/go-log v1.0.1"
-	"github.com/ipfs/go-log v1.0.1/go.mod"
-	"github.com/ipfs/go-log v1.0.2"
-	"github.com/ipfs/go-log v1.0.2/go.mod"
-	"github.com/ipfs/go-log v1.0.3"
-	"github.com/ipfs/go-log v1.0.3/go.mod"
-	"github.com/ipfs/go-log v1.0.4"
-	"github.com/ipfs/go-log v1.0.4/go.mod"
-	"github.com/ipfs/go-log/v2 v2.0.1"
-	"github.com/ipfs/go-log/v2 v2.0.1/go.mod"
-	"github.com/ipfs/go-log/v2 v2.0.2"
-	"github.com/ipfs/go-log/v2 v2.0.2/go.mod"
-	"github.com/ipfs/go-log/v2 v2.0.3"
-	"github.com/ipfs/go-log/v2 v2.0.3/go.mod"
-	"github.com/ipfs/go-log/v2 v2.0.5"
-	"github.com/ipfs/go-log/v2 v2.0.5/go.mod"
-	"github.com/ipfs/go-log/v2 v2.1.1"
-	"github.com/ipfs/go-log/v2 v2.1.1/go.mod"
-	"github.com/ipfs/go-merkledag v0.0.3/go.mod"
-	"github.com/ipfs/go-merkledag v0.0.6/go.mod"
-	"github.com/ipfs/go-merkledag v0.1.0/go.mod"
-	"github.com/ipfs/go-merkledag v0.2.3"
-	"github.com/ipfs/go-merkledag v0.2.3/go.mod"
-	"github.com/ipfs/go-merkledag v0.3.0"
-	"github.com/ipfs/go-merkledag v0.3.0/go.mod"
-	"github.com/ipfs/go-merkledag v0.3.1"
-	"github.com/ipfs/go-merkledag v0.3.1/go.mod"
-	"github.com/ipfs/go-merkledag v0.3.2"
-	"github.com/ipfs/go-merkledag v0.3.2/go.mod"
-	"github.com/ipfs/go-metrics-interface v0.0.1"
-	"github.com/ipfs/go-metrics-interface v0.0.1/go.mod"
-	"github.com/ipfs/go-metrics-prometheus v0.0.2"
-	"github.com/ipfs/go-metrics-prometheus v0.0.2/go.mod"
-	"github.com/ipfs/go-mfs v0.1.2"
-	"github.com/ipfs/go-mfs v0.1.2/go.mod"
-	"github.com/ipfs/go-path v0.0.3/go.mod"
-	"github.com/ipfs/go-path v0.0.7"
-	"github.com/ipfs/go-path v0.0.7/go.mod"
-	"github.com/ipfs/go-path v0.0.8"
-	"github.com/ipfs/go-path v0.0.8/go.mod"
-	"github.com/ipfs/go-peertaskqueue v0.0.4/go.mod"
-	"github.com/ipfs/go-peertaskqueue v0.1.0/go.mod"
-	"github.com/ipfs/go-peertaskqueue v0.1.1/go.mod"
-	"github.com/ipfs/go-peertaskqueue v0.2.0"
-	"github.com/ipfs/go-peertaskqueue v0.2.0/go.mod"
-	"github.com/ipfs/go-unixfs v0.0.4/go.mod"
-	"github.com/ipfs/go-unixfs v0.1.0/go.mod"
-	"github.com/ipfs/go-unixfs v0.2.4"
-	"github.com/ipfs/go-unixfs v0.2.4/go.mod"
-	"github.com/ipfs/go-verifcid v0.0.1"
-	"github.com/ipfs/go-verifcid v0.0.1/go.mod"
-	"github.com/ipfs/interface-go-ipfs-core v0.3.0"
-	"github.com/ipfs/interface-go-ipfs-core v0.3.0/go.mod"
-	"github.com/ipfs/interface-go-ipfs-core v0.4.0"
-	"github.com/ipfs/interface-go-ipfs-core v0.4.0/go.mod"
-	"github.com/ipld/go-car v0.1.1-0.20200429200904-c222d793c339"
-	"github.com/ipld/go-car v0.1.1-0.20200429200904-c222d793c339/go.mod"
-	"github.com/ipld/go-ipld-prime v0.0.2-0.20200428162820-8b59dc292b8e"
-	"github.com/ipld/go-ipld-prime v0.0.2-0.20200428162820-8b59dc292b8e/go.mod"
-	"github.com/ipld/go-ipld-prime-proto v0.0.0-20200428191222-c1ffdadc01e1"
-	"github.com/ipld/go-ipld-prime-proto v0.0.0-20200428191222-c1ffdadc01e1/go.mod"
-	"github.com/jackpal/gateway v1.0.4/go.mod"
-	"github.com/jackpal/gateway v1.0.5"
-	"github.com/jackpal/gateway v1.0.5/go.mod"
-	"github.com/jackpal/go-nat-pmp v1.0.1"
-	"github.com/jackpal/go-nat-pmp v1.0.1/go.mod"
-	"github.com/jackpal/go-nat-pmp v1.0.2"
-	"github.com/jackpal/go-nat-pmp v1.0.2/go.mod"
-	"github.com/jbenet/go-cienv v0.0.0-20150120210510-1bb1476777ec/go.mod"
-	"github.com/jbenet/go-cienv v0.1.0"
-	"github.com/jbenet/go-cienv v0.1.0/go.mod"
-	"github.com/jbenet/go-is-domain v1.0.5"
-	"github.com/jbenet/go-is-domain v1.0.5/go.mod"
-	"github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c"
-	"github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c/go.mod"
-	"github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2"
-	"github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2/go.mod"
-	"github.com/jbenet/go-temp-err-catcher v0.1.0"
-	"github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod"
-	"github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8/go.mod"
-	"github.com/jbenet/goprocess v0.1.3"
-	"github.com/jbenet/goprocess v0.1.3/go.mod"
-	"github.com/jbenet/goprocess v0.1.4"
-	"github.com/jbenet/goprocess v0.1.4/go.mod"
-	"github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod"
-	"github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod"
-	"github.com/jessevdk/go-flags v1.4.0/go.mod"
-	"github.com/jrick/logrotate v1.0.0/go.mod"
-	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/json-iterator/go v1.1.10/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
-	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
-	"github.com/jtolds/gls v4.20.0+incompatible"
-	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d/go.mod"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/errcheck v1.2.0"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/koron/go-ssdp v0.0.0-20180514024734-4a0ed625a78b"
-	"github.com/koron/go-ssdp v0.0.0-20180514024734-4a0ed625a78b/go.mod"
-	"github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d"
-	"github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pretty v0.2.0"
-	"github.com/kr/pretty v0.2.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/pty v1.1.3/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/libp2p/go-addr-util v0.0.1"
-	"github.com/libp2p/go-addr-util v0.0.1/go.mod"
-	"github.com/libp2p/go-addr-util v0.0.2"
-	"github.com/libp2p/go-addr-util v0.0.2/go.mod"
-	"github.com/libp2p/go-buffer-pool v0.0.1/go.mod"
-	"github.com/libp2p/go-buffer-pool v0.0.2"
-	"github.com/libp2p/go-buffer-pool v0.0.2/go.mod"
-	"github.com/libp2p/go-cidranger v1.1.0"
-	"github.com/libp2p/go-cidranger v1.1.0/go.mod"
-	"github.com/libp2p/go-conn-security v0.0.1/go.mod"
-	"github.com/libp2p/go-conn-security-multistream v0.0.1/go.mod"
-	"github.com/libp2p/go-conn-security-multistream v0.0.2/go.mod"
-	"github.com/libp2p/go-conn-security-multistream v0.1.0"
-	"github.com/libp2p/go-conn-security-multistream v0.1.0/go.mod"
-	"github.com/libp2p/go-conn-security-multistream v0.2.0"
-	"github.com/libp2p/go-conn-security-multistream v0.2.0/go.mod"
-	"github.com/libp2p/go-eventbus v0.1.0"
-	"github.com/libp2p/go-eventbus v0.1.0/go.mod"
-	"github.com/libp2p/go-eventbus v0.2.1"
-	"github.com/libp2p/go-eventbus v0.2.1/go.mod"
-	"github.com/libp2p/go-flow-metrics v0.0.1"
-	"github.com/libp2p/go-flow-metrics v0.0.1/go.mod"
-	"github.com/libp2p/go-flow-metrics v0.0.2"
-	"github.com/libp2p/go-flow-metrics v0.0.2/go.mod"
-	"github.com/libp2p/go-flow-metrics v0.0.3"
-	"github.com/libp2p/go-flow-metrics v0.0.3/go.mod"
-	"github.com/libp2p/go-libp2p v0.0.2/go.mod"
-	"github.com/libp2p/go-libp2p v0.0.30/go.mod"
-	"github.com/libp2p/go-libp2p v0.1.0/go.mod"
-	"github.com/libp2p/go-libp2p v0.1.1/go.mod"
-	"github.com/libp2p/go-libp2p v0.6.0"
-	"github.com/libp2p/go-libp2p v0.6.0/go.mod"
-	"github.com/libp2p/go-libp2p v0.6.1"
-	"github.com/libp2p/go-libp2p v0.6.1/go.mod"
-	"github.com/libp2p/go-libp2p v0.7.0"
-	"github.com/libp2p/go-libp2p v0.7.0/go.mod"
-	"github.com/libp2p/go-libp2p v0.7.4"
-	"github.com/libp2p/go-libp2p v0.7.4/go.mod"
-	"github.com/libp2p/go-libp2p v0.8.1/go.mod"
-	"github.com/libp2p/go-libp2p v0.8.3"
-	"github.com/libp2p/go-libp2p v0.8.3/go.mod"
-	"github.com/libp2p/go-libp2p v0.11.0"
-	"github.com/libp2p/go-libp2p v0.11.0/go.mod"
-	"github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052"
-	"github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052/go.mod"
-	"github.com/libp2p/go-libp2p-autonat v0.0.2/go.mod"
-	"github.com/libp2p/go-libp2p-autonat v0.0.6/go.mod"
-	"github.com/libp2p/go-libp2p-autonat v0.1.0"
-	"github.com/libp2p/go-libp2p-autonat v0.1.0/go.mod"
-	"github.com/libp2p/go-libp2p-autonat v0.1.1"
-	"github.com/libp2p/go-libp2p-autonat v0.1.1/go.mod"
-	"github.com/libp2p/go-libp2p-autonat v0.2.0"
-	"github.com/libp2p/go-libp2p-autonat v0.2.0/go.mod"
-	"github.com/libp2p/go-libp2p-autonat v0.2.1"
-	"github.com/libp2p/go-libp2p-autonat v0.2.1/go.mod"
-	"github.com/libp2p/go-libp2p-autonat v0.2.2"
-	"github.com/libp2p/go-libp2p-autonat v0.2.2/go.mod"
-	"github.com/libp2p/go-libp2p-autonat v0.3.2"
-	"github.com/libp2p/go-libp2p-autonat v0.3.2/go.mod"
-	"github.com/libp2p/go-libp2p-blankhost v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-blankhost v0.1.1/go.mod"
-	"github.com/libp2p/go-libp2p-blankhost v0.1.4"
-	"github.com/libp2p/go-libp2p-blankhost v0.1.4/go.mod"
-	"github.com/libp2p/go-libp2p-blankhost v0.1.6"
-	"github.com/libp2p/go-libp2p-blankhost v0.1.6/go.mod"
-	"github.com/libp2p/go-libp2p-blankhost v0.2.0"
-	"github.com/libp2p/go-libp2p-blankhost v0.2.0/go.mod"
-	"github.com/libp2p/go-libp2p-circuit v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-circuit v0.0.9/go.mod"
-	"github.com/libp2p/go-libp2p-circuit v0.1.0/go.mod"
-	"github.com/libp2p/go-libp2p-circuit v0.1.4"
-	"github.com/libp2p/go-libp2p-circuit v0.1.4/go.mod"
-	"github.com/libp2p/go-libp2p-circuit v0.2.1"
-	"github.com/libp2p/go-libp2p-circuit v0.2.1/go.mod"
-	"github.com/libp2p/go-libp2p-circuit v0.2.2"
-	"github.com/libp2p/go-libp2p-circuit v0.2.2/go.mod"
-	"github.com/libp2p/go-libp2p-circuit v0.3.1"
-	"github.com/libp2p/go-libp2p-circuit v0.3.1/go.mod"
-	"github.com/libp2p/go-libp2p-connmgr v0.2.4"
-	"github.com/libp2p/go-libp2p-connmgr v0.2.4/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.0.2/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.0.3/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.0.4/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.2.0/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.2.2/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.2.4/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.2.5"
-	"github.com/libp2p/go-libp2p-core v0.2.5/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.3.0"
-	"github.com/libp2p/go-libp2p-core v0.3.0/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.3.1"
-	"github.com/libp2p/go-libp2p-core v0.3.1/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.4.0"
-	"github.com/libp2p/go-libp2p-core v0.4.0/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.5.0"
-	"github.com/libp2p/go-libp2p-core v0.5.0/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.5.1"
-	"github.com/libp2p/go-libp2p-core v0.5.1/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.5.2"
-	"github.com/libp2p/go-libp2p-core v0.5.2/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.5.3"
-	"github.com/libp2p/go-libp2p-core v0.5.3/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.5.4/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.5.5/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.5.6"
-	"github.com/libp2p/go-libp2p-core v0.5.6/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.5.7"
-	"github.com/libp2p/go-libp2p-core v0.5.7/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.6.0"
-	"github.com/libp2p/go-libp2p-core v0.6.0/go.mod"
-	"github.com/libp2p/go-libp2p-core v0.6.1"
-	"github.com/libp2p/go-libp2p-core v0.6.1/go.mod"
-	"github.com/libp2p/go-libp2p-crypto v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-crypto v0.0.2/go.mod"
-	"github.com/libp2p/go-libp2p-crypto v0.1.0"
-	"github.com/libp2p/go-libp2p-crypto v0.1.0/go.mod"
-	"github.com/libp2p/go-libp2p-discovery v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-discovery v0.0.5/go.mod"
-	"github.com/libp2p/go-libp2p-discovery v0.1.0"
-	"github.com/libp2p/go-libp2p-discovery v0.1.0/go.mod"
-	"github.com/libp2p/go-libp2p-discovery v0.2.0"
-	"github.com/libp2p/go-libp2p-discovery v0.2.0/go.mod"
-	"github.com/libp2p/go-libp2p-discovery v0.3.0"
-	"github.com/libp2p/go-libp2p-discovery v0.3.0/go.mod"
-	"github.com/libp2p/go-libp2p-discovery v0.4.0"
-	"github.com/libp2p/go-libp2p-discovery v0.4.0/go.mod"
-	"github.com/libp2p/go-libp2p-discovery v0.5.0"
-	"github.com/libp2p/go-libp2p-discovery v0.5.0/go.mod"
-	"github.com/libp2p/go-libp2p-gostream v0.2.1"
-	"github.com/libp2p/go-libp2p-gostream v0.2.1/go.mod"
-	"github.com/libp2p/go-libp2p-host v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-host v0.0.3/go.mod"
-	"github.com/libp2p/go-libp2p-http v0.1.5"
-	"github.com/libp2p/go-libp2p-http v0.1.5/go.mod"
-	"github.com/libp2p/go-libp2p-interface-connmgr v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-interface-connmgr v0.0.4/go.mod"
-	"github.com/libp2p/go-libp2p-interface-connmgr v0.0.5/go.mod"
-	"github.com/libp2p/go-libp2p-interface-pnet v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-kad-dht v0.9.0"
-	"github.com/libp2p/go-libp2p-kad-dht v0.9.0/go.mod"
-	"github.com/libp2p/go-libp2p-kbucket v0.4.7"
-	"github.com/libp2p/go-libp2p-kbucket v0.4.7/go.mod"
-	"github.com/libp2p/go-libp2p-loggables v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-loggables v0.1.0"
-	"github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod"
-	"github.com/libp2p/go-libp2p-metrics v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-mplex v0.1.1/go.mod"
-	"github.com/libp2p/go-libp2p-mplex v0.2.0/go.mod"
-	"github.com/libp2p/go-libp2p-mplex v0.2.1"
-	"github.com/libp2p/go-libp2p-mplex v0.2.1/go.mod"
-	"github.com/libp2p/go-libp2p-mplex v0.2.2"
-	"github.com/libp2p/go-libp2p-mplex v0.2.2/go.mod"
-	"github.com/libp2p/go-libp2p-mplex v0.2.3"
-	"github.com/libp2p/go-libp2p-mplex v0.2.3/go.mod"
-	"github.com/libp2p/go-libp2p-mplex v0.2.4"
-	"github.com/libp2p/go-libp2p-mplex v0.2.4/go.mod"
-	"github.com/libp2p/go-libp2p-nat v0.0.2/go.mod"
-	"github.com/libp2p/go-libp2p-nat v0.0.4"
-	"github.com/libp2p/go-libp2p-nat v0.0.4/go.mod"
-	"github.com/libp2p/go-libp2p-nat v0.0.5"
-	"github.com/libp2p/go-libp2p-nat v0.0.5/go.mod"
-	"github.com/libp2p/go-libp2p-nat v0.0.6"
-	"github.com/libp2p/go-libp2p-nat v0.0.6/go.mod"
-	"github.com/libp2p/go-libp2p-net v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-net v0.0.2/go.mod"
-	"github.com/libp2p/go-libp2p-netutil v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-netutil v0.1.0"
-	"github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod"
-	"github.com/libp2p/go-libp2p-noise v0.1.1"
-	"github.com/libp2p/go-libp2p-noise v0.1.1/go.mod"
-	"github.com/libp2p/go-libp2p-peer v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-peer v0.1.1/go.mod"
-	"github.com/libp2p/go-libp2p-peer v0.2.0"
-	"github.com/libp2p/go-libp2p-peer v0.2.0/go.mod"
-	"github.com/libp2p/go-libp2p-peerstore v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-peerstore v0.0.6/go.mod"
-	"github.com/libp2p/go-libp2p-peerstore v0.1.0/go.mod"
-	"github.com/libp2p/go-libp2p-peerstore v0.1.3"
-	"github.com/libp2p/go-libp2p-peerstore v0.1.3/go.mod"
-	"github.com/libp2p/go-libp2p-peerstore v0.1.4"
-	"github.com/libp2p/go-libp2p-peerstore v0.1.4/go.mod"
-	"github.com/libp2p/go-libp2p-peerstore v0.2.0"
-	"github.com/libp2p/go-libp2p-peerstore v0.2.0/go.mod"
-	"github.com/libp2p/go-libp2p-peerstore v0.2.1"
-	"github.com/libp2p/go-libp2p-peerstore v0.2.1/go.mod"
-	"github.com/libp2p/go-libp2p-peerstore v0.2.2"
-	"github.com/libp2p/go-libp2p-peerstore v0.2.2/go.mod"
-	"github.com/libp2p/go-libp2p-peerstore v0.2.3"
-	"github.com/libp2p/go-libp2p-peerstore v0.2.3/go.mod"
-	"github.com/libp2p/go-libp2p-peerstore v0.2.4"
-	"github.com/libp2p/go-libp2p-peerstore v0.2.4/go.mod"
-	"github.com/libp2p/go-libp2p-peerstore v0.2.6"
-	"github.com/libp2p/go-libp2p-peerstore v0.2.6/go.mod"
-	"github.com/libp2p/go-libp2p-pnet v0.2.0"
-	"github.com/libp2p/go-libp2p-pnet v0.2.0/go.mod"
-	"github.com/libp2p/go-libp2p-protocol v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-protocol v0.1.0/go.mod"
-	"github.com/libp2p/go-libp2p-pubsub v0.3.2/go.mod"
-	"github.com/libp2p/go-libp2p-pubsub v0.3.5"
-	"github.com/libp2p/go-libp2p-pubsub v0.3.5/go.mod"
-	"github.com/libp2p/go-libp2p-pubsub-router v0.3.2"
-	"github.com/libp2p/go-libp2p-pubsub-router v0.3.2/go.mod"
-	"github.com/libp2p/go-libp2p-quic-transport v0.8.0"
-	"github.com/libp2p/go-libp2p-quic-transport v0.8.0/go.mod"
-	"github.com/libp2p/go-libp2p-record v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-record v0.1.0/go.mod"
-	"github.com/libp2p/go-libp2p-record v0.1.1/go.mod"
-	"github.com/libp2p/go-libp2p-record v0.1.2"
-	"github.com/libp2p/go-libp2p-record v0.1.2/go.mod"
-	"github.com/libp2p/go-libp2p-record v0.1.3"
-	"github.com/libp2p/go-libp2p-record v0.1.3/go.mod"
-	"github.com/libp2p/go-libp2p-routing v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-routing-helpers v0.2.3"
-	"github.com/libp2p/go-libp2p-routing-helpers v0.2.3/go.mod"
-	"github.com/libp2p/go-libp2p-secio v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-secio v0.0.3/go.mod"
-	"github.com/libp2p/go-libp2p-secio v0.1.0/go.mod"
-	"github.com/libp2p/go-libp2p-secio v0.2.0"
-	"github.com/libp2p/go-libp2p-secio v0.2.0/go.mod"
-	"github.com/libp2p/go-libp2p-secio v0.2.1"
-	"github.com/libp2p/go-libp2p-secio v0.2.1/go.mod"
-	"github.com/libp2p/go-libp2p-secio v0.2.2"
-	"github.com/libp2p/go-libp2p-secio v0.2.2/go.mod"
-	"github.com/libp2p/go-libp2p-swarm v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-swarm v0.0.6/go.mod"
-	"github.com/libp2p/go-libp2p-swarm v0.1.0/go.mod"
-	"github.com/libp2p/go-libp2p-swarm v0.2.2"
-	"github.com/libp2p/go-libp2p-swarm v0.2.2/go.mod"
-	"github.com/libp2p/go-libp2p-swarm v0.2.3"
-	"github.com/libp2p/go-libp2p-swarm v0.2.3/go.mod"
-	"github.com/libp2p/go-libp2p-swarm v0.2.4"
-	"github.com/libp2p/go-libp2p-swarm v0.2.4/go.mod"
-	"github.com/libp2p/go-libp2p-swarm v0.2.8"
-	"github.com/libp2p/go-libp2p-swarm v0.2.8/go.mod"
-	"github.com/libp2p/go-libp2p-testing v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-testing v0.0.2/go.mod"
-	"github.com/libp2p/go-libp2p-testing v0.0.3/go.mod"
-	"github.com/libp2p/go-libp2p-testing v0.0.4/go.mod"
-	"github.com/libp2p/go-libp2p-testing v0.1.0"
-	"github.com/libp2p/go-libp2p-testing v0.1.0/go.mod"
-	"github.com/libp2p/go-libp2p-testing v0.1.1"
-	"github.com/libp2p/go-libp2p-testing v0.1.1/go.mod"
-	"github.com/libp2p/go-libp2p-testing v0.2.0"
-	"github.com/libp2p/go-libp2p-testing v0.2.0/go.mod"
-	"github.com/libp2p/go-libp2p-tls v0.1.3"
-	"github.com/libp2p/go-libp2p-tls v0.1.3/go.mod"
-	"github.com/libp2p/go-libp2p-transport v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-transport v0.0.4/go.mod"
-	"github.com/libp2p/go-libp2p-transport v0.0.5/go.mod"
-	"github.com/libp2p/go-libp2p-transport-upgrader v0.0.1/go.mod"
-	"github.com/libp2p/go-libp2p-transport-upgrader v0.0.4/go.mod"
-	"github.com/libp2p/go-libp2p-transport-upgrader v0.1.1"
-	"github.com/libp2p/go-libp2p-transport-upgrader v0.1.1/go.mod"
-	"github.com/libp2p/go-libp2p-transport-upgrader v0.2.0"
-	"github.com/libp2p/go-libp2p-transport-upgrader v0.2.0/go.mod"
-	"github.com/libp2p/go-libp2p-transport-upgrader v0.3.0"
-	"github.com/libp2p/go-libp2p-transport-upgrader v0.3.0/go.mod"
-	"github.com/libp2p/go-libp2p-yamux v0.1.2/go.mod"
-	"github.com/libp2p/go-libp2p-yamux v0.1.3/go.mod"
-	"github.com/libp2p/go-libp2p-yamux v0.2.0/go.mod"
-	"github.com/libp2p/go-libp2p-yamux v0.2.1"
-	"github.com/libp2p/go-libp2p-yamux v0.2.1/go.mod"
-	"github.com/libp2p/go-libp2p-yamux v0.2.2"
-	"github.com/libp2p/go-libp2p-yamux v0.2.2/go.mod"
-	"github.com/libp2p/go-libp2p-yamux v0.2.5"
-	"github.com/libp2p/go-libp2p-yamux v0.2.5/go.mod"
-	"github.com/libp2p/go-libp2p-yamux v0.2.7"
-	"github.com/libp2p/go-libp2p-yamux v0.2.7/go.mod"
-	"github.com/libp2p/go-libp2p-yamux v0.2.8"
-	"github.com/libp2p/go-libp2p-yamux v0.2.8/go.mod"
-	"github.com/libp2p/go-maddr-filter v0.0.1/go.mod"
-	"github.com/libp2p/go-maddr-filter v0.0.4/go.mod"
-	"github.com/libp2p/go-maddr-filter v0.0.5"
-	"github.com/libp2p/go-maddr-filter v0.0.5/go.mod"
-	"github.com/libp2p/go-maddr-filter v0.1.0/go.mod"
-	"github.com/libp2p/go-mplex v0.0.1/go.mod"
-	"github.com/libp2p/go-mplex v0.0.3/go.mod"
-	"github.com/libp2p/go-mplex v0.0.4/go.mod"
-	"github.com/libp2p/go-mplex v0.1.0"
-	"github.com/libp2p/go-mplex v0.1.0/go.mod"
-	"github.com/libp2p/go-mplex v0.1.1"
-	"github.com/libp2p/go-mplex v0.1.1/go.mod"
-	"github.com/libp2p/go-mplex v0.1.2"
-	"github.com/libp2p/go-mplex v0.1.2/go.mod"
-	"github.com/libp2p/go-msgio v0.0.1/go.mod"
-	"github.com/libp2p/go-msgio v0.0.2/go.mod"
-	"github.com/libp2p/go-msgio v0.0.3/go.mod"
-	"github.com/libp2p/go-msgio v0.0.4"
-	"github.com/libp2p/go-msgio v0.0.4/go.mod"
-	"github.com/libp2p/go-msgio v0.0.6"
-	"github.com/libp2p/go-msgio v0.0.6/go.mod"
-	"github.com/libp2p/go-nat v0.0.3"
-	"github.com/libp2p/go-nat v0.0.3/go.mod"
-	"github.com/libp2p/go-nat v0.0.4"
-	"github.com/libp2p/go-nat v0.0.4/go.mod"
-	"github.com/libp2p/go-nat v0.0.5"
-	"github.com/libp2p/go-nat v0.0.5/go.mod"
-	"github.com/libp2p/go-netroute v0.1.2"
-	"github.com/libp2p/go-netroute v0.1.2/go.mod"
-	"github.com/libp2p/go-netroute v0.1.3"
-	"github.com/libp2p/go-netroute v0.1.3/go.mod"
-	"github.com/libp2p/go-openssl v0.0.2"
-	"github.com/libp2p/go-openssl v0.0.2/go.mod"
-	"github.com/libp2p/go-openssl v0.0.3"
-	"github.com/libp2p/go-openssl v0.0.3/go.mod"
-	"github.com/libp2p/go-openssl v0.0.4"
-	"github.com/libp2p/go-openssl v0.0.4/go.mod"
-	"github.com/libp2p/go-openssl v0.0.5"
-	"github.com/libp2p/go-openssl v0.0.5/go.mod"
-	"github.com/libp2p/go-openssl v0.0.7"
-	"github.com/libp2p/go-openssl v0.0.7/go.mod"
-	"github.com/libp2p/go-reuseport v0.0.1"
-	"github.com/libp2p/go-reuseport v0.0.1/go.mod"
-	"github.com/libp2p/go-reuseport v0.0.2"
-	"github.com/libp2p/go-reuseport v0.0.2/go.mod"
-	"github.com/libp2p/go-reuseport-transport v0.0.1/go.mod"
-	"github.com/libp2p/go-reuseport-transport v0.0.2"
-	"github.com/libp2p/go-reuseport-transport v0.0.2/go.mod"
-	"github.com/libp2p/go-reuseport-transport v0.0.3"
-	"github.com/libp2p/go-reuseport-transport v0.0.3/go.mod"
-	"github.com/libp2p/go-reuseport-transport v0.0.4"
-	"github.com/libp2p/go-reuseport-transport v0.0.4/go.mod"
-	"github.com/libp2p/go-sockaddr v0.0.2"
-	"github.com/libp2p/go-sockaddr v0.0.2/go.mod"
-	"github.com/libp2p/go-socket-activation v0.0.2"
-	"github.com/libp2p/go-socket-activation v0.0.2/go.mod"
-	"github.com/libp2p/go-stream-muxer v0.0.1/go.mod"
-	"github.com/libp2p/go-stream-muxer v0.1.0/go.mod"
-	"github.com/libp2p/go-stream-muxer-multistream v0.1.1/go.mod"
-	"github.com/libp2p/go-stream-muxer-multistream v0.2.0"
-	"github.com/libp2p/go-stream-muxer-multistream v0.2.0/go.mod"
-	"github.com/libp2p/go-stream-muxer-multistream v0.3.0"
-	"github.com/libp2p/go-stream-muxer-multistream v0.3.0/go.mod"
-	"github.com/libp2p/go-tcp-transport v0.0.1/go.mod"
-	"github.com/libp2p/go-tcp-transport v0.0.4/go.mod"
-	"github.com/libp2p/go-tcp-transport v0.1.0/go.mod"
-	"github.com/libp2p/go-tcp-transport v0.1.1"
-	"github.com/libp2p/go-tcp-transport v0.1.1/go.mod"
-	"github.com/libp2p/go-tcp-transport v0.2.0"
-	"github.com/libp2p/go-tcp-transport v0.2.0/go.mod"
-	"github.com/libp2p/go-tcp-transport v0.2.1"
-	"github.com/libp2p/go-tcp-transport v0.2.1/go.mod"
-	"github.com/libp2p/go-testutil v0.0.1/go.mod"
-	"github.com/libp2p/go-testutil v0.1.0/go.mod"
-	"github.com/libp2p/go-ws-transport v0.0.1/go.mod"
-	"github.com/libp2p/go-ws-transport v0.0.5/go.mod"
-	"github.com/libp2p/go-ws-transport v0.1.0/go.mod"
-	"github.com/libp2p/go-ws-transport v0.2.0"
-	"github.com/libp2p/go-ws-transport v0.2.0/go.mod"
-	"github.com/libp2p/go-ws-transport v0.3.0"
-	"github.com/libp2p/go-ws-transport v0.3.0/go.mod"
-	"github.com/libp2p/go-ws-transport v0.3.1"
-	"github.com/libp2p/go-ws-transport v0.3.1/go.mod"
-	"github.com/libp2p/go-yamux v1.2.1/go.mod"
-	"github.com/libp2p/go-yamux v1.2.2/go.mod"
-	"github.com/libp2p/go-yamux v1.2.3"
-	"github.com/libp2p/go-yamux v1.2.3/go.mod"
-	"github.com/libp2p/go-yamux v1.3.0"
-	"github.com/libp2p/go-yamux v1.3.0/go.mod"
-	"github.com/libp2p/go-yamux v1.3.3"
-	"github.com/libp2p/go-yamux v1.3.3/go.mod"
-	"github.com/libp2p/go-yamux v1.3.5"
-	"github.com/libp2p/go-yamux v1.3.5/go.mod"
-	"github.com/libp2p/go-yamux v1.3.7"
-	"github.com/libp2p/go-yamux v1.3.7/go.mod"
-	"github.com/lucas-clemente/quic-go v0.18.0"
-	"github.com/lucas-clemente/quic-go v0.18.0/go.mod"
-	"github.com/lunixbochs/vtclean v1.0.0/go.mod"
-	"github.com/magiconair/properties v1.8.0/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329"
-	"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
-	"github.com/marten-seemann/qpack v0.2.0/go.mod"
-	"github.com/marten-seemann/qtls v0.10.0"
-	"github.com/marten-seemann/qtls v0.10.0/go.mod"
-	"github.com/marten-seemann/qtls-go1-15 v0.1.0"
-	"github.com/marten-seemann/qtls-go1-15 v0.1.0/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.1/go.mod"
-	"github.com/mattn/go-colorable v0.1.2/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.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.5/go.mod"
-	"github.com/mattn/go-isatty v0.0.8"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.11"
-	"github.com/mattn/go-isatty v0.0.11/go.mod"
-	"github.com/mattn/go-runewidth v0.0.9"
-	"github.com/mattn/go-runewidth v0.0.9/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
-	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
-	"github.com/microcosm-cc/bluemonday v1.0.1/go.mod"
-	"github.com/miekg/dns v1.1.4/go.mod"
-	"github.com/miekg/dns v1.1.12"
-	"github.com/miekg/dns v1.1.12/go.mod"
-	"github.com/miekg/dns v1.1.28"
-	"github.com/miekg/dns v1.1.28/go.mod"
-	"github.com/miekg/dns v1.1.31"
-	"github.com/miekg/dns v1.1.31/go.mod"
-	"github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1"
-	"github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod"
-	"github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod"
-	"github.com/minio/sha256-simd v0.0.0-20190328051042-05b4dd3047e5/go.mod"
-	"github.com/minio/sha256-simd v0.1.0/go.mod"
-	"github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod"
-	"github.com/minio/sha256-simd v0.1.1"
-	"github.com/minio/sha256-simd v0.1.1/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/mr-tron/base58 v1.1.0/go.mod"
-	"github.com/mr-tron/base58 v1.1.1/go.mod"
-	"github.com/mr-tron/base58 v1.1.2"
-	"github.com/mr-tron/base58 v1.1.2/go.mod"
-	"github.com/mr-tron/base58 v1.1.3"
-	"github.com/mr-tron/base58 v1.1.3/go.mod"
-	"github.com/mr-tron/base58 v1.2.0"
-	"github.com/mr-tron/base58 v1.2.0/go.mod"
-	"github.com/multiformats/go-base32 v0.0.3"
-	"github.com/multiformats/go-base32 v0.0.3/go.mod"
-	"github.com/multiformats/go-base36 v0.1.0"
-	"github.com/multiformats/go-base36 v0.1.0/go.mod"
-	"github.com/multiformats/go-multiaddr v0.0.1/go.mod"
-	"github.com/multiformats/go-multiaddr v0.0.2/go.mod"
-	"github.com/multiformats/go-multiaddr v0.0.4/go.mod"
-	"github.com/multiformats/go-multiaddr v0.1.0/go.mod"
-	"github.com/multiformats/go-multiaddr v0.1.1"
-	"github.com/multiformats/go-multiaddr v0.1.1/go.mod"
-	"github.com/multiformats/go-multiaddr v0.2.0"
-	"github.com/multiformats/go-multiaddr v0.2.0/go.mod"
-	"github.com/multiformats/go-multiaddr v0.2.1"
-	"github.com/multiformats/go-multiaddr v0.2.1/go.mod"
-	"github.com/multiformats/go-multiaddr v0.2.2"
-	"github.com/multiformats/go-multiaddr v0.2.2/go.mod"
-	"github.com/multiformats/go-multiaddr v0.3.0"
-	"github.com/multiformats/go-multiaddr v0.3.0/go.mod"
-	"github.com/multiformats/go-multiaddr v0.3.1"
-	"github.com/multiformats/go-multiaddr v0.3.1/go.mod"
-	"github.com/multiformats/go-multiaddr-dns v0.0.1/go.mod"
-	"github.com/multiformats/go-multiaddr-dns v0.0.2/go.mod"
-	"github.com/multiformats/go-multiaddr-dns v0.2.0"
-	"github.com/multiformats/go-multiaddr-dns v0.2.0/go.mod"
-	"github.com/multiformats/go-multiaddr-fmt v0.0.1/go.mod"
-	"github.com/multiformats/go-multiaddr-fmt v0.1.0"
-	"github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod"
-	"github.com/multiformats/go-multiaddr-net v0.0.1/go.mod"
-	"github.com/multiformats/go-multiaddr-net v0.1.0"
-	"github.com/multiformats/go-multiaddr-net v0.1.0/go.mod"
-	"github.com/multiformats/go-multiaddr-net v0.1.1"
-	"github.com/multiformats/go-multiaddr-net v0.1.1/go.mod"
-	"github.com/multiformats/go-multiaddr-net v0.1.2"
-	"github.com/multiformats/go-multiaddr-net v0.1.2/go.mod"
-	"github.com/multiformats/go-multiaddr-net v0.1.3"
-	"github.com/multiformats/go-multiaddr-net v0.1.3/go.mod"
-	"github.com/multiformats/go-multiaddr-net v0.1.4"
-	"github.com/multiformats/go-multiaddr-net v0.1.4/go.mod"
-	"github.com/multiformats/go-multiaddr-net v0.1.5"
-	"github.com/multiformats/go-multiaddr-net v0.1.5/go.mod"
-	"github.com/multiformats/go-multiaddr-net v0.2.0"
-	"github.com/multiformats/go-multiaddr-net v0.2.0/go.mod"
-	"github.com/multiformats/go-multibase v0.0.1"
-	"github.com/multiformats/go-multibase v0.0.1/go.mod"
-	"github.com/multiformats/go-multibase v0.0.2"
-	"github.com/multiformats/go-multibase v0.0.2/go.mod"
-	"github.com/multiformats/go-multibase v0.0.3"
-	"github.com/multiformats/go-multibase v0.0.3/go.mod"
-	"github.com/multiformats/go-multihash v0.0.1/go.mod"
-	"github.com/multiformats/go-multihash v0.0.5/go.mod"
-	"github.com/multiformats/go-multihash v0.0.7/go.mod"
-	"github.com/multiformats/go-multihash v0.0.8"
-	"github.com/multiformats/go-multihash v0.0.8/go.mod"
-	"github.com/multiformats/go-multihash v0.0.9"
-	"github.com/multiformats/go-multihash v0.0.9/go.mod"
-	"github.com/multiformats/go-multihash v0.0.10"
-	"github.com/multiformats/go-multihash v0.0.10/go.mod"
-	"github.com/multiformats/go-multihash v0.0.13"
-	"github.com/multiformats/go-multihash v0.0.13/go.mod"
-	"github.com/multiformats/go-multihash v0.0.14"
-	"github.com/multiformats/go-multihash v0.0.14/go.mod"
-	"github.com/multiformats/go-multistream v0.0.1/go.mod"
-	"github.com/multiformats/go-multistream v0.0.4/go.mod"
-	"github.com/multiformats/go-multistream v0.1.0"
-	"github.com/multiformats/go-multistream v0.1.0/go.mod"
-	"github.com/multiformats/go-multistream v0.1.1"
-	"github.com/multiformats/go-multistream v0.1.1/go.mod"
-	"github.com/multiformats/go-multistream v0.1.2"
-	"github.com/multiformats/go-multistream v0.1.2/go.mod"
-	"github.com/multiformats/go-varint v0.0.1"
-	"github.com/multiformats/go-varint v0.0.1/go.mod"
-	"github.com/multiformats/go-varint v0.0.2/go.mod"
-	"github.com/multiformats/go-varint v0.0.5"
-	"github.com/multiformats/go-varint v0.0.5/go.mod"
-	"github.com/multiformats/go-varint v0.0.6"
-	"github.com/multiformats/go-varint v0.0.6/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod"
-	"github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod"
-	"github.com/nxadm/tail v1.4.4"
-	"github.com/nxadm/tail v1.4.4/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.7.0/go.mod"
-	"github.com/onsi/ginkgo v1.8.0"
-	"github.com/onsi/ginkgo v1.8.0/go.mod"
-	"github.com/onsi/ginkgo v1.12.0"
-	"github.com/onsi/ginkgo v1.12.0/go.mod"
-	"github.com/onsi/ginkgo v1.12.1"
-	"github.com/onsi/ginkgo v1.12.1/go.mod"
-	"github.com/onsi/ginkgo v1.14.0"
-	"github.com/onsi/ginkgo v1.14.0/go.mod"
-	"github.com/onsi/gomega v1.4.3/go.mod"
-	"github.com/onsi/gomega v1.5.0"
-	"github.com/onsi/gomega v1.5.0/go.mod"
-	"github.com/onsi/gomega v1.7.1/go.mod"
-	"github.com/onsi/gomega v1.9.0"
-	"github.com/onsi/gomega v1.9.0/go.mod"
-	"github.com/onsi/gomega v1.10.1"
-	"github.com/onsi/gomega v1.10.1/go.mod"
-	"github.com/opentracing/opentracing-go v1.0.2/go.mod"
-	"github.com/opentracing/opentracing-go v1.1.0"
-	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
-	"github.com/opentracing/opentracing-go v1.2.0"
-	"github.com/opentracing/opentracing-go v1.2.0/go.mod"
-	"github.com/openzipkin/zipkin-go v0.1.1/go.mod"
-	"github.com/pelletier/go-toml v1.2.0/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/polydawn/refmt v0.0.0-20190221155625-df39d6c2d992/go.mod"
-	"github.com/polydawn/refmt v0.0.0-20190408063855-01bf1e26dd14"
-	"github.com/polydawn/refmt v0.0.0-20190408063855-01bf1e26dd14/go.mod"
-	"github.com/polydawn/refmt v0.0.0-20190807091052-3d65705ee9f1/go.mod"
-	"github.com/polydawn/refmt v0.0.0-20190809202753-05966cbd336a"
-	"github.com/polydawn/refmt v0.0.0-20190809202753-05966cbd336a/go.mod"
-	"github.com/prometheus/client_golang v0.8.0/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.2/go.mod"
-	"github.com/prometheus/client_golang v1.0.0/go.mod"
-	"github.com/prometheus/client_golang v1.7.1"
-	"github.com/prometheus/client_golang v1.7.1/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/prometheus/client_model v0.2.0"
-	"github.com/prometheus/client_model v0.2.0/go.mod"
-	"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
-	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
-	"github.com/prometheus/common v0.4.1/go.mod"
-	"github.com/prometheus/common v0.10.0"
-	"github.com/prometheus/common v0.10.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
-	"github.com/prometheus/procfs v0.0.2/go.mod"
-	"github.com/prometheus/procfs v0.1.3"
-	"github.com/prometheus/procfs v0.1.3/go.mod"
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-	"github.com/rs/cors v1.7.0"
-	"github.com/rs/cors v1.7.0/go.mod"
-	"github.com/russross/blackfriday v1.5.2/go.mod"
-	"github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod"
-	"github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod"
-	"github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod"
-	"github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod"
-	"github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod"
-	"github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod"
-	"github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod"
-	"github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod"
-	"github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod"
-	"github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod"
-	"github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod"
-	"github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod"
-	"github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod"
-	"github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod"
-	"github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod"
-	"github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod"
-	"github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod"
-	"github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod"
-	"github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod"
-	"github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod"
-	"github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/sirupsen/logrus v1.4.2/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/assertions v1.0.0"
-	"github.com/smartystreets/assertions v1.0.0/go.mod"
-	"github.com/smartystreets/assertions v1.0.1"
-	"github.com/smartystreets/assertions v1.0.1/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
-	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337"
-	"github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod"
-	"github.com/smola/gocompat v0.2.0"
-	"github.com/smola/gocompat v0.2.0/go.mod"
-	"github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod"
-	"github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod"
-	"github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a/go.mod"
-	"github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572"
-	"github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod"
-	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-	"github.com/spaolacci/murmur3 v1.1.0"
-	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
-	"github.com/spf13/afero v1.1.2/go.mod"
-	"github.com/spf13/cast v1.3.0/go.mod"
-	"github.com/spf13/cobra v0.0.5/go.mod"
-	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/spf13/viper v1.3.2/go.mod"
-	"github.com/src-d/envconfig v1.0.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/stretchr/testify v1.5.1"
-	"github.com/stretchr/testify v1.5.1/go.mod"
-	"github.com/stretchr/testify v1.6.1"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"github.com/syndtr/goleveldb v1.0.0"
-	"github.com/syndtr/goleveldb v1.0.0/go.mod"
-	"github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod"
-	"github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e"
-	"github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e/go.mod"
-	"github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c"
-	"github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod"
-	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
-	"github.com/viant/assertly v0.4.8/go.mod"
-	"github.com/viant/toolbox v0.24.0/go.mod"
-	"github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436/go.mod"
-	"github.com/warpfork/go-wish v0.0.0-20190328234359-8b3e70f8e830"
-	"github.com/warpfork/go-wish v0.0.0-20190328234359-8b3e70f8e830/go.mod"
-	"github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a"
-	"github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a/go.mod"
-	"github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc"
-	"github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc/go.mod"
-	"github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158"
-	"github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158/go.mod"
-	"github.com/whyrusleeping/cbor-gen v0.0.0-20200402171437-3d27c146c105"
-	"github.com/whyrusleeping/cbor-gen v0.0.0-20200402171437-3d27c146c105/go.mod"
-	"github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f"
-	"github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f/go.mod"
-	"github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1"
-	"github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod"
-	"github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc"
-	"github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod"
-	"github.com/whyrusleeping/go-logging v0.0.1"
-	"github.com/whyrusleeping/go-logging v0.0.1/go.mod"
-	"github.com/whyrusleeping/go-notifier v0.0.0-20170827234753-097c5d47330f"
-	"github.com/whyrusleeping/go-notifier v0.0.0-20170827234753-097c5d47330f/go.mod"
-	"github.com/whyrusleeping/go-smux-multiplex v3.0.16+incompatible/go.mod"
-	"github.com/whyrusleeping/go-smux-multistream v2.0.2+incompatible/go.mod"
-	"github.com/whyrusleeping/go-smux-yamux v2.0.8+incompatible/go.mod"
-	"github.com/whyrusleeping/go-smux-yamux v2.0.9+incompatible/go.mod"
-	"github.com/whyrusleeping/go-sysinfo v0.0.0-20190219211824-4a357d4b90b1"
-	"github.com/whyrusleeping/go-sysinfo v0.0.0-20190219211824-4a357d4b90b1/go.mod"
-	"github.com/whyrusleeping/mafmt v1.2.8"
-	"github.com/whyrusleeping/mafmt v1.2.8/go.mod"
-	"github.com/whyrusleeping/mdns v0.0.0-20180901202407-ef14215e6b30/go.mod"
-	"github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9"
-	"github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9/go.mod"
-	"github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7"
-	"github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7/go.mod"
-	"github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c"
-	"github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c/go.mod"
-	"github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee"
-	"github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee/go.mod"
-	"github.com/whyrusleeping/yamux v1.1.5/go.mod"
-	"github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod"
-	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
-	"github.com/yuin/goldmark v1.1.27/go.mod"
-	"go.opencensus.io v0.18.0/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0/go.mod"
-	"go.opencensus.io v0.22.1"
-	"go.opencensus.io v0.22.1/go.mod"
-	"go.opencensus.io v0.22.2"
-	"go.opencensus.io v0.22.2/go.mod"
-	"go.opencensus.io v0.22.3"
-	"go.opencensus.io v0.22.3/go.mod"
-	"go.opencensus.io v0.22.4"
-	"go.opencensus.io v0.22.4/go.mod"
-	"go.uber.org/atomic v1.4.0"
-	"go.uber.org/atomic v1.4.0/go.mod"
-	"go.uber.org/atomic v1.5.0"
-	"go.uber.org/atomic v1.5.0/go.mod"
-	"go.uber.org/atomic v1.6.0"
-	"go.uber.org/atomic v1.6.0/go.mod"
-	"go.uber.org/dig v1.10.0"
-	"go.uber.org/dig v1.10.0/go.mod"
-	"go.uber.org/fx v1.13.1"
-	"go.uber.org/fx v1.13.1/go.mod"
-	"go.uber.org/goleak v0.10.0"
-	"go.uber.org/goleak v0.10.0/go.mod"
-	"go.uber.org/goleak v1.0.0"
-	"go.uber.org/goleak v1.0.0/go.mod"
-	"go.uber.org/multierr v1.1.0"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/multierr v1.4.0"
-	"go.uber.org/multierr v1.4.0/go.mod"
-	"go.uber.org/multierr v1.5.0"
-	"go.uber.org/multierr v1.5.0/go.mod"
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
-	"go.uber.org/zap v1.10.0"
-	"go.uber.org/zap v1.10.0/go.mod"
-	"go.uber.org/zap v1.14.1"
-	"go.uber.org/zap v1.14.1/go.mod"
-	"go.uber.org/zap v1.15.0"
-	"go.uber.org/zap v1.15.0/go.mod"
-	"go4.org v0.0.0-20180809161055-417644f6feb5/go.mod"
-	"go4.org v0.0.0-20200411211856-f5505b9728dd"
-	"go4.org v0.0.0-20200411211856-f5505b9728dd/go.mod"
-	"golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod"
-	"golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod"
-	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
-	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-	"golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b/go.mod"
-	"golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod"
-	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-	"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
-	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
-	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
-	"golang.org/x/crypto v0.0.0-20190618222545-ea8f1a30c443/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod"
-	"golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod"
-	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d"
-	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
-	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5"
-	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod"
-	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37"
-	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/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-20200207192155-f17229e696bd/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-20180702182130-06c8688daad7/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"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f"
-	"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"
-	"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.2.0"
-	"golang.org/x/mod v0.2.0/go.mod"
-	"golang.org/x/net v0.0.0-20180524181706-dfa909b99c79/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod"
-	"golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod"
-	"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190227160552-c95aed5357e7/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190611141213-3f473d35a33a/go.mod"
-	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80"
-	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
-	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478"
-	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
-	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/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-20200520004742-59133d7f0dd7/go.mod"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/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/perf v0.0.0-20180704124530-6e6d33e29852/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"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a"
-	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190219092855-153ac476189d/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod"
-	"golang.org/x/sys v0.0.0-20190302025703-b6889370fb10/go.mod"
-	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod"
-	"golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-	"golang.org/x/sys v0.0.0-20190524122548-abf6ff778158/go.mod"
-	"golang.org/x/sys v0.0.0-20190524152521-dbbf3f1254d4/go.mod"
-	"golang.org/x/sys v0.0.0-20190526052359-791d8a0f4d09/go.mod"
-	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-	"golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae/go.mod"
-	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
-	"golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod"
-	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
-	"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
-	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
-	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
-	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
-	"golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod"
-	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
-	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/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"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f/go.mod"
-	"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod"
-	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1"
-	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/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"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20181130052023-1c3d964395ce/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-20190328211700-ab21143f2384"
-	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/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-20191029041327-9cc4af7d6b2c/go.mod"
-	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
-	"golang.org/x/tools v0.0.0-20191030062658-86caa796c7ab/go.mod"
-	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
-	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
-	"golang.org/x/tools v0.0.0-20191114200427-caa0b0f7d508"
-	"golang.org/x/tools v0.0.0-20191114200427-caa0b0f7d508/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"
-	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
-	"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425"
-	"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/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-20200130002326-2f3ba24bd6e7/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-20200522201501-cb1345f3a375"
-	"golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898"
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod"
-	"google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod"
-	"google.golang.org/api v0.1.0/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/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.2.0/go.mod"
-	"google.golang.org/appengine v1.3.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/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod"
-	"google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod"
-	"google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod"
-	"google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/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-20200212174721-66ed5ce911ce/go.mod"
-	"google.golang.org/grpc v1.14.0/go.mod"
-	"google.golang.org/grpc v1.16.0/go.mod"
-	"google.golang.org/grpc v1.17.0/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.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.26.0/go.mod"
-	"google.golang.org/grpc v1.27.0/go.mod"
-	"google.golang.org/grpc v1.27.1"
-	"google.golang.org/grpc v1.27.1/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"
-	"google.golang.org/protobuf v1.21.0/go.mod"
-	"google.golang.org/protobuf v1.23.0"
-	"google.golang.org/protobuf v1.23.0/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/cheggaaa/pb.v1 v1.0.28"
-	"gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/inf.v0 v0.9.1/go.mod"
-	"gopkg.in/src-d/go-cli.v0 v0.0.0-20181105080154-d492247bbc0d/go.mod"
-	"gopkg.in/src-d/go-log.v1 v1.0.1/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.5"
-	"gopkg.in/yaml.v2 v2.2.5/go.mod"
-	"gopkg.in/yaml.v2 v2.3.0"
-	"gopkg.in/yaml.v2 v2.3.0/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod"
-	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"honnef.co/go/tools v0.0.0-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"
-	"honnef.co/go/tools v0.0.1-2019.2.3/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"
-	"sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod"
-	"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
-)
-
-go-module_set_globals
-SRC_URI="https://github.com/ipfs/go-ipfs/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!net-p2p/go-ipfs-bin
-	acct-group/ipfs
-	acct-user/ipfs
-	sys-fs/fuse:0
-"
-
-DOCS=(CHANGELOG.md CONTRIBUTING.md README.md docs/)
-
-#S="${WORKDIR}"
-
-src_compile() {
-	local mygoargs
-	mygoargs=(
-		-tags release
-	)
-	go build "${mygoargs[@]}" -o ipfs ./cmd/ipfs || die
-	go build "${mygoargs[@]}" -o ipfswatch ./cmd/ipfswatch || die
-}
-
-src_test() {
-	go test ./cmd/ipfs/... ./cmd/ipfswatch/... || die
-}
-
-src_install() {
-	dobin ipfs
-	dobin ipfswatch
-	newbashcomp misc/completion/ipfs-completion.bash ipfs
-	einstalldocs
-
-	systemd_dounit "${FILESDIR}/ipfs.service"
-	systemd_newunit "${FILESDIR}/ipfs-at.service" "ipfs@.service"
-
-	newinitd "${FILESDIR}/ipfs.init" ipfs
-	newconfd "${FILESDIR}/ipfs.confd" ipfs
-
-	keepdir /var/log/ipfs
-	fowners -R ipfs:ipfs /var/log/ipfs
-}
-
-pkg_postinst() {
-	elog 'To be able to use the ipfs service you will need to create the ipfs repository'
-	elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)'
-	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
-}
diff --git a/net-p2p/go-ipfs/go-ipfs-0.9.1.ebuild b/net-p2p/go-ipfs/go-ipfs-0.9.1.ebuild
new file mode 100644
index 000000000000..21d34658b639
--- /dev/null
+++ b/net-p2p/go-ipfs/go-ipfs-0.9.1.ebuild
@@ -0,0 +1,1746 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Main implementation of IPFS"
+HOMEPAGE="https://ipfs.io/"
+
+EGO_SUM=(
+	"bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc"
+	"bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc/go.mod"
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.31.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.37.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.53.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/datastore v1.0.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/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"contrib.go.opencensus.io/exporter/prometheus v0.3.0"
+	"contrib.go.opencensus.io/exporter/prometheus v0.3.0/go.mod"
+	"dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod"
+	"dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod"
+	"dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod"
+	"git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod"
+	"github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod"
+	"github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod"
+	"github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96"
+	"github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
+	"github.com/Kubuxu/go-os-helper v0.0.1"
+	"github.com/Kubuxu/go-os-helper v0.0.1/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/Shopify/sarama v1.19.0/go.mod"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+	"github.com/Stebalien/go-bitfield v0.0.1"
+	"github.com/Stebalien/go-bitfield v0.0.1/go.mod"
+	"github.com/VividCortex/gohistogram v1.0.0/go.mod"
+	"github.com/aead/siphash v1.0.1/go.mod"
+	"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+	"github.com/alexbrainman/goissue34681 v0.0.0-20191006012335-3fc7a47baff5"
+	"github.com/alexbrainman/goissue34681 v0.0.0-20191006012335-3fc7a47baff5/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/apache/thrift v0.12.0/go.mod"
+	"github.com/apache/thrift v0.13.0/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
+	"github.com/aws/aws-lambda-go v1.13.3/go.mod"
+	"github.com/aws/aws-sdk-go v1.27.0/go.mod"
+	"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
+	"github.com/benbjohnson/clock v1.0.2/go.mod"
+	"github.com/benbjohnson/clock v1.0.3"
+	"github.com/benbjohnson/clock v1.0.3/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/blang/semver/v4 v4.0.0"
+	"github.com/blang/semver/v4 v4.0.0/go.mod"
+	"github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod"
+	"github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod"
+	"github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c/go.mod"
+	"github.com/btcsuite/btcd v0.0.0-20190605094302-a0d1e3e36d50/go.mod"
+	"github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod"
+	"github.com/btcsuite/btcd v0.20.1-beta/go.mod"
+	"github.com/btcsuite/btcd v0.21.0-beta"
+	"github.com/btcsuite/btcd v0.21.0-beta/go.mod"
+	"github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod"
+	"github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod"
+	"github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod"
+	"github.com/btcsuite/btcutil v1.0.2/go.mod"
+	"github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod"
+	"github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod"
+	"github.com/btcsuite/goleveldb v1.0.0/go.mod"
+	"github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod"
+	"github.com/btcsuite/snappy-go v1.0.0/go.mod"
+	"github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod"
+	"github.com/btcsuite/winsvc v1.0.0/go.mod"
+	"github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod"
+	"github.com/casbin/casbin/v2 v2.1.2/go.mod"
+	"github.com/cenkalti/backoff v2.2.1+incompatible"
+	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/cheekybits/genny v1.0.0"
+	"github.com/cheekybits/genny v1.0.0/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/clbanning/x2j v0.0.0-20191024224557-825249438eec/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/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-semver v0.2.1-0.20180108230905-e214231b295a/go.mod"
+	"github.com/coreos/go-semver v0.3.0"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.3.1"
+	"github.com/coreos/go-systemd/v22 v22.3.1/go.mod"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3"
+	"github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3/go.mod"
+	"github.com/creack/pty v1.1.7/go.mod"
+	"github.com/cskr/pubsub v1.0.2"
+	"github.com/cskr/pubsub v1.0.2/go.mod"
+	"github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018/go.mod"
+	"github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c"
+	"github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod"
+	"github.com/decred/dcrd/lru v1.0.0/go.mod"
+	"github.com/dgraph-io/badger v1.5.5-0.20190226225317-8115aed38f8f/go.mod"
+	"github.com/dgraph-io/badger v1.6.0-rc1/go.mod"
+	"github.com/dgraph-io/badger v1.6.0/go.mod"
+	"github.com/dgraph-io/badger v1.6.1/go.mod"
+	"github.com/dgraph-io/badger v1.6.2"
+	"github.com/dgraph-io/badger v1.6.2/go.mod"
+	"github.com/dgraph-io/ristretto v0.0.2"
+	"github.com/dgraph-io/ristretto v0.0.2/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f/go.mod"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dustin/go-humanize v1.0.0"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/eapache/go-resiliency v1.1.0/go.mod"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+	"github.com/eapache/queue v1.1.0/go.mod"
+	"github.com/edsrzf/mmap-go v1.0.0/go.mod"
+	"github.com/elgris/jsondiff v0.0.0-20160530203242-765b5c24c302"
+	"github.com/elgris/jsondiff v0.0.0-20160530203242-765b5c24c302/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.6.9/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/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5"
+	"github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod"
+	"github.com/flynn/noise v1.0.0"
+	"github.com/flynn/noise v1.0.0/go.mod"
+	"github.com/francoispqt/gojay v1.2.13"
+	"github.com/francoispqt/gojay v1.2.13/go.mod"
+	"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
+	"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
+	"github.com/frankban/quicktest v1.11.3"
+	"github.com/frankban/quicktest v1.11.3/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/gabriel-vasile/mimetype v1.1.2"
+	"github.com/gabriel-vasile/mimetype v1.1.2/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/gliderlabs/ssh v0.1.1/go.mod"
+	"github.com/go-bindata/go-bindata/v3 v3.1.3"
+	"github.com/go-bindata/go-bindata/v3 v3.1.3/go.mod"
+	"github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod"
+	"github.com/go-errors/errors v1.0.1/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-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-kit/kit v0.10.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0"
+	"github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.4/go.mod"
+	"github.com/gogo/googleapis v1.1.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.0/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.3.0/go.mod"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/gogo/protobuf v1.3.2"
+	"github.com/gogo/protobuf v1.3.2/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/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/lint v0.0.0-20180702182130-06c8688daad7/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.4/go.mod"
+	"github.com/golang/mock v1.6.0"
+	"github.com/golang/mock v1.6.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.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.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/go.mod"
+	"github.com/golang/protobuf v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.5.2"
+	"github.com/golang/protobuf v1.5.2/go.mod"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/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.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.3/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-github v17.0.0+incompatible/go.mod"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gopacket v1.1.17/go.mod"
+	"github.com/google/gopacket v1.1.18/go.mod"
+	"github.com/google/gopacket v1.1.19"
+	"github.com/google/gopacket v1.1.19/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/google/uuid v1.2.0"
+	"github.com/google/uuid v1.2.0/go.mod"
+	"github.com/googleapis/gax-go v2.0.0+incompatible/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.3/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f"
+	"github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f/go.mod"
+	"github.com/gorilla/context v1.1.1/go.mod"
+	"github.com/gorilla/mux v1.6.2/go.mod"
+	"github.com/gorilla/mux v1.7.3/go.mod"
+	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gorilla/websocket v1.4.1/go.mod"
+	"github.com/gorilla/websocket v1.4.2"
+	"github.com/gorilla/websocket v1.4.2/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/gxed/hashland/keccakpg v0.0.1/go.mod"
+	"github.com/gxed/hashland/murmur3 v0.0.1/go.mod"
+	"github.com/hannahhoward/cbor-gen-for v0.0.0-20200817222906-ea96cece81f1/go.mod"
+	"github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e"
+	"github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e/go.mod"
+	"github.com/hashicorp/consul/api v1.3.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.1"
+	"github.com/hashicorp/go-multierror v1.1.1/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/hudl/fargo v1.3.0/go.mod"
+	"github.com/huin/goupnp v1.0.0"
+	"github.com/huin/goupnp v1.0.0/go.mod"
+	"github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
+	"github.com/ipfs/bbloom v0.0.1/go.mod"
+	"github.com/ipfs/bbloom v0.0.4"
+	"github.com/ipfs/bbloom v0.0.4/go.mod"
+	"github.com/ipfs/go-bitswap v0.0.9/go.mod"
+	"github.com/ipfs/go-bitswap v0.1.0/go.mod"
+	"github.com/ipfs/go-bitswap v0.1.2/go.mod"
+	"github.com/ipfs/go-bitswap v0.1.3/go.mod"
+	"github.com/ipfs/go-bitswap v0.1.8/go.mod"
+	"github.com/ipfs/go-bitswap v0.3.4"
+	"github.com/ipfs/go-bitswap v0.3.4/go.mod"
+	"github.com/ipfs/go-block-format v0.0.1/go.mod"
+	"github.com/ipfs/go-block-format v0.0.2/go.mod"
+	"github.com/ipfs/go-block-format v0.0.3"
+	"github.com/ipfs/go-block-format v0.0.3/go.mod"
+	"github.com/ipfs/go-blockservice v0.0.7/go.mod"
+	"github.com/ipfs/go-blockservice v0.1.0/go.mod"
+	"github.com/ipfs/go-blockservice v0.1.1/go.mod"
+	"github.com/ipfs/go-blockservice v0.1.2/go.mod"
+	"github.com/ipfs/go-blockservice v0.1.3/go.mod"
+	"github.com/ipfs/go-blockservice v0.1.4"
+	"github.com/ipfs/go-blockservice v0.1.4/go.mod"
+	"github.com/ipfs/go-cid v0.0.1/go.mod"
+	"github.com/ipfs/go-cid v0.0.2/go.mod"
+	"github.com/ipfs/go-cid v0.0.3/go.mod"
+	"github.com/ipfs/go-cid v0.0.4/go.mod"
+	"github.com/ipfs/go-cid v0.0.5/go.mod"
+	"github.com/ipfs/go-cid v0.0.6/go.mod"
+	"github.com/ipfs/go-cid v0.0.7"
+	"github.com/ipfs/go-cid v0.0.7/go.mod"
+	"github.com/ipfs/go-cidutil v0.0.2"
+	"github.com/ipfs/go-cidutil v0.0.2/go.mod"
+	"github.com/ipfs/go-datastore v0.0.1/go.mod"
+	"github.com/ipfs/go-datastore v0.0.5/go.mod"
+	"github.com/ipfs/go-datastore v0.1.0/go.mod"
+	"github.com/ipfs/go-datastore v0.1.1/go.mod"
+	"github.com/ipfs/go-datastore v0.3.0/go.mod"
+	"github.com/ipfs/go-datastore v0.3.1/go.mod"
+	"github.com/ipfs/go-datastore v0.4.0/go.mod"
+	"github.com/ipfs/go-datastore v0.4.1/go.mod"
+	"github.com/ipfs/go-datastore v0.4.4/go.mod"
+	"github.com/ipfs/go-datastore v0.4.5"
+	"github.com/ipfs/go-datastore v0.4.5/go.mod"
+	"github.com/ipfs/go-detect-race v0.0.1"
+	"github.com/ipfs/go-detect-race v0.0.1/go.mod"
+	"github.com/ipfs/go-ds-badger v0.0.2/go.mod"
+	"github.com/ipfs/go-ds-badger v0.0.5/go.mod"
+	"github.com/ipfs/go-ds-badger v0.0.7/go.mod"
+	"github.com/ipfs/go-ds-badger v0.2.1/go.mod"
+	"github.com/ipfs/go-ds-badger v0.2.3/go.mod"
+	"github.com/ipfs/go-ds-badger v0.2.6"
+	"github.com/ipfs/go-ds-badger v0.2.6/go.mod"
+	"github.com/ipfs/go-ds-flatfs v0.4.5"
+	"github.com/ipfs/go-ds-flatfs v0.4.5/go.mod"
+	"github.com/ipfs/go-ds-leveldb v0.0.1/go.mod"
+	"github.com/ipfs/go-ds-leveldb v0.1.0/go.mod"
+	"github.com/ipfs/go-ds-leveldb v0.4.1/go.mod"
+	"github.com/ipfs/go-ds-leveldb v0.4.2"
+	"github.com/ipfs/go-ds-leveldb v0.4.2/go.mod"
+	"github.com/ipfs/go-ds-measure v0.1.0"
+	"github.com/ipfs/go-ds-measure v0.1.0/go.mod"
+	"github.com/ipfs/go-filestore v0.0.3"
+	"github.com/ipfs/go-filestore v0.0.3/go.mod"
+	"github.com/ipfs/go-fs-lock v0.0.6"
+	"github.com/ipfs/go-fs-lock v0.0.6/go.mod"
+	"github.com/ipfs/go-graphsync v0.8.0"
+	"github.com/ipfs/go-graphsync v0.8.0/go.mod"
+	"github.com/ipfs/go-ipfs-blockstore v0.0.1/go.mod"
+	"github.com/ipfs/go-ipfs-blockstore v0.1.0/go.mod"
+	"github.com/ipfs/go-ipfs-blockstore v0.1.4/go.mod"
+	"github.com/ipfs/go-ipfs-blockstore v0.1.6"
+	"github.com/ipfs/go-ipfs-blockstore v0.1.6/go.mod"
+	"github.com/ipfs/go-ipfs-blocksutil v0.0.1"
+	"github.com/ipfs/go-ipfs-blocksutil v0.0.1/go.mod"
+	"github.com/ipfs/go-ipfs-chunker v0.0.1/go.mod"
+	"github.com/ipfs/go-ipfs-chunker v0.0.5"
+	"github.com/ipfs/go-ipfs-chunker v0.0.5/go.mod"
+	"github.com/ipfs/go-ipfs-cmds v0.6.0"
+	"github.com/ipfs/go-ipfs-cmds v0.6.0/go.mod"
+	"github.com/ipfs/go-ipfs-config v0.14.0"
+	"github.com/ipfs/go-ipfs-config v0.14.0/go.mod"
+	"github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod"
+	"github.com/ipfs/go-ipfs-delay v0.0.1"
+	"github.com/ipfs/go-ipfs-delay v0.0.1/go.mod"
+	"github.com/ipfs/go-ipfs-ds-help v0.0.1/go.mod"
+	"github.com/ipfs/go-ipfs-ds-help v0.1.1"
+	"github.com/ipfs/go-ipfs-ds-help v0.1.1/go.mod"
+	"github.com/ipfs/go-ipfs-exchange-interface v0.0.1"
+	"github.com/ipfs/go-ipfs-exchange-interface v0.0.1/go.mod"
+	"github.com/ipfs/go-ipfs-exchange-offline v0.0.1"
+	"github.com/ipfs/go-ipfs-exchange-offline v0.0.1/go.mod"
+	"github.com/ipfs/go-ipfs-files v0.0.3/go.mod"
+	"github.com/ipfs/go-ipfs-files v0.0.8"
+	"github.com/ipfs/go-ipfs-files v0.0.8/go.mod"
+	"github.com/ipfs/go-ipfs-keystore v0.0.2"
+	"github.com/ipfs/go-ipfs-keystore v0.0.2/go.mod"
+	"github.com/ipfs/go-ipfs-pinner v0.1.1"
+	"github.com/ipfs/go-ipfs-pinner v0.1.1/go.mod"
+	"github.com/ipfs/go-ipfs-posinfo v0.0.1"
+	"github.com/ipfs/go-ipfs-posinfo v0.0.1/go.mod"
+	"github.com/ipfs/go-ipfs-pq v0.0.1/go.mod"
+	"github.com/ipfs/go-ipfs-pq v0.0.2"
+	"github.com/ipfs/go-ipfs-pq v0.0.2/go.mod"
+	"github.com/ipfs/go-ipfs-provider v0.5.1"
+	"github.com/ipfs/go-ipfs-provider v0.5.1/go.mod"
+	"github.com/ipfs/go-ipfs-routing v0.0.1/go.mod"
+	"github.com/ipfs/go-ipfs-routing v0.1.0"
+	"github.com/ipfs/go-ipfs-routing v0.1.0/go.mod"
+	"github.com/ipfs/go-ipfs-util v0.0.1/go.mod"
+	"github.com/ipfs/go-ipfs-util v0.0.2"
+	"github.com/ipfs/go-ipfs-util v0.0.2/go.mod"
+	"github.com/ipfs/go-ipld-cbor v0.0.2/go.mod"
+	"github.com/ipfs/go-ipld-cbor v0.0.3/go.mod"
+	"github.com/ipfs/go-ipld-cbor v0.0.4/go.mod"
+	"github.com/ipfs/go-ipld-cbor v0.0.5"
+	"github.com/ipfs/go-ipld-cbor v0.0.5/go.mod"
+	"github.com/ipfs/go-ipld-format v0.0.1/go.mod"
+	"github.com/ipfs/go-ipld-format v0.0.2/go.mod"
+	"github.com/ipfs/go-ipld-format v0.2.0"
+	"github.com/ipfs/go-ipld-format v0.2.0/go.mod"
+	"github.com/ipfs/go-ipld-git v0.0.4"
+	"github.com/ipfs/go-ipld-git v0.0.4/go.mod"
+	"github.com/ipfs/go-ipns v0.0.2/go.mod"
+	"github.com/ipfs/go-ipns v0.1.0"
+	"github.com/ipfs/go-ipns v0.1.0/go.mod"
+	"github.com/ipfs/go-log v0.0.1/go.mod"
+	"github.com/ipfs/go-log v1.0.1/go.mod"
+	"github.com/ipfs/go-log v1.0.2/go.mod"
+	"github.com/ipfs/go-log v1.0.3/go.mod"
+	"github.com/ipfs/go-log v1.0.4/go.mod"
+	"github.com/ipfs/go-log v1.0.5"
+	"github.com/ipfs/go-log v1.0.5/go.mod"
+	"github.com/ipfs/go-log/v2 v2.0.1/go.mod"
+	"github.com/ipfs/go-log/v2 v2.0.2/go.mod"
+	"github.com/ipfs/go-log/v2 v2.0.3/go.mod"
+	"github.com/ipfs/go-log/v2 v2.0.5/go.mod"
+	"github.com/ipfs/go-log/v2 v2.1.1/go.mod"
+	"github.com/ipfs/go-log/v2 v2.1.3"
+	"github.com/ipfs/go-log/v2 v2.1.3/go.mod"
+	"github.com/ipfs/go-merkledag v0.0.6/go.mod"
+	"github.com/ipfs/go-merkledag v0.1.0/go.mod"
+	"github.com/ipfs/go-merkledag v0.2.3/go.mod"
+	"github.com/ipfs/go-merkledag v0.3.0/go.mod"
+	"github.com/ipfs/go-merkledag v0.3.1/go.mod"
+	"github.com/ipfs/go-merkledag v0.3.2"
+	"github.com/ipfs/go-merkledag v0.3.2/go.mod"
+	"github.com/ipfs/go-metrics-interface v0.0.1"
+	"github.com/ipfs/go-metrics-interface v0.0.1/go.mod"
+	"github.com/ipfs/go-metrics-prometheus v0.0.2"
+	"github.com/ipfs/go-metrics-prometheus v0.0.2/go.mod"
+	"github.com/ipfs/go-mfs v0.1.2"
+	"github.com/ipfs/go-mfs v0.1.2/go.mod"
+	"github.com/ipfs/go-namesys v0.3.0"
+	"github.com/ipfs/go-namesys v0.3.0/go.mod"
+	"github.com/ipfs/go-path v0.0.7/go.mod"
+	"github.com/ipfs/go-path v0.0.9"
+	"github.com/ipfs/go-path v0.0.9/go.mod"
+	"github.com/ipfs/go-peertaskqueue v0.0.4/go.mod"
+	"github.com/ipfs/go-peertaskqueue v0.1.0/go.mod"
+	"github.com/ipfs/go-peertaskqueue v0.1.1/go.mod"
+	"github.com/ipfs/go-peertaskqueue v0.2.0"
+	"github.com/ipfs/go-peertaskqueue v0.2.0/go.mod"
+	"github.com/ipfs/go-pinning-service-http-client v0.1.0"
+	"github.com/ipfs/go-pinning-service-http-client v0.1.0/go.mod"
+	"github.com/ipfs/go-unixfs v0.1.0/go.mod"
+	"github.com/ipfs/go-unixfs v0.2.4/go.mod"
+	"github.com/ipfs/go-unixfs v0.2.5"
+	"github.com/ipfs/go-unixfs v0.2.5/go.mod"
+	"github.com/ipfs/go-verifcid v0.0.1"
+	"github.com/ipfs/go-verifcid v0.0.1/go.mod"
+	"github.com/ipfs/interface-go-ipfs-core v0.4.0"
+	"github.com/ipfs/interface-go-ipfs-core v0.4.0/go.mod"
+	"github.com/ipfs/tar-utils v0.0.1"
+	"github.com/ipfs/tar-utils v0.0.1/go.mod"
+	"github.com/ipld/go-car v0.3.1"
+	"github.com/ipld/go-car v0.3.1/go.mod"
+	"github.com/ipld/go-codec-dagpb v1.2.0"
+	"github.com/ipld/go-codec-dagpb v1.2.0/go.mod"
+	"github.com/ipld/go-ipld-prime v0.9.0/go.mod"
+	"github.com/ipld/go-ipld-prime v0.9.1-0.20210324083106-dc342a9917db"
+	"github.com/ipld/go-ipld-prime v0.9.1-0.20210324083106-dc342a9917db/go.mod"
+	"github.com/jackpal/gateway v1.0.5/go.mod"
+	"github.com/jackpal/go-nat-pmp v1.0.1/go.mod"
+	"github.com/jackpal/go-nat-pmp v1.0.2"
+	"github.com/jackpal/go-nat-pmp v1.0.2/go.mod"
+	"github.com/jbenet/go-cienv v0.0.0-20150120210510-1bb1476777ec/go.mod"
+	"github.com/jbenet/go-cienv v0.1.0"
+	"github.com/jbenet/go-cienv v0.1.0/go.mod"
+	"github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c"
+	"github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c/go.mod"
+	"github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2/go.mod"
+	"github.com/jbenet/go-temp-err-catcher v0.1.0"
+	"github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod"
+	"github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8/go.mod"
+	"github.com/jbenet/goprocess v0.1.3/go.mod"
+	"github.com/jbenet/goprocess v0.1.4"
+	"github.com/jbenet/goprocess v0.1.4/go.mod"
+	"github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod"
+	"github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod"
+	"github.com/jessevdk/go-flags v1.4.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/jpillora/backoff v1.0.0/go.mod"
+	"github.com/jrick/logrotate v1.0.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.8/go.mod"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/json-iterator/go v1.1.10/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/jtolds/gls v4.2.1+incompatible/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/julienschmidt/httprouter v1.3.0/go.mod"
+	"github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.5.0"
+	"github.com/kisielk/errcheck v1.5.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod"
+	"github.com/klauspost/compress v1.11.7"
+	"github.com/klauspost/compress v1.11.7/go.mod"
+	"github.com/klauspost/cpuid/v2 v2.0.4"
+	"github.com/klauspost/cpuid/v2 v2.0.4/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+	"github.com/koron/go-ssdp v0.0.0-20180514024734-4a0ed625a78b/go.mod"
+	"github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d"
+	"github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pretty v0.2.1"
+	"github.com/kr/pretty v0.2.1/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.3/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/libp2p/go-addr-util v0.0.1/go.mod"
+	"github.com/libp2p/go-addr-util v0.0.2"
+	"github.com/libp2p/go-addr-util v0.0.2/go.mod"
+	"github.com/libp2p/go-buffer-pool v0.0.1/go.mod"
+	"github.com/libp2p/go-buffer-pool v0.0.2"
+	"github.com/libp2p/go-buffer-pool v0.0.2/go.mod"
+	"github.com/libp2p/go-cidranger v1.1.0"
+	"github.com/libp2p/go-cidranger v1.1.0/go.mod"
+	"github.com/libp2p/go-conn-security v0.0.1/go.mod"
+	"github.com/libp2p/go-conn-security-multistream v0.0.2/go.mod"
+	"github.com/libp2p/go-conn-security-multistream v0.1.0/go.mod"
+	"github.com/libp2p/go-conn-security-multistream v0.2.0/go.mod"
+	"github.com/libp2p/go-conn-security-multistream v0.2.1"
+	"github.com/libp2p/go-conn-security-multistream v0.2.1"
+	"github.com/libp2p/go-conn-security-multistream v0.2.1/go.mod"
+	"github.com/libp2p/go-conn-security-multistream v0.2.1/go.mod"
+	"github.com/libp2p/go-doh-resolver v0.3.1"
+	"github.com/libp2p/go-doh-resolver v0.3.1/go.mod"
+	"github.com/libp2p/go-eventbus v0.1.0/go.mod"
+	"github.com/libp2p/go-eventbus v0.2.1"
+	"github.com/libp2p/go-eventbus v0.2.1/go.mod"
+	"github.com/libp2p/go-flow-metrics v0.0.1/go.mod"
+	"github.com/libp2p/go-flow-metrics v0.0.2/go.mod"
+	"github.com/libp2p/go-flow-metrics v0.0.3"
+	"github.com/libp2p/go-flow-metrics v0.0.3/go.mod"
+	"github.com/libp2p/go-libp2p v0.0.30/go.mod"
+	"github.com/libp2p/go-libp2p v0.1.0/go.mod"
+	"github.com/libp2p/go-libp2p v0.1.1/go.mod"
+	"github.com/libp2p/go-libp2p v0.6.1/go.mod"
+	"github.com/libp2p/go-libp2p v0.7.0/go.mod"
+	"github.com/libp2p/go-libp2p v0.7.4/go.mod"
+	"github.com/libp2p/go-libp2p v0.8.1/go.mod"
+	"github.com/libp2p/go-libp2p v0.12.0/go.mod"
+	"github.com/libp2p/go-libp2p v0.13.0/go.mod"
+	"github.com/libp2p/go-libp2p v0.14.3"
+	"github.com/libp2p/go-libp2p v0.14.3/go.mod"
+	"github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052"
+	"github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052/go.mod"
+	"github.com/libp2p/go-libp2p-autonat v0.0.6/go.mod"
+	"github.com/libp2p/go-libp2p-autonat v0.1.0/go.mod"
+	"github.com/libp2p/go-libp2p-autonat v0.1.1/go.mod"
+	"github.com/libp2p/go-libp2p-autonat v0.2.0/go.mod"
+	"github.com/libp2p/go-libp2p-autonat v0.2.1/go.mod"
+	"github.com/libp2p/go-libp2p-autonat v0.2.2/go.mod"
+	"github.com/libp2p/go-libp2p-autonat v0.4.0/go.mod"
+	"github.com/libp2p/go-libp2p-autonat v0.4.2"
+	"github.com/libp2p/go-libp2p-autonat v0.4.2/go.mod"
+	"github.com/libp2p/go-libp2p-blankhost v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-blankhost v0.1.1/go.mod"
+	"github.com/libp2p/go-libp2p-blankhost v0.1.4/go.mod"
+	"github.com/libp2p/go-libp2p-blankhost v0.2.0"
+	"github.com/libp2p/go-libp2p-blankhost v0.2.0/go.mod"
+	"github.com/libp2p/go-libp2p-circuit v0.0.9/go.mod"
+	"github.com/libp2p/go-libp2p-circuit v0.1.0/go.mod"
+	"github.com/libp2p/go-libp2p-circuit v0.1.4/go.mod"
+	"github.com/libp2p/go-libp2p-circuit v0.2.1/go.mod"
+	"github.com/libp2p/go-libp2p-circuit v0.4.0"
+	"github.com/libp2p/go-libp2p-circuit v0.4.0/go.mod"
+	"github.com/libp2p/go-libp2p-connmgr v0.2.4"
+	"github.com/libp2p/go-libp2p-connmgr v0.2.4/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.0.2/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.0.3/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.0.4/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.2.0/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.2.2/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.2.4/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.2.5/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.3.0/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.3.1/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.4.0/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.5.0/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.5.1/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.5.3/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.5.4/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.5.5/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.5.6/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.5.7/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.6.0/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.6.1/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.7.0/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.8.0/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.8.1/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.8.2/go.mod"
+	"github.com/libp2p/go-libp2p-core v0.8.5"
+	"github.com/libp2p/go-libp2p-core v0.8.5/go.mod"
+	"github.com/libp2p/go-libp2p-crypto v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-crypto v0.0.2/go.mod"
+	"github.com/libp2p/go-libp2p-crypto v0.1.0/go.mod"
+	"github.com/libp2p/go-libp2p-discovery v0.0.5/go.mod"
+	"github.com/libp2p/go-libp2p-discovery v0.1.0/go.mod"
+	"github.com/libp2p/go-libp2p-discovery v0.2.0/go.mod"
+	"github.com/libp2p/go-libp2p-discovery v0.3.0/go.mod"
+	"github.com/libp2p/go-libp2p-discovery v0.5.0/go.mod"
+	"github.com/libp2p/go-libp2p-discovery v0.5.1"
+	"github.com/libp2p/go-libp2p-discovery v0.5.1/go.mod"
+	"github.com/libp2p/go-libp2p-gostream v0.3.0"
+	"github.com/libp2p/go-libp2p-gostream v0.3.0/go.mod"
+	"github.com/libp2p/go-libp2p-host v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-host v0.0.3/go.mod"
+	"github.com/libp2p/go-libp2p-http v0.2.0"
+	"github.com/libp2p/go-libp2p-http v0.2.0/go.mod"
+	"github.com/libp2p/go-libp2p-interface-connmgr v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-interface-connmgr v0.0.4/go.mod"
+	"github.com/libp2p/go-libp2p-interface-connmgr v0.0.5/go.mod"
+	"github.com/libp2p/go-libp2p-interface-pnet v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-kad-dht v0.11.1/go.mod"
+	"github.com/libp2p/go-libp2p-kad-dht v0.12.2"
+	"github.com/libp2p/go-libp2p-kad-dht v0.12.2/go.mod"
+	"github.com/libp2p/go-libp2p-kbucket v0.3.1/go.mod"
+	"github.com/libp2p/go-libp2p-kbucket v0.4.7"
+	"github.com/libp2p/go-libp2p-kbucket v0.4.7/go.mod"
+	"github.com/libp2p/go-libp2p-loggables v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-loggables v0.1.0"
+	"github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod"
+	"github.com/libp2p/go-libp2p-metrics v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-mplex v0.1.1/go.mod"
+	"github.com/libp2p/go-libp2p-mplex v0.2.0/go.mod"
+	"github.com/libp2p/go-libp2p-mplex v0.2.1/go.mod"
+	"github.com/libp2p/go-libp2p-mplex v0.2.2/go.mod"
+	"github.com/libp2p/go-libp2p-mplex v0.2.3/go.mod"
+	"github.com/libp2p/go-libp2p-mplex v0.3.0/go.mod"
+	"github.com/libp2p/go-libp2p-mplex v0.4.0/go.mod"
+	"github.com/libp2p/go-libp2p-mplex v0.4.1"
+	"github.com/libp2p/go-libp2p-mplex v0.4.1/go.mod"
+	"github.com/libp2p/go-libp2p-nat v0.0.4/go.mod"
+	"github.com/libp2p/go-libp2p-nat v0.0.5/go.mod"
+	"github.com/libp2p/go-libp2p-nat v0.0.6"
+	"github.com/libp2p/go-libp2p-nat v0.0.6/go.mod"
+	"github.com/libp2p/go-libp2p-net v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-net v0.0.2/go.mod"
+	"github.com/libp2p/go-libp2p-netutil v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-netutil v0.1.0"
+	"github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod"
+	"github.com/libp2p/go-libp2p-noise v0.1.1/go.mod"
+	"github.com/libp2p/go-libp2p-noise v0.2.0"
+	"github.com/libp2p/go-libp2p-noise v0.2.0/go.mod"
+	"github.com/libp2p/go-libp2p-peer v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-peer v0.1.1/go.mod"
+	"github.com/libp2p/go-libp2p-peer v0.2.0/go.mod"
+	"github.com/libp2p/go-libp2p-peerstore v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-peerstore v0.0.6/go.mod"
+	"github.com/libp2p/go-libp2p-peerstore v0.1.0/go.mod"
+	"github.com/libp2p/go-libp2p-peerstore v0.1.3/go.mod"
+	"github.com/libp2p/go-libp2p-peerstore v0.1.4/go.mod"
+	"github.com/libp2p/go-libp2p-peerstore v0.2.0/go.mod"
+	"github.com/libp2p/go-libp2p-peerstore v0.2.1/go.mod"
+	"github.com/libp2p/go-libp2p-peerstore v0.2.2/go.mod"
+	"github.com/libp2p/go-libp2p-peerstore v0.2.6/go.mod"
+	"github.com/libp2p/go-libp2p-peerstore v0.2.7"
+	"github.com/libp2p/go-libp2p-peerstore v0.2.7/go.mod"
+	"github.com/libp2p/go-libp2p-pnet v0.2.0"
+	"github.com/libp2p/go-libp2p-pnet v0.2.0/go.mod"
+	"github.com/libp2p/go-libp2p-protocol v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-protocol v0.1.0/go.mod"
+	"github.com/libp2p/go-libp2p-pubsub v0.4.0/go.mod"
+	"github.com/libp2p/go-libp2p-pubsub v0.4.2"
+	"github.com/libp2p/go-libp2p-pubsub v0.4.2/go.mod"
+	"github.com/libp2p/go-libp2p-pubsub-router v0.4.0"
+	"github.com/libp2p/go-libp2p-pubsub-router v0.4.0/go.mod"
+	"github.com/libp2p/go-libp2p-quic-transport v0.10.0/go.mod"
+	"github.com/libp2p/go-libp2p-quic-transport v0.11.2"
+	"github.com/libp2p/go-libp2p-quic-transport v0.11.2/go.mod"
+	"github.com/libp2p/go-libp2p-record v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-record v0.1.0/go.mod"
+	"github.com/libp2p/go-libp2p-record v0.1.1/go.mod"
+	"github.com/libp2p/go-libp2p-record v0.1.2/go.mod"
+	"github.com/libp2p/go-libp2p-record v0.1.3"
+	"github.com/libp2p/go-libp2p-record v0.1.3/go.mod"
+	"github.com/libp2p/go-libp2p-routing v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-routing-helpers v0.2.3"
+	"github.com/libp2p/go-libp2p-routing-helpers v0.2.3/go.mod"
+	"github.com/libp2p/go-libp2p-secio v0.0.3/go.mod"
+	"github.com/libp2p/go-libp2p-secio v0.1.0/go.mod"
+	"github.com/libp2p/go-libp2p-secio v0.2.0/go.mod"
+	"github.com/libp2p/go-libp2p-secio v0.2.1/go.mod"
+	"github.com/libp2p/go-libp2p-secio v0.2.2/go.mod"
+	"github.com/libp2p/go-libp2p-swarm v0.0.6/go.mod"
+	"github.com/libp2p/go-libp2p-swarm v0.1.0/go.mod"
+	"github.com/libp2p/go-libp2p-swarm v0.2.2/go.mod"
+	"github.com/libp2p/go-libp2p-swarm v0.2.3/go.mod"
+	"github.com/libp2p/go-libp2p-swarm v0.2.8/go.mod"
+	"github.com/libp2p/go-libp2p-swarm v0.3.0/go.mod"
+	"github.com/libp2p/go-libp2p-swarm v0.3.1/go.mod"
+	"github.com/libp2p/go-libp2p-swarm v0.4.0/go.mod"
+	"github.com/libp2p/go-libp2p-swarm v0.5.0"
+	"github.com/libp2p/go-libp2p-swarm v0.5.0/go.mod"
+	"github.com/libp2p/go-libp2p-testing v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-testing v0.0.2/go.mod"
+	"github.com/libp2p/go-libp2p-testing v0.0.3/go.mod"
+	"github.com/libp2p/go-libp2p-testing v0.0.4/go.mod"
+	"github.com/libp2p/go-libp2p-testing v0.1.0/go.mod"
+	"github.com/libp2p/go-libp2p-testing v0.1.1/go.mod"
+	"github.com/libp2p/go-libp2p-testing v0.1.2-0.20200422005655-8775583591d8/go.mod"
+	"github.com/libp2p/go-libp2p-testing v0.3.0/go.mod"
+	"github.com/libp2p/go-libp2p-testing v0.4.0"
+	"github.com/libp2p/go-libp2p-testing v0.4.0/go.mod"
+	"github.com/libp2p/go-libp2p-tls v0.1.3"
+	"github.com/libp2p/go-libp2p-tls v0.1.3/go.mod"
+	"github.com/libp2p/go-libp2p-transport v0.0.1/go.mod"
+	"github.com/libp2p/go-libp2p-transport v0.0.5/go.mod"
+	"github.com/libp2p/go-libp2p-transport-upgrader v0.0.4/go.mod"
+	"github.com/libp2p/go-libp2p-transport-upgrader v0.1.1/go.mod"
+	"github.com/libp2p/go-libp2p-transport-upgrader v0.2.0/go.mod"
+	"github.com/libp2p/go-libp2p-transport-upgrader v0.3.0/go.mod"
+	"github.com/libp2p/go-libp2p-transport-upgrader v0.4.0/go.mod"
+	"github.com/libp2p/go-libp2p-transport-upgrader v0.4.2"
+	"github.com/libp2p/go-libp2p-transport-upgrader v0.4.2/go.mod"
+	"github.com/libp2p/go-libp2p-xor v0.0.0-20200501025846-71e284145d58"
+	"github.com/libp2p/go-libp2p-xor v0.0.0-20200501025846-71e284145d58/go.mod"
+	"github.com/libp2p/go-libp2p-yamux v0.1.2/go.mod"
+	"github.com/libp2p/go-libp2p-yamux v0.1.3/go.mod"
+	"github.com/libp2p/go-libp2p-yamux v0.2.0/go.mod"
+	"github.com/libp2p/go-libp2p-yamux v0.2.1/go.mod"
+	"github.com/libp2p/go-libp2p-yamux v0.2.2/go.mod"
+	"github.com/libp2p/go-libp2p-yamux v0.2.5/go.mod"
+	"github.com/libp2p/go-libp2p-yamux v0.2.7/go.mod"
+	"github.com/libp2p/go-libp2p-yamux v0.2.8/go.mod"
+	"github.com/libp2p/go-libp2p-yamux v0.4.0/go.mod"
+	"github.com/libp2p/go-libp2p-yamux v0.5.0/go.mod"
+	"github.com/libp2p/go-libp2p-yamux v0.5.1/go.mod"
+	"github.com/libp2p/go-libp2p-yamux v0.5.4"
+	"github.com/libp2p/go-libp2p-yamux v0.5.4/go.mod"
+	"github.com/libp2p/go-maddr-filter v0.0.1/go.mod"
+	"github.com/libp2p/go-maddr-filter v0.0.4/go.mod"
+	"github.com/libp2p/go-maddr-filter v0.0.5/go.mod"
+	"github.com/libp2p/go-maddr-filter v0.1.0"
+	"github.com/libp2p/go-maddr-filter v0.1.0/go.mod"
+	"github.com/libp2p/go-mplex v0.0.3/go.mod"
+	"github.com/libp2p/go-mplex v0.0.4/go.mod"
+	"github.com/libp2p/go-mplex v0.1.0/go.mod"
+	"github.com/libp2p/go-mplex v0.1.1/go.mod"
+	"github.com/libp2p/go-mplex v0.1.2/go.mod"
+	"github.com/libp2p/go-mplex v0.2.0/go.mod"
+	"github.com/libp2p/go-mplex v0.3.0"
+	"github.com/libp2p/go-mplex v0.3.0/go.mod"
+	"github.com/libp2p/go-msgio v0.0.2/go.mod"
+	"github.com/libp2p/go-msgio v0.0.3/go.mod"
+	"github.com/libp2p/go-msgio v0.0.4/go.mod"
+	"github.com/libp2p/go-msgio v0.0.6"
+	"github.com/libp2p/go-msgio v0.0.6/go.mod"
+	"github.com/libp2p/go-nat v0.0.3/go.mod"
+	"github.com/libp2p/go-nat v0.0.4/go.mod"
+	"github.com/libp2p/go-nat v0.0.5"
+	"github.com/libp2p/go-nat v0.0.5/go.mod"
+	"github.com/libp2p/go-netroute v0.1.2/go.mod"
+	"github.com/libp2p/go-netroute v0.1.3/go.mod"
+	"github.com/libp2p/go-netroute v0.1.5/go.mod"
+	"github.com/libp2p/go-netroute v0.1.6"
+	"github.com/libp2p/go-netroute v0.1.6/go.mod"
+	"github.com/libp2p/go-openssl v0.0.2/go.mod"
+	"github.com/libp2p/go-openssl v0.0.3/go.mod"
+	"github.com/libp2p/go-openssl v0.0.4/go.mod"
+	"github.com/libp2p/go-openssl v0.0.5/go.mod"
+	"github.com/libp2p/go-openssl v0.0.7"
+	"github.com/libp2p/go-openssl v0.0.7/go.mod"
+	"github.com/libp2p/go-reuseport v0.0.1/go.mod"
+	"github.com/libp2p/go-reuseport v0.0.2"
+	"github.com/libp2p/go-reuseport v0.0.2/go.mod"
+	"github.com/libp2p/go-reuseport-transport v0.0.2/go.mod"
+	"github.com/libp2p/go-reuseport-transport v0.0.3/go.mod"
+	"github.com/libp2p/go-reuseport-transport v0.0.4"
+	"github.com/libp2p/go-reuseport-transport v0.0.4/go.mod"
+	"github.com/libp2p/go-sockaddr v0.0.2/go.mod"
+	"github.com/libp2p/go-sockaddr v0.1.0/go.mod"
+	"github.com/libp2p/go-sockaddr v0.1.1"
+	"github.com/libp2p/go-sockaddr v0.1.1/go.mod"
+	"github.com/libp2p/go-socket-activation v0.0.2"
+	"github.com/libp2p/go-socket-activation v0.0.2/go.mod"
+	"github.com/libp2p/go-stream-muxer v0.0.1/go.mod"
+	"github.com/libp2p/go-stream-muxer v0.1.0/go.mod"
+	"github.com/libp2p/go-stream-muxer-multistream v0.1.1/go.mod"
+	"github.com/libp2p/go-stream-muxer-multistream v0.2.0/go.mod"
+	"github.com/libp2p/go-stream-muxer-multistream v0.3.0"
+	"github.com/libp2p/go-stream-muxer-multistream v0.3.0/go.mod"
+	"github.com/libp2p/go-tcp-transport v0.0.4/go.mod"
+	"github.com/libp2p/go-tcp-transport v0.1.0/go.mod"
+	"github.com/libp2p/go-tcp-transport v0.1.1/go.mod"
+	"github.com/libp2p/go-tcp-transport v0.2.0/go.mod"
+	"github.com/libp2p/go-tcp-transport v0.2.1/go.mod"
+	"github.com/libp2p/go-tcp-transport v0.2.3/go.mod"
+	"github.com/libp2p/go-tcp-transport v0.2.4"
+	"github.com/libp2p/go-tcp-transport v0.2.4/go.mod"
+	"github.com/libp2p/go-testutil v0.0.1/go.mod"
+	"github.com/libp2p/go-testutil v0.1.0/go.mod"
+	"github.com/libp2p/go-ws-transport v0.0.5/go.mod"
+	"github.com/libp2p/go-ws-transport v0.1.0/go.mod"
+	"github.com/libp2p/go-ws-transport v0.2.0/go.mod"
+	"github.com/libp2p/go-ws-transport v0.3.0/go.mod"
+	"github.com/libp2p/go-ws-transport v0.3.1/go.mod"
+	"github.com/libp2p/go-ws-transport v0.4.0"
+	"github.com/libp2p/go-ws-transport v0.4.0/go.mod"
+	"github.com/libp2p/go-yamux v1.2.1/go.mod"
+	"github.com/libp2p/go-yamux v1.2.2/go.mod"
+	"github.com/libp2p/go-yamux v1.2.3/go.mod"
+	"github.com/libp2p/go-yamux v1.3.0/go.mod"
+	"github.com/libp2p/go-yamux v1.3.3/go.mod"
+	"github.com/libp2p/go-yamux v1.3.5/go.mod"
+	"github.com/libp2p/go-yamux v1.3.7/go.mod"
+	"github.com/libp2p/go-yamux v1.4.0/go.mod"
+	"github.com/libp2p/go-yamux v1.4.1"
+	"github.com/libp2p/go-yamux v1.4.1/go.mod"
+	"github.com/libp2p/go-yamux/v2 v2.0.0/go.mod"
+	"github.com/libp2p/go-yamux/v2 v2.2.0"
+	"github.com/libp2p/go-yamux/v2 v2.2.0/go.mod"
+	"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
+	"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
+	"github.com/lucas-clemente/quic-go v0.19.3/go.mod"
+	"github.com/lucas-clemente/quic-go v0.21.2"
+	"github.com/lucas-clemente/quic-go v0.21.2/go.mod"
+	"github.com/lunixbochs/vtclean v1.0.0/go.mod"
+	"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/marten-seemann/qpack v0.2.1/go.mod"
+	"github.com/marten-seemann/qtls v0.10.0/go.mod"
+	"github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod"
+	"github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod"
+	"github.com/marten-seemann/qtls-go1-15 v0.1.5"
+	"github.com/marten-seemann/qtls-go1-15 v0.1.5/go.mod"
+	"github.com/marten-seemann/qtls-go1-16 v0.1.4"
+	"github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod"
+	"github.com/marten-seemann/qtls-go1-17 v0.1.0-rc.1"
+	"github.com/marten-seemann/qtls-go1-17 v0.1.0-rc.1/go.mod"
+	"github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd"
+	"github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.1/go.mod"
+	"github.com/mattn/go-colorable v0.1.2/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.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.5/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/miekg/dns v1.1.12/go.mod"
+	"github.com/miekg/dns v1.1.28/go.mod"
+	"github.com/miekg/dns v1.1.31/go.mod"
+	"github.com/miekg/dns v1.1.41"
+	"github.com/miekg/dns v1.1.41/go.mod"
+	"github.com/mikioh/tcp v0.0.0-20190314235350-803a9b46060c"
+	"github.com/mikioh/tcp v0.0.0-20190314235350-803a9b46060c/go.mod"
+	"github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b"
+	"github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b/go.mod"
+	"github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc"
+	"github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc/go.mod"
+	"github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1"
+	"github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod"
+	"github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod"
+	"github.com/minio/sha256-simd v0.0.0-20190328051042-05b4dd3047e5/go.mod"
+	"github.com/minio/sha256-simd v0.1.0/go.mod"
+	"github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod"
+	"github.com/minio/sha256-simd v0.1.1/go.mod"
+	"github.com/minio/sha256-simd v1.0.0"
+	"github.com/minio/sha256-simd v1.0.0/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mr-tron/base58 v1.1.0/go.mod"
+	"github.com/mr-tron/base58 v1.1.1/go.mod"
+	"github.com/mr-tron/base58 v1.1.2/go.mod"
+	"github.com/mr-tron/base58 v1.1.3/go.mod"
+	"github.com/mr-tron/base58 v1.2.0"
+	"github.com/mr-tron/base58 v1.2.0/go.mod"
+	"github.com/multiformats/go-base32 v0.0.3"
+	"github.com/multiformats/go-base32 v0.0.3/go.mod"
+	"github.com/multiformats/go-base36 v0.1.0"
+	"github.com/multiformats/go-base36 v0.1.0/go.mod"
+	"github.com/multiformats/go-multiaddr v0.0.1/go.mod"
+	"github.com/multiformats/go-multiaddr v0.0.2/go.mod"
+	"github.com/multiformats/go-multiaddr v0.0.4/go.mod"
+	"github.com/multiformats/go-multiaddr v0.1.0/go.mod"
+	"github.com/multiformats/go-multiaddr v0.1.1/go.mod"
+	"github.com/multiformats/go-multiaddr v0.2.0/go.mod"
+	"github.com/multiformats/go-multiaddr v0.2.1/go.mod"
+	"github.com/multiformats/go-multiaddr v0.2.2/go.mod"
+	"github.com/multiformats/go-multiaddr v0.3.0/go.mod"
+	"github.com/multiformats/go-multiaddr v0.3.1/go.mod"
+	"github.com/multiformats/go-multiaddr v0.3.3"
+	"github.com/multiformats/go-multiaddr v0.3.3/go.mod"
+	"github.com/multiformats/go-multiaddr-dns v0.0.1/go.mod"
+	"github.com/multiformats/go-multiaddr-dns v0.0.2/go.mod"
+	"github.com/multiformats/go-multiaddr-dns v0.2.0/go.mod"
+	"github.com/multiformats/go-multiaddr-dns v0.3.0/go.mod"
+	"github.com/multiformats/go-multiaddr-dns v0.3.1"
+	"github.com/multiformats/go-multiaddr-dns v0.3.1"
+	"github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod"
+	"github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod"
+	"github.com/multiformats/go-multiaddr-fmt v0.0.1/go.mod"
+	"github.com/multiformats/go-multiaddr-fmt v0.1.0"
+	"github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod"
+	"github.com/multiformats/go-multiaddr-net v0.0.1/go.mod"
+	"github.com/multiformats/go-multiaddr-net v0.1.0/go.mod"
+	"github.com/multiformats/go-multiaddr-net v0.1.1/go.mod"
+	"github.com/multiformats/go-multiaddr-net v0.1.2/go.mod"
+	"github.com/multiformats/go-multiaddr-net v0.1.3/go.mod"
+	"github.com/multiformats/go-multiaddr-net v0.1.4/go.mod"
+	"github.com/multiformats/go-multiaddr-net v0.1.5/go.mod"
+	"github.com/multiformats/go-multiaddr-net v0.2.0"
+	"github.com/multiformats/go-multiaddr-net v0.2.0/go.mod"
+	"github.com/multiformats/go-multibase v0.0.1/go.mod"
+	"github.com/multiformats/go-multibase v0.0.3"
+	"github.com/multiformats/go-multibase v0.0.3/go.mod"
+	"github.com/multiformats/go-multicodec v0.2.0"
+	"github.com/multiformats/go-multicodec v0.2.0/go.mod"
+	"github.com/multiformats/go-multihash v0.0.1/go.mod"
+	"github.com/multiformats/go-multihash v0.0.5/go.mod"
+	"github.com/multiformats/go-multihash v0.0.8/go.mod"
+	"github.com/multiformats/go-multihash v0.0.9/go.mod"
+	"github.com/multiformats/go-multihash v0.0.10/go.mod"
+	"github.com/multiformats/go-multihash v0.0.13/go.mod"
+	"github.com/multiformats/go-multihash v0.0.14/go.mod"
+	"github.com/multiformats/go-multihash v0.0.15"
+	"github.com/multiformats/go-multihash v0.0.15/go.mod"
+	"github.com/multiformats/go-multistream v0.0.1/go.mod"
+	"github.com/multiformats/go-multistream v0.0.4/go.mod"
+	"github.com/multiformats/go-multistream v0.1.0/go.mod"
+	"github.com/multiformats/go-multistream v0.1.1/go.mod"
+	"github.com/multiformats/go-multistream v0.2.0/go.mod"
+	"github.com/multiformats/go-multistream v0.2.1/go.mod"
+	"github.com/multiformats/go-multistream v0.2.1/go.mod"
+	"github.com/multiformats/go-multistream v0.2.2"
+	"github.com/multiformats/go-multistream v0.2.2/go.mod"
+	"github.com/multiformats/go-varint v0.0.1/go.mod"
+	"github.com/multiformats/go-varint v0.0.2/go.mod"
+	"github.com/multiformats/go-varint v0.0.5/go.mod"
+	"github.com/multiformats/go-varint v0.0.6"
+	"github.com/multiformats/go-varint v0.0.6/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+	"github.com/nats-io/jwt v0.3.0/go.mod"
+	"github.com/nats-io/jwt v0.3.2/go.mod"
+	"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
+	"github.com/nats-io/nats.go v1.9.1/go.mod"
+	"github.com/nats-io/nkeys v0.1.0/go.mod"
+	"github.com/nats-io/nkeys v0.1.3/go.mod"
+	"github.com/nats-io/nuid v1.0.1/go.mod"
+	"github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod"
+	"github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod"
+	"github.com/nxadm/tail v1.4.4/go.mod"
+	"github.com/nxadm/tail v1.4.8"
+	"github.com/nxadm/tail v1.4.8/go.mod"
+	"github.com/oklog/oklog v0.3.2/go.mod"
+	"github.com/oklog/run v1.0.0/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.7.0/go.mod"
+	"github.com/onsi/ginkgo v1.8.0/go.mod"
+	"github.com/onsi/ginkgo v1.12.0/go.mod"
+	"github.com/onsi/ginkgo v1.12.1/go.mod"
+	"github.com/onsi/ginkgo v1.14.0/go.mod"
+	"github.com/onsi/ginkgo v1.16.2/go.mod"
+	"github.com/onsi/ginkgo v1.16.4"
+	"github.com/onsi/ginkgo v1.16.4/go.mod"
+	"github.com/onsi/gomega v1.4.1/go.mod"
+	"github.com/onsi/gomega v1.4.3/go.mod"
+	"github.com/onsi/gomega v1.5.0/go.mod"
+	"github.com/onsi/gomega v1.7.1/go.mod"
+	"github.com/onsi/gomega v1.9.0/go.mod"
+	"github.com/onsi/gomega v1.10.1/go.mod"
+	"github.com/onsi/gomega v1.13.0"
+	"github.com/onsi/gomega v1.13.0/go.mod"
+	"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
+	"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
+	"github.com/opentracing/basictracer-go v1.0.0/go.mod"
+	"github.com/opentracing/opentracing-go v1.0.2/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/opentracing/opentracing-go v1.2.0"
+	"github.com/opentracing/opentracing-go v1.2.0/go.mod"
+	"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.1/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
+	"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
+	"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
+	"github.com/pact-foundation/pact-go v1.0.4/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pborman/uuid v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
+	"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
+	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/profile v1.2.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/polydawn/refmt v0.0.0-20190221155625-df39d6c2d992/go.mod"
+	"github.com/polydawn/refmt v0.0.0-20190408063855-01bf1e26dd14/go.mod"
+	"github.com/polydawn/refmt v0.0.0-20190807091052-3d65705ee9f1/go.mod"
+	"github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e"
+	"github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/prometheus/client_golang v0.8.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.2/go.mod"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.3.0/go.mod"
+	"github.com/prometheus/client_golang v1.6.0/go.mod"
+	"github.com/prometheus/client_golang v1.7.1/go.mod"
+	"github.com/prometheus/client_golang v1.9.0/go.mod"
+	"github.com/prometheus/client_golang v1.10.0"
+	"github.com/prometheus/client_golang v1.10.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.1.0/go.mod"
+	"github.com/prometheus/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
+	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+	"github.com/prometheus/common v0.2.0/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.7.0/go.mod"
+	"github.com/prometheus/common v0.9.1/go.mod"
+	"github.com/prometheus/common v0.10.0/go.mod"
+	"github.com/prometheus/common v0.15.0/go.mod"
+	"github.com/prometheus/common v0.18.0"
+	"github.com/prometheus/common v0.18.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
+	"github.com/prometheus/procfs v0.0.11/go.mod"
+	"github.com/prometheus/procfs v0.1.3/go.mod"
+	"github.com/prometheus/procfs v0.2.0/go.mod"
+	"github.com/prometheus/procfs v0.6.0"
+	"github.com/prometheus/procfs v0.6.0/go.mod"
+	"github.com/prometheus/statsd_exporter v0.20.0"
+	"github.com/prometheus/statsd_exporter v0.20.0/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rs/cors v1.7.0"
+	"github.com/rs/cors v1.7.0/go.mod"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod"
+	"github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod"
+	"github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod"
+	"github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod"
+	"github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod"
+	"github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod"
+	"github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod"
+	"github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod"
+	"github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod"
+	"github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod"
+	"github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod"
+	"github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod"
+	"github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod"
+	"github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod"
+	"github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod"
+	"github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod"
+	"github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod"
+	"github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod"
+	"github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod"
+	"github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sirupsen/logrus v1.6.0"
+	"github.com/sirupsen/logrus v1.6.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/assertions v1.0.0/go.mod"
+	"github.com/smartystreets/assertions v1.0.1"
+	"github.com/smartystreets/assertions v1.0.1/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/smola/gocompat v0.2.0/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/sony/gobreaker v0.4.1/go.mod"
+	"github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod"
+	"github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod"
+	"github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a/go.mod"
+	"github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572"
+	"github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0"
+	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/src-d/envconfig v1.0.0/go.mod"
+	"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
+	"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
+	"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/syndtr/goleveldb v1.0.0"
+	"github.com/syndtr/goleveldb v1.0.0/go.mod"
+	"github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod"
+	"github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e"
+	"github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+	"github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c"
+	"github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/urfave/cli v1.22.1/go.mod"
+	"github.com/urfave/cli/v2 v2.0.0/go.mod"
+	"github.com/viant/assertly v0.4.8/go.mod"
+	"github.com/viant/toolbox v0.24.0/go.mod"
+	"github.com/wangjia184/sortedset v0.0.0-20160527075905-f5d03557ba30/go.mod"
+	"github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436/go.mod"
+	"github.com/warpfork/go-wish v0.0.0-20190328234359-8b3e70f8e830/go.mod"
+	"github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a"
+	"github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a/go.mod"
+	"github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc"
+	"github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc/go.mod"
+	"github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158/go.mod"
+	"github.com/whyrusleeping/cbor-gen v0.0.0-20200710004633-5379fc63235d/go.mod"
+	"github.com/whyrusleeping/cbor-gen v0.0.0-20210219115102-f37d292932f2"
+	"github.com/whyrusleeping/cbor-gen v0.0.0-20210219115102-f37d292932f2/go.mod"
+	"github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f"
+	"github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f/go.mod"
+	"github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1"
+	"github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod"
+	"github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod"
+	"github.com/whyrusleeping/go-logging v0.0.1/go.mod"
+	"github.com/whyrusleeping/go-notifier v0.0.0-20170827234753-097c5d47330f/go.mod"
+	"github.com/whyrusleeping/go-sysinfo v0.0.0-20190219211824-4a357d4b90b1"
+	"github.com/whyrusleeping/go-sysinfo v0.0.0-20190219211824-4a357d4b90b1/go.mod"
+	"github.com/whyrusleeping/mafmt v1.2.8/go.mod"
+	"github.com/whyrusleeping/mdns v0.0.0-20180901202407-ef14215e6b30/go.mod"
+	"github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9"
+	"github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9/go.mod"
+	"github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7"
+	"github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7/go.mod"
+	"github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee"
+	"github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee/go.mod"
+	"github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/yuin/goldmark v1.3.5/go.mod"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+	"go.opencensus.io v0.18.0/go.mod"
+	"go.opencensus.io v0.20.1/go.mod"
+	"go.opencensus.io v0.20.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.1/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.23.0"
+	"go.opencensus.io v0.23.0/go.mod"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/atomic v1.5.0/go.mod"
+	"go.uber.org/atomic v1.6.0/go.mod"
+	"go.uber.org/atomic v1.7.0"
+	"go.uber.org/atomic v1.7.0/go.mod"
+	"go.uber.org/dig v1.10.0"
+	"go.uber.org/dig v1.10.0/go.mod"
+	"go.uber.org/fx v1.13.1"
+	"go.uber.org/fx v1.13.1/go.mod"
+	"go.uber.org/goleak v0.10.0/go.mod"
+	"go.uber.org/goleak v1.0.0"
+	"go.uber.org/goleak v1.0.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/multierr v1.3.0/go.mod"
+	"go.uber.org/multierr v1.4.0/go.mod"
+	"go.uber.org/multierr v1.5.0/go.mod"
+	"go.uber.org/multierr v1.6.0"
+	"go.uber.org/multierr v1.6.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"go.uber.org/zap v1.13.0/go.mod"
+	"go.uber.org/zap v1.14.1/go.mod"
+	"go.uber.org/zap v1.15.0/go.mod"
+	"go.uber.org/zap v1.16.0"
+	"go.uber.org/zap v1.16.0/go.mod"
+	"go4.org v0.0.0-20180809161055-417644f6feb5/go.mod"
+	"go4.org v0.0.0-20200411211856-f5505b9728dd"
+	"go4.org v0.0.0-20200411211856-f5505b9728dd/go.mod"
+	"golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+	"golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b/go.mod"
+	"golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
+	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190618222545-ea8f1a30c443/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod"
+	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
+	"golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod"
+	"golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf"
+	"golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/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-20200207192155-f17229e696bd/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-20180702182130-06c8688daad7/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/lint v0.0.0-20201208152925-83fdc39ff7b5"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/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.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/mod v0.4.1/go.mod"
+	"golang.org/x/mod v0.4.2"
+	"golang.org/x/mod v0.4.2/go.mod"
+	"golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod"
+	"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190227160552-c95aed5357e7/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190611141213-3f473d35a33a/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/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-20200520004742-59133d7f0dd7/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-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod"
+	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
+	"golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod"
+	"golang.org/x/net v0.0.0-20210428140749-89ef3d95e781"
+	"golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/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"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/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-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190219092855-153ac476189d/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod"
+	"golang.org/x/sys v0.0.0-20190302025703-b6889370fb10/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod"
+	"golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190524122548-abf6ff778158/go.mod"
+	"golang.org/x/sys v0.0.0-20190524152521-dbbf3f1254d4/go.mod"
+	"golang.org/x/sys v0.0.0-20190526052359-791d8a0f4d09/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
+	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod"
+	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/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-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod"
+	"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod"
+	"golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod"
+	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+	"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
+	"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
+	"golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
+	"golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+	"golang.org/x/sys v0.0.0-20210426080607-c94f62235c83/go.mod"
+	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod"
+	"golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744"
+	"golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.0.0-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.6"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20181130052023-1c3d964395ce/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-20190328211700-ab21143f2384/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-20191029041327-9cc4af7d6b2c/go.mod"
+	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+	"golang.org/x/tools v0.0.0-20191030062658-86caa796c7ab/go.mod"
+	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191114200427-caa0b0f7d508/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-20191216052735-49a3e744a425/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-20200103221440-774c71fcf114/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/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-20200619180055-7c47624df98f/go.mod"
+	"golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod"
+	"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
+	"golang.org/x/tools v0.1.1-0.20210225150353-54dc8c5edb56/go.mod"
+	"golang.org/x/tools v0.1.1"
+	"golang.org/x/tools v0.1.1/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.0.0-20180910000450-7ca32eb868bf/go.mod"
+	"google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod"
+	"google.golang.org/api v0.1.0/go.mod"
+	"google.golang.org/api v0.3.1/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/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.2.0/go.mod"
+	"google.golang.org/appengine v1.3.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"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod"
+	"google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod"
+	"google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod"
+	"google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/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-20190530194941-fb225487d101/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-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/grpc v1.14.0/go.mod"
+	"google.golang.org/grpc v1.16.0/go.mod"
+	"google.golang.org/grpc v1.17.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.22.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.23.1/go.mod"
+	"google.golang.org/grpc v1.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.1/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/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"google.golang.org/protobuf v1.26.0"
+	"google.golang.org/protobuf v1.26.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c"
+	"gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gcfg.v1 v1.2.3/go.mod"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/src-d/go-cli.v0 v0.0.0-20181105080154-d492247bbc0d/go.mod"
+	"gopkg.in/src-d/go-log.v1 v1.0.1/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/warnings.v0 v0.1.2/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.5/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod"
+	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-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"
+	"honnef.co/go/tools v0.0.1-2019.2.3/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"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
+	"sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod"
+	"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
+)
+
+go-module_set_globals
+SRC_URI="https://github.com/ipfs/go-ipfs/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!net-p2p/go-ipfs-bin
+	acct-group/ipfs
+	acct-user/ipfs
+	sys-fs/fuse:0
+"
+
+DOCS=(CHANGELOG.md CONTRIBUTING.md README.md docs/)
+
+#S="${WORKDIR}"
+
+src_compile() {
+	local mygoargs
+	mygoargs=(
+		-tags release
+	)
+	go build "${mygoargs[@]}" -o ipfs ./cmd/ipfs || die
+	go build "${mygoargs[@]}" -o ipfswatch ./cmd/ipfswatch || die
+}
+
+src_test() {
+	go test ./cmd/ipfs/... ./cmd/ipfswatch/... || die
+}
+
+src_install() {
+	dobin ipfs
+	dobin ipfswatch
+	newbashcomp misc/completion/ipfs-completion.bash ipfs
+	einstalldocs
+
+	systemd_dounit "${FILESDIR}/ipfs.service"
+	systemd_newunit "${FILESDIR}/ipfs-at.service" "ipfs@.service"
+
+	newinitd "${FILESDIR}/ipfs.init" ipfs
+	newconfd "${FILESDIR}/ipfs.confd" ipfs
+
+	keepdir /var/log/ipfs
+	fowners -R ipfs:ipfs /var/log/ipfs
+}
+
+pkg_postinst() {
+	elog 'To be able to use the ipfs service you will need to create the ipfs repository'
+	elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)'
+	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 1950a8b36de7..64e47c293849 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/tayga/Manifest b/net-proxy/tayga/Manifest
index 3ebe099a170c..c400884bd72e 100644
--- a/net-proxy/tayga/Manifest
+++ b/net-proxy/tayga/Manifest
@@ -6,5 +6,5 @@ AUX tayga.initd 497 BLAKE2B bb5822727a9df4afa383f89fafd21685e11b21494a6818c90f2b
 DIST tayga-0.9.2.tar.bz2 86022 BLAKE2B 9658960e0a8a4a419851a50f131a7dfb0790d0d188ad95ed5078033bd3a19180964a072dc177616b3451bc23dfa2b998058d73cc6aacfbb4b59c0b9173764440 SHA512 a7a81cccb7c3e32f00f142b1bac598b732dd748772b307561239d695418ada5302182d487e51d1cf95ed736c0180c01db2f33409d0b9343d6587b76cbb3bc573
 EBUILD tayga-0.9.2-r1.ebuild 484 BLAKE2B 2987bf7006a153dde6e5db99d4c2e871b504b4eafa3a39faec03623d6f3b42e94c7de837406baa40491ece824f91da95fa59b4f947145fb3d1e6b05ea5189d0d SHA512 65cbdda9b3f612e25456711c9d0614778b64cddc3264ef9dcf2c314fe57cf73439071296e7fd5e184ac95c0c8e3db7299f3447e73b078ca460700e619a5505cb
 EBUILD tayga-0.9.2-r2.ebuild 618 BLAKE2B 13c8fb4c43e2959a86057e95ef46317019e5efd5aa6ea33d237f776f30087d93b107d09901f14565a03ad6d1824a687d8e236bf6ef081b109252e3ee8c2a5ecf SHA512 a19ba144f2042b3f76b6e012f698552ef2633d181eaf4fc37100816dc69c92eb394acbd89d5b33f9908889260a4b93275ab8f2fcf06029464030662c08bc32cb
-EBUILD tayga-0.9.2-r3.ebuild 730 BLAKE2B 16bf6909d5373c86f17967987648695fc7060e7358d596a9a0c940e5eb50824bd7820991ada9b7e0d1cc3c269ccd92c4739d51e8189b371649ac8d678c5a092b SHA512 1488a22fa7c7cacd4337a8d969540690dc76344325dfb53b473bcf83554400c8e017438cb91b1781a0deeb7241c5088a550f2dda3765d5ae9e221fe294c15f3a
+EBUILD tayga-0.9.2-r3.ebuild 737 BLAKE2B 399db49ba6c083bc3f913ea23b7bc3b0588052a5a4d5d9914fa431723133ea968e940a9ed75ccad83598ab757c58a77bf3d2416d217b1e5ee52a49dd9ab979a5 SHA512 3816c65666786adb267cd290eaa1d7b6a2a37f960b38b848c56c861f99a547605ce1051d153cc884ba28d258cba0d3e0dbcc0ebe7efef8872b0b75b22498ee41
 MISC metadata.xml 236 BLAKE2B 7ba65ccb8874d2a0e4b90d90a6b9b038651fa6655b80f493e13543ba816d44973502dad3853c9a28b615888f73d1d515cede7ccae90730b0858fbac655647c12 SHA512 0c85fb2c4ddc9049999107c26a22bb29fbeff328b17ed430860a1bc5d86fe05ae8439a592bd46551eb6e37cf0e17c8c57bbb6cd71bac6df1e756c6f175abe1b6
diff --git a/net-proxy/tayga/tayga-0.9.2-r3.ebuild b/net-proxy/tayga/tayga-0.9.2-r3.ebuild
index f4c824c4e7b0..a52ba9b60133 100644
--- a/net-proxy/tayga/tayga-0.9.2-r3.ebuild
+++ b/net-proxy/tayga/tayga-0.9.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://www.litech.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
 DEPEND=""
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 2577fd902d13..14ec3333710d 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 477aaf9f7871..0cf7b8d9c3cd 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -5,10 +5,10 @@ DIST libreswan-3.32.tar.gz 4141631 BLAKE2B 37a4cb5c1f52d69b17ba60abd2b7a181d9f55
 DIST libreswan-4.2.tar.gz 3467095 BLAKE2B 0630e9f7cf7ce6182712b4837688fd6b7a1ad1644f167f7ded4e63c7a0aac960a38d903cefbf0189da22b6ddb8c15f217ff3134f220b64020812789c1a196d29 SHA512 290be2e36fb41959c9889597aad8ab5df1edc1999ed7315e8f2e50213de073732c91ad497a2b5634f7bc83bca84089ef9f711420a77309c6cce243f1419a2d0f
 DIST libreswan-4.3.tar.gz 3489322 BLAKE2B 36908bf043fb1085f40b4a5f35ca6dc1563e1a1701f9cced9cb6765094bb2ef603b6d6d4b076a333d540f6454c10b6350d9b8c20de8bc3f27b19915b4cf42b9f SHA512 4687c867d34655cd33997edf4ab7887b2121af41c99d1bd9c794fce1c1eef412f5528de7a338e92a44c1c5d0aaa8fbeb756b89849fcad3deb45a418751e64045
 DIST libreswan-4.4.tar.gz 3503201 BLAKE2B c6c5cb2d7141afe52128e71051fd39b058a06fe4972074c853dbba2937f4c113548392d9c202badac5c1350e4d05f60d4a4d0aed453b1ee91c38a3245b0cf209 SHA512 108b2ac7a36454c48ce448a83ddd81e72d7fbb7cf8b042116d9bd31f195cdab4ccd6311d72af7ab4cc6d054df50d30a6bfc50b56fe7cbfd35d54a68804a6678b
-EBUILD libreswan-3.32-r2.ebuild 3148 BLAKE2B 6cab669035cf47b752d732a6a20817c19a84b7800a2ae87d3eccddcf10e8173473b672550480f29313732e88dfb778372ac40402fb2024b70677cd59efd637f1 SHA512 0e69e88ea4cd5e3bab996dbe98f9acf0597a7b4d3e374ce800c96d5c028cbf855834111f30feaf474ececa452f5f85b591593eb2d7001df93df9cfbc0aca6481
-EBUILD libreswan-3.32-r3.ebuild 3186 BLAKE2B 934834dd11293ee4cb44fb47ce653b14732900d20e25cb19717b50d12aa95c15900dfc798924e4ba3fda6faf0e5cf52bf830b7e74e21b3ef00f463504b82ccd3 SHA512 e934097109c1c80d40d1c37c88fe5b95da12aa74b5a7c54c705238c568344434e69c33fcd2dcbcd67ef83a95a96c2f63950e54928098e7648edf6335d7c64617
-EBUILD libreswan-4.2-r1.ebuild 3256 BLAKE2B b81f41dfd5e11055bdb1d09cc9baa346d3c69e81b8af6409cf53fa5c80fec64d8828e0234bfdb440bd7804108a9f64b06c14f8be0525c15ff8a92cdac7e3b2f5 SHA512 92d40027482f414ac657ce35ae7972a2a21bcebe4723855d5681989df9c7e991005c918309ea4520035ec605184da09485eb24a1968253fae02c265bbf781173
-EBUILD libreswan-4.3-r1.ebuild 3254 BLAKE2B 5fb21f11ed9e7253eb9740f1737fe8cc82053b1c316303061123af49a596cb99448082d55e4e9e11d270a72fcc720bfe9ae49110d9fb75644aad41bee9a4eba9 SHA512 c9f0346125076b49759a39e1b0f2c789d83aa4a722fb8ef3a42c237482b3177e16661408129e50c833ab2af79b12e6c1f3dab602913b28ed70f0d57e3f08695f
-EBUILD libreswan-4.4-r2.ebuild 3255 BLAKE2B 0fd9390917bafbd16448d59dfd5b4011dc30cd09a8980fd5fe6fc9c7d304426d209d85c267af2b3548dd4faba6e6960b19b16894c22c41675c24323710f6f333 SHA512 d4f7ddf6c3308244c664366e7a7b4b72ca326cafc6d2fd7e94d310f6f4035a57d51aee415bb45986b8b98acfcb726125a525a9d4016f96130413ff953befffd3
-EBUILD libreswan-4.4-r3.ebuild 3279 BLAKE2B f96faf835838ee300e76d5f9744720c52c65e8c51fad5b337b3f87d5f6baa0c343eae666fff3f19b16a4a3272b5553096a73d9da5ebf9eb3eda1e04fd0796692 SHA512 41db2c0328c4d270c812f48510205a10b06a2dd62c32fc65104dd01c2cb4dfcd6e4d989e2d657451fbc281d3a3e3c612863fdb0aaae17cb48060bb4a801e310f
+EBUILD libreswan-3.32-r4.ebuild 3191 BLAKE2B 256ae0b37e6efc53174ba4b1e5dce166ec49e719bd3b768f19d40f2a0aa2ecd820ad4f8fa40fc6896e070b70041e50730736be026bf22a439b6d9aa93e44131f SHA512 8f29ae93e948b912dd581b011e9ad03f3069bd1a0dc54ac24341ea75bcf067f61c65d08361145191f25a6b2da9987079514b0bfeb725cb522dce7676290ee60a
+EBUILD libreswan-3.32-r5.ebuild 3229 BLAKE2B ed6d3a1668d2877997a872111c2450d71be046b9acc96949b23405b7f92b178c56c087d1685494d5464f9b1a654e7719f750deeb1b63b5a52b8064060013f917 SHA512 45c5ddcc8e7509f5aa71b4b4e470fc2066b335d81ee304645e5371a873187812fe9bd250192dcfd8c0d89a0f3fbeb3bf90abd8c457d0ac7b7a2b388aa430b216
+EBUILD libreswan-4.2-r2.ebuild 3299 BLAKE2B 9c658f9901211a1a835e9a75b92af351fa572baa175567db55ce80048276d0a152df3a59682d9867fc69ce888b0025bd26347ad51d22d8f533ef425560ecfe1e SHA512 18bebcb26cd8e2933e574eaa3d267dced985b5d0ff6c4b6de3b7d6940eeca66cbf5f3c562e0123ed1abf8b08e0842f353991bb94ae0c75593d6b496ba15153ff
+EBUILD libreswan-4.3-r2.ebuild 3297 BLAKE2B 0349de254a56a9a375f734981326b46a8798a553842fb0030344f09ea797a4cba421dd29bba2a7af7116cac27c5f0290161a694539989c9148daf46610102262 SHA512 8eb0e3189d38b9432d8a879faa96a98536f034743194ceb27ec282562693bd547e4da8bcf162f6e6d0674c555854fcae355f1f7c4b31d1f4fbdfe675fea02342
+EBUILD libreswan-4.4-r4.ebuild 3298 BLAKE2B d580c97b4da77e574ab25a8b163942c302f19c22823799ba780bf9340f34a0cffe7ed2a6cf800891dafebbe564cda92a7b6399a1a4bf9dcfbdbfd028f8bc61fb SHA512 0c075d4992460e9731e183780e11d99f3dc303fff2410b90c019f08c2b317c8a0b6e2ac444044c5570d6578e91275ee0fca57c5a3793fa31d0d9a95ef110a87b
+EBUILD libreswan-4.4-r5.ebuild 3322 BLAKE2B 72d157245c7d6759d704df541614a6194b277b064e631d1d41ba76f9781c50c5b04d8a453787582ab4df58f28773ca55e9e8f8523d84db6da2df25260c5ee7ea SHA512 a6386f61655bc2afb438ec6a10b8d07de6b14d1088ffe7ad7685ecc75e3b409af08c92c046423c2faef3d1ef2066218128f5888d10a1d420024e5b8ea5ebcb29
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.32-r2.ebuild b/net-vpn/libreswan/libreswan-3.32-r2.ebuild
deleted file mode 100644
index a2dd7437d923..000000000000
--- a/net-vpn/libreswan/libreswan-3.32-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="caps curl dnssec ldap pam seccomp selinux systemd test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	>=dev-libs/nss-3.42
-	>=sys-kernel/linux-headers-4.19
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-libs/nss
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-python/setproctitle )
-"
-RDEPEND="${DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-vpn/strongswan
-	selinux? ( sec-policy/selinux-ipsec )
-"
-
-usetf() {
-	usex "$1" true false
-}
-
-PATCHES=( "${FILESDIR}/${PN}-3.30-ip-path.patch" )
-
-src_prepare() {
-	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
-	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC
-	export INC_USRLOCAL=/usr
-	export INC_MANDIR=share/man
-	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=openrc
-	export INC_RCDIRS=
-	export INC_RCDEFAULT=/etc/init.d
-	export USERCOMPILE=
-	export USERLINK=
-	export USE_DNSSEC=$(usetf dnssec)
-	export USE_LABELED_IPSEC=$(usetf selinux)
-	export USE_LIBCAP_NG=$(usetf caps)
-	export USE_LIBCURL=$(usetf curl)
-	export USE_LINUX_AUDIT=$(usetf selinux)
-	export USE_LDAP=$(usetf ldap)
-	export USE_SECCOMP=$(usetf seccomp)
-	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
-	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_XAUTHPAM=$(usetf pam)
-	export DEBUG_CFLAGS=
-	export OPTIMIZE_CFLAGS=
-	export WERROR_CFLAGS=
-}
-
-src_compile() {
-	emake all
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
-}
-
-src_test() {
-	: # integration tests only that require set of kvms to be set up
-}
-
-src_install() {
-	default
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	dodoc -r docs
-
-	find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	local IPSEC_CONFDIR=${ROOT}/etc/ipsec.d
-	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
-		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
-		eend $?
-		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
-	fi
-}
diff --git a/net-vpn/libreswan/libreswan-3.32-r3.ebuild b/net-vpn/libreswan/libreswan-3.32-r3.ebuild
deleted file mode 100644
index 0cae2c0bd2c0..000000000000
--- a/net-vpn/libreswan/libreswan-3.32-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="caps curl dnssec ldap pam seccomp selinux systemd test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	>=dev-libs/nss-3.42
-	>=sys-kernel/linux-headers-4.19
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-libs/nss
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-python/setproctitle )
-"
-RDEPEND="${DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-vpn/strongswan
-	selinux? ( sec-policy/selinux-ipsec )
-"
-
-usetf() {
-	usex "$1" true false
-}
-
-PATCHES=( "${FILESDIR}/${PN}-3.30-ip-path.patch" "${FILESDIR}/${P}-nss-compat.patch" )
-
-src_prepare() {
-	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
-	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC
-	export INC_USRLOCAL=/usr
-	export INC_MANDIR=share/man
-	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=openrc
-	export INC_RCDIRS=
-	export INC_RCDEFAULT=/etc/init.d
-	export USERCOMPILE=
-	export USERLINK=
-	export USE_DNSSEC=$(usetf dnssec)
-	export USE_LABELED_IPSEC=$(usetf selinux)
-	export USE_LIBCAP_NG=$(usetf caps)
-	export USE_LIBCURL=$(usetf curl)
-	export USE_LINUX_AUDIT=$(usetf selinux)
-	export USE_LDAP=$(usetf ldap)
-	export USE_SECCOMP=$(usetf seccomp)
-	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
-	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_XAUTHPAM=$(usetf pam)
-	export DEBUG_CFLAGS=
-	export OPTIMIZE_CFLAGS=
-	export WERROR_CFLAGS=
-}
-
-src_compile() {
-	emake all
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
-}
-
-src_test() {
-	: # integration tests only that require set of kvms to be set up
-}
-
-src_install() {
-	default
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	dodoc -r docs
-
-	find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	local IPSEC_CONFDIR=${ROOT}/etc/ipsec.d
-	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
-		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
-		eend $?
-		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
-	fi
-}
diff --git a/net-vpn/libreswan/libreswan-3.32-r4.ebuild b/net-vpn/libreswan/libreswan-3.32-r4.ebuild
new file mode 100644
index 000000000000..6d019790c6e4
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-3.32-r4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="caps curl dnssec ldap pam seccomp selinux systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	>=dev-libs/nss-3.42
+	>=sys-kernel/linux-headers-4.19
+	virtual/libcrypt:=
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+PATCHES=( "${FILESDIR}/${PN}-3.30-ip-path.patch" )
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export INC_USRLOCAL=/usr
+	export INC_MANDIR=share/man
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=openrc
+	export INC_RCDIRS=
+	export INC_RCDEFAULT=/etc/init.d
+	export USERCOMPILE=
+	export USERLINK=
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_XAUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
+
+	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+	fperms 0600 /etc/ipsec.secrets
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process libreswan.conf
+
+	local IPSEC_CONFDIR=${ROOT}/etc/ipsec.d
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-vpn/libreswan/libreswan-3.32-r5.ebuild b/net-vpn/libreswan/libreswan-3.32-r5.ebuild
new file mode 100644
index 000000000000..fbf53aa5227f
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-3.32-r5.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="caps curl dnssec ldap pam seccomp selinux systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	>=dev-libs/nss-3.42
+	>=sys-kernel/linux-headers-4.19
+	virtual/libcrypt:=
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+PATCHES=( "${FILESDIR}/${PN}-3.30-ip-path.patch" "${FILESDIR}/${P}-nss-compat.patch" )
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export INC_USRLOCAL=/usr
+	export INC_MANDIR=share/man
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=openrc
+	export INC_RCDIRS=
+	export INC_RCDEFAULT=/etc/init.d
+	export USERCOMPILE=
+	export USERLINK=
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_XAUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
+
+	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+	fperms 0600 /etc/ipsec.secrets
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process libreswan.conf
+
+	local IPSEC_CONFDIR=${ROOT}/etc/ipsec.d
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-vpn/libreswan/libreswan-4.2-r1.ebuild b/net-vpn/libreswan/libreswan-4.2-r1.ebuild
deleted file mode 100644
index d22b2acaad21..000000000000
--- a/net-vpn/libreswan/libreswan-4.2-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	>=dev-libs/nss-3.42
-	>=sys-kernel/linux-headers-4.19
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-libs/nss
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-python/setproctitle )
-"
-RDEPEND="${DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-vpn/strongswan
-	selinux? ( sec-policy/selinux-ipsec )
-"
-
-usetf() {
-	usex "$1" true false
-}
-
-PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
-
-src_prepare() {
-	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
-	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC
-	export PREFIX=/usr
-	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=openrc
-	export INITDDIRS=
-	export INITDDIR_DEFAULT=/etc/init.d
-	export USERCOMPILE=${CFLAGS}
-	export USERLINK=${LDFLAGS}
-	export USE_DNSSEC=$(usetf dnssec)
-	export USE_LABELED_IPSEC=$(usetf selinux)
-	export USE_LIBCAP_NG=$(usetf caps)
-	export USE_LIBCURL=$(usetf curl)
-	export USE_LINUX_AUDIT=$(usetf selinux)
-	export USE_LDAP=$(usetf ldap)
-	export USE_NM=$(usetf networkmanager)
-	export USE_SECCOMP=$(usetf seccomp)
-	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
-	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_XAUTHPAM=$(usetf pam)
-	export DEBUG_CFLAGS=
-	export OPTIMIZE_CFLAGS=
-	export WERROR_CFLAGS=
-}
-
-src_compile() {
-	emake all
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
-}
-
-src_test() {
-	: # integration tests only that require set of kvms to be set up
-}
-
-src_install() {
-	default
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	keepdir /var/lib/ipsec/nss
-	fperms 0700 /var/lib/ipsec/nss
-
-	dodoc -r docs
-
-	find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
-	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
-		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
-		eend $?
-		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
-	fi
-}
diff --git a/net-vpn/libreswan/libreswan-4.2-r2.ebuild b/net-vpn/libreswan/libreswan-4.2-r2.ebuild
new file mode 100644
index 000000000000..ef6abcc59657
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-4.2-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	>=dev-libs/nss-3.42
+	>=sys-kernel/linux-headers-4.19
+	virtual/libcrypt:=
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export PREFIX=/usr
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=openrc
+	export INITDDIRS=
+	export INITDDIR_DEFAULT=/etc/init.d
+	export USERCOMPILE=${CFLAGS}
+	export USERLINK=${LDFLAGS}
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_NM=$(usetf networkmanager)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_XAUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
+
+	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+	fperms 0600 /etc/ipsec.secrets
+
+	keepdir /var/lib/ipsec/nss
+	fperms 0700 /var/lib/ipsec/nss
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process libreswan.conf
+
+	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-vpn/libreswan/libreswan-4.3-r1.ebuild b/net-vpn/libreswan/libreswan-4.3-r1.ebuild
deleted file mode 100644
index 8e5ba4775e4d..000000000000
--- a/net-vpn/libreswan/libreswan-4.3-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	>=dev-libs/nss-3.42
-	>=sys-kernel/linux-headers-4.19
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-libs/nss
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-python/setproctitle )
-"
-RDEPEND="${DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-vpn/strongswan
-	selinux? ( sec-policy/selinux-ipsec )
-"
-
-usetf() {
-	usex "$1" true false
-}
-
-PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
-
-src_prepare() {
-	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
-	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC
-	export PREFIX=/usr
-	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=openrc
-	export INITDDIRS=
-	export INITDDIR_DEFAULT=/etc/init.d
-	export USERCOMPILE=${CFLAGS}
-	export USERLINK=${LDFLAGS}
-	export USE_DNSSEC=$(usetf dnssec)
-	export USE_LABELED_IPSEC=$(usetf selinux)
-	export USE_LIBCAP_NG=$(usetf caps)
-	export USE_LIBCURL=$(usetf curl)
-	export USE_LINUX_AUDIT=$(usetf selinux)
-	export USE_LDAP=$(usetf ldap)
-	export USE_NM=$(usetf networkmanager)
-	export USE_SECCOMP=$(usetf seccomp)
-	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
-	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_XAUTHPAM=$(usetf pam)
-	export DEBUG_CFLAGS=
-	export OPTIMIZE_CFLAGS=
-	export WERROR_CFLAGS=
-}
-
-src_compile() {
-	emake all
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
-}
-
-src_test() {
-	: # integration tests only that require set of kvms to be set up
-}
-
-src_install() {
-	default
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	keepdir /var/lib/ipsec/nss
-	fperms 0700 /var/lib/ipsec/nss
-
-	dodoc -r docs
-
-	find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
-	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
-		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
-		eend $?
-		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
-	fi
-}
diff --git a/net-vpn/libreswan/libreswan-4.3-r2.ebuild b/net-vpn/libreswan/libreswan-4.3-r2.ebuild
new file mode 100644
index 000000000000..b796e7383a4a
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-4.3-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	>=dev-libs/nss-3.42
+	>=sys-kernel/linux-headers-4.19
+	virtual/libcrypt:=
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export PREFIX=/usr
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=openrc
+	export INITDDIRS=
+	export INITDDIR_DEFAULT=/etc/init.d
+	export USERCOMPILE=${CFLAGS}
+	export USERLINK=${LDFLAGS}
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_NM=$(usetf networkmanager)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_XAUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
+
+	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+	fperms 0600 /etc/ipsec.secrets
+
+	keepdir /var/lib/ipsec/nss
+	fperms 0700 /var/lib/ipsec/nss
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process libreswan.conf
+
+	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-vpn/libreswan/libreswan-4.4-r2.ebuild b/net-vpn/libreswan/libreswan-4.4-r2.ebuild
deleted file mode 100644
index 5ab87e049ce3..000000000000
--- a/net-vpn/libreswan/libreswan-4.4-r2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	>=dev-libs/nss-3.42
-	>=sys-kernel/linux-headers-4.19
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-libs/nss
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-python/setproctitle )
-"
-RDEPEND="${DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-vpn/strongswan
-	selinux? ( sec-policy/selinux-ipsec )
-"
-
-usetf() {
-	usex "$1" true false
-}
-
-PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
-
-src_prepare() {
-	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
-	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC
-	export PREFIX=/usr
-	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=openrc
-	export INITDDIRS=
-	export INITDDIR_DEFAULT=/etc/init.d
-	export USERCOMPILE=${CFLAGS}
-	export USERLINK=${LDFLAGS}
-	export USE_DNSSEC=$(usetf dnssec)
-	export USE_LABELED_IPSEC=$(usetf selinux)
-	export USE_LIBCAP_NG=$(usetf caps)
-	export USE_LIBCURL=$(usetf curl)
-	export USE_LINUX_AUDIT=$(usetf selinux)
-	export USE_LDAP=$(usetf ldap)
-	export USE_NM=$(usetf networkmanager)
-	export USE_SECCOMP=$(usetf seccomp)
-	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
-	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_AUTHPAM=$(usetf pam)
-	export DEBUG_CFLAGS=
-	export OPTIMIZE_CFLAGS=
-	export WERROR_CFLAGS=
-}
-
-src_compile() {
-	emake all
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
-}
-
-src_test() {
-	: # integration tests only that require set of kvms to be set up
-}
-
-src_install() {
-	default
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	keepdir /var/lib/ipsec/nss
-	fperms 0700 /var/lib/ipsec/nss
-
-	dodoc -r docs
-
-	find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
-	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
-		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
-		eend $?
-		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
-	fi
-}
diff --git a/net-vpn/libreswan/libreswan-4.4-r3.ebuild b/net-vpn/libreswan/libreswan-4.4-r3.ebuild
deleted file mode 100644
index 36d74c43e4f4..000000000000
--- a/net-vpn/libreswan/libreswan-4.4-r3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	>=dev-libs/nss-3.42
-	>=sys-kernel/linux-headers-4.19
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-libs/nss
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-python/setproctitle )
-"
-RDEPEND="${DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-vpn/strongswan
-	selinux? ( sec-policy/selinux-ipsec )
-"
-
-usetf() {
-	usex "$1" true false
-}
-
-PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
-
-src_prepare() {
-	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
-	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC
-	export PREFIX=/usr
-	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=$(usex systemd systemd openrc)
-	export INITDDIRS=
-	export INITDDIR_DEFAULT=/etc/init.d
-	export USERCOMPILE=${CFLAGS}
-	export USERLINK=${LDFLAGS}
-	export USE_DNSSEC=$(usetf dnssec)
-	export USE_LABELED_IPSEC=$(usetf selinux)
-	export USE_LIBCAP_NG=$(usetf caps)
-	export USE_LIBCURL=$(usetf curl)
-	export USE_LINUX_AUDIT=$(usetf selinux)
-	export USE_LDAP=$(usetf ldap)
-	export USE_NM=$(usetf networkmanager)
-	export USE_SECCOMP=$(usetf seccomp)
-	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
-	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_AUTHPAM=$(usetf pam)
-	export DEBUG_CFLAGS=
-	export OPTIMIZE_CFLAGS=
-	export WERROR_CFLAGS=
-}
-
-src_compile() {
-	emake all
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
-}
-
-src_test() {
-	: # integration tests only that require set of kvms to be set up
-}
-
-src_install() {
-	default
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	keepdir /var/lib/ipsec/nss
-	fperms 0700 /var/lib/ipsec/nss
-
-	dodoc -r docs
-
-	find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
-	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
-		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
-		eend $?
-		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
-	fi
-}
diff --git a/net-vpn/libreswan/libreswan-4.4-r4.ebuild b/net-vpn/libreswan/libreswan-4.4-r4.ebuild
new file mode 100644
index 000000000000..cf531fec3296
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-4.4-r4.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	>=dev-libs/nss-3.42
+	>=sys-kernel/linux-headers-4.19
+	virtual/libcrypt:=
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export PREFIX=/usr
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=openrc
+	export INITDDIRS=
+	export INITDDIR_DEFAULT=/etc/init.d
+	export USERCOMPILE=${CFLAGS}
+	export USERLINK=${LDFLAGS}
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_NM=$(usetf networkmanager)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_AUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
+
+	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+	fperms 0600 /etc/ipsec.secrets
+
+	keepdir /var/lib/ipsec/nss
+	fperms 0700 /var/lib/ipsec/nss
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process libreswan.conf
+
+	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-vpn/libreswan/libreswan-4.4-r5.ebuild b/net-vpn/libreswan/libreswan-4.4-r5.ebuild
new file mode 100644
index 000000000000..06f4baa533ab
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-4.4-r5.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	>=dev-libs/nss-3.42
+	>=sys-kernel/linux-headers-4.19
+	virtual/libcrypt:=
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export PREFIX=/usr
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=$(usex systemd systemd openrc)
+	export INITDDIRS=
+	export INITDDIR_DEFAULT=/etc/init.d
+	export USERCOMPILE=${CFLAGS}
+	export USERLINK=${LDFLAGS}
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_NM=$(usetf networkmanager)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_AUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
+
+	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+	fperms 0600 /etc/ipsec.secrets
+
+	keepdir /var/lib/ipsec/nss
+	fperms 0700 /var/lib/ipsec/nss
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process libreswan.conf
+
+	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 5ac5fc475251..413b0e59c5bc 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -5,6 +5,6 @@ AUX openvpn-2.5.0-auth-pam-missing-header.patch 339 BLAKE2B 8aa56f7d475c4d7a1f0d
 AUX openvpn-2.5.2-detect-python-rst2man.patch 554 BLAKE2B e379af57dcc25766803043c40ac2128e2649acb4594ba6c4f55967e5d38dc6fd3190d519b6e9ea81656eb9e5344043e6cb84e155059337282913b60a58d09eca SHA512 e09307c2841a8836d12e1973baaa5e61fd9371e6628dcc858cfa9111b8907f8e6ad73073552655292f0f9d23b8850aa821d3a1520b4b11c312a8beb2225c6ae9
 AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6b67450cf8b397dba8fd735931790648c1d485c149a55ffcbf095623b491b8a827eccab9 SHA512 35201b0e60ad20358080007e595eb4f96d186ba8e88f0485c55d164c28e3d78a12f3e09347ba3d76abb9b8b03fb4a53664bd74ab484be1548090022b956925fd
 DIST openvpn-2.5.2.tar.gz 1830763 BLAKE2B d1c5fa97b3a9168e8715a7cf926b581e054d1d8ac905dcb78e91b9e7f2ea2abf2f03a02e6b4ee10184e810ebb871f4fc638834848eb3b4a9122b177705382fe8 SHA512 5811d26b32e7f258dc1f7ed704d28f9eb03200b54a128e4cb5dfa37ace5113d7841830fc04e1c5f69a138141d0f6f0ca6cb7fc3c39d67456e476eb4c45102be1
-EBUILD openvpn-2.5.2.ebuild 5007 BLAKE2B a276f607f7defd11de4f19f61a7a1a2e21a3d9b929f748b9b1c825033b40578a4106eda5cb66e7a32e999ce04e5506398a2ffbfeab7ebc70c703b9c6b129566d SHA512 9fdb0645c697ca50f8bf7226b3f2423280091a971d31bca972c0b02df59583d7cf9e16f223b34873ca6143c8321e3210a33b0b94e882a1f0002f8ea748257742
-EBUILD openvpn-9999.ebuild 4986 BLAKE2B 5eebd395ec22387351e2dea239b61ca22cbcc0c7cff64f2de4c7bd4bac9cb8c99af4546aa986a67cd11efe524e3db8e57a7bac95da7b22ebfe3f1e0bfdf8beb4 SHA512 279bc764dfda1887a9259c84a226764784ac31d7d8dc85ad45ab1dde5ad05a26f9c0c1556299cd2d3687299a8c89d00d19c18113c94145d59c914885fbde19e7
+EBUILD openvpn-2.5.2-r2.ebuild 5073 BLAKE2B 6e5af48ff12ad50db367e306e38055254196e389a6f4a5cc6b997d13ed86c16f3b19365b83cca7171a63bf3e2ee307d5c91b7a055abeb61196eeb33b02e753fc SHA512 2723e6954ddaa4bf2e62f53901267f59bf845443b5cb9ff0bdf15f15d4cdc197c52c98a50869db7e9f91f32cb56c83556e0ceda21c455afbf176e91f1d3e9177
+EBUILD openvpn-9999.ebuild 5027 BLAKE2B ee349a52108d8e8952b3f1053893f85a37486628e58fe88d1574137a9bc7abbe8972e6cdc117b36588e53ce2cc9a0edb848a960258f02189c45302158b7080b8 SHA512 8b4d1b69f7a5a223d33e51fa3edf1328ae5a15eca3040be1fc1c609865bc23dec2571eda4a92b2c32465979dba286d6ccc69bc7f0f452e40a274330d5d015ee2
 MISC metadata.xml 1083 BLAKE2B 5642cd5be7d4d53f5cc3b1e501f3a22c875ceee114cc2c4d5fa45f96983593d8f2c5b60a30c396187ad7bb2adb36d6d5c03aef8530d450ab86df589a591ae95b SHA512 91a8c6eda7d21dbf7619b49b757d9016ac94ff6c9e87ef5684a01d5138d8f84cfcc525fd62729ceac85394e82cec3931716f6dfaae59cfc3eda804bd968ee428
diff --git a/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild b/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild
new file mode 100644
index 000000000000..e09e6ac634dc
--- /dev/null
+++ b/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd linux-info tmpfiles
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+HOMEPAGE="https://openvpn.net/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
+	EGIT_SUBMODULES=(-cmocka)
+
+	inherit git-r3
+else
+	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
+IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	^^ ( openssl mbedtls )
+	pkcs11? ( !mbedtls )
+	!plugins? ( !pam !down-root )
+	inotify? ( plugins )
+"
+
+CDEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] )
+	)
+	lz4? ( app-arch/lz4 )
+	lzo? ( >=dev-libs/lzo-1.07 )
+	mbedtls? ( net-libs/mbedtls:= )
+	openssl? ( >=dev-libs/openssl-0.9.8:0= )
+	pam? ( sys-libs/pam )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
+	systemd? ( sys-apps/systemd )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	test? ( dev-util/cmocka )
+"
+RDEPEND="${CDEPEND}
+	acct-group/openvpn
+	acct-user/openvpn
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+if [[ ${PV} = "9999" ]]; then
+	BDEPEND+=" dev-python/docutils"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/openvpn-2.5.0-auth-pam-missing-header.patch
+	"${FILESDIR}"/openvpn-2.5.2-detect-python-rst2man.patch
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~TUN"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local -a myeconfargs
+
+	if ! use mbedtls; then
+		myeconfargs+=(
+			$(use_enable pkcs11)
+		)
+	fi
+	myeconfargs+=(
+		$(use_enable inotify async-push)
+		--with-crypto-library=$(usex mbedtls mbedtls openssl)
+		$(use_enable lz4)
+		$(use_enable lzo)
+		$(use_enable plugins)
+		$(use_enable iproute2)
+		$(use_enable pam plugin-auth-pam)
+		$(use_enable down-root plugin-down-root)
+		$(use_enable systemd)
+	)
+	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
+		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
+		IPROUTE=$(usex iproute2 '/bin/ip' '') \
+		econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	local -x RUN_SUDO=false
+
+	make check || die "top-level tests failed"
+	pushd tests/unit_tests &>/dev/null || die
+	make check || die "unit tests failed"
+	popd &>/dev/null || die
+}
+
+src_install() {
+	default
+
+	find "${ED}/usr" -name '*.la' -delete || die
+
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README README.IPv6
+
+	# Install some helper scripts
+	keepdir /etc/openvpn
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
+
+	# install examples, controlled by the respective useflag
+	if use examples ; then
+		# (is the below comment relevant anymore?)
+		## dodoc does not supportly support directory traversal, #15193
+		docinto examples
+		dodoc -r sample contrib
+	fi
+
+	# https://bugs.gentoo.org/755680#c3
+	doman doc/openvpn.8
+}
+
+pkg_postinst() {
+	tmpfiles_process openvpn.conf
+
+	if use x64-macos; then
+		elog "You might want to install tuntaposx for TAP interface support:"
+		elog "http://tuntaposx.sourceforge.net"
+	fi
+
+	if systemd_is_booted ||  has_version sys-apps/systemd; then
+		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
+		elog  ""
+		elog "server:"
+		elog ""
+		elog "- Place your server configuration file in /etc/openvpn/server"
+		elog "- Use the openvpn-server@.service like so"
+		elog "systemctl start openvpn-server@{Server-config}"
+		elog ""
+		elog "client:"
+		elog ""
+		elog "- Place your client configuration file in /etc/openvpn/client"
+		elog "- Use the openvpn-client@.service like so:"
+		elog "systemctl start openvpn-client@{Client-config}"
+	else
+		elog "The openvpn init script expects to find the configuration file"
+		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+		elog ""
+		elog "To create more VPNs, simply create a new .conf file for it and"
+		elog "then create a symlink to the openvpn init script from a link called"
+		elog "openvpn.newconfname - like so"
+		elog "	 cd /etc/openvpn"
+		elog "	 ${EDITOR##*/} foo.conf"
+		elog "	 cd /etc/init.d"
+		elog "	 ln -s openvpn openvpn.foo"
+		elog ""
+		elog "You can then treat openvpn.foo as any other service, so you can"
+		elog "stop one vpn and start another if you need to."
+	fi
+
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+		ewarn ""
+		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+		ewarn "a client by our init script and as such we force up,down scripts."
+		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+		ewarn "can move your scripts to."
+	fi
+
+	if use plugins ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
+	fi
+}
diff --git a/net-vpn/openvpn/openvpn-2.5.2.ebuild b/net-vpn/openvpn/openvpn-2.5.2.ebuild
deleted file mode 100644
index 97c64cdc1ea5..000000000000
--- a/net-vpn/openvpn/openvpn-2.5.2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd linux-info
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-HOMEPAGE="https://openvpn.net/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
-	EGIT_SUBMODULES=(-cmocka)
-
-	inherit git-r3
-else
-	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
-IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( openssl mbedtls )
-	pkcs11? ( !mbedtls )
-	!plugins? ( !pam !down-root )
-	inotify? ( plugins )
-"
-
-CDEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] )
-	)
-	lz4? ( app-arch/lz4 )
-	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( >=dev-libs/openssl-0.9.8:0= )
-	pam? ( sys-libs/pam )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
-	test? ( dev-util/cmocka )
-"
-RDEPEND="${CDEPEND}
-	acct-group/openvpn
-	acct-user/openvpn
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-if [[ ${PV} = "9999" ]]; then
-	BDEPEND+=" dev-python/docutils"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/openvpn-2.5.0-auth-pam-missing-header.patch
-	"${FILESDIR}"/openvpn-2.5.2-detect-python-rst2man.patch
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~TUN"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local -a myeconfargs
-
-	if ! use mbedtls; then
-		myeconfargs+=(
-			$(use_enable pkcs11)
-		)
-	fi
-	myeconfargs+=(
-		$(use_enable inotify async-push)
-		--with-crypto-library=$(usex mbedtls mbedtls openssl)
-		$(use_enable lz4)
-		$(use_enable lzo)
-		$(use_enable plugins)
-		$(use_enable iproute2)
-		$(use_enable pam plugin-auth-pam)
-		$(use_enable down-root plugin-down-root)
-		$(use_enable systemd)
-	)
-	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
-		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
-		IPROUTE=$(usex iproute2 '/bin/ip' '') \
-		econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	local -x RUN_SUDO=false
-
-	make check || die "top-level tests failed"
-	pushd tests/unit_tests &>/dev/null || die
-	make check || die "unit tests failed"
-	popd &>/dev/null || die
-}
-
-src_install() {
-	default
-
-	find "${ED}/usr" -name '*.la' -delete || die
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		docinto /usr/share/doc/${PF}/examples
-		dodoc -r sample contrib
-	fi
-
-	# https://bugs.gentoo.org/755680#c3
-	doman doc/openvpn.8
-}
-
-pkg_postinst() {
-	if use x64-macos; then
-		elog "You might want to install tuntaposx for TAP interface support:"
-		elog "http://tuntaposx.sourceforge.net"
-	fi
-
-	if systemd_is_booted ||  has_version sys-apps/systemd; then
-		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
-		elog  ""
-		elog "server:"
-		elog ""
-		elog "- Place your server configuration file in /etc/openvpn/server"
-		elog "- Use the openvpn-server@.service like so"
-		elog "systemctl start openvpn-server@{Server-config}"
-		elog ""
-		elog "client:"
-		elog ""
-		elog "- Place your client configuration file in /etc/openvpn/client"
-		elog "- Use the openvpn-client@.service like so:"
-		elog "systemctl start openvpn-client@{Client-config}"
-	else
-		elog "The openvpn init script expects to find the configuration file"
-		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-		elog ""
-		elog "To create more VPNs, simply create a new .conf file for it and"
-		elog "then create a symlink to the openvpn init script from a link called"
-		elog "openvpn.newconfname - like so"
-		elog "	 cd /etc/openvpn"
-		elog "	 ${EDITOR##*/} foo.conf"
-		elog "	 cd /etc/init.d"
-		elog "	 ln -s openvpn openvpn.foo"
-		elog ""
-		elog "You can then treat openvpn.foo as any other service, so you can"
-		elog "stop one vpn and start another if you need to."
-	fi
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
-	fi
-}
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index ac64c3e3d3c7..d5d643edb2fb 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic systemd linux-info
+inherit autotools flag-o-matic systemd linux-info tmpfiles
 
 DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
 HOMEPAGE="https://openvpn.net/"
@@ -139,6 +139,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process openvpn.conf
+
 	if use x64-macos ; then
 		elog "You might want to install tuntaposx for TAP interface support:"
 		elog "http://tuntaposx.sourceforge.net"
diff --git a/net-vpn/tailscale/Manifest b/net-vpn/tailscale/Manifest
index 6d0d63869fb2..14d2c0f87dce 100644
--- a/net-vpn/tailscale/Manifest
+++ b/net-vpn/tailscale/Manifest
@@ -1298,10 +1298,10 @@ DIST tailscale-1.4.0.tar.gz 485277 BLAKE2B e32b886679c70831a45677abb8763218ac1f9
 DIST tailscale-1.4.1.tar.gz 485377 BLAKE2B 54a34f96b63179d5ee1951bddb6f21ed5724064a5d04def1ffd88624315456020ffc915c4bd2ac79d750b979f4075c848218beff32446dedc60624dd80a93ac5 SHA512 ce15f4427fb988cdedbd58100a7a5ee8850cb9810c0532ba5ba33c355f764bcab41d8e6b258dd817efe41e2aefa4b3311fec3c3633e310333bdcf6ec7d4535f5
 DIST tailscale-1.4.5.tar.gz 490763 BLAKE2B 99fe2db3afc3856b2a9ecf36e57fee294599144b28c530d03e526aa595d40ffefa98e280a381dd654ee0e043dad7d542ff53559c7fc28c4319ae81fdab84fccc SHA512 965613fe2d73597f84c803d06c4b4210d39854f3694b5069788d4c4e037a8702824225e94c1c7f5bb65a246702e6bde2236308674f61b8b3cf47c04019d7af2a
 DIST tailscale-1.8.7.tar.gz 658120 BLAKE2B e3a7c5bebb0ed467dbea2869ab939dee7a5f31720531a4931654d2b00f8d445ad598493dc757e10bc5246daa6d105c40a6994394c2f00b01bf12e2edf3818c41 SHA512 549cedcb54b65cee7510d6fd067d99f05b9dce63a075bd5afa02eecd93f4150c7f8c5af48141e4d763a7cf5ce2db132039c0ad4b17980c8399a7960186f546cd
-EBUILD tailscale-1.10.0.ebuild 54381 BLAKE2B 625acc1cd317125e9b5ada9ce13439516298cec9f0e72a969a7640a99120d9902f6e3896186007e594da4476746398a11ea0e43405a90b7c9e1df0f745b68f13 SHA512 29048d1fde79329be4d02c6d3b69eec7e26a6784153020b7bc269f0741a7f6a8b77972293c8aa31a92f45730db81ae5cd188e0164370336241e6283254a766f9
-EBUILD tailscale-1.2.10-r1.ebuild 12390 BLAKE2B c48c840e79156070c88b83259386eb3a86205a82d5700b28abf70acdba97feca79f4d2cb7376be59ab2967c4aa966ce073aca8bbc572e01fef813e24064aa2dc SHA512 24ef695b6a03563cc50b4bebe6f6719663eacb676bea795b5d5d60094c8ea3d0f208965399e60e647ce876847366826e4f8eb24f0c917ac4a0a7d8807711a473
-EBUILD tailscale-1.4.0.ebuild 34293 BLAKE2B 8ffff47444df394a43bb2d4169805d1f377f450908bff8618029eb8161b4720c9c473b57c0a59d0a014be8951d7abf10300bbeca6f96f8da8f17e467c6d571d7 SHA512 34359fa814693467551d405de78eb256ff1c04619b875ede5d59d4166df30ceadef38813c4a39dc212cc9682a5cfcf9a9364cda5188c33b5ba953737d5d86107
-EBUILD tailscale-1.4.1.ebuild 34293 BLAKE2B 83189a02b318c1157047cb426dc5a08fd94a6d608f670cf84ffc155af5b3605a7d207f022b7a350d810a8168ce0a137bb599c63f952df0df08284a2b19447eac SHA512 d3b8901ce945858be02974870b10ffecfe8b7e9893948f9221c761af5f2f6343a3956c0ff708278194b6fcc9a0ac5d0f3759818e9f9da33bef8152eaf197a2e2
-EBUILD tailscale-1.4.5.ebuild 34293 BLAKE2B 0eeafa60586977d5a4361b8936e71cd0218411d23a45a65400c8e4f25ad5b8ed2cb34b1088e6ba523468e29d9e83b4cf09c3de727ed3da463b8b37501f1c825e SHA512 5030543c949f11765f9c610bc19a7d51fc62374b3d3973cec3c7cd5e039c3a372001e95463aede905dd03aff5cbc89655221a9a50eae73b413575d75d61aec31
-EBUILD tailscale-1.8.7.ebuild 15367 BLAKE2B 4e4bbb7e66a7e996f5aeb8554c2a71a49644cea69424f4a7d744fcc4bcff014c5bc005f0c78d77adc36c27d546a6dc3afc781ab6c72063e5cdddc67f4da5c9ba SHA512 6f4173c0a6a1507216bf4237324422a144583beabbcd7565bbe87942c9137e8148aba248f91f9c1b48cbf51206b4d56b736f6452dad8ed7bda592196bf5fd812
+EBUILD tailscale-1.10.0.ebuild 54430 BLAKE2B 526f96637e1853ed61f01d1cd578a02ce8f5766efd7f86d7de0791d9f48a0f7b0438f45f0d604b5bec04f5659d7f049ddce34fe5ebd73254215eed1b41a4bebd SHA512 015f52024ddd0ae942b28b1fe080fb16aa7300d253638c9ce4328027633891bd859c0f17c53e7bae0e10591968cc208174abaf4a502b2e2755f1ee7e9d020615
+EBUILD tailscale-1.2.10-r1.ebuild 12444 BLAKE2B cf2adfaeaad1a68887df9895acf09803a48208be0975e4f90d624b1cdd35a1c1f98b4ef7dd36fe64be6cafa2275bd9cb404a1769f78eb70c447eafd3e63e00c5 SHA512 a19d95805841f81b5d70feaca87b52c1364819d6dcf3ddbc3efb31a1c958cb8427bd5dcb18ddd045c00c018f9a68b1d0a0e58afa5d3c60b3c7956c296cc39ccb
+EBUILD tailscale-1.4.0.ebuild 34347 BLAKE2B ff31ce1fe75cd127c5a6ff276993649274fe803b4dcde7f4a21a07fe1dab8f79bac6fdf8b456c3fab4ff0310600c4020793d64346680003864af38ab33bb0992 SHA512 74ef73d5948cf0e174c93a8026183ead0aa9e60c10281da0ee0de342eb2ae23ec3b860e6bb8a707fd3e5e0c88caecc3a3cb4fb29b3c2a44817b10f7fdf591df0
+EBUILD tailscale-1.4.1.ebuild 34347 BLAKE2B dc23f417a8c42233f7239c0288b20fe6858957328b1a2526d3be6808bf5c2773a5f16b7060a156bd314218ce7da024f4b5f336f7c95d769faab6b2b308cd9cbf SHA512 4acca4d99f6bfc8481f620f56195f97cc35a38c442dea0a40d862c60b9e70626a1a1d80c0cf0bc730b88335dfb47891e3ca681b11b8d8327601a6b1053dfd84e
+EBUILD tailscale-1.4.5.ebuild 34347 BLAKE2B f30eff0606a87e187d26d8c98ebaf74be6a4cdd1935dc56ce57260b702d9bc0c5f572002fe1f3cf2681ad49bf5761cfffe6b4b7b0c7fb7e156a8c66e59751d2d SHA512 2b5029597b464005fc77d134f3cbc408e14a2a38cbcbefdd0b925beddc678fc347951ad5e8e35ff69403b71fc3441213c1ec89f6744e5dad74c92b48f8a0fe89
+EBUILD tailscale-1.8.7.ebuild 15416 BLAKE2B b50e70bbc6404a8e1c3bd69a32f9d8de30299951c15873b2cdadada2497ce1684c676f9fb63f0192ce1728800ef98334eca61f2730c7b0263ce0538bc4352ca3 SHA512 5213d6ba6c3c29f673cdd4bd3031c4e669e4ca3d21dd569393e3a20cd0ba9b5469bd20edc4fe50e329276e0b296fffcff884b705c296531eaaa7cf7ff691e6e8
 MISC metadata.xml 358 BLAKE2B 22d5d18f91742e203070183a10f77a34a2d76c2cb0146a1d5115c168eae27c9030c2ea852a43090bd3a060e45f0b32b1ed00df43c98895a378926ca6ba226825 SHA512 2e84721353876b58131a9b68e832517be62a9ef2d14e8bd7ad4169c4480fdc630ca11c4c9e62cb1ec986913a7531f3efa209cb1ab4538408c0a337650064f789
diff --git a/net-vpn/tailscale/tailscale-1.10.0.ebuild b/net-vpn/tailscale/tailscale-1.10.0.ebuild
index ea23773ccebe..e19f4d2e8726 100644
--- a/net-vpn/tailscale/tailscale-1.10.0.ebuild
+++ b/net-vpn/tailscale/tailscale-1.10.0.ebuild
@@ -1024,3 +1024,7 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-vpn/tailscale/tailscale-1.2.10-r1.ebuild b/net-vpn/tailscale/tailscale-1.2.10-r1.ebuild
index 15d91103c2fa..98c2720f0238 100644
--- a/net-vpn/tailscale/tailscale-1.2.10-r1.ebuild
+++ b/net-vpn/tailscale/tailscale-1.2.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -253,3 +253,7 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-vpn/tailscale/tailscale-1.4.0.ebuild b/net-vpn/tailscale/tailscale-1.4.0.ebuild
index 69a4661f9fad..94bf9df62b6e 100644
--- a/net-vpn/tailscale/tailscale-1.4.0.ebuild
+++ b/net-vpn/tailscale/tailscale-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -628,3 +628,7 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-vpn/tailscale/tailscale-1.4.1.ebuild b/net-vpn/tailscale/tailscale-1.4.1.ebuild
index ad7708552184..f1c534c69b6c 100644
--- a/net-vpn/tailscale/tailscale-1.4.1.ebuild
+++ b/net-vpn/tailscale/tailscale-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -628,3 +628,7 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-vpn/tailscale/tailscale-1.4.5.ebuild b/net-vpn/tailscale/tailscale-1.4.5.ebuild
index 471f008a1171..120700e29cbf 100644
--- a/net-vpn/tailscale/tailscale-1.4.5.ebuild
+++ b/net-vpn/tailscale/tailscale-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -628,3 +628,7 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-vpn/tailscale/tailscale-1.8.7.ebuild b/net-vpn/tailscale/tailscale-1.8.7.ebuild
index d258d5895192..7b4248c4540b 100644
--- a/net-vpn/tailscale/tailscale-1.8.7.ebuild
+++ b/net-vpn/tailscale/tailscale-1.8.7.ebuild
@@ -307,3 +307,7 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index aea3bbaa8052..ffccaded4a1c 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/airspy/Manifest b/net-wireless/airspy/Manifest
index 9e5dfa0b3990..4d920eaa9bb1 100644
--- a/net-wireless/airspy/Manifest
+++ b/net-wireless/airspy/Manifest
@@ -1,4 +1,6 @@
+DIST airspy-1.0.10.tar.gz 238863 BLAKE2B 1cd257140094205ed5c9e574b6b77b297ff88d50e3dada639d6daea4aa6969a9470f7e68d505a88e04dd42b978263b83abb0d8f37399fdf0093823b9c24150a7 SHA512 61ea82e8b9892053b6fdccd7de05f248145bb5da0d4f63bb31d3a815fa739b248662a875d53d88de260cfa2a98ef266ea165ba50397e67822ea21ca273c93b24
 DIST airspy-1.0.9.tar.gz 216852 BLAKE2B 14cc4743b4398fec6fc6defe257b38c620ccca812c8e4da580fe78a99ac0e7a1b104cc05e83ba7b1423586e182da1a77d152485c515f41b4a52ff533e19d9903 SHA512 95030a39f687b0b72115d0279725845637240d8e8639fc2fb7b4b79d24be7aec85243d6d0e0643af358e7b4cf1e81b55b3c093b888411a47c7ed8a59a2aa497c
+EBUILD airspy-1.0.10.ebuild 884 BLAKE2B 4a44da90a620e185da767b646d4edd33d7bace30832ed07ca72af76369dae4d2204d0c6b2eea70f10804d78e52b8d077d7fb220c574e323c29b6c0ca16a600a9 SHA512 eb23227a4cd18167019126933ad437ce82dfaf2ec3c2339d0ea2fc30f10b3df4f846cbfadbf3c88f7558a81e255acff058cc712405bcc4483f56460fd8d13ee5
 EBUILD airspy-1.0.9.ebuild 884 BLAKE2B 4a44da90a620e185da767b646d4edd33d7bace30832ed07ca72af76369dae4d2204d0c6b2eea70f10804d78e52b8d077d7fb220c574e323c29b6c0ca16a600a9 SHA512 eb23227a4cd18167019126933ad437ce82dfaf2ec3c2339d0ea2fc30f10b3df4f846cbfadbf3c88f7558a81e255acff058cc712405bcc4483f56460fd8d13ee5
 EBUILD airspy-9999.ebuild 884 BLAKE2B 4a44da90a620e185da767b646d4edd33d7bace30832ed07ca72af76369dae4d2204d0c6b2eea70f10804d78e52b8d077d7fb220c574e323c29b6c0ca16a600a9 SHA512 eb23227a4cd18167019126933ad437ce82dfaf2ec3c2339d0ea2fc30f10b3df4f846cbfadbf3c88f7558a81e255acff058cc712405bcc4483f56460fd8d13ee5
 MISC metadata.xml 220 BLAKE2B 46dd60edb9f6b8599815a6df1e5c833413abeb70008ac99b15b950b347fb6892dacab82b18b1be2637acaf61af1e6c32d82a031bff6f5c94da5d042455710fc3 SHA512 bce2f2527797db14ce1ebb3e56895c1cb583ba27a0cc713e7dedde863e7e3711f449b607748090ac21accd536147a16e80e5c9ec7472a795426f87469cdbabf9
diff --git a/net-wireless/airspy/airspy-1.0.10.ebuild b/net-wireless/airspy/airspy-1.0.10.ebuild
new file mode 100644
index 000000000000..d214c535ef76
--- /dev/null
+++ b/net-wireless/airspy/airspy-1.0.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev
+
+DESCRIPTION="Usemode driver and associated tools for airspy"
+HOMEPAGE="http://www.airspy.com"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/airspy/host.git"
+else
+	SRC_URI="https://github.com/airspy/host/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/airspyone_host-${PV}"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+udev"
+
+DEPEND="virtual/udev
+		virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_UDEV_RULES=$(usex udev)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use udev; then
+		udev_newrules "${ED}/etc/udev/rules.d/52-airspy.rules" 52-airspy.rules
+		rm -rf "${ED}/etc"
+	fi
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+}
diff --git a/net-wireless/bladerf-firmware/Manifest b/net-wireless/bladerf-firmware/Manifest
index 38412eae57b8..1f924f7855f6 100644
--- a/net-wireless/bladerf-firmware/Manifest
+++ b/net-wireless/bladerf-firmware/Manifest
@@ -1,7 +1,3 @@
-DIST bladeRF_fw_v2.2.0.img 122760 BLAKE2B ec7ea8e7abec7feba9efbbc4b1e681fdeae51622013e72e2244368b5b9522861f7f76fcc9f8a7d523281d4be06726e63bf286670530641d55da540424cf11963 SHA512 64c75b8ad8a2be6a311892e7e28b16966f6c962b483547e2b959e28b050e0d6b1ac4fa078c53711555bf41e1c5a56945c58807870941b499501b6274410b05f7
-DIST bladeRF_fw_v2.3.2.img 123368 BLAKE2B 70a4d1a90c8c4f16372b87c494417edfb0a74913446f4880e70cbdf3862a59a8f319bce821112f9f7f9106f02f2ffeca110b5f5232ab2d6c81e21a2fefa4f5a9 SHA512 4ca7667ba7c3c6efa6e5f8f9072ba1ef6b95c5fea9d9600d9e0f656b387b7d0e95891f252750d557907d243ec5792690e28ed55dc6bf96b1edf3426798e5d141
 DIST bladeRF_fw_v2.4.0.img 123432 BLAKE2B f451fac209afdb976840f430bee23c2a2cfacb58bb960ea1f4608d97859974bbe4874389c69bca779ef39744d2926aa96d127780dad925451813ffbc9a83c90a SHA512 0fea8985dc4e02146056cba2bf28b31fc7331941eeb2c905cdab29c7b2ee4223c75b99de68f4734329a4c661f7472a1facacde3b251f2663608dacef8bde2017
-EBUILD bladerf-firmware-2.2.0.ebuild 829 BLAKE2B bc8f35217abd47d51f004c3604079b9b934774bfd155cecf21f9cbcb049b69962f06918d6d3ce4e968317a45ba8b79bedebac908d9598fdefbb90c38cb4affc5 SHA512 f7f68bcc3b436fba5e7ec663eb646e960d45d8d21a7fd4c7326b5d869a9ac85e2862ec8eb5c111076599a6be9117b88f0782d5de7700478feb6e481037492ff2
-EBUILD bladerf-firmware-2.3.2.ebuild 824 BLAKE2B 1d60dafe6fa56213d7299191ed2182525d63a77724f0c1b72866d6a61644caabee015b5086f77877d76bd055cb7e9b8117687aa990f18c68daa8c2907bffeee5 SHA512 ed25b2b73d3aba8ae80ab4aa6173eedf9a1bc39a33df2b849f762bce526cc6a640d1cdb966c65f927223504ae5348083ff15815e94955eeeab27d9696bc81ccf
-EBUILD bladerf-firmware-2.4.0.ebuild 826 BLAKE2B d6c1b86e8b67bca76572c1c22d728dee20af663c5135e6345b0379aa09e21121441a0867b94e730a8479cf558f2028c9191fd9c8959a8f2d9c34b54180b555dc SHA512 926fa7f654cd1e632553f627b798625bd1cc1563de06105607adcfc67036aed97aef84cee35bbf35decf4245cd7ac678b427d6d655713212d0efd199999efca3
+EBUILD bladerf-firmware-2.4.0.ebuild 824 BLAKE2B 0483b495492163a4936c21ce448426165d8867a186ad9ae64e2c0ac809ccb63540ba805273949b4bcf0d8e79e602734e5e6c762cbc63ff5c7a86e20e9b1f8b12 SHA512 c31c55eb57cf3e9cf3eee15c763b925779ca2d72b01bbd3a0d22e4fd3e4d17a716b92e0e76000963a036f9e25354f69f1715c4bd1130774ae8ce535bde149918
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-wireless/bladerf-firmware/bladerf-firmware-2.2.0.ebuild b/net-wireless/bladerf-firmware/bladerf-firmware-2.2.0.ebuild
deleted file mode 100644
index b10085ff842e..000000000000
--- a/net-wireless/bladerf-firmware/bladerf-firmware-2.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="bladeRF FX3 firmware images"
-HOMEPAGE="http://nuand.com/fx3.php"
-
-#firmware is open source, but uses a proprietary toolchain to build
-#automated builds from git are available, but likely unneeded
-#http://hoopycat.com/bladerf_builds/
-SRC_URI="http://nuand.com/fx3/bladeRF_fw_v${PV}.img"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${DISTDIR}"
-
-src_unpack() {
-	true
-}
-
-src_install() {
-	insinto /usr/share/Nuand/bladeRF/
-	doins bladeRF_fw_v${PV}.img
-}
-
-pkg_postinst() {
-	elog "Please remember you have to actually flash this onto"
-	elog "your bladerf with the following command:"
-	elog "bladeRF-cli -f /usr/share/Nuand/bladeRF/bladeRF_fw_v${PV}.img"
-}
diff --git a/net-wireless/bladerf-firmware/bladerf-firmware-2.3.2.ebuild b/net-wireless/bladerf-firmware/bladerf-firmware-2.3.2.ebuild
deleted file mode 100644
index 36da8ec2d502..000000000000
--- a/net-wireless/bladerf-firmware/bladerf-firmware-2.3.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="bladeRF FX3 firmware images"
-HOMEPAGE="http://nuand.com/fx3.php"
-
-#firmware is open source, but uses a proprietary toolchain to build
-#automated builds from git are available, but likely unneeded
-#http://hoopycat.com/bladerf_builds/
-SRC_URI="http://nuand.com/fx3/bladeRF_fw_v${PV}.img"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${DISTDIR}"
-
-src_unpack() {
-	true
-}
-
-src_install() {
-	insinto /usr/share/Nuand/bladeRF/
-	doins bladeRF_fw_v${PV}.img
-}
-
-pkg_postinst() {
-	elog "Please remember you have to actually flash this onto"
-	elog "your bladerf with the following command:"
-	elog "bladeRF-cli -f /usr/share/Nuand/bladeRF/bladeRF_fw_v${PV}.img"
-}
diff --git a/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild b/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild
index 054e6a0a036a..7cdf02f656b7 100644
--- a/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild
+++ b/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://nuand.com/fx3/bladeRF_fw_v${PV}.img"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-wireless/bladerf-fpga/Manifest b/net-wireless/bladerf-fpga/Manifest
index 1d59d72f307c..0721b9185442 100644
--- a/net-wireless/bladerf-fpga/Manifest
+++ b/net-wireless/bladerf-fpga/Manifest
@@ -1,16 +1,6 @@
-DIST hostedx115-0.11.0.rbf 3571462 BLAKE2B ebf8e583ce73860b652f75640369aab9522c89b90d342618d11cad18c3073df18c37b815e38405568079530899765637c00d9c5a2a0076584d18a4714ac343c8 SHA512 c24f24db343890d42a2a608eabb1d75e59abae5a9be665a0d861adcc2f8063e7550221b01aa1aaff7766d33d12f007d56f918547979f8b622937fc5597977bb2
 DIST hostedx115-0.12.0.rbf 3571462 BLAKE2B a89693c1d53b81e59b7801246afdbee8bc30eda8ac1770b6bbd251445d1e6db36b81c8b34af008c0eb923fe7f661faa3f7d6535fb87047312db042b5ecf44cee SHA512 84161ac1b1d569b93d67e563f4c8800b6e9c376dabe463c457d9cbad2b628519e36eced0120553015922290b817bbb0c0fc9ca66aae17719f8124193af00a996
-DIST hostedx115-0.7.3.rbf 3571462 BLAKE2B 828c28623b42c8f16ee5ec8d6b3f8132b7d93662d5e8b6aad45cb3bfbd14f9788b1a0f236377ce6fb204163d4b1ea1d775d7ddcb566610bef04a8143d9525ce0 SHA512 43a46b5081d52ed0770dafa19e7e71925b9d79ead13da782ee42637db41c42140597c703b0b6da1b56866c92947f811c76c08407eff3b043eeaf66e5560ffa6f
-DIST hostedx40-0.11.0.rbf 1191788 BLAKE2B a0cc51c1e591b44789225e4d42e77ac1b93b8422dc2bd02b38959c5ffd360b01d7649f638e7162302d6e1d0464cb11152c9b71685e7a76d4f4c33a96207b9a4c SHA512 37ff1a6114f1c805bf7df955922d64f66cc2c1e9abd4ada456e3113270f8c131ed795f5549537ff5dbea6a36bba307417ff284ed60fa2dd5f57fdb72caf0a9d1
 DIST hostedx40-0.12.0.rbf 1191788 BLAKE2B 47396bcade3cb2df3769569c5176dfbe8c9b717d02d62101d76d8e0ecdfa8df499966e072dd1b6ad54b03c4448e86fdad0c7e190ed30fbffb579b6282a2b1160 SHA512 1c963d5b4d3ecade5e9565202ce2563493806b44319f2b9b00325f17164f0207396b1546826afc19767f9207b3d526b90e74bef7e0d38be15ba6c81fdeb12c41
-DIST hostedx40-0.7.3.rbf 1191788 BLAKE2B 489372b297a9e7385809b36efa80df7d489cc803e5ae5b8c1a6bdc80434fd462ec5e12ab5996a4412fe3306038766330200776b0e11c816d0004cc7602721aec SHA512 b4619b8918d178a42e0bd4885ef1671a96e8aeb224291ee21a792e0be73a6e4ea2b8951003aa093581971aa220f7d101c4a1cddec90845ca31f11b17c5f67fdd
-DIST hostedxA4-0.11.0.rbf 2632660 BLAKE2B 53040e0d595e1da719f52a1e14ed81b3557f25a89eff30a56ae11ce071c0e7014b0ee5acc885495b757084c9e79fe60a78f71d05f131154b525d48326d27933e SHA512 11b6481fbc71ca4fef18b4267628e1d45794d235995446e29a164bc793d2402285bfd6bd1be596e886cc56fd4576fee7d1fe0c6903a236478bc4e7fd22849030
 DIST hostedxA4-0.12.0.rbf 2632660 BLAKE2B 25f434bcb434df420be3c6a4c0bb3d3f48189e81b36f7bf8d775856080e8552fd4a62690fec31dc1b13ba66057b2261ca749706183f0e4063068c62dcd909634 SHA512 5e3bf78c8f87648df241a234d2bcbad1c8ed066a2b31a7b8f529c2401e140603d47f37b72c9631308d29daaa4f56f77dbff0f1dab8071a55e66e385c1d3a9bd6
-DIST hostedxA4-0.7.3.rbf 2632660 BLAKE2B a98ea6ffc1ffdbf9b8ded3144d4f9fb19dac6b196239dccdd9ce908b185eac4898a65ac897f460b1a0dee437131bdeccecf2b36714099d4f86962f04108c856e SHA512 655df2f698ae376577925349fc4773cf3819360f7bff0932761160aa823625d408be48a809df7edd2e3a4054b418f5dd6a0769f2aa982551ea3b847eaea5fc87
-DIST hostedxA9-0.11.0.rbf 12858972 BLAKE2B 8a68e742a2afa8bac4274c3228390b8c8572255f1c96daf70fd49364ffd96c7490c2d2a712164484b87039fa52d93e808ea144875d873e3e238b6c7e9c92933a SHA512 d7213017b4d49e8cdfea8336889640b11147001887ca4d0a83d979f1fad9c4baec5d2825894e1b732efb2f4602a6d857191703f8d701e0444f6863250388251c
 DIST hostedxA9-0.12.0.rbf 12858972 BLAKE2B 29d3c5d12c232333a7e2cb2e9ef580a7a350a0d04287cf2d068894d4b185a0f8256cfe87269738978ab0f0fabafa28921ca6ff13b8067d61fafb46a30ca230b7 SHA512 990199f980ebdda58f40bd72823585b3091d829b2974e84ab925576b7d1db2dfeef1d0934763636b92baee982470cc2fcff85dfa9bb2c6254b7021274703e4aa
-DIST hostedxA9-0.7.3.rbf 12858972 BLAKE2B 71bbdea5ef372b9a6a6512757391c2b143ff69efbcfec58178873eff14c7995750a43939ea93b69529ccca62987ec4437621b6f78289a94acbc2f14c02069e64 SHA512 e33970360e3104891d3c738ab46662b80a29160d87b913c3a4655aa03bd6ff8236274d1f2ad591e4dcee40c85ff579abcd69e637aa5cf86e1a08c143f89ba685
-EBUILD bladerf-fpga-0.11.0.ebuild 1094 BLAKE2B 80a33113b538d6cb497221ac6dcfe47c08f0f70c53fd46d38bea0618d2a7ea02758fd8d51e3f3a407d70b2404886d5162170d7ec4d6bce923e4a2a2028ec780b SHA512 ae4931a750aee028258d37bce712f956b85f3a078d3939ce01419784aada4b32f602d29be84369db996e487d6b6e4d9a70f4438b28c9d204238603af0bb9646c
-EBUILD bladerf-fpga-0.12.0.ebuild 1096 BLAKE2B 47f88a6482a4e50d87781077adecfde1ee6422412bd2d36cee127ad164375bea77ef89460064a22a3f4e5ddfd92e8e5a37421ac3dc06db635162f7268c43574f SHA512 4233d3490c50872a7fcf4237ff136f70c074fd84358508a3b4bcd53e13af50b875c27bef6e939dbf9a74f3ad81e6d74f03bf7f7a60e521a0b7db543c8208ee2a
-EBUILD bladerf-fpga-0.7.3.ebuild 1099 BLAKE2B e68325362b5cc55e5ddd887202a6ae310f309fd5237916ffdacc80c04a5d0e19dfed5a251c42399189cd24bc77c942ee606b8d36613d299499e0d4d7161b2635 SHA512 3f0ae72740e00885f354f4b14c094574f84f5dc7efd98504a10a50a386181a8e58162dcbb98f49ad7473267eaa5e8ef7a1a8c7087ffd68d9f533fbabccc53984
+EBUILD bladerf-fpga-0.12.0.ebuild 1094 BLAKE2B 9b246fddc6872ce2de153504e30e20736f5f47b98bbeee451645a2df391489464efad7e528eb0500fab2acada997613f678ca0d3f333fb0ea641cf766a461ffd SHA512 844ed41ecab8d43b6a7c8bbf85c8d471bc1493c6eed0d27bd39ef13dec840ae032517bc651eb808f968c4f5f2a251e6e6520adb2cc04b6836fe395355561f218
 MISC metadata.xml 698 BLAKE2B d11ce3cfe82a1fc860cb8d7e796cc70f1d3140430437c9ce676e56836f6e5945f6657493e7087928a684903ac394e51742104a128e3db84fdbe2c7be4f87b646 SHA512 dbe253746eb236f7cc3d3701148ac0bd95604c459261f93bc21c27193ee62dcebd9d1f56da2e95a162d4eb86fc55790c5ad9c285181c955a12ac284caf2e6584
diff --git a/net-wireless/bladerf-fpga/bladerf-fpga-0.11.0.ebuild b/net-wireless/bladerf-fpga/bladerf-fpga-0.11.0.ebuild
deleted file mode 100644
index 39fad99d6e43..000000000000
--- a/net-wireless/bladerf-fpga/bladerf-fpga-0.11.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="bladeRF FPGA bitstreams"
-HOMEPAGE="http://nuand.com/fpga.php"
-
-#fpga code is open source, but uses a proprietary toolchain to build
-#automated builds from git are available, but likely unneeded
-#http://hoopycat.com/bladerf_builds/
-SRC_URI="xA4? ( http://nuand.com/fpga/v${PV}/hostedxA4.rbf -> hostedxA4-${PV}.rbf )
-		xA9? ( http://nuand.com/fpga/v${PV}/hostedxA9.rbf -> hostedxA9-${PV}.rbf )
-		x40? ( http://nuand.com/fpga/v${PV}/hostedx40.rbf -> hostedx40-${PV}.rbf )
-		x115? ( http://nuand.com/fpga/v${PV}/hostedx115.rbf -> hostedx115-${PV}.rbf )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+xA4 +xA9 +x40 +x115"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${DISTDIR}"
-
-src_unpack() {
-	true
-}
-
-src_install() {
-	insinto /usr/share/Nuand/bladeRF/
-	use xA4 && newins hostedxA4-${PV}.rbf hostedxA4.rbf
-	use xA9 && newins hostedxA9-${PV}.rbf hostedxA9.rbf
-	use x40 && newins hostedx40-${PV}.rbf hostedx40.rbf
-	use x115 && newins hostedx115-${PV}.rbf hostedx115.rbf
-}
diff --git a/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild b/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild
index cf4de99cf076..10f806c6a60a 100644
--- a/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild
+++ b/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="xA4? ( http://nuand.com/fpga/v${PV}/hostedxA4.rbf -> hostedxA4-${PV}.rb
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+xA4 +xA9 +x40 +x115"
 
 DEPEND=""
diff --git a/net-wireless/bladerf-fpga/bladerf-fpga-0.7.3.ebuild b/net-wireless/bladerf-fpga/bladerf-fpga-0.7.3.ebuild
deleted file mode 100644
index 739ce1773ca2..000000000000
--- a/net-wireless/bladerf-fpga/bladerf-fpga-0.7.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="bladeRF FPGA bitstreams"
-HOMEPAGE="http://nuand.com/fpga.php"
-
-#fpga code is open source, but uses a proprietary toolchain to build
-#automated builds from git are available, but likely unneeded
-#http://hoopycat.com/bladerf_builds/
-SRC_URI="xA4? ( http://nuand.com/fpga/v${PV}/hostedxA4.rbf -> hostedxA4-${PV}.rbf )
-		xA9? ( http://nuand.com/fpga/v${PV}/hostedxA9.rbf -> hostedxA9-${PV}.rbf )
-		x40? ( http://nuand.com/fpga/v${PV}/hostedx40.rbf -> hostedx40-${PV}.rbf )
-		x115? ( http://nuand.com/fpga/v${PV}/hostedx115.rbf -> hostedx115-${PV}.rbf )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+xA4 +xA9 +x40 +x115"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${DISTDIR}"
-
-src_unpack() {
-	true
-}
-
-src_install() {
-	insinto /usr/share/Nuand/bladeRF/
-	use xA4 && newins hostedxA4-${PV}.rbf hostedxA4.rbf
-	use xA9 && newins hostedxA9-${PV}.rbf hostedxA9.rbf
-	use x40 && newins hostedx40-${PV}.rbf hostedx40.rbf
-	use x115 && newins hostedx115-${PV}.rbf hostedx115.rbf
-}
diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
index 1603d3483437..fa030d11bc5c 100644
--- a/net-wireless/bladerf/Manifest
+++ b/net-wireless/bladerf/Manifest
@@ -1,8 +1,5 @@
-AUX bladerf-2019.07-gcc10.patch 966 BLAKE2B fe17328ea2c01e3345aab309414384395ac9bff0583bd324c995515a372ea84cb93d42e198a37ac650dcd4d219f8621f58740f15ecf8dbe08624891c228ee422 SHA512 287e0abdd5ba393b3d9376fb3f275bc2a0fe215e2918eef4365b580b0678683b81cabd80cfb1e4f42332b063b3800a6218254f6006b3d747ac6cd5e42686480e
 DIST analogdevices-no-OS-0bba46.tar.gz 44190321 BLAKE2B b5c31b4b9ed92e0ac9f1a4c1eda38e065f00e0ee8034a99615a2509a4c91c589faefaf2e42a8bd30e61eb36459fa264c6e1892577f759c2ca0810925cede163e SHA512 cf6f6d34fed9879ae7263782f20f33dd3af84201e3477fa0501e072eb08a8a545a07c496ad0ff3f7dc1a6ef407f136f843ba05942b4819e146c5fef023a3bb02
-DIST bladerf-2019.07.tar.gz 2186702 BLAKE2B 1d08dc90ddf5d5f650fdc49e5a7e4224de7caa988974c1252052975599066b2221741a2cd2f0ba496e98d63b6d417b0eb1ae12de4dd9a9d43fb730bb6b221dc2 SHA512 e6ba47106ac9904d41fc611560c8f4bc482b9f17b6c476d4a2ac36c5779e9a64222140f4f067fab2252ccfabebf74e866f0fefb359934ff4df7a8416a8558b87
 DIST bladerf-2021.03.tar.gz 2261864 BLAKE2B b4e58e370c1e515162f01a0da3985b5ba3c210a8a045bd531e618a9da8e4e66e74a8ccca9138cf6427b512f9c4423bd4151cc63d70a5e218c2a24980afa73972 SHA512 76ebb6501ad9286c7a52a0540f991f7848e396b4d75104bf7186ffac5e3142aa79914352238c8a9e0b4453910c171218c0e861092f228202d0b236939fecc325
-EBUILD bladerf-2019.07.ebuild 1690 BLAKE2B 6bd198bd82099a861b202226a6de5339e252e458dcc8143c039b9011b60afb37b2c852f4d8767f7fe2494a32aca786e38cfe086a7971b7736269e373cc9d86d4 SHA512 9ceeb249595508d2f9d2278b33218f62a573e5dceab257828ab919d1fb00592a2d35451cfec23168c48f0bf54ae4c9f145918e37ac1375bdc92f21da0bc40a6a
-EBUILD bladerf-2021.03.ebuild 1635 BLAKE2B a094a4b9603bc24bd1214e3e65792982acc535ada7b32bbadf6f2f00f9560437582fc8d3777b08e069aec22536e4db762e8aa1c87943c8b68a5e293b1c8820db SHA512 bd46ac70a1e2b38854919f52ef5f1aa29ca3bbcf1a0e171c138a25e9e5c13dbea7fd14ebab35d12ce2d3238ea7e798d1bcca157a08d2b84840970fd65dea62b7
+EBUILD bladerf-2021.03.ebuild 1633 BLAKE2B 7d83c515d30a5f553753b6a153ae5a87eb4ecb87c4a0634e69550c6f6394d4cfdd27484eae069417b2ca7b6912c5bc9ab94007ecdfc19c6c6de166ab55851d62 SHA512 5be0ae2a713acac895913438bacc02974446ccac5185b2841cbeff35e7cf273efb9029c1ef86120711d277cfbe212aae44ae91d480f8aee8ac4ac735e1c154b4
 EBUILD bladerf-9999.ebuild 1635 BLAKE2B a094a4b9603bc24bd1214e3e65792982acc535ada7b32bbadf6f2f00f9560437582fc8d3777b08e069aec22536e4db762e8aa1c87943c8b68a5e293b1c8820db SHA512 bd46ac70a1e2b38854919f52ef5f1aa29ca3bbcf1a0e171c138a25e9e5c13dbea7fd14ebab35d12ce2d3238ea7e798d1bcca157a08d2b84840970fd65dea62b7
 MISC metadata.xml 534 BLAKE2B d39c41a686202aff5a46e2b67cdcb5f3dc339bd7854a313f8d58165995b030194638447c2c987d1c5372a241c030b7d715a9854d9daaec1a0a59b85c6f421c1c SHA512 b7d10693f1c08b1a60bf6f4542e7fad445a63249d3fa796b08b3c7db7d758c89000c09a6aeb0dffbe6a90467acc5ee18331d839162a540a2c7040d5dd7218db7
diff --git a/net-wireless/bladerf/bladerf-2019.07.ebuild b/net-wireless/bladerf/bladerf-2019.07.ebuild
deleted file mode 100644
index f3febfccacb6..000000000000
--- a/net-wireless/bladerf/bladerf-2019.07.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils udev
-
-DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
-HOMEPAGE="https://nuand.com/"
-
-#lib is LGPL and cli tools are GPL
-LICENSE="GPL-2+ LGPL-2.1+"
-
-SLOT="0/${PV}"
-
-#maintainer notes:
-#doc use flag, looks like it can't be disabled right now and will
-#	always build if pandoc and help2man are installed
-#	also ignores when deps are missing and just disables docs
-IUSE="doc +tecla"
-
-MY_PN="bladeRF"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Nuand/${MY_PN}.git"
-else
-	MY_PV=${PV/\_/-}
-	S="${WORKDIR}/${MY_PN}-${MY_PV}"
-	SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz \
-			https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-CDEPEND=">=dev-libs/libusb-1.0.16
-	tecla? ( dev-libs/libtecla )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}"
-PDEPEND=">=net-wireless/bladerf-firmware-2.3.2
-	>=net-wireless/bladerf-fpga-0.11.0"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-
-src_unpack() {
-	if [ "${PV}" = "9999" ]; then
-		git-r3_src_unpack
-	else
-		default
-		mv "${WORKDIR}/no-OS-0bba46e6f6f75785a65d425ece37d0a04daf6157/ad9361" "${S}/thirdparty/analogdevicesinc/no-OS/" || die
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DVERSION_INFO_OVERRIDE:STRING="${PV}"
-		-DBUILD_DOCUMENTATION="$(usex doc)"
-		-DENABLE_LIBTECLA="$(usex tecla)"
-		-DTREAT_WARNINGS_AS_ERRORS=OFF
-		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/bladerf/bladerf-2021.03.ebuild b/net-wireless/bladerf/bladerf-2021.03.ebuild
index 09bf7b568186..ac1bd5fa0b1e 100644
--- a/net-wireless/bladerf/bladerf-2021.03.ebuild
+++ b/net-wireless/bladerf/bladerf-2021.03.ebuild
@@ -29,7 +29,7 @@ else
 	S="${WORKDIR}/${MY_PN}-${MY_PV}"
 	SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz \
 			https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 CDEPEND=">=dev-libs/libusb-1.0.16
diff --git a/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch b/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch
deleted file mode 100644
index bdd99c5cadcc..000000000000
--- a/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 5cf9fd299a396a5ae5b4402215713fd2a84e607b Mon Sep 17 00:00:00 2001
-From: Robert Ghilduta <robert.ghilduta@nuand.com>
-Date: Mon, 25 May 2020 21:36:50 -0500
-Subject: [PATCH] libbladeRF: define bladerf2_state_to_string as extern in
- header
-
----
- host/libraries/libbladeRF/src/board/bladerf2/common.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/host/libraries/libbladeRF/src/board/bladerf2/common.h b/host/libraries/libbladeRF/src/board/bladerf2/common.h
-index 23187ba6c..efbebc867 100644
---- a/host/libraries/libbladeRF/src/board/bladerf2/common.h
-+++ b/host/libraries/libbladeRF/src/board/bladerf2/common.h
-@@ -207,7 +207,7 @@ extern const float ina219_r_shunt;
- /* Constants */
- /******************************************************************************/
- 
--char const *bladerf2_state_to_string[4];
-+extern char const *bladerf2_state_to_string[4];
- 
- 
- /******************************************************************************/
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index 031e40cc2945..8df8d32be1ed 100644
--- a/perl-core/Manifest.gz
+++ b/perl-core/Manifest.gz
diff --git a/perl-core/Scalar-List-Utils/Manifest b/perl-core/Scalar-List-Utils/Manifest
index b78da5bcb8c0..cc99ecd93110 100644
--- a/perl-core/Scalar-List-Utils/Manifest
+++ b/perl-core/Scalar-List-Utils/Manifest
@@ -1,3 +1,3 @@
 DIST Scalar-List-Utils-1.56.tar.gz 173248 BLAKE2B 9dde08b8ce9ca8de84569e60a3f9da794912008ed45f140a14aff1f7190c8a5168065a9fbc83f73779653b3cd26e7be3a9172493084db7f326f9e4c92281b2a4 SHA512 90291e154497599e7e41b6746dc29351c619201b5723eedfa76dee81d0db4ae28ad598355edc61c529de5c05d5eafc17ae6c3205f0c624fc2a028ecbac9f2c3f
-EBUILD Scalar-List-Utils-1.560.0.ebuild 451 BLAKE2B 37bc32e83bcc4e536a272bb493bdf90f69da1e6889eccf729701dea5883ff179f931dd3ddb7ab9fba7d6d89c5ad3231609beaa0a5689607400d53d01e4b0757c SHA512 8254f7f213a415dbf92267615adced8ebf4764cda9177c35c64cd57c0056af82783ed77b22b0c8db3af24153a23adeeb660928a4fab6d390dd2e92110273619d
+EBUILD Scalar-List-Utils-1.560.0.ebuild 448 BLAKE2B 4923f6afc0443979e21252ec044df0a0982cabb42854a176c07fc06da633fd499184928fe96175873fa3775fa8e6eee91ba941017df464c3169ff709156a1f03 SHA512 fcf6276076fb8d6516b2f5e1251dfcffaf79312b4904d54509e74c5d92cf6f9606a2ca6c9df97cd013101a3460aa0a07cf87d99c4028425ee0726a1f8aa1c191
 MISC metadata.xml 574 BLAKE2B a58de3a041485c962e4f62a61d562e226f9aa349b03536eb1eb4a61898e2dfea40f6231c9815de0bde59485bad84c255e53a023e1973c842860282997e0f4721 SHA512 e9b319821da9fb8618f12d546c4c71be99db66541c209f2d7be3ffcc3f8c03530df32580e9fa8de5d519260ade1e62399267db71e9d66c74ede1a0108bee94d7
diff --git a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.560.0.ebuild b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.560.0.ebuild
index f8faeab6c7f2..627cf9669b6a 100644
--- a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.560.0.ebuild
+++ b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.560.0.ebuild
@@ -9,4 +9,4 @@ inherit perl-module
 
 DESCRIPTION="Common Scalar and List utility subroutines"
 SLOT="0"
-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"
+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"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f6cc0fbae2d8..7504daafcb9f 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 7bfdedc64361..123047b0b6a0 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joshua Kinard <kumba@gentoo.org> (2021-07-31)
+# Mask USE 'test' on MIPS for libgudev.  This requires dev-util/umockdev,
+# which has apparently never had a MIPS keyword.  Running the testsuite can be
+# revisited at a later date.  Bug #805083
+dev-libs/libgudev test
+
 # Matt Turner <mattst88@gentoo.org> (2021-06-10)
 # dev-python/django is not keyworded here
 dev-python/diskcache test
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 88f3708c7434..6f0fc6cdc7a5 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -366,7 +366,7 @@ sci-chemistry/vmd tachyon
 
 # Pacho Ramos <pacho@gentoo.org>
 # Not keyworded
-media-plugins/gst-plugins-meta dts vcd vpx
+media-plugins/gst-plugins-meta dts vcd
 
 # QA: This entry is moved from INVALID location from default/linux/powerpc.
 # VDPAU is currently not keyworded on PPC since its a nvidia-drivers feature
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 0913c07249aa..c702c9a2127b 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,10 +1,14 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-28)
+# app-cdr/cdrtools fails to compile on riscv
+dev-util/catalyst iso
+
 # Yixun Lan <dlan@gentoo.org> (2021-07-27)
-# depend on sci-physics/bullet, media-libs/libv4l, media-libs/libsdl2
+# depend on sci-physics/bullet, media-libs/libv4l
 # which not keyworded
-dev-libs/efl physics sdl v4l
+dev-libs/efl physics v4l
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-27)
 # dev-libs/boxfort does not support riscv64 yet, meaning
@@ -46,6 +50,7 @@ dev-python/pandas doc full-support test
 # LuaJIT does not support riscv
 app-text/texlive-core luajittex
 dev-texlive/texlive-basic luajittex
+www-servers/nginx nginx_modules_http_lua
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-11)
 # Causes 35 tests to fail with "fatal llvm error"
@@ -62,7 +67,6 @@ mail-mta/courier fax
 # Ye Cao <ye.c@rioslab.org> (2021-07-02)
 # Dependencies not keyworded, not tested
 dev-python/ipython nbconvert notebook
-dev-python/matplotlib wxwidgets
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-05)
 # Dependencies not keyworded here yet:
@@ -72,12 +76,14 @@ app-editors/emacs gconf m17n-lib xwidgets
 app-crypt/heimdal afs
 #  - app-xemacs/ruby-modes (and by extension xemacs itself)
 dev-lang/ruby xemacs
-#  - sci-libs/gdal
-dev-python/networkx extras
 #  - dev-ruby/asciidoctor
 dev-libs/nanomsg doc
+#  - sci-libs/gdal
+dev-python/networkx extras
 #  - app-text/dblatex & media-gfx/transfig
 dev-util/ragel doc
+#  - Qt5 & KDE
+dev-vcs/subversion kwallet
 #  - media-libs/dumb, media-libs/openal
 media-libs/allegro dumb openal
 #  - media-gfx/nvidia-texture-tools
@@ -88,8 +94,8 @@ net-analyzer/rrdtool rados ruby
 net-misc/connman iwd ofono
 #  - dev-util/aruba & dev-util/cucumber
 sys-block/thin-provisioning-tools test
-#  - sys-cluster/rdma-core | sys-fabric/ofed, sys-cluster/knem, sys-fabric/infinipath-psm, sys-fabric/librdmacm
-sys-cluster/openmpi openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_dynamic-sl openmpi_ofed_features_rdmacm openmpi_ofed_features_udcm
+#  - sys-cluster/knem, sys-fabric/infinipath-psm
+sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_psm
 #  - sys-fabric/ofed, dev-db/mariadb | dev-db/mysql
 sys-cluster/slurm ofed slurmdbd
 
@@ -143,12 +149,6 @@ net-libs/libproxy spidermonkey webkit kde networkmanager
 dev-libs/efl avif
 media-libs/gd avif heif
 
-# Sam James <sam@gentoo.org> (2021-02-26)
-# dev-libs/efl not keyworded here
-# and is a desktop application mainly
-# bug #773178
-app-crypt/pinentry efl
-
 # Joonas Niilola <juippis@gentoo.org> (2021-01-15)
 # Dependency not keyworded on this arch.
 app-text/enchant voikko
@@ -166,28 +166,10 @@ net-misc/openssh security-key
 dev-libs/libpcre2 jit
 dev-libs/libpcre jit
 <dev-vcs/git-2.31.0 pcre-jit
+www-servers/nginx pcre-jit
 
-# Not yet tested / unkeyworded dependencies
-# This includes also packages which do not support python-3 or
-# do not support python-3.7 yet.
-
-app-admin/syslog-ng mongodb test
+# app-shells/fish not keyworded due to failing tests
 dev-python/argcomplete test
-dev-python/aiohttp doc test
-dev-python/jinja doc
-dev-python/lxml test
-dev-python/pbr test
+
+# Several dependencies not keyworded due to failing tests.
 dev-python/pypiserver test
-dev-python/setuptools test
-dev-python/sphinx doc test
-dev-python/twisted test
-dev-python/urllib3 test
-dev-util/catalyst iso
-dev-util/pkgconf test
-dev-vcs/git highlight subversion
-sys-libs/libcxx static-libs
-media-libs/fontconfig doc
-net-libs/gnutls test-full
-net-libs/libpcap rdma
-net-misc/ntp openntpd
-sys-devel/gettext cvs
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 0be6a25cde1e..a037994c9e83 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -151,7 +151,7 @@ TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE="1"
 
 # Aaron W. Swenson <titanofold@gentoo.org> (2017-07-09)
 # Default target(s) for postgres{,-multi}.eclass
-POSTGRES_TARGETS="postgres10 postgres11"
+POSTGRES_TARGETS="postgres12 postgres13"
 
 # Michael Orlitzky <mjo@gentoo.org> (2017-11-17)
 #
diff --git a/profiles/package.mask b/profiles/package.mask
index cac5efe8bf9d..d0e2c93abd7c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,52 @@
 
 #--- END OF EXAMPLES ---
 
+# David Seifert <soap@gentoo.org> (2021-08-01)
+# Dropped into ::gentoo, then unmaintained. Multiple versions behind
+# upstream, GCC 11 bug open, lacks python 3.10, python library without
+# revdeps. Bug #790137, #792870, removal in 30 days.
+sci-libs/sktime
+
+# David Seifert <soap@gentoo.org> (2021-08-01)
+# Last release 10 years ago, EOL upstream, no other distro packages this
+# anymore, tons of bugs. Revdeps are unmaintained too and out of date.
+# Bug #798015, removal in 30 days.
+sci-biology/ncbi-tools
+sci-biology/njplot
+sci-biology/psipred
+sci-chemistry/mars
+sci-libs/rosetta-fragments
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-31)
+# Obsolete; all versions in current Perl core distributions
+# are newer, and no virtuals currently pull these packages.
+# Removal in 30 days.
+perl-core/ExtUtils-MakeMaker
+perl-core/ExtUtils-Manifest
+perl-core/File-Path
+perl-core/Getopt-Long
+perl-core/HTTP-Tiny
+perl-core/JSON-PP
+perl-core/libnet
+
+# David Seifert <soap@gentoo.org> (2021-07-30)
+# games-engines/renpy has been gone for 6 months, the
+# eselect module has no use anymore and the ebuild has
+# QA issues. Bug #805275, removal in 30 days.
+app-eselect/eselect-renpy
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-07-30)
+# these libs have no consumers, removal in 30 days
+# see bug: https://bugs.gentoo.org/805152
+dev-java/jgoodies-animation
+dev-java/jgoodies-binding
+dev-java/jgoodies-forms
+
+# Joonas Niilola <juippis@gentoo.org> (2021-07-29)
+# Upstream provided migration instructions from 2. -> 3. update, 
+# breaks if not all at least many revdeps. #805011 for tracker bug.
+>=net-libs/mbedtls-3.0.0
+
 # Sam James <sam@gentoo.org> (2021-07-26)
 # Fails to build with GCC 11. No activity upstream.
 # Removal on 2021-08-26. bug #740536, bug #624746.
@@ -310,11 +356,6 @@ dev-python/pathlib2
 dev-python/traceback2
 dev-python/unittest2
 
-# Sergei Trofimovich <slyfox@gentoo.org> (2021-07-05)
-# The platform is outdated and not maintained anymore.
-# Mask for removal in 30 days.
-dev-haskell/haskell-platform
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-07-04)
 # severely broken nfs
 # possibly depper problem due to bug in mm/page_alloc
@@ -340,15 +381,6 @@ dev-ruby/shotgun
 # Masked for removal in 30 days.
 dev-ruby/source_map
 
-# Sergei Trofimovich <slyfox@gentoo.org> (2021-07-02)
-# Outdated, not really maintained. Grab it if you like.
-# Masked for removal in 30 days. bug #800097.
-x11-plugins/purple-mattermost
-
-# Sergei Trofimovich <slyfox@gentoo.org> (2021-07-02)
-# Masked for removal in 30 days.
-media-sound/xmms2-scrobbler
-
 # David Seifert <soap@gentoo.org> (2021-07-01)
 # Berkeley DB slots that are long past EOL by Oracle,
 # maintenance burden, and no real path forward by Oracle.
@@ -422,12 +454,6 @@ media-gfx/povtree
 >=dev-lang/ocaml-4.12
 =dev-ml/camlp4-4.12
 
-# Stephan Hartmann <sultan@gentoo.org> (2021-06-05)
-# Dev channel releases are only for people who
-# are developers or want more experimental features
-# and accept a more unstable release.
->=www-client/chromium-93
-
 # Bernard Cafarelli <voyageur@gentoo.org> (2021-06-04)
 # Alpha versions of fetchmail 7
 # Add support for OAUTH2 for those needing it
@@ -472,14 +498,14 @@ dev-java/werken-xpath
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2021-05-16)
 # Mask gcc-7 branch (ended upstream support). Please switch
-# to a freshed gcc branch.
+# to a fresher gcc branch.
 <sys-devel/gcc-8
 <dev-util/nvidia-cuda-toolkit-10
 <dev-util/nvidia-cuda-sdk-10
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2021-05-16)
 # Mask gcc-6 branch (ended upstream support). Please switch
-# to a freshed gcc branch.
+# to a fresher gcc branch.
 <sys-devel/gcc-7
 
 # Sam James <sam@gentoo.org> (2021-05-09)
@@ -521,10 +547,9 @@ dev-java/werken-xpath
 =media-fonts/culmus-0.133-r1
 
 # Lars Wendler <polynomial-c@gentoo.org> (2021-03-22)
-# Has unidentified race condition on very fast CPUs that causes maintainer-
-# mode to be triggered.
-# Most likely caused by the following upstream commit:
-#   https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=aba75f6d4a9c875a9d5d90a07c6b3678db66a4bf
+# On fast CPUs eautoreconf skips intermediate steps,
+# enables maintainer-mode or fails automake assertions:
+# bug #782985
 sys-devel/autoconf:2.71
 
 # Sam James <sam@gentoo.org> (2021-03-03)
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 395d55f62969..26f4c4c7e88a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -85,7 +85,6 @@ app-admin/mcollective:client - Install client utilities
 app-admin/openrc-settingsd:systemd - Use the versions of dbus and polkit files provided by sys-apps/systemd
 app-admin/pass:X - Use x11-misc/xclip to copy passwords to the clipboard.
 app-admin/pass:dmenu - Add support for x11-misc/dmenu with the 'passmenu' program.
-app-admin/pass:fish-completion - Enable fish completion support.
 app-admin/pass:git - Use dev-vcs/git for password revisions.
 app-admin/pass:importers - Allow importing passwords from other password managers using various contributed scripts.
 app-admin/pass-otp:qrcode - Add support for qrcodes using media-gfx/qrencode
@@ -625,6 +624,8 @@ app-emulation/virtualbox:udev - Controls installation of special USB udev rules.
 app-emulation/virtualbox:vboxwebsrv - Build and install the VirtualBox webservice
 app-emulation/virtualbox-modules:pax-kernel - Apply patch needed for pax enabled kernels
 app-emulation/vkd3d:spirv-tools - Enable SPIRV shader debugging support using dev-util/spirv-tools
+app-emulation/wine-gecko:shared - Install pre-unpacked files which do not need to be copied into the Wine prefix
+app-emulation/wine-mono:shared - Install pre-unpacked files which do not need to be copied into the Wine prefix
 app-emulation/wine-staging:capi - Enable ISDN support via CAPI
 app-emulation/wine-staging:custom-cflags - Bypass strip-flags; use at your own peril
 app-emulation/wine-staging:dos - Pull in games-emulation/dosbox to run DOS applications
@@ -730,7 +731,6 @@ app-i18n/ibus-chewing:gconf - Enable support for gnome-base/gconf
 app-i18n/ibus-handwrite:zinnia - Enable support for app-i18n/zinnia
 app-i18n/ibus-libpinyin:boost - Compile against dev-libs/boost libraries
 app-i18n/ibus-libpinyin:opencc - Enable support for app-i18n/opencc
-app-i18n/ibus-m17n:gtk2 - Build with x11-libs/gtk+:2 instead of x11-libs/gtk+:3
 app-i18n/ibus-pinyin:boost - Enable support for dev-libs/boost
 app-i18n/ibus-sunpinyin:gui - Install graphical user interface tool (ibus-setup-sunpinyin)
 app-i18n/ibus-unikey:gtk2 - Enable support for x11-libs/gtk+:2
@@ -1385,6 +1385,7 @@ dev-games/ogre:poco - When USE=threads, use poco for threading
 dev-games/ogre:resman-pedantic - Resource Manager PEDANTIC : require an explicit resource group. Case sensitive lookup. Some demos might not work with this setting. (default: case-insensitive + sensitive lookup in all groups)
 dev-games/ogre:tbb - When USE=threads, use tbb for threading
 dev-games/ogre:tools - Build and install AssimpConverter (assimp USE flag is enabled), MeshUpgrader, VRMLConverter and XMLConverter
+dev-games/openscenegraph:collada - Enable DAE file support via dev-libs/collada-dom
 dev-games/openscenegraph:dicom - Enable DICOM medical image file support via sci-libs/dcmtk
 dev-games/openscenegraph:egl - Enable EGL support
 dev-games/openscenegraph:fox - Build examples using x11-libs/fox library
@@ -1394,9 +1395,12 @@ dev-games/openscenegraph:openinventor - Build OpenInventor plugin
 dev-games/openscenegraph:osgapps - Build osg applications
 dev-games/openscenegraph:sdl2 - Use media-libs/libsdl2 additionally to media-libs/libsdl
 dev-games/openscenegraph:xrandr - Enable support for the X xrandr extension
+dev-games/openscenegraph-openmw:collada - Enable DAE file support via dev-libs/collada-dom
+dev-games/openscenegraph-openmw:dicom - Enable DICOM medical image file support via sci-libs/dcmtk
 dev-games/openscenegraph-openmw:egl - Enable EGL support
 dev-games/openscenegraph-openmw:fox - Build examples using x11-libs/fox library
 dev-games/openscenegraph-openmw:gdal - Enable support for sci-libs/gdal library
+dev-games/openscenegraph-openmw:las - Enable support for geospatial data LAS LiDAR format using sci-geosciences/liblas
 dev-games/openscenegraph-openmw:openinventor - Build OpenInventor plugin
 dev-games/openscenegraph-openmw:osgapps - Build osg applications
 dev-games/openscenegraph-openmw:sdl2 - Use media-libs/libsdl2 additionally to media-libs/libsdl
@@ -1544,7 +1548,6 @@ dev-haskell/quickcheck-classes:vector - Enable the use of the `vector` package.
 dev-haskell/quickcheck-classes-base:binary-laws - Include infrastructure for testing class laws of binary type constructors. Disabling `unary-laws` while keeping `binary-laws` enabled is an unsupported configuration.
 dev-haskell/quickcheck-classes-base:unary-laws - Include infrastructure for testing class laws of unary type constructors.
 dev-haskell/recaptcha:network-uri - Get Network.URI from the network-uri package.
-dev-haskell/reflection:template-haskell - Enable template haskell.
 dev-haskell/rfc5051:mkunicodedata - build codes generator itself
 dev-haskell/sandi:conduit - Build with conduit
 dev-haskell/semigroupoid-extras:profunctors - You can disable the use of the `profunctors` package using `-f-profunctors`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
@@ -2015,6 +2018,7 @@ dev-libs/jemalloc:lazy-lock - Enable lazy locking (only lock when multi-threaded
 dev-libs/jemalloc:prof - Enable allocation profiling
 dev-libs/jemalloc:stats - Enable statistics calculation/reporting
 dev-libs/jemalloc:xmalloc - Add support for xmalloc (abort-on-out-of-memory)
+dev-libs/kosmindoormap:openinghours - Enable support for highlighting currently open amenities/shops/etc.
 dev-libs/kreport:marble - Enable displaying of maps using kde-apps/marble
 dev-libs/kreport:scripting - Support Qml scripting using dev-qt/qtdeclarative
 dev-libs/libbase58:tools - Build command line base58 tool
@@ -2042,7 +2046,6 @@ dev-libs/libevent:ssl - Support for dev-libs/openssl encryption
 dev-libs/libevent:verbose-debug - Support for verbose debug logging
 dev-libs/libffi:exec-static-trampoline - Don't rely on dynamic code generation for trampolines.
 dev-libs/libffi:pax-kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
-dev-libs/libffi:pax_kernel - DEPRECATED alias for 'pax-kernel'. Do not use.
 dev-libs/libffi-compat:pax-kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
 dev-libs/libfido2:nfc - Enable experimental NFC support
 dev-libs/libflatarray:cuda - Enables plugins for NVIDIA GPUs (e.g. CUDAAllocator)
@@ -3011,6 +3014,7 @@ games-emulation/dolphin:discord-presence - Enables Discord Rich Presence, show t
 games-emulation/dolphin:evdev - Enable evdev input support
 games-emulation/dolphin:log - Increase logging output
 games-emulation/dolphin:lto - Add support for link-time optimizations.
+games-emulation/dolphin:mgba - Enables GBA controllers emulation using libmgba.
 games-emulation/dolphin:vulkan - Enable support for Vulkan-based video backend.
 games-emulation/dosbox:core-inline - Enable memory-increasing inlines for better performance but requiring more build time
 games-emulation/dosbox:glide - Enable unofficial Glide emulation via media-libs/openglide
@@ -3325,8 +3329,6 @@ gui-apps/grim:jpeg - Enable JPEG support.
 gui-apps/gtkgreet:layershell - Enable layer shell support
 gui-apps/mako:icons - Enable support for icons
 gui-apps/swayidle:elogind - Enable support for rootless session via elogind
-gui-apps/swayidle:fish-completion - Enable fish completion support
-gui-apps/swaylock:fish-completion - Enable fish completion support
 gui-apps/swaylock:gdk-pixbuf - Enable additional image format support via the x11-libs/gdk-pixbuf library
 gui-apps/waybar:mpd - Enable support for the Music Player Daemon
 gui-apps/waybar:network - Enable libnl support for network related features
@@ -4111,6 +4113,7 @@ media-libs/gd:heif - Enable support for the heif format via media-libs/libheif
 media-libs/gd:webp - Enable support for the webp format
 media-libs/gegl:lensfun - Enable support for media-libs/lensfun.
 media-libs/gegl:umfpack - Enable sparse solving via sci-libs/umfpack.
+media-libs/glfw:wayland-only - Enable wayland support and disable X11 support
 media-libs/gmmlib:custom-cflags - Do not override user CFLAGS like -march, -msse and similar with lib defaults. Not tested by upstream.
 media-libs/grilo:playlist - Enable support for playlists through dev-libs/totem-pl-parser
 media-libs/gst-plugins-bad:bzip2 - Enable bzip2 encoder/decoder plugin
@@ -4678,7 +4681,6 @@ media-sound/pulseaudio:daemon - Build the pulseaudio binary (not-needed for pipe
 media-sound/pulseaudio:doc - Build the doxygen-described API documentation.
 media-sound/pulseaudio:elogind - Use sys-auth/elogind for giving each session a PA client
 media-sound/pulseaudio:equalizer - Enable the equalizer module (requires sci-libs/fftw).
-media-sound/pulseaudio:forget-missing - Enables clearing of unavailable devices from database files which is recommended for GNOME.
 media-sound/pulseaudio:gconf - Ensure gnome-base/gconf is present for pulseaudio GConf to GSettings module automatic migration (keeping the user configuration)
 media-sound/pulseaudio:gdbm - Use sys-libs/gdbm to store PulseAudio databases. Recommended for desktop usage. This flag causes the whole package to be licensed under GPL-2 or later.
 media-sound/pulseaudio:glib - Add support to dev-libs/glib-based mainloop for the libpulse client library, to allow using libpulse on glib-based programs. Build the GSettings PA module.
@@ -5598,7 +5600,6 @@ net-firewall/nufw:pam_nuauth - Add support for pam nufw from PAM
 net-firewall/nufw:plaintext - Add support for authentication with plaintext files
 net-firewall/nufw:prelude - Add support/bindings for the Prelude Intrusion Detection System
 net-firewall/pglinux:cron - Install cron script
-net-firewall/pglinux:logrotate - Install logrotate.d file
 net-firewall/shorewall:init - Adds the capability to place the firewall in a safe state prior to bringing up the network interfaces
 net-firewall/shorewall:ipv4 - Installs everything needed to create a full IPv4 firewall
 net-firewall/shorewall:ipv6 - Adds the capability to create a full IPv6 firewall (requires net-firewall/shorewall ipv4 USE flag)
@@ -6413,7 +6414,6 @@ net-misc/hylafaxplus:jbig - JBIG Fax Compression Support
 net-misc/hylafaxplus:mgetty - Receive faxes via serial port connections
 net-misc/hylafaxplus:pam - hfaxd authentication via PAM
 net-misc/icecast:kate - Add karaoke and text encapsulation support for Ogg files
-net-misc/icecast:logrotate - Install support files for app-admin/logrotate?
 net-misc/icecast:yp - Build support for yp public directory listings
 net-misc/iputils:arping - Build and install arping -- tool for sending ARP requests to peers (see also net-analyzer/arping)
 net-misc/iputils:clockdiff - Build and install clockdiff -- tool for comparing clocks via ICMP packets
@@ -7066,7 +7066,6 @@ sci-biology/abyss:misc-haskell - build abyss-samtobreak tool, pull in haskell to
 sci-biology/bioperl:db - Install sci-biology/bioperl-run
 sci-biology/bioperl:network - Install sci-biology/bioperl-run
 sci-biology/bioperl:run - Install sci-biology/bioperl-run
-sci-biology/bowtie:tbb - Enables building bowtie with the Intel Threading Building Blocks from dev-cpp/tbb. This flag is recommended.
 sci-biology/clustalw-mpi:mpi-njtree - Use MPI (as opposed to serial) code for computing neighbor-joining trees
 sci-biology/clustalw-mpi:static-pairalign - Use static (as opposed to dynamic) scheduling for pair alignments
 sci-biology/exonerate:utils - Install all utilities
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 74a32cb73e6b..c2d8ff11cb80 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/bowtie/Manifest b/sci-biology/bowtie/Manifest
index f9a42acddbb3..c2958853f2a0 100644
--- a/sci-biology/bowtie/Manifest
+++ b/sci-biology/bowtie/Manifest
@@ -1,4 +1,3 @@
-AUX bowtie-2.2.9-fix-c++14.patch 687 BLAKE2B a75f473f429379789a97142d7820fb19fc1a64b764236c6fa1c068cefb03e37a58b41b0a515a62d42e85b3131f0dfe8f2bb856126528099277394674a0e53248 SHA512 3aa6e7a30fdf93ae564091ce9b87338ab9feccbd0c873f4130af71dc94fd3b27527b42a93f13471a2613bad44dbacd639d17515000f03856695a0021ce14dfc5
-DIST bowtie2-2.2.9-source.zip 5734235 BLAKE2B ec48e09fe05403d1085bb4e0c6ef1325b8912da0a8c942061c34f3381c6dd7ccdcc64c4bcdbb18c1da84ac57e1e34cc866fe79809c33c2769a8d75ecde7d0846 SHA512 ead8f7641f3231638d986f9e500bc4ec7afe1e542048465bfcc2e93e2b2d2e499f0dd8aa5c1e3e21df285c9d195b187682eb7e12be4a408f6c50fb97c0e0a205
-EBUILD bowtie-2.2.9.ebuild 1277 BLAKE2B b9cf9edc34af3f01eb1cde1510637bbcbaf7206d9a24135d859d14dcefe793abd0b78dd19dbcd1835840514e754061aee86a79d5992ca68d316c64c98bb4891c SHA512 40e22698d5df241b8b98c601f8ed22276d39f4c9818bb23afec0a39b625fd38a0fdb3f4b4d6f8c01b458e2b6b3464a7ee8a135bd446f3488354eeca9934daa85
-MISC metadata.xml 528 BLAKE2B 310fb406a0dbe56b194ae13cf521264e105f9d849b09e10d5d7e556c7d00a9cc7a0f9546a91e43f30344c9ec14a76e0d8a3f037fb4cb91bba68999d9f45b69e0 SHA512 1eb83cbd7d7e747bc94021051ba6ae0bf22411091287b754851a9f6824b263b6ca83c9a0d055c0b6ab24963ceea9b32d76bf1b343f48a3ee4bd322fec539b301
+DIST bowtie2-2.4.4-source.zip 10515984 BLAKE2B be4ceb9d3155d2a9a1f580e5032251b04b89ce0c8c9c89fc3551b34fe3bd71a683362488be7aad6daef24734c6f95c19223f20e67f198f745c4432381243039c SHA512 1b5dadd7e41b90bb9b05f50bfa171fe219cfd03aa8bb6f800de4baaffeb975eef6efc4fb8b49cb0d18833f74a1741cbe1556b87388f59188e04a55dcee6a02da
+EBUILD bowtie-2.4.4.ebuild 1202 BLAKE2B 4ba725c1a324fcff1444451c51b0f5f3d031dc6bb1c0e20eef82de155c19d2bff504531fc8ce2821f6955cc97b0ab162ff8c28c8b651629bf2127c90e972ab96 SHA512 c3fd41634d8b32b389a196b6443d8768541afceb67ca404ade678be166af4624733fa4c2ee5ce5683db415a9fb1e70a7edeeadeee3e9d3905c09f70e512b4ffe
+MISC metadata.xml 341 BLAKE2B 6128267ebf9a8b0b4b6abf9da19a57f9a1da5492a6c878a531e7c43dc139c614793c4919d1a4a99739dfee4a3e6861554b9155f46d7af60a2f998811890bb70a SHA512 02b50e247581f0454829e2aaca768cc8719ee181db276feb20c5b4ed3ab3ba820af8db491075906eeb7bb4e0941940e98c5ee81a8efae0b633881e8f14cbcd74
diff --git a/sci-biology/bowtie/bowtie-2.2.9.ebuild b/sci-biology/bowtie/bowtie-2.2.9.ebuild
deleted file mode 100644
index 0bacb8ca25d7..000000000000
--- a/sci-biology/bowtie/bowtie-2.2.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Popular short read aligner for Next-generation sequencing data"
-HOMEPAGE="http://bowtie-bio.sourceforge.net/bowtie2/"
-SRC_URI="mirror://sourceforge/project/${PN}-bio/${PN}2/${PV}/${PN}2-${PV}-source.zip"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="examples cpu_flags_x86_sse2 +tbb"
-
-RDEPEND="dev-lang/perl
-	tbb? ( dev-cpp/tbb )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}2-${PV}"
-
-DOCS=( AUTHORS NEWS TUTORIAL )
-HTML_DOCS=( doc/{manual.html,style.css} )
-PATCHES=( "${FILESDIR}/${PN}-2.2.9-fix-c++14.patch" )
-
-pkg_pretend() {
-	if ! use cpu_flags_x86_sse2 ; then
-		eerror "This package requires a CPU supporting the SSE2 instruction set."
-		die "SSE2 support missing"
-	fi
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CPP="$(tc-getCXX)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="" \
-		CXXFLAGS="" \
-		EXTRA_FLAGS="${LDFLAGS}" \
-		RELEASE_FLAGS="${CXXFLAGS} -msse2" \
-		WITH_TBB="$(usex tbb 1 0)"
-}
-
-src_install() {
-	dobin ${PN}2 ${PN}2-*
-
-	exeinto /usr/libexec/${PN}2
-	doexe scripts/*
-
-	newman MANUAL ${PN}2.1
-	einstalldocs
-
-	if use examples; then
-		insinto /usr/share/${PN}2
-		doins -r example
-	fi
-}
diff --git a/sci-biology/bowtie/bowtie-2.4.4.ebuild b/sci-biology/bowtie/bowtie-2.4.4.ebuild
new file mode 100644
index 000000000000..2ba75bc2bca7
--- /dev/null
+++ b/sci-biology/bowtie/bowtie-2.4.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="Popular short read aligner for Next-generation sequencing data"
+HOMEPAGE="http://bowtie-bio.sourceforge.net/bowtie2/"
+SRC_URI="mirror://sourceforge/project/${PN}-bio/bowtie2/${PV}/bowtie2-${PV}-source.zip"
+S="${WORKDIR}/${PN}2-${PV}"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse2 examples"
+REQUIRED_USE="cpu_flags_x86_sse2 ${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+src_compile() {
+	emake \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="" \
+		CPPFLAGS="${CPPFLAGS}" \
+		EXTRA_FLAGS="${LDFLAGS}" \
+		RELEASE_FLAGS="${CXXFLAGS} -msse2"
+}
+
+src_install() {
+	dobin bowtie2 bowtie2-*
+
+	exeinto /usr/libexec/bowtie2
+	doexe scripts/*
+
+	HTML_DOCS=( doc/{manual.html,style.css} )
+	einstalldocs
+	dodoc TUTORIAL
+	newman MANUAL bowtie2.1
+
+	python_fix_shebang "${ED}"/usr/bin/bowtie2-{build,inspect}
+
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sci-biology/bowtie/files/bowtie-2.2.9-fix-c++14.patch b/sci-biology/bowtie/files/bowtie-2.2.9-fix-c++14.patch
deleted file mode 100644
index cd2a67b6a52b..000000000000
--- a/sci-biology/bowtie/files/bowtie-2.2.9-fix-c++14.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix building with C++14, which errors out due to differing semantics between C++98
-and C++14 with regards to allowing destructors to throw exceptions.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=593966
-
---- a/blockwise_sa.h
-+++ b/blockwise_sa.h
-@@ -87,7 +87,11 @@
- 	_logger(__logger)
- 	{ }
- 
--	virtual ~BlockwiseSA() { }
-+	virtual ~BlockwiseSA()
-+#if __cplusplus >= 201103L
-+	noexcept(false)
-+#endif
-+	{ }
- 
- 	/**
- 	 * Get the next suffix; compute the next bucket if necessary.
-@@ -216,6 +220,9 @@
-     { _randomSrc.init(__seed); reset(); }
-     
-     ~KarkkainenBlockwiseSA()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
-     {
- #ifdef WITH_TBB
- 		    tbb_grp.wait();
diff --git a/sci-biology/bowtie/metadata.xml b/sci-biology/bowtie/metadata.xml
index 71e8d3bb8e0f..f570878c86e5 100644
--- a/sci-biology/bowtie/metadata.xml
+++ b/sci-biology/bowtie/metadata.xml
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-biology@gentoo.org</email>
-    <name>Gentoo Biology Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">bowtie-bio</remote-id>
-  </upstream>
-  <use>
-    <flag name="tbb">Enables building bowtie with the Intel
-      Threading Building Blocks from <pkg>dev-cpp/tbb</pkg>. This
-      flag is recommended.</flag>
-  </use>
+	<maintainer type="project">
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">bowtie-bio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-biology/emboss/Manifest b/sci-biology/emboss/Manifest
index d3d3d46bb05a..192e7507fed5 100644
--- a/sci-biology/emboss/Manifest
+++ b/sci-biology/emboss/Manifest
@@ -1,8 +1,5 @@
 AUX README.gentoo 1522 BLAKE2B 566213e78e6c74fc6c8745391fbdbc477c9d1793f74e68fb0465ba4f842203e1670dd6216c4181326a4ccbf0c051daa99a376a15dd5b0714473f84ed8404e8f7 SHA512 a5441a056ebb11d24b83b8bfb9182f0753b85ec5ba126a123eb97c55fc665dadff2cc5f16c8e4314535f1b6a206c200324c0c5d5db6af109c841ee68ac76bb07
-AUX emboss-6.6.0_FORTIFY_SOURCE-fix.patch 417 BLAKE2B 6662dae6877f28bc53942e3989846835721c31a79eeb62fd0b2fc4bf5bf8dc63c25f43831667985109f109bf463f795190018801ba84811c7e94b135047f7d4c SHA512 9873504675825613c913fbd8c03d919c5d70ad7f15e3983ae9dc5ecd04e57d1086c303a4f38efd29def4f089099b24449014bbe965816c7f8b37a5d4ffa13469
-AUX emboss-6.6.0_fix-build-system.patch 12599 BLAKE2B dbe6a94a801b0f46df0e7490c7b07ad85a143c07821d8bc083221d07b1286275c7fd5cd183c5c08d06dc6fb3c71eacd265d872647828991fd52551ae618bcaf7 SHA512 60dbb50967b0b855fabd68f2df7713da81007cb84aeb3f2d7510d13e533e3b19ed3d07e012010ebb1b2af04522f6f2142fbef405b9b580740a6bb5d30319b67b
-AUX emboss-6.6.0_plplot-declarations.patch 1562 BLAKE2B f6c19e6cb7c2eb8110a3841ed566d81411e75a6898cdfbb8ce4754a69291f78a069a44fbc5027430611ee83ca5a7abe1e536a59bedd01e30227c5762622614bd SHA512 fc27b7c1d518b5cdacf1964d56219c6574f43d18dc324e41b9dcdfd1afef17a784f2b209b62c366fb902ba57a50f438a1b328eb2118ee9463ce82b36039bc0bb
-AUX emboss-6.6.0_qa-implicit-declarations.patch 1324 BLAKE2B 42da02b30fa201e24091df762386a88ad76709d192dab95c82cf578126ef9973ba1e927711ac5dd3eee1cfac22a2d29fc75045ce72322cbd7faaa6d50564319e SHA512 15c303fe48a438f50f1c9a0efd7e8fcbcb4102151fc182feb8e0d74c47c3435385a1e44436cebd3c2017c97dd89b82832258748f28f3740e511a92b088f539fb
 DIST EMBOSS-6.6.0.tar.gz 117962028 BLAKE2B 91bf3c680290bd975d2ddb5251089d7f75f8a44a26e1247e93d2c9cf2f23e6b89c4218022ba1af0c940136ff56782f40d2c4604dc756b400ae23f223da7f3cca SHA512 2d28a03381f7dc98d205aa50202fbbac02ad218fc775d86579d310296be124403623484b1907154d915f15cd32a9f8cf16ecfaa6c4a28b362e24dc8e6380b75a
-EBUILD emboss-6.6.0-r1.ebuild 1631 BLAKE2B 561dcc9b1dcf2cfe71e6c42e1770d8dfee2a25df7bb86da22d9fe934a118f974f2294f444c0047cd28794d9f94356a201a050c878c2185df20e0a7bea59d819c SHA512 27c4c445c27c3915fac4b35e997ae549c86669b8998c5086af7b533fc69366e118dbb4a8f833e79bd4b8f783af7e2424e398f4b898b002725c42780e24b66bf8
+DIST emboss-6.6.0-patches.tar.xz 5408 BLAKE2B ec1c55c90a64b1c27645804411b44e413ae881b1637ad2b8dfcff172e15b841cc3d2807039761f8307b0b5a29ab5b1a2c840e189f326091aa9ce25317ec9cda6 SHA512 942681df428f6254c1711902f667c6e8c71babf3e9b0c73b8b7d2fbfa5e8856ce5817560280948e588f6037011ad7055a3af5b88a58fc2b14349869927c889eb
+EBUILD emboss-6.6.0-r1.ebuild 1827 BLAKE2B 4e8b0902b12d390abadbf5c9a9e2824a94bc5513aadb87959eb2faf245ad75246ee3080f75e2ebfb34792471e65350a3cee2a7f08837402b43d7e5608eb181d7 SHA512 e5297ce7678262a91c8749217f094a944b87eb157893542fe89fa6ffb770726959dfe8fd1a1f84aa349432a636419cf2cba6950e83bcc1a6c0156c97144b075e
 MISC metadata.xml 1096 BLAKE2B 704b6e7e0e9cb07a4cb184813ede8d7410d6612b2c8626838383a383dbd44f85b7f1dbcc988634f22d06ad76fbac927b4fd8a8836191be702c4f99a26343c6ac SHA512 4964b7e46d9fc16fcc44aaf83d0bb21a5ae860300764ca50e25f51ee0affc55fd863027747eb8e0eeca3578eefecbe23cba5ce68d518960e1721047cbefa9a3d
diff --git a/sci-biology/emboss/emboss-6.6.0-r1.ebuild b/sci-biology/emboss/emboss-6.6.0-r1.ebuild
index 1c74ded5e22f..766dd6a61b0c 100644
--- a/sci-biology/emboss/emboss-6.6.0-r1.ebuild
+++ b/sci-biology/emboss/emboss-6.6.0-r1.ebuild
@@ -8,7 +8,9 @@ EBO_EAUTORECONF=1
 inherit emboss-r2 readme.gentoo-r1
 
 DESCRIPTION="The European Molecular Biology Open Software Suite - A sequence analysis package"
-SRC_URI="ftp://emboss.open-bio.org/pub/${PN^^}/${P^^}.tar.gz"
+SRC_URI="
+	ftp://emboss.open-bio.org/pub/${PN^^}/${P^^}.tar.gz
+	https://dev.gentoo.org/~soap/distfiles/${P}-patches.tar.xz"
 S="${WORKDIR}/${P^^}"
 
 LICENSE+=" Apache-2.0 GPL-3+ CC-BY-3.0"
@@ -29,10 +31,12 @@ PDEPEND="
 	)"
 
 PATCHES=(
-	"${FILESDIR}"/${P}_fix-build-system.patch
-	"${FILESDIR}"/${P}_FORTIFY_SOURCE-fix.patch
-	"${FILESDIR}"/${P}_plplot-declarations.patch
-	"${FILESDIR}"/${P}_qa-implicit-declarations.patch
+	"${WORKDIR}"/patches/${P}-fix-build-system.patch
+	"${WORKDIR}"/patches/${P}-FORTIFY_SOURCE-fix.patch
+	"${WORKDIR}"/patches/${P}-plplot-declarations.patch
+	"${WORKDIR}"/patches/${P}-qa-implicit-declarations.patch
+	"${WORKDIR}"/patches/${P}-C99-bool.patch
+	"${WORKDIR}"/patches/${P}-Wimplicit-function-declaration.patch
 )
 
 src_install() {
diff --git a/sci-biology/emboss/files/emboss-6.6.0_FORTIFY_SOURCE-fix.patch b/sci-biology/emboss/files/emboss-6.6.0_FORTIFY_SOURCE-fix.patch
deleted file mode 100644
index 7704873e9d26..000000000000
--- a/sci-biology/emboss/files/emboss-6.6.0_FORTIFY_SOURCE-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- EMBOSS-6.6.0/emboss/embossversion.c
-+++ EMBOSS-6.6.0/emboss/embossversion.c
-@@ -415,7 +415,7 @@
- 	ajFmtPrintF(outfile, "X_DISPLAY_MISSING %d\n", X_DISPLAY_MISSING);
- #endif
- #ifdef _FORTIFY_SOURCE
--	ajFmtPrintF(outfile, "_FORTIFY_SOURCE %d\n", _FORTIFY_SOURCE);
-+	ajFmtPrintF(outfile, "_FORTIFY_SOURCE %d\n", __USE_FORTIFY_LEVEL);
- #endif
- 	ajFmtPrintF(outfile, "\n");
- 	ajFmtPrintF(outfile, "Sizes (bytes):\n");
diff --git a/sci-biology/emboss/files/emboss-6.6.0_fix-build-system.patch b/sci-biology/emboss/files/emboss-6.6.0_fix-build-system.patch
deleted file mode 100644
index 266bddd95a37..000000000000
--- a/sci-biology/emboss/files/emboss-6.6.0_fix-build-system.patch
+++ /dev/null
@@ -1,411 +0,0 @@
- Makefile.am               |  9 +++---
- ajax/Makefile.am          |  4 +--
- ajax/acd/Makefile.am      |  8 +++--
- ajax/ajaxdb/Makefile.am   |  6 ++--
- ajax/core/Makefile.am     |  6 ++--
- ajax/core/ajreg.h         |  7 ++--
- ajax/ensembl/Makefile.am  |  6 ++--
- ajax/graphics/Makefile.am |  8 +++--
- configure.ac              | 82 ++++++++++++++++++++++++++---------------------
- emboss/Makefile.am        | 13 +++++---
- jemboss/lib/Makefile.am   |  2 +-
- m4/idxdbs.m4              | 17 +++-------
- nucleus/Makefile.am       |  8 +++--
- 13 files changed, 100 insertions(+), 76 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 177dec5..18dd99a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -12,8 +12,11 @@ LICENSE \
- ONEWS \
- PROBLEMS
- 
--SUBDIRS = \
--plplot \
-+SUBDIRS =
-+if !ESYSTEMLIBS
-+SUBDIRS += plplot
-+endif
-+SUBDIRS += \
- ajax \
- nucleus \
- emboss \
-@@ -33,5 +36,3 @@ dist-hook:
- 	tar cBf - doc | ( cd $(distdir); tar xBf - ; find doc -name CVS | xargs rm -rf; )
- 	tar cBf - jemboss | ( cd $(distdir); tar xBf - ; find jemboss -name CVS | xargs rm -rf; find jemboss -name Makefile | xargs rm -rf; find jemboss -name .cvsignore | xargs rm -rf )
- 
--install-exec-hook:
--	$(bindir)/embossupdate
-diff --git a/ajax/Makefile.am b/ajax/Makefile.am
-index f27472c..de34e17 100644
---- a/ajax/Makefile.am
-+++ b/ajax/Makefile.am
-@@ -1,7 +1,7 @@
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS  = pcre
-+SUBDIRS  =
- if !ESYSTEMLIBS
--SUBDIRS += expat zlib
-+SUBDIRS += pcre expat zlib
- endif
- SUBDIRS += core graphics ensembl ajaxdb acd
-diff --git a/ajax/acd/Makefile.am b/ajax/acd/Makefile.am
-index 9f0f700..3295a1d 100644
---- a/ajax/acd/Makefile.am
-+++ b/ajax/acd/Makefile.am
-@@ -3,16 +3,20 @@
- lib_LTLIBRARIES = libacd.la
- 
- libacd_la_CFLAGS = $(WARN_CFLAGS) $(DEVWARN_CFLAGS) $(JAVA_CFLAGS)
-+libacd_la_LIBADD = ../core/libajax.la ../graphics/libajaxg.la
- 
- libacd_la_CPPFLAGS  = -I$(top_srcdir)/ajax/ajaxdb
-+libacd_la_CPPFLAGS += -I$(top_srcdir)/ajax/core
- libacd_la_CPPFLAGS += -I$(top_srcdir)/ajax/ensembl
- libacd_la_CPPFLAGS += -I$(top_srcdir)/ajax/graphics
--libacd_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
- if !ESYSTEMLIBS
-+libacd_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
- libacd_la_CPPFLAGS += -I$(top_srcdir)/ajax/expat
- libacd_la_CPPFLAGS += -I$(top_srcdir)/ajax/zlib
--endif
- libacd_la_CPPFLAGS += -I$(top_srcdir)/plplot
-+else
-+libacd_la_CFLAGS   += $(PLPLOT_CFLAGS)
-+endif
- libacd_la_CPPFLAGS += $(JAVA_CPPFLAGS)
- 
- libacd_la_LDFLAGS  = -version-info 6:5:0
-diff --git a/ajax/ajaxdb/Makefile.am b/ajax/ajaxdb/Makefile.am
-index c2b0c00..9de14fe 100644
---- a/ajax/ajaxdb/Makefile.am
-+++ b/ajax/ajaxdb/Makefile.am
-@@ -3,14 +3,16 @@
- lib_LTLIBRARIES = libajaxdb.la
- 
- libajaxdb_la_CFLAGS = $(WARN_CFLAGS) $(DEVWARN_CFLAGS) $(JAVA_CFLAGS)
-+libajaxdb_la_LIBADD = ../core/libajax.la ../ensembl/libensembl.la
- 
- libajaxdb_la_CPPFLAGS  = -I$(top_srcdir)/ajax/ensembl
--libajaxdb_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
-+libajaxdb_la_CPPFLAGS += -I$(top_srcdir)/ajax/core
- if !ESYSTEMLIBS
-+libajaxdb_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
- libajaxdb_la_CPPFLAGS += -I$(top_srcdir)/ajax/expat
- libajaxdb_la_CPPFLAGS += -I$(top_srcdir)/ajax/zlib
--endif
- libajaxdb_la_CPPFLAGS += -I$(top_srcdir)/plplot
-+endif
- libajaxdb_la_CPPFLAGS += $(AXIS2C_CPPFLAGS)
- libajaxdb_la_CPPFLAGS += $(JAVA_CPPFLAGS)
- 
-diff --git a/ajax/core/Makefile.am b/ajax/core/Makefile.am
-index 2906837..3189c34 100644
---- a/ajax/core/Makefile.am
-+++ b/ajax/core/Makefile.am
-@@ -3,13 +3,15 @@
- lib_LTLIBRARIES = libajax.la
- 
- libajax_la_CFLAGS = $(WARN_CFLAGS) $(DEVWARN_CFLAGS) $(JAVA_CFLAGS)
-+libajax_la_LIBADD = $(EXPAT_LIBS) $(PCRE_LIBS) $(ZLIB_LIBS)
- 
--libajax_la_CPPFLAGS  = -I$(top_srcdir)/ajax/pcre
-+libajax_la_CPPFLAGS  =
- if !ESYSTEMLIBS
-+libajax_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
- libajax_la_CPPFLAGS += -I$(top_srcdir)/ajax/expat
- libajax_la_CPPFLAGS += -I$(top_srcdir)/ajax/zlib
--endif
- libajax_la_CPPFLAGS += -I$(top_srcdir)/plplot
-+endif
- libajax_la_CPPFLAGS += $(JAVA_CPPFLAGS)
- libajax_la_CPPFLAGS += $(MYSQL_CPPFLAGS)
- libajax_la_CPPFLAGS += $(POSTGRESQL_CPPFLAGS)
-diff --git a/ajax/core/ajreg.h b/ajax/core/ajreg.h
-index 1623c82..5d928cf 100644
---- a/ajax/core/ajreg.h
-+++ b/ajax/core/ajreg.h
-@@ -39,9 +39,8 @@
- #include "ajdefine.h"
- #include "ajstr.h"
- 
--#include "pcre_config.h"
--#include "pcre_internal.h"
--#include "pcreposix.h"
-+#include <pcre.h>
-+#include <pcreposix.h>
- 
- AJ_BEGIN_DECLS
- 
-@@ -84,7 +83,7 @@ AJ_BEGIN_DECLS
- 
- typedef struct AjSRegexp
- {
--    real_pcre *pcre;
-+    struct real_pcre *pcre;
-     pcre_extra *extra;
-     int *ovector;
-     const char* orig;
-diff --git a/ajax/ensembl/Makefile.am b/ajax/ensembl/Makefile.am
-index 0d1250b..5484c02 100644
---- a/ajax/ensembl/Makefile.am
-+++ b/ajax/ensembl/Makefile.am
-@@ -3,13 +3,15 @@
- lib_LTLIBRARIES = libensembl.la
- 
- libensembl_la_CFLAGS = $(WARN_CFLAGS) $(DEVWARN_CFLAGS) $(JAVA_CFLAGS)
-+libensembl_la_LIBADD = ../core/libajax.la
- 
--libensembl_la_CPPFLAGS  = -I$(top_srcdir)/ajax/pcre
-+libensembl_la_CPPFLAGS  = -I$(top_srcdir)/ajax/core
- if !ESYSTEMLIBS
-+libensembl_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
- libensembl_la_CPPFLAGS += -I$(top_srcdir)/ajax/expat
- libensembl_la_CPPFLAGS += -I$(top_srcdir)/ajax/zlib
--endif
- libensembl_la_CPPFLAGS += -I$(top_srcdir)/plplot
-+endif
- libensembl_la_CPPFLAGS += $(JAVA_CPPFLAGS)
- 
- libensembl_la_LDFLAGS  = -version-info 6:5:0
-diff --git a/ajax/graphics/Makefile.am b/ajax/graphics/Makefile.am
-index a4f202b..1114c2c 100644
---- a/ajax/graphics/Makefile.am
-+++ b/ajax/graphics/Makefile.am
-@@ -3,12 +3,16 @@
- lib_LTLIBRARIES = libajaxg.la
- 
- libajaxg_la_CFLAGS = $(WARN_CFLAGS) $(DEVWARN_CFLAGS) $(JAVA_CFLAGS)
-+libajaxg_la_LIBADD = ../core/libajax.la $(PLPLOT_LIBS)
- 
--libajaxg_la_CPPFLAGS  = -I$(top_srcdir)/ajax/pcre
-+libajaxg_la_CPPFLAGS  = -I$(top_srcdir)/ajax/core
- if !ESYSTEMLIBS
-+libajaxg_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
- libajaxg_la_CPPFLAGS += -I$(top_srcdir)/ajax/expat
--endif
- libajaxg_la_CPPFLAGS += -I$(top_srcdir)/plplot
-+else
-+libajaxg_la_CFLAGS   += $(PLPLOT_CFLAGS)
-+endif
- libajaxg_la_CPPFLAGS += $(JAVA_CPPFLAGS)
- 
- libajaxg_la_LDFLAGS  = -version-info 6:5:0
-diff --git a/configure.ac b/configure.ac
-index a7bd9c6..9ba3121 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -629,32 +629,6 @@ AS_CASE([${host_os}],
- 
- 
- 
--
--dnl PCRE library definitions - see the MAJOR and MINOR values
--dnl to see which version's configure.in these lines come from
--
--dnl Provide the current PCRE version information. Do not use numbers
--dnl with leading zeros for the minor version, as they end up in a C
--dnl macro, and may be treated as octal constants. Stick to single
--dnl digits for minor numbers less than 10. There are unlikely to be
--dnl that many releases anyway.
--
--PCRE_MAJOR="7"
--PCRE_MINOR="9"
--PCRE_DATE="11-Apr-2009"
--PCRE_VERSION="${PCRE_MAJOR}.${PCRE_MINOR}"
--
--dnl Default values for miscellaneous macros
--
--POSIX_MALLOC_THRESHOLD="-DPOSIX_MALLOC_THRESHOLD=10"
--
--dnl Provide versioning information for libtool shared libraries that
--dnl are built by default on Unix systems.
--
--PCRE_LIB_VERSION="0:1:0"
--PCRE_POSIXLIB_VERSION="0:0:0"
--
--
- dnl Define where the EMBOSS package is located
- AC_SUBST([AJAX_FIXED_ROOT])
- AJAX_FIXED_ROOT="\\\"`pwd`/emboss\\\""
-@@ -743,17 +717,7 @@ AX_LIB_POSTGRESQL
- 
- 
- 
--dnl "Export" these variables for PCRE
- 
--AC_SUBST([HAVE_MEMMOVE])
--AC_SUBST([HAVE_STRERROR])
--AC_SUBST([PCRE_MAJOR])
--AC_SUBST([PCRE_MINOR])
--AC_SUBST([PCRE_DATE])
--AC_SUBST([PCRE_VERSION])
--AC_SUBST([PCRE_LIB_VERSION])
--AC_SUBST([PCRE_POSIXLIB_VERSION])
--AC_SUBST([POSIX_MALLOC_THRESHOLD])
- 
- 
- 
-@@ -849,7 +813,53 @@ AC_ARG_ENABLE([systemlibs],
- 
- AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
- 
-+AS_IF([test "x${enable_systemlibs}" = "xyes"],
-+[
-+dnl using system libraries
-+  PKG_CHECK_MODULES([PCRE], [libpcre])
-+  PKG_CHECK_MODULES([EXPAT], [expat])
-+  PKG_CHECK_MODULES([ZLIB], [zlib])
-+  PKG_CHECK_MODULES([PLPLOT], [plplotd],
-+    [],[PKG_CHECK_MODULES([PLPLOT], [plplot])]
-+    )
-+],
-+[
-+dnl using bundled libraries
-+  dnl PCRE library definitions - see the MAJOR and MINOR values
-+  dnl to see which version's configure.ac these lines come from
- 
-+  dnl Provide the current PCRE version information. Do not use numbers
-+  dnl with leading zeros for the minor version, as they end up in a C
-+  dnl macro, and may be treated as octal constants. Stick to single
-+  dnl digits for minor numbers less than 10. There are unlikely to be
-+  dnl that many releases anyway.
-+
-+  PCRE_MAJOR="7"
-+  PCRE_MINOR="9"
-+  PCRE_DATE="11-Apr-2009"
-+  PCRE_VERSION="${PCRE_MAJOR}.${PCRE_MINOR}"
-+
-+  dnl Default values for miscellaneous macros
-+
-+  POSIX_MALLOC_THRESHOLD="-DPOSIX_MALLOC_THRESHOLD=10"
-+
-+  dnl Provide versioning information for libtool shared libraries that
-+  dnl are built by default on Unix systems.
-+
-+  PCRE_LIB_VERSION="0:1:0"
-+  PCRE_POSIXLIB_VERSION="0:0:0"
-+
-+  dnl "Export" these variables for PCRE
-+  AC_SUBST([HAVE_MEMMOVE])
-+  AC_SUBST([HAVE_STRERROR])
-+  AC_SUBST([PCRE_MAJOR])
-+  AC_SUBST([PCRE_MINOR])
-+  AC_SUBST([PCRE_DATE])
-+  AC_SUBST([PCRE_VERSION])
-+  AC_SUBST([PCRE_LIB_VERSION])
-+  AC_SUBST([PCRE_POSIXLIB_VERSION])
-+  AC_SUBST([POSIX_MALLOC_THRESHOLD])
-+])
- 
- 
- # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
-diff --git a/emboss/Makefile.am b/emboss/Makefile.am
-index 89ada78..f987d40 100644
---- a/emboss/Makefile.am
-+++ b/emboss/Makefile.am
-@@ -28,15 +28,18 @@ endif
- 
- AM_CPPFLAGS  = -I$(top_srcdir)/ajax/acd
- AM_CPPFLAGS += -I$(top_srcdir)/ajax/ajaxdb
-+AM_CPPFLAGS += -I$(top_srcdir)/ajax/core
- AM_CPPFLAGS += -I$(top_srcdir)/ajax/ensembl
- AM_CPPFLAGS += -I$(top_srcdir)/ajax/graphics
-+if !ESYSTEMLIBS
- AM_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
--if !ESYSTEMLIBS
- AM_CPPFLAGS += -I$(top_srcdir)/ajax/expat
- AM_CPPFLAGS += -I$(top_srcdir)/ajax/zlib
--endif
--AM_CPPFLAGS += -I$(top_srcdir)/nucleus
- AM_CPPFLAGS += -I$(top_srcdir)/plplot
-+else
-+AM_CFLAGS   += $(PLPLOT_CFLAGS)
-+endif
-+AM_CPPFLAGS += -I$(top_srcdir)/nucleus
- AM_CPPFLAGS += $(AXIS2C_CPPFLAGS)
- AM_CPPFLAGS += $(JAVA_CPPFLAGS)
- 
-@@ -49,9 +52,11 @@ LDADD += ../ajax/core/libajax.la
- if !ESYSTEMLIBS
- LDADD += ../ajax/zlib/libezlib.la
- LDADD += ../ajax/expat/libeexpat.la
--endif
- LDADD += ../ajax/pcre/libepcre.la
- LDADD += ../plplot/libeplplot.la
-+else
-+LDADD += $(EXPAT_LIBS) $(PCRE_LIBS) $(ZLIB_LIBS) $(PLPLOT_LIBS)
-+endif
- LDADD += $(XLIB)
- 
- #if PURIFY
-diff --git a/jemboss/lib/Makefile.am b/jemboss/lib/Makefile.am
-index 5f7e21e..8b45ce2 100644
---- a/jemboss/lib/Makefile.am
-+++ b/jemboss/lib/Makefile.am
-@@ -12,7 +12,7 @@ mail.jar \
- jalviewApplet.jar \
- jemboss.jar
- 
--jemboss.jar:../org/emboss/jemboss/server/JembossFile*Server.java
-+jemboss.jar:$(srcdir)/../org/emboss/jemboss/server/JembossFile*Server.java
- if JAVA_BUILD
- 	$(ANT) -f ../build.xml package -Demboss.data=../emboss/data -Dname=jemboss -Djar.dir=lib -Dnotformemboss=yes;
- endif
-diff --git a/m4/idxdbs.m4 b/m4/idxdbs.m4
-index 0ca7ea9..9b54f2a 100644
---- a/m4/idxdbs.m4
-+++ b/m4/idxdbs.m4
-@@ -1,17 +1,8 @@
- AC_DEFUN([CHECK_IDXDBS],
- [
--AC_MSG_CHECKING(for EMBOSS pre-indexed databases)
-+AC_MSG_NOTICE(checking for EMBOSS pre-indexed databases)
- 
--
--if test -f ./emboss/index/edam.xac; then
--AC_MSG_RESULT(yes)
--else
--AC_MSG_RESULT(no)
--echo ""
--echo "Pre-indexed edam, taxon + drcat databases not found."
--echo "Please download them from within this directory using:"
--echo "    rsync -av rsync://emboss.open-bio.org/EMBOSS/ ."
--echo "and then repeat the configure step."
--exit 1
--fi
-+AC_CHECK_FILE([$srcdir/emboss/index/edam.xac],
-+	[],
-+	[AC_MSG_ERROR([cannot find pre-indexed edam, taxon + drcat databases])])
- ])
-diff --git a/nucleus/Makefile.am b/nucleus/Makefile.am
-index 37b8543..5819c89 100644
---- a/nucleus/Makefile.am
-+++ b/nucleus/Makefile.am
-@@ -3,6 +3,7 @@
- lib_LTLIBRARIES = libnucleus.la
- 
- libnucleus_la_CFLAGS  = $(WARN_CFLAGS) $(DEVWARN_CFLAGS) $(JAVA_CFLAGS)
-+libnucleus_la_LIBADD  = ../ajax/core/libajax.la ../ajax/ajaxdb/libajaxdb.la ../ajax/acd/libacd.la
- 
- if ISSHARED
- if ISAIXIA64
-@@ -10,11 +11,14 @@ libnucleus_la_CFLAGS += -Wl,-G -lm
- endif
- endif
- 
--libnucleus_la_CPPFLAGS  = -I$(top_srcdir)/plplot
--libnucleus_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
-+libnucleus_la_CPPFLAGS  = -I$(top_srcdir)/ajax/core
- if !ESYSTEMLIBS
-+libnucleus_la_CPPFLAGS += -I$(top_srcdir)/plplot
-+libnucleus_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
- libnucleus_la_CPPFLAGS += -I$(top_srcdir)/ajax/expat
- libnucleus_la_CPPFLAGS += -I$(top_srcdir)/ajax/zlib
-+else
-+libnucleus_la_CFLAGS   += $(PLPLOT_CFLAGS)
- endif
- libnucleus_la_CPPFLAGS += -I$(top_srcdir)/ajax/graphics
- libnucleus_la_CPPFLAGS += -I$(top_srcdir)/ajax/ensembl
diff --git a/sci-biology/emboss/files/emboss-6.6.0_plplot-declarations.patch b/sci-biology/emboss/files/emboss-6.6.0_plplot-declarations.patch
deleted file mode 100644
index 15f5f967a07d..000000000000
--- a/sci-biology/emboss/files/emboss-6.6.0_plplot-declarations.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- EMBOSS-6.6.0/ajax/graphics/ajgraph.c
-+++ EMBOSS-6.6.0/ajax/graphics/ajgraph.c
-@@ -49,7 +49,7 @@
- 
- #define GRAPH_DEBUG 1
- 
--#include "plplotP.h"
-+#include <plplotP.h>
- 
- 
- static void     GraphArray(ajuint numofpoints,
-@@ -964,10 +964,10 @@
-     if(!thys->ready)
-     {
- #if GRAPH_DEBUG
--        ajDebug("=g= plxsfnam ('%S', '%s')\n", txt, ext);
-+        ajDebug("=g= plsfnam ('%S')\n", txt);
- #endif
- 
--        plxsfnam(ajStrGetPtr(txt), ext);
-+        plsfnam(ajStrGetPtr(txt));
-         ajStrAssignS(&graphBasename, txt);
-         ajStrAssignC(&graphExtension, ext);
-         if(ajStrGetCharFirst(graphExtension) == '.')
-@@ -1213,10 +1213,10 @@
- void ajGraphicsSetPenwidth(float penwidth)
- {
- #if GRAPH_DEBUG
--    ajDebug("=g= plwid(%.2f) [width]\n", penwidth);
-+    ajDebug("=g= c_plwidth(%.2f) [width]\n", penwidth);
- #endif
- 
--    plwid((PLINT)penwidth);
-+    c_plwidth((PLINT)penwidth);
- 
-     return;
- }
-@@ -1538,10 +1538,10 @@
- static void GraphSetPen(ajint colour)
- {
- #if GRAPH_DEBUG
--    ajDebug("=g= plcol(%d '%s') [colour]\n", colour, graphColourName[colour]);
-+    ajDebug("=g= plcol0(%d '%s') [colour]\n", colour, graphColourName[colour]);
- #endif
- 
--    plcol((PLINT)colour);
-+    plcol0((PLINT)colour);
- 
-     return;
- }
---- EMBOSS-6.6.0/ajax/graphics/ajgraph.h
-+++ EMBOSS-6.6.0/ajax/graphics/ajgraph.h
-@@ -32,7 +32,7 @@
- /* ========================================================================= */
- 
- #include "ajdefine.h"
--#include "plplot.h"
-+#include <plplot.h>
- #include "ajgraphstruct.h"
- #include "ajdefine.h"
- #include "ajstr.h"
diff --git a/sci-biology/emboss/files/emboss-6.6.0_qa-implicit-declarations.patch b/sci-biology/emboss/files/emboss-6.6.0_qa-implicit-declarations.patch
deleted file mode 100644
index eff10b2e6700..000000000000
--- a/sci-biology/emboss/files/emboss-6.6.0_qa-implicit-declarations.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- EMBOSS-6.6.0/ajax/core/ajfeatread.c
-+++ EMBOSS-6.6.0/ajax/core/ajfeatread.c
-@@ -45,6 +45,7 @@
- 
- #include <limits.h>
- #include <math.h>
-+#include <string.h>
- #include <errno.h>
- 
- #ifdef WIN32
---- EMBOSS-6.6.0/ajax/core/ajfeatwrite.c
-+++ EMBOSS-6.6.0/ajax/core/ajfeatwrite.c
-@@ -43,7 +43,7 @@
- 
- #include <limits.h>
- #include <math.h>
--
-+#include <string.h>
- 
- static AjPRegexp featoutRegUfoFmt = NULL;
- static AjPRegexp featoutRegUfoFile = NULL;
---- EMBOSS-6.6.0/ajax/core/ajpdbio.c
-+++ EMBOSS-6.6.0/ajax/core/ajpdbio.c
-@@ -37,7 +37,7 @@
- 
- #include <limits.h>
- #include <math.h>
--
-+#include <string.h>
- 
- 
- 
---- EMBOSS-6.6.0/ajax/core/ajreg.c
-+++ EMBOSS-6.6.0/ajax/core/ajreg.c
-@@ -32,6 +32,7 @@
- #include "ajlib.h"
- 
- #include "ajreg.h"
-+#include <string.h>
- 
- 
- 
---- EMBOSS-6.6.0/ajax/core/ajseqtype.c
-+++ EMBOSS-6.6.0/ajax/core/ajseqtype.c
-@@ -32,7 +32,7 @@
- #include "ajfeat.h"
- #include "ajfile.h"
- #include "ajreg.h"
--
-+#include <string.h>
- 
- 
- 
---- EMBOSS-6.6.0/nucleus/embindex.c
-+++ EMBOSS-6.6.0/nucleus/embindex.c
-@@ -35,6 +35,7 @@
- #include "ajnam.h"
- 
- #include <errno.h>
-+#include <string.h>
- 
- #define BTENTRYFILE     ".ent"
- #define KWLIMIT 12
---- EMBOSS-6.6.0/nucleus/embword.c
-+++ EMBOSS-6.6.0/nucleus/embword.c
-@@ -36,7 +36,7 @@
- #include "ajutil.h"
- 
- #include <math.h>
--
-+#include <string.h>
- 
- 
- 
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index f19bea934c99..275b330f8074 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index 8f39fd895945..f5813909181f 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,7 +1,9 @@
 DIST qalculate-gtk-3.17.0.tar.gz 2414740 BLAKE2B e24cd509566ab2daa106b5d233f8d851409b933e82b4057cd2c9b3c6b3526a30f878f2512243711e77718dd12cd4208a5c60bbded7eae50a8841a49c75814bb7 SHA512 ea4413d1574f9875810d82c80590de46c3c424b6466508faab30c6b2505ddd306fb206f316ec99e28a7e5311f2842e011206b9caca4aed36245d1f16f25f5de5
 DIST qalculate-gtk-3.18.0.tar.gz 2418606 BLAKE2B 19c37474cacacd9e4c3ebdc58441a9c032cb86382e5545760018731b197765cae19d2f5687aeeb3ab09b2c137ec3f383f442a0b7910109fb0b664019837bb905 SHA512 d90c7188b28853489363663199be500e83dc908af6956d31d7f50c0797db262282475b7cc56bf177ebbacc3a0aaec5499c10c7270bd44a848589f16ea190b03e
 DIST qalculate-gtk-3.19.0.tar.gz 2508273 BLAKE2B db2f479c9fbbc11ece391e324858aad4404bdca03e14f69e7e2ed8966850fa5f699dd82d9ef613054d5113f5137b983e6520c2dc1c8e5a83ce253ea140d7c522 SHA512 3587ca55673bf71476423be6ec99fd8245c19c725866103862cd622e39e136cfaa94cd86744ede7a700a6e7886b7e8b84d646b25a1a22c73242a0ba9719149d6
+DIST qalculate-gtk-3.20.1.tar.gz 2547876 BLAKE2B d357ba4c03f39d504c2dda0e3d48b443ca05f5dd092bfef35f688947bf5c73eabef4756c7f53280cfd382e78c283f90a99dfa5d9727c5a9addce1c65c0ec9fb4 SHA512 5cdb5154a329514ed9d9c2081d15bfad4f12e2fc837ee3c32313a88492b06cb1139e1774ab3b3c3d4018a6a1d875022fafbf6ca904f8e8f56b60eda2450ef1e5
 EBUILD qalculate-gtk-3.17.0.ebuild 841 BLAKE2B 0240be3d37f43cf047c74d89c35c72394f6b564f490ca095a80b047d849e718ecb3025704804467fb3199d97591a004bac7dc34915a553987e9f7f4bc07a032d SHA512 748ea72a4e2b62d288131b20ff231cc57a88ed33fc623f68807973f617f670e8532f27582bf148fddc059aff92c06ea4560edddb8120b8ceb12d3fd78999f54e
 EBUILD qalculate-gtk-3.18.0.ebuild 865 BLAKE2B 42649f8a09ec79bee7127a50e4dcf11a8a3496ebd537143343140c8434dba4258b62bead1256ab71ab24ef471106fb5d0fae5004227feaeae2bf36d2ed775c5e SHA512 9a6abe04019dc6cc4abb82a44d273d775ddc523348884520adfebedccc3efdee320369ca55d872259f8deb05b45e4b1c210250b290b1bec60b508463d6e8e27d
-EBUILD qalculate-gtk-3.19.0.ebuild 869 BLAKE2B 6575ed5ac052420925875d372f0190da4fa492a6e1e40dac718c3a726d945931f9337903404552cf914cc5ecc4a80278f5c4507cffb8007909859be4be4f7ebc SHA512 f4aaa20f497999773472aef52e55aa4a3a7723b68b378a41597308b9cccd75212cfc4a6f5a27e619cf385be06719732d936ec8d803fca43dde2b8118cc60ab54
+EBUILD qalculate-gtk-3.19.0.ebuild 865 BLAKE2B 42649f8a09ec79bee7127a50e4dcf11a8a3496ebd537143343140c8434dba4258b62bead1256ab71ab24ef471106fb5d0fae5004227feaeae2bf36d2ed775c5e SHA512 9a6abe04019dc6cc4abb82a44d273d775ddc523348884520adfebedccc3efdee320369ca55d872259f8deb05b45e4b1c210250b290b1bec60b508463d6e8e27d
+EBUILD qalculate-gtk-3.20.1.ebuild 867 BLAKE2B 9902d9bb755544336057002966effa84ed4cc002424cbd38a9d58643a9d038c0c01cab0cfa7fc291d32211a587319066db1000809679e6ca4d5a50f30ae90ed1 SHA512 e14314cb50c583b5b60db6c8308d9826cf67c03f3c25683026eebf938c07dcc20f331b13ea5f89423a607890b133f18e9e436bb008de655390f951a3a637e311
 MISC metadata.xml 606 BLAKE2B 15fdc1a94dbacd325187cafc04040e85b12e9497c36483f5eaacf56b6418858555b459e7a25b6b3d2155c748150d646b8d0f9af7abdc6ea26a6e6dcc4ac6f483 SHA512 39b2ecbdf4152007252597d839f3369660c1430798a022a8165993d1b8cc18fb7a82948640aeddd010c9fbf75648cd79f4356b204ced1d9ae43d18005845c2fb
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.19.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.19.0.ebuild
index 886fd621ca60..095917fa8e5a 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-3.19.0.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.19.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.20.1.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.20.1.ebuild
new file mode 100644
index 000000000000..49cf3c365e1d
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.20.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2
+
+DESCRIPTION="Modern multi-purpose calculator"
+HOMEPAGE="https://qalculate.github.io/"
+SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=sci-libs/libqalculate-3.20.0:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="app-text/rarian
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Required by src_test() and `make check`
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/calendarconversion.ui
+		data/periodictable.ui
+	EOF
+
+	gnome2_src_prepare
+}
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 7f20c7cfbb04..07c3ddc824f7 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/folium/Manifest b/sci-geosciences/folium/Manifest
new file mode 100644
index 000000000000..890e6b330253
--- /dev/null
+++ b/sci-geosciences/folium/Manifest
@@ -0,0 +1,5 @@
+AUX folium-0.12.1-gentoo.patch 319 BLAKE2B f859846e54add4e65a92f7e3a71af4f71b77bc9e09e682fe8b16af6a2e79e166bc73e9329e468cc7af22753615e4ed945f9934f35617147adcca4f046ff482d8 SHA512 f55ef6e0fb50d3b5ac057d118c047b1c7b70c09a859c30d676bbc59efdf7a0a2276d0bc8514b1367306972b79a3d2e7d3afe4f5a25b554eb904d94506ea15809
+AUX folium-0.12.1-scm.patch 439 BLAKE2B 58d054e56a0ea38d63c75fa43a5cdbbf671abbf5f7c67649dc1037ca83a8bce6f388a904666b89681a4ffc3f5c517cb2eb5e7b37f2f3e577b7bdbe5f0fe80130 SHA512 aad8a6c22441d593b7895565f7cb37621da4882123e4d40ec4370d707a58c38cf9de4b5fedc9b2e229138fde5e33eef914431e0f9f7761c5a1b9d8b0f6414b04
+DIST folium-0.12.1.tar.gz 20033236 BLAKE2B 00e9fb369be9300ca04f9ba3fed18ca28a4985111ccd358312570773b80906df292e14a6f4acbd8ea7686f1b807017f729ad918b3b025af321faf5d7686333db SHA512 b19d2180c36160a370e6ab5ccfacf74ba7b735610d43e69a5200529c776e9c11ee42f4f7fa1ee54621f52b0f2e1fc1f86bc9a146c4a924831b12578643a69616
+EBUILD folium-0.12.1.ebuild 689 BLAKE2B ae18d34cd24468f7f6a46064f24a9b327f934998616d72749b493dc71a1d4b0b9ca7dc6abbf5059bc5f9aa083a43e6bb188e4ede35519ad7eea5ea5db7ee050f SHA512 803baf10ef7cb6fa23bae20637c726e6f3d412f49691f77a1088b93721cdb75a0071db3e05d08b8f7f7a0dcc26feecb82741796e16b99176c9cab4a400c7bacc
+MISC metadata.xml 629 BLAKE2B 77c818e0b7433187baf801c2112c0fd99f4249a0c98b77a8014c5780a0a84c51616a441b8e55653ce0c76c606d1306d3a08eb8be845f68c5b23f8bcc8d6aaf00 SHA512 c69f2992006da35e13df370758f49dcc6ed3db5df00240b4682fb3ef418a87c2509d8495e28e72d2a04ae4603c24169a7cef5baa4f38036acf5ec807ec64c7bd
diff --git a/sci-geosciences/folium/files/folium-0.12.1-gentoo.patch b/sci-geosciences/folium/files/folium-0.12.1-gentoo.patch
new file mode 100644
index 000000000000..e2fbf5f35e15
--- /dev/null
+++ b/sci-geosciences/folium/files/folium-0.12.1-gentoo.patch
@@ -0,0 +1,14 @@
+--- a/setup.cfg	2021-07-30 23:31:49.026429515 +0200
++++ b/setup.cfg	2021-07-30 23:32:04.638212109 +0200
+@@ -11,11 +11,6 @@
+ parentdir_prefix =
+ 
+ [tool:pytest]
+-flake8-max-line-length = 121
+-flake8-ignore =
+-    docs/* ALL
+-select = C,E,F,W,B,B950
+-ignore = E203, E501, W503
+ 
+ [metadata]
+ description-file = README.md
diff --git a/sci-geosciences/folium/files/folium-0.12.1-scm.patch b/sci-geosciences/folium/files/folium-0.12.1-scm.patch
new file mode 100644
index 000000000000..78992bafa059
--- /dev/null
+++ b/sci-geosciences/folium/files/folium-0.12.1-scm.patch
@@ -0,0 +1,12 @@
+--- a/setup.py	2021-07-30 23:29:57.320896714 +0200
++++ b/setup.py	2021-07-30 23:30:05.608787963 +0200
+@@ -89,9 +89,4 @@
+     extras_require={"testing": ["pytest"]},
+     install_requires=install_requires,
+     zip_safe=False,
+-    use_scm_version={
+-        "write_to": "folium/_version.py",
+-        "write_to_template": '__version__ = "{version}"',
+-        "tag_regex": r"^(?P<prefix>v)?(?P<version>[^\+]+)(?P<suffix>.*)?$",
+-    },
+ )
diff --git a/sci-geosciences/folium/folium-0.12.1.ebuild b/sci-geosciences/folium/folium-0.12.1.ebuild
new file mode 100644
index 000000000000..1a5944469af3
--- /dev/null
+++ b/sci-geosciences/folium/folium-0.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Python Data, Leaflet.js Maps"
+HOMEPAGE="https://github.com/python-visualization/folium"
+SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-scm.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+RDEPEND="sci-libs/branca[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm -r tests/selenium || die
+	default
+}
diff --git a/sci-geosciences/folium/metadata.xml b/sci-geosciences/folium/metadata.xml
new file mode 100644
index 000000000000..4afe8241f01e
--- /dev/null
+++ b/sci-geosciences/folium/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<longdescription lang="en">
+		Python Data, Leaflet.js Maps
+		folium builds on the data wrangling strengths of the Python ecosystem
+		and the mapping strengths of the Leaflet.js library.
+		Manipulate your data in Python, then visualize it in a Leaflet map
+		via folium.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">python-visualization/folium</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/geopy/Manifest b/sci-geosciences/geopy/Manifest
new file mode 100644
index 000000000000..f546cc388540
--- /dev/null
+++ b/sci-geosciences/geopy/Manifest
@@ -0,0 +1,3 @@
+DIST geopy-2.2.0.tar.gz 289811 BLAKE2B f876a867a19e5178eba1fa6b7389159e820fc6a9c9a6ac4beb807e2b1b121612a526b5f7290d5fd6db3e259cbd03a86695775d4cad39662126d5f5b7194b19bd SHA512 78b6c2e4726dd50ad97e3425a0459b4611eed54c06c16a2b397db9c3fd9878d76f9eba26ce353908315fea469a76b4044401f5ba37aab3752e9649fd35db16cd
+EBUILD geopy-2.2.0.ebuild 560 BLAKE2B 8f40ec9dfa51a46ddc2ba97fd879d2993c9824554701f8eb069eaf88e450f7975749eea7b6bfa405ae663694f06c05804c240a68fb5e41c318bb0dc172983b2f SHA512 7cf2a45ea650387dd25cfc5c840b1a7c744e99df03707a4fbb3f0e992bc7aa583c6dbb6f38eebbe3f86d2d770c9aff93ba11f2a796a73130463b07a532adaf21
+MISC metadata.xml 633 BLAKE2B 30a6c40ee0d395957994d9ec99cbad8ffda1cc62d44460890b2c6f789f11b9b051f6ea7740923cfe7a3663be96f2a126578d9f19c35ff4d5315537857c51a33e SHA512 51c0db7e58e35a1db28ede06b3fca9a244b4b13d3f536e500008da8acad96fe605e0588664974a51dd1e749c85d9fe0e6c81f9e4d923635da65d852e952ddd4f
diff --git a/sci-geosciences/geopy/geopy-2.2.0.ebuild b/sci-geosciences/geopy/geopy-2.2.0.ebuild
new file mode 100644
index 000000000000..0eca56b94d75
--- /dev/null
+++ b/sci-geosciences/geopy/geopy-2.2.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for several popular geocoding web services"
+HOMEPAGE="https://github.com/geopy/geopy"
+SRC_URI="https://github.com/geopy/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+# Need geocoding service to test
+RESTRICT="test"
+
+RDEPEND=">=sci-geosciences/GeographicLib-1.51-r1[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND=""
diff --git a/sci-geosciences/geopy/metadata.xml b/sci-geosciences/geopy/metadata.xml
new file mode 100644
index 000000000000..17a8d5bb1069
--- /dev/null
+++ b/sci-geosciences/geopy/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<longdescription lang="en">
+		geopy is a Python client for several popular geocoding web services.
+		geopy makes it easy for Python developers to locate the coordinates
+		of addresses, cities, countries, and landmarks across the globe using
+		third-party geocoders and other data sources.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">geopy/geopy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index f80ddb36e0af..e2f88c8054cf 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -2,7 +2,9 @@ AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434a
 DIST gpxsee-9.0.tar.gz 8538085 BLAKE2B 4c8cdabba6082689e98561eccb399bd2e8c4fdce6f229dae2c4a5576e0adbd05380538c906654d7400f5537d370d368193efdb380100cdb79a3805fa9e80f12c SHA512 3eeaaadd48e838dfa56a499ff44cee681f02c6e3e34ec500c70024926af854966f0ddb81b5b88c3f1741350eed3207d864a83daff93009f3f6a72b9fb69357d8
 DIST gpxsee-9.1.tar.gz 4295570 BLAKE2B b2753bc53003279b84f2811cbbe7195d6941e821fe03dfe95206eaa8c86a6df255530fddd4b13f82036e6404fe547d3a3a33f0c5c65df38aa17eb32285dde14f SHA512 2be51e5df8155175c786cfb265bc02a2abbd848a26b5d38a4bdc82a9677ee32711d11c9623168b5706b299529576d2cecfbb37cae90ff24177ebb5a7b70e3439
 DIST gpxsee-9.2.tar.gz 4434460 BLAKE2B e12994afd9673d859d8846e56d17ae86368f312390d7bee835ff02b4e08ab7330c9138d1af451c0c6a44866e2b044c01111d9de77ce0a40b47c48377e6d9589c SHA512 6469f06a21814d25a56899e79d055f166d6c3ab6ecdcea851f87a4991d74ff4e99fec9924ecd4c3065dcf8cb8eed53bdff66c2e3f5642978e6333d80a75f8262
+DIST gpxsee-9.3.tar.gz 4436406 BLAKE2B 2a6cfab191a0d199fe75ccc2f2b9017557d146f34d3889b2517f6e197948296bd6c1f35a33d1a1fdcec213379f85f741eaa8eefd5d135adb3e221f3937f18328 SHA512 c8f8f58579c674a2f986b27a17a4e959bef6b83348df1bbc31118b63bcfcaf2e09df87286b83362adcf74f8a8f7080e0c2da77db08defb1a2a68f3ffd9f24b23
 EBUILD gpxsee-9.0.ebuild 1120 BLAKE2B a08d58f04255fd34faa739551b640756018ca8ad9f9036192d373c64b34020790a441550142d13fbc4bd682eaa8ec24098c82dfe6c8c8fd6a9f826f519038e71 SHA512 1b9f155067f8d47fdd6d450147f1ae760146ee0aa65acd12a37e86958ff8c620ac5c0c226c24e3b9170a54c401e2ca47e87cd6b17de24e63da0c77afe274ffff
 EBUILD gpxsee-9.1.ebuild 1119 BLAKE2B aedcd32f3e09a31ce9726a613224665a95519150d793a2071c1d0daa787dc5ca85b3fd89a64edd9517685b87d9c47ba6d3345c845541b6f0d47531012e148719 SHA512 865c8dc1da8c5dacc9b46dcebd6678dd76b4fe8eefd93a24317e0e7bd9ac53f398778fb012d9abdb62811adb324cdfea944d63de09b0a46a907b0bb59570e035
 EBUILD gpxsee-9.2.ebuild 1119 BLAKE2B aedcd32f3e09a31ce9726a613224665a95519150d793a2071c1d0daa787dc5ca85b3fd89a64edd9517685b87d9c47ba6d3345c845541b6f0d47531012e148719 SHA512 865c8dc1da8c5dacc9b46dcebd6678dd76b4fe8eefd93a24317e0e7bd9ac53f398778fb012d9abdb62811adb324cdfea944d63de09b0a46a907b0bb59570e035
+EBUILD gpxsee-9.3.ebuild 1119 BLAKE2B aedcd32f3e09a31ce9726a613224665a95519150d793a2071c1d0daa787dc5ca85b3fd89a64edd9517685b87d9c47ba6d3345c845541b6f0d47531012e148719 SHA512 865c8dc1da8c5dacc9b46dcebd6678dd76b4fe8eefd93a24317e0e7bd9ac53f398778fb012d9abdb62811adb324cdfea944d63de09b0a46a907b0bb59570e035
 MISC metadata.xml 452 BLAKE2B ff5c6d1a028e9e7c38ac529383e5b80a668f142ea84e742e2c16c48870b4b961580e6b9bbde24eae4a9200d942a58e0c3d14d7e52cc261be9417f04d4e0f7459 SHA512 87df33dd06fedc5f454445089edf56d13e27d683b8faba7aee4f29493f2c38989fb252b851bb59a36665e4431cdcf58d8ce35c23460d957db5d928bb8f1d03d4
diff --git a/sci-geosciences/gpxsee/gpxsee-9.3.ebuild b/sci-geosciences/gpxsee/gpxsee-9.3.ebuild
new file mode 100644
index 000000000000..af40115090c9
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-9.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk"
+inherit desktop plocale qmake-utils xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
+
+src_prepare() {
+	default
+
+	plocale_find_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	plocale_for_each_disabled_locale rm_ts
+}
+
+src_compile() {
+	lrelease gpxsee.pro
+	eqmake5 gpxsee.pro
+	emake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.md
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index fdde81d6d0cd..fbab1f9bf1b2 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/branca/Manifest b/sci-libs/branca/Manifest
new file mode 100644
index 000000000000..ae0b6b5ac69b
--- /dev/null
+++ b/sci-libs/branca/Manifest
@@ -0,0 +1,4 @@
+AUX branca-0.4.2-test.patch 358 BLAKE2B 087756ebe2507101eaf8c18b2726294b3eec99f7708fff092217b6083ea4f85878c2671671fb8bfbddf92822b60dbdcc737bc0eef0d46b33e1e74f00e244c470 SHA512 81d6542e259c7233e3a2c926b07cadd9fbc930db7d25f552d8febb70f3d689f57f01c49c0b6cc5e795e7fa817a7989a05a8b2768162d730b021bb6a4f2ff3925
+DIST branca-0.4.2.tar.gz 59337 BLAKE2B 7d7f101a3dcc07c0210f968da2ed41f4a75177b625ce46252024da7dbba82618dbe60886c615c9461c724af76b45c7710f631bc65d5743cee7f18a2052f9db49 SHA512 cefb3b0f41d515492902ef4046cf7f10b638aca8409f5b08f201550ed5a971a441d13243b1ce38ac0b8c0f76cde1329955d26c1856e1f3c25014a6ce0d805fd6
+EBUILD branca-0.4.2.ebuild 690 BLAKE2B 73e8827c08d67736567ea7d848b72f273f20a995d292624f24856cd64bd6666baba2e3fd5f6a5d58f669c3507365bc0e724da9bca413042ea594a2d11c8c4dca SHA512 692c3d5af1abc488ce49f3566ebb7e3013508ea9657e34214a637f523a147232f009e65e1404be1e0fc028621591b803ff8035165135d3a30da197293849e487
+MISC metadata.xml 566 BLAKE2B a5480589b81b88e433fc25420876d44f2d2c44bac5283c7b06c203d6fbe05afc46f0f17c2d35721894dc88d52686bf5a7386eeb55a8142695ec45961cf0d75f1 SHA512 fa78103653a5554470eb01f24e6c32412697c99fe9d3b1a75a18918c9fde42b649748c2bd9534af41e61f16255bd0794b86354fcd0d0f1942fb017316a2d78b7
diff --git a/sci-libs/branca/branca-0.4.2.ebuild b/sci-libs/branca/branca-0.4.2.ebuild
new file mode 100644
index 000000000000..f536554b7301
--- /dev/null
+++ b/sci-libs/branca/branca-0.4.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit distutils-r1
+
+DESCRIPTION="spinoff from folium, host the non-map-specific features."
+HOMEPAGE="https://github.com/python-visualization/branca"
+SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
+
+RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/selenium[${PYTHON_USEDEP}]
+	)"
+BDEPEND=""
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -m 'not headless'
+}
diff --git a/sci-libs/branca/files/branca-0.4.2-test.patch b/sci-libs/branca/files/branca-0.4.2-test.patch
new file mode 100644
index 000000000000..8c1525d69bf7
--- /dev/null
+++ b/sci-libs/branca/files/branca-0.4.2-test.patch
@@ -0,0 +1,14 @@
+--- a/setup.cfg	2021-07-30 21:13:41.303271681 +0200
++++ b/setup.cfg	2021-07-30 21:13:49.133164898 +0200
+@@ -11,11 +11,6 @@
+ parentdir_prefix =
+ 
+ [tool:pytest]
+-flake8-max-line-length = 105
+-flake8-ignore =
+-    docs/* ALL
+-    versioneer.py ALL
+-    branca/_version.py ALL
+ markers =
+     headless: mark headless tests (deselect with '-m "not headless"')
+ 
diff --git a/sci-libs/branca/metadata.xml b/sci-libs/branca/metadata.xml
new file mode 100644
index 000000000000..6e83a06af3af
--- /dev/null
+++ b/sci-libs/branca/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<longdescription lang="en">
+		This library is a spinoff from folium, that would host the non-map-specific features.
+		It may become a HTML+JS generation library in the future.
+		It is based on Jinja2 only.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">python-visualization/branca</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index aa460590d56e..db4015653f37 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,5 +1,5 @@
 AUX camd-2.4.6-dash_doc.patch 498 BLAKE2B 93871bfdc9fbe1bc77f7cdc66d18d7517e318edcdbc09e1efa63a9400de5a3e91fa1febdc24394743b710090d7a78fc9e864732c4979db73f679cbd008fea670 SHA512 61a38299792ade16a067e7960d5922ffeb6be838eab73f8be493b999c9256875a07b28066e1965b59f9d9e5f63f616a1674f8987ff847e49ac4ff2a8fe05c73f
 DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0
-EBUILD camd-2.4.6-r1.ebuild 846 BLAKE2B 29fe717acbc0e52ae6824e6ed147357c7c6f725ea4c53972a2767b6419b52e31ea3915fd86705fed86edb7dbc00a1bb51a93098486930eacb93ea5c3772e0f9e SHA512 00c3174718c29cc174311fb35b31378bcac6623f1297df4804c419de19d6d961cc12bc32e0831f6ce1caab3bce353d422db37af5b510617cb0ccf304e2ad3614
+EBUILD camd-2.4.6-r1.ebuild 840 BLAKE2B c02405546aae3b43bcfd70fa24b2ca475b3d0492fc27f4f1292a00092916f7c20a52e94d65777c3f3a236e03ccb0a350117441e299f49a469935d3871a474b80 SHA512 fa5b9796edf73cba07c9e7c1acd8bd09b12f9e74eb6a1fe30081ee46984a6c0d2b40455ce3a981d08e813e5300e5669ebc5a5b4cecee53858ccaaf01b4c09fc6
 EBUILD camd-2.4.6.ebuild 717 BLAKE2B aaea2b067e019608d3bd31ec989d25b926299da54b35fb9b60e0b9bfcd050e9c7ddddf987c9d1b36de838fd3360812d3ded619b576e4f042f9f3dc9e243b84df SHA512 3344d69aec563ab8d21a0aacdc6a14587b182bd460f4849a396ecd51fd2a2ee63bd483eddcafb12c489c23369356a3f4eeb14a7369da11d55f4d93616058c950
 MISC metadata.xml 494 BLAKE2B 456f4ab539ab7303849cfabfda3e07987874a833e5691d6c3336ebb8a86cc6d5cc5fe8c20b65d8e5fdd8da1c947b9e7ff8eedfd2cc17da6040ff5d109b1b110d SHA512 6402783aec0922669bbf45477074644a9b10f44b0b06bf86ad9b4ecbab124076ee7f19c2c68c6eb3bf21a1569a3410f1ed0ac12f653dd5808559da133613d09f
diff --git a/sci-libs/camd/camd-2.4.6-r1.ebuild b/sci-libs/camd/camd-2.4.6-r1.ebuild
index 32c654a6328d..76e46e3b9ddf 100644
--- a/sci-libs/camd/camd-2.4.6-r1.ebuild
+++ b/sci-libs/camd/camd-2.4.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index 1d0963cade12..444860d31a07 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -9,5 +9,5 @@ DIST cdf380vbrm.pdf 2260048 BLAKE2B 30abdf365763df753569289a74013033e0dc56c3ce0a
 DIST cdf38_0-dist-cdf.tar.gz 1251571 BLAKE2B d51463fcf196e0c35617b93725104b34a9047ee7ef22d5d5b7ed9ed5816903e435f130b8ebb0d75e0f05c4908b71de3a4c9bab910a9472b3111be22f659e1bc8 SHA512 cc13358ddd5dfa90731ec6d9da0985697ff9e297be0bc03d8132761d479f5ff062c822085d3141a2fa4320ccd7d1b59064fc236f143a00f24b22c6edf0f618ce
 DIST cdf38_0-dist-java.tar.gz 1007414 BLAKE2B 64fb991d937e9242d42a9b6524facff35acefe4fb2279b92942faf6a9403fae98c3a6b8e9881a916e8669ead5bca4a404dbc250d3a95be26cbe761b6dfa48227 SHA512 12b4d98561f4c07ef4837daa0fc90e1d1cb78622b3837d3cdc30643eae3e9f1ffe50dfa22e8be56615aa4cf4b983df6bde2d1c9fbe2115142d9fdfa653bee2be
 DIST cdf38ifd.pdf 881707 BLAKE2B b80e15e631eb5025317d324893c16838b3a44218cf2c592692eff4d0b778494f2555cf79d2d35b54d66606a82c3835ad896fe809ef363f85ab8261879bf55167 SHA512 2dd3ff5867f5faba3502f877057e9d3110e7be03219dcf5aa657c6685e4a63f847b3d3fbea8d201ae5601a78773c636799cc1ab53e77e12d0ffd5c543322340c
-EBUILD cdf-3.8.0.ebuild 3247 BLAKE2B 1a803b6b61f99dde5075cbd3a1259ed93177e6c8a02bdc30bcdbb295ec1936360f1f11b646fbf4641a500d345f21126aa822adc08f0d429b56f95bb015b0ec4c SHA512 57c2263a5b96681c04fbc0472ad7e8db255b01ab6922037ba7af7c3fed3945f4860be75bcc5f90e5c685aa10fe913b153d7040887d9fa57dcff195494028c2e2
+EBUILD cdf-3.8.0-r1.ebuild 3243 BLAKE2B 38829e729888e48e6cb17169aca9f76acb89247e8da0ee6f7815f718c0df1cf3e332ccd4d47cf3cecb57601a16d186308b647d7a9b2f0a7f95234d34e077463f SHA512 7138664c012bd17c6219feb81493d295c36276e7eabdeef47957452df0b3c26829d3c0748a926b993b17fd614e4a83d0cfdca9e6bc76c6241353ac65af3e909f
 MISC metadata.xml 1025 BLAKE2B b93e6e8c52f2ac85ac66c6aa1a9a4075c11d6d6ae4c28e540a33b2964f911e5c118510f0b57d25ead76aa3bf07be70b309af1079425bf786c18f70e00930c143 SHA512 26992a8b0ce0aff229d7dc4e87440dc15e0a0143ef88ba6d910a8e4f6372803ae8e3bd007a53b554509220bdb41fe8a804f9b606a4dca47f03d88d39f2164549
diff --git a/sci-libs/cdf/cdf-3.8.0-r1.ebuild b/sci-libs/cdf/cdf-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..5d8499adc51c
--- /dev/null
+++ b/sci-libs/cdf/cdf-3.8.0-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-opt-2 multilib toolchain-funcs
+
+MY_DP="${PN}$(ver_cut 1)$(ver_cut 2)"
+MY_P="${MY_DP}_$(ver_cut 3)"
+
+DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets"
+HOMEPAGE="https://cdf.gsfc.nasa.gov"
+SRC_BASE="https://spdf.gsfc.nasa.gov/pub/software/${PN}/dist/${MY_P}/unix/"
+
+SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
+	java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz )
+	doc? (
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0crm.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0csrm.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0frm.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0prm.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0ug.pdf
+		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0vbrm.pdf
+	)"
+
+LICENSE="CDF"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples java ncurses static-libs"
+RESTRICT="bindist"
+
+RDEPEND="
+	java? ( >=virtual/jre-1.8:= )
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="
+	${RDEPEND}
+	ncurses? ( virtual/pkgconfig )
+"
+
+S="${WORKDIR}/${MY_P}-dist"
+
+# respect cflags, ldflags, soname
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-flags.patch
+)
+
+src_prepare() {
+	default
+
+	# use proper lib dir
+	sed -i \
+		-e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	PV_SO=${PV:0:1}
+	emake \
+		OS=linux \
+		AR=$(tc-getAR) \
+		CC=$(tc-getCC) \
+		LD=$(tc-getCC) \
+		ENV=gnu \
+		SHARED=yes \
+		SHAREDEXT_linux=so.${PV_SO} \
+		CURSESLIB_linux_gnu="$(usex ncurses "$($(tc-getPKG_CONFIG) --libs ncurses)" "")" \
+		CURSES=$(usex ncurses) \
+		${myconf} \
+		all
+
+	if use java; then
+		export CDF_BASE="${S}"
+		export CDF_LIB="${S}/src/lib"
+		cd cdfjava/jni
+		$(tc-getCC) \
+			${CFLAGS} -fPIC \
+			-I${CDF_BASE}/src/include \
+			-I$(java-config -O)/include \
+			-I$(java-config -O)/include/linux \
+			-c cdfNativeLibrary.c \
+			-o cdfNativeLibrary.o \
+			|| die "compiling java lib failed"
+		$(tc-getCC) \
+			${LDFLAGS} \
+			-shared cdfNativeLibrary.o \
+			-Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
+			-L${CDF_LIB} -lcdf -lm \
+			-o libcdfNativeLibrary.so.${PV_SO} \
+			|| die "linking java lib failed"
+	fi
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	dodir /usr/bin /usr/$(get_libdir)
+	# -j1 (fragile non-autotooled make)
+	emake -j1 \
+		INSTALLDIR="${ED}/usr" \
+		SHAREDEXT=so.${PV_SO} \
+		install
+	dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/libcdf.a
+	dodoc Release.notes CHANGES.txt Welcome.txt
+	doenvd "${FILESDIR}"/50cdf
+
+	if use doc; then
+		dodoc "${DISTDIR}"/${MY_DP}{0{crm,csrm,frm,prm,ug,vbrm},ifd}.pdf
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc samples/*
+	fi
+
+	if use java; then
+		cd cdfjava || die
+		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
+		dosym libcdfNativeLibrary.so.${PV_SO} \
+			/usr/$(get_libdir)/libcdfNativeLibrary.so
+		java-pkg_dojar */*.jar
+		if use examples; then
+			docinto examples/java
+			dodoc examples/*
+		fi
+	fi
+
+	# move this to a better location
+	dodir "/usr/share/${PF}"
+	mv "${ED}/usr/CDFLeapSeconds.txt" "${ED}/usr/share/${PF}/" || die
+}
diff --git a/sci-libs/cdf/cdf-3.8.0.ebuild b/sci-libs/cdf/cdf-3.8.0.ebuild
deleted file mode 100644
index 84faafaf9a4d..000000000000
--- a/sci-libs/cdf/cdf-3.8.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2 multilib toolchain-funcs
-
-MY_DP="${PN}$(ver_cut 1)$(ver_cut 2)"
-MY_P="${MY_DP}_$(ver_cut 3)"
-
-DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets"
-HOMEPAGE="https://cdf.gsfc.nasa.gov"
-SRC_BASE="https://spdf.gsfc.nasa.gov/pub/software/${PN}/dist/${MY_P}/unix/"
-
-SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
-	java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz )
-	doc? (
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0crm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0csrm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0frm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0prm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0ug.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0vbrm.pdf
-	)"
-
-LICENSE="CDF"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples java ncurses static-libs"
-RESTRICT="bindist"
-
-RDEPEND="
-	java? ( >=virtual/jre-1.8:= )
-	ncurses? ( sys-libs/ncurses:0= )
-"
-DEPEND="
-	${RDEPEND}
-	ncurses? ( virtual/pkgconfig )
-"
-
-S="${WORKDIR}/${MY_P}-dist"
-
-# respect cflags, ldflags, soname
-PATCHES=(
-	"${FILESDIR}"/${P}-respect-flags.patch
-)
-
-src_prepare() {
-	default
-
-	# use proper lib dir
-	sed -i \
-		-e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \
-		Makefile || die "sed failed"
-}
-
-src_compile() {
-	PV_SO=${PV:0:1}
-	emake \
-		OS=linux \
-		CC=$(tc-getCC) \
-		ENV=gnu \
-		SHARED=yes \
-		SHAREDEXT_linux=so.${PV_SO} \
-		CURSESLIB_linux_gnu="$(usex ncurses "$($(tc-getPKG_CONFIG) --libs ncurses)" "")" \
-		CURSES=$(usex ncurses) \
-		${myconf} \
-		all
-
-	if use java; then
-		export CDF_BASE="${S}"
-		export CDF_LIB="${S}/src/lib"
-		cd cdfjava/jni
-		$(tc-getCC) \
-			${CFLAGS} -fPIC \
-			-I${CDF_BASE}/src/include \
-			-I$(java-config -O)/include \
-			-I$(java-config -O)/include/linux \
-			-c cdfNativeLibrary.c \
-			-o cdfNativeLibrary.o \
-			|| die "compiling java lib failed"
-		$(tc-getCC) \
-			${LDFLAGS} \
-			-shared cdfNativeLibrary.o \
-			-Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
-			-L${CDF_LIB} -lcdf -lm \
-			-o libcdfNativeLibrary.so.${PV_SO} \
-			|| die "linking java lib failed"
-	fi
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	dodir /usr/bin /usr/$(get_libdir)
-	# -j1 (fragile non-autotooled make)
-	emake -j1 \
-		INSTALLDIR="${ED}/usr" \
-		SHAREDEXT=so.${PV_SO} \
-		install
-	dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/libcdf.a
-	dodoc Release.notes CHANGES.txt Welcome.txt
-	doenvd "${FILESDIR}"/50cdf
-
-	if use doc; then
-		dodoc "${DISTDIR}"/${MY_DP}{0{crm,csrm,frm,prm,ug,vbrm},ifd}.pdf
-	fi
-
-	if use examples; then
-		docinto /usr/share/doc/${PF}/examples
-		dodoc samples/*
-	fi
-
-	if use java; then
-		cd cdfjava || die
-		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
-		dosym libcdfNativeLibrary.so.${PV_SO} \
-			/usr/$(get_libdir)/libcdfNativeLibrary.so
-		java-pkg_dojar */*.jar
-		if use examples; then
-			docinto /usr/share/doc/${PF}/examples/java
-			dodoc examples/*
-		fi
-	fi
-
-	# move this to a better location
-	dodir "/usr/share/${PF}"
-	mv "${ED}/usr/CDFLeapSeconds.txt" "${ED}/usr/share/${PF}/" || die
-}
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 26690b4da095..ac4699e90609 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -8,5 +8,5 @@ DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e392662421852
 DIST gsl-2.7.tar.gz 7508761 BLAKE2B a9da4df40ea57374880026a0586f2f218dbb0c9154cc661b3e7f5cd414311b95300e60faa2d7f4d3c6cdae5cfdf77cb8052075b56f51564aec2649cc4ad5f7f9 SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5
 EBUILD gsl-1.16.ebuild 3069 BLAKE2B 3cb68ede8761db13a1e17b0e0aff1f165e20f38946dd5b70a92b597c38faa4581bd0c9b96d16257f7fbccfa765513e4a0319686f4ffd959e7a0d2e084cacab75 SHA512 03a6b20f6d6cf125d120841aea9b2170e9bb77bbc64346e82f3a03fc5e78c19ae75bf8e01c19e6371f21658c3bcc168f0f13a04ebb500715629c45306b5af713
 EBUILD gsl-2.5-r1.ebuild 1428 BLAKE2B 199410861db77b4e73bba3647790efd91fe675185c55cb1730e6e06221753f34048cff8033e07c1846104801c994da0b9fe0c2da3a6661e3899d67b0345892fc SHA512 bc175e93a0ab179b397d97efe24a9b66a1787c28dcd5c38e6cec359246790fb01fb43764567dd1031ace02acc99928d1518a59f6c4e98b8c674c7f8f1f7c09bf
-EBUILD gsl-2.7.ebuild 1456 BLAKE2B a7eb14aa4241789d1cb7d3c480fcd39fc1337401f12723e977dd0186cdd968cf2f3a2db3c5e712a2b96933fc016ef2f40edff95de943926d312e3245408cc145 SHA512 090f6df2ac6b24e3507328e8faa84df916555e0ef11a605d9627825806649abe6989d9efdfaee354889a55985805fd0839111425ba96f23c45b0bb41cd9994cd
+EBUILD gsl-2.7.ebuild 1461 BLAKE2B b8ba4ef7b9bd8c2485750c9a26ea778f0a913a0a6c2e67be34d5deaaa0a7349299e216ed2635681b4f46e489f76600a2f406e31a255bf3b876bbb6b1b734b0f9 SHA512 f1c8fd6ac5b35ae6854745d33c51af2066f72ebacd1ab49f52109a7362a47d8b3804ccf7ef3def69df91eceea1056b26e28a436b4af72c70255842d3645ca0bc
 MISC metadata.xml 1190 BLAKE2B b9015dc09464b327144a546a0e9dae6e1c5eaf3ce118a24b7ad1853f09af1952284f754aada2436d7e1a1df82638720492445d8f015ccb1cec05c78dd718fc26 SHA512 f56ec87aeb8f257480a631748db79c78193797e1ecd586dbbd78f31a01fbbd3341fa67ffd3244e5dba352478ee552184d6a1d9b5ef5d54d67b038215090eca00
diff --git a/sci-libs/gsl/gsl-2.7.ebuild b/sci-libs/gsl/gsl-2.7.ebuild
index 35e85c74340b..1819cb8629de 100644
--- a/sci-libs/gsl/gsl-2.7.ebuild
+++ b/sci-libs/gsl/gsl-2.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/25"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest
index 98b100895427..8a59b61138a0 100644
--- a/sci-libs/keras-applications/Manifest
+++ b/sci-libs/keras-applications/Manifest
@@ -1,3 +1,3 @@
 DIST keras-applications-1.0.8.tar.gz 288909 BLAKE2B 41d70552f5dfdd0c1385a7ca0b527ce0e0c3441c1ee3f72c90569f3e43e6a82485d0d4affee83afc645f3b99a519facb41d11a3fc1384c98f44182dddbea02bb SHA512 58af0d8e0289d97b416559bf235deeb9a5405d50f2a2c93612cdbde36e4d6d006db5c570acb814c209414a4b61c2310a99257aa0e2feaf24e5260d549b8b94f6
-EBUILD keras-applications-1.0.8-r1.ebuild 543 BLAKE2B 5338140ebf0ca3c4290900ba8856f91fe2df6c1287b1c36a15353c0560abfacba3810e69d417fd7076b6cc4b974b8237a0d94432485afbe2007821d162675d24 SHA512 0d6ecabe6df68c4afaef5d4aae34237545df5a91c47f5959a552a055808cf05b11a111f3a63484787f51aebf4d739b21fee55f8023c9ac99344efeee1ee3bd40
+EBUILD keras-applications-1.0.8-r1.ebuild 545 BLAKE2B 0ac41382b219ebd3c3e42cbef5d9ef7ff9964d81e9d22e67cc0d6169a5a52bfdec39cf522b569fae3b8a2910f7449b92772d66dad87db4dc8e8e2c853c924cf5 SHA512 96b1f4199889b92d5909f2bde219ee4b6bd1b79b7a2f39d33b84218c328de49d90dddb72c91397ef832335bb6d3236af8187e0f710297d6375dcc1ecb7a55753
 MISC metadata.xml 621 BLAKE2B 4f375ddfcfed6172df186350f7bd3dbfbcacea34f555b14719af43f58b140d73e378cd0a5efd8438ed2a0006f3552febc684b4fce85aeb88fb2c9bf819c06c4b SHA512 9dbb366d483843279cc7532b56a877313a7c39de25c93c313a2957092f9766ce5715a83dd87ef116d1733a7cc399319025ce1eb0e7ad174e2b7441360a9f5560
diff --git a/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild b/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
index 382cc9d362c1..e640d34d62a7 100644
--- a/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
+++ b/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Keras deep learning library reference implementations of deep learning models"
diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest
index 49c6e633bf53..942861e8471f 100644
--- a/sci-libs/keras-preprocessing/Manifest
+++ b/sci-libs/keras-preprocessing/Manifest
@@ -1,3 +1,3 @@
 DIST Keras_Preprocessing-1.1.2.tar.gz 163598 BLAKE2B 94d0bac41ac140015a5d46453c99e1180c8c06d8fab4d6707890b1f24466d287f6da54d66b395e5e50c7aac67cc0abc8153fbfbeb4ffb0e79561bca528a6b81b SHA512 aae4d52accdfb9df260070336b1c5a628e57563978f7cb299aa67a6265f26eb44deb803cef795616a5e94cd8bcd2b9aa067570258fff96642b88cc0c701c3cec
-EBUILD keras-preprocessing-1.1.2.ebuild 669 BLAKE2B bf3053948a2aef2ea1078661344681ce981db36c3db416e5a63e249dca87558725a94631b2dab6e68c217f40d4b49ad4e87ac258875dab2cc098455a8259821b SHA512 c01486e5bddfd491fd8a69f3e8e065c7d9492ce08ff34da3603944123f0ffd79bb0afcfe2b857c6a884493ff4237fbcc9fb58d5e27756fe1f11472b2e347f18d
+EBUILD keras-preprocessing-1.1.2.ebuild 671 BLAKE2B 477fb6c959caeed1eabcfd4e1c34f3636386ae212b7c8befd5b584972896414c9762527366d2bc13e96124093451a6db07987f2ba2aa85ae21a6c78689f1a005 SHA512 c98b2460e71d3698e026b95dca48a7cb284fb7491ba81847fc1cd04eae94d47e5eae3638342510cd72d625fff863c6c87241986f9567bee2ce24ef8bba130e46
 MISC metadata.xml 585 BLAKE2B a2f92ac4e2b9af055313a13de9bcbaee7ab7ca2efa4790c82027aece4b629bfa7a73c5ed0286b0f24f1853330057527009afe6ab1722f19d9c504a9d0737e827 SHA512 371cc3f5897bd28c62642a8857a22e775e24aa917bc0e58bb4de4e0a2a6580174ba35cfda2e8dd83599e2180fdfb3f11a953e7076c6d87073e1465b145b115e9
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild
index 9b72af9e2845..a864e1a89657 100644
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 MY_PN="Keras_Preprocessing"
 
diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index de32368746d4..c701b185873d 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -3,5 +3,5 @@ DIST libint-1.1.6.tar.gz 256404 BLAKE2B c754e25f0c3bc6c52eb434beafd2cb794a2e7150
 DIST libint-2.6.0.tar.gz 24743255 BLAKE2B 3ab7baba012828485c6c8425bce100e1ab50d2a3c8443ea2ef5cf173d58d8aa211a07e837b10a7f89d7e57f2e15b9384060bbf7b9885f32e9426525e65e15960 SHA512 56343c64b0dfb829702f4bb2fe14a04ad063acd7cb8b5a21cd1a45a830944c1ee98c888c9a28d6746b1bc17459aefcfb0aafe6ef310bfe554056212ad19e43ef
 EBUILD libint-1.1.6.ebuild 855 BLAKE2B 65e5b86aa9e9b8a29825c7075145b4ad170c9a6bd255773e605a826476a54e3ec4734194362a53d74c95b3916e98ab7343ac5b94f4defb2a6cad0c42c55077a0 SHA512 ec5cc40c2c27cf812cca7d843461e5568f2596970ef80912e3c8cfab2cc70b0a5179c680c63a7d8df84d8d38bfd3e43dfad035ac4b43bf587ef81738d0e84274
 EBUILD libint-2.6.0-r3.ebuild 1422 BLAKE2B 5a95126604bd6e1e9f7b697fd542a0ee74a24b539d5ec367d2fcb833ec70481305869cbc18e6bdcb23692f5fe39467cf53d5264353ae854530cda4cda3de98c5 SHA512 0b2e7980ed09840a83659640df1ad32803d3975e419926958d5d75eb0fb8e7d2ca207093727b68b89419065c51c1c46dff268d833e897c1d5a4c827c90fc1c31
-EBUILD libint-2.6.0-r5.ebuild 1599 BLAKE2B aed56eb648dcaa628e7cfbed6baa9937f349397108a72060b1066df1c76ab601307b5a35130b30f5ec2146d15cef9e4050f6ca3cc82ca1a0712fee9533658f13 SHA512 c9e01d3adadc3fdd75e110e2ab686ab63657dea38300f3024bf044e1c55050a3971101908c8d446cf227b4ba62b2d172f9d42560d3e6a01416f03891c595c0cb
+EBUILD libint-2.6.0-r5.ebuild 1598 BLAKE2B d3efe5f6bb2e2304cbb07eb1de390d5b596cb4dbd4e34e4716a468345cbf72c0bc7b71dc714a66383304ca6a17a4f7c232450c7d989b1d8e9c571ac10ab24f90 SHA512 ace5668a85735297d2f7e835de962e3e3c4c84f0c6ccb3f8989e9e3fc53a0d84fad5320ba3dbab00e1d70ded7e909e0c8afbcf60d5332979dd000154f88bc3db
 MISC metadata.xml 612 BLAKE2B bc2b11edd30d0db99860d1d005c56c428c75be96224fa3285fd3cde6f35af0f142b445254214af00308a29ee8965505a8dfe14ffb2e80b57ca42ef20c91bf100 SHA512 db9172c0e887d45f42914159eae83c0f11b40fbafac31395c782ff959cdccad8a62a8d468cec66d6e362cd8ea09aa3b05057d19fff8a1f94b9bd472be97d04b0
diff --git a/sci-libs/libint/libint-2.6.0-r5.ebuild b/sci-libs/libint/libint-2.6.0-r5.ebuild
index bb486f0f534f..bbf70b01e2ba 100644
--- a/sci-libs/libint/libint-2.6.0-r5.ebuild
+++ b/sci-libs/libint/libint-2.6.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs doc"
 
 DEPEND="
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 5bd9615694ac..19d7b4d1d5b9 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,7 +1,9 @@
 DIST libqalculate-3.17.0.tar.gz 1770500 BLAKE2B 247c74db32e63437c556dd60f00f56acf53d9ba90ea1027b34b98b455215e6c03e3ee34116b6d3989fa43b449e18b6f2ebaed67f9dff36f08dd8b38c685c6586 SHA512 b204dc44b6fdb2b72d3c85840fee38482db071f0f8241420ea24093dcdcc377c66f516c571827fbede40237618a53153a75bb7afee7f3bee7a1a71aedd779a11
 DIST libqalculate-3.18.0.tar.gz 1788899 BLAKE2B 7701dab4d11c9d54f95454cd7be530cfa9f5a8dbe438dac6d734c294ce1eb5be1f4fdb30ef6d041d19f389df88dce4fa7dea68d555ad441992498685bfb3b919 SHA512 37d870f6fd147745747ac971758a512e85e33c42605b99ac4ba68b53ca42a6f0da7ede3869fe3ea4e47d77961e826ad999e0f0c0d87039042563f124bea1250e
 DIST libqalculate-3.19.0.tar.gz 2007385 BLAKE2B bd0b1bbfcd4bad0053ec9193bec1081cce609935b4282add885d7277a20696cc3c69272b8255d9da3e79907ec4c57b4b87c971908fc3da890d46ff4849e65ccc SHA512 19df6e46e88478df4dd7ae592557c8c984f76c137708892b01f88737c2a8d72ca01324fd1b1322069292795cd158483b3fc0cc99c6559279e7a2f76ca4a47a56
+DIST libqalculate-3.20.1.tar.gz 2107300 BLAKE2B 79314cbe2adb183a17f96947b8ad4fa0bbfea665f7b9afda67785059e9bc0d94599b05cd55999302fc5e1216929b4ed98db4e2a6ae0c6fc74ebdd37dc6dcb72e SHA512 65a723c257c9e2419fc60ca254c23a7a7dd4d9a31beaa9c8fcf41a1e252e5f3be08e1160dcc72a0a407fe3ffd3e73353b141e40019871677a490d8c810c96931
 EBUILD libqalculate-3.17.0.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469
 EBUILD libqalculate-3.18.0.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469
-EBUILD libqalculate-3.19.0.ebuild 1609 BLAKE2B 0b94f2b0efce772c01aa861c72e8499d6e32dca53bdd3ee338cd147edd988f4764733786a76052a86c6b749c10b6961d9fb2b0dca9369e5123a07ba0e6ebd7a2 SHA512 098a1bae358bdabb33207fca12efb737f6510fd4c478c577504e10c87e7298ab3ea2c1ab1c5308a6cb5c363b9cc96f7c2797c2c048a08b12370580decd25bbcf
+EBUILD libqalculate-3.19.0.ebuild 1604 BLAKE2B 742061709594aff32c619af31ed37f9741c71c59e015415ed3a2cad9e3b491c3f8546fd54d8db3bdb66b60f5d1e0fef71fc407bea2fd9ac7a34c851262ef414c SHA512 f85aa53889d88ea0e6cfadabdafdc5bfb6681452351e8adf9e740561831ad0ac9ed1a228be82e82a4e4a08c39f3f9e7c736c5d91bd9f9bf0471301608ad27608
+EBUILD libqalculate-3.20.1-r1.ebuild 1608 BLAKE2B 527c1abfaa8d29f92f178d63c8898ec26affc870a830cfe7c26bde6f76fd9b900457822ec148a8aef32ef23d51ffc5aa0f89b96549c587e699e3ef2179f35f7e SHA512 dd7b56e849de9713540e1c449f09f982b5042e7210d8b4612d4ead5bf29646ffc7343d8400fc60f681ff37e5cb457bc84ea1af4289d37877581db02d07f4e328
 MISC metadata.xml 412 BLAKE2B bec97c9946830a88d871c0a27f06ff42a2ed252971f616f43f4c0cfa9617ea46565153c41c2aabea921b694c6a665a097635fdcf5dd82387dc60445e14657427 SHA512 3e011ceae845d6f233e86f7d39eb4460f561720312d8a0696b87672251cf46138228ae678ab63459280dd36fda3f9f8f302d9259e49acd6606fe2e66126bffb9
diff --git a/sci-libs/libqalculate/libqalculate-3.19.0.ebuild b/sci-libs/libqalculate/libqalculate-3.19.0.ebuild
index 3aa3d2f4f4cc..b1e1ab831657 100644
--- a/sci-libs/libqalculate/libqalculate-3.19.0.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.19.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/21"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl icu gnuplot readline"
 
 DEPEND="
diff --git a/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild b/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
new file mode 100644
index 000000000000..590dd468c1ed
--- /dev/null
+++ b/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A modern multi-purpose calculator library"
+HOMEPAGE="https://qalculate.github.io/"
+SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl icu gnuplot readline"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libxml2:2
+	dev-libs/mpfr:0=
+	virtual/libiconv
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	readline? ( sys-libs/readline:0= )"
+RDEPEND="${DEPEND}
+	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/currencies.xml.in
+		data/datasets.xml.in
+		data/elements.xml.in
+		data/functions.xml.in
+		data/planets.xml.in
+		data/prefixes.xml.in
+		data/units.xml.in
+		data/variables.xml.in
+		src/defs2doc.cc
+	EOF
+}
+
+src_configure() {
+	# Needed for po-defs/Makefile
+	export CXX_FOR_BUILD="$(tc-getBUILD_CXX)"
+	export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E"
+
+	# bug #792027
+	tc-export CC
+
+	econf \
+		--disable-static \
+		$(use_with curl libcurl) \
+		$(use_with gnuplot gnuplot-call) \
+		$(use_with icu) \
+		$(use_with readline)
+}
+
+src_install() {
+	# docs/reference/Makefile.am -> referencedir=
+	emake \
+		DESTDIR="${D}" \
+		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install
+
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index 9527c061119f..fa4a74d29dfc 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -7,5 +7,5 @@ DIST tensorflow-estimator-2.4.0.tar.gz 660203 BLAKE2B b270536fe976fc718bb6ba558d
 DIST tensorflow-estimator-2.5.0.tar.gz 689339 BLAKE2B 6fb491b047cabed6edf67cccc913de54e4c2337eb052ba833239b72b07facaf33410b8a57a8f95fc0e2c225190d9b26b7955579d77883dbc236519cb784784c3 SHA512 dc49d92f4d2e63770dd901b272d7c62db50bfef7107e38f6525b6a458ad9915d1cbcdc9961c70c6ef88b9a38361f7b6712f6a2d30e240a35aab4bb25ffe17e71
 EBUILD tensorflow-estimator-2.3.0.ebuild 1996 BLAKE2B 935e5abdbf005915672c23942a99b4d0e7fe78ffe007df9e8dc0600c45189b0d65f0ba8252ea3c8f9ecc53cee332d1dbf1f97245486e68f0e6a8c805d3c85991 SHA512 fd088f65553d2887477434a88957a78205f13d0c7b5f281a3be7dc1e98c83dc4bdd52b0d10500ba5b7db13cfab5b80e0e0f135230a9e20e50a78d6542356eb01
 EBUILD tensorflow-estimator-2.4.0.ebuild 2012 BLAKE2B 16c9916d5a4a4ecbd1ad6b1f4e508fb2951b195f0f4e277e472bfa5da7879493f99db712aa629904c150fc54efd62f3721cc6f9e328719c0696ab97bc7a4a880 SHA512 5aac7a7eccd518ced6f1359e02cd211e4552735283d1d9cda02839734ab15c555cae6d58fdd8b64d86775a9f1b05cda0c7dd81ba21f0908208dbdca84c0285a5
-EBUILD tensorflow-estimator-2.5.0.ebuild 2173 BLAKE2B 37b190141bbbd2de2c1154196bb44adf996159a28eed234321985f43e7ba54558390572c0c5cb1bdc9b0f5f67935ffcc64062ea365f763a03e707fb621a10751 SHA512 802d742e55f7d7ef9d533e791999167d85a9f91b47580f201341a2371750811ee38c9660a8cd1045e31912d1905cb15e282ad5562a660c6098914618f2e1ff81
+EBUILD tensorflow-estimator-2.5.0.ebuild 2175 BLAKE2B e9e90aee52d27b13f193a2a91f84ff97f641ac23fb948cfb34911212c2db3347f30639ebe537573cbd2b5e6788d843fe70f2c473e6b35889906d1b8fe66d292b SHA512 eacca70003a320d3c7c5a51609a8a62d887fae1eaa5e0405c8fa019549cb004fb0a46db79a646a744e2c589fdd66412c0f44a746387a35158ad0d67b4d013fb1
 MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.5.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.5.0.ebuild
index 770a8a614291..913bf9e0bcc2 100644
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.5.0.ebuild
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 MY_PN="estimator"
 MY_PV=${PV/_rc/-rc}
 MY_P=${MY_PN}-${MY_PV}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index ad4ccd54d5ac..6fe418e29868 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -40,8 +40,10 @@ DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932
 DIST tensorflow-2.4.0.tar.gz 53257138 BLAKE2B 21973f67a7a4cb91baccbd3a4d9c8bce4c7f488ed44e834122b0fa0fc47b22d48276ecd9b580fa839c32a3dacac73bc010f91a27e5568df4dd9986b14b7eeb4f SHA512 4860c148fd931c4dc7c558128e545e2b6384e590a3fbc266a5bfe842a8307f23f1f7e0103bda3a383e7c77edad2bb76dec02da8be400a40956072df19c5d4dbd
 DIST tensorflow-2.5.0.tar.gz 55999506 BLAKE2B 0f1f29ed9ff6e5fd3fc0c98419bca636f48085810f934290885b3469c45817b2ce17e9dbd3d93d70b09ec7975088edd0973f147449f527a8f2e23b388e2592ce SHA512 637c63b1bed1c0eb7bb018f1ff7f29f7f0d78e75dac384df4ecb5dfb92bbcb28209e3d3d2204145abddf88e3247d8c31bbb4cea032a73b7122b2ef3eb0d2b947
 DIST tensorflow-patches-2.4.0.tar.bz2 1842 BLAKE2B ac35a02e3494b0cb6cfcc9212557d5b5480aea41b09d74b918471e688b489bafd2dbc609320abde609a461db1c8d0043fce4053ad9a223bc93fb883176417199 SHA512 39b3ebe710eb3bb5c4575dbbad66ae1bd2a81b803fb9007709154320eaf31cbac213ea5dc6c2e674e685db1cea5ff524f723f3893dfe5f31af32be7756882b28
+DIST tensorflow-patches-2.5.0-r1.tar.bz2 5180 BLAKE2B aafebb5cc4616ad93982e0fd8299f91c22063b96841b920a98a4cb54bcdc0cad51011f943ca62055239a0c21ed69d1f5b985710dcf0c28346b7ba12114583842 SHA512 38acd53136f3f1e061b71624cc5a1cefbdcb1d897b7728bc93462e8f52e998c3d72453ca9c94fa53dd28279cae5c591b7cbe9f61684784ff94c451a641524f31
 DIST tensorflow-patches-2.5.0.tar.bz2 4834 BLAKE2B 3e7331bb290db529e32fe6ba0a9fa2f5729fc510b925bc74532eb1bb15f8ecdaa2655cb16229a696e9716d006057badf26392e8fca2695146dc9a491050cb7c2 SHA512 699d16296c4f04e4de540b2eb91122a245cc02233a2b76021646a57d3228688b44a691308b4f1e9d9dc16929e6d2d692540cdeb3f42d2cad2c101d3008c22a33
 DIST tensorflow-toolchains-v1.1.10.tar.gz 137512 BLAKE2B 774b22a599070564c0f77ed0da79f6a96359b196dd3007370be885b796c236b9a29c01597507a3049f82cf489824c8016740b778cacb2b8cd859500f9ecb1887 SHA512 1daf4684f5b364a89b3cc475cf2d13d0d0622fc14d2b32d7ad8518932538e716782d755cfcedc98d129a3986bc7c38bfc7854c8ad596891e397510b75ae2f93e
 EBUILD tensorflow-2.4.0.ebuild 14658 BLAKE2B dcaed6ed4fcd5c4b476843123b28a5fbff7f5a82745974ef8f003d3631bb594d4685225dfbf0274c27c14464859f22e13b02a489c58a286c520015b96b19e970 SHA512 917f4f972ed833bcabe9adbf3cf36b04ab65d7afc272faebdd409b121616e9759d29ea16d0bb6d9ee5077ecc9250bd93bec6ccf9abe3f1f8d948e4d8588cb0e3
+EBUILD tensorflow-2.5.0-r1.ebuild 15549 BLAKE2B 6ce8046e632899b01048a95b5ad7746fa12d412d0a02f097482ed5792849cec4fd47fe82b0f0efafb16e00e4964de9551d26a5eac7f423f1f51880897b563b88 SHA512 e2cd4679c5e232e39bc81285fc5819901c24990e235faef3a2177de192e7bd483601a8b0bdd9b810c8cb47e7f9987d68aeaa25307344bfb0cf01cdf24bc0457d
 EBUILD tensorflow-2.5.0.ebuild 15547 BLAKE2B 52467e6df18ef6d8e3906a171b73c4b2d696fcd5bd1054b4a91b3074104375c2c35f2af29cc738af075df77e7aa128e9f378df993bfc9dc8be40cad7e87ddd96 SHA512 780580f02f115de8b5f63a4ab0c78acfe30baf69c0f46a908a173db2b7a2c0b32f596e67f25c129e5ddd304e7873dd488a49800296e32a623f2eefea7256f63f
 MISC metadata.xml 500 BLAKE2B 05036ab51828503c91b561bf087bb0a4d0cd6aa2f68dafa51499a5b57c33bf04e4f413aca576b62eb60b233467405a346c08d72b3c771b9f3fb4e099a55bd3c5 SHA512 ca5c67f8ced7d0f5ebb5f261c7adbcf23ea31b099e0aa3e1a3f6fd37df7d3558706af4df8411fc421a3b99c8615df7c5f07c617d7af275eccc728e76ce509458
diff --git a/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild b/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..1a9cf3d0793b
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild
@@ -0,0 +1,410 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit bazel check-reqs cuda distutils-r1 flag-o-matic prefix toolchain-funcs
+
+DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda mpi +python xla"
+CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
+for i in $CPU_USE_FLAGS_X86; do
+	IUSE+=" cpu_flags_x86_${i}"
+done
+
+# distfiles that bazel uses for the workspace, will be copied to basel-distdir
+bazel_external_uris="
+	https://github.com/abseil/abseil-cpp/archive/6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz -> abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz
+	https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz
+	https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz
+	https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip
+	https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip
+	https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz
+	https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
+	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
+	https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz
+	https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz
+	https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz
+	https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz
+	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
+	https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip
+	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
+	https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz
+	https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip -> ruy-54774a7a2cf85963777289193629d4bd42de4a59.zip
+	https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz
+	https://github.com/llvm/llvm-project/archive/1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz -> llvm-1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz
+	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
+	https://github.com/oneapi-src/oneDNN/archive/v2.2.tar.gz -> oneDNN-v2.2.tar.gz
+	https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz
+	https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip -> pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip
+	https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz
+	https://github.com/tensorflow/toolchains/archive/v1.1.10.tar.gz -> tensorflow-toolchains-v1.1.10.tar.gz
+	https://gitlab.com/libeigen/eigen/-/archive/f612df273689a19d25b45ca4f8269463207c4fee/eigen-f612df273689a19d25b45ca4f8269463207c4fee.tar.gz
+	cuda? (
+		https://github.com/NVIDIA/cudnn-frontend/archive/360d6e7164dfb7c802493fd1c0464f0d815b852a.zip -> cudnn-frontend-360d6e7164dfb7c802493fd1c0464f0d815b852a.zip
+		https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip
+		https://github.com/nvidia/nccl/archive/v2.8.3-1.tar.gz -> nvidia-nccl-v2.8.3-1.tar.gz
+	)
+	python? (
+		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
+		https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt
+		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
+	)"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
+		${bazel_external_uris}"
+
+RDEPEND="
+	app-arch/snappy
+	dev-db/lmdb
+	dev-db/sqlite
+	dev-libs/double-conversion
+	dev-libs/icu:=
+	>=dev-libs/jsoncpp-1.9.2
+	dev-libs/libpcre
+	dev-libs/nsync
+	dev-libs/openssl:0=
+	>=dev-libs/protobuf-3.13.0:=
+	>=dev-libs/re2-0.2019.06.01:=
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng:0
+	>=net-libs/grpc-1.28:=
+	net-misc/curl
+	sys-libs/zlib
+	>=sys-apps/hwloc-2
+	cuda? (
+		|| (
+			( =dev-util/nvidia-cuda-toolkit-11.1*[profiler] =dev-libs/cudnn-8* )
+			( =dev-util/nvidia-cuda-toolkit-11.2*[profiler] =dev-libs/cudnn-8* )
+		)
+	)
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/flatbuffers-1.12.0:=
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
+		dev-python/astunparse[${PYTHON_USEDEP}]
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/flatbuffers[${PYTHON_USEDEP}]
+		>=dev-python/gast-0.3.3[${PYTHON_USEDEP}]
+		dev-python/h5py[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+		>=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}]
+		>=dev-python/opt-einsum-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		>=dev-python/grpcio-1.28[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}]
+		>=net-libs/google-cloud-cpp-0.10.0
+		>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
+		>=sci-libs/keras-preprocessing-1.1.2[${PYTHON_USEDEP}]
+		>=sci-visualization/tensorboard-2.5.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/mock
+		dev-python/setuptools
+	)"
+PDEPEND="python? (
+		>=sci-libs/tensorflow-estimator-2.5.0[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.8.0
+	dev-java/java-config
+	>=dev-util/bazel-3.7.2
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
+	)
+	!python? ( dev-lang/python )
+	python? (
+		dev-python/cython
+		dev-python/mock
+		>=dev-python/grpcio-tools-1.28
+	)"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="10G"
+
+get-cpu-flags() {
+	local i f=()
+	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+	done
+	use cpu_flags_x86_fma3 && f+=( -mfma )
+	echo "${f[*]}"
+}
+
+pkg_setup() {
+	ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities"
+	ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:"
+	ewarn "https://www.tensorflow.org/guide/migrate"
+
+	local num_pythons_enabled
+	num_pythons_enabled=0
+	count_impls() {
+		num_pythons_enabled=$((${num_pythons_enabled} + 1))
+	}
+	use python && python_foreach_impl count_impls
+
+	# 10G to build C/C++ libs, 5G per python impl
+	CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	append-flags $(get-cpu-flags)
+	bazel_setup_bazelrc
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	# Relax version checks in setup.py
+	sed -i "/^    '/s/==/>=/g" tensorflow/tools/pip_package/setup.py || die
+	sed -i "/config_googleapis/d" tensorflow/workspace0.bzl || die
+
+	# Prefixify hard-coded command locations
+	hprefixify -w /host_compiler_prefix/ third_party/gpus/cuda_configure.bzl
+
+	default
+	use python && python_copy_sources
+
+	use cuda && cuda_add_sandbox
+}
+
+src_configure() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
+
+	do_configure() {
+		export CC_OPT_FLAGS=" "
+		export TF_ENABLE_XLA=$(usex xla 1 0)
+		export TF_NEED_OPENCL_SYCL=0
+		export TF_NEED_OPENCL=0
+		export TF_NEED_COMPUTECPP=0
+		export TF_NEED_ROCM=0
+		export TF_NEED_MPI=$(usex mpi 1 0)
+		export TF_SET_ANDROID_WORKSPACE=0
+
+		if use python; then
+			export PYTHON_BIN_PATH="${PYTHON}"
+			export PYTHON_LIB_PATH="$(python_get_sitedir)"
+		else
+			export PYTHON_BIN_PATH="$(which python)"
+			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
+		fi
+
+		export TF_NEED_CUDA=$(usex cuda 1 0)
+		export TF_DOWNLOAD_CLANG=0
+		export TF_CUDA_CLANG=0
+		export TF_NEED_TENSORRT=0
+		if use cuda; then
+			export TF_CUDA_PATHS="${EPREFIX}/opt/cuda"
+			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
+			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
+			einfo "Setting CUDA version: $TF_CUDA_VERSION"
+			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+
+			if [[ $(cuda-config -s) != *$(gcc-version)* ]]; then
+				ewarn "TensorFlow is being built with Nvidia CUDA support. Your default compiler"
+				ewarn "version is not supported by the currently installed CUDA. TensorFlow will"
+				ewarn "instead be compiled using: ${GCC_HOST_COMPILER_PATH}."
+				ewarn "If the build fails with linker errors try rebuilding the relevant"
+				ewarn "dependencies using the same compiler version."
+			fi
+
+			if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then
+				ewarn "WARNING: TensorFlow is being built with its default CUDA compute capabilities: 3.5 and 7.0."
+				ewarn "These may not be optimal for your GPU."
+				ewarn ""
+				ewarn "To configure TensorFlow with the CUDA compute capability that is optimal for your GPU,"
+				ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow."
+				ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5"
+				ewarn ""
+				ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
+				ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
+			fi
+		fi
+
+		# com_googlesource_code_re2 weird branch using absl, doesnt work with released re2
+		#com_github_googleapis_googleapis
+		local SYSLIBS=(
+			absl_py
+			astor_archive
+			astunparse_archive
+			boringssl
+			com_github_googlecloudplatform_google_cloud_cpp
+			com_github_grpc_grpc
+			com_google_protobuf
+			curl
+			cython
+			dill_archive
+			double_conversion
+			enum34_archive
+			flatbuffers
+			functools32_archive
+			gast_archive
+			gif
+			hwloc
+			icu
+			jsoncpp_git
+			libjpeg_turbo
+			lmdb
+			nasm
+			nsync
+			opt_einsum_archive
+			org_sqlite
+			pasta
+			pcre
+			png
+			pybind11
+			six_archive
+			snappy
+			tblib_archive
+			termcolor_archive
+			typing_extensions_archive
+			wrapt
+			zlib
+		)
+
+		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
+		export TF_IGNORE_MAX_BAZEL_VERSION=1
+
+		# This is not autoconf
+		./configure || die
+
+		echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die
+		echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die
+		echo "build --action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die
+		echo "build --host_action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die
+
+		for cflag in $($(tc-getPKG_CONFIG) jsoncpp --cflags)
+		do
+			echo "build --copt=\"${cflag}\"" >> .bazelrc || die
+			echo "build --host_copt=\"${cflag}\"" >> .bazelrc || die
+		done
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_configure
+	else
+		do_configure
+	fi
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
+
+	if use python; then
+		python_setup
+		BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}"
+	fi
+
+	# fail early if any deps are missing
+	ebazel build -k --nobuild \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so \
+		//tensorflow:libtensorflow_cc.so \
+		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
+
+	ebazel build \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so
+	ebazel build //tensorflow:libtensorflow_cc.so
+
+	do_compile() {
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
+	}
+	BUILD_DIR="${S}"
+	cd "${BUILD_DIR}"
+	use python && python_foreach_impl run_in_build_dir do_compile
+	ebazel shutdown
+}
+
+src_install() {
+	local i j
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
+
+	do_install() {
+		einfo "Installing ${EPYTHON} files"
+		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
+		cd "${srcdir}" || die
+		esetup.py install
+
+		# libtensorflow_framework.so is in /usr/lib already
+		rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die
+		rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die
+		python_optimize
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir do_install
+
+		# Symlink to python-exec scripts
+		for i in "${ED}"/usr/lib/python-exec/*/*; do
+			n="${i##*/}"
+			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
+		done
+
+		python_setup
+		local BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}" || die
+	fi
+
+	einfo "Installing headers"
+	ebazel build //tensorflow:install_headers
+	ebazel shutdown
+	insinto /usr/include/${PN}/
+	doins -r bazel-bin/tensorflow/include/*
+
+	einfo "Installing libs"
+	# Generate $(tc-getPKG_CONFIG) file
+	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc ${PN}_cc.pc
+
+	for l in libtensorflow{,_framework,_cc}.so; do
+		dolib.so bazel-bin/tensorflow/${l}
+		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1)
+		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3)
+	done
+
+	einstalldocs
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 5649cb23b81c..1a9f94f94460 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index d0c233f2064e..dfae36a94ecf 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -3,5 +3,5 @@ DIST z3-4.8.11.tar.gz 4799940 BLAKE2B 5478f9f45f2dc8ea5d2b781e79d886e77eed5ae034
 DIST z3-4.8.11b.tar.gz 4801435 BLAKE2B 903a04246fe4dedc96fda653fa9e3a57a80b951d20b992306bd07bc778cf0a94cf36fe4ed3f178bb26196a1ca294834c784a117fe906d52b82f874a43869d110 SHA512 dfcfc85209dd00aa5f07de0a7e7186a33442b72b94b05c01f53350b9281551be2a2c21ad5e7814bc2c52a3329be8df578e6be8c387cbfdc3a9d3bef0611d6613
 EBUILD z3-4.8.10-r1.ebuild 2428 BLAKE2B dbcf484ac1b804abc88bc0dc7405e2c161f1d80259d972d2327c7f837bec3bee355efaa0d689fe5f490d09c0a509a2ee4be7fb38588518ca3f5db92997449e31 SHA512 3a48335f2cbb5d94a24c80793c4651f244c71645a869ee494ec83600aaaa3824a8198d71a32fe3c14c8f2df80c5b76ac321f41f6e04b5c4aab05851db65bf37c
 EBUILD z3-4.8.11-r1.ebuild 2433 BLAKE2B 6289708b8c64f3aa62e98f659cc79bad7d9d189267e670d2543c45dc8b2fc60ee31b1a9950059f7a75ed2a470cf13d5a9dc5956259614985365de2aa6fd4418e SHA512 37db72f50f850d89bc9b540140d94d26a18358fda78afdd4cb95ba47b9ba3591c2afb50679acd722b776e8a9ff681688ab73899317d63d71c47687a8b8dd4d0e
-EBUILD z3-4.8.11b.ebuild 2434 BLAKE2B b2e68066debfd8269a84a38f38b62bcb27dac57a2c208f4025ffc06d423cbd78cb123dbf714a0042563d82c01e4374fd46a3989d9e756ba1f3731769a5304c6c SHA512 75d5212ecb38f38da01d765d0ff3c806cf25b04cd8d1d5d9bbcdf6c141f2069e7e9b5dc18a9fc6f5637ef297a7ad219d9e1bb7588a1d64af614630342fbbe168
+EBUILD z3-4.8.11b.ebuild 2433 BLAKE2B 7cb4957417d1f8327cdb7ce66b820838b84984b73e2825b2feaa14e4877f7655d60f946f54e08979ebf61aa86c225aa4082d15145dc602c3c5e27488736edfe9 SHA512 fe28f5f6d28b00b0092411fb102c810d07e97c95df7c693aefc3279822773953b0b58006d96ec06d030e59278eb359f30e76d1acfbf8f8d65b64cf9fc9758f11
 MISC metadata.xml 616 BLAKE2B c35cac6f5810148c69a612d6b04ed4cacdbf066e61951ea1433336f14b2b058c4dd50530b547021007489122f5e94407b30641dc9ccf3b59a345e7a09e5fdd28 SHA512 eaf72a29601e96d5312120a1fc01a0b3dd2b7d8dbee70f6052e8ff7a7e07ae8b768d1417b7f4b523e755e5569092f2685bba77beaf3d7c455ccbd057cc9b670a
diff --git a/sci-mathematics/z3/z3-4.8.11b.ebuild b/sci-mathematics/z3/z3-4.8.11b.ebuild
index 985b483904f9..6716e2d4fda3 100644
--- a/sci-mathematics/z3/z3-4.8.11b.ebuild
+++ b/sci-mathematics/z3/z3-4.8.11b.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 4d31928b1f91..7c5b0a08fb39 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index de681bc53ff9..477817067f55 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,7 +1,7 @@
 AUX gnuplot-5.0.1-fix-underlinking.patch 483 BLAKE2B 1719635d947a5d53fa5b6def65286aa1064e5a80d36d42670890bdda7dc849add342e3574dbee85f0546d953491271354c6946cc157207af700ab1cfde6d0249 SHA512 b5ac3ed830f201ba6018a81bc4860e6da0e41cc9cdc1ac8acc225bf41a0006cbd6e2f8e061ab2bd013ad55b105a02e915e256a09ca4e4faaf4791ea1c3199f28
 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c
 DIST gnuplot-5.4.1.tar.gz 5608076 BLAKE2B 7b2c30acd16b1aec3be9341c019449882a9231afe196bb05dc5d7925681296986de2be3463ca19d62ff1cea6dece0586b6bc8a54881c4fc2ec372635264ebb3d SHA512 2371830636d4c9ee93e9d6566dc2889e96ece3660b63ef4cfb6514e233510e5abaf4f93863bbe9a418f11db8e3b12a15242556aae52bb69591ad7d26e6581121
-EBUILD gnuplot-5.4.1-r1.ebuild 5112 BLAKE2B cbda6dc26ff05c4b6469e8ba0eae6904cc2c4ce589878e5b52b50e2027cc7cd92cabbe909d9c95e5bc561368cb4437463e519d88c5cc0048bc7e41e18a9684d6 SHA512 27bf7527327905338ef4bc356fe31c6db151f307058515de074340b9f96e9184e17a301d05d6aafdb962493817e49e964381c5ee03736307173f0c73275199fd
+EBUILD gnuplot-5.4.1-r1.ebuild 5059 BLAKE2B 1dcb458413bc167a7a1329f2d1fac9c6a25959ca8aafc4f38c2b73753fab7e4627a54d13bd166a40307b1e75e5cd8289b5b8028339181b9587b1d3e5ce102bce SHA512 b5e459e9e8fa0332e92e190dad95ce1f26abfa8f9d4f1982853a8c546cd6ef492132363624065b4a3457f9fae4ae03a90c06a9be8597407c20d46e741aa55701
 EBUILD gnuplot-5.4.1-r2.ebuild 5099 BLAKE2B 13d76018e6800afca391f71a1820a322b57ef0e61fd4a38a1a04258a185ea01d97edc18f621842b799b5f9fd24101379d785fd58a3d751029cb777da2245afeb SHA512 a912f8ca065989a4861539ffda711960df8804ca7fc84c50891f8454104ef539be2d47299ec938667a0fdceaa2ba8dde58963ed1c2d1e9c883c2f8bf5d97f3d2
 EBUILD gnuplot-5.5.9999-r1.ebuild 5100 BLAKE2B 951612f52afede49d5a93e906c063c70e5f97342f5586aa124ea79525d73b10faef7c346f5f32a7b5f48b0357d9a02ed9b25af20c26f3b42262e29439a55402f SHA512 edbfda82aacefeea9d37ecd2ec7520b5e36d1a5b2d15c9c83ebb5002f485d223e0243e45799306772a7d57a15a07282d9e03d369c793f198e8fef7214c304f01
 MISC metadata.xml 1069 BLAKE2B 2f42ec584b402482270c5f975c6001702f2d5cf367e9f86c190af4b91d97e3c807434e1963a5e1ed856751f592cf1d28cc25897674f92894409497b173e84e8a SHA512 7433f704ff9bee279a70346522595532c221462a915acedb44be85838a472c8a064670a31f72792d10df038b96595e61788c625614a691e956840b39fc063feb
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
index ff93661495b2..1b6af60e70ab 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-{1,2,3} )
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
+inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
 
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
@@ -119,8 +119,6 @@ src_configure() {
 	tc-export_build_env BUILD_CC
 	export CC_FOR_BUILD=${BUILD_CC}
 
-	use qt5 && append-cxxflags -std=c++11
-
 	econf \
 		--with-texdir="${TEXMF}/tex/latex/${PN}" \
 		--with-readline=$(usex readline gnu builtin) \
diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest
index 87f966eff877..17363feb84f5 100644
--- a/sci-visualization/tensorboard/Manifest
+++ b/sci-visualization/tensorboard/Manifest
@@ -1,5 +1,5 @@
 DIST tensorboard-2.4.0.zip 10631832 BLAKE2B e892c3f62855bd900320adbbea2758191296e2863e8865f4ffed3c5623fe5273a5a26554504b63db58c60d2a8c407e234d6cf3edc3868c88dfebd894def99859 SHA512 2301f526a98ac85cf5d182fff0f565c86883ec795bbaf2322696416621c8473d850a3f508079f89ca2a86a05fe020acde1282b72e2bb5ad77aab2d0e5ea2db4f
 DIST tensorboard-2.5.0.zip 6019104 BLAKE2B f07db4fec7cc39e15c4f580f479679f0db4f06e66d81768799ed3652bb9ba63c7b61bde7f12119d09474009e55c12d91ef0f2b3aeeb05682532630314cab871a SHA512 e39ca09bd00fab9b5f6f9393e48cb6be2313f86c24b2f0ffcfd08b08b9ed4e95e7e19297bb67d8b558e1913640774f9b9d512a34153251acb9f566d6485e0f78
 EBUILD tensorboard-2.4.0.ebuild 1944 BLAKE2B 8de93c1331c5a18ae04c366fbc38288c28bb80c2c1dff889bbd88683ce5c451f1e9db4a9011ff7980448e778ef01475f2838442e871ea039d9a3eb4a9b3d61d8 SHA512 da210f7574f030b59f2944f6fcbdbf45d6395dad603e69e24344d21942c2aa0a2eb9b5a3eca883ab9d83337f2648b47f162bcee4044de5f61148fcdb1f3ebeb1
-EBUILD tensorboard-2.5.0.ebuild 2058 BLAKE2B 06a05e5f60caeb5bfb4c308b2ec77e640265472f8a282ab6bb113c3cb4eee4f039b2ae22b87a099479b8d46b6b5d900be22a1001b20de96119adf5813b743473 SHA512 c3777889abaae86b754787a95a58291a5d2e7952165a21638ec8429cf0dc0eb5aa83f6262bd87b5fa1778d142e78e4c6a00a1203717377401190591cbbf778e3
+EBUILD tensorboard-2.5.0.ebuild 2060 BLAKE2B 5eec94d8cb854130b0bae18c4fc2c96497beb5ab9daf1e8086b0171fef3fa50c50483b160a83ecee605db6126ff455fa666557a1baa30d36c8314cae388aa6ed SHA512 12c1c737a9eced8fc90b9dfd570d00d6430cb30ff836a399ac1dd2cad62f2d3e1d5a2741d0a4ab7fe527df8b1e588cb0d77b3f6cc08abc85a6e5cbd1bdcd1627
 MISC metadata.xml 494 BLAKE2B 367959e934fdf8e447da9632a05ea0ada6116a7c39cf42096a3b24f0dcf0c0bfbd3263e6f3913611c27e76f629b77d1e5022fa124d7e79f03a224bd3627bb538 SHA512 b59bedcac4e07ddbb62e90df57670116ba51c3d8c6294679ba5d8f17d7adbf3644f3d203c1d1ef4fa06d7e50640148ee259a081afb807477784350b98c52da11
diff --git a/sci-visualization/tensorboard/tensorboard-2.5.0.ebuild b/sci-visualization/tensorboard/tensorboard-2.5.0.ebuild
index 345a4c811517..d2ada5a97d3e 100644
--- a/sci-visualization/tensorboard/tensorboard-2.5.0.ebuild
+++ b/sci-visualization/tensorboard/tensorboard-2.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit python-r1
 
 DESCRIPTION="TensorFlow's Visualization Toolkit"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a40c39ae7976..67ffca24be09 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 9adf7ad290a5..68ae53a12d94 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,6 +1,6 @@
 DIST checkpolicy-3.1.tar.gz 69072 BLAKE2B 31cb5ef52533b0a62f954e770278fc5766a961d87fb86260b04abe562bcd90d0025b33931c6ad54096c64ab54150c7562c112eac80eb2f60dbcdda57f4cacfe2 SHA512 2276a5a0919286049d2ceba386ef5f6de523745b588bb81cb4fed5eced5fd0b8070249b7a3ae5a85e2abb9369a86318f727d4073aad14ab75c43750a46069168
 DIST checkpolicy-3.2.tar.gz 69035 BLAKE2B 263c582c8ed3c38822513899f3591edfc5d0132977451503a8b45d2074b5a1c5ce03973353b3ceaad44da913b4e35546cfef1988b68bd517618efdb942f994ec SHA512 133639595c2acc66c02b5a637c5e0c60d80ce2bae04f4a709d9fafabd31f9497d1a6e3334904b985c2a1bd94a7a7e3df782c2af2ae41d1fd79b69156a835edeb
 EBUILD checkpolicy-3.1.ebuild 1149 BLAKE2B beac3751ebcfc7969e662a3cc1b25a266b144db2155a8f469170781d1e6aa515a759d40adecec768e066f6424291e6fd7ed5c3e87f56eb39a309e0e56de45676 SHA512 68682e8384cd6ff456343fdfa611be2bce2e15edb732dc377e8839cd3b1fcf510d914d02c8b2433d34ee6e53fe5cfba46ad0712cdb25f91bff3532b5cf80c035
-EBUILD checkpolicy-3.2.ebuild 1020 BLAKE2B f2c102e37fb20e87d7409ff142211d7972979bb74fa97db360cafa6a24ad1e62793f6d2b4e353bf0dcd865a71178d09f3c94d21a8bffa53208e3057668d0e8f5 SHA512 7a4ca556b7d1214a9a1edf851e3c12113dce94f16256085380317ce1c059c488c07568516de4e75bc5b54fdc43284e15d9958b692c0ea4b4ed3f30b20c2943eb
+EBUILD checkpolicy-3.2.ebuild 1019 BLAKE2B 4ce64afa38737ac28fcaa1f32f8ac017f2077d4cfa4d11d39f8aab684d7e926f37d4923f94b54f3d951674d68bdd1f3395d9a5595987c54531cd5a1c93b28ea3 SHA512 acdc25a5435099b4641e21a1a3d8403b0d7fefb11b1b3e64ac5dc7e1fd2f795308574095774ff8c639de2441a57e1f940a9cb331e8664cf4b7aec0663b1053c8
 EBUILD checkpolicy-9999.ebuild 1014 BLAKE2B 08372b851c56f8392c54270335c7b4a7aac00f39523f4a1cabbe5a3c1855c3687fb580016589beba2d208f4199a428b72df93a093a1519c3a91a3e01199b0ffc SHA512 fe151a9a059ca7643dc0349dccad1c0eb80cb5c6455b02b85a2aaa747c8e13bdbb3f9cdc3d71313249f8f00ec1b8d5979a253eeea0d0a6b982f77183f798114b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sys-apps/checkpolicy/checkpolicy-3.2.ebuild b/sys-apps/checkpolicy/checkpolicy-3.2.ebuild
index 799b7e95e9bc..486df7377865 100644
--- a/sys-apps/checkpolicy/checkpolicy-3.2.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-3.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/earlyoom/Manifest b/sys-apps/earlyoom/Manifest
index 1efde3085918..f7493c414649 100644
--- a/sys-apps/earlyoom/Manifest
+++ b/sys-apps/earlyoom/Manifest
@@ -4,6 +4,6 @@ AUX earlyoom-r1 138 BLAKE2B a95a6db627133ed3d9e4fa02505a1fb8abfc17c345a16df9956d
 DIST earlyoom-1.3.tar.gz 31399 BLAKE2B 3867540afb23493fbb532bcb72a5cfacca4ed297a053ff5e2c7e394bfa3640887e3e7c6430789bc1eda4b7a68680d8a74ab56b641fe9e5d4caa4406e2edb0667 SHA512 c5de742289e82c2098bd88c61dcb3e20eb022905a015b4894c95a4de3978ce18d794a9e7c17c97851ca9f8888728908f7bf978c014b3b69799bffa8b546d258a
 DIST earlyoom-1.6.2.tar.gz 49006 BLAKE2B 85a02d4171ba1bb94d5ddf573b8f5ac58d28a0cf9766f4fb2c96be5b45eee7aab853008c36f9e3aac76685b70008051faa2fe339797ecf9137469f089935a6b3 SHA512 d622a5347591d2017f6e62255940482af431e647acf1b35ab035e0dbfd44da7fc52633e6dd6433e42a1348fd294d766550ba092260f3ec59bd51e545f08e466b
 EBUILD earlyoom-1.3.ebuild 1035 BLAKE2B 64ab6ed459eb6138383569f8b1e03fad94bc4573353ea749ca65a564b2be47f398072974ea5a26c40d3521aa40e27296ebc2a4cd794a01376a652fdcce4dc304 SHA512 79d26e8b94db7b379a9745f2a4a3268fa25cfd97a53897ef29caf7267ab9428b3e096744861c64d6c64afa54cd55e4a565faf3c568a296323d486207ce0a7595
-EBUILD earlyoom-1.6.2.ebuild 1055 BLAKE2B b44ce2881587ced020d5ca03a5c159fcaaa43c232fc1709a63eeb55d9c863f5c4a9b45b2fb91233d129eade27966fa6ed5dfb47fd2012dda41b6a31b3d90df0f SHA512 505051bf11eeac75d153c11b2f168afe4d06669ee951fab5d124c87fa6f868de166ddd705e1c9dce0d09867e33966427f8306db293ac269e391bd684b88d6e24
+EBUILD earlyoom-1.6.2.ebuild 1054 BLAKE2B c9505019f4a676f11c707a7dd785ee5818fc2ee575674f61a1af90d761d24cc253c7a8e6be93571ca0ac942837c5938c836ce92ccc43945868e7764b039e4cfc SHA512 56570338533bebb7fbad9d884548dc7474d82ee2a30e89715f3ffcdb7e92431f17e461463fe91d41b85ce7d54a6a22f3d9c488d785ca466d2018a0d7c67d5315
 EBUILD earlyoom-9999.ebuild 970 BLAKE2B 88a517b48f7367e9abac73dcbc1661e0f0344626506c8e5380a88e6d61fd7b996d93696952fa10b057c579cb5a5490abfa516cecd90a6f916f28f834343cb1df SHA512 342d48f9a0ebedeea82a6995a3ae456745d95d099e61f9ba2d27122a7193df2d8566e139526aa95286e9c12ac401971f1704d029d42783f8faf6956f128e2b10
 MISC metadata.xml 307 BLAKE2B e51a83c88fdb7b817981979a1de41249b2255900e6575eb555489bbc6e924e0bb0ac41d1c214279e0e4e87cba96eb4c0dd92b8dc591a1a1fa7f83e7b6fa9eda5 SHA512 28e7739c241e47e235f1cf897bf4fe5befbcdf783451906ed200c7fac9da0b57c24c6b79900493379709aebbd0a81b4999436d070ad2557cce3886a1efc4c806
diff --git a/sys-apps/earlyoom/earlyoom-1.6.2.ebuild b/sys-apps/earlyoom/earlyoom-1.6.2.ebuild
index 1b2e94871b28..34481cbb8a2f 100644
--- a/sys-apps/earlyoom/earlyoom-1.6.2.ebuild
+++ b/sys-apps/earlyoom/earlyoom-1.6.2.ebuild
@@ -15,7 +15,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 IUSE="docs systemd test"
 
diff --git a/sys-apps/fix-gnustack/Manifest b/sys-apps/fix-gnustack/Manifest
index b1f9efc7ad62..43592f8cb63b 100644
--- a/sys-apps/fix-gnustack/Manifest
+++ b/sys-apps/fix-gnustack/Manifest
@@ -1,3 +1,3 @@
 DIST fix-gnustack-0.1.tar.bz2 105457 BLAKE2B 25825972d0a37335a6d6aec316e4dc972d6590da5d7d1145252b3fb4fbbf6276cc7818e47270065583558adf36522ea26652f8e7212a2046fc0d54c131ad5324 SHA512 df83beef5533003ceedda799bb27af15f877d2b3bc7c8213b2ac64a100270790655de3836eaa0ab8411d9eb91a6056e4902973b740b9b0791dcc5477226544a1
-EBUILD fix-gnustack-0.1.ebuild 444 BLAKE2B 40b601c1c46e5033f6eedee4f8f47892c84cad41cdf9c2cfea80a817693ace06e4543de6e5526c9cdf4687b9441656929f8cf9348077ba043f3700a1a8a9aade SHA512 e6ca404e1b9e72ce1e218ae50c4360a9373784571117354ae11526853e23dfc893eb02499088eaea51c62add16baf75585fb2ba90ff3b6fd84a005bf80af974d
-MISC metadata.xml 330 BLAKE2B c6c9d215cd38a95f824fac1761bc4e6048ac50688318fa33a94d6d97739e726efaff57e4e0814d16b5336cf4481498580d4e2743404a619cad0d81c052880b6f SHA512 6bca1bac9701b2dde509f25dd18dd819d769cda23669faf680800747a37369002eb3954606fc6541dec324473eb13a78bc0c8a97085436072ee076d85e7a2345
+EBUILD fix-gnustack-0.1.ebuild 443 BLAKE2B 6ff06d40ef5a3aa53e19b028b738c81a8029a13a7fca90d7728010f1ddcd91347988368ec37fd828419106832c91c36cc4c0835b7d16ccdeffc2b785e5c620d4 SHA512 26693f127e2c878cfa585afb46602b742c4c1bdbadc77243c7dfa11aa8fb52ff80bc2954641c8dcd378bfdd7050aa1cd3861a034d51dc2a327577ceb2b2ba808
+MISC metadata.xml 337 BLAKE2B b4cf898b0e30aa10cc1bce0d27840f55307d8439377eaf69ef33db33f3d8bda30ed30845ff4671770a9923fdc36a3a0c523bb04a3d64f61f7070d3d0c4d7cba9 SHA512 c4884533d260184b6480e7abe07f35d438585db6511e8ddee42a5778a25ac8509be5abc0d0fec30f4082117bf7950c9811be221dbfc9189eef136c3b331cb40b
diff --git a/sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild b/sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild
index f80f513ccabd..8964f4883c79 100644
--- a/sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild
+++ b/sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Utility to report and remove the executable flag from an ELF object's GNU_STACK"
 HOMEPAGE="https://dev.gentoo.org/~blueness/fix-gnustack"
 SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2"
+S="${WORKDIR}/${PN}"
+
 LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="dev-libs/elfutils"
 RDEPEND="${DEPEND}"
-
-KEYWORDS="amd64 ~x86"
-SLOT="0"
-
-S="${WORKDIR}/${PN}"
diff --git a/sys-apps/fix-gnustack/metadata.xml b/sys-apps/fix-gnustack/metadata.xml
index 62a593741836..0495c5db73e3 100644
--- a/sys-apps/fix-gnustack/metadata.xml
+++ b/sys-apps/fix-gnustack/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>blueness@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/gcp/Manifest b/sys-apps/gcp/Manifest
index 5b8d0bdb7004..c5f2293e72bb 100644
--- a/sys-apps/gcp/Manifest
+++ b/sys-apps/gcp/Manifest
@@ -1,4 +1,4 @@
 AUX gcp-0.2.1-gentoo-fhs.patch 431 BLAKE2B a779679ea6f7ee897b66ce89b8d209969012cee0c1f1840c8607b4d458b3f9ef9371f5612804cab8fadef84171c53677388c53f78aff5bc20b4e6d10e5cbc58f SHA512 9ddaf9f0635eae415ae99cefc37157cba0758a1e89c2f7cd64502991452eec323d63b9949ed9f834afe7340b53d423ce4efd6dffc346b694a6d94424ea18aedd
 DIST gcp-0.2.1.tar.gz 33098 BLAKE2B 9affaf87db722c1e35fe71acf93521753a4372d42bf33892cde8605b17972ac46f616177114c5ccc36fad64011ae881ecc9382c79311dbca93ebedd04e688526 SHA512 900e08554e8f87e9572c52381c83bdcd89f02cab4fbf51335ddb81796057fa8bec156cf3ddab8712ed2c55ca7d6d0e1c209939ccead9bf7693d76bf882807017
 EBUILD gcp-0.2.1.ebuild 831 BLAKE2B 3d4b9459ab8646e584356aaa2302c0ccd2459817b2371697b6aed8010884265bac7fc29f5bfeb1465114fa1445208428bbf94d5ec5bab3630e54e49cd41b50f1 SHA512 fe161fd674e55f367cc4da1877544c9e010a2209bf574b80f8437fa350c1ef6c8b6e2a16baf1887cb571868340a5a0c3ba975e93c0ced7d133c63a2f3a1d83de
-MISC metadata.xml 219 BLAKE2B 96b35aca9e98ee4763a251a4dd9d63b7377c7183023f2ccda74cc76c7117fa885f518bebfad739d2e80f32dfdf4882e08012a94360666dd9cff26642e2df4513 SHA512 39ee913ff21c2aaa9f767872e2b49cb3cb982afab04d7b5045eda61368d63c2e3e1d637df59f7fb4ec4f95776e754615a260b37580cc9f18017a7c080955db77
+MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/sys-apps/gcp/metadata.xml b/sys-apps/gcp/metadata.xml
index e25cd064c44a..70f78a5392df 100644
--- a/sys-apps/gcp/metadata.xml
+++ b/sys-apps/gcp/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>soap@gentoo.org</email>
-  </maintainer>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/hotplug2stdout/Manifest b/sys-apps/hotplug2stdout/Manifest
index 7fc0b851871e..6d3f6ce1ce0f 100644
--- a/sys-apps/hotplug2stdout/Manifest
+++ b/sys-apps/hotplug2stdout/Manifest
@@ -1,3 +1,3 @@
 DIST hotplug2stdout-1.2.1.tar.gz 7578 BLAKE2B 766e840a6647751613975aa71c0a558d5117bdf84584ef2d96391be3b4d97c7dc9454006746380c49276cda4fdf7af81d32d665f43319f461204ddf9b8d433c9 SHA512 51cdef016b8e57324b005fbe633643c36b2e557da369e48471b6969441610c4489c0a49be28080cca17c8d77124c6540877151acde415dab49971f87160df126
-EBUILD hotplug2stdout-1.2.1.ebuild 583 BLAKE2B ccde96e855db85081cea9eb3316b9551c473cb09382b388e51ed436f5750299147bfdb9303889ae9ac2707171f28d884b17ab4f69f5ca66344539d1b227aaf37 SHA512 83e727810a190e1ae8ee867f62e969c86720733d459ba3c6a5bff77c258d12625a6cd51cf09c2be204a716b3752c21b458a8ee469476d5de51af2eaca0b48b0d
+EBUILD hotplug2stdout-1.2.1.ebuild 690 BLAKE2B 96171f713302e78fb3ebe8fb064a30b5c2011c72dd0ebdf189318f2a8bbcdc11c8a01ab67da5b6bbea24f846830d675fc7bc649552d1bcf792758e43e62cfe65 SHA512 48c1b8181b217dc574553e5c0b3da9b6f7d6498f782c867bc3bb0eb05e4b36fab0c967beccbebf77a73622a82ad3f9041aa76590dabec15bbf069ac7153c60e9
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-apps/hotplug2stdout/hotplug2stdout-1.2.1.ebuild b/sys-apps/hotplug2stdout/hotplug2stdout-1.2.1.ebuild
index 24d87721c34c..c38d1da44a2b 100644
--- a/sys-apps/hotplug2stdout/hotplug2stdout-1.2.1.ebuild
+++ b/sys-apps/hotplug2stdout/hotplug2stdout-1.2.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="A tool for reading kernel uevent(s) to stdout"
@@ -12,8 +13,19 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-src_prepare() { rm -f ${PN}; }
-src_compile() { $(tc-getCC) ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${PN}.c -o ${PN} || die; }
-src_install() { dobin ${PN}; }
+src_prepare() {
+	default
+
+	# Clean up prebuilt binary
+	rm -f ${PN} || die
+}
+
+src_compile() {
+	elog "$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${PN}.c -o ${PN}"
+	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${PN}.c -o ${PN} || die
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index d5f2ac195193..79df41101bae 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -2,6 +2,6 @@ AUX man-db-2.9.3-darwin-libdb-intl.patch 733 BLAKE2B 864ed2ac8a3626ad5474412ce59
 AUX man-db-2.9.3-sandbox-env-tests.patch 315 BLAKE2B d6f4835e9e32f8afffe6ab1a70ee664192db05fbe74013724fcdbe112ead2d4288f90be032777a58ee41515c23d5561ab9cde495a92aa9f74ee353479ef884e3 SHA512 d8840d45c3b115f51bb9b3fc11ece2fecadfe284cd7db29cd012ed32faed990b12a9920cf11282358e5dd27df4bcf3c1a0316116ecae58917ef3c65efb1eb22b
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 DIST man-db-2.9.4.tar.xz 1909020 BLAKE2B 43427e851f0e661ca1cee55211dd7636f4ffde067c75de7715f525029b22c205728f8e86ac49abff60e47a4a4c9e1fbd78e2c87e70bd37778b88594a3897275f SHA512 169f091dd0a1d0dbd1583366f8257afb8f57e030d0f7d4213c14ce0b1fc5debf8b9cf2731de503830cb2826b3a22b3cff7da993d44ec18557935bd293529133c
-EBUILD man-db-2.9.4.ebuild 5062 BLAKE2B 00764d866d8bfeea46c028e6c6ae4594c8f7e1ab3966c28d103c232bf386d411a48772342169af569d0f3204b355474c77811378127efdd044dabba510deacc8 SHA512 e1deed08c157d5a0dad34301d89171ba8715b30f4e903b28f476216f9d26278cc882e04b370574da9b9f1716b46f50f609f92e5d1b78cd5a392bc1b3ae08d7b0
-EBUILD man-db-9999.ebuild 5070 BLAKE2B 282b6d530643d4f98e1f5618865676f0eed81da88a599238f0c179777030eaa526182e49017e750aff403da713a1f6c598f87167fd8687be565320783e9c975e SHA512 fccf9aacad6d3b6fa86b08b30972a178599aa95eb596c7d0ba9d10284c870cd2dd86cfec77f5d58e5bc6f54ffcde05adba7f0d176bf9a5ded05a6584fd4f6f21
+EBUILD man-db-2.9.4-r1.ebuild 5102 BLAKE2B 0535e249981dc133d73b6378ba89bc0b341a9e98c73a2160b31b5095e70f9b746a382e9a01600a4623aa8d301b5e47ac24dea2f7696c46f8a98d07931800fa0d SHA512 7f7736caaeca6d5032a2fbc4b1c35d0f07e03b5eed38e6783f31080dcbdf0c5eb60786bd9a7377102ca9938d4624a827d1dd20c2407e741b32a0b32c51c1784a
+EBUILD man-db-9999.ebuild 5110 BLAKE2B f073f875c6c882b5b5f387659b8862d2cf6493cccd3cf1636428ae183751a575aa059e9b8ad8eaf68fb1707f883fbc0f65f71719b6b7459bbbe20a49457761fc SHA512 7a5bda7f4b52ec037b82dbc94af31dc05309ba5d7f203efd8f0f751d3a7d02166dbd1e9c1417e523fb58c8d834aa4b9c0ed9f0a9571aa30bf94bca84223c39bf
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.9.4-r1.ebuild b/sys-apps/man-db/man-db-2.9.4-r1.ebuild
new file mode 100644
index 000000000000..b96129617cc4
--- /dev/null
+++ b/sys-apps/man-db/man-db-2.9.4-r1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd prefix tmpfiles
+
+DESCRIPTION="A man replacement that utilizes berkdb instead of flat files"
+HOMEPAGE="http://www.nongnu.org/man-db/"
+if [[ "${PV}" = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
+
+CDEPEND="
+	!sys-apps/man
+	>=dev-libs/libpipeline-1.5.0
+	sys-apps/groff
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( berkdb? ( sys-libs/db:= ) )
+	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
+	seccomp? ( sys-libs/libseccomp )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? (
+		>=app-text/po4a-0.45
+		sys-devel/gettext
+		virtual/libiconv
+		virtual/libintl
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/man
+	acct-user/man
+	selinux? ( sec-policy/selinux-mandb )
+"
+PDEPEND="manpager? ( app-text/manpager )"
+
+PATCHES=(
+	"${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch
+	"${FILESDIR}"/man-db-2.9.3-darwin-libdb-intl.patch
+)
+
+pkg_setup() {
+	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
+		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
+	fi
+}
+
+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
+		)
+		AUTORECONF="/bin/true" \
+		LIBTOOLIZE="/bin/true" \
+		sh ./bootstrap "${bootstrap_opts[@]}" || die
+
+		eautoreconf
+	fi
+
+	hprefixify src/man_db.conf.in
+	if use prefix ; then
+		{
+			echo "#"
+			echo "# Added settings for Gentoo Prefix"
+			[[ ${CHOST} == *-darwin* ]] && \
+				echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man"
+			echo "MANDATORY_MANPATH /usr/share/man"
+		} >> src/man_db.conf.in
+	fi
+}
+
+src_configure() {
+	# set sections we want to search by default
+	local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
+	sections+=" 1x 2x 3x 4x 5x 6x 7x 8x"
+	case ${CHOST} in
+		*-solaris*)
+			# Solaris tends to use sections named after the pkgs that
+			# owns them, in particular for libc functions we want those
+			# sections
+			local s
+			for s in $(cd /usr/share/man/ && echo man*) ; do
+				s=${s#man}
+				[[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}"
+			done
+			;;
+	esac
+
+	export ac_cv_lib_z_gzopen=$(usex zlib)
+	local myeconfargs=(
+		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--disable-setuid #662438
+		--enable-cache-owner=man
+		--with-sections="${sections}"
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_with seccomp libseccomp)
+		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
+	)
+	case ${CHOST} in
+		*-solaris*|*-darwin*)
+			myeconfargs+=(
+				$(use_with nls libiconv-prefix ${EPREFIX}/usr)
+				$(use_with nls libintl-prefix ${EPREFIX}/usr)
+			)
+			;;
+	esac
+	econf "${myeconfargs[@]}"
+
+	# Disable color output from groff so that the manpager can add it. #184604
+	sed -i \
+		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
+		src/man_db.conf || die
+
+	cat > 15man-db <<-EOF || die
+	SANDBOX_PREDICT="/var/cache/man"
+	EOF
+}
+
+src_install() {
+	default
+	dodoc docs/{HACKING,TODO}
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
+
+	insinto /etc/sandbox.d
+	doins 15man-db
+}
+
+pkg_preinst() {
+	local cachedir="${EROOT}/var/cache/man"
+	# If the system was already exploited, and the attacker is hiding in the
+	# cachedir of the old man-db, let's wipe them out.
+	# see bug  #602588 comment 18
+	local _replacing_version=
+	local _setgid_vuln=0
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
+			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
+		else
+			_setgid_vuln=1
+			debug-print "Applying cleanup for security bug #602588"
+		fi
+	done
+	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
+
+	# Fall back to recreating the cachedir
+	if [[ ! -d ${cachedir} ]] ; then
+		mkdir -p "${cachedir}" || die
+		chown man:man "${cachedir}" || die
+	fi
+
+	# Update the whatis cache
+	if [[ -f ${cachedir}/whatis ]] ; then
+		einfo "Cleaning ${cachedir} from sys-apps/man"
+		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process man-db.conf
+
+	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
+		einfo "Rebuilding man-db from scratch with new database format!"
+		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
+	fi
+}
diff --git a/sys-apps/man-db/man-db-2.9.4.ebuild b/sys-apps/man-db/man-db-2.9.4.ebuild
deleted file mode 100644
index ee7a1ac42db7..000000000000
--- a/sys-apps/man-db/man-db-2.9.4.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd prefix
-
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
-
-CDEPEND="
-	!sys-apps/man
-	>=dev-libs/libpipeline-1.5.0
-	sys-apps/groff
-	gdbm? ( sys-libs/gdbm:= )
-	!gdbm? ( berkdb? ( sys-libs/db:= ) )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
-	seccomp? ( sys-libs/libseccomp )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? (
-		>=app-text/po4a-0.45
-		sys-devel/gettext
-		virtual/libiconv
-		virtual/libintl
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	acct-group/man
-	acct-user/man
-	selinux? ( sec-policy/selinux-mandb )
-"
-PDEPEND="manpager? ( app-text/manpager )"
-
-PATCHES=(
-	"${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch
-	"${FILESDIR}"/man-db-2.9.3-darwin-libdb-intl.patch
-)
-
-pkg_setup() {
-	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
-		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
-	fi
-}
-
-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
-		)
-		AUTORECONF="/bin/true" \
-		LIBTOOLIZE="/bin/true" \
-		sh ./bootstrap "${bootstrap_opts[@]}" || die
-
-		eautoreconf
-	fi
-
-	hprefixify src/man_db.conf.in
-	if use prefix ; then
-		{
-			echo "#"
-			echo "# Added settings for Gentoo Prefix"
-			[[ ${CHOST} == *-darwin* ]] && \
-				echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man"
-			echo "MANDATORY_MANPATH /usr/share/man"
-		} >> src/man_db.conf.in
-	fi
-}
-
-src_configure() {
-	# set sections we want to search by default
-	local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
-	sections+=" 1x 2x 3x 4x 5x 6x 7x 8x"
-	case ${CHOST} in
-		*-solaris*)
-			# Solaris tends to use sections named after the pkgs that
-			# owns them, in particular for libc functions we want those
-			# sections
-			local s
-			for s in $(cd /usr/share/man/ && echo man*) ; do
-				s=${s#man}
-				[[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}"
-			done
-			;;
-	esac
-
-	export ac_cv_lib_z_gzopen=$(usex zlib)
-	local myeconfargs=(
-		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--disable-setuid #662438
-		--enable-cache-owner=man
-		--with-sections="${sections}"
-		$(use_enable nls)
-		$(use_enable static-libs static)
-		$(use_with seccomp libseccomp)
-		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
-	)
-	case ${CHOST} in
-		*-solaris*|*-darwin*)
-			myeconfargs+=(
-				$(use_with nls libiconv-prefix ${EPREFIX}/usr)
-				$(use_with nls libintl-prefix ${EPREFIX}/usr)
-			)
-			;;
-	esac
-	econf "${myeconfargs[@]}"
-
-	# Disable color output from groff so that the manpager can add it. #184604
-	sed -i \
-		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
-		src/man_db.conf || die
-
-	cat > 15man-db <<-EOF || die
-	SANDBOX_PREDICT="/var/cache/man"
-	EOF
-}
-
-src_install() {
-	default
-	dodoc docs/{HACKING,TODO}
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
-
-	insinto /etc/sandbox.d
-	doins 15man-db
-}
-
-pkg_preinst() {
-	local cachedir="${EROOT}/var/cache/man"
-	# If the system was already exploited, and the attacker is hiding in the
-	# cachedir of the old man-db, let's wipe them out.
-	# see bug  #602588 comment 18
-	local _replacing_version=
-	local _setgid_vuln=0
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
-			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
-		else
-			_setgid_vuln=1
-			debug-print "Applying cleanup for security bug #602588"
-		fi
-	done
-	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
-
-	# Fall back to recreating the cachedir
-	if [[ ! -d ${cachedir} ]] ; then
-		mkdir -p "${cachedir}" || die
-		chown man:man "${cachedir}" || die
-	fi
-
-	# Update the whatis cache
-	if [[ -f ${cachedir}/whatis ]] ; then
-		einfo "Cleaning ${cachedir} from sys-apps/man"
-		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
-	fi
-}
-
-pkg_postinst() {
-	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
-		einfo "Rebuilding man-db from scratch with new database format!"
-		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
-	fi
-}
diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild
index f5b961755735..e673f4391432 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-inherit systemd prefix
+inherit systemd prefix tmpfiles
 
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
+DESCRIPTION="A man replacement that utilizes berkdb instead of flat files"
 HOMEPAGE="http://www.nongnu.org/man-db/"
 if [[ "${PV}" = 9999* ]] ; then
 	inherit autotools git-r3
@@ -192,6 +192,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	tmpfiles_process man-db.conf
+
 	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
 		einfo "Rebuilding man-db from scratch with new database format!"
 		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 70a902cf0f59..09729edefcbb 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,3 +1,3 @@
 DIST mawk-1.3.4-20200120.tgz 468855 BLAKE2B dd8bb8f66cb8bd67d8415ee25ce928113cf3f33f8135bc432a16f30b83df861cd2e29da9e0fac1dfb1a6796239d0c838ed72cf51467f8ed79b96068e3e1f1e93 SHA512 14d9a6642ce931bf6457d248fc2d6da4f0ea7541976ca282ea708b26df048f86fdf92c27f72d497501ccd43a244d1d1a606f1a2f266a7558306fea35dcc3041b
-EBUILD mawk-1.3.4_p20200120.ebuild 862 BLAKE2B 4e7a4bbe1d17b457e494b2f58a72e38156a162508527b96d9474b0acef9b3cb7ada1f529b452dc1cd94cf762e1e4bebe514b06241e9d4ffe60da66ace5aca6fc SHA512 8ca56fa8d99b6b83854345dd7aa8b0de86903125ff43a99a81602bce707ef0968c2f450280834167f3ca4c572e5cce5e1cc514fdd0f83c1f250e005eefc3da71
+EBUILD mawk-1.3.4_p20200120.ebuild 861 BLAKE2B d95c29bc349b1c7465a5b00b1d4277c2a8babaf8ea35099d348121df01f2e35b76bb120b0ed42d66002fdc315dd1bdb5e206d127ecec5e2357f865c83325f829 SHA512 d15be66fd63771e6d1aecd5cfbb3ba05e3148f7c613a57971691383534eb0f482b5d57956ce5cdb322ee723634fa4fa98001da4a30aeaacf3d11402d54ead7ab
 MISC metadata.xml 354 BLAKE2B e8a003a587171e7313564e5b8f97a607fc26b434e5045426789dc5e8e1fd54fac9830fb7b262b5b116b9c46f2eaffb8d24cc84aa0efea8b2adba659629d55b19 SHA512 64ebb5869d73b897984a63747eacda76fd6ba1b374e4995df9b3ff4b4e4908570dd2e0e6028581983486b5eb4ce2f61743da737eb353b2822ab8d5e16fe49bed
diff --git a/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
index 7c38dd64e7e7..2df5944453c9 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index b2734f3d00ba..6f50e644014e 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -2,6 +2,6 @@ AUX mcstransd.init 656 BLAKE2B 782add77ee81b582151c35003c303b5e67b4ffc4e6f4af97e
 DIST mcstrans-3.1.tar.gz 44598 BLAKE2B 1755c2f56e3d40fa2ea95c349988fe5dd7b52a9f26bef0f42e42bda8f7b94993b9a47d2e333337f746cbabd9dd571118b0a8e1ffb7c22c604db58fc809bcc033 SHA512 21e9b7a8c9d98cbee61f2eb1c440a51d19ac111a5955c24d365a8784e1aa34fb47a22a108e550c8a4cde4f25ec5afc466126a68e9faedfc796bef83eada93b60
 DIST mcstrans-3.2.tar.gz 44596 BLAKE2B 6738acbcb7c25ec67b8d14cd166c601c7790d28332de8eb4caec32e43390b199aeea51750856aee7c4a2bcfc003af3ac01b00a4247578230d42de3956a88ebb2 SHA512 edc7d4c255056d823c67d69d0c0bb49e8da8cf1b69d94b65e1c2cb5f4944dcc0bd26ed795d76cbe310d9c98b98ca69a49eb7e39ed4cd7df3f6ed8bd1b68da6b1
 EBUILD mcstrans-3.1.ebuild 1076 BLAKE2B 95420d079ff83b4a3e4aa7655932d1ded963f53e01e4cefad6b49613f882458c3ac9ec4a9f0771f314e32d341cad58e5684aa56b669e191b0a353c217c2a3a2c SHA512 4c41ad6cb454f39743f3d822298743abb5cba0846a030e2666e7beae9fb245ec8acc60b32762c1ce66131f188cb0dfbe69f1fc933dabcc62d8ae9d2dc5884e78
-EBUILD mcstrans-3.2.ebuild 991 BLAKE2B 9999de79f25055c6cd4a58af353eeacc0a64fa83a53cda27c36060fb6b9d01a6a838fbb3e533ce5d252f280c36a6bf2937fcd562a86acc67b02cf1e53dcf5750 SHA512 7923ab16702bde568d9bdc0a58304cd561766c64ed0d03a284cee85e562dd45c0873a809f92b4f3b70019af79d88cbca61058038657144fcfb4b556951eb5455
+EBUILD mcstrans-3.2.ebuild 990 BLAKE2B 5727f7797e09a3d4fd2783fb0386389b9c5d4cb436f3d920ada8d94bc45a4f2645787d7564f95abe39128ddd31763fa67584b2d66156c8eb41525f78d082c8c0 SHA512 c4a5958839c8aab262a8424b2228fa7b503a6cd1d39986de47cad689b241a279f05c7db7551632e767090d8ab36fc065b8400d7ef6a22047d93039a59bc77abf
 EBUILD mcstrans-9999.ebuild 992 BLAKE2B e334940d81f7b75e79fc4556cc4e578dab2479bb54bb0b72452fde69808097df9e45106e864459363fef8db1d9e17f0539295d7c52c27758a199cf1bdec4224f SHA512 1ab31b01289d8b89fa6a7ab877c2f86971855b9edf26b623b3b213f1c501f1e070388bc2cc6f90308e7fdc146220e65b8fa4d525f8e7c69439d25f892dbb51ed
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-apps/mcstrans/mcstrans-3.2.ebuild b/sys-apps/mcstrans/mcstrans-3.2.ebuild
index 28ef70cad5bf..06962f8dcdb1 100644
--- a/sys-apps/mcstrans/mcstrans-3.2.ebuild
+++ b/sys-apps/mcstrans/mcstrans-3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DESCRIPTION="SELinux context translation to human readable names"
diff --git a/sys-apps/memtest86-bin/Manifest b/sys-apps/memtest86-bin/Manifest
index 816e22675c75..e6394773538c 100644
--- a/sys-apps/memtest86-bin/Manifest
+++ b/sys-apps/memtest86-bin/Manifest
@@ -1,4 +1,4 @@
 AUX memtest86-bin-grub.d 467 BLAKE2B cf36f784b4032f615e5e3cd07d67125ea54c2d4fd9c7ce2f05a6a87fb4a2636491edabc77a0833039c6a8667d0cefffb20c3d4a755bc9571a363b3c6193a1831 SHA512 0f8063689c2a1dcc5d5aee2b7a7e7db4c195012ab6c641bbd66c3c495bec5252a5733664e900483580e78ee47a29a6e8e078127ef1c723ee6419e9accb4a7bc0
-DIST memtest86-bin-9.1.zip 8561760 BLAKE2B 89d72804d8d38b103f64a576b66fbc654ea81acdd04001922d4f6487ba0b0cde50d18a4446cedfdc540cc7c2315e5a1bca97f6c2c2691aea6b5fdd22df3402a5 SHA512 06fc070fc50d115e57309407569274fa4785383f377cb4e4246195f4af30fce531fcf1b866f3ce0a0a7c174902150c327e6f5158a4c59d708ca0ceeae12179d3
-EBUILD memtest86-bin-9.1.ebuild 704 BLAKE2B 28f93fd07044d806183d01654af494bf8334525faacaa640f2986f0278c29d7da25852ffdbe25a944ce619d8e99a6dcb6d2e0d4028ef5fc40ff294adda674677 SHA512 4047b478351cc38843cfb111feebc182704cffdfd4823bfb01594ec184e6cb3ae1b1bdc6ca5f9f75ba1b1a381e3ecb82a443e74078b9a28ad5ac48e99247a3eb
+DIST memtest86-bin-9.2.zip 8640127 BLAKE2B 99a51857f3625705a257edd19722ad662e03599722b9441c101886a22fa185fb284ee23d55a7e261fd442780e966350e291c9b0b39a08115c0c15a45ac3b4c22 SHA512 46e900376e9074162c71259d88b560c2d4a32f900750af3e5b301bea0e15c612788297fbd068939760551173fb4cfb11edff25586dd9bd1f69a6140c1b93da7f
+EBUILD memtest86-bin-9.2.ebuild 704 BLAKE2B 28f93fd07044d806183d01654af494bf8334525faacaa640f2986f0278c29d7da25852ffdbe25a944ce619d8e99a6dcb6d2e0d4028ef5fc40ff294adda674677 SHA512 4047b478351cc38843cfb111feebc182704cffdfd4823bfb01594ec184e6cb3ae1b1bdc6ca5f9f75ba1b1a381e3ecb82a443e74078b9a28ad5ac48e99247a3eb
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/sys-apps/memtest86-bin/memtest86-bin-9.1.ebuild b/sys-apps/memtest86-bin/memtest86-bin-9.2.ebuild
index 97f87cab2411..97f87cab2411 100644
--- a/sys-apps/memtest86-bin/memtest86-bin-9.1.ebuild
+++ b/sys-apps/memtest86-bin/memtest86-bin-9.2.ebuild
diff --git a/sys-apps/pmount-gui/Manifest b/sys-apps/pmount-gui/Manifest
index 24eaa032f3a1..7fcc88a02521 100644
--- a/sys-apps/pmount-gui/Manifest
+++ b/sys-apps/pmount-gui/Manifest
@@ -1,3 +1,3 @@
 DIST pmount-gui-0_pre20130806.tar.xz 5132 BLAKE2B 7c575f4ab9ebe632eebed0a73ef2dfe3e7ffeb47cb28ab39a3c8928d2f0bb8f0b118e00d8d9a7d9663721016c93fda33c803bcd6c283ad7f4b5e7ea4df401c04 SHA512 97871dcfbd14a26f93186b8e08d5512c6b7d6fbf76c94a9e4f0f8e74404ce7a8e1139bb5d3fd432fb1b228ff48f9f56195124839431f6a5d3d82f43165a2b5ce
-EBUILD pmount-gui-0_pre20130806.ebuild 712 BLAKE2B 23eaa2b94beadc5a07d21940d36d39d520f4ff5fe9041a3251ebb35941c7cd0b7ea47793b47e7f719b3580be0c80a580534113b39328b622fed4329529898173 SHA512 fc69d3ae66631108c93754d4c96d31b441f19b30a743f2b87091b0a51957c0a8bc07ce5d8d040835f1e7eb8d0b8c463339059ea3a60d9bc395316a1e5b32021f
+EBUILD pmount-gui-0_pre20130806.ebuild 685 BLAKE2B 7ff56b654a859e9dd94c819cd6806d2fd7f6f9e11a4798c59857c26543495467d371f8729905e2472171ba42f537f4c262b438e17fbd54d67074d4407da50324 SHA512 1bb09be6111648618b3f235c8b35592c15ebd9f155a57449a1c9660d56a5f8d1209d370e20217a83fecb3398ecb0bec44a5687e6644a0840ab0b3634e7e312b6
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-apps/pmount-gui/pmount-gui-0_pre20130806.ebuild b/sys-apps/pmount-gui/pmount-gui-0_pre20130806.ebuild
index e43bb34fb1ae..2fa0665d5f77 100644
--- a/sys-apps/pmount-gui/pmount-gui-0_pre20130806.ebuild
+++ b/sys-apps/pmount-gui/pmount-gui-0_pre20130806.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-if [ ${PV} = 9999* ]; then
+if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://git.tdb.fi/pmount-gui"
 	inherit git-2
 else
@@ -18,17 +18,15 @@ HOMEPAGE="http://git.tdb.fi/?p=pmount-gui.git;a=summary"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE=""
 
-COMMON_DEPEND="x11-libs/gtk+:2"
-RDEPEND="${COMMON_DEPEND}
+DEPEND="x11-libs/gtk+:2"
+RDEPEND="${DEPEND}
 	sys-apps/pmount
 	virtual/udev"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 src_compile() {
-	emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
+	emake CC="$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
 }
 
 src_install() {
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 4880feede16e..a385e57782ef 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -3,6 +3,6 @@ DIST policycoreutils-3.1.tar.gz 2817914 BLAKE2B ef68bb5f9cf577164ead44803b6be2bd
 DIST policycoreutils-3.2.tar.gz 2817961 BLAKE2B 747cbd7b84ffa9153067340f8f1dc5a652eaf85b037a6e10e116d3d0b31c8e7c9794bc6a46ae212848bef4887478ac167e359a387bebac49e0acd08b727808ce SHA512 d16781d2d61b8b78d6fc242f2b5c3a03f47ea524fb61655823b6b0f0327ff376c65fe7bdf7a53f5863c01e599cf4a7050f21fda0fe6a8f2c2c16f89b156a4346
 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
 EBUILD policycoreutils-3.1-r2.ebuild 4624 BLAKE2B b467137228cf544f8467a109eb2a00fa80a8b1ddedeb13a60faf2dd0c9adf5c5b622ca045874c691cedc5429614c1d7c73dd385f8faad5ce1a95016c12790be6 SHA512 51e326cdb0f0103b40fee5826e8608e66d90b4ebf40b6313092f341f2438b49892813ef24d1bd60e00bd9102a31120db326ad47359c02fc7792d7fa9f755e32a
-EBUILD policycoreutils-3.2.ebuild 4480 BLAKE2B d4fa0161f0dd418acc6daab20613ba9f736bdfebe874860a1f0f45eff8837317310b9fe43a00d2f02c39f6bf89ae57a8c669f7408f51ac023ae1c0b77fefbcd5 SHA512 2ffd528e81b2e0e0144ad187531d22de978a3ca1dd4bad8d027caa4b15de1017f4a083c90573a12e0c54b2b7a6e616f703a123f2f65e4ee459c6d3798d252d18
+EBUILD policycoreutils-3.2.ebuild 4479 BLAKE2B b2c21302b74e1c13f6bd842b91a72b4ff0a212597c5ab84e56123185db33e04b9d60cb11bc952ffeb72df6f8e2d3eb8190b7896c45cc3364b274a1e8db06321a SHA512 93866105e6c6145648c6c72c20fbd4e246836887275f13e22b8794bda7fc3dbbf93edf493acec5cd157dfe6e9f9d3bafc40e97a03084e22ae01f75bb21151aba
 EBUILD policycoreutils-9999.ebuild 4481 BLAKE2B 58bb10ff43da7cfdf706cd201e19abe70992d1fb49172f20aba80f7cda1bce21de7b7bbbd342c3586b4f18cea6b0d1505d4def30477abba257f78fad6c54c9f0 SHA512 73808abce9ab0c4f9b4714945cd98ab70a1bb37b14fc4326fd8e0ba001db1152af45f0fa315bab57a357aaf80a111d8f517ae6bc87ab4a7de449fe25624f9e78
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/policycoreutils-3.2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.2.ebuild
index 317d7990d80b..60b377c9efda 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.2.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.2.ebuild
@@ -25,7 +25,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S1="${WORKDIR}/${P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/progress/Manifest b/sys-apps/progress/Manifest
index f15da3341099..4dc4dc6388ea 100644
--- a/sys-apps/progress/Manifest
+++ b/sys-apps/progress/Manifest
@@ -1,3 +1,3 @@
 DIST progress-0.15.tar.gz 58549 BLAKE2B a75d9b4cb965419cc1677ff80d1990c2b2069031e71e982ff6e83381cbac53aee37e9cc22984e132929c0502dc89f860022def62b886e7b6122f2111aa314fc6 SHA512 8b446d04e156b8d3d905caf9a8c9eac2ff2d24ca3b118ebdf6b2aa9f9f99d0d219c026020c33bc3f2fff936f4a29d95f89fe1cbc1ab66b7b33f5e32bf18710ca
-EBUILD progress-0.15.ebuild 582 BLAKE2B ce5fe5b82958b5cc897b704f809390d99e0b13d1841474ef901ab027457fdf28588584fa0d61dcce1f608ff1fc4e8a75ff20d5c592c4fcd2aea1e2b996f4c292 SHA512 45d3c87bfeca22883b5650d1d315d70a71a28021bc6924dac98a09837d04090f1a76031273c83038a70d7e5bffeed5ef0671d19d57c5daa0bf7650171bebf66a
+EBUILD progress-0.15-r1.ebuild 591 BLAKE2B ed72cfda89caacafd3670c75e5277ec6ebb044e3c7bfb4b8889bf7d99515cef15b0568cc41f00ce370a025f86dc94689d0ddcbb8ee9a11aa38f1d064de564bf1 SHA512 5019e992a0a5a5597e29d62f566540f25127a1d53172ec71ccc7e677b44a8f1fdd38c7def686fefc653e7e70eebceace83553c3b772b89e7172e2c3b947066de
 MISC metadata.xml 335 BLAKE2B 720a8160043a20aa7d50e4fab61b6b55044c6a62b5baa848edf83f5954b824a3a3a21908e9e0712fae3773b122858eaa7b53a2aaf4365ecc500bc6e818ae327d SHA512 903ec46393a006768a24ebf7be7fed66b5ce5eb1db5c68f29feda30e9d79812ff4ca9303b2ad00def4ffe4e4f1f31e1faa6ef4bf868059459beb026331a3232b
diff --git a/sys-apps/progress/progress-0.15-r1.ebuild b/sys-apps/progress/progress-0.15-r1.ebuild
new file mode 100644
index 000000000000..7b1766238200
--- /dev/null
+++ b/sys-apps/progress/progress-0.15-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Coreutils Viewer: show progress for cp, rm, dd, and so forth"
+HOMEPAGE="https://github.com/Xfennec/progress"
+SRC_URI="https://github.com/Xfennec/progress/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	tc-export CC
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install
+	dodoc README.md
+}
diff --git a/sys-apps/progress/progress-0.15.ebuild b/sys-apps/progress/progress-0.15.ebuild
deleted file mode 100644
index 2f46847710f1..000000000000
--- a/sys-apps/progress/progress-0.15.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Coreutils Viewer: show progress for cp, rm, dd, and so forth"
-HOMEPAGE="https://github.com/Xfennec/progress"
-SRC_URI="https://github.com/Xfennec/progress/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	tc-export CC
-}
-
-src_install() {
-	emake PREFIX="${D}/${EPREFIX}/usr" install
-	dodoc README.md
-}
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index 43f450688e3f..4c829f9bd472 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -2,6 +2,6 @@ AUX restorecond.init 647 BLAKE2B e716293dee6f66a43d95cf43b6e4a50392d66d3d1fb2f08
 DIST restorecond-3.1.tar.gz 18939 BLAKE2B 3a3fcde057dad3ed05692d679ba27e0b24f191d92ed5114fa38cb5f846c4cc00d85bb09b5d4e560ed2b914444e0c2d1c407f6c03900610624d5626d05f2991bc SHA512 cdcf299f48b89a7c641ded9507b9b966bf648497394f8e988a9cb1ceb3224c86369706027f3416a4f9750836f7a8f4580a4b3df76673e03f897b383d7ed0e2c8
 DIST restorecond-3.2.tar.gz 18965 BLAKE2B 6cbd32c7c33fcc9f3fff78cc1faaa354c7ee918bfde8e12dfa73ce99632a8bc1e00d2f3b7cdd9c72179dbb51af1847e8dadd41cdc3ca20e9fb45e61871325029 SHA512 b1437a5d4dffef3463a0f2994f07c98585e9cfbc354db2dc07483fd9b964b079090697a277d2f4fd6bcd8df62f7505962fdca22d700721f6ba71490ace0167a9
 EBUILD restorecond-3.1.ebuild 1170 BLAKE2B 98e3caa2596762f7a123252aebff2b9d2fd774e070fcbbd5bfcf13445b1ee1afe9e6850fcf37491cc6da6d382c0a6af360902180dc17905384eb78840dae1055 SHA512 68d65a4b44f6d1b5cd20226a25e8813af4cee19bb2d197ad188c79fa4cf3f152307c2cfd0ef4198f9684ada8efddcb243db97ec13b9dc5843d4fb4859938c91c
-EBUILD restorecond-3.2.ebuild 1085 BLAKE2B 15f16081601bd7ddfc087e1453fae50204c49d521663658f3890b75c713c658e583ad75e581d067920645d60ced2d448bf8b1adfc820fdd6e2ea7091c6c292f0 SHA512 9d804e90681f0af77a6dc2e21ebbd55cbce2be18a3fa9cb437445c71f0f00dc5a9c23a1d788579417f064542daeff195b9db96397791f32440f61a85058009a6
+EBUILD restorecond-3.2.ebuild 1084 BLAKE2B e60456cdcffb87d4cf6fa9f3595d906ffd1b9663c29b5228e779ae1506e4cd02875c57c6452a1a21227e13cc78dde855d35d18aa89b737268b7d8e73340093ac SHA512 4481e3167024db0ad648b815ad770f8a4e47183a33c9b5139cee967f640fc575cd0da0fc0ca485441de2be7f688ed6c034e152a6293606db13ac63b8223c261a
 EBUILD restorecond-9999.ebuild 1086 BLAKE2B 5e96801f2054d6b2a825f9ab4d63f39f91597488a31dc76ce1111de3b1e3e357897dda4b6ff9ad09fa82dd180bd64770397c06a938bd5999896b38266389fd3d SHA512 a0108d23bfb7dc4990eb4d25e7ab53136454d9250e4849814602d394e31329fe7f7c6c94e07af3793bc689a4655d2c0442f1f70295750643c6948eaa4a8c5118
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-apps/restorecond/restorecond-3.2.ebuild b/sys-apps/restorecond/restorecond-3.2.ebuild
index fe9b6bec869b..600b91f0ad82 100644
--- a/sys-apps/restorecond/restorecond-3.2.ebuild
+++ b/sys-apps/restorecond/restorecond-3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index 7fac235a2097..c7441805fbaf 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,6 +1,6 @@
 DIST secilc-3.1.tar.gz 176631 BLAKE2B e79818580d2a788d672574ebd77349f0c59b678d2be628479f517412ca876fa225ba0dd63ef3200ed15ff693cd5f4cb4ff537d81666fef3a008ba4b3a7577e0c SHA512 79e3e4910178af49ea164d620aa997adb21dd18581c054a4023dd9116ec9dd203bd12989ef308aa1d253b47fcd251ee2b99c26e143d1db3de22a7f374ff38e0b
 DIST secilc-3.2.tar.gz 179384 BLAKE2B 89a02ceeaeb221eb5e819f6c6f09cd7e4675971d1870850867f0e258e3cf089c048a2976016c8200cffcb7904aae01d7e9d6a0c086a2a33fb08020df10b92059 SHA512 ef60aaaba3a9b4d8da496ae80203a8c9595dc2f97f767432f6b3323395fda65293540ed9574e8d7d3f40854c3ad38a95a7b96939b6c689f02a3d04834b81ca45
 EBUILD secilc-3.1.ebuild 877 BLAKE2B ec8b1f7e9874e234d561ac9deb26b128ded5599616bd2e501b6fb591e77c45942466c227103c7f040dd10ba49445e283e9fb410d3f18635c8f4eb9d0f0571b8e SHA512 e3d0bd0d5bcb480d10f7a7e188a13b380f6452a5f153a0c5abe3b58bd475225d271e127cb1ec6c9ea98e3405095992aa88cfceceaae7278281cc8ce0bded1904
-EBUILD secilc-3.2.ebuild 773 BLAKE2B 2abdab69d2bb2347f80075463c5f755e26f2cfc7bb27893c1a85c09270e7e64d199c5c0d10bd749c7b497b0c774fecc43adae0c734d8dd2a596354ec7d08501e SHA512 fb15d7940c27423cf3145a4a26130579fd2ccdf54bcd71211407c0fc2c1d61bfd969ecc0bee9bbe9ed1ea9d084026f84375d29486ee13b3ada8687f944f81e53
+EBUILD secilc-3.2.ebuild 772 BLAKE2B 49c4cdaea7d58b8d3f7b5c3a392e12f3cb56534905cfb54a379f142667805d27ee7003c8a3cfc778a74887cd91d5ef4df5903b803be79389c559fe9f9371854d SHA512 1867606221210d55944a10ed38bf2a349ff0472e0e77c7091a823f2989ba811cd7df984c3457721f01dd63e66758789c73fb5b0fb4ba1aab300d881dd90eaaff
 EBUILD secilc-9999.ebuild 767 BLAKE2B a29b9d94a0b73c83f2d3b403e85a0a8d2b279e0cb6f82af8e7efec6e4293a33dc43622aa817180eb501c67d8c42854bcd08aeee80c8f99795679f964428cc2d1 SHA512 0a179e4c5deabd685f48103c0ecc6ed190aed00122d91731a040916cd55b2853987c44cfe6315ff872119a7b53f9a1b8eea88dd7b8c24b66ba62c6cdb8e2af19
 MISC metadata.xml 517 BLAKE2B 69224c0360ff5acd98dcd493463266090ad17693588e91a434e412460352594673563388b52eba5313c7a9aa3b745d916f089805fe88ba8270cef1528f1fe13c SHA512 457ff97de6f9c6992a025588a5af5692abfc38a7df8537de2006ac841989a9b7e566b796b16d304252ad03cf66f205dd3a4fb0218281fd551c430c58b9039310
diff --git a/sys-apps/secilc/secilc-3.2.ebuild b/sys-apps/secilc/secilc-3.2.ebuild
index f77d113c66ba..deb372f0b8f7 100644
--- a/sys-apps/secilc/secilc-3.2.ebuild
+++ b/sys-apps/secilc/secilc-3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index bc2a4576362e..e844eebba85f 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,6 +1,6 @@
 DIST selinux-python-3.1.tar.gz 2100549 BLAKE2B c5d207bad60c379259e3bfc8f029f76d4572818cdd41a263498ed4434a70eaf7ff51af7772cfb27de0e9e4af03bcf9906ab0f6a59e88de10e81cbe0e8c5928b8 SHA512 5dd98f77ae8ea8bac6a89ec7def76e12496b9a9f8c9612c4cc1dac7a8e8c60380a00c857426bfefbcb4273706addd2594e9b467f69408ef284f082a09d45bd49
 DIST selinux-python-3.2.tar.gz 2101106 BLAKE2B b4b185a7468de68eb2146011a9bc82ffb7db9878517833c1e8dfa23279aec3dfbf46a27b70b17c1e317a2c939bcf6d1748638fd4a078325b853de34ae3c51a6f SHA512 2c3483e27c4ad6942e23e39897e0eccf61b95d685ace62315678cb49739d300d4ca4a7a51fa7a9aacaa98737446a70923855d15827eb6275ffd6999be0b2a755
 EBUILD selinux-python-3.1-r2.ebuild 2548 BLAKE2B a449b67df1783f7a74859bb5fda7c6c17d4c71c21abb5e3f286872befd15c6f8b85b0a12b67232682bc4e5bcdb6701c0b926d78b4b428d56cec6f0f264072ca9 SHA512 a7ca65aab8c6c7fbcd16e1b26a0b21569f72ffc10e7784ca6cba5cbc1bf4cb57fc846095abd0056d0e4ddb4dc6065b464defef55053e4d554cf5baa086bd70f1
-EBUILD selinux-python-3.2.ebuild 3090 BLAKE2B 17200335ad8527c654fe58d7819537ee921e9f05e01cbe54c0e79443a46738642754bc6ff098506e2f8f4edc686b5ecfedb560dd0039b334fa07a7735bb8eda0 SHA512 7a9d8988aa4e6af503ab8205fff2a53c009c2a19fe874f6ce613ce7b34a74b0018f924d32fa63c79e636fa64c7d8887c7be6528ceec5d5949c2d7b2414ea8fd6
+EBUILD selinux-python-3.2.ebuild 3089 BLAKE2B 4e9c3574ac73dedebaabc0c4c1d70d88a5988a323f558c9f8666c2985bc1677f05c9fd03e6b0235bf92425c297755822aa3a178246c68979ea8fc17d0f5ada18 SHA512 c060076f20c54549833ab1cb3882e9b7180bfd73fb1e92ab95d51e004ad2085fd985fd06ded24b2115fc080a77e7fae8ec9a320af37fae308836483728115746
 EBUILD selinux-python-9999.ebuild 3091 BLAKE2B f808560e53edca86a9bf4048f90f271039c7904da00cc71628ed3e34abbb5c57607ce8dfb408cfcfb98218baab88ffe95d13f044451b9fcbd3023c669ad3d6ba SHA512 badf21087e5b5d43791c2351c25ba2c087e9db7b1ef1a4db3a9bdf9c4283a03399cb999acb5dfb88e9c13c21e1c82f5684f0c041f0f5b081b9861eb2974aac0d
 MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe
diff --git a/sys-apps/selinux-python/selinux-python-3.2.ebuild b/sys-apps/selinux-python/selinux-python-3.2.ebuild
index d0d1993c20a3..affdd90050d8 100644
--- a/sys-apps/selinux-python/selinux-python-3.2.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN#selinux-}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index fa0e6d96e244..e3306f492acd 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,6 +1,6 @@
 DIST semodule-utils-3.1.tar.gz 14257 BLAKE2B c8c9a1ce7c9c4f53b1f4c728d16b149fdc284f4cff8b4fce0cb59b77d37d6d7e9bf2102c7177c4eaf94677af6147e42d8d0bd55c0bf3a358968d0162d5a6c65a SHA512 b92794bbfbce5834ee7f62fddb40b5506e9291e8fa7c5d669b2e281089b8f8dc40c4522ea287ac5deffdaee751442ba8e691e2ac45fdd378b60d5d6b2527d157
 DIST semodule-utils-3.2.tar.gz 14260 BLAKE2B 35c071c96071028d4a912a89b88d02672f1fb8c2d8d23c3cb472b607dad55acdf351ef870b4d52bb2bed7b816a199c18947afcd16e77b66268822288feb4af2a SHA512 f937647cc22f7ed719908bad64415d706fd97cf1dce484dbca2484b05b3295de40e31bec643b6caaf4e8be742b1f911428d393c5e2d1d0ae39a2a37fd3be9bc1
 EBUILD semodule-utils-3.1.ebuild 937 BLAKE2B 2a17b566209258d0f47adf56d8c38f7c920f6ceb053e07bfaf7dd51139e39a42cc60a4e1986ccb19b50c4bc89b1c97b3a133c02a38431127dfd17200e361e535 SHA512 e36fad3f19c5f81791e57a02ff677a42d02e8037b4cad66d24d7bf37fa50863954c8fe58c18d1416212d24537febed8b91bdfa6fa3ce9c79efb5c80675b3d476
-EBUILD semodule-utils-3.2.ebuild 809 BLAKE2B 3467e06bcc61d36f1a18ff049167a209bf73e6df5626385e0b44fcaf0535145151f29513fe58ce5b527ffd88256b946caf5b8537e89958bb8298d8af4dbe6dfd SHA512 fd8f5b14d0604fbd095e599dcc4685301bc3085758319463419b08efcb034c331e7a94302ff76eb8295d2696dc6a47adc6ec9f3bd8a4224ed87ab60993e8c35a
+EBUILD semodule-utils-3.2.ebuild 808 BLAKE2B 0b1a8904210665e80b85aeb592cb9bc0e0eb574ab6dc8583f58ab22c00eca0c38cbcae0a6e8ad3f46cb0a7dab43bc8e74c1b26aa681fda8b04a8773926becd25 SHA512 95cb923afba92ed58410961e31b72c99e2df03dd62659a51497de35c6c8d0cb985e1b56582abee87c9f4d47f483343a9a0791429785d59a1c5dc11a92b4f6e1e
 EBUILD semodule-utils-9999.ebuild 810 BLAKE2B ec38af054d489b5782728e6c61f75e9b537c22fedc0babfcc9c9760cfd1af93d9ade3aab08a53374586497724fa3812d9c6c2817ce061bf00aa1a0e81cd2d433 SHA512 e524646d89401e49b007ff969ddce63e06efc42bc16960bda20b84c03c1cb6b98e89ad0608eb24208cf9f0afc0ef8d786bc58430f28935ae524f6b3a70fad069
 MISC metadata.xml 400 BLAKE2B 688a9292eb5fc938ae1aef1e62cb46f7cfb119f8d8e784e03c7d3f0d13d48b5120037195d1aac27080b6768a28fa51c209a6928ad0b84aa3802bda55d66f94be SHA512 737d2e097f9b98132e1a75d42c95aaf8ec51be2c4da9898f33b7b07ef519bb846bfc36836c33fc3ddfc716fac06c610475149b5923a684a249f4edf6cc13a147
diff --git a/sys-apps/semodule-utils/semodule-utils-3.2.ebuild b/sys-apps/semodule-utils/semodule-utils-3.2.ebuild
index 68b824025192..14d5e5bc116f 100644
--- a/sys-apps/semodule-utils/semodule-utils-3.2.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 fi
 
 DESCRIPTION="SELinux policy module utilities"
diff --git a/sys-apps/unscd/Manifest b/sys-apps/unscd/Manifest
index 595b63e2a9dc..3dd34d02b73d 100644
--- a/sys-apps/unscd/Manifest
+++ b/sys-apps/unscd/Manifest
@@ -2,5 +2,5 @@ AUX unscd-tmpfiles.conf 29 BLAKE2B e899d228b801b5c86b9bca3eb500acf9f07bf2f46d54e
 AUX unscd.initd-r1 321 BLAKE2B dd36cd5c9e5d677655204048b3d43d8e5fe8b2f5d9c69c862a230257ab73350a5d27c3c6b8a107f2541d617e4e6cbbb421d1e06c83270de3100ed3101715137f SHA512 41def8b588f818b7e6e42809b37ab9d794d7d30c4be7dca047f64cdded55a401fa00cee962066125efe69a8efb9080fa2588c0941f4fc915243f1e111ac169c7
 AUX unscd.service 513 BLAKE2B 443b97c41978967d2ce0d9ef021dd271e1fc292cec082f060109f28e96f83bc8c53937f63a4c38bc1e04cb5b72af9f80ddcf55b8537938e10fc8f8eca040ca38 SHA512 3a03be4807c06506caea41aa163bb036c2600566e7a73267e08ef0aebb3a288d37eb12e448740942277baee365654c6118102915479be882cb65dfefaf53917b
 DIST nscd-0.54-r1.c 73304 BLAKE2B 5c35fec2f4f3447c5d6500a7fc50c97347923d62d084134ced5c412307e8db6079e01302b16ac3e1940ee9194a31ebec464e3bd838fd8b6a650b8c0bdc66349d SHA512 88f40a10ff9ba0f46ef6f266a8ab610bf54c1d322d11df47e616e3cc007edaebdf673ec71a314b7c672d2aa7a2eac799abb0bdf87aaebd71fb8d2f7ef4e33ab6
-EBUILD unscd-0.54-r1.ebuild 740 BLAKE2B 860627c3aabf2c4128ead156b12df65361aaa9e5a78fc3b96f9ab7306deb427cd9466507e3abf477adc11a3be6a3a9e2b28ff8fa3ce666a3735e03b75df02db5 SHA512 661acacd38fbd0d5bcf3229b729f017b7d13803a95c566c986f0b0fc985a0801bacc9904682bc0c32f1fdb867f38f1d53bb39f19959a1f20db920fb685e865fb
+EBUILD unscd-0.54-r1.ebuild 789 BLAKE2B 6d33a7388be57334fd26b26413b0821b7f4ec20c7cecec0cd36ff3e102085b2908d244f4a7dffd4ce3d4e3bc5bce5c4e8544c43b746ed53d920859606552518a SHA512 85f3ee289a56096dd2e824a7e5dfd68f82de1f625a451770991714bd9ef99e4fcbd482d814441f7977f8d9db1f662776a8561bfd59c7c4cce9b420eb00cf51a8
 MISC metadata.xml 464 BLAKE2B a35add2ef5141e6d23e0410b727bde1a1a09817d1498b0f962b6c315a204ccd17bd962826c9c0b0bb1a765d07cd105c77641a6504073369ac53c6e41ce8bac63 SHA512 d5869f42886829dee06a1eed99b398182e252d3935d84cd3e88432edfa8a56ad4b9aa461efa60dc70c4217a993f37a193a76c05be472fb19587fe2f0efe38b8c
diff --git a/sys-apps/unscd/unscd-0.54-r1.ebuild b/sys-apps/unscd/unscd-0.54-r1.ebuild
index f8010311180b..0e9ee2aa391d 100644
--- a/sys-apps/unscd/unscd-0.54-r1.ebuild
+++ b/sys-apps/unscd/unscd-0.54-r1.ebuild
@@ -34,3 +34,7 @@ src_install() {
 	systemd_dounit "${FILESDIR}"/unscd.service
 	dosbin unscd
 }
+
+pkg_postinst() {
+	tmpfiles_process unscd.conf
+}
diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
index 1893d8047fa1..ce568d973739 100644
--- a/sys-apps/usbguard/Manifest
+++ b/sys-apps/usbguard/Manifest
@@ -1,11 +1,7 @@
 AUX usbguard-0.7.6-usbguard-dbus.openrc 278 BLAKE2B 58f11c693e25436605af6ad41a1f618e30b20f336cda6a11db480fdda65022c28ce84d6aa9e804c1344221f3aa4ab8a262094106bb677414c2b24e7971f9acad SHA512 f66bee161324610755371fa04199fcd81887c1a55ab73cc1922be719d61e8315b7a869e1d8af6c3df2d6922b07027dced3605e63b130e8f094fcb606aea20b9e
 AUX usbguard-0.7.6-usbguard.openrc 309 BLAKE2B d5297058d0ee8ce0f9fc91f2158f4aef5f077e1087800449a0319038d677a2a70274305058cd104ba30529b3c9daf82ffbe16ca5cdf20a3b4817e66d499d08c5 SHA512 512a08f59caf9de22b0776473a1ea9a4322b05c6286c99dac3055e0c6d52c78542448c33e19708338080cfdcdfcfb0f9868e8c523155e978c0161c262081da09
+AUX usbguard-1.0.0-bash-completion-configure.patch 3598 BLAKE2B 7b8ed24d698c37a68adec76607b3eaf8f7315f2f151f1a9be814faa66572962e00802ee6a38b6f047e4feca86689e52959619086d3c7a2a37ef5a8dcb7ea5545 SHA512 cf523f671b1266cce94a951e06fdeb2d520b8fbcf67769dd597b34c74fa702af7ffc2774ae0088d512f8f43fb7b9c17b49d1b100f6e7175a6e717a243efb1e50
 AUX usbguard-1.0.0-pthreads-link.patch 1013 BLAKE2B 78daa200908b47e3db9b779383958711add034c521a5cf95718b62ef89259007dafc7318df0a9722228ba36419593636383a7dea069947c99baeddc3449f046b SHA512 a5634f6ca80d46d37af803106d3c44313408f7fdaaa160ce713562210cbb28cb4d3f9180cda0855c73bf85410b0d77b0c1758803adc757888c7876db9fb761e7
-DIST usbguard-0.7.6.tar.gz 1189194 BLAKE2B 4fefd9ccf13b094f64942559f481144f08986dc71154b87c1623459d2429c07e2738a17877d3f6c275e83ce904067b1284c588c9a95023c7205cc5e21ca118f0 SHA512 0b0d42276e48baac2dc1f9031eec25e3f622a8d6178cb0400b97c7d32005bfa158b60fd286fdc66206a8684658fefaf6389ef93511e942f025e75671d7455628
-DIST usbguard-0.7.8.tar.gz 1220764 BLAKE2B 8127acc0ef5dd89cc540097a71f10d56f3cb0a166453e27161e444d37dbf51cc4861bc9c71dcca16e9fec7187b3dcabb2bf08af522b2aaa4693fa4f4913a9ae0 SHA512 315c25ed7eb61cc0920047836dcca035cb07aecb6dfece9e4f6dc2ad61aaf6fdbf86898e43493958f3d12a146eb4c8f88b90bb246da0df83bb2097ce5b853e88
 DIST usbguard-1.0.0.tar.gz 1260374 BLAKE2B ea9b48f14a4091f4ce61b6c171947cf2412c47e9aa3edb816e933f7aad6247b32e89bee90675ca5a0136b460fef8f2d423c0c81ad49d52453d0d3803b881503a SHA512 068a9be8bd5ea05efcdad79e2c4beb5e8b646b4703fbe1f8bb262e37ae9a6284a6eeb811a6bd441250a38bce1e45b7f44ad15726aa5963da2e1b56e85f5e16fd
-EBUILD usbguard-0.7.6-r1.ebuild 1910 BLAKE2B d708d26de6da007518ea857a9d8852d3444cb76ce688eebfeeb9f27a7bb182a2ab847db3259d1cc2593f8b5a87e1169c69ae33fb5114e18b117e357228d5d925 SHA512 8d47d66b6d022382610354e744d3ab18fb595391a4a9a7285809816763988e126cc9a50d3f1c6bb8293942de00fd52be3c453c8247a53749ec0fff3b1c3cffb0
-EBUILD usbguard-0.7.8.ebuild 2062 BLAKE2B cf1d12238d7b2b846119fc11454347cc92cb550aa404fbe8afb3364c29b49abb444f4cbf559eb3aeda68fe0f73ba59f134a7d4b8a947f81687e14a148c8bcd06 SHA512 e8efc8156d5b5d565843baff754b70a12dabe43aa65f2090249901fc088587821fa6b5fed7668933105319cf58a22576764b4cb43e688ce142ee9e34a604e916
-EBUILD usbguard-1.0.0-r1.ebuild 2320 BLAKE2B e96e88d83a14f93283f708e9b81f1ee221c97400189434093f77de6b3d99f498d29a343c5b825640e5f573daedb8d9a8f44447b3a819e671dfb65ff137a5bb22 SHA512 bf4ef727a7c5545262385d4e11a85074026d18f38f5cfe941da2999e104e20d936ee822992c5b38e5a752ced29d0c6adff43ae5b82055df8a6af363b7cd4344a
-EBUILD usbguard-1.0.0.ebuild 2253 BLAKE2B 036fed4776dfc7d13e05f006be5a15e31522cd8eb22cc3e80d1f3fcba48aa3941d82a97354582b297b37d8b17b777952eb762ec7606201235517b5435cff5a2e SHA512 b88fe2ec0a531fb533bd85e85fb8a9e89be89e1ce2eb52c10e1f7ea284c5be0edf1520ab34f54cf8b37311ed68c4e2f0564e0b20d6703b1a0226876a877b1d6c
+EBUILD usbguard-1.0.0-r2.ebuild 2375 BLAKE2B ae31b853b32157a6b5e654f2e3fc792f228fd190e96c3f67261751e6748b6908902ac1d22c315f17892082d164ff1e8c168bd167e7284361b33be7d367b63b15 SHA512 08fd0ac7e120c6cbc10decabdc42957a44fd3c00a0dac307dfa4d1e8d9e4da2950de1c6a47c793fcfa037894f00670baa8e084a3812ca1a4dec8e215e989899e
 MISC metadata.xml 344 BLAKE2B ccb8c1c611694dea10c4d0809ab46ccdc30efeadcd60904ffe6aa98420d489ea64bf8b1f0f46caea3d77ef448bd2b8d510f355aeee6ce98e5f3a3f76c6fbe141 SHA512 a661530757754d0640302d966aaa1156dfdda95430a3c0d80cf178ec4ffcfdcc13e9c19de7a22fd5269bc877d177d7a80fd15e9875247ea1f829601c2be19777
diff --git a/sys-apps/usbguard/files/usbguard-1.0.0-bash-completion-configure.patch b/sys-apps/usbguard/files/usbguard-1.0.0-bash-completion-configure.patch
new file mode 100644
index 000000000000..c63a85f23a50
--- /dev/null
+++ b/sys-apps/usbguard/files/usbguard-1.0.0-bash-completion-configure.patch
@@ -0,0 +1,105 @@
+https://github.com/USBGuard/usbguard/pull/483
+
+From b3bb39e0e5de61e1c713cb98ebca5e4c6529e2b9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 18 Jul 2021 03:42:21 +0100
+Subject: [PATCH] configure.ac: Use standard --with-bash-completion-dir option
+
+Rationale:
+This makes it a lot easier to enable/disable installation
+of bash completion files rather than it being based on
+a certain package being installed (or not). It's useful
+in Gentoo Linux for example where we may want to always
+install Bash completion files to the right location, even
+if the user isn't using it yet, to save rebuilds.
+
+This makes a few changes to the current Bash completion logic, mainly:
+* Falls back gracefully to a standard directory if bash-completion
+  itself is not installed (in that case, we can't ask it via pkgconfig
+  where to place files).
+
+* So the behaviour is now:
+  * no argument / --with-bash-completion-dir=yes:
+
+    Asks pkgconfig, but falls back to standard directory.
+
+  * --with-bash-completion-dir=dir:
+
+    Use the given directory with no detection.
+
+  * --without-bash-completion-dir:
+
+    No installation of Bash completion files.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ Makefile.am  |  2 +-
+ configure.ac | 32 ++++++++++++++------------------
+ 2 files changed, 15 insertions(+), 19 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 34a2e96..910c3c5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -438,7 +438,7 @@ usbguard_LDADD=\
+ 	$(top_builddir)/libusbguard.la \
+ 	${PTHREAD_LIBS}
+ 
+-if BASH_COMPLETION_ENABLED
++if ENABLE_BASH_COMPLETION
+ bashcompletiondir = $(BASH_COMPLETION_DIR)
+ dist_bashcompletion_DATA = $(top_srcdir)/scripts/bash_completion/usbguard
+ endif
+diff --git a/configure.ac b/configure.ac
+index 73021b6..4207ae2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -663,11 +663,18 @@ AC_ARG_ENABLE([systemd],
+        *) AC_MSG_ERROR([bad value ${enableval} for --enable-systemd]) ;;
+      esac], [systemd=no])
+ 
+-
+-PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
+-  [bash_completion_dir="`$PKG_CONFIG --variable=completionsdir bash-completion`"
+-   bash_completion=yes],
+-  [bash_completion=no])
++AC_ARG_WITH([bash-completion-dir],
++	AS_HELP_STRING([--with-bash-completion-dir[=PATH]],
++		[Enable bash auto-completion. Uses pkgconfig if no path given. @<:@default=yes@:>@]),
++	[], [with_bash_completion_dir=yes])
++
++if test "x$with_bash_completion_dir" = "xyes"; then
++	PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
++		[BASH_COMPLETION_DIR=$($PKG_CONFIG --variable=completionsdir bash-completion)],
++		[BASH_COMPLETION_DIR="$datadir/bash-completion/completions"])
++else
++	BASH_COMPLETION_DIR="$with_bash_completion_dir"
++fi
+ 
+ if test "x$debug" = xyes; then
+    CXXFLAGS="$CXXFLAGS $CXXFLAGS_DEBUG_ENABLED"
+@@ -706,19 +713,8 @@ fi
+ 
+ AC_SUBST([ANALYZE_CONFIGURE_ARGS], $ac_configure_args)
+ 
+-case "$bash_completion_dir" in
+-  /usr/share/*|/usr/local/share/*)
+-    bash_completion_dir=$(echo "$bash_completion_dir" | sed -r 's,^(/usr/share|/usr/local/share),${datadir},')
+-    ;;
+-  /usr/*|/usr/local/*)
+-    bash_completion_dir=$(echo "$bash_completion_dir" | sed -r 's,^(/usr|/usr/local),${prefix},')
+-    ;;
+-  /*)
+-    bash_completion_dir='${prefix}'"$bash_completion_dir"
+-    ;;
+-esac
+-
+-AC_SUBST([BASH_COMPLETION_DIR], $bash_completion_dir)
++AC_SUBST([BASH_COMPLETION_DIR])
++AM_CONDITIONAL([ENABLE_BASH_COMPLETION], [test "x$with_bash_completion_dir" != "xno"])
+ 
+ AM_CONDITIONAL([SYSTEMD_SUPPORT_ENABLED], [test "x$systemd" = xyes ])
+ AM_CONDITIONAL([DBUS_ENABLED], [test "x$with_dbus" = xyes ])
+-- 
+2.32.0
+
diff --git a/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild b/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
deleted file mode 100644
index 3f76442a7df2..000000000000
--- a/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Daemon protecting your computer against BadUSB"
-HOMEPAGE="https://github.com/USBGuard/usbguard"
-SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion dbus ldap policykit systemd"
-
-REQUIRED_USE="policykit? ( dbus )"
-
-CDEPEND="
-	<dev-libs/pegtl-3
-	>=dev-libs/libsodium-0.4.5:=
-	>=dev-libs/protobuf-2.5.0:=
-	>=sys-cluster/libqb-0.16.0:=
-	sys-devel/gcc:*[cxx]
-	>=sys-libs/libcap-ng-0.7.0
-	>=sys-libs/libseccomp-2.0.0
-	>=sys-process/audit-2.7.7
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	dbus? (
-		>=dev-libs/dbus-glib-0.100
-		dev-libs/glib:2
-		sys-apps/dbus
-		policykit? ( sys-auth/polkit[introspection] )
-	)
-	ldap? ( net-nds/openldap )
-	systemd? ( sys-apps/systemd )
-	"
-RDEPEND="${CDEPEND}
-	virtual/udev
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	dev-cpp/catch:1
-	dbus? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		dev-util/gdbus-codegen
-	)
-	"
-
-src_configure() {
-	local myargs=(
-		$(use_with dbus)
-		$(use_with ldap)
-		$(use_with policykit polkit)
-		$(use_enable systemd)
-	)
-
-	econf "${myargs[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/log/usbguard
-
-	newinitd "${FILESDIR}"/${P}-usbguard.openrc usbguard
-	use dbus && newinitd "${FILESDIR}"/${P}-usbguard-dbus.openrc usbguard-dbus
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn 'BEFORE STARTING USBGUARD please be sure to create/generate'
-	ewarn '                         a rules file at /etc/usbguard/rules.conf'
-	ewarn '                         so that you do not'
-	ewarn '                                            GET LOCKED OUT'
-	ewarn "                         of this system (\"$(hostname)\")."
-	ewarn
-	ewarn 'This command may be of help:'
-	ewarn '  sudo sh -c "usbguard generate-policy > /etc/usbguard/rules.conf"'
-	ewarn
-}
diff --git a/sys-apps/usbguard/usbguard-0.7.8.ebuild b/sys-apps/usbguard/usbguard-0.7.8.ebuild
deleted file mode 100644
index cc4ab8ff6f37..000000000000
--- a/sys-apps/usbguard/usbguard-0.7.8.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Daemon protecting your computer against BadUSB"
-HOMEPAGE="https://github.com/USBGuard/usbguard"
-SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion dbus ldap policykit static-libs systemd"
-
-REQUIRED_USE="policykit? ( dbus )"
-
-CDEPEND="
-	<dev-libs/pegtl-3
-	>=dev-libs/libsodium-0.4.5:=
-	>=dev-libs/protobuf-2.5.0:=
-	>=sys-cluster/libqb-0.16.0:=
-	sys-devel/gcc:*[cxx]
-	>=sys-libs/libcap-ng-0.7.0
-	>=sys-libs/libseccomp-2.0.0
-	>=sys-process/audit-2.7.7
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	dbus? (
-		dev-libs/glib:2
-		sys-apps/dbus
-		policykit? ( sys-auth/polkit[introspection] )
-	)
-	ldap? ( net-nds/openldap )
-	systemd? ( sys-apps/systemd )
-	"
-RDEPEND="${CDEPEND}
-	virtual/udev
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	dev-cpp/catch:1
-	dbus? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		dev-util/gdbus-codegen
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myargs=(
-		$(use_with dbus)
-		$(use_with ldap)
-		$(use_with policykit polkit)
-		$(use_enable static-libs static)
-		$(use_enable systemd)
-	)
-
-	econf "${myargs[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/log/usbguard
-
-	newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard.openrc usbguard
-	use dbus && newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard-dbus.openrc usbguard-dbus
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn 'BEFORE STARTING USBGUARD please be sure to create/generate'
-	ewarn '                         a rules file at /etc/usbguard/rules.conf'
-	ewarn '                         so that you do not'
-	ewarn '                                            GET LOCKED OUT'
-	ewarn "                         of this system (\"$(hostname)\")."
-	ewarn
-	ewarn 'This command may be of help:'
-	ewarn '  sudo sh -c "usbguard generate-policy > /etc/usbguard/rules.conf"'
-	ewarn
-}
diff --git a/sys-apps/usbguard/usbguard-1.0.0-r1.ebuild b/sys-apps/usbguard/usbguard-1.0.0-r1.ebuild
deleted file mode 100644
index 45cb81c1a51a..000000000000
--- a/sys-apps/usbguard/usbguard-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Daemon protecting your computer against BadUSB"
-HOMEPAGE="https://github.com/USBGuard/usbguard"
-SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/1"  # due to libusbguard.so.<1>.0.0
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion dbus ldap policykit static-libs systemd test umockdev"
-
-REQUIRED_USE="policykit? ( dbus )"
-
-# https://github.com/USBGuard/usbguard/issues/449
-# https://bugs.gentoo.org/769692
-REQUIRED_USE+=" test? ( static-libs )"
-
-CDEPEND="
-	<dev-libs/pegtl-3
-	>=dev-libs/libsodium-0.4.5:=
-	>=dev-libs/protobuf-2.5.0:=
-	>=sys-cluster/libqb-0.16.0:=
-	sys-devel/gcc:*[cxx]
-	>=sys-libs/libcap-ng-0.7.0
-	>=sys-libs/libseccomp-2.0.0
-	>=sys-process/audit-2.7.7
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	dbus? (
-		dev-libs/glib:2
-		sys-apps/dbus
-		policykit? ( sys-auth/polkit[introspection] )
-	)
-	ldap? ( net-nds/openldap )
-	systemd? ( sys-apps/systemd )
-	umockdev? ( dev-util/umockdev )
-	"
-RDEPEND="${CDEPEND}
-	virtual/udev
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	dev-cpp/catch:1
-	dbus? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		dev-util/gdbus-codegen
-	)
-	"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myargs=(
-		$(use_with dbus)
-		$(use_with ldap)
-		$(use_with policykit polkit)
-		$(use_enable static-libs static)
-		$(use_enable systemd)
-		$(use_enable umockdev)
-	)
-
-	econf "${myargs[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/log/usbguard
-
-	newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard.openrc usbguard
-	use dbus && newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard-dbus.openrc usbguard-dbus
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn 'BEFORE STARTING USBGUARD please be sure to create/generate'
-	ewarn '                         a rules file at /etc/usbguard/rules.conf'
-	ewarn '                         so that you do not'
-	ewarn '                                            GET LOCKED OUT'
-	ewarn "                         of this system (\"$(hostname)\")."
-	ewarn
-	ewarn 'This command may be of help:'
-	ewarn '  sudo sh -c "usbguard generate-policy > /etc/usbguard/rules.conf"'
-	ewarn
-}
diff --git a/sys-apps/usbguard/usbguard-1.0.0-r2.ebuild b/sys-apps/usbguard/usbguard-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..cf0a6c5a14dd
--- /dev/null
+++ b/sys-apps/usbguard/usbguard-1.0.0-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="Daemon protecting your computer against BadUSB"
+HOMEPAGE="https://github.com/USBGuard/usbguard"
+SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/1"  # due to libusbguard.so.<1>.0.0
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus ldap policykit static-libs systemd test umockdev"
+
+REQUIRED_USE="policykit? ( dbus )"
+
+# https://github.com/USBGuard/usbguard/issues/449
+# https://bugs.gentoo.org/769692
+REQUIRED_USE+=" test? ( static-libs )"
+
+CDEPEND="
+	<dev-libs/pegtl-3
+	>=dev-libs/libsodium-0.4.5:=
+	>=dev-libs/protobuf-2.5.0:=
+	>=sys-cluster/libqb-0.16.0:=
+	sys-devel/gcc:*[cxx]
+	>=sys-libs/libcap-ng-0.7.0
+	>=sys-libs/libseccomp-2.0.0
+	>=sys-process/audit-2.7.7
+	dbus? (
+		dev-libs/glib:2
+		sys-apps/dbus
+		policykit? ( sys-auth/polkit[introspection] )
+	)
+	ldap? ( net-nds/openldap )
+	systemd? ( sys-apps/systemd )
+	umockdev? ( dev-util/umockdev )
+	"
+RDEPEND="${CDEPEND}
+	virtual/udev
+	"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	dev-cpp/catch:1
+	dbus? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		dev-util/gdbus-codegen
+	)
+	"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch
+	"${FILESDIR}"/${PN}-1.0.0-bash-completion-configure.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myargs=(
+		--with-bash-completion-dir=$(get_bashcompdir)
+		$(use_with dbus)
+		$(use_with ldap)
+		$(use_with policykit polkit)
+		$(use_enable static-libs static)
+		$(use_enable systemd)
+		$(use_enable umockdev)
+	)
+
+	econf "${myargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/log/usbguard
+
+	newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard.openrc usbguard
+	use dbus && newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard-dbus.openrc usbguard-dbus
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn 'BEFORE STARTING USBGUARD please be sure to create/generate'
+	ewarn '                         a rules file at /etc/usbguard/rules.conf'
+	ewarn '                         so that you do not'
+	ewarn '                                            GET LOCKED OUT'
+	ewarn "                         of this system (\"$(hostname)\")."
+	ewarn
+	ewarn 'This command may be of help:'
+	ewarn '  sudo sh -c "usbguard generate-policy > /etc/usbguard/rules.conf"'
+	ewarn
+}
diff --git a/sys-apps/usbguard/usbguard-1.0.0.ebuild b/sys-apps/usbguard/usbguard-1.0.0.ebuild
deleted file mode 100644
index f93887630a22..000000000000
--- a/sys-apps/usbguard/usbguard-1.0.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Daemon protecting your computer against BadUSB"
-HOMEPAGE="https://github.com/USBGuard/usbguard"
-SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/1"  # due to libusbguard.so.<1>.0.0
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion dbus ldap policykit static-libs systemd test"
-
-REQUIRED_USE="policykit? ( dbus )"
-
-# https://github.com/USBGuard/usbguard/issues/449
-# https://bugs.gentoo.org/769692
-REQUIRED_USE+=" test? ( static-libs )"
-
-CDEPEND="
-	<dev-libs/pegtl-3
-	>=dev-libs/libsodium-0.4.5:=
-	>=dev-libs/protobuf-2.5.0:=
-	>=sys-cluster/libqb-0.16.0:=
-	sys-devel/gcc:*[cxx]
-	>=sys-libs/libcap-ng-0.7.0
-	>=sys-libs/libseccomp-2.0.0
-	>=sys-process/audit-2.7.7
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	dbus? (
-		dev-libs/glib:2
-		sys-apps/dbus
-		policykit? ( sys-auth/polkit[introspection] )
-	)
-	ldap? ( net-nds/openldap )
-	systemd? ( sys-apps/systemd )
-	"
-RDEPEND="${CDEPEND}
-	virtual/udev
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	dev-cpp/catch:1
-	dbus? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		dev-util/gdbus-codegen
-	)
-	"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myargs=(
-		$(use_with dbus)
-		$(use_with ldap)
-		$(use_with policykit polkit)
-		$(use_enable static-libs static)
-		$(use_enable systemd)
-	)
-
-	econf "${myargs[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/log/usbguard
-
-	newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard.openrc usbguard
-	use dbus && newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard-dbus.openrc usbguard-dbus
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn 'BEFORE STARTING USBGUARD please be sure to create/generate'
-	ewarn '                         a rules file at /etc/usbguard/rules.conf'
-	ewarn '                         so that you do not'
-	ewarn '                                            GET LOCKED OUT'
-	ewarn "                         of this system (\"$(hostname)\")."
-	ewarn
-	ewarn 'This command may be of help:'
-	ewarn '  sudo sh -c "usbguard generate-policy > /etc/usbguard/rules.conf"'
-	ewarn
-}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 891553cd0c2e..248d6a13a7c8 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -4,12 +4,13 @@ AUX util-linux-2.37-avoid_autoreconf.patch 3661 BLAKE2B 5098c11338238c944b69a4f4
 AUX util-linux-2.37-lcrypt_link_fix.patch 1545 BLAKE2B 85b9259ae3f8f4d39b94387212cd3db743194c7f8e645deb9b626792e78084f0d786f37d7c6fca0051ea161f020d72a89b3359d9dd9f624e0e009285d9cc937d SHA512 8f0f6ecbbab84b7f0f64111d9fd27852f6a8d9bac69598ae292b2978c0d7a9bc6beaad509ebe7d3bbaf239c9c04a592db13da6642b0029a485c2ad354b0a13ce
 AUX util-linux-2.37-lcrypt_use_LIBS.patch 2486 BLAKE2B bc1e73604932f6dc65c3ed262af37a6a180dd89d9196c531678f713ec3c3d979cef3f0f0627652a891079b71952463250e4edf29e9aaa898eefb9f25b99a0adc SHA512 cb2c37c8f5d668430eef15d87af0dcf237102d5b196ee674e2a4d5fe14482b323f2e915a1cb4f538f07330869dcf04af93281a955ddaa796db283971b1921723
 AUX util-linux-2.37-ppc-nortas.patch 1038 BLAKE2B 0e1ea63056a78476a86cb1fadc5a46e39d2d91af5a4de703857cd3720bc328c931f0ca10383930c414ab98aa7d85c16388da6d91c1192d68cca91365619423c1 SHA512 d8253a3c81cf703533a577e0efed7f1508ee5e979a3ec319e42eedd1e9b8883e0defcdca37852088557d2a027eac6e9008ad95355b7f925b98b165327a017da4
+AUX util-linux-2.37.1-lscpu_nullptr.patch 828 BLAKE2B 1847450e9b3580964d54184718f3e8971d42c00a4ba51f320a969058ace35a00bac9eae4e188dd6be6ce4c120aca53429011f4e3a2d9affea03000bdcfa6362c SHA512 29228cd5024eb94394f665656cd033ac52560e023a4575ce311393dd0922b80a753508dc9b23f16ba92fe0f00a171dada8b4789660225f571823614dfe439f9e
 DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b
 DIST util-linux-2.37-manpages.tar.xz 160156 BLAKE2B 39572332cfe4cac2313941ae922a01f5f4fe34cceb2ca3c806e87ec55187053dfce044790ad497d04adafc2abc513ae1429a1686e71b3b4e0e7907d17c9b6548 SHA512 2f3f1da3eae10b90daa672690ec90de303d87e9b0390f795daf80927a7c42f6aac9d3516b63051a6237a5609b5fda1dec92a1b8adc172115f3478b7edfa04918
 DIST util-linux-2.37.1.tar.xz 5628360 BLAKE2B 309ea7202f32c0ec750cb01486cf32c3e9dd457d83e5beab8d6b97a5e7f312332ecfcd1ddbb88ae5ec9ee483bb15452b8d58bce1f931f9dfa35be3ce042da3da SHA512 ec300c830869e10a0d7f8c0b99e9bb46e0b88fc51f3c6c6a4d9752a89f035e8d69d81f25fd103ef8d7d253e81440695ef3f5d72dccc94815ec8d5f6f949f7555
 DIST util-linux-2.37.tar.xz 5519268 BLAKE2B 37d4f260d636539c60b7196545c7c542c7e08a24cf3395be0c14054b5f05765c9f8234ded1c8fed60855e76bf0cfedc557d45e99b37d1e6b4a0244897fe06860 SHA512 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615
 EBUILD util-linux-2.36.2-r1.ebuild 8935 BLAKE2B 065f9a2c46802fdc656dfe1fb01b575aa769c087d295e646970efd6f16c20d3b10705c82dd1f536f0edde3a1422047bb8ac214361f3a2349c9b2295d5bfc5f05 SHA512 6100692d0d27f04f28112b4512a83ebb79805bfbdf1aba5c9b4f8a191deebf3efd4c1c45401bad0498ebf7d65edd9383e2c8a748ede22f733e09570cdeffb22b
 EBUILD util-linux-2.37-r1.ebuild 9991 BLAKE2B a6b00e3fd2aeb4fba72026456c02b243b950d5a6aa9f6166d8c2ef4015a5751d33be0ae28db15174770198e561b35476159baf03251e6cee860aee65ce82e8c3 SHA512 c76077d9f66cf106bc59e7075121d7c6d8c0260bf220b92e9f642bc1754973dbdbe410fb6d09cda02a40d85cfa15a22a1bcfceca77d50f4c50ce0a480f64a7e5
-EBUILD util-linux-2.37.1.ebuild 9219 BLAKE2B 29540366c24bcabd3ba816c927b950afa1e7785339ff3cb657e7cfdf70e713a49e42a314b3378694794b03b50d085912f47211f9ff1d30735f0c1ea778fbe679 SHA512 e97de69dd6c1bea120070bb36df737111db68c4108fe23bea58a99f2ca2815010b1fc7a2c7f7bd9b4eab7a560c08b70af7a1139cf66882359f762f5ce9662f87
+EBUILD util-linux-2.37.1.ebuild 9280 BLAKE2B 0356e14ea41414d58c7c19a249496998529ded536e92cf50cbe7ee32c93b8c44f5009abbf34cde0996dcbcb5806a5350b9a4cfd64970e23b83c791ca863cf375 SHA512 9f5e17b5aafb7fa8262cdad6e3f94f94fcbd064f6e266b5bb9c6b29d50e7d913b9338c3a0e83fd695da900b72c0f365c13e62da999f950b560fea3349652be88
 EBUILD util-linux-9999.ebuild 9219 BLAKE2B 29540366c24bcabd3ba816c927b950afa1e7785339ff3cb657e7cfdf70e713a49e42a314b3378694794b03b50d085912f47211f9ff1d30735f0c1ea778fbe679 SHA512 e97de69dd6c1bea120070bb36df737111db68c4108fe23bea58a99f2ca2815010b1fc7a2c7f7bd9b4eab7a560c08b70af7a1139cf66882359f762f5ce9662f87
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_nullptr.patch b/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_nullptr.patch
new file mode 100644
index 000000000000..bfb528cf1f15
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_nullptr.patch
@@ -0,0 +1,26 @@
+If you call a function which can return a null pointer you probably want
+to check the return value before attempting to dereference it. </sarcasm>
+
+--- a/sys-utils/lscpu.c
++++ b/sys-utils/lscpu.c
+@@ -966,7 +966,7 @@
+ 		*(p - 2) = '\0';
+ 		add_summary_s(tb, sec, _("CPU op-mode(s):"), buf);
+ 	}
+-	if (ct->addrsz)
++	if (ct && ct->addrsz)
+ 		add_summary_s(tb, sec, _("Address sizes:"), ct->addrsz);
+ #if !defined(WORDS_BIGENDIAN)
+ 	add_summary_s(tb, sec, _("Byte Order:"), "Little Endian");
+@@ -1008,9 +1008,9 @@
+ 	sec = NULL;
+ 
+ 	/* Section: cpu type description */
+-	if (ct->vendor)
++	if (ct && ct->vendor)
+ 		sec = add_summary_s(tb, NULL, _("Vendor ID:"), ct->vendor);
+-	if (ct->bios_vendor)
++	if (ct && ct->bios_vendor)
+ 		add_summary_s(tb, sec, _("BIOS Vendor ID:"), ct->bios_vendor);
+ 
+ 	for (i = 0; i < cxt->ncputypes; i++)
diff --git a/sys-apps/util-linux/util-linux-2.37.1.ebuild b/sys-apps/util-linux/util-linux-2.37.1.ebuild
index 141bdf409cb5..c12359853f47 100644
--- a/sys-apps/util-linux/util-linux-2.37.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37.1.ebuild
@@ -86,6 +86,10 @@ RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.37.1-lscpu_nullptr.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 4cb66c51ccc4..d13cd6cc523a 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index 55744cd0670a..72de7fcce082 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -9,5 +9,5 @@ AUX nss-pam-ldapd-0.9.11-use-mkstemp.patch 789 BLAKE2B da9525e66873be615cfe90f6a
 AUX nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch 403 BLAKE2B 2e17a92b3650ce4e6627be7ddb2f656cd9ab53e49d7e2b11d078dac0d7a00015d88d861bfdc1378eb25c1b9750ed3811023cc95b04ccf9d028ffc5899dc01cd5 SHA512 c8cccb044a641f673f12db9717bda4c0c4d91bd1933342595d8f3f540449459c5cf14263133487195b223670d450873f608e3ce5b6f1ca775ca7fe0180a9f962
 AUX pynslcd.init 515 BLAKE2B 711ba152ea9cc52198171e451889ab42a224581bae7e4378846f480063ed9a672fdb38b153d6941364d3d06e325d9feb95f6fd17885b4e6181d99393cb54de0a SHA512 56334d86cc027e538d8a0bf9a8b87308e3ae6e91be608a4a630f21c57cc41b6cb5dc6fb3220fed1ca555dd4da6a5c7c10b2776f9e49a7b71a96ece21fc65fed7
 DIST nss-pam-ldapd-0.9.11.tar.gz 777878 BLAKE2B c2b442786dd788dcf4373939ed52b4585d1821a7168fdd342ded3c99ef9ac8f3e4af0ac360f842b61885c1f2bc2ef85a0ce9ce0c1027bc974d0ba5242505657f SHA512 2b307805667526b85c724e113fe38899eee397e5c8673e89090d4836ce6d0ffcf18dd022d6c20a5e11d4138e736451b841a0f16ba379d524de4faaaf02906645
-EBUILD nss-pam-ldapd-0.9.11-r3.ebuild 4505 BLAKE2B 7f5a6430cab68536705bc6c5c9cec24966f0ba20c7821d67de11f78752dcc58e77f5414376a25d38cea44efe22eb69570aff4aad6357d72bc47a974ad92e2c66 SHA512 afb00da2ba95518aef803135eb591f3ecc4529774f6dd0994d539c9e88d0e3cfc0265b7c3285354145ac5177bd6cff23b62660e0aa31e382f3a03176516483e1
+EBUILD nss-pam-ldapd-0.9.11-r3.ebuild 4535 BLAKE2B cc0c91e8d0adcdbd9846065790d3aa28c6c5e1e9b08ef975a5a65eacaa13d9d18a574889c9fb7c205aa208c95c3aed95df27852ab1308e2df5a5f8bb0220e915 SHA512 fd27d97c0358d13921b4ccd35544ddd9d04ef7023b87d2da2c9f74b08d4950a7e27bbf8aed920d1b7f75494dbca88b85f6f7a5e0997e4392ba4f505b0669abb8
 MISC metadata.xml 1169 BLAKE2B 22b5c9adcafb123a6af088ddfcaa1962eaf250ed153020e65afe36a0e6473b1f8c624f770634a91c3a983c74ded1d43535bb4930f13c6470fad681f5a77fcd51 SHA512 ab658f7d791db370920a4eb57da8ead2713b1cabda6f2dccd24478855043802e7c70a07c3aeaa33829b19dc94a4317d8b5ebec07d1caebe07b4fb3bc59b27b4c
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
index 3f748952208f..e5b27e992d04 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
@@ -147,6 +147,8 @@ multilib_src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process nslcd.conf
+
 	echo
 	elog "For this to work you must configure /etc/nslcd.conf"
 	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
diff --git a/sys-auth/polkit-qt/Manifest b/sys-auth/polkit-qt/Manifest
index fd17d103f231..8e18969a6e94 100644
--- a/sys-auth/polkit-qt/Manifest
+++ b/sys-auth/polkit-qt/Manifest
@@ -1,5 +1,5 @@
 DIST polkit-qt-1-0.113.0.tar.xz 64652 BLAKE2B 52d8c5c8009e2595c70db5b6a6349e4524d6d9cbec12c5a535f25d737da1d16e77fadf3572eebbede7a5ed583c818e878119b416d69a076e03bb37d2f7da7b41 SHA512 deea5d75f547eaa0279c664ec9608b65f464db97fd5fdea27437f8ed4ec033de2b9f91d967deacb28bf0a1e54f131f997acb862cc3e1f8dfcb1f6c337e719b38
 DIST polkit-qt-1-0.114.0.tar.xz 58384 BLAKE2B e788198e386797ba9b4c228a451dde703f83e79c81eacaf805e431a3f60c0832adc3faef4616e3008dfaa816d7dc5a7a80aaf02936ea232373e78e0d008724ca SHA512 4a16d9428d5ccc0107dcbd67c29ecba196424e555dc43d55cf2b6e0e7b72c99f894e9c994eaed85a9536010d67a19f20fe74f792c0d6b9ca0e05ce85f655f9a8
 EBUILD polkit-qt-0.113.0.ebuild 814 BLAKE2B 5e99b99d78a7b6339550a464980ba0aec6f5d4dc4049de4388c87915906d09f2f639eaf114d60909b58572817f0fa15270a0551305287fa9f601a2441f2705b5 SHA512 71333f134b632293c09dadee8838cb1f39a14bebce7fe2d4f47cc8ba74888b99efd5ec40e5e0b38d485c5d33a86d72f69aad08b362bbdd7be905dc9fb94ca6c8
-EBUILD polkit-qt-0.114.0.ebuild 794 BLAKE2B 41ada602f2c80e7ebe77b5e5d456b6959911909453a3350d0fdf064e499a65aaa4e87a2c07368d21bf37d69c70a8912baf7a85d78353eb90e2cb6457e4e42e17 SHA512 40fcb5bdba660f6c5764f199e6e7c283b2519ca123d79fe895f478ea12ae8f272a0fb189a081eb81815a54fa14e2c4148e82f5b65370a699936b986e74a9275c
+EBUILD polkit-qt-0.114.0.ebuild 793 BLAKE2B 8eb5ce365f638b208142166149b17ddf7f226a1b15e20d9c042f38b396f4b911cf3a71e0c8297b80eb2dd4da7ad75447acc50239fdb516bde189cffdca1d1544 SHA512 28df131ca9dc8b9f7dc4a221698f010704f8cfd42b1dd51b282aa882da5ff7345d00e93b5b6e16b9b156681d8ce6c3ff22f814a095f5601050d41ac52e31c387
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-auth/polkit-qt/polkit-qt-0.114.0.ebuild b/sys-auth/polkit-qt/polkit-qt-0.114.0.ebuild
index f08c5bcad9ff..fef63b40378b 100644
--- a/sys-auth/polkit-qt/polkit-qt-0.114.0.ebuild
+++ b/sys-auth/polkit-qt/polkit-qt-0.114.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://api.kde.org/polkit-qt-1/html/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${KDE_ORG_NAME}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2"
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index 70634aa62cc5..4f2e15ab7d2e 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -2,5 +2,5 @@ AUX yubico-piv-tool-2.1.1-no-Werror.patch 453 BLAKE2B 80e024475d4c5c648154a0cb79
 AUX yubico-piv-tool-2.1.1-tests-optional.patch 881 BLAKE2B 02821ac155a75a213567958d33e5f9b25838c1b1ea9dc65efda223ee397643d2d6479b5e5bd5867dfaf057d64bdebf1f1379d2187e4f9fbca1fb4fa97133d0fa SHA512 f694e2d9e882cdb04728a3fc1f857c9c5c388ed439d6efbb385fa96414c8241ce918f7a2bbbe0ac2c94fbf3b2981fc68de4c7a999822a14068c8f43bd21de43d
 AUX yubico-piv-tool-2.1.1-ykcs11-threads.patch 1168 BLAKE2B ec91a73c7ad6c9ddd2e6250536b89f01d1778a79bc8df823e896323053dac8fe23c6b23a84b526da61146204df3cbc7889cae3ffc9a0414626e6ddb3b0806051 SHA512 d48787ff5de1ed5ff80fbf2f65308ea0c174500e32b55033508284aa05b0674f013479aaed5697a8f1207f821e7fdbf99cc206830725c023aa3a349fa0792172
 DIST yubico-piv-tool-2.2.0.tar.gz 1309359 BLAKE2B a5be7a48549f864b9322b5bf53726007b593ce7d08cd06f2251aef98cb065d90586e0189e6f3da94d6d274d6998459afa4a55a0d4c1145395f55830f53d334e4 SHA512 b2f8cd73800e0e0778ce36148b962026479f5d3ada3e313acb5a780993c28c41b03e9aa9335ac5b79fed7a418a2d3d3697231adf2da0dd06cd8d22ea5a01aca5
-EBUILD yubico-piv-tool-2.2.0-r1.ebuild 1279 BLAKE2B 592308196b5065466e08a878ea595e738fcbf2ab217175ca589eb9fdfa26b8359e395b91a3311fec5569e1bd23f1810810735ff55dd46b968cedf833c9d66a33 SHA512 9649becd0d8d48c9ca8ee1d737cf7591c85e96ffc8a1fe8433cdd9c7bb2f9ac9dc3c56b308fb0906a29cbd99d10fd25f17e315039f6547829b73c8f18bfeadc0
+EBUILD yubico-piv-tool-2.2.0-r1.ebuild 1286 BLAKE2B 8c9680ac2683f6f0a2f9d04ae12a8f7f5c190bb10ba84c3f0547bc07411093c6556095b0a151655eab0178ff64c8dde5af0dff52b49bd0ab69584ad480c9ea43 SHA512 a01a15aef8de6e9c9e8bcfaa63c7e327ce6c71029d75dbc7315df6dfa96499e079890301065849928b1543145a994314bdd7b0047fd645c69b7f54383293bb5e
 MISC metadata.xml 332 BLAKE2B cab42a159a3cd0da5f66dbbd7e542f4fbae2deb966a20e7392baa575ce00b65b40db1846abb69baced17c6feb6f9e3d565620ed5476735cfaa121b0a2b81dc22 SHA512 892f4b9d170c5bd2679a1777215d7b88249bd4347c918499b762aa9ad0132b7b15d847180e4d27527d5cead6a4f8e23a7a4d3dc89752bda3852a99782129c257
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild
index 1bb45ee8e3f6..f93875e443a8 100644
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="sys-apps/pcsc-lite
-	dev-libs/openssl:0=[-bindist(-)]"
+	<dev-libs/openssl-3.0.0:0=[-bindist(-)]"
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
 BDEPEND="dev-util/gengetopt
diff --git a/sys-auth/yubikey-personalization-gui/Manifest b/sys-auth/yubikey-personalization-gui/Manifest
index 30847b69e00b..167d492a2811 100644
--- a/sys-auth/yubikey-personalization-gui/Manifest
+++ b/sys-auth/yubikey-personalization-gui/Manifest
@@ -1,3 +1,3 @@
 DIST yubikey-personalization-gui-3.1.25.tar.gz 942121 BLAKE2B edc581824f917b50664dd758a0447fa9a61c85844cd220d82661c9e1f1bbabc1bda77545c1eda2e56a43b8176479c1b161f8e9ad5feb3d61cdc37d301ebde9fc SHA512 6d45c2a9e9c452a44fba5ff3830150ce65e968899215c59fd7b412317143015c466ac706dcfa49def2c4304a01866a3674ba7cc37e47dff4e8c6acb8166fcf45
-EBUILD yubikey-personalization-gui-3.1.25.ebuild 1329 BLAKE2B 0ebddfda4bcc20066a8a345a102189322b87cdc7ca2128b664a834114a3f356821a83e07ed6c84e9a9c8f5b7c910703c1cb627fefa8e4b292cb5c47fa5fd9aea SHA512 5ed97bac56cd321f07b9e36a594ca3ea6d7d43018bf042b69a63551e2db25d3009708429ba5f8102e87d52ac0d32bb9e417034195c933422f1e2ad03dce8ecd2
+EBUILD yubikey-personalization-gui-3.1.25.ebuild 1287 BLAKE2B c021cca98774187e52f42734d8f189e8e95cfefa9a135980b22f821f778d4d59d693fb5b3b1d055a9fbc581f423e43a6178df692a0cfc60c2581dde01e79ccab SHA512 ec39476f13f2651ee175baf4889b5b0df8d27031846c57ada1456d44b0200e07c07e979464a04efd38516c7a3e3711aeb0f102bf97594c8939656afa2304879d
 MISC metadata.xml 340 BLAKE2B c6934bbbe195cd50d59c353031eeee553b2f8bd22412a9cb520c83de313096768242cf574be56d382bdba56aff8a4c43be270b79e0b44b3f3d1f242bbb6a2313 SHA512 7efc9df75003c2582b4173da4e2eb06463fcbd70f242b7075e1c6ead87809b1a6239866baaf78077be835842c2ed10fac3380bc0ab7022be19b4a6b928d8d6f3
diff --git a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.25.ebuild b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.25.ebuild
index 4874fb7e3ff8..cefccbf1a2e9 100644
--- a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.25.ebuild
+++ b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.25.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop flag-o-matic qmake-utils xdg-utils
+inherit desktop qmake-utils xdg-utils
 
 DESCRIPTION="GUI for personalization of Yubico's YubiKey"
 HOMEPAGE="https://github.com/Yubico/yubikey-personalization-gui"
@@ -41,8 +41,6 @@ src_prepare() {
 }
 
 src_configure() {
-	append-cxxflags -std=c++11
-
 	eqmake5 "CONFIG+=nosilent" YKPersonalization.pro
 }
 
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 97df54f26709..fd14465c02ab 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/ndctl/Manifest b/sys-block/ndctl/Manifest
index 397e30a6cbc0..da1493e21fdc 100644
--- a/sys-block/ndctl/Manifest
+++ b/sys-block/ndctl/Manifest
@@ -1,3 +1,4 @@
+AUX ndctl-71.1-bash-completion-configure.patch 1717 BLAKE2B 167bc8e1bdb8fb9c31451c7ca7ed0edd28ecdc03185a06d96b125a604b34816df1927788d5208d229704778c356d26cd41b2d031af29e66686d0dbd0c2206f74 SHA512 b688bc49e413cb41c0b611f304a91f074a99fbcd60393c18d36435a7e3fa0a4326bf2107ff731adda96d0f14b57cf37d265de6156e903f43beec225cf8a7474f
 DIST ndctl-71.1.tar.gz 330512 BLAKE2B 582f29fb649f33a48b5412bfefc15de2b1f765b27251d1b8a472d8c7705d671acbd6bf646f737baf8556d8fda39db68242f44e11225d7305e95f5d2ec5931f31 SHA512 92fb06ca64455775ce0b89ba0846f70235e02fe3502e2a8a55a858f76f87cb90ae98f5bf01620e5884f667ea78ee2bee2cd9e7a85ffa8f8d9c456e9282ca9ebc
-EBUILD ndctl-71.1-r1.ebuild 1203 BLAKE2B 8a5c0832c4ee85cb04f512e87dccd937c223870e1476ce1d080dc64184bd2681546795ad6d0b609510f4ffdc8e0987e148630afc170a0d68215ae73bdfaf1d93 SHA512 46b8429fa942fb278a72ffd6980932359acba2146e5ff72070e56c3240144e9a4535836902cf5eab4edbc47a61bfb4d434f31e6d30220f0166f62b61827a53ec
+EBUILD ndctl-71.1-r2.ebuild 1266 BLAKE2B eea6e5193230abe91775fade34483046f5bed0ac5a0fe2ff739fee84c1ec368d044b12ec3032c20f6219c038df1abcc656b948c352477570131ec4bfff639d86 SHA512 a6e207637e43d707b6263edf84b8eb1186e3da517d932767b66a1e1f6b78d4c072efec2b5a32e81c188bfb0d807c03ddb15a401c224b77a2c45cdec288505fee
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/sys-block/ndctl/files/ndctl-71.1-bash-completion-configure.patch b/sys-block/ndctl/files/ndctl-71.1-bash-completion-configure.patch
new file mode 100644
index 000000000000..d6a796ab9796
--- /dev/null
+++ b/sys-block/ndctl/files/ndctl-71.1-bash-completion-configure.patch
@@ -0,0 +1,48 @@
+https://github.com/pmem/ndctl/pull/174
+
+From 92485810ce872c92b925ccdf4e3b58fa37ccbb8e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 17 Jul 2021 19:31:56 +0100
+Subject: [PATCH] change bash-completion
+
+---
+ configure.ac | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5ec8d2f..f7b1aed 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -133,19 +133,22 @@ PKG_CHECK_MODULES([UUID], [uuid],
+ 	[AC_DEFINE([HAVE_UUID], [1], [Define to 1 if using libuuid])])
+ PKG_CHECK_MODULES([JSON], [json-c])
+ 
+-AC_ARG_WITH([bash],
+-	AS_HELP_STRING([--with-bash],
+-		[Enable bash auto-completion. @<:@default=yes@:>@]),
++AC_ARG_WITH([bash-completion-dir],
++	AS_HELP_STRING([--with-bash-completion-dir[=PATH]],
++		[Enable bash auto-completion. Uses pkgconfig if no path given. @<:@default=yes@:>@]),
+ 	[],
+-	[with_bash=yes])
++	[with_bash_completion_dir=yes])
+ 
+-if test "x$with_bash" = "xyes"; then
++if test "x$with_bash_completion_dir" = "xyes"; then
+ 	PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
+-		[BASH_COMPLETION_DIR=$($PKG_CONFIG --variable=completionsdir bash-completion)], [])
++		[BASH_COMPLETION_DIR=$($PKG_CONFIG --variable=completionsdir bash-completion)],
++		[BASH_COMPLETION_DIR="$datadir/bash-completion/completions"])
++else
++	BASH_COMPLETION_DIR="$with_bash_completion_dir"
+ fi
+ 
+ AC_SUBST([BASH_COMPLETION_DIR])
+-AM_CONDITIONAL([ENABLE_BASH_COMPLETION], [test "x$with_bash" = "xyes"])
++AM_CONDITIONAL([ENABLE_BASH_COMPLETION], [test "x$with_bash_completion_dir" != "xno"])
+ 
+ AC_ARG_ENABLE([local],
+         AS_HELP_STRING([--disable-local], [build against kernel ndctl.h @<:@default=system@:>@]),
+-- 
+2.32.0
+
diff --git a/sys-block/ndctl/ndctl-71.1-r1.ebuild b/sys-block/ndctl/ndctl-71.1-r1.ebuild
deleted file mode 100644
index 4f2aa941c70a..000000000000
--- a/sys-block/ndctl/ndctl-71.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1
-
-DESCRIPTION="Helper tools and libraries for managing non-volatile memory on Linux"
-HOMEPAGE="https://github.com/pmem/ndctl"
-SRC_URI="https://github.com/pmem/ndctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC0-1.0"
-SLOT="0/6"
-KEYWORDS="amd64 ~x86"
-IUSE="bash-completion systemd test"
-
-DEPEND="
-	dev-libs/json-c:=
-	sys-apps/keyutils:=
-	sys-apps/kmod:=
-	sys-apps/util-linux:=
-	virtual/libudev:=
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	app-text/asciidoc
-	app-text/xmlto
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-# tests require root access
-RESTRICT+=" test"
-
-DOCS=(
-	README.md
-	CONTRIBUTING.md
-)
-
-src_prepare() {
-	default
-	printf 'm4_define([GIT_VERSION], [%s])' "${PV}" > version.m4 || die
-	sed -e '/git-version-gen/ d' -i Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with bash-completion bash) \
-		$(use_with systemd) \
-		--disable-asciidoctor
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	use bash-completion && bashcomp_alias ndctl daxctl
-}
diff --git a/sys-block/ndctl/ndctl-71.1-r2.ebuild b/sys-block/ndctl/ndctl-71.1-r2.ebuild
new file mode 100644
index 000000000000..d6c230f369cd
--- /dev/null
+++ b/sys-block/ndctl/ndctl-71.1-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="Helper tools and libraries for managing non-volatile memory on Linux"
+HOMEPAGE="https://github.com/pmem/ndctl"
+SRC_URI="https://github.com/pmem/ndctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC0-1.0"
+SLOT="0/6"
+KEYWORDS="amd64 ~x86"
+IUSE="bash-completion systemd test"
+
+DEPEND="
+	dev-libs/json-c:=
+	sys-apps/keyutils:=
+	sys-apps/kmod:=
+	sys-apps/util-linux:=
+	virtual/libudev:=
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-text/asciidoc
+	app-text/xmlto
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+# tests require root access
+RESTRICT+=" test"
+
+DOCS=(
+	README.md
+	CONTRIBUTING.md
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-71.1-bash-completion-configure.patch"
+)
+
+src_prepare() {
+	default
+	printf 'm4_define([GIT_VERSION], [%s])' "${PV}" > version.m4 || die
+	sed -e '/git-version-gen/ d' -i Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		$(use_with systemd) \
+		--disable-asciidoctor
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+
+	bashcomp_alias ndctl daxctl
+}
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index f6d39bf3d7f5..7475eca4e217 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -2,5 +2,5 @@ AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4
 AUX parted-3.3-atari.patch 421 BLAKE2B 9048176f882e66cf89cc2d79aa0ea7a550f9c649d8f54f4df102eb361c6e0be473a2e07e1ab8f63dc446422a92ced10cfb4858a27b7988c1b5a960e6e8e1d518 SHA512 59738de6f89dd6d407eef139ffe4d0925d418f4d33a30a1ead1e1f05ab7ad93e13294412d5061dd40302b9592a33b97f137089f477dc6a2febd3fe60eae77ca0
 DIST parted-3.4.tar.xz 1860300 BLAKE2B c724d3d1490c62d440b9e5dc359fef7ff623bc77ae5f867d8905245cb279ec391fa07a1a774488ad3bf7a2c477007264d7bab2635a544be8f94dc706a654a711 SHA512 e69bd1b610778e980d4595d04892f2ea1faf4ae9bfc98cd62abfc70066423f08ddaa396f9461c7beb1330d023232274606b6b26091a0458aeedd0f3f57536690
 DIST parted-3.4.tar.xz.sig 508 BLAKE2B 112ad0158b1100bd9150a7c87e8f93e67d42870b82a17d4d0aa8bb5e46306f837f3f99feabaf301f8cd640c299174e5f5acf152dd1f20ea2b7ace73d57d31f14 SHA512 6b11812267e66470ba2908ee1cc78b232b0bc2519787f5a17b92cd5f8ba904b1a836833f19c5244b23d4c7810437eeb26fbbd68fac819391b342709682345472
-EBUILD parted-3.4.ebuild 1467 BLAKE2B 255a22fd0e407793f428091bd6c64f18f709e254d020a98ebe7b25eda24ef98b9acd00a7f90f811800e56dfd99067038f1cd78e6ef36978b5ee88146bc6ad4a7 SHA512 d887a2dd9fba74ce72a43275d4e00da42f0993157ad73347364c9b032a9829a52671e8b5caf788bb974b68bc7c73130e6c44a8a0a61fc4384980e03e69237fd9
+EBUILD parted-3.4.ebuild 1465 BLAKE2B f2d03a3250e869fedc29428ecae13f88c2bb1b7e4f2693d0893db7ff9e37c8cce1e3e2caf8bddcb1f4f06bdc77e3195d3afc1f840d0356fd72fa33934262d12d SHA512 997295b4cfc791632cb6902a01ed06750b5a4cff47de3513b7e4fb9bb610a1d799985168c219305758345d035fc967a8e33198e37033384045bd0188f09769f7
 MISC metadata.xml 886 BLAKE2B 7eab7ab0acb3ca62dbd119ebdccad3a0a5aa69754edbc7465182496bfd136cdd06a7f12c8515ff2c9420dd22b9a4c03ca7f126b357f146af3825bf8e76064149 SHA512 aad773c94d64b99d1f70f2e542e75c4795e1c58bfdc238eb50d0e0a7c10d1255af464b2c7ddea76bbee4b6af5f8d90e1c584f319cb290cbe85aa6c7c8e873e21
diff --git a/sys-block/parted/parted-3.4.ebuild b/sys-block/parted/parted-3.4.ebuild
index 573a9aca4f70..2e26bc74904e 100644
--- a/sys-block/parted/parted-3.4.ebuild
+++ b/sys-block/parted/parted-3.4.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-VERIFY_SIG_OPENPGP_KEY_PATH=${EPREFIX}/usr/share/openpgp-keys/bcl.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/bcl.asc
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index b9892d53113b..e255ec256126 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/aboot/Manifest b/sys-boot/aboot/Manifest
index 73e92ce9c03b..f0d8b71bdee0 100644
--- a/sys-boot/aboot/Manifest
+++ b/sys-boot/aboot/Manifest
@@ -8,4 +8,5 @@ DIST aboot-1.0_pre20040408.tar.bz2 115062 BLAKE2B 49f1b45abcd4726fd036e24709d10b
 DIST aboot_gentoo.diff.bz2 9527 BLAKE2B 2492b456f7411630b6ecfb19db775969b69a35c0ef31b2146fd353aac78cf4d3c9ef2162cf54ab4ac025c65607219b3a33a74d2105be196e6dda54dd2509c1f8 SHA512 868a73fee56e9bf6d986175a6a4dc321ed12fb78d74dfb8f1a3e35274577ddc9ea0820768b44836403587b3976ad8dacdcf6562a9ce5c45981c752670901155f
 DIST gentoo-headers-base-2.6.22.tar.bz2 4700338 BLAKE2B a264d7999ed7735e42ea21f8cf96b60ca1bdbfcb76dbdfcba14a849043e1f6a9109cd72bf5b91b9ab877dc3025ce6a9270ea914cf277b8f77cecff703646a7ec SHA512 99849928eede0c4b101ddc9179c0974cac6b4f18803dc98b72dcbe80cea88d3062f709beaa1b890edbed9c147be0dd516065d4cee945164b5d9f19f7a3cf249d
 EBUILD aboot-1.0_pre20040408-r3.ebuild 2643 BLAKE2B 42cc709c24a16cc6a1edde9833894159a8f16b3ccd0328148b03dba0fe04e3f42ea66616c999e974fd82c13a0df587ff8fbad8e0ad5d0460e67abd20f7742b90 SHA512 4a86c1b908e70c83ef306c756bab15fe7a36cfb2677b178334deaea6f46cc391b5a743a5b2ab4d5cddaf7675ca7a75645a50ab5f11e4cf3327776848e4df5d89
+EBUILD aboot-9999.ebuild 1918 BLAKE2B 32d15635932447d804c78f47d8f8795cad5a96a6fb3088ffb479a07c90a4b27da48d7a187b09d9b90e668e0b9479d781cd9eddf59d05861b66815efa5a281e16 SHA512 ae87fa7a82b75160bdcbed66aa7d4a751fc261277063d1f6cf24174d62a5960587d7cb4be986b57a3d2ed1ce5a9c8c6b5ab811ed81064ab1ab79a7573608a0f2
 MISC metadata.xml 338 BLAKE2B 7d68dddf2bf27051683da2c5f6a43ea7b3aa41b7e6bdbb8705d422e0db65b781d181cdc506a58824f4624985e72e82640b3bca51e46e6092cc2fdc047d38dcaa SHA512 2c9c87a850f9900d030fd37a4f59308136f478db254fbfd8e37d4f3c16ab33c74d1ef4119b74f4e0b34310ef066ffb53f89e2a4013cfca4a7b56f690e2aa7faf
diff --git a/sys-boot/aboot/aboot-9999.ebuild b/sys-boot/aboot/aboot-9999.ebuild
new file mode 100644
index 000000000000..d3e6321ec031
--- /dev/null
+++ b/sys-boot/aboot/aboot-9999.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mattst88/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~alpha"
+fi
+
+DESCRIPTION="Alpha Linux boot loader for SRM"
+HOMEPAGE="https://github.com/mattst88/aboot https://sourceforge.net/projects/aboot/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+BDEPEND="app-text/docbook-sgml-utils"
+
+src_compile() {
+	emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) \
+		all netabootwrap
+
+	einfo "Building man pages"
+	emake -C doc/man
+}
+
+src_install() {
+	dodir /boot /sbin /usr/share/man/man{1,5,8}
+	emake root="${D}" install
+
+	insinto /boot
+	doins net_aboot.nh
+	dobin netabootwrap
+	dodoc ChangeLog INSTALL README TODO aboot.conf
+
+	insinto /etc
+	newins "${FILESDIR}"/aboot.conf aboot.conf.example
+
+}
+
+pkg_postinst() {
+	einfo "To make aboot install a new bootloader on your harddisk follow"
+	einfo "these steps:"
+	einfo ""
+	einfo " - edit the file /etc/aboot.conf"
+	einfo " - cd /boot"
+	einfo " - swriteboot -c2 /dev/sda bootlx"
+	einfo " This will install a new bootsector on /dev/sda and aboot will"
+	einfo " use the second partition on this device to lookup kernel and "
+	einfo " initrd (as described in the aboot.conf file)"
+	einfo ""
+	einfo "IMPORTANT :"
+	einfo ""
+	einfo "The partition table of your boot device has to contain "
+	einfo "a BSD-DISKLABEL and the first 12 megabytes of your boot device"
+	einfo "must not be part of a partition as aboot will write its bootloader"
+	einfo "in there and not as with most x86 bootloaders into the "
+	einfo "master boot sector. If your partition table does not reflect this"
+	einfo "you are going to destroy your installation !"
+	einfo "Also note that aboot currently only supports ext2/3 partitions"
+	einfo "to boot from."
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index f693bc86f27c..3280c9574f5b 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 4f324be36c9f..cd171e36e056 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -53,10 +53,10 @@ DIST ceph-15.2.12.tar.gz 148509713 BLAKE2B 4962e7d574b38592a874a1b3fa8610bb2d0af
 DIST ceph-15.2.13.tar.gz 148542333 BLAKE2B 2e9668bcb0fd283ec4ab51b0c6142fc9a3b6310eb5d34e07da5e6b73b55dd7976db5ab9c78a93684ddc2f51873b1a17c4d31c5f5647b2d43a2826ee5362f7e5d SHA512 bde28c331c489db0845959f65c425146c317466a7793f56a83e2827dec35b8cd6f600bf9056151c1e6926cc0155deebbc8681c240ac9f37ad876b9a6afae96da
 DIST ceph-16.2.4.tar.gz 155840423 BLAKE2B a803ffa61ac9fd6d42790d6d8e12aa8df843968627df0051475355f3ba0dc1272afa3d9e2716115ad769b2f322d7bd239d99b89e51610e89ce9efe39af4f01ae SHA512 8904e7fcabd50276e4e86735fd85dba96f417c194c219025146f994707def7abe372528b0f2e862e274b2f405d7b791bac86b6cbb8d57cecd6f44023a2ffb6f6
 DIST ceph-16.2.5.tar.gz 155933825 BLAKE2B 3c8f3f1663b91d4de1e3736317add0b88d9083db5ab2fc3e2e913278977deec076bd4410e309f4e47ccc169d74356c2ab1221c94532cc45ee75ec73673fc42a0 SHA512 5c32f9aa817ecfa788725bcfe5743756853ca9b3f9ee453242110f1b5e1bdd1feaef79ad9ccf2b185445c9644bcecb1355e151a2255bfd27edc9818e0d6d4c4a
-EBUILD ceph-14.2.21-r2.ebuild 10431 BLAKE2B da08ec46959c57da162051019010c20bd718e1def03a99f7a74dfae5a8305b63d720b5da00fd26c0527683d13e703d223c09d86fad88c251934b28a20d444efb SHA512 38ca1c08982148a210c9aeb308407cc118c67e315aee6d20f2255f01f48656dfa622d610337dcbd5b83d27cfba60649c1d8aa07beed84d9ffe8fb74c644a4d8c
-EBUILD ceph-14.2.22.ebuild 10379 BLAKE2B 970b467d01d8b294f5c886e843e0f85c19dccf6bfe17726f7e6a34ec2e34557b90a96305d2b62e45a9e3264e5eb9335b1f29cc37a52fb116387b85aa62d685f6 SHA512 f64bf074c77fc603b4ade5c2ac341218c932f4058eadbaeff29bbf6f10facf60b09698bf0a6fa2de6d7feb6271dbe2ff9ad41e2e60b8b0d57ab2a9517f346775
-EBUILD ceph-15.2.12-r2.ebuild 10780 BLAKE2B c3ceaef839451ad3c05d8d3ffa389a3e8a2a65563a0276c3b5b6f9e81a02590a77561d5a1ee7ac6842ad1295d3f2908fe3c4aede5edb50f15eaec2ebe2dbeae2 SHA512 f2d503964a06f6ebab1e080ae574744c455ba34323ab04de7d98ff7f6b33b8d0439b179412fd3410ab2602443f2c5757621238a4006edc73aaddb001b9b81c8b
-EBUILD ceph-15.2.13-r2.ebuild 10676 BLAKE2B df69ca97ef59cd7934aab08fa4e754e69ccf0a000e06523bd444681fde18171adc71acd4b99d5935174542cc0c3eb12ae39e557a078bc296e482047092514b1d SHA512 474f065867fbdf66832e4d910d90447406dcb0483727ce42e8e5ae13b8222294e05838fa18990998b3cb693a27e0fc2de4a06402120535088a12c374ede8f814
-EBUILD ceph-16.2.4-r2.ebuild 11990 BLAKE2B 396daa63143a2e70921039f3dff9af8107d9d708c1864994f64ea5b251924f72af92af2fb0e512d0d7b8545ab32c7b70078e2f076a7a4939999611316d55015e SHA512 44a6d31278d8885398af0bcafd36e16a0abd25dfc66d4242294ae84c3db631967bbc786cafaa54abeda5d981e8711453732e9ecc8332213cac224b357b8f7f17
-EBUILD ceph-16.2.5.ebuild 11991 BLAKE2B 62c9ee82927b0ae110e8bad74e76a39cf3ccbf1e4d5d247784d4962fa619fceec2c463885c574fedb5ec75d4f369a0152afd007550d60fe8833dd1faa0c71d26 SHA512 09d8ce0d5aa9ae0b11b6c2918ef06807a9065b8d4341df7c0ff9b5f87ef1896589d2d1437eb70a4ed0cf5f0a29c01d998318797a358a96b5b56fe5caa8dbbeeb
+EBUILD ceph-14.2.21-r2.ebuild 10460 BLAKE2B b5a0c5fd242da07334c24022353750ede7192033c114cae55107f8c68d9523ee4d72ba2d9af29ef2cc4717c8f6438f4fc8dd6c15d3d9176c65b53d8583b0b2be SHA512 8c5b07478158c7276688da4b559662bf181bc9b8ed6bb3539a8f12873969fa1d732fa94048dd6346e71e0ea57d7453e00c319f7f5692b58d6902f590e23643e8
+EBUILD ceph-14.2.22.ebuild 10408 BLAKE2B f1cf94e11b52be223be81070f9186db8073adc6c397ef8e71298724e2098d1a0e6742c292c68e75207aa8aef40be5bb2d45eccd015407520fde469840724870f SHA512 9ef62b42dd7977926461adfbe4f32518e4f788cf05ae33a17f00fa9ef106dc165ce3f612e790fdf07b00df71374b48077a156aa83657411ad19f1ea6cc21cf7e
+EBUILD ceph-15.2.12-r2.ebuild 10809 BLAKE2B 0d6d9c6f03d97938150d63580ef239782c98b5172113fc62f8b345d22d8c004b41de5eca9c1d7ec1d8aaff3d2f4e6d7c393a0e1f9eeb5493f0213f1bd528859a SHA512 43572f01bda8913e6736182f96e2d7f9d0a3cf3ce3d62facbdbe2f6edd2b5e84ef1ae5b0bce25a7ca16c221656d25d12308bd1b6c188fdcdaa0c22ad94d9a7fc
+EBUILD ceph-15.2.13-r2.ebuild 10705 BLAKE2B 59c423be256017163deb6d2e1a4ab690092e65e5068be7e9a26c965936b0e162565360ae2aef3b841b7fe3e418bc2518ba99e8252da4cb66a8f982135a995308 SHA512 5efc7f97490233c427eef21b3ed527e190f0a0436d8f86ab673bcebf1b71549f91d71adba48ea63188412a5aff86dbbe6e0d82cfb233287f5d924e7046e27f23
+EBUILD ceph-16.2.4-r2.ebuild 12019 BLAKE2B aba6a1b3f4351159591bf590f75b8c8ed67c75191830d6bd3ec828c1a82d71ee8151d5cd654bc092254e77b304b38427bc74179b893f97b3455f4982cfdb97a5 SHA512 1377a375513cce4e326e00e1ee1252b2f19bf3a392dbbed04189dc2e1beb68ef9b444ed66556037797b58b54a77483be26ca63c1a8c7049ea66dc800fb84ccf5
+EBUILD ceph-16.2.5.ebuild 12020 BLAKE2B 07add334a77f2da4c6c5f2b0fe564aea99d0a3d6be09360155873179e29271fc0844a62f33c279eaa9ad35b8b86f6b7d3dd96f21ecbf0ce2070193870ca14270 SHA512 15ae3d05777b333d4ec8ff5d80ed81e384fc2313b533d9a2b71c889543d0072ed1e65b2acc1ecb52a1af79cccb5e6a670c50785e7b94674ce54fe87a14578842
 MISC metadata.xml 2318 BLAKE2B f9cf86426b0d8ea87cb80cb03315e9b0b581f604b2e1f28011dd49ab885232184fbcb6e496e8305d92e2c45bea973b8627235115e6bc7b7590874ac2ce9a00cc SHA512 e4eb8fb92dfe9161c217d880db3733aec36efc74431f529b12212702abbf633647bb8a22bfe7864d7389e8ed893bc37518e228ce165140058f98aec534b8f3de
diff --git a/sys-cluster/ceph/ceph-14.2.21-r2.ebuild b/sys-cluster/ceph/ceph-14.2.21-r2.ebuild
index aa787f1388b9..5d1b43cae8f2 100644
--- a/sys-cluster/ceph/ceph-14.2.21-r2.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.21-r2.ebuild
@@ -389,4 +389,5 @@ src_install() {
 
 pkg_postinst() {
 	readme.gentoo_print_elog
+	tmpfiles_process ${PN}.conf
 }
diff --git a/sys-cluster/ceph/ceph-14.2.22.ebuild b/sys-cluster/ceph/ceph-14.2.22.ebuild
index ab7a4ecf5a94..1288ebd6a786 100644
--- a/sys-cluster/ceph/ceph-14.2.22.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.22.ebuild
@@ -388,4 +388,5 @@ src_install() {
 
 pkg_postinst() {
 	readme.gentoo_print_elog
+	tmpfiles_process ${PN}.conf
 }
diff --git a/sys-cluster/ceph/ceph-15.2.12-r2.ebuild b/sys-cluster/ceph/ceph-15.2.12-r2.ebuild
index 75c961e4526c..7e0b490c135d 100644
--- a/sys-cluster/ceph/ceph-15.2.12-r2.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.12-r2.ebuild
@@ -400,4 +400,5 @@ src_install() {
 
 pkg_postinst() {
 	readme.gentoo_print_elog
+	tmpfiles_process ${PN}.conf
 }
diff --git a/sys-cluster/ceph/ceph-15.2.13-r2.ebuild b/sys-cluster/ceph/ceph-15.2.13-r2.ebuild
index 0244baef17e2..bc1a96acf142 100644
--- a/sys-cluster/ceph/ceph-15.2.13-r2.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.13-r2.ebuild
@@ -398,4 +398,5 @@ src_install() {
 
 pkg_postinst() {
 	readme.gentoo_print_elog
+	tmpfiles_process ${PN}.conf
 }
diff --git a/sys-cluster/ceph/ceph-16.2.4-r2.ebuild b/sys-cluster/ceph/ceph-16.2.4-r2.ebuild
index ab8e538d648c..e3804ec653b9 100644
--- a/sys-cluster/ceph/ceph-16.2.4-r2.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.4-r2.ebuild
@@ -447,4 +447,5 @@ src_install() {
 
 pkg_postinst() {
 	readme.gentoo_print_elog
+	tmpfiles_process ${PN}.conf
 }
diff --git a/sys-cluster/ceph/ceph-16.2.5.ebuild b/sys-cluster/ceph/ceph-16.2.5.ebuild
index 834efe8eb5e6..0aab57c79ca9 100644
--- a/sys-cluster/ceph/ceph-16.2.5.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.5.ebuild
@@ -447,4 +447,5 @@ src_install() {
 
 pkg_postinst() {
 	readme.gentoo_print_elog
+	tmpfiles_process ${PN}.conf
 }
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 0f52c7dde5f0..e0c82f3fe539 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -14,5 +14,5 @@ EBUILD galera-25.3.28-r1.ebuild 1787 BLAKE2B dfe11ca3f23116f4d703a9e72ff09985919
 EBUILD galera-25.3.32.ebuild 1726 BLAKE2B 69be6fa5fb2fcc79d844497c5e2c374caeefb7307620a66b93333330705a44587c0eedfa0eac8194606513bf453f42739f440e9f2704869d87ae20d02b58482a SHA512 cd89402a39cdc67e2d441106148de15928faa89d63cb93af57242ab95917467569b2342488b96dac860693dc4798627afb977ce30621edfe92f08eab46817858
 EBUILD galera-26.4.6.ebuild 1883 BLAKE2B 1c25c650cc1aaa24e15b5fe91075174ffe45292d184c78a4ad2a03c6f57576a1d27c428ad9d827308678920027061836e26679e0daf6132b51dbc1278e9c7d7e SHA512 50d2c6b0efb9e3d912ada92de0f1034bad21307b355b9bd3eb1b6edb9fa9c69e086a2dd10a257804377f03b76c60bfd134f70d7d460a95677efce8990aaaee5e
 EBUILD galera-26.4.7.ebuild 1780 BLAKE2B 3d1481060258879c4b2efd30f3923f7f3fd7b37d177941ff1b2ec15606cd77f28e242baa94b8214460cf6301a4ab7f48984b0feab4850022dff56be693415761 SHA512 f28a2fb4215ae66a14d5fc640df8e1a9b124881da616ef74e7ce2d3050630c74753cb1edeaff3c843a04505c5a99d2ae02fbd2b2f829493bcaf89f60cec94fda
-EBUILD galera-26.4.8.ebuild 1910 BLAKE2B 983152d37f7d2a9f753df58e14158b93755a8f387ee7a2c039ff2d0127b6d0373f55bce2730e6e6cf0f09f96c08ee9b3a5ede4dd64c7671dce4d5bc7218b3790 SHA512 933bc33374551a894756bae0da0eee2d38d79244ba39159b88eeece9c52d389d772925e876b0fd0cb91db5f9e296c2ffb21f19d6b497f4be81ecfb2169ad8db6
+EBUILD galera-26.4.8.ebuild 1909 BLAKE2B cacfb74ca71c02f846e2d5804ad827a9d697c7531005149d89bcff83187b22429ced418a790cd575bfabd202774ab6155ef52ec477401e94169308453ecad96f SHA512 48bd6e47d3eae317578c0d28ce90c280d5c1981256762eee4584615b2146866f8795e73404d28f168f2e79e6d8ff27250c6266c0db219717a78e4dd0eceaa84e
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-26.4.8.ebuild b/sys-cluster/galera/galera-26.4.8.ebuild
index 4cfe520cc94b..8c74829e351e 100644
--- a/sys-cluster/galera/galera-26.4.8.ebuild
+++ b/sys-cluster/galera/galera-26.4.8.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 BSD"
 
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 
 # Tests are currently broken, see
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 8b3720d35849..759340f5e48f 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -12,10 +12,10 @@ DIST glusterfs-8.4.tar.gz 7833014 BLAKE2B c67f510c655465e9fbecaa7f391531543e37a2
 DIST glusterfs-8.5.tar.gz 7873397 BLAKE2B 6ababf15fda216c9a47c05859f7123847d711dd5a12e3ec2c5dcf8475f35830c9a32f7b21ad763ab1be59b06f1d93f83acc0cbb8f7635456a3638be73b162aa4 SHA512 e256141a76deb9a255be31422d76b0c81aad4a7e5b166d2be90a79d340ceb811cbff11f469166ef7582f40f58f47fb056aa05aafd4b35f094bf9c21a5c08f3bb
 DIST glusterfs-9.1.tar.gz 8206207 BLAKE2B dea099eb1d366704010247964c24de404fb09c00a375dde4af30a2af836d3b35689fab91a75268aa01dba45860eb50a6e0572913c059e53fb5799d2302c2f005 SHA512 2c26813f12fed7a0640cc470badc2b83f156b660ef475487a689dca6c3fa407192f4959aeaf7a981969a079cf5d2c7aace85ff818ea6133d5a085d90d226e1da
 DIST glusterfs-9.2.tar.gz 8212980 BLAKE2B 7fb42186c5d309c357f72e3037fc09d8b15f32770d74173dd4779bab91056d1ceb78a4a651fec2018faf1597357576d41593e9d7b04cf9af7f4742301b284b01 SHA512 34a0a1745029e2fad3c8fc6a044b4e4645f8cf11eddc3c8c8e94cce9733449248c577ce6066bc49010a65121d991daf67766393fe513ac694082f0efa1d4ef95
-EBUILD glusterfs-7.9-r1.ebuild 5882 BLAKE2B d4f8f6d53c25540c32af441d912fa39db975ac5be3e9edd5852c8bd6ef515999acfb19c3a5732d82151c3daaa089f772c5e2f4c72a4ee1bb70896097a9a858cc SHA512 3e86af7bc8355a114567e5561c290a0856fdbc88ea8e74666169d4e82d4d98fccdd91959003c7bf17f97bf66d89325ad9cec25d098a4557c7fcacf52c73899c9
-EBUILD glusterfs-8.3-r1.ebuild 5396 BLAKE2B c1fdc46069a53be15ba918d3e4ed8915610ac9d40f0d4cebba0c1f76df6fd2fbb1e3604bd7f1f4965a1dfff4d2744d188ba00604d745a3c4f4c800d895905f3d SHA512 b3cb370a53d9ea89327f6401777b68ece2ea5f6bf2aaffa67d745e53fef4d981636483553d04cb3bf63b1c53601765dfa7b71de372b6992bf2b0786755d565d0
-EBUILD glusterfs-8.4-r1.ebuild 5396 BLAKE2B c1fdc46069a53be15ba918d3e4ed8915610ac9d40f0d4cebba0c1f76df6fd2fbb1e3604bd7f1f4965a1dfff4d2744d188ba00604d745a3c4f4c800d895905f3d SHA512 b3cb370a53d9ea89327f6401777b68ece2ea5f6bf2aaffa67d745e53fef4d981636483553d04cb3bf63b1c53601765dfa7b71de372b6992bf2b0786755d565d0
-EBUILD glusterfs-8.5-r1.ebuild 5439 BLAKE2B 0460414bc4d2b072b4aa6204d194b8d8982fd590c76f26d64a68c3cd949b7f21ae643dfe7dec81753e6b50f1997f6896139c51bd4fcfb050bdfacd1dad95335e SHA512 0309259e9b55d0090262cbf231ae3c16713591355909f4f8b16f4e99e0256d93a9697bf1e41abf576898c39a17aa2952032cdd1235ae6dc7ab63c8572fa64996
-EBUILD glusterfs-9.1-r1.ebuild 5421 BLAKE2B 928f2dd64499dbe89becf8b78fb4d2e1f403aca8390c7b1e33b29c61350f4bcb7366078a8023990202f9dd2053429f12b10cd1e73486478b00a8b45e2d0239cd SHA512 b722622e81af6476112839003428c6204fc8347a1080a195cbbe20dfb5a78def2a1ddd1586c112417ae16610d3e6bb4bee0f0bed883f77e8a58b855cd37ec19c
-EBUILD glusterfs-9.2-r1.ebuild 5478 BLAKE2B 04855f5bc4b079c8e96c9678952a49e02f4b2ea074126289aca2bed5cf9db6e3ddba9697fe46eb9363570084d019231893fabe92fe0d8a2a06c7680b0c7b2414 SHA512 86c7540f00d02103ccc3ea5d8b20ad0a9136a3e2784ad7d6e8751bce5d1f47774d5748cf21ae8d18f9e3a051678225b0f8472d46d11ae1f6b5a126583f85b43c
+EBUILD glusterfs-7.9-r1.ebuild 5918 BLAKE2B 30a380db21aa976157cffa6da38443b5466ca014e6088915cc7b251671e0d218505938110a10caaab4f68d920920429fc768b7bd4fdc40fa43adbee5e430a1c4 SHA512 d04251b216950f23b5d4a7c95dc62f665da1af04073e9f5a647146411918d377e3152e90023daed81ad6f8e6358b3f43e9901943751ee6ab42baf6903267d1bd
+EBUILD glusterfs-8.3-r1.ebuild 5432 BLAKE2B 82e9ee097997352a86510a7ca3c8a7d450899a6ed96044f7e707fdaa952ad6a6c43fee6e4a557732f3f12dc2173146edbf4ae42d544494e8b659d6edf9146cd5 SHA512 ac49472d7d75eeecc7ee8f005a8d5f5be25eae6458888bb5b083c2e78bb764b31592f058907bdd44da148995900991e0fc0ab2923677c433959f9f2a3d427daf
+EBUILD glusterfs-8.4-r1.ebuild 5432 BLAKE2B 82e9ee097997352a86510a7ca3c8a7d450899a6ed96044f7e707fdaa952ad6a6c43fee6e4a557732f3f12dc2173146edbf4ae42d544494e8b659d6edf9146cd5 SHA512 ac49472d7d75eeecc7ee8f005a8d5f5be25eae6458888bb5b083c2e78bb764b31592f058907bdd44da148995900991e0fc0ab2923677c433959f9f2a3d427daf
+EBUILD glusterfs-8.5-r1.ebuild 5438 BLAKE2B 240fa1b843a881dbac772b8efd5a8fc2839f6daa9d25ca2bdb384f5744ad68a8c4fb6eee2745aa848a059c7f8033f6e34c86fa8bdbf21b14ca323e306d73a318 SHA512 9600b3bda87e097149924f702c386b5219d9b0ca5a23d2cae2ee9622d4645c3b90a929dda9f222a4f44474a349d6ca3697d3573c33266091c950b7d7343d07ae
+EBUILD glusterfs-9.1-r1.ebuild 5457 BLAKE2B e9f8b7201eacc9705295a498e0e136742b9cd414f4492e99609d26c3adfa1ea76b62856596a3c30c1349fd25afb19bd502d643ad5cb857b9fab8d6b6db8dbb04 SHA512 746d669c2f0cfb6d996a5128b3c604ab83c39f9a552b26c6e3a7131b564624d25623bb152248e22033046c236efb669c66236c0499f927fe4c098d4eeb14ad66
+EBUILD glusterfs-9.2-r1.ebuild 5458 BLAKE2B f44b0f014e5ae10f939ba1dec4815ca886ca4de737a69a45450089eb082c8d1d8eaf0ab70bcb0d741926c0daccb9faaf276c1e1a035da48d2a590a26707e7f41 SHA512 14ad8f4703bd2ee433a76f6b41e1740afcb7675ed16515845b092ce082619502b5b7305712a8c3531460f94310b4fa891aa22758f2d7b0182cd1b568ca9930bb
 MISC metadata.xml 1516 BLAKE2B dc32b16a9cc12174d5cf6a82f8d45920392d43545a4ed9be1c6a0ec3bc50b7c51a647b049c1b74971e95a4de949c9205ad168bfc8f074ca4c535d2999b917d3a SHA512 04542d21102f1722d8f82e498f38e91316932d96f0a05eec74180e4ad133b83fd26d58d3591d2906995072c184822d7ed16357d741b7de99a0c7ff7571da6a08
diff --git a/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild b/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild
index c06064e3dd84..8fe9cb9d3d7a 100644
--- a/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild
@@ -104,7 +104,7 @@ src_configure() {
 		$(use_enable xml xml-output) \
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
 		--localstatedir="${EPREFIX}"/var
 }
 
@@ -113,6 +113,10 @@ src_compile() {
 	use emacs && elisp-compile extras/glusterfs-mode.el
 }
 
+src_test() {
+	./run-tests.sh || die
+}
+
 src_install() {
 	default
 
@@ -171,11 +175,9 @@ src_install() {
 	python_optimize "${ED}"
 }
 
-src_test() {
-	./run-tests.sh || die
-}
-
 pkg_postinst() {
+	tmpfiles_process gluster.conf
+
 	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
 	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
 	elog "  /etc/init.d/glusterd start"
diff --git a/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild
index c6fc8ce35bc6..79808b9e3ff6 100644
--- a/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild
@@ -98,7 +98,7 @@ src_configure() {
 		$(use_enable xml xml-output) \
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
 		--localstatedir="${EPREFIX}"/var
 }
 
@@ -107,6 +107,10 @@ src_compile() {
 	use emacs && elisp-compile extras/glusterfs-mode.el
 }
 
+src_test() {
+	./run-tests.sh || die
+}
+
 src_install() {
 	default
 
@@ -158,11 +162,9 @@ src_install() {
 	python_optimize "${ED}"
 }
 
-src_test() {
-	./run-tests.sh || die
-}
-
 pkg_postinst() {
+	tmpfiles_process gluster.conf
+
 	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
 	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
 	elog "  /etc/init.d/glusterd start"
diff --git a/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild
index c6fc8ce35bc6..79808b9e3ff6 100644
--- a/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild
@@ -98,7 +98,7 @@ src_configure() {
 		$(use_enable xml xml-output) \
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
 		--localstatedir="${EPREFIX}"/var
 }
 
@@ -107,6 +107,10 @@ src_compile() {
 	use emacs && elisp-compile extras/glusterfs-mode.el
 }
 
+src_test() {
+	./run-tests.sh || die
+}
+
 src_install() {
 	default
 
@@ -158,11 +162,9 @@ src_install() {
 	python_optimize "${ED}"
 }
 
-src_test() {
-	./run-tests.sh || die
-}
-
 pkg_postinst() {
+	tmpfiles_process gluster.conf
+
 	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
 	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
 	elog "  /etc/init.d/glusterd start"
diff --git a/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild
index 147d96407341..18671f3fc19e 100644
--- a/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild
@@ -163,6 +163,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process gluster.conf
+
 	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
 	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
 	elog "  /etc/init.d/glusterd start"
@@ -184,9 +186,8 @@ pkg_postinst() {
 	elog "If you are upgrading from a previous version of ${PN}, please read:"
 	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
 
-	tmpfiles_process glusterfs.conf
-
 	use emacs && elisp-site-regen
+
 }
 
 pkg_postrm() {
diff --git a/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild b/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild
index 8f52fcdca644..4b3b440fa715 100644
--- a/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild
@@ -99,7 +99,7 @@ src_configure() {
 		$(use_enable xml xml-output) \
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
 		--localstatedir="${EPREFIX}"/var
 }
 
@@ -108,6 +108,10 @@ src_compile() {
 	use emacs && elisp-compile extras/glusterfs-mode.el
 }
 
+src_test() {
+	./run-tests.sh || die
+}
+
 src_install() {
 	default
 
@@ -159,11 +163,9 @@ src_install() {
 	python_optimize "${ED}"
 }
 
-src_test() {
-	./run-tests.sh || die
-}
-
 pkg_postinst() {
+	tmpfiles_process gluster.conf
+
 	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
 	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
 	elog "  /etc/init.d/glusterd start"
diff --git a/sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild b/sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild
index 153b9cf51ac0..8bc22e9cba26 100644
--- a/sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild
@@ -164,6 +164,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process gluster.conf
+
 	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
 	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
 	elog "  /etc/init.d/glusterd start"
@@ -185,8 +187,6 @@ pkg_postinst() {
 	elog "If you are upgrading from a previous version of ${PN}, please read:"
 	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
 
-	tmpfiles_process /usr/lib/tmpfiles.d/gluster.conf
-
 	use emacs && elisp-site-regen
 }
 
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 9867cbe7a1f1..afaa12c3cf1f 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -6,5 +6,5 @@ AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf4
 AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a
 AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8
 DIST slurm-20-11-0-1.tar.gz 8762691 BLAKE2B 1e24a04b3faf97f4df98bd982d67d47f79670b863f466326e45e00fac0b99124122e94e30054a97471e4337234cbd213806791bdd5b3bddfeb05bef55f42931e SHA512 9a57f2610f7294ba6cd265746b874e32a7930100f30c0adf41d95b261787c441bdcacaa641f0b9785150b94fc7d6b5b7608ec618f668bffcae6f774752f17678
-EBUILD slurm-20.11.0.1-r101.ebuild 7941 BLAKE2B dcc3c8eba8dd915a3f671e5cb09eb2b58bcd0db25109b556f777d2504212e031074b3c415299ec28998cd23c79e0f2b4f524157f67f484a7d91e886788718e99 SHA512 9d310a6bd13403b2abaab91b28a96b1b7ea214fa6623ace3ef5f2e51c1eb1511178230f860258344d4f3ee0a28b765e0edcdad073887e4567278d6a83f58601a
+EBUILD slurm-20.11.0.1-r101.ebuild 7971 BLAKE2B 1f43aeb7d45affe35d1c375069da2c162f1d2419ba8263737e882eaf60485b8ae64a6013e665f505ced1a01c60d3d7246a976e715a733e6292c6b82bfde86a65 SHA512 26baa23c5dc1c11b4f4fe4b48828fa78ca3cfe0ef51c13532126bad14a0be75cd83c6102816d881831d04c08202bb63b98b20ce38bc7fd56c151c0d8f719640c
 MISC metadata.xml 1091 BLAKE2B fcacf65a8cde25fa09e7ab996cf85987f39879808819f7e6ec56de3e6535ed66adcdba88e346afd947753fee93b6014353e5418cc61b0e2bff196fb8492841e6 SHA512 3f1364da6cb3d8af99c2c061ee9667a0432d2ed440562b0c1c69815e4bc191bd68bcdfc8a3ce2e358d8b4171d2c7262e2aebd63e7788a5164a2e28b627ffd988
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild
index f8a84798d701..f964ff1a8d43 100644
--- a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild
+++ b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild
@@ -250,6 +250,8 @@ pkg_postinst() {
 	done
 	echo
 
+	tmpfiles_process slurm.conf
+
 	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
 	elog "through a (javascript enabled) browser to create a configureation file."
 	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index efc3ddb563d9..46c92c120c13 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 5bdd4e72ad79..712ddf088348 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -8,6 +8,7 @@ AUX autoconf-2.69-make-tests-bash5-compatible.patch 2275 BLAKE2B 17fd9702c37cc76
 AUX autoconf-2.69-perl-5.26-2.patch 1003 BLAKE2B e2a858f905f20d46a52ac7d78be63ef0ea5ce0b87a7059ea17317bed3b658c0eafe3f9d8b1b11f4d84d3160bfa3f504e980870fe562d7a1ba6da1c70177e49bb SHA512 b02086ac8a468a626d8b6506aa14e19ef10e4d33b91a7647f74d5746cce9f690d6cf5840ea81c593f63e8f94275974f31c8695065844380678e83153c1b547d0
 AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143c011eff116a65dd06a126a9ab3b127ee766c618e0d51caf88821d979632e7949c843ebad1c5c9e87ad066aa4a46376 SHA512 0202c099b85102dab18ad7d4268b836cadf587d0a48aefa386e70539b3b689fd580053d7287730f1d0a9cc97d6eeb41c1579a181a82a5cb2e04e436bb96d0b20
 AUX autoconf-2.71-darwin.patch 525 BLAKE2B 641a98ccc5070ed46480c65c3966b7c047a48bc44930b0ca6039e492d383857140fa7da152eb60ad6bc51ad129cfbf66bd9863dea25672f985b38422a4ce3160 SHA512 92c528f416c6dbc413bd027c6684b8bf14b397164e13d5a2e754e23ac0803b09b20bf54ec89e495736b122eb6b519013c94b54d36fa7aff2715454a6321d0a05
+AUX autoconf-2.71-time.patch 1253 BLAKE2B 0f791c225bddb89dab42b3927e1993f260df90de3a80bf0360f573231abd2c99128fccbc88eec82e9a7a07b7c9b4aa2dd8a7db1832d4ac5dbada34b4b2c4a213 SHA512 e84f4d0a700653ba244c6169f516666b4ce3328c90a5461690f6109649504350b5823fd109cc2298ddf05e81fab3aceea955547b02c7472acb44dcc31ba79b70
 DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
 DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3
 DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e SHA512 55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da
@@ -16,6 +17,6 @@ DIST autoconf-2.71.tar.xz 1292296 BLAKE2B 7fd4b98b4cfff10720e8da6ee9104563799164
 EBUILD autoconf-2.13-r1.ebuild 1520 BLAKE2B 4b98ba08406846f4556eb46c223dd98e0ec034bd5a1246af248581542a3c9254d8b2fc879362095ad99c6bb842243ed582df27dc865c0b29d30482ec2e2aeee4 SHA512 1cdb6bca636c241af2a3dcc314929ac690bcef2ff12b5748ab335aacde795a25821dd4c4ed4053c3af10e48693c6c691d7b0904e67910e9462cd554ab9b4b024
 EBUILD autoconf-2.64-r1.ebuild 648 BLAKE2B 02c8390b16a7efe5900562658ec4797d21a8958f4eb40874104928b9eb256c3a50e0d1a7f5de24f2c71f6343c50149049f184f3d1d3ae2aea75444aeb4f42c50 SHA512 7d101553e2175ccdda97570402dad92ae6ae8224aa95549e035fea6fa15347e2ae3a2cf7f74a119e1c70bf7685bf3dfa46b394611b700f850268c8d99a3a88e0
 EBUILD autoconf-2.69-r5.ebuild 1820 BLAKE2B 3b103cb825ca98cb30cc358029a99f91121ed5dddd29a6ce1d4496c6be41cfa9c6175ad6ffda44e7dad54ae54db51df774ba68a4138210dc8d0d64f8b1bd5241 SHA512 eb60a3e852d5ed3722ad3d03405cba0eb9840d056af86039078426b687ef34522ea8b8090645a56502e4afd0095e1faa4305474901890b72bf6ec00aaeb38835
-EBUILD autoconf-2.71.ebuild 2065 BLAKE2B a575c43caa73b2745c6cc874f4492dc2202de31f5a51f4bdd848ecb70b0eefff89c204aa0669a37fa1382a2d3bf067a68b5f221fce6a7eb7ad49d480b75eb270 SHA512 b62bf55e60beed8910a712d7d85f0de00f27339e351c688dfc3df2a3bbb16e51b78b78354c4e15f0a60eebbac0bbd810b38a886a92381426bbe1e5653be024eb
-EBUILD autoconf-9999.ebuild 1386 BLAKE2B de6bb3a1c210e63b358e6db1fa72c77bd5067fe22e629ea76620d8c31657b8c29bd58cdb69b39f87c7445bcc0d0da77e93c5d35d33783cc31df9a4ddf14cad03 SHA512 5dc7271984bb48e29325dae31d193bdf838cef778d7d391145787c4b1e1a31a4720f8827bcef2acf8d4edbd8885ebf70392d3dfddb7a64e63d30dc7208565164
+EBUILD autoconf-2.71-r1.ebuild 2137 BLAKE2B a92aa4c33668822f841db49f9fa3678c13713f8f59cb22019835da9c31745371cdc1d07296b9347ab048c8a289c5cf751f620f90ec2472a8d8f990badfbb930b SHA512 95217c68cac5cc5d80fc18c8ea79f4651ef0452b61438471ac92b2208a1f58a9489cd31ee5b9ae71bf5ba127da76794981b74e5287f76a814fa73075e3cbd195
+EBUILD autoconf-9999.ebuild 1415 BLAKE2B 58fd01a12db47c27edd002fdd2a93b6cf962d60827b83d60faeb1081871af4eb7007427a9fb51e6416f7f293364db616dda8cf5a08083faece80c89f385c2291 SHA512 bf49a37cb2a48296029564503f4faf665de99c256bf9149fbc1f6c4678d6aef56037fe425e8c123fe2deaf4eb40c682ccbab5e9178fb5188cba059cb0ba50fa3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.71-r1.ebuild b/sys-devel/autoconf/autoconf-2.71-r1.ebuild
new file mode 100644
index 000000000000..f07c731cd372
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.71-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
+	inherit git-r3
+else
+	# For _beta handling replace with real version number
+	MY_PV="${PV}"
+	MY_P="${PN}-${MY_PV}"
+	#PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz
+		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz"
+	#SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz"
+	[[ "${PV}" == *_beta* ]] || \
+	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"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-3"
+SLOT="${PV/_*}"
+IUSE="emacs"
+
+BDEPEND=">=sys-devel/m4-1.4.16
+	>=dev-lang/perl-5.6"
+RDEPEND="${BDEPEND}
+	>=sys-devel/autoconf-wrapper-15
+	sys-devel/gnuconfig
+	!~sys-devel/${P}:2.5"
+[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+PATCHES=( "${FILESDIR}/${P}-time.patch" )
+
+src_prepare() {
+	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch )
+	fi
+
+	# Save timestamp to avoid later makeinfo call
+	touch -r doc/{,old_}autoconf.texi || die
+
+	local pdir
+	for pdir in "${WORKDIR}"/{upstream_,}patches ; do
+		if [[ -d "${pdir}" ]] ; then
+			eapply ${pdir}
+		fi
+	done
+
+	toolchain-autoconf_src_prepare
+
+	# Restore timestamp to avoid makeinfo call
+	# We already have an up to date autoconf.info page at this point.
+	touch -r doc/{old_,}autoconf.texi || die
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	toolchain-autoconf_src_install
+
+	local f
+	for f in config.{guess,sub} ; do
+		ln -fs ../../gnuconfig/${f} \
+			"${ED}"/usr/share/autoconf-*/build-aux/${f} || die
+	done
+}
diff --git a/sys-devel/autoconf/autoconf-2.71.ebuild b/sys-devel/autoconf/autoconf-2.71.ebuild
deleted file mode 100644
index 86e89e450868..000000000000
--- a/sys-devel/autoconf/autoconf-2.71.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
-	inherit git-r3
-else
-	# For _beta handling replace with real version number
-	MY_PV="${PV}"
-	MY_P="${PN}-${MY_PV}"
-	#PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz
-		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz"
-	#SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz"
-	[[ "${PV}" == *_beta* ]] || \
-	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"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-inherit toolchain-autoconf
-
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-
-LICENSE="GPL-3"
-SLOT="${PV/_*}"
-IUSE="emacs"
-
-BDEPEND=">=sys-devel/m4-1.4.16
-	>=dev-lang/perl-5.6"
-RDEPEND="${BDEPEND}
-	>=sys-devel/autoconf-wrapper-15
-	sys-devel/gnuconfig
-	!~sys-devel/${P}:2.5"
-[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
-PDEPEND="emacs? ( app-emacs/autoconf-mode )"
-
-src_prepare() {
-	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch )
-	fi
-
-	# Save timestamp to avoid later makeinfo call
-	touch -r doc/{,old_}autoconf.texi || die
-
-	local pdir
-	for pdir in "${WORKDIR}"/{upstream_,}patches ; do
-		if [[ -d "${pdir}" ]] ; then
-			eapply ${pdir}
-		fi
-	done
-
-	toolchain-autoconf_src_prepare
-
-	# Restore timestamp to avoid makeinfo call
-	# We already have an up to date autoconf.info page at this point.
-	touch -r doc/{old_,}autoconf.texi || die
-}
-
-src_install() {
-	toolchain-autoconf_src_install
-
-	local f
-	for f in config.{guess,sub} ; do
-		ln -fs ../../gnuconfig/${f} \
-			"${ED}"/usr/share/autoconf-*/build-aux/${f} || die
-	done
-}
diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild
index f3b786e014a7..cb3d17704c68 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,10 @@ src_prepare() {
 	toolchain-autoconf_src_prepare
 }
 
+src_test() {
+	emake check
+}
+
 src_install() {
 	default
 
diff --git a/sys-devel/autoconf/files/autoconf-2.71-time.patch b/sys-devel/autoconf/files/autoconf-2.71-time.patch
new file mode 100644
index 000000000000..8ecfe10f40a3
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.71-time.patch
@@ -0,0 +1,49 @@
+From e194b3c7e00429612a9d40e78ea571687fd25b91 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sun, 1 Aug 2021 19:07:48 +0200
+Subject: [PATCH] Use stat from Time::HiRes (instead of File::stat)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ lib/Autom4te/FileUtils.pm | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm
+index a182031b..27a5fd91 100644
+--- a/lib/Autom4te/FileUtils.pm
++++ b/lib/Autom4te/FileUtils.pm
+@@ -34,12 +34,12 @@ This perl module provides various general purpose file handling functions.
+ 
+ =cut
+ 
+-use 5.006;
++use 5.008;
+ use strict;
+ use warnings FATAL => 'all';
+ 
+ use Exporter;
+-use File::stat;
++use Time::HiRes qw(stat);
+ use IO::File;
+ 
+ use Autom4te::Channels;
+@@ -115,10 +115,11 @@ sub mtime ($)
+   return 0
+     if $file eq '-' || ! -f $file;
+ 
+-  my $stat = stat ($file)
++  my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
++    $atime,$mtime,$ctime,$blksize,$blocks) = stat ($file)
+     or fatal "cannot stat $file: $!";
+ 
+-  return $stat->mtime;
++  return $mtime;
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index 9b08131f3fed..4dc35c4221e7 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -1,12 +1,12 @@
 DIST binutils-2.35.2-patches-1.tar.xz 11836 BLAKE2B 0141349c9618992d1ab1e0309f7ed8fbc43b60a58be1dfed05eae8a8fee857241d9e112ae673da6fc9778767675f536ece818cb85567367bb1c8f87a0693623f SHA512 35de5f227c745c5fb800784fe657b2a6216faf43e2498e8481e7b0dc79b0d2f86b3b6a10b896e060319a77a51c61d2e1b7a951ae962b3a6ef8c1a2a261d9bb6c
 DIST binutils-2.35.2.tar.xz 22056908 BLAKE2B 9c392e0db2b482442f9476f30bd80cf2796321cbf7be79cf21af7bef167b6074c4ae009dcf9b438d2f2f4a23381c935176b2cfa85de1a526ab46e0fd844a7ca5 SHA512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348
 DIST binutils-2.36.1-patches-3.tar.xz 32720 BLAKE2B 2a5a60168ec5ff612e7e58530092f306460cdb4a963320978dffcc22d73684486a14a5981f6eab2f7fc270def22cdc9954de455d680b2de4befc1ad4916347ba SHA512 e429cc82451675f14715d4e7640fe7b995495c8759a8e919c4291f8ca8358a663012f05c1ec6e60b1261114848379fefc9df723929770462dd676fa04fc7aa54
-DIST binutils-2.36.1-patches-4.tar.xz 43508 BLAKE2B 116cefcbf4641f1ab649bb0345b80a23c29d1d3340d16f87068a1cffb911e4633f3e6da235534cd79c601cb4168bc78f9b7115185a49cdec78b6e7de7856b344 SHA512 3de95f1bb3787eeb7e942e2a9cf4a2bf967c5758158c3daf76b81a62ccefe5569b0a300cdc02e2e702c61a0cfc63d4209a7d306179cdddc3bc544d21b744eb82
+DIST binutils-2.36.1-patches-5.tar.xz 44388 BLAKE2B 1dadb012fe35ec5fb0c5a15d348ab535bc5e3765375c97a3768c6b9f7126e0fda15d35163c9f9c33a4be98662dd120d7c1b21930a20c18dbb5345f56ecd9ecc1 SHA512 a2ce3388f1f1a77ff865481ff4b625121fd55f5234fed0a885312744f2f9c504717de1499b68252c6de64fa45866db7692df91c5838b43fbeb178938811cbe84
 DIST binutils-2.36.1.tar.xz 22772248 BLAKE2B 03fbfbedd6dba2beaa836b1ed254eddd7a54a163d3061fd93edd2b9591cae24ba049b26658c524b5ccecc2f22d431dfa168218d2531aa356945c994fbbe896fa SHA512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9
 DIST binutils-2.37-patches-2.tar.xz 79304 BLAKE2B bdcbe29efba3582f2d1be9057a39aedb655cbc225abe8ea656c1bcf090a53930c74197505c8de2dcfd9a105f1b1cc8fa84a0d532547221d2df34a77b06e7fa15 SHA512 5cea876cfbdcd1409f5ef8ee138a8c29ad5b3d38b5d72ce312f2eb94fb8b2165e9a10018c46bdc36bc59ade2e2764e5da4ac653d15690bfc0bc9784202cc0164
 DIST binutils-2.37.tar.xz 22916924 BLAKE2B f5a374fdf0300f7734d1e462333296b16c9d5ed6eba167e1742a4da7082f4388c929e286bf76c3933b3e434937380340732a31790723654b491ea0c8ab5b9ba5 SHA512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7
 EBUILD binutils-hppa64-2.35.2.ebuild 12393 BLAKE2B 7c6521094cd088a4d9ddab7391c2994e9506a53083a269d1fcee519f5ad8ded88e53d6957656ba5287643c17a87ae7c584e49771aa635d573f40ff3c060c153d SHA512 5855d3967d920f93ed177626a9eb64348e951341751d42b3d67b98dacedea9b250473a5e3baee3d08510a8a3d2f8340ba775ee71207df125d1490b4a23dea281
 EBUILD binutils-hppa64-2.36.1-r1.ebuild 12394 BLAKE2B 50ccc0adbf2573870d042e29ca46585bfc8d5adfb19cb151989434f6d420a8cc02ef5eb45697af83472e74c8516ae2538eaf70cc3489d0f6f12bba462411b542 SHA512 1a23658a100282335ad60958c3f55f6b9d18676e99f69afe441721721fd60b3fad8116d155cd77aac9bccf0aef4b600350aa23bba81288925116ee60e4d14cd6
-EBUILD binutils-hppa64-2.36.1-r2.ebuild 12394 BLAKE2B a373520927be4fe8b4e2215f3ea1ee95faa8de4b0599f9d83f17a3fb21eb86c5d5430afbc3783cf9115a4d415d8d19946f071d5c2d9665f647fa2f4e8a8dc64c SHA512 f45a98431b34eeac5e28e8192ff030a41d17394f2d01a25e07388f7355e5a0b4fb286d410478a8a2c1a995d8eeae3a1b5ec564cb49f1939f95781598acf1f6d4
+EBUILD binutils-hppa64-2.36.1-r2.ebuild 12394 BLAKE2B de0c3d4769e6f059de888475b266b0bdf26b27ae05d5f2441548051ef360f7e5ca0a06776507f771772e022c183a7eeed9eeaf8a1e9ff92ef947b3568f907a5d SHA512 8decd31c9b4aeacef4e369692c6e5dd7a6bf5a9223f11ce828742cfdcc229d3e6502187bb28d70814ee0e6b273d415c11b017338daa13b3da0ec3f34fce67bf0
 EBUILD binutils-hppa64-2.37.ebuild 12395 BLAKE2B edc7271d3c2b1785b6469d029e2bd9fd7fbdd6072eab5a9815d87643f74ec9fda7c8df1abf09a208826e5968a0f5c2d1a3f7b8e357ac2d1f72d0d7aac2e820c9 SHA512 52d33540efc4541d321ab4e50b2cba7fe0d33812987490f71c97e1560004c635a8c3a75f0498400759baa6b21374140236b2838d61361c0d19a5702025124d48
 MISC metadata.xml 767 BLAKE2B 1b1533f4fce4b4ea9e2bebbe19c55d55d226120dd255fa421b46971ac554696209fa9df92e40279561876895392827415ee77f7502fec5b0ac684a60f0697de6 SHA512 3aa7ebfd1f6efc14d1d6b19406e08c100854c1e1b933cd8682e90825e8fcb71ec3086e2772422931fe88797c1b54d02422e0700488637f6bd594bf6d1d6181a9
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.36.1-r2.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.36.1-r2.ebuild
index 10fc4993e5cb..9f5a705c45a7 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.36.1-r2.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.36.1-r2.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="default-gold? ( gold )"
 # PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
 #                      for the patchsets
 
-PATCH_VER=4
+PATCH_VER=5
 PATCH_DEV=dilfridge
 
 case ${PV} in
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 55d04d701605..0e597c239de3 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -13,7 +13,7 @@ DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fc
 DIST binutils-2.35.2-patches-1.tar.xz 11836 BLAKE2B 0141349c9618992d1ab1e0309f7ed8fbc43b60a58be1dfed05eae8a8fee857241d9e112ae673da6fc9778767675f536ece818cb85567367bb1c8f87a0693623f SHA512 35de5f227c745c5fb800784fe657b2a6216faf43e2498e8481e7b0dc79b0d2f86b3b6a10b896e060319a77a51c61d2e1b7a951ae962b3a6ef8c1a2a261d9bb6c
 DIST binutils-2.35.2.tar.xz 22056908 BLAKE2B 9c392e0db2b482442f9476f30bd80cf2796321cbf7be79cf21af7bef167b6074c4ae009dcf9b438d2f2f4a23381c935176b2cfa85de1a526ab46e0fd844a7ca5 SHA512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348
 DIST binutils-2.36.1-patches-3.tar.xz 32720 BLAKE2B 2a5a60168ec5ff612e7e58530092f306460cdb4a963320978dffcc22d73684486a14a5981f6eab2f7fc270def22cdc9954de455d680b2de4befc1ad4916347ba SHA512 e429cc82451675f14715d4e7640fe7b995495c8759a8e919c4291f8ca8358a663012f05c1ec6e60b1261114848379fefc9df723929770462dd676fa04fc7aa54
-DIST binutils-2.36.1-patches-4.tar.xz 43508 BLAKE2B 116cefcbf4641f1ab649bb0345b80a23c29d1d3340d16f87068a1cffb911e4633f3e6da235534cd79c601cb4168bc78f9b7115185a49cdec78b6e7de7856b344 SHA512 3de95f1bb3787eeb7e942e2a9cf4a2bf967c5758158c3daf76b81a62ccefe5569b0a300cdc02e2e702c61a0cfc63d4209a7d306179cdddc3bc544d21b744eb82
+DIST binutils-2.36.1-patches-5.tar.xz 44388 BLAKE2B 1dadb012fe35ec5fb0c5a15d348ab535bc5e3765375c97a3768c6b9f7126e0fda15d35163c9f9c33a4be98662dd120d7c1b21930a20c18dbb5345f56ecd9ecc1 SHA512 a2ce3388f1f1a77ff865481ff4b625121fd55f5234fed0a885312744f2f9c504717de1499b68252c6de64fa45866db7692df91c5838b43fbeb178938811cbe84
 DIST binutils-2.36.1.tar.xz 22772248 BLAKE2B 03fbfbedd6dba2beaa836b1ed254eddd7a54a163d3061fd93edd2b9591cae24ba049b26658c524b5ccecc2f22d431dfa168218d2531aa356945c994fbbe896fa SHA512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9
 DIST binutils-2.37-patches-2.tar.xz 79304 BLAKE2B bdcbe29efba3582f2d1be9057a39aedb655cbc225abe8ea656c1bcf090a53930c74197505c8de2dcfd9a105f1b1cc8fa84a0d532547221d2df34a77b06e7fa15 SHA512 5cea876cfbdcd1409f5ef8ee138a8c29ad5b3d38b5d72ce312f2eb94fb8b2165e9a10018c46bdc36bc59ade2e2764e5da4ac653d15690bfc0bc9784202cc0164
 DIST binutils-2.37.tar.xz 22916924 BLAKE2B f5a374fdf0300f7734d1e462333296b16c9d5ed6eba167e1742a4da7082f4388c929e286bf76c3933b3e434937380340732a31790723654b491ea0c8ab5b9ba5 SHA512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7
@@ -22,7 +22,7 @@ EBUILD binutils-2.33.1-r1.ebuild 11909 BLAKE2B 7401764d65bb05f67b9892bbd6e1b66eb
 EBUILD binutils-2.34-r2.ebuild 12005 BLAKE2B 8455ac022e79d7099fa863cd969cff17aa6ff3e3a260120da75b2564bc8eaae3287b3f1242df8daa68f95bb47b491502552f67bb84d91ad9c11684663a4b86eb SHA512 36f794faedf862a43ae5e3895100506c18b12be46ba9e152d694be932a9f9f754539c4faaa9a72ffdcd2410b5555e97af22c1947233a26548242d8e5de37f152
 EBUILD binutils-2.35.2.ebuild 12886 BLAKE2B f917e60ca6585449a67d14de97f653617f0ae86a9fc7f5442443314ca25d4dae6b05338b7d76455a2b64ca5077a57837699417f56752a53678f21b2dc8174cf0 SHA512 963629da28ae4bc0ec436341269f03f2eaa7bf40d2ffa7d7c9a1ee4ac2c29ee8a8ded88cd3263b9155be7d66b6267f941dede3aa0246eb5540831a543b780db1
 EBUILD binutils-2.36.1-r1.ebuild 12795 BLAKE2B b9134c029636f8129dff88479cc7a98d49b35d97f07e06299ba1b72b85d4ca9a70a9e3976838b1f826f47361851baa41070a4ae8a3c3fa036509ef4431a9af7f SHA512 284fdf19b3d84f530f5dd6d83cf98a2360b2d5c196f1d2018887c2b1f85eaf09f3535cee487ba92b6e63fd374dcc2f7ed30c3a024208ec045ca27717e983e65e
-EBUILD binutils-2.36.1-r2.ebuild 12795 BLAKE2B 887187a5a36002ffd842f9d8950f0480636ccfced4eec1190e4cf71a372742344fcc17d5d305b73df4472a2ddf60b329536dc726f906b8ebca8bd8b8f1ddeaab SHA512 7dcd91b19d3eef6a8c8c9f13aa555744a8084ccc97239309699cd39d8baa94bf1828e579de4453b100560ddc291ee1c8a8e8448e8fa83beed09accd651212391
+EBUILD binutils-2.36.1-r2.ebuild 12795 BLAKE2B 2454e1290a3bfba37be7c3a570401d0837af9cf810245bb77d7e2e2bb248662460b191483e5ab345a750deb35b7fbfb605cba7f1f19b4c554dd36682dd30a635 SHA512 da6c66f0f21090bb0d2e69d1980de4663b22efe1339b1101be839bfd5682f661981a32781eaf0b89516bbd4343dc3c3b22c2218522d00784a814307f3b688528
 EBUILD binutils-2.37.ebuild 12811 BLAKE2B 78222700fc4ae8a77c06292cafeae8610e294cea4ee76254b202f485b3c4dc57a2ac7648bc44c36e7141bfecbf06392736742f4d367c7adafbf89fbc6554a895 SHA512 dd6f034211d255ed2d5231e7467c64d69823883073ddfaadf1c96f3139d8a0cb5beffb56cbe43b47f309eb3b2503173a5e23b39783ed519c20e5e17c78b8ece9
 EBUILD binutils-9999.ebuild 12811 BLAKE2B e2e34afd60867af801e379645a92ccee1375cac16b9844792c8642c24d39a4449df9791ac404ac4d8ea3a7f054f64f475bafc6e6fdf32245fd24c953a15433a9 SHA512 4493d0ee24f5bc06184c8febd5418f415fa9c1b256f85a4c37e34b83d1dfc10cb45fce2a75371bbb7aa8253d52701cb48f5414d0f203d45a114e66d617a1c23c
 MISC metadata.xml 726 BLAKE2B 152b58d7d48d653882735395f6cb40b3634b0480c1f9c7ac2bf2055e7f821962c4ee8d7de85f418258a713c1b17fc991cbcfcbe127b91ca2058ef7a71b5b6d17 SHA512 dfb3c44075c587ba6ce24ad280c387d4383b440077c5fa0fb4df1a715e4fdcde3898da866a30df862f8b1975939643f873fddc92fc575f254976d87fc53adbfd
diff --git a/sys-devel/binutils/binutils-2.36.1-r2.ebuild b/sys-devel/binutils/binutils-2.36.1-r2.ebuild
index aa618899414c..76bc10bd799e 100644
--- a/sys-devel/binutils/binutils-2.36.1-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.36.1-r2.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="default-gold? ( gold )"
 # PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
 #                      for the patchsets
 
-PATCH_VER=4
+PATCH_VER=5
 PATCH_DEV=dilfridge
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 1a425aaa317f..f060b4c12303 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,8 +1,8 @@
 AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359ecb0e5b5c746447b9a0e9d2dff188f6f0d45225dd07d1226a86297f0c9ba8b8be7587039f2cc7ceaab4bde61f570 SHA512 3d855d54b64e2871ad8ccd494939c92a6bca2bec61f186e907a9b6b8b4f51b4ff63fcacbb8b6d44cef33a39c6ba2bed6c1fdd30d7ad65ad03d1d659781c420fe
 AUX bmake-20210314-mk-fixes.patch 2054 BLAKE2B 404e99593f04408e3f62d8c6118fc1676ef414b4cc18f5ec8b089182fad8865ad79e40c236e58b084f3194bdcc94c92e1e10e40efbddc142b84053117065e202 SHA512 8c9e823dd158e352021f0905e2a15cb8d7da3020c49a8f824cc5dbd8f33910fc64629d5f400fd8651a16b07e0685a1247a661fd9230a62b7330bd5fc71427dd4
 DIST bmake-20210420.tar.gz 755281 BLAKE2B fe98dc5d0c5a11aecf45b160cfe5b69ef49e56a973823e84ec1f607023aa94d66cd87bc3f31fc340dc86eae0a6e87ca2a71b8367f3e9bb1a9eae8626d13a80ea SHA512 3bb603965c149e4f6bee4afff9710921e943bd1faaf5d142418a5f7a0752416e094b6a0f0dfc998bf6bedc391f668162856a51167e34b6f2ad2a0a498c96ed35
-DIST bmake-20210621.tar.gz 758062 BLAKE2B ba2dd62c752e649a4bb939dbbb948b13f9f5494c047e20149fe3ef94601a84044a70120e717af4d6ac76b4c7fcb57c4f742a12923fe945cc7a675295a4d4e1f9 SHA512 75419782f097204e74cef1028ad96ac92e93de5f89844923f7a559de18555e815653fef150ccd2d63376cc697c849cedd28b4d066077aeb52daf8e2d0fcbfddf
+DIST bmake-20210704.tar.gz 759047 BLAKE2B 4c21941c45c826e1758c64bc60532cff3b9a727cc18658b019ce55382aad8c668a5ef9039df695629f81a334969f1a5aaf08d5924aa20576474a528fe8dbcb15 SHA512 b21d89753b659a70d6f5d70aa41cc2b5f5ded5a5a4a227064c938db42282d7684df9389fa1db532c2e0de11d5be1e66698388f1e1e6966153ec56330af688674
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
 EBUILD bmake-20210420.ebuild 1265 BLAKE2B 085219c02d197e22d6afad2f68cc030cf25bb0d846cffa21a931f1f123a8319c858fc4fe1f3def677cf75684efc891d0e2394a79f675723ef78413b52cae2b44 SHA512 d900abeb3ca40e87e6fa2daeb270e7a4641c68f2be0dfd78c15d6b649401cdd7b7f473c368bc48167654af86b5c3db1c2c17ef35f235e8a491ee4d283a6b3aea
-EBUILD bmake-20210621.ebuild 1266 BLAKE2B a5942f2e09caac94b265833f06d341cf4c15856cd81dcb44e606250ffbd13b8ed541ccc11a953fdf5762da59c151667a5755fa2436415d6bc09e2498b89c63ca SHA512 e2afff68379224b51a8274901f00a18e7f230d95ee63488d936ddaa1f419331f16f7f379266d27f6408f4b1bd743d867ddf5706653ea196bbe76ac9fe5dbfd10
+EBUILD bmake-20210704.ebuild 1266 BLAKE2B a5942f2e09caac94b265833f06d341cf4c15856cd81dcb44e606250ffbd13b8ed541ccc11a953fdf5762da59c151667a5755fa2436415d6bc09e2498b89c63ca SHA512 e2afff68379224b51a8274901f00a18e7f230d95ee63488d936ddaa1f419331f16f7f379266d27f6408f4b1bd743d867ddf5706653ea196bbe76ac9fe5dbfd10
 MISC metadata.xml 356 BLAKE2B c8acffcd095f37e19987d6d116df6654453aab320818262c98e1ccec0871084adb919e408599eb6b4460544c2ec8660abe1e0add7a858d41dc48492f78d1c53d SHA512 c63247454ecc0add57dc73ae2e16421dab39ad199d592c459366b567f3ef3f63c706cb66ac3bdadfafe8a995216e35dc3f90f22ad45a7c078b302b48116f4645
diff --git a/sys-devel/bmake/bmake-20210621.ebuild b/sys-devel/bmake/bmake-20210704.ebuild
index 5d5f15630855..5d5f15630855 100644
--- a/sys-devel/bmake/bmake-20210621.ebuild
+++ b/sys-devel/bmake/bmake-20210704.ebuild
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 1c56aae4ac46..f109b52347f7 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -7,4 +7,5 @@ EBUILD clang-common-11.1.0.ebuild 581 BLAKE2B 3e7e2e6c0b0a7f177aaf610a7be4bebb6e
 EBUILD clang-common-12.0.0.ebuild 594 BLAKE2B 24422b771d72ca53dec018f281f05701f0b39a60e81168f60dbe36545e520f1e974eaa3b2d65d513fd5207f01acd63a90777b50509953ba2d21e38d8c4d025dc SHA512 07ded270729f30ec981a54b729f451c8c2dcc3d94ea60cd37556f54a8f4e78e9aa0daf3c377dda7de8d8d9c1277e0c33c5576e89f6a239750b87d52139578f2b
 EBUILD clang-common-12.0.1.ebuild 598 BLAKE2B 4bcaeaa6c64e882067cef81c495839c752b54864284183f0383be63dc07ebaef1758b1e870486c2c09b8f42d0ffabba7988750c60a0eb4d83e42ac3a934239fc SHA512 d0fb7add5034bc118c6246d0b01954e07c8e401571ba9fa3a9f11140cfa1606a3b1f48f788e4c8bb4da1fa5a7bbc591e21a4363d3179e194d80b5b7e2da0bda8
 EBUILD clang-common-13.0.0.9999.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
+EBUILD clang-common-14.0.0.9999.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-14.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..03e4441b91b9
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-14.0.0.9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+PDEPEND="sys-devel/clang:*"
+
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+S=${WORKDIR}/clang/utils
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index ec751e5b0cc4..9abb55bbcac4 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -3,4 +3,5 @@ EBUILD clang-runtime-11.1.0.ebuild 692 BLAKE2B 5703e482af3e2983d4c7a5c6345fb33d2
 EBUILD clang-runtime-12.0.0.ebuild 705 BLAKE2B e78f47523b471645662518919b515067f25a69a339739ebfb96a31e19422f325ff38dcbc8b8ad591d11eeb3c4b5b0b73ea7ab9c423a9e6b2f8e35cf588a5c006 SHA512 e7c3f2420c794916c8367e874c01db1e1e297852ca8682da333d54b3424bf32870d3fe8f4936e25e3537c075a8fa429522fd173fbcf75fa5f1e59b69db4bb98a
 EBUILD clang-runtime-12.0.1.ebuild 709 BLAKE2B 5b533ae47cfa4c8c5dfa8b0a9383c5d39cf8bd43d5ea3424fef3dfab89e18199c01e9263f94b354985be82cf3268a0b7accc09d6237d3cbbbc3e7f81e0099807 SHA512 28ff3e688a68b5070de307fb5a7a040488b1e1e8464ab440e2186b2ab20dcef4ade742180b74db91909ed79f66a511da4eb2012af0f1575ce0d6dc7b13f2c8c6
 EBUILD clang-runtime-13.0.0.9999.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
+EBUILD clang-runtime-14.0.0.9999.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
 MISC metadata.xml 578 BLAKE2B d58a4d1a7bf88a0d5640a02f3acb7e491f275b3bb66a8583aa057b8daae93bb1dbb80f6150bc326228c6ab8c8f8498b46bf72a3fb5e97d0eeea2fb39f87660e3 SHA512 822f56b33d991088ad5e51c3dd96e2e36f544b68c57e45ed8365835d1ef6d0eb797f9de1f8f33b59fbbaf085e245079ca767d5e8b773261cf9ad2c5629b7b16a
diff --git a/sys-devel/clang-runtime/clang-runtime-14.0.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..218cdb1426f6
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-14.0.0.9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+PROPERTIES="live"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}
+		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 5b8ea31b3bbe..d1f1f1efd299 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -6,7 +6,7 @@ DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf0
 DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b
 DIST llvm-gentoo-patchset-12.0.0-1.tar.xz 6364 BLAKE2B bcf96dad8300cdc3e1f416cb90935ae3b1359efc5687118b5a9bbee25de7087a266250f50c6f2abd18f4efeeec19354f59513c8fdd1d61c2cfc8cc2f0115e514 SHA512 76201e169f71a8d568365ffeafcfd37138e74b0536826f47eb6ce89c2280586f10426917e851f99bfb20477cd828cc40daa8cb7a62959981620fbd81e1b22ee1
 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
-DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
+DIST llvm-gentoo-patchset-9999-2.tar.xz 4064 BLAKE2B 4b29234f10ea4ab2609e83c71bcd5f968cd93abd275c13366146ca899bbc576d55a3364432cc7db353739f5da5762529436689b848857e839e230425d551265b SHA512 c0d40a81bd11dc6018d7b3789e4ca7e1cd784992d44fab8d750b8b5281db39ad9092d320d125cae93164d2dddc42177a173b6d5e4158e4b62d7507db877acb9e
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
@@ -15,5 +15,6 @@ EBUILD clang-10.0.1.ebuild 11494 BLAKE2B 0e3a04d4d8f6db728703cac19b8bc0a07e3e964
 EBUILD clang-11.1.0.ebuild 11852 BLAKE2B f2c36f5206bc0995a921a583beb85ba6430ba74ff62409f238b36dadcd20b3092abdbd1f4143a6a1a6de1f6b82a24cbaff481ea0483e30240e4d8788c8294a07 SHA512 3833b2597f3cf7d6887e151a95e6e81bab8b8c4f964ab08e4ea2bedd4a7b22e7efc12ce2ba15ba02c6dd6997801a81a9b905f2bbedc1611d8e78bde05c192278
 EBUILD clang-12.0.0-r1.ebuild 12007 BLAKE2B 105fee23696a755fead0b4c261da12c87648ccdb5b499078e6821e17b48d8a2148a805457dbcc100888d9df0f32aeed1c4b9277023252766d8aa1f98af95d098 SHA512 22b1cedea4b139b4d4cb942631dee99fe0f0c7fb242e3e46ac857cf396fc49cb50006e9ac3f42fa85aa16bf75cd07f60592e1e6c7b05ff585be6ee10c2e05241
 EBUILD clang-12.0.1.ebuild 12010 BLAKE2B c46af2a8dce955060b2c5aa66f297ba7195cf0bda95bc3c01e316818a5de9a0e6624415b8baa1c4416d80cf90309b1a53fc2bd76db18a1ff83ea839f8221014f SHA512 0f858f6d9ebe68273795b046fa28837fbc7b26ec0d618ad98ba7991176a28b3df0fe6b090100784e79ae4cb86ff50ff40a9d15fa93e6e7185ca7cc64ffdd5518
-EBUILD clang-13.0.0.9999.ebuild 11935 BLAKE2B 257fd172b37adf7e502df136fc92945122d49244709b3fbe12e1e20c900c2b0e6df46c4af1dd335d4d0990edc9cf474f78bbf88562f652343f9e8e44e82de20a SHA512 390660d2f879e7ee2690db0fe66162d3ecd57ddc4db2fdbfb9fde9a6480c1d0daf19c558a99c5026bd3c0e82f6500b627931e6948f5d0f955592c001ced73b65
+EBUILD clang-13.0.0.9999.ebuild 11952 BLAKE2B dd5024b469679b5ec459101bc2dea65fb2f888d15c494cce41491604973946e4370a661c4783269fb3952e838bfd9cf55981baa3d986d3df88ed225b68899126 SHA512 b434043d9b98baf06ab7a1b07916fabcadaeafee68abdc16e515fb0c015fa78c7e660e5864896e6cce740107882ec361cc4ec62a5b95afee1d6fbe5d7b9e8915
+EBUILD clang-14.0.0.9999.ebuild 11952 BLAKE2B dd5024b469679b5ec459101bc2dea65fb2f888d15c494cce41491604973946e4370a661c4783269fb3952e838bfd9cf55981baa3d986d3df88ed225b68899126 SHA512 b434043d9b98baf06ab7a1b07916fabcadaeafee68abdc16e515fb0c015fa78c7e660e5864896e6cce740107882ec361cc4ec62a5b95afee1d6fbe5d7b9e8915
 MISC metadata.xml 1336 BLAKE2B aaddc1c1193323466a545df21dfa53b637c3edff4f61cd55037d8327273457cf8d35cad7b92a2eef31acfb055a3e1ed93cb53a913b01eddf43b7b3dc6de880c4 SHA512 0538198df449cdf4d0cd00cb50d7c6883b06524419a29c4376cdcaed440fb84cfbd4983a1a025ae9a6e2fc5d91a4870bfcde587c493d8b617baec2214705601c
diff --git a/sys-devel/clang/clang-13.0.0.9999.ebuild b/sys-devel/clang/clang-13.0.0.9999.ebuild
index e90eadf1e627..d5bd5c8e6ea9 100644
--- a/sys-devel/clang/clang-13.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-13.0.0.9999.ebuild
@@ -67,7 +67,7 @@ LLVM_TEST_COMPONENTS=(
 	llvm/utils/{lit,llvm-lit,unittest}
 	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
 )
-LLVM_PATCHSET=9999-1
+LLVM_PATCHSET=9999-2
 llvm.org_set_globals
 
 # Multilib notes:
@@ -225,6 +225,7 @@ get_distribution_components() {
 			clang-check
 			clang-extdef-mapping
 			scan-build
+			scan-build-py
 			scan-view
 		)
 	fi
diff --git a/sys-devel/clang/clang-14.0.0.9999.ebuild b/sys-devel/clang/clang-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..d5bd5c8e6ea9
--- /dev/null
+++ b/sys-devel/clang/clang-14.0.0.9999.ebuild
@@ -0,0 +1,441 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org multilib-minimal pax-utils \
+	prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx default-lld
+	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	doc? ( dev-python/sphinx )
+	xml? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	!<sys-devel/llvm-4.0.0_rc:0
+	!sys-devel/clang:0"
+PDEPEND="
+	sys-devel/clang-common
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? (
+		=sys-libs/compiler-rt-${PV%_*}*
+		llvm-libunwind? ( sys-libs/llvm-libunwind )
+		!llvm-libunwind? ( sys-libs/libunwind )
+	)
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	default-lld? ( sys-devel/lld )"
+
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_MANPAGES=build
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+LLVM_PATCHSET=9999-2
+llvm.org_set_globals
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+	eprefixify \
+		lib/Frontend/InitHeaderSearch.cpp \
+		lib/Driver/ToolChains/Darwin.cpp || die
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# headers for clang-tidy static library
+					clang-tidy-headers)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			c-index-test
+			clang
+			clang-format
+			clang-offload-bundler
+			clang-offload-wrapper
+			clang-refactor
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+
+			# extra tools
+			clang-apply-replacements
+			clang-change-namespace
+			clang-doc
+			clang-include-fixer
+			clang-move
+			clang-query
+			clang-reorder-fields
+			clang-tidy
+			clangd
+			find-all-symbols
+			modularize
+			pp-trace
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-clang-man
+				docs-clang-tools-man
+			)
+		fi
+
+		use doc && out+=(
+			docs-clang-html
+			docs-clang-tools-html
+		)
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-build-py
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# disable using CUDA to autodetect GPU, just build for all
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+		-DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DLLVM_BUILD_DOCS=ON
+				-DLLVM_ENABLE_SPHINX=ON
+				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-clang
+	multilib_is_native_abi &&
+		cmake_build check-clang-tools check-clangd
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD; then
+		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
+	elog "Some of them are vim integration scripts (with instructions inside)."
+	elog "The run-clang-tidy.py script requires the following additional package:"
+	elog "  dev-python/pyyaml"
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 47944519043a..de4ca4cfe7ae 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -5,10 +5,11 @@ DIST gcc-10.3.0-patches-1.tar.bz2 15282 BLAKE2B ef283e8b108af9bfd3324fabb95c8353
 DIST gcc-10.3.0-patches-2.tar.bz2 17688 BLAKE2B 8dc949208e0a4a3f0f106fabb9eb6e6787b1a829f9cfed6009d1328220e71926489b4f82a270cabcfa64af46e9892e72f5af2ce991c209055fcfab103cdfdde8 SHA512 053e67f778105062f1246cc09f6f8973d663855ab6d0ba976575e4b8f62e667dc05c058d4b3ae33c135292533c8f9a44b6f7a71f14435962b4becaf49848dc80
 DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
 DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
-DIST gcc-11.1.0-patches-1.tar.bz2 12130 BLAKE2B 4d763b83dba7875bbbe8bbb9b6c392791ba97037d17347548604ffa7c70b32fdafcd45b0722ae40aa3aa8cbb34b9f3e3aa399d0096e35e74f75b174aad0c032e SHA512 e4e363c6a81bbc423ec36b6c57801ea2a70961ee7d7d0333924c7012b2b6fd4008f53e9208b5d1f6025f9e74a95d46c121b4b8909827070b46091228688996a4
 DIST gcc-11.1.0-patches-3.tar.bz2 19670 BLAKE2B bd37b28beb8ee387d03466bdb8e81b6f8f8a4bec3cdd012db84439166855eb6f465e2232e0472f9369a74c240af2a035d1023abcdd5058a7d9e27b0cb1709716 SHA512 b18102b70b77ec1328eec7f9e03fd083649af97845a6ecd68bf3cac128571e3b25a99823ce29cede8c6bcb9b0f31288a2e5a8f5d59cfad2b1278c420bf9e2149
 DIST gcc-11.1.0.tar.xz 78877216 BLAKE2B fe617e776b0270d11adea21b5c37d889de90865c19ab82d1c37bbd5c5b9c583a98c174606c4f893ca4950a4233e2a58aae93ad6aa7ad33d4e78a31c72371c1ed SHA512 fd6bba0f67ff48069d03073d1a9b5e896383b1cfc9dde008e868e60a9ec5014a837d56af0ecbf467b3fb9b37ec74a676e819a18b44393a0a3c4280175b5d7ad8
-DIST gcc-12.0.0-patches-1.tar.bz2 12137 BLAKE2B 1b5a07c4e0996b559cc5d57c5a0ade76983d80f3dc8f87e67b95b54114f7adcf3a78bd409123e7f414e33cf3114da9fab3491fd7cb39e337a22c1d6b562842e5 SHA512 fb5464a0b55446b2c99b6cb50e70404a723925b6bea322855ed4d2f66bdff70aab22e93d1e6d7d72d8a1451cac919d0d07b2a6caf0d953fa1692fb3422b2528c
+DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
+DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
+DIST gcc-12.0.0-patches-2.tar.bz2 11564 BLAKE2B 5954ee8dd5edb30ecde54275d9ffd4d2f5671de82fe7789688d1220b181fbcdeed3d5305858d8af1fd016e627687ca6f2ebc76bb6b49e9b903e8d63c3de2baea SHA512 6299a1f46fc3f29934db7af20651c0c3e1266bef89b222fc9e3bc6a7e7cd2869301c5b227a4105157456474ae8a626ec550c15971bceb2f844476a9f5bc56284
 DIST gcc-6.5.0-patches-6.tar.bz2 15320 BLAKE2B fe6b60cd45d00187e4e41e607af6a1137481a6d8f4421a0ead7da9fd86d0cd19bf428e5d150e1de4e0616606f8d6c31738da24be8151c58f7760aa92432ea3d0 SHA512 87c2a6726373999472cbd6211e486864266c833d5a07f8fb02dd3054b7dd3f86aa86ea47b17928045ef6e46d82f429f879d6f69d8adf3b6f2956f4ac6b3f80f1
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
 DIST gcc-7.5.0-patches-4.tar.bz2 13183 BLAKE2B 38a56910f01ef4172182d2145cef1df53b57eaa8f0655223cf54689e7ce12a264bfbb3735bde42b8a8594ab44031d9c48dc0d5303fab6537746f05e4d46b427a SHA512 28d3732d5351dabd1452ee0462865a0de00103d9ea66941e38499c532b34ee8beb150b0b32af58cde901e437b4c256593c29736a5e7df2575aa0d0c43b6cf6eb
@@ -26,8 +27,9 @@ EBUILD gcc-10.3.0-r2.ebuild 447 BLAKE2B fd9df7b68bfdc3bb0d4bf04aea7242cf9974d321
 EBUILD gcc-10.3.0.ebuild 447 BLAKE2B ea4aa1b2beea36b702347947e95094e936c687404d7ae42061bb739a449f65acc887a2a57349cf21f470c856759523912751a32fe28bd2da84169ee12ab1ebce SHA512 b39876cce4822b1199ee4f62d2583e37f051f9d9b2d95e236076263399b07cf899cfc3b5e65218a8fe0e1bda13d9e0c26013986eb96d335b1026921fe20f7f1a
 EBUILD gcc-10.3.1_pre9999.ebuild 649 BLAKE2B 7c2d1e2d939433104d3fb01de2dbdb12b6022a503d2252d8371f699577eb289276897440113bc70745deb7057819d63890be8c0fd0022c02cc6d565fb1c1307e SHA512 eaca9dd9ac89a354beae99d38d7df2004289d281236f4a41457afbba563dcc8f6c1bfe24e8ea9219019c2b7e1c9abb67f428c96389fc9f6b8263db2af66ff3ef
 EBUILD gcc-11.1.0-r2.ebuild 454 BLAKE2B e99d90cca50914b672f9462925c18484b55d73478e3cdfb45f9d9999333cbadb64047087aac25775e494c750159fa118fd0014843cc93d7b2046f6458ef80a52 SHA512 0209cbe81e71912fe53cbef3ca3bd048951b132f79c2d3a39b9a847032f3f172c1f5259d13f23b0a3d9bfec274c98807b233b06233333ebf28b4f00656e67285
-EBUILD gcc-11.1.1_pre9999.ebuild 649 BLAKE2B de4b651b108ff8d9923e377295d1fc5338bb86305200766e3ba922cc0266e14904feeeadd534ea953c8771bed0fe74dafb4a1b31fd0789d143b355def18ee0c4 SHA512 7ae3da7bc046186cebebf2e2217db6ea594a5b43af5cb201eecb754a64f324f7da7c0b99cc3696bf8ba8ffacad8dd7f813150d43d1b247d3f62b842efd3e9d0c
-EBUILD gcc-12.0.0_pre9999.ebuild 530 BLAKE2B c3c820c72fdd572ec504101a905f04e10ef18d13afd54183227f49612f22e5eced8bd1a6edd72e924f5b13dce89434acd02962d7dd744e6b7b174b781d33b1c3 SHA512 a47c5ad7d191db46601afe6aeedfb1bf957c2c48fd71c4fe734ddb523d5662eb599f876eb00ceb8f4dcd574bbc8aeda3ee1d3a6194fd8265ebd38e850edeea44
+EBUILD gcc-11.2.0.ebuild 290 BLAKE2B 6b94604283cf63809aa912ab2984f6ca668571723e6a0526fd09ead95a3b79797f22a9c8b0bf5bb80733eadddc7320a602e81e1621a1e954758dd6ed134034ce SHA512 bb845cacc8b9b0e2032c2cbe9b2c9a304276ac6d1cb6aa72c625a3c1afba61fd73098f438e96e7aa647229fa9bbdca37001dcc79b41be416345d49c10b76045f
+EBUILD gcc-11.2.1_pre9999.ebuild 527 BLAKE2B 69ad8ded1819b6b584ddac3ad639750d5d13f465854bf88093d0a48f5f83f5919ff66014ff0ae67167e88d3282cb108291a0ffe86147f7f505396c77a887a017 SHA512 0011d0d43953cbcd1afa201005f52bc13bedffeab1a45469d6d7b60e2e04343b1a4385dd8bf684e442858ab80b314aa849184e3353e0e3adf44839c3753de4ad
+EBUILD gcc-12.0.0_pre9999.ebuild 367 BLAKE2B f4d4fae47ad12381f9f25e4c97964d7a155f7b1c186a324c8c96109559da063f5f568a168e32a078e1afe39bfa786260a7a3785bfed648c68156fe14ad3bce56 SHA512 2a4e545ba1ee6f16f0301a367097b0253dd9f786873b45b31be2b0284605dbb9bc8d6c34d4f0a2d7825e92fa6c8fcedca4b680e1cb7d4446574c0d993c8918c9
 EBUILD gcc-6.5.0-r4.ebuild 445 BLAKE2B 2f3d0d7d881671cb42296b53441f8c379bea95dcb83348fc9d993b1c586c828a82188ca39688a728a32e1d37f19a5bc5148e339654477c5383d90e29dc527ca3 SHA512 1c2fcee4393c001dfe1718ac6bc7ace20df0b77bfc9cf1c94683a60f3c0d42cf62b8e6afe4d8938937eef870083b7026491cc3c4952d67fa81894e543ec4653a
 EBUILD gcc-7.5.0-r2.ebuild 456 BLAKE2B 4d675d65bb34c51225f2f490409ed63f0f95a3f9bec9c1e034127ad0ac4fed7f104fc5febb761133873505807c6cc6b44b8ce8d51d0faef26843feed6cf1f933 SHA512 057ed372182d4bd5afb51459e0bc563fa05590feb5e0a859123a2d20d9f052cd23d2ac70923f58c827ebec3e419cfb6cb1d370feb58d39a02089fa3bd4d90921
 EBUILD gcc-8.5.0-r1.ebuild 452 BLAKE2B 5ac3065a75d23a3e5237ba6fa1b7961fc643338e5cd98ddecb66305b442e06458ca9a7c553467cfa24ea328a862a283623f477e1600aac012adce50ad2ffd522 SHA512 4dadf7904ba6a82199710628afb03b158caca2893b77f6b999e8098a9a155013c9785307ab16a122e6ed7d25b93380a79f571d2e4c5e4eacf9a132ad7ef713a3
diff --git a/sys-devel/gcc/gcc-11.1.1_pre9999.ebuild b/sys-devel/gcc/gcc-11.1.1_pre9999.ebuild
deleted file mode 100644
index 1d6460448597..000000000000
--- a/sys-devel/gcc/gcc-11.1.1_pre9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_GCC_VER="11.1.0"
-PATCH_VER="1"
-
-inherit toolchain
-
-# Don't keyword live ebuilds
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/21_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-11.2.0.ebuild b/sys-devel/gcc/gcc-11.2.0.ebuild
new file mode 100644
index 000000000000..7ed0fc66d6a2
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.2.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="1"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild b/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild
new file mode 100644
index 000000000000..500dca96a088
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_GCC_VER="11.2.0"
+PATCH_VER="1"
+
+inherit toolchain
+
+# Don't keyword live ebuilds
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
index e804e6bb8c7a..e8889dee6ccd 100644
--- a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 
 PATCH_GCC_VER="12.0.0"
-PATCH_VER="1"
+PATCH_VER="2"
 
 inherit toolchain
 
@@ -15,10 +15,3 @@ EGIT_BRANCH=master
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/21_all_disable-riscv32-ABIs.patch" || die
-	fi
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index fe066d1a6014..b82c5e006019 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,9 +1,11 @@
 AUX gdb-10.1-cet.patch 2675 BLAKE2B b720e43514b25897a332648bfb15e16278f76606413991ce75c0233af27bbc434c36e85d36d4207339211382c0c5de5e9892f9e533e9d24b5257864939ac4874 SHA512 4fd4787c7ff2f7c2fed338ccc0f478b120d566959c0de5dde03cdcfdb37911bc22c5c11a124a000d84138a23c30ee3fa65c024eb72d1c924f926b04e079412a5
+AUX gdb-10.2-DW_LLE-riscv64.patch 1352 BLAKE2B 962c47c3791735162da4351c29fdb4c8bdc803824445a034cced8eb24d4028a27dd68f3238b3028299212eb5a9035e006dd48429d497b5a83a301c5a2e9cbc5d SHA512 c70c34be908ca2ae3545184730d49ebf024295ff382b632fe7186de0f9e019655476bef01e5ae1017856d12e7fe15ca1917a3f1b44ddf4c11214dfa4f47f766f
 AUX gdb-10.2-sparc-nat.patch 1683 BLAKE2B b5ef1ce44dd935ca8a69a6477cfea703109300e5c50b108b834ebcaaa3d4144b81ec10bd586db207cec2eab3355c2886c0af442a4046f378a08300cbd7d1783e SHA512 dc72e7e1d789dac8befd77ad07bdbcfa6ad96e82095cd807f12dcbc7f0521e4bbb6812841ec7bd311d2efe2f4aa9f249e4d114315ae88a04216f698448bb35b0
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
 DIST gdb-10.1.tar.xz 21507112 BLAKE2B 69d79cd667ecb6e936b41a03817ade5dd9b761f97bc123d668b5f968d123c37d048fc8ec1289151e989f01bb01a43cc3d8b5b54f1807f1e3eb5f43e6bf0aa55b SHA512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537
 DIST gdb-10.2.tar.xz 21518900 BLAKE2B c5d31d80d2b454767d6f844e8471b012ad437c3872391b618fd7b14c5cf251b78e55d28c12e81382fd600f67e2f618ff5dbe3a7b737a5d5161ceb3542afbb90b SHA512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa
 EBUILD gdb-10.1.ebuild 7019 BLAKE2B 34dd10dad9c958e960775dbaa65e941448c096f52bd59dd16f214922f2b81fea84c80196cc59660fdc59a60297b23e5aae8de3d6b0453b7ab636862a9c760604 SHA512 7c132c6ee9aad5d683646b8bd9ed9179fcb3c59c40bd049745d4bde6366c4f75c36faa9184e72a5e82954e84a10fae049b907cdfcf4a55671b126f53d2322dc4
+EBUILD gdb-10.2-r1.ebuild 7115 BLAKE2B 41c7ffb7ea952f794146a8cb9f1738387fc0f1161e1923474c8f25a824dc984582963537d1f29673b13a0addae03159206862364f9b2a42455c3dfae4dbe04e8 SHA512 7b16c497f26e67f3e5de1035bbab1201ca79cdbe9583bce716e6816f7187956f2cbed1eb9991661fd597b5e20b24af6e63a2e6ddd28fa75cc76e4a1e27a24d8b
 EBUILD gdb-10.2.ebuild 7063 BLAKE2B 93bacd2f7e3f45c17d01f12a0302d9cf070a65ea4dc00c6c0d47a93b1a0e19ff2d092dd38b813bb43a405f58028f4c43be7e4fb3b1b9bc13d57d5b59aa1db643 SHA512 2ec5d372037d0d98d50d58f5bba03fda00d06fd46e7d11280e4b17a91435086ef288c46cbc5157a3ca4bbc288d4ff679845878e457c8e9e631fde606a85c741a
 EBUILD gdb-9999.ebuild 6990 BLAKE2B 4b35c8d7d109a74e98ca5bc9e6c7967f1f3a9d8ff508f14cd15bf752df8117f3355562bacb2a8bff4ccffe28971e428d9a209df83cb3dd6006d97489259686de SHA512 dbba8eb4feea97afd7ca3d90a9e48209facc426e4227792eb57dc3124ef64979440409382f0ad2ab9f05792ca5661505c46f0f563126bc33d05793af04d74357
 MISC metadata.xml 1102 BLAKE2B 76a586ca542d54f382f13416d53729e9a26f05d8ee2e592cf0b0aa1851d0a9546b20d2058107ca250986682c5f4f86c38939f4cd627f36d9223be3589337caad SHA512 047a745a15e2fd6ecbf22d52e3771e0982a10ed2eb41513e30946574e5b6e813088a31bb3c32832181f19fbd4f5061575389723f66b1821e75839a863e422c0e
diff --git a/sys-devel/gdb/files/gdb-10.2-DW_LLE-riscv64.patch b/sys-devel/gdb/files/gdb-10.2-DW_LLE-riscv64.patch
new file mode 100644
index 000000000000..0d3e8c5cb949
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-10.2-DW_LLE-riscv64.patch
@@ -0,0 +1,41 @@
+https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=80d1206d7fea6eb756183e2825abdfd0f00cd976
+https://sourceware.org/PR27999
+
+From 80d1206d7fea6eb756183e2825abdfd0f00cd976 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Mon, 21 Jun 2021 11:38:23 +0200
+Subject: [PATCH] gdb: Support DW_LLE_start_end
+
+Without that it is impossible to debug on riscv64.
+
+--- a/gdb/dwarf2/loc.c
++++ b/gdb/dwarf2/loc.c
+@@ -255,9 +255,27 @@ decode_debug_loclists_addresses (dwarf2_per_cu_data *per_cu,
+       *new_ptr = loc_ptr;
+       return DEBUG_LOC_OFFSET_PAIR;
+ 
++    case DW_LLE_start_end:
++      if (loc_ptr + 2 * addr_size > buf_end)
++	return DEBUG_LOC_BUFFER_OVERFLOW;
++
++      if (signed_addr_p)
++	*low = extract_signed_integer (loc_ptr, addr_size, byte_order);
++      else
++	*low = extract_unsigned_integer (loc_ptr, addr_size, byte_order);
++
++      loc_ptr += addr_size;
++      if (signed_addr_p)
++	*high = extract_signed_integer (loc_ptr, addr_size, byte_order);
++      else
++	*high = extract_unsigned_integer (loc_ptr, addr_size, byte_order);
++
++      loc_ptr += addr_size;
++      *new_ptr = loc_ptr;
++      return DEBUG_LOC_START_END;
++
+     /* Following cases are not supported yet.  */
+     case DW_LLE_startx_endx:
+-    case DW_LLE_start_end:
+     case DW_LLE_default_location:
+     default:
+       return DEBUG_LOC_INVALID_ENTRY;
diff --git a/sys-devel/gdb/gdb-10.2-r1.ebuild b/sys-devel/gdb/gdb-10.2-r1.ebuild
new file mode 100644
index 000000000000..b5d5204d0458
--- /dev/null
+++ b/sys-devel/gdb/gdb-10.2-r1.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+case ${PV} in
+9999*)
+	# live git tree
+	EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+	inherit git-r3
+	SRC_URI=""
+	;;
+*.*.50.2???????)
+	# weekly snapshots
+	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
+	;;
+*)
+	# Normal upstream release
+	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
+	;;
+esac
+
+PATCH_VER=""
+PATCH_DEV=""
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# ia64 kernel crashes when gdb testsuite is running
+RESTRICT="
+	ia64? ( test )
+
+	!test? ( test )
+"
+
+RDEPEND="
+	dev-libs/mpfr:0=
+	>=sys-libs/ncurses-5.2-r2:0=
+	>=sys-libs/readline-7:0=
+	sys-libs/zlib
+	lzma? ( app-arch/xz-utils )
+	python? ( ${PYTHON_DEPS} )
+	xml? ( dev-libs/expat )
+	source-highlight? (
+		dev-util/source-highlight
+	)
+	xxhash? (
+		dev-libs/xxhash
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	virtual/yacc
+	nls? ( sys-devel/gettext )
+	source-highlight? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+	"${FILESDIR}"/${PN}-10.1-cet.patch
+	"${FILESDIR}"/${PN}-10.2-sparc-nat.patch
+	"${FILESDIR}"/${PN}-10.2-DW_LLE-riscv64.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	strip-linguas -u bfd/po opcodes/po
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+	# avoid using ancient termcap from host on Prefix systems
+	sed -i -e 's/termcap tinfow/tinfow/g' \
+		gdb/configure{.ac,} || die
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	local myconf=(
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# gnulib's or gdb's configure.
+		--disable-dependency-tracking
+
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{binutils,etc,gas,gold,gprof,ld}
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+	)
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	# gdbserver only works for native targets (CHOST==CTARGET).
+	# it also doesn't support all targets, so rather than duplicate
+	# the target list (which changes between versions), use the
+	# "auto" value when things are turned on, which is triggered
+	# whenever no --enable or --disable is given
+	if is_cross || use !server ; then
+		myconf+=( --disable-gdbserver )
+	fi
+
+	myconf+=(
+		--enable-64-bit-bfd
+		--disable-install-libbfd
+		--disable-install-libiberty
+		# Disable guile for now as it requires guile-2.x #562902
+		--without-guile
+		--enable-obsolete
+		# This only disables building in the readline subdir.
+		# For gdb itself, it'll use the system version.
+		--disable-readline
+		--with-system-readline
+		# This only disables building in the zlib subdir.
+		# For gdb itself, it'll use the system version.
+		--without-zlib
+		--with-system-zlib
+		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+		$(use_with xml expat)
+		$(use_with lzma)
+		$(use_enable nls)
+		$(use_enable source-highlight)
+		$(use multitarget && echo --enable-targets=all)
+		$(use_with python python "${EPYTHON}")
+		$(use_with xxhash)
+	)
+	if use sparc-solaris || use x86-solaris ; then
+		# disable largefile support
+		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
+		myconf+=( --disable-largefile )
+	fi
+
+	# source-highlight is detected with pkg-config: bug #716558
+	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}"/usr -name libiberty.a -delete || die
+
+	# Delete translations that conflict with binutils-libs. #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
+
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+		gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
+	docinto sim
+	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
+	if use server ; then
+		docinto gdbserver
+		dodoc gdbserver/{ChangeLog,README}
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
+
+	# gcore is part of ubin on freebsd
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		rm "${ED}"/usr/bin/gcore || die
+	fi
+
+	if use python; then
+		python_optimize "${ED}"/usr/share/gdb/python/gdb
+	fi
+}
+
+pkg_postinst() {
+	# portage sucks and doesnt unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index e59790d874ee..a2ae630b37e7 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -9,4 +9,5 @@ EBUILD lld-11.1.0.ebuild 1399 BLAKE2B bfa3538e4bd9492e94547f4ed304d75ff5da1e58c1
 EBUILD lld-12.0.0.ebuild 1666 BLAKE2B 6fe783db711fd7a68603e02271eb8dcdd71bee6729e2b940fdbfbe318514bf87312252ad290f059d0c547ab9c5efa4877f6c93c201e5b2e10e31d3f31466980c SHA512 85a2c9f6105acc9ab00a241e7dace1c933fad82f878e7d0df7706e57b6c54df9a94932a1c3b66d5bf0a551eb1187e4964fc7e370648f2243765bdacb6e2f2040
 EBUILD lld-12.0.1.ebuild 1671 BLAKE2B 8f04ffcf0837a8000f5de80d36034b33b83458918f76dbd7ecfc5640d07cf2c9fce3b6b8e49138cc97e9d2a05051a4e5cb9d68b1a77db5060c861d018699ea28 SHA512 e054b3d29377f6b396366370026b54e362de3ba20e4b5ef971b32610a1b7de57ec24eec94d4586b7c453653249840260eb16aca795a36c2a29a3039fa37f8d8f
 EBUILD lld-13.0.0.9999.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
+EBUILD lld-14.0.0.9999.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-14.0.0.9999.ebuild b/sys-devel/lld/lld-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..68762b0a03cc
--- /dev/null
+++ b/sys-devel/lld/lld-14.0.0.9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)"
+
+LLVM_COMPONENTS=( lld libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index bbaf2360425c..c1319c260e0e 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -7,4 +7,5 @@ EBUILD llvm-common-11.1.0.ebuild 603 BLAKE2B 0a7273b73b30e1cfb707d232c8634368edf
 EBUILD llvm-common-12.0.0.ebuild 609 BLAKE2B 2faa36404e10c224574c12300a941de17ef147a0574a95b5c3296ebcd607b705dee123620ba335e98a66846a2989a37a2f6a53330c9f1a5fb6ee14ae4bcf5aa9 SHA512 236aa7322479eec3d1c442998fbbc235f277c559bd060ab1655cbd8e172de5a1fc603b56390bbba0e027d62fc46d2d781b7680daa29f62633230fd167f9f9a95
 EBUILD llvm-common-12.0.1.ebuild 613 BLAKE2B 960b0e06a84ef48bf0f0ef0e174b475572689d9a8a477f8b0a1a336203e1c8a3c5d034010a8e3e36251a0e0af95e8be9891d4ef77527122c173d65ff6e45e48c SHA512 7e4fdb7fae1bf619a2c2bcaae1486b8687431576bf3dfd856cfe2ecd618a77fa20a66f66ad692131cea71b762f3c7818ce677dceb58c3d45b145a4e2a9a3cfce
 EBUILD llvm-common-13.0.0.9999.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
+EBUILD llvm-common-14.0.0.9999.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-14.0.0.9999.ebuild b/sys-devel/llvm-common/llvm-common-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..53511a0a20e3
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-14.0.0.9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 4b82929233f3..2250b1f6793d 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -15,5 +15,6 @@ EBUILD llvm-10.0.1.ebuild 11490 BLAKE2B 40960dd1109655157b04396283d704ea1a0af35f
 EBUILD llvm-11.1.0.ebuild 12504 BLAKE2B 7f22ab387fab31e11d554667b1b183f5b66203f601096c130642500f877f2af473b31a0cba96da93d9c85d50e2fbafb7f46a0ff6bf2f96a0bd41266ddc04dc8f SHA512 716b8474077279b821140d2defa5f1dd5b2ab7cf09aeb27907410a184a701ecbf99f545622e68d0a81a762c3b5cbc6ff3b30415a331d38dac8fb72f37a3147bf
 EBUILD llvm-12.0.0.ebuild 12772 BLAKE2B a41ff10ab546eecb3b37c32ad55ac317b7d966f6a3b0cad7c3d5263a43919df575f76e0f60498e03e0fda4e6eb61183d4aa645621c946cd3aad5d05908209eb2 SHA512 6ca48dfcb3b975f0d837fd6de1b1a02ff199fe615ef0524ff8cfea95ca9cb8b25339c14fc9c746081cb4d19566ffb9d9c5dac42e650efc56174bf5ffeca80fb5
 EBUILD llvm-12.0.1.ebuild 12625 BLAKE2B 458487e1b943f982da89b171de0a0deb8b6a4418fb55df88f35adaab1d28dcc8990c34c3b1c65ec486ab7762c72f6cbdafb212585ad48397b1368a2bd854abe7 SHA512 3fd3f71b2eb2651aec0670c178a530eb54227616013d5220857352bc0d63fad101792b41e79135166cbe25401ee3ec63614a93c7fe0d1a355193232331ca3b8e
-EBUILD llvm-13.0.0.9999.ebuild 12553 BLAKE2B cc0576aa50ab6806b065e2acb38518e2bc9e3a958f1def101f68a2cf15606453ebe9475fd45fbb0fc0fbba5b46705ff3663e894d445599e85689bc7c5d62fb12 SHA512 b39d45bed54dd012eca536413312cd7f25be1e903a47acace3f0c37425f33f6e3ffce7cdb1b70b76e111fe284726727e2606dbbf8e2c5d79a9ee4b6d8015bca6
+EBUILD llvm-13.0.0.9999.ebuild 12589 BLAKE2B 44bca6c287c2d804f6701a8ac8a953624e8418d1ead94450b7b8b5f0ff5192bf6c027ca4f290c8a0e6bc96badd50be68e3fa2765f8cc535ddbd2bd8a39530b2d SHA512 b3e11ab52ca7309933d7cb66e3cb5c85c934c5e417e271d3c8c14879a1afc190b7a49f68a5abc2d847f1883a17f85cd3e9ab42b358b530424d4314707063fce9
+EBUILD llvm-14.0.0.9999.ebuild 12589 BLAKE2B 44bca6c287c2d804f6701a8ac8a953624e8418d1ead94450b7b8b5f0ff5192bf6c027ca4f290c8a0e6bc96badd50be68e3fa2765f8cc535ddbd2bd8a39530b2d SHA512 b3e11ab52ca7309933d7cb66e3cb5c85c934c5e417e271d3c8c14879a1afc190b7a49f68a5abc2d847f1883a17f85cd3e9ab42b358b530424d4314707063fce9
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/llvm-13.0.0.9999.ebuild b/sys-devel/llvm/llvm-13.0.0.9999.ebuild
index 82bad48eff07..ebe79aea74c9 100644
--- a/sys-devel/llvm/llvm-13.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-13.0.0.9999.ebuild
@@ -251,7 +251,6 @@ get_distribution_components() {
 			llvm-dlltool
 			llvm-dwarfdump
 			llvm-dwp
-			llvm-elfabi
 			llvm-exegesis
 			llvm-extract
 			llvm-gsymutil
@@ -284,13 +283,16 @@ get_distribution_components() {
 			llvm-readobj
 			llvm-reduce
 			llvm-rtdyld
+			llvm-sim
 			llvm-size
 			llvm-split
 			llvm-stress
 			llvm-strings
 			llvm-strip
 			llvm-symbolizer
+			llvm-tapi-diff
 			llvm-undname
+			llvm-windres
 			llvm-xray
 			obj2yaml
 			opt
@@ -365,7 +367,7 @@ multilib_src_configure() {
 		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
 		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
 		# used only for llvm-objdump tool
-		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
 
 		-DPython3_EXECUTABLE="${PYTHON}"
 
diff --git a/sys-devel/llvm/llvm-14.0.0.9999.ebuild b/sys-devel/llvm/llvm-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..ebe79aea74c9
--- /dev/null
+++ b/sys-devel/llvm/llvm-14.0.0.9999.ebuild
@@ -0,0 +1,521 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Those are in lib/Targets, without explicit CMakeLists.txt mention
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
+# Keep in sync with CMakeLists.txt
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	exegesis? ( dev-libs/libpfm:= )
+	gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	gold? ( sys-libs/binutils-libs )"
+BDEPEND="
+	dev-lang/perl
+	>=dev-util/cmake-3.16
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	libffi? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( >=sys-devel/llvmgold-${SLOT} )"
+
+LLVM_COMPONENTS=( llvm )
+LLVM_MANPAGES=build
+LLVM_PATCHSET=9999-1
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_live_ebuild() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+	# reorder
+	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
+
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eqawarn "Expected: ${exp_targets[*]}"
+		eqawarn
+	fi
+
+	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
+		eqawarn "ALL_LLVM_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
+		eqawarn "Expected: ${all_targets[*]}"
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the live ebuild is up-to-date
+	check_live_ebuild
+
+	llvm.org_src_prepare
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-bitcode-strip
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwp
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-jitlink-executor
+			llvm-lib
+			llvm-libtool-darwin
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-otool
+			llvm-pdbutil
+			llvm-profdata
+			llvm-profgen
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-reduce
+			llvm-rtdyld
+			llvm-sim
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-tapi-diff
+			llvm-undname
+			llvm-windres
+			llvm-xray
+			obj2yaml
+			opt
+			sancov
+			sanstats
+			split-file
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use gold && out+=(
+			LLVMgold
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	if is_libcxx_linked; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-devel/llvmgold/Manifest b/sys-devel/llvmgold/Manifest
index 9b0ab8740c55..715bb838e133 100644
--- a/sys-devel/llvmgold/Manifest
+++ b/sys-devel/llvmgold/Manifest
@@ -2,4 +2,5 @@ EBUILD llvmgold-10.ebuild 564 BLAKE2B e50f9488b04a458b347f61f97b14269c0d9ba6440b
 EBUILD llvmgold-11.ebuild 571 BLAKE2B 43b8417652b96027c4556aa936f6bd00e81e9826a2002afebd0f7ca3803337a33eb5e31d3c454bc094f5bdecbe30827bfe4a5c65a86c511478ff5ab0b4d0e4df SHA512 717119361f1c86e436947ea74ff5a574c6c936d1bfd6d9ef30e3277094994e69bdce9c7f496192667a28de44443f819e94f719004ef2dbf6006f2c755a11d5a5
 EBUILD llvmgold-12.ebuild 564 BLAKE2B 6ba6d22e27287c2d03ec16aef37723e85c2ec80dc8e7715a5f09ccf6435b4cbd1ec2f72864667e309a038bee2f29d041390dec9e46a17675540546a7086aeed6 SHA512 a43c8b70380b77af903b7575033817dbf1e4dda4043a7194ce786337128da94b9e53abe871c3fc3ef0710cceadad8eb36699ac6d979623833a5c99f1b18aa98e
 EBUILD llvmgold-13.ebuild 544 BLAKE2B 30824a2e7dfa3cd1d94a6edb202e8ee4ab1f58e42c2b758f8f70672ae5e0d5f28b90d3b8e3335a603944bf198bbe96da99cb99012c4476ad8d04dfcb957fa55f SHA512 0d7c2e55023f389fb43d92dbcb5002738010142cfe637bedf4277240e09c2d644f4601d0e1ff7f1412902a72f4df7e3234fa3a53e401bbdc6c6a5425f78f724a
+EBUILD llvmgold-14.ebuild 544 BLAKE2B ed40bafc272fcac21165e838269dc10ba282a0166e2ae67b56150156e5b5faf1ba473cccefd557d98eebc5af3f396bb505d65329a0fed58f5b846208ad286ef5 SHA512 1c50636022ab1c5467be5305ba5d8501bf5c121518c00cec0d5d6b0977f2b406c1c2911ebcb7a37cbbc29ec11509bf1079ad054f626793828ed750e80d6e21ab
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvmgold/llvmgold-14.ebuild b/sys-devel/llvmgold/llvmgold-14.ebuild
new file mode 100644
index 000000000000..adb4ec55f055
--- /dev/null
+++ b/sys-devel/llvmgold/llvmgold-14.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="LLVMgold plugin symlink for autoloading"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+PROPERTIES="live"
+
+RDEPEND="sys-devel/llvm:${PV}[gold]
+	!sys-devel/llvm:0"
+
+S=${WORKDIR}
+
+src_install() {
+	dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
+	dosym "../../../../lib/llvm/${PV}/$(get_libdir)/LLVMgold.so" \
+		"/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
+}
diff --git a/sys-devel/slibtool/Manifest b/sys-devel/slibtool/Manifest
index 6d1278d68499..b31866efae58 100644
--- a/sys-devel/slibtool/Manifest
+++ b/sys-devel/slibtool/Manifest
@@ -2,7 +2,7 @@ DIST slibtool-0.5.33.tar.xz 74100 BLAKE2B ae4901fb116c1c9463d7a817dc0c3aff2de098
 DIST slibtool-0.5.33.tar.xz.sig 833 BLAKE2B dec6515251e85e91727ef85e31fc370975058142c81c5abaa7a5b300a88b785878768fb56b68d9d7da2d9dc063e6c188136f6ee9566605ebf0cba834d9ea96b6 SHA512 00bc2117b1b68b94618effbb5ce24c09c0a0e6b76a8d0d4c34d0e6a13081d14521aa909a3b629a9e6680db5c3b720c61afdc90c6e7b1989debe1abb7574d9977
 DIST slibtool-0.5.34.tar.xz 79720 BLAKE2B 3a692d7485dcf2277f7ed99fe1ad67cf5fd33d8fe0a527d64634b0e7f956a5f58b92d812396f00d872ceb8509e058ae1a026f16a65feb2e79a9fff7bd60290da SHA512 3f7f6e4f45c4c2ae5ba5533152f08269cd77ca6fa2f3a515802bc23c7ac505b2d7340098fa98962c79035129cfd4077205596309f4acd1d634b9a1d6e2c0e96c
 DIST slibtool-0.5.34.tar.xz.sig 833 BLAKE2B 52df017d8ae3056e259a5283b0a4cea119a5ab4ce95e6c894d0d2e98fc10db101039a57c9a2a771f677c9d0afaad9273095ebdb078fca146a3d67ea25e9261fb SHA512 9f8415431a0b43e7be9a808dd6ed138a9b34b7b2c4af3ab406bdbc456ec31c877f13bc0b056ab9a50bec0b0cf1b654a133085f8523e70c8cb7d3851652d34ff7
-EBUILD slibtool-0.5.33.ebuild 962 BLAKE2B 87e607df3a644b9326ff42e750449fd5b6c46ad2589f82457f47fbe21f913759fb2ed7da7732f3163a5be324bf6e20ece1cc7cf9089a5bfc3628c9230f4e6b80 SHA512 9272d4a7cf3899ab1c044c061ccf0e4c1a9f606377715c37c1487a5d80309e6870dffb7690896221ed6494b07daba602495c8be74390505aae33f42a8e9a74f4
-EBUILD slibtool-0.5.34.ebuild 976 BLAKE2B 946e2efe1a2e2ff8d7f8a0b207f21a2c14baed2ddf7d2ca6f99abad93f035f9f91d0df6f0d6dce36c710f3df6491b80f60722059db039824dbd95055f8a817ca SHA512 d143b390ace64a408ebbc1d7c2e513ac447a30c44c07dfba32de8cd004944ff9c55f9d66d999eac670e9afabd709c2dda7a42f4a0cd58e90c36c03e9216991f5
-EBUILD slibtool-9999.ebuild 962 BLAKE2B 87e607df3a644b9326ff42e750449fd5b6c46ad2589f82457f47fbe21f913759fb2ed7da7732f3163a5be324bf6e20ece1cc7cf9089a5bfc3628c9230f4e6b80 SHA512 9272d4a7cf3899ab1c044c061ccf0e4c1a9f606377715c37c1487a5d80309e6870dffb7690896221ed6494b07daba602495c8be74390505aae33f42a8e9a74f4
+EBUILD slibtool-0.5.33.ebuild 970 BLAKE2B a25a6d8b11c6e789bc9d832142915ef32834b2c592dda30ae9946be637225ea4d611abf53b8164c4c873f2987c1c54c1e33490f93d9acb44a757241fba792368 SHA512 a1e017b88d9c10c770ae5f5ea541bcb6290b5df285ab0a3d95f4706f869b79f6ebc1a2c0a63e2fb32fc3ffe3506e7cdf9dfc64e40d47c704eb55eea3a8ff9bd6
+EBUILD slibtool-0.5.34.ebuild 990 BLAKE2B dad80b47d6270e2ebfcc268433b5f6a805789c69f0a16949817d750dcd8f7c3369fe1b86ab18f3889dfeca6062927abee40135fd9407cb1f0ef587a8583b152b SHA512 3f03f89332226e285df12880a1077b659ec5f4a5be9b2d0b366548be4e487e67e6e07e0faf0d3bd68561a06f0dae0e4ad183b8c086856c09e8a9d29ae9deab33
+EBUILD slibtool-9999.ebuild 970 BLAKE2B a25a6d8b11c6e789bc9d832142915ef32834b2c592dda30ae9946be637225ea4d611abf53b8164c4c873f2987c1c54c1e33490f93d9acb44a757241fba792368 SHA512 a1e017b88d9c10c770ae5f5ea541bcb6290b5df285ab0a3d95f4706f869b79f6ebc1a2c0a63e2fb32fc3ffe3506e7cdf9dfc64e40d47c704eb55eea3a8ff9bd6
 MISC metadata.xml 607 BLAKE2B 6c240213f79eb90907b92ebc7539fd76ab8f6bddc78e01898ad39f7f0159d9ad34f5fa1516bd78a0f554cc026d6918a9efe17c9f78f523a6175b4ff9346cac09 SHA512 24fa899cf7c7d197c04eb7408c9b8803bee662290f153e090b6d69f9cb9571c2817d5895dd2fc2e002b0529484943869689f513aa582e5f2b601696aa0a1b17f
diff --git a/sys-devel/slibtool/slibtool-0.5.33.ebuild b/sys-devel/slibtool/slibtool-0.5.33.ebuild
index 6fe991b4272d..c87ae71d6df2 100644
--- a/sys-devel/slibtool/slibtool-0.5.33.ebuild
+++ b/sys-devel/slibtool/slibtool-0.5.33.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.foss21.org/slibtool"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/midipix.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/midipix.asc
 	inherit verify-sig
 
 	SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz"
diff --git a/sys-devel/slibtool/slibtool-0.5.34.ebuild b/sys-devel/slibtool/slibtool-0.5.34.ebuild
index 063524621121..7e9bfc001430 100644
--- a/sys-devel/slibtool/slibtool-0.5.34.ebuild
+++ b/sys-devel/slibtool/slibtool-0.5.34.ebuild
@@ -12,13 +12,13 @@ if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.foss21.org/slibtool"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/midipix.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/midipix.asc
 	inherit verify-sig
 
 	SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://dl.midipix.org/slibtool/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 	BDEPEND="verify-sig? ( app-crypt/openpgp-keys-midipix )"
 fi
diff --git a/sys-devel/slibtool/slibtool-9999.ebuild b/sys-devel/slibtool/slibtool-9999.ebuild
index 6fe991b4272d..c87ae71d6df2 100644
--- a/sys-devel/slibtool/slibtool-9999.ebuild
+++ b/sys-devel/slibtool/slibtool-9999.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.foss21.org/slibtool"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/midipix.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/midipix.asc
 	inherit verify-sig
 
 	SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 66e92e122905..d35f4ee693f0 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 662c5c2fb675..47838717d237 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,8 +1,8 @@
 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
-DIST btrfs-progs-v5.12.1.tar.xz 2220424 BLAKE2B 1e6120609feb37dd2ced04b27d8cba9a28c3b962add6f037927dcb05bdcd46a229f981f7f68231ee58e7e36a65fae4e6041e92c0db11dba56fe63b09bca30cc7 SHA512 a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5
+DIST btrfs-progs-v5.13.1.tar.xz 2237108 BLAKE2B 6de5d70d1b3611dc7c502530c08f9b58da798b33a97a415a787c5ed55b3369432f362c4d61636b6c85d952bf4482125a2d59397214ac543cf7160de28fe20a0b SHA512 4ef8256da59614d17316db9c19909a2aa4f0557504201e421332c63a4935dbd6578791484b9f3f2dbeaaa28f6f4b4fd59c5a7adf6853fd76546ac213a0f09823
 DIST btrfs-progs-v5.13.tar.xz 2234256 BLAKE2B dd6dc6977c2a21471b59573c3ae6f7853d5ec4434549873174a6bde6b3ed4c5ed03c5adaed896538cb74699f538ec13403c193f132fcc8a2ba1b4f6bbdbac67e SHA512 7832ca02b77410edd8d80f10c6f1482dee944073518dbacd5773e70f27b7c632231ea66bdb64aa4611869465c15d2d60d364bfd25c2e40e0a2c198edbf9741cd
 EBUILD btrfs-progs-5.10.1.ebuild 3058 BLAKE2B 561b88a1cd1009fd9fe45bc6a1e29c01a5a4bad16dcfda748c87bb02f38084ae822d2b406f94771a8dd0e775bd430b51100b2d70b84e7c3c07312ea6ffc32a50 SHA512 5b7c79c83ec1e549e7d8feb9b7f898fe5682ecf51094345b47174ec0ed3e44bee349db4e44c811508b9ca9df6fe96afa7cd87a8a94dab22150a192f9a70432e3
-EBUILD btrfs-progs-5.12.1.ebuild 3097 BLAKE2B 3805cc7ca9bfc522acfc33734abec7521f8659e3e593294d7af803fab61efaf30f10d05294febb83cd50a016bf2b341a23e202ba958d1475631c38ccf8141bea SHA512 ec47ac06ca1b090e4a9a70023d3c7e03aff7defc0e94cb052a4f0f1343a395cf69b6a73d4907ed15061ba4c14f2c58e87b739cc5329688c1960e330f58dfc670
+EBUILD btrfs-progs-5.13.1.ebuild 3092 BLAKE2B 5b07b20d1cb89479283b12614b4ce9ec27cfec01d2fe80a7422f2130f53d11d8d0d6e548b192fada2bcc99e47e3cdc827521e9e85293d82a755887adea599ba2 SHA512 d413b904b27d71dbbb74c06426c76d6ee39a95093db3660c25b269225ce60ce9eee5223edb385ba5f3a1c27d1f3b2e12e8a053d194e4196fd1b4f1d95aa45ef6
 EBUILD btrfs-progs-5.13.ebuild 3097 BLAKE2B 3805cc7ca9bfc522acfc33734abec7521f8659e3e593294d7af803fab61efaf30f10d05294febb83cd50a016bf2b341a23e202ba958d1475631c38ccf8141bea SHA512 ec47ac06ca1b090e4a9a70023d3c7e03aff7defc0e94cb052a4f0f1343a395cf69b6a73d4907ed15061ba4c14f2c58e87b739cc5329688c1960e330f58dfc670
 EBUILD btrfs-progs-9999.ebuild 3097 BLAKE2B 3805cc7ca9bfc522acfc33734abec7521f8659e3e593294d7af803fab61efaf30f10d05294febb83cd50a016bf2b341a23e202ba958d1475631c38ccf8141bea SHA512 ec47ac06ca1b090e4a9a70023d3c7e03aff7defc0e94cb052a4f0f1343a395cf69b6a73d4907ed15061ba4c14f2c58e87b739cc5329688c1960e330f58dfc670
 MISC metadata.xml 523 BLAKE2B 7757fa4d4f1400bf08e2975e5214a1dd0c8258b61366c98089ca9c497b8c62e497cdedad605370f7034519b91c266b23e2e42bcafef3bb2bb69cb6b93319fa00 SHA512 3830f8f555ade672eeb52394a5b262e06e69b8b27d947d81dcde9b341fea9f16b77df8101ee5cd3314b6552543431a5f32a2592bf77a7a50e28cc56c95a4b164
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild
deleted file mode 100644
index 0beda5a218fc..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert doc python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-BDEPEND="
-	doc? (
-		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
-		app-text/docbook-xml-dtd:4.5
-		app-text/xmlto
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable doc documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-
-	# install prebuilt subset of manuals
-	use doc || doman Documentation/*.[58]
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.13.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.13.1.ebuild
new file mode 100644
index 000000000000..10909cb0c94d
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.13.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit bash-completion-r1 python-single-r1
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV="v${PV/_/-}"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+else
+	WANT_LIBTOOL=none
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert doc python reiserfs static static-libs +zstd"
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-apps/util-linux:0=[static-libs(+)?]
+	sys-libs/zlib:0=
+	convert? (
+		sys-fs/e2fsprogs:0=
+		sys-libs/e2fsprogs-libs:0=
+		reiserfs? (
+			>=sys-fs/reiserfsprogs-3.6.27
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	zstd? ( app-arch/zstd:0= )
+"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-5.10
+	convert? ( sys-apps/acl )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs:0[static-libs(+)]
+			sys-libs/e2fsprogs-libs:0[static-libs(+)]
+			reiserfs? (
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+			)
+		)
+		zstd? ( app-arch/zstd:0[static-libs(+)] )
+	)
+"
+BDEPEND="
+	doc? (
+		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
+		app-text/docbook-xml-dtd:4.5
+		app-text/xmlto
+	)
+"
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" sys-devel/gnuconfig"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		AT_M4DIR=m4 eautoreconf
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		$(use_enable convert)
+		$(use_enable doc documentation)
+		$(use_enable elibc_glibc backtrace)
+		$(use_enable python)
+		$(use_enable static-libs static)
+		$(use_enable zstd)
+		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_install() {
+	local makeargs=(
+		$(usex python install_python '')
+		$(usex static install-static '')
+	)
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+	newbashcomp btrfs-completion btrfs
+	use python && python_optimize
+
+	# install prebuilt subset of manuals
+	use doc || doman Documentation/*.[58]
+}
diff --git a/sys-fs/cachefilesd/Manifest b/sys-fs/cachefilesd/Manifest
index ddbc7b01414d..0fb1fee1ac9b 100644
--- a/sys-fs/cachefilesd/Manifest
+++ b/sys-fs/cachefilesd/Manifest
@@ -4,6 +4,6 @@ AUX cachefilesd-tmpfiles.d 32 BLAKE2B 26527e8c3b8e821fc05c6bb1ddd0a6cf74857f8219
 AUX cachefilesd.conf 296 BLAKE2B fce58c6af2016c45c0545b86c4dd98ffba8f58193af0b163a8ba83c297c9a9af944ba6d8997da5f1ac44c8cb331fafe94f93ed0b5fb4d4b14c5025cf6436b46e SHA512 6b82563b27b3a202afa6922bf4059836c7d363c5350d2b348ecca6ae12de2ae31d903e65b00f427712e7df22c0401b181177e168715e5e375b290f6d247fd846
 DIST cachefilesd-0.10.10.tar.bz2 26694 BLAKE2B c527a6283617ba53818e0cad1859544b1e66af1107b05d1f83904669425d31c5374f3c032b892c9d95892d02d9256bbd9b180f1d0b6b430f0cfa70440406ef9f SHA512 d7d816b5ef1fffe1272cb8c2e9cbd18c1393438afca250436a36a446c6a37303e7784057725a56be839e0489101190b563c4fc015fc4ff11baa8003121e5183a
 DIST cachefilesd-0.10.9.tar.bz2 26555 BLAKE2B da5df1d2c6715a7cc304b32842f00e69d356359abfae865cfc1b63b89e1149bcb48762ddf84d13f5d18b727d8e0693257d424e599c3874bbe842da9aed4a0cfe SHA512 06ab444a7df8ec37c15bc03554510f4acbb453e0730277f036abc5d61f9e377d90d9387dd5237ea481b95b1bf097b5992adce90ce971fe29760cc4c0d3c9cf34
-EBUILD cachefilesd-0.10.10-r1.ebuild 1554 BLAKE2B 5028a3afe6ce251736b7c1eab841ebf04817e43b4ade3242cb73bcd54de5ca709307c8f023305522022753e62bb1026bc7b252e9353e2db09ec52cf349720009 SHA512 2ca17a482e3b328bbd42b87610092192c53f5ab03c19a844aaed93591e1ba6e896142c0bda8ccbc3c4b39c49a06b5474c053ea54dabe4b98cc895dd8f537de41
-EBUILD cachefilesd-0.10.9.ebuild 1471 BLAKE2B f7520cc3beae29bf2db2115ee88f31d3c97485db9806802b297c6106c3a3b5c5f355bfd9e371ada6c0decea2cc3be35367ce6da40c3da66e4a458a7216f79e23 SHA512 9409bd10c3f393663004a2b0f1e1082ed59bdb8804a2cfcf68a1e683a5898c97bc242f45f6bd17bf3d2560343dba049e326154264a85d301eff7b11d3898f8d6
+EBUILD cachefilesd-0.10.10-r1.ebuild 1584 BLAKE2B 071ba66543118ba53e2893a9226bf6716d12250f226759c38697e43eb6818ebc5904389de3a9b839e20f912a211021cf7a2cd60594ffbfa3a0a34a01a7b23f9a SHA512 c158d7c153336ccbeceb63a1ba2c26dc3779fad2ee92ae3032e4a8e5275ef7d3814a2dc692a20d0f983587f396081794f43ccfe9993f077c82658af299e6b4a3
+EBUILD cachefilesd-0.10.9.ebuild 1501 BLAKE2B 40541a5c37516de1694a7bf485debe1ea56cae9a091e2456b34947c5d1b169083289150809c2777447c1ddb949650751d5a1e37b1f3ad0ac3896c7b5fab723f3 SHA512 80a5038fe9cbf257e981f1d54ebeed81c49b7a69adb7cf55092478a474732ad0c9dab4667b50913873ae39c8cb3cae6556f55668d2d47c76cc39ff9aebe23e94
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
index 495532b754a1..48fbad06a93a 100644
--- a/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
@@ -50,6 +50,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	[[ -d /var/cache/fscache ]] && return
 	elog "Before CacheFiles can be used, a directory for local storage"
 	elog "must be created.  The default configuration of /etc/cachefilesd.conf"
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
index 27984303d163..849ad870b21d 100644
--- a/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
@@ -46,6 +46,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	[[ -d /var/cache/fscache ]] && return
 	elog "Before CacheFiles can be used, a directory for local storage"
 	elog "must be created.  The default configuration of /etc/cachefilesd.conf"
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 54fdb74719ba..047661a33ba7 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,8 +3,8 @@ AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2
 AUX cryptsetup-2.0.4-fix-static-pwquality-build.patch 427 BLAKE2B dfdc56c6627084732973254cd52c48f0869aa7b4c58e466840a87f77c1d4fb09ae37295fb54e980abccfdfe51dc63161e188a0be9bb4bf3c69d7731120f84bac SHA512 23b5f9b21ec86c92787bfc8744682ce0777dfa87e1de97afbb8db33c4587f1e2c8e5f8c9d0fa56ca801d7795739f9a66f14633d8a3904ea68ddd58ddc3863adf
 DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
 DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2 SHA512 5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
-DIST cryptsetup-2.4.0-rc0.tar.xz 11145080 BLAKE2B e6425a54d14d93b712df42e7b9460e23afb8bcb74bbe164522a2399a26d3eb668bfcc6387e5934056cdf46fcf0c136601dc1617dcb96ded6d4251a8335442e27 SHA512 ed80cc7a1763cf0e788bd72eee979640d6133b98a7b294a3fa09c608273eef172c2d56d80802433143d01063a0c142e68ea06465392b273fc2615b8f90273b25
-EBUILD cryptsetup-2.3.4-r1.ebuild 3853 BLAKE2B d66f995f69cac742d0d1e6c22bccda546c49c74fc495fd43dad6469cb948214923f85119eae86f8d87989a6f689d20113048427d6238f2ee75910274a1fe3512 SHA512 ad6cd0dc0f2ca709ee380046c2d5b5b23f198fd2fff59197f052138b765752ee018b24e76de3ad929ca15fae14d736b25b643f7055f682cc02b61de4083976b6
-EBUILD cryptsetup-2.3.6.ebuild 3853 BLAKE2B d66f995f69cac742d0d1e6c22bccda546c49c74fc495fd43dad6469cb948214923f85119eae86f8d87989a6f689d20113048427d6238f2ee75910274a1fe3512 SHA512 ad6cd0dc0f2ca709ee380046c2d5b5b23f198fd2fff59197f052138b765752ee018b24e76de3ad929ca15fae14d736b25b643f7055f682cc02b61de4083976b6
-EBUILD cryptsetup-2.4.0_rc0.ebuild 4063 BLAKE2B 0bb3d1c586db729de6c1d2a48ed8ddf3e0cb41dda4185797b48dfab31bb61633df662b1a200f83285a48b1ed2c6bc8139066f2556e3742851639f3d5b8767c4d SHA512 50f77d38592217e2f72dd866c54115e52a2dbcea0c8a1feeb68cb11280ecc590f03eb1ea6112cf9d3b9ff730a365bc757b235a5a1f30dfbf9d0b83039f44a527
+DIST cryptsetup-2.4.0-rc1.tar.xz 11148144 BLAKE2B e3ae27231b0a4e634be35b1c767aa74e50d09b14339ad82678df1058eeda7b3280f8aaf0e0ccbf039fe632564974f778dac524311767ab7e3c6a419afbd3cb2b SHA512 73f07e7963624111d916f9791617af52bdf614be04da8462603aa17e0b10f28f681eca2bc991c74c9c3804a4ffc9714f7d075242631f5b77a86462bc57bade93
+EBUILD cryptsetup-2.3.4-r2.ebuild 3916 BLAKE2B ef3b9cb1322bfd44370a9e6340476017ec8441fc9bab9c344a194ad147bdb7a27b28d38a1c06f4c3930ad7a4960eb426af36c830f6db95723862c0bb42d1c4b0 SHA512 7df3da59e92df22745f3c9fc7b9f3e7d5b6e419182cd4529fa8734048e542c9c8f90ea276f28c23f74ef6717c624487d4d3840b9ce3f5bfe1050bd1d9d09d416
+EBUILD cryptsetup-2.3.6-r1.ebuild 3916 BLAKE2B ef3b9cb1322bfd44370a9e6340476017ec8441fc9bab9c344a194ad147bdb7a27b28d38a1c06f4c3930ad7a4960eb426af36c830f6db95723862c0bb42d1c4b0 SHA512 7df3da59e92df22745f3c9fc7b9f3e7d5b6e419182cd4529fa8734048e542c9c8f90ea276f28c23f74ef6717c624487d4d3840b9ce3f5bfe1050bd1d9d09d416
+EBUILD cryptsetup-2.4.0_rc1-r1.ebuild 4126 BLAKE2B 076450aeefdc22e92f8ebeeb2a96664ebf1fc15dc3b11d57c1c4e83f35711c6b8b931cfdffda2e7a31c20a2703524666c8c77ae82fd48ee7b409442fdc7d5e4a SHA512 9c45be16d0519ee47a1fc7f827c0f7eac1bcca69346147b5e68834b3d2c8fe0b27c68dfbac5b9c70a7defa3ed55b988cf71da838aed3b47018b82cb95aecf17d
 MISC metadata.xml 1075 BLAKE2B cd8afdb9fb1117d48e88b4aa6dd7ec9b6e072fe12d8880de6dd4dfe2fe018bf25910da08056274f43ee6b93e672041b25f214694b2f6e46bc75c8fb63318b1b3 SHA512 6539b510c89c1e335897c7c32550f86fdc0bd7958977fc9d4188e664a21db84c8b333938a4e03e147f023d1404ac6291999a4bd943a131bbc1bc26d907877e25
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
deleted file mode 100644
index e96df12d24be..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-	dev-libs/json-c:=[static-libs(+)]
-	dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
-	argon2? ( app-crypt/argon2:=[static-libs(+)] )
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? ( dev-libs/openssl:0=[static-libs(+)] )
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(-)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	local myeconfargs=(
-		--disable-internal-argon2
-		--enable-shared
-		--sbindir=/sbin
-		# for later use
-		--with-default-luks-format=LUKS2
-		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
-		$(use_enable argon2 libargon2)
-		$(use_enable nls)
-		$(use_enable pwquality)
-		$(use_enable reencrypt cryptsetup-reencrypt)
-		$(use_enable static static-cryptsetup)
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable !urandom dev-random)
-		$(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-
-	default
-}
-
-src_install() {
-	default
-
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		if use reencrypt ; then
-			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
-		fi
-	fi
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc docs/v*ReleaseNotes
-
-	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4-r2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.4-r2.ebuild
new file mode 100644
index 000000000000..3c4bf01a993c
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4-r2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info tmpfiles
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+	dev-libs/json-c:=[static-libs(+)]
+	dev-libs/libgpg-error[static-libs(+)]
+	dev-libs/popt[static-libs(+)]
+	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
+	argon2? ( app-crypt/argon2:=[static-libs(+)] )
+	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+	openssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+	sys-fs/lvm2[static-libs(+)]
+	udev? ( virtual/libudev[static-libs(-)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
+
+pkg_setup() {
+	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+}
+
+src_prepare() {
+	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use kernel ; then
+		ewarn "Note that kernel backend is very slow for this type of operation"
+		ewarn "and is provided mainly for embedded systems wanting to avoid"
+		ewarn "userspace crypto libraries."
+	fi
+
+	local myeconfargs=(
+		--disable-internal-argon2
+		--enable-shared
+		--sbindir=/sbin
+		# for later use
+		--with-default-luks-format=LUKS2
+		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+		$(use_enable argon2 libargon2)
+		$(use_enable nls)
+		$(use_enable pwquality)
+		$(use_enable reencrypt cryptsetup-reencrypt)
+		$(use_enable static static-cryptsetup)
+		$(use_enable static-libs static)
+		$(use_enable udev)
+		$(use_enable !urandom dev-random)
+		$(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if [[ ! -e /dev/mapper/control ]] ; then
+		ewarn "No /dev/mapper/control found -- skipping tests"
+		return 0
+	fi
+
+	local p
+	for p in /dev/mapper /dev/loop* ; do
+		addwrite ${p}
+	done
+
+	default
+}
+
+src_install() {
+	default
+
+	if use static ; then
+		mv "${ED}"/sbin/cryptsetup{.static,} || die
+		mv "${ED}"/sbin/veritysetup{.static,} || die
+		if use reencrypt ; then
+			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
+		fi
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	dodoc docs/v*ReleaseNotes
+
+	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+}
+
+pkg_postinst() {
+	tmpfiles_process cryptsetup.conf
+}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
new file mode 100644
index 000000000000..3c4bf01a993c
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info tmpfiles
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+	dev-libs/json-c:=[static-libs(+)]
+	dev-libs/libgpg-error[static-libs(+)]
+	dev-libs/popt[static-libs(+)]
+	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
+	argon2? ( app-crypt/argon2:=[static-libs(+)] )
+	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+	openssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+	sys-fs/lvm2[static-libs(+)]
+	udev? ( virtual/libudev[static-libs(-)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
+
+pkg_setup() {
+	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+}
+
+src_prepare() {
+	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use kernel ; then
+		ewarn "Note that kernel backend is very slow for this type of operation"
+		ewarn "and is provided mainly for embedded systems wanting to avoid"
+		ewarn "userspace crypto libraries."
+	fi
+
+	local myeconfargs=(
+		--disable-internal-argon2
+		--enable-shared
+		--sbindir=/sbin
+		# for later use
+		--with-default-luks-format=LUKS2
+		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+		$(use_enable argon2 libargon2)
+		$(use_enable nls)
+		$(use_enable pwquality)
+		$(use_enable reencrypt cryptsetup-reencrypt)
+		$(use_enable static static-cryptsetup)
+		$(use_enable static-libs static)
+		$(use_enable udev)
+		$(use_enable !urandom dev-random)
+		$(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if [[ ! -e /dev/mapper/control ]] ; then
+		ewarn "No /dev/mapper/control found -- skipping tests"
+		return 0
+	fi
+
+	local p
+	for p in /dev/mapper /dev/loop* ; do
+		addwrite ${p}
+	done
+
+	default
+}
+
+src_install() {
+	default
+
+	if use static ; then
+		mv "${ED}"/sbin/cryptsetup{.static,} || die
+		mv "${ED}"/sbin/veritysetup{.static,} || die
+		if use reencrypt ; then
+			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
+		fi
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	dodoc docs/v*ReleaseNotes
+
+	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+}
+
+pkg_postinst() {
+	tmpfiles_process cryptsetup.conf
+}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
deleted file mode 100644
index e96df12d24be..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-	dev-libs/json-c:=[static-libs(+)]
-	dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
-	argon2? ( app-crypt/argon2:=[static-libs(+)] )
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? ( dev-libs/openssl:0=[static-libs(+)] )
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(-)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	local myeconfargs=(
-		--disable-internal-argon2
-		--enable-shared
-		--sbindir=/sbin
-		# for later use
-		--with-default-luks-format=LUKS2
-		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
-		$(use_enable argon2 libargon2)
-		$(use_enable nls)
-		$(use_enable pwquality)
-		$(use_enable reencrypt cryptsetup-reencrypt)
-		$(use_enable static static-cryptsetup)
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable !urandom dev-random)
-		$(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-
-	default
-}
-
-src_install() {
-	default
-
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		if use reencrypt ; then
-			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
-		fi
-	fi
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc docs/v*ReleaseNotes
-
-	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild
deleted file mode 100644
index 6a8851cfee43..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs +udev urandom ssh"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-	dev-libs/json-c:=[static-libs(+)]
-	dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
-	argon2? ( app-crypt/argon2:=[static-libs(+)] )
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? ( dev-libs/openssl:0=[static-libs(+)] )
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	ssh? ( net-libs/libssh[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(-)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	local myeconfargs=(
-		--disable-internal-argon2
-		--enable-shared
-		--sbindir=/sbin
-		# for later use
-		--with-default-luks-format=LUKS2
-		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
-		$(use_enable argon2 libargon2)
-		$(use_enable nls)
-		$(use_enable pwquality)
-		$(use_enable reencrypt cryptsetup-reencrypt)
-		$(use_enable static static-cryptsetup)
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable !urandom dev-random)
-		$(use_enable ssh ssh-token)
-		$(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-
-	default
-}
-
-src_install() {
-	default
-
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		mv "${ED}"/sbin/integritysetup{.static,} || die
-		if use ssh ; then
-			mv "${ED}"/sbin/cryptsetup-ssh{.static,} || die
-		fi
-		if use reencrypt ; then
-			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
-		fi
-	fi
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc docs/v*ReleaseNotes
-
-	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..3e204ddad194
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info tmpfiles
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+	dev-libs/json-c:=[static-libs(+)]
+	dev-libs/libgpg-error[static-libs(+)]
+	dev-libs/popt[static-libs(+)]
+	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
+	argon2? ( app-crypt/argon2:=[static-libs(+)] )
+	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+	openssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+	ssh? ( net-libs/libssh[static-libs(+)] )
+	sys-fs/lvm2[static-libs(+)]
+	udev? ( virtual/libudev[static-libs(-)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
+
+pkg_setup() {
+	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+}
+
+src_prepare() {
+	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use kernel ; then
+		ewarn "Note that kernel backend is very slow for this type of operation"
+		ewarn "and is provided mainly for embedded systems wanting to avoid"
+		ewarn "userspace crypto libraries."
+	fi
+
+	local myeconfargs=(
+		--disable-internal-argon2
+		--enable-shared
+		--sbindir=/sbin
+		# for later use
+		--with-default-luks-format=LUKS2
+		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+		$(use_enable argon2 libargon2)
+		$(use_enable nls)
+		$(use_enable pwquality)
+		$(use_enable reencrypt cryptsetup-reencrypt)
+		$(use_enable static static-cryptsetup)
+		$(use_enable static-libs static)
+		$(use_enable udev)
+		$(use_enable !urandom dev-random)
+		$(use_enable ssh ssh-token)
+		$(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if [[ ! -e /dev/mapper/control ]] ; then
+		ewarn "No /dev/mapper/control found -- skipping tests"
+		return 0
+	fi
+
+	local p
+	for p in /dev/mapper /dev/loop* ; do
+		addwrite ${p}
+	done
+
+	default
+}
+
+src_install() {
+	default
+
+	if use static ; then
+		mv "${ED}"/sbin/cryptsetup{.static,} || die
+		mv "${ED}"/sbin/veritysetup{.static,} || die
+		mv "${ED}"/sbin/integritysetup{.static,} || die
+		if use ssh ; then
+			mv "${ED}"/sbin/cryptsetup-ssh{.static,} || die
+		fi
+		if use reencrypt ; then
+			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
+		fi
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	dodoc docs/v*ReleaseNotes
+
+	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+}
+
+pkg_postinst() {
+	tmpfiles_process cryptsetup.conf
+}
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 6521e7d1c12c..f86db311c939 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -4,7 +4,7 @@ DIST fuse-3.10.3.tar.xz 2558792 BLAKE2B 5b730321677e5080148c2ca5db35ed14b6f1919c
 DIST fuse-3.10.4.tar.xz 2787472 BLAKE2B 174b51bf55544bbc08e04089a4d8685b371d3f584e337ed0d8d82c62e10c14b6ef14a964d6627e8a121036db1ab4c6c1ccd413c08f8685d3d91893874427e46f SHA512 1cb7600dc04f148b15ec3183d0348320dd946cf15d4077798e7e34fe7e8202837718c8b8bd1f190b7dddda2453ee2b0433d77e18f142ecb7affec1cae29520f6
 DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
 EBUILD fuse-2.9.9-r1.ebuild 2056 BLAKE2B a62986e92f4deb4993f4c0bd71996c1f2b4be435e396dc869f8fda9d6b0c3e74e397a6388fb66b076cc5bbc441d3122aa8ea7c788d5a96b82386621e1427b882 SHA512 0c65cac78140b2baf6ce8c3342c99cb52a1746b0a7d0a21d4e44955d56d7fd5b334b020ffd2cb1bb982f9652b422e7555d05ab2ff5746b664786e5c2f3c38bf8
-EBUILD fuse-3.10.3.ebuild 1780 BLAKE2B 8353528e780c89cd401d0d9edfbfe48e5483e555f953c7f55e143ea6d14f2da86d51c86b6a88917d4fe58a09feb6e4c3b194a2cfed3adeac14e124a3b0e825be SHA512 4218dbf5460324b4f0944f5154ec04da949c5d3dc7b097cd6abffc62cad6351195d007c6d8ad09df71a444c3245f76b641648a47b1d50e097c13f58f4b585778
+EBUILD fuse-3.10.3.ebuild 1779 BLAKE2B c6b51c0cb628354f575d7428a6fd1db86a9a8db3c400f425170334c74409599f079bb5195338b9f1b8325cf7eaeb4a6e52672eec253e7ddf018c84c5687c0930 SHA512 3f52e1f3b2fee5b8704c01d7309c4f0864a48c688731bc54662c7eb96107ea0468f3402df22ff71409311311736f114c6f6c76e43b5ca6f06687cbaf6e7f38cb
 EBUILD fuse-3.10.4.ebuild 1787 BLAKE2B 19b6886011b27cb4ecb6e8128d23833b78c6f97c349b1b65e290607c0ee24a186ff5945ac3f689905162cfba719aad02ebe2269cc6ca0ab33aeeb16eb2edf22a SHA512 b81a884161020b1d1e284e47b0857e0edb4543f3ae504409f2f2f1f2c798e137626a20f914cb1217d42e8273493bad61e9c2e5c12e5d18feb2da38dec2279d80
 EBUILD fuse-3.9.3.ebuild 1909 BLAKE2B 1782605f62d587f1677e140cd2dcf714c2420d642d164a1cfafdbd1270d8a79881ff3daefe168fd9b5fea7dfbf95c994878106493ca89a84cdcbeaf41362dabe SHA512 2dac127d407278184c69798fd84c2f1520a48a31122ef33988efeab878dd942fa82b2abf62098a0ae52b3ffcfe3a5cfc883690bd642238112069f36c0575034e
 MISC metadata.xml 460 BLAKE2B a8f51e9fc0148b7bcc163ea5e0f72291f9e36f3dad8c20076495fe32cb8d5fe992579ab069f840bca251164ff646c522ee0b7ad5ffa7b3115effa89d5acfe332 SHA512 e56ba815557e847487dbc76dbec4ae657c7c4ecebc9b3c02c39402daa699c5ff90923bcaf1843747c94d2025f339ca6521f35f48c6c4583d36e9de33e6f3a586
diff --git a/sys-fs/fuse/fuse-3.10.3.ebuild b/sys-fs/fuse/fuse-3.10.3.ebuild
index 23c420f21ebc..80905c5ccb83 100644
--- a/sys-fs/fuse/fuse-3.10.3.ebuild
+++ b/sys-fs/fuse/fuse-3.10.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+suid test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 2e37ad06efce..65ae527b84f9 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -3,6 +3,6 @@ AUX multipath-tools-0.8.6-no-compress-man-pages.patch 8056 BLAKE2B 6e1ef1680538f
 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
 AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e
 DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
-EBUILD multipath-tools-0.8.6-r1.ebuild 2143 BLAKE2B e43f6abb36ea701d747513b6ac01344872b9e36c976f3f8213a51406d767047af9e69e0f1e4c6436852397fc597c57f89dc819985249362fed8e491015a47211 SHA512 c958b3bc9ade0daa842992efe67499ecd86d7948057bd1fcc88d158e5109539e5ac20ce5aaa17d6d73125158a38aa4dabbe4eb150dec8f282ebfa3b189b0d062
+EBUILD multipath-tools-0.8.6-r1.ebuild 2141 BLAKE2B 70dc0bdd9bc5d7d4fff9a64d883841410265f541c10e24d79e64708422f32a9a6b9eaf561054292bac27ff46a66b5c4c56086a7eadc3819bc0e7a7d8df4ad0e8 SHA512 1f4c59f6ea83c0463f7350a2ee3f6003ca081c33c965db90b26dcd4152682c60b6449cf438e5ee8d0b2a7f2a2380cc2af8a3379a4f9e2bc68ca84ef070e0b43e
 EBUILD multipath-tools-0.8.6.ebuild 2078 BLAKE2B 185d6508999de14cb02f9db69823b561cc62d9dbe596828421cd2381c656301874bb3f43052042b5a3179ca8de469914557acc7369109cdd5ef9c267b5493059 SHA512 c591a02efae279dce30f20f6ba5647eeec4d353e29f38f07a4677c0a683b07ad24a7471e7316e8e4063df43c4bca0833bbdef653ffa8e833566a9bb7fdb14c2a
 MISC metadata.xml 452 BLAKE2B e950c42b1b03518526a348e0bb2a6ad8d2b912e14f71562d4249d1adeaf149443621d4518a6fdf7912e8efeb40634177a0da7d944d2142c7eb851231356a353c SHA512 2bd1aab9e07240502a4bd344c9ed73df3c677f41083f76865862e679c613dbf23957bce83469b5ddb9afa43fda13b7cf2fa4efb31da9b89a9ec91631260111b2
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
index 8dff4dda6bf3..7a3d1e0718c2 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 805c1d0b0c4d..319b0f2a6d56 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,13 +1,7 @@
 AUX 249-libudev-static.patch 1454 BLAKE2B 420f9452066ccf951033c1ae1e215284fa9d11f24777c68ecd0178db5c7571ee881451300d409468c1ba3f3b2ad4b35adca5b2761309c84b315bbabd45f6b97f SHA512 4d616b4b02981c4622951a46f23519e03c2d1228453837d31fe060db70afa24722883ca57c08c55cd9fd35c720a5ef2ecb11ab3313867e1b3cfc3682e45e3f45
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
-DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1cb190b25e4dbf0a8f2be075d04a3cbe92e2fee5bb6a03b73bd8195d8c7b691661b39b7850547d512219cc40af SHA512 486f6ac6c2897a2aac97a59306091a03fd50768340407401e1f088ea5b21c67dae726bff4cbe53cec6b89a8f0ee72205b340165a4fe3a3c16cff6d176506c6e0
 DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
-DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
-DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
-EBUILD udev-245.5-r1.ebuild 5968 BLAKE2B 67f2fddbebf375b7901ffc12c0f0c50f4745acf0a24d5e5b5955910a1f1403c523a024538e29b41985a2638e3f35e919517e1789a22208b975c31b0499d62815 SHA512 0d805c6259030058a1e22b0a69bb427df1c8eacc7d4c0fe5a78c76ddbb3e5da5995d24f1832cd70db12735c58ffef3a70a2d8accfddd8c4c423b8152996cac1a
-EBUILD udev-246-r1.ebuild 5967 BLAKE2B 3b1af1762b4a31f83084cc616770769e54772ab4be84e279e56764e0c9693da670e91f67acaa102de44e2d8eb469a84b1a3e7dca4a3053e388fe270d939b736b SHA512 ff1cbb4d84cc5caf468db8b79750bf0631c26d65200bc2f76c4776ac84e6bceebc189d7f8fd8733ff29f67cf826484eaa5dd162c03682bee2233181279a40cf1
-EBUILD udev-247.2.ebuild 5688 BLAKE2B da40822cb40389a42ef0e11f65fefa8d13b121b8e10a3cc6bb68056a081f2aafe12cabb7394b9b022fc8c3fc5718e5d6b2b3cd8f8ce04457e1a766e882abc5cc SHA512 83f80cbe8f786264b86dd3b880759d3519942805f2625e3e171e88601ede87cb488c4b3ec98e8a5e7e3f3023a2a244c6c3cd465fdb82f1e148883a88757891ba
 EBUILD udev-248.ebuild 5475 BLAKE2B 70b628ed25d8f5b39c556e680bece42604ba30ff083fe7e0f2e77a677dc8f89a7aafcea7fadfec4f756aad03c0f9b19dae34f1a43bff724444fa429d55ab183d SHA512 1954e732be787b8a9b9454ae0987bbc2276de6b7e71ec8d260d5e1c835bb9a1f68c04843709f42c791e58ad43c70f5146f5faeaf1e776353119b5ad15404d901
 EBUILD udev-249-r1.ebuild 5776 BLAKE2B 909f1699e70b77b0347f35fa3353cc16021870aea15fbdf4faca6623327a22237ca78a9891e4e141cf72ae682023611155234cac4fb6008e6ccc1cfb97d9eef5 SHA512 1ec11b20403555deb4d7725289af1a214550aa92d3aea2d39807a1d26a73764e499eed1b3b8deec9300e406c5eb9efab24ae01d365fb9055728660b2c74bacba
 EBUILD udev-9999.ebuild 5735 BLAKE2B 7847f1af44dd1dd3b85b9144c690066260297ab2beba5cc86be946838f3a07b7976b108629f8d50424b6cc3bfe37e60c3ed87262a44465d42c68c689fb70db16 SHA512 68ee2e626625d6fbd7c7747b0e6788329b3a81015ebe3f6db1d65bc3bca8cbe8e56792ffe2a9acb736395c2549d0f6969f1fadd2cd00eec950ed5726674c05dd
diff --git a/sys-fs/udev/udev-245.5-r1.ebuild b/sys-fs/udev/udev-245.5-r1.ebuild
deleted file mode 100644
index 1322ad2f6057..000000000000
--- a/sys-fs/udev/udev-245.5-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 2003-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="acl +kmod selinux static-libs"
-
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	virtual/pkgconfig
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-"
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl )
-	kmod? ( >=sys-apps/kmod-15 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.9
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/kmem
-	acct-group/tty
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/lp
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-"
-PDEPEND=">=sys-apps/hwids-20140304[udev]
-	>=sys-fs/udev-init-scripts-26"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
-		linux-info_pkg_setup
-
-		# CONFIG_FHANDLE was introduced by 2.6.39
-		local MINKV=2.6.39
-
-		if kernel_is -lt ${MINKV//./ }; then
-			eerror "Your running kernel is too old to run this version of ${P}"
-			eerror "You need to upgrade kernel at least to ${MINKV}"
-		fi
-
-		if kernel_is -lt 3 7; then
-			ewarn "Your running kernel is too old to have firmware loader and"
-			ewarn "this version of ${P} doesn't have userspace firmware loader"
-			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
-		fi
-	fi
-}
-
-src_prepare() {
-	cat <<-EOF > "${T}"/40-gentoo.rules
-	# Gentoo specific floppy and usb groups
-	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
-	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-	EOF
-
-	if [[ -d "${WORKDIR}/patches" ]]; then
-		eapply "${WORKDIR}/patches"
-	fi
-
-	local PATCHES=(
-	)
-
-	default
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dacl=$(meson_multilib_native_use acl)
-		-Defi=false
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Dlink-udev-shared=false
-		-Dsplit-usr=true
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dstatic-libudev=$(usex static-libs true false)
-
-		# Prevent automagic deps
-		-Dgcrypt=false
-		-Dlibcryptsetup=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dseccomp=false
-		-Dlz4=false
-		-Dxz=false
-	)
-	meson_src_configure
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-	python_setup
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	# meson creates this link
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	local targets=(
-		src/udev/${libudev}
-	)
-	if use static-libs; then
-		targets+=( src/udev/libudev.a )
-	fi
-	if multilib_is_native_abi; then
-		targets+=(
-			systemd-udevd
-			udevadm
-			src/udev/ata_id
-			src/udev/cdrom_id
-			src/udev/fido_id
-			src/udev/mtd_probe
-			src/udev/scsi_id
-			src/udev/v4l_id
-			man/udev.conf.5
-			man/systemd.link.5
-			man/hwdb.7
-			man/udev.7
-			man/systemd-udevd.service.8
-			man/udevadm.8
-		)
-	fi
-	eninja "${targets[@]}"
-}
-
-multilib_src_install() {
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
-	gen_usr_ldscript -a udev
-	use static-libs && dolib.a src/udev/libudev.a
-
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins src/libudev/libudev.pc
-
-	if multilib_is_native_abi; then
-		into /
-		dobin udevadm
-
-		exeinto /lib/systemd
-		doexe systemd-udevd
-
-		exeinto /lib/udev
-		doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
-		rm rules.d/99-systemd.rules || die
-		insinto /lib/udev/rules.d
-		doins rules.d/*.rules
-
-		insinto /usr/share/pkgconfig
-		doins src/udev/udev.pc
-
-		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
-		rm man/systemd-udevd-{control,kernel}.socket.8 || die
-		doman man/*.[0-9]
-	fi
-}
-
-multilib_src_install_all() {
-	doheader src/libudev/libudev.h
-
-	insinto /etc/udev
-	doins src/udev/udev.conf
-	keepdir /etc/udev/{hwdb.d,rules.d}
-
-	insinto /lib/systemd/network
-	doins network/99-default.link
-
-	# see src_prepare() for content of 40-gentoo.rules
-	insinto /lib/udev/rules.d
-	doins "${T}"/40-gentoo.rules
-	doins "${S}"/rules.d/*.rules
-
-	dobashcomp shell-completion/bash/udevadm
-
-	insinto /usr/share/zsh/site-functions
-	doins shell-completion/zsh/_udevadm
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	# Update hwdb database in case the format is changed by udev version.
-	if has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT}"
-		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
-	fi
-}
diff --git a/sys-fs/udev/udev-246-r1.ebuild b/sys-fs/udev/udev-246-r1.ebuild
deleted file mode 100644
index 5fc08f3b74af..000000000000
--- a/sys-fs/udev/udev-246-r1.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 2003-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="acl +kmod selinux static-libs"
-
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	virtual/pkgconfig
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-"
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl )
-	kmod? ( >=sys-apps/kmod-15 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.9
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/kmem
-	acct-group/tty
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/lp
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-"
-PDEPEND=">=sys-apps/hwids-20140304[udev]
-	>=sys-fs/udev-init-scripts-34"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
-		linux-info_pkg_setup
-
-		# CONFIG_FHANDLE was introduced by 2.6.39
-		local MINKV=2.6.39
-
-		if kernel_is -lt ${MINKV//./ }; then
-			eerror "Your running kernel is too old to run this version of ${P}"
-			eerror "You need to upgrade kernel at least to ${MINKV}"
-		fi
-
-		if kernel_is -lt 3 7; then
-			ewarn "Your running kernel is too old to have firmware loader and"
-			ewarn "this version of ${P} doesn't have userspace firmware loader"
-			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
-		fi
-	fi
-}
-
-src_prepare() {
-	cat <<-EOF > "${T}"/40-gentoo.rules
-	# Gentoo specific floppy and usb groups
-	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
-	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-	EOF
-
-	if [[ -d "${WORKDIR}/patches" ]]; then
-		eapply "${WORKDIR}/patches"
-	fi
-
-	local PATCHES=(
-	)
-
-	default
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dacl=$(meson_multilib_native_use acl)
-		-Defi=false
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Dlink-udev-shared=false
-		-Dsplit-usr=true
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dstatic-libudev=$(usex static-libs true false)
-
-		# Prevent automagic deps
-		-Dgcrypt=false
-		-Dlibcryptsetup=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dseccomp=false
-		-Dlz4=false
-		-Dxz=false
-	)
-	meson_src_configure
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-	python_setup
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	# meson creates this link
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	local targets=(
-		src/udev/${libudev}
-	)
-	if use static-libs; then
-		targets+=( src/udev/libudev.a )
-	fi
-	if multilib_is_native_abi; then
-		targets+=(
-			udevadm
-			src/udev/ata_id
-			src/udev/cdrom_id
-			src/udev/fido_id
-			src/udev/mtd_probe
-			src/udev/scsi_id
-			src/udev/v4l_id
-			man/udev.conf.5
-			man/systemd.link.5
-			man/hwdb.7
-			man/udev.7
-			man/systemd-udevd.service.8
-			man/udevadm.8
-		)
-	fi
-	eninja "${targets[@]}"
-}
-
-multilib_src_install() {
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
-	gen_usr_ldscript -a udev
-	use static-libs && dolib.a src/udev/libudev.a
-
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins src/libudev/libudev.pc
-
-	if multilib_is_native_abi; then
-		into /
-		dobin udevadm
-
-		dosym ../../bin/udevadm /lib/systemd/systemd-udevd
-
-		exeinto /lib/udev
-		doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
-		rm rules.d/99-systemd.rules || die
-		insinto /lib/udev/rules.d
-		doins rules.d/*.rules
-
-		insinto /usr/share/pkgconfig
-		doins src/udev/udev.pc
-
-		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
-		rm man/systemd-udevd-{control,kernel}.socket.8 || die
-		doman man/*.[0-9]
-	fi
-}
-
-multilib_src_install_all() {
-	doheader src/libudev/libudev.h
-
-	insinto /etc/udev
-	doins src/udev/udev.conf
-	keepdir /etc/udev/{hwdb.d,rules.d}
-
-	insinto /lib/systemd/network
-	doins network/99-default.link
-
-	# see src_prepare() for content of 40-gentoo.rules
-	insinto /lib/udev/rules.d
-	doins "${T}"/40-gentoo.rules
-	doins "${S}"/rules.d/*.rules
-
-	dobashcomp shell-completion/bash/udevadm
-
-	insinto /usr/share/zsh/site-functions
-	doins shell-completion/zsh/_udevadm
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	# Update hwdb database in case the format is changed by udev version.
-	if has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT}"
-		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
-	fi
-}
diff --git a/sys-fs/udev/udev-247.2.ebuild b/sys-fs/udev/udev-247.2.ebuild
deleted file mode 100644
index b1dfe60bc551..000000000000
--- a/sys-fs/udev/udev-247.2.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 2003-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="acl +kmod selinux static-libs"
-
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	virtual/pkgconfig
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-"
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl )
-	kmod? ( >=sys-apps/kmod-15 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.9
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/kmem
-	acct-group/tty
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/lp
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-"
-PDEPEND=">=sys-apps/hwids-20140304[udev]
-	>=sys-fs/udev-init-scripts-34"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
-		linux-info_pkg_setup
-
-		# CONFIG_FHANDLE was introduced by 2.6.39
-		local MINKV=2.6.39
-
-		if kernel_is -lt ${MINKV//./ }; then
-			eerror "Your running kernel is too old to run this version of ${P}"
-			eerror "You need to upgrade kernel at least to ${MINKV}"
-		fi
-
-		if kernel_is -lt 3 7; then
-			ewarn "Your running kernel is too old to have firmware loader and"
-			ewarn "this version of ${P} doesn't have userspace firmware loader"
-			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
-		fi
-	fi
-}
-
-src_prepare() {
-	local PATCHES=(
-	)
-
-	default
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dacl=$(meson_multilib_native_use acl)
-		-Defi=false
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Dlink-udev-shared=false
-		-Dsplit-usr=true
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dstatic-libudev=$(usex static-libs true false)
-
-		# Prevent automagic deps
-		-Dgcrypt=false
-		-Dlibcryptsetup=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dp11kit=false
-		-Dseccomp=false
-		-Dlz4=false
-		-Dxz=false
-	)
-	meson_src_configure
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-	python_setup
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	# meson creates this link
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	local targets=(
-		src/udev/${libudev}
-	)
-	if use static-libs; then
-		targets+=( src/udev/libudev.a )
-	fi
-	if multilib_is_native_abi; then
-		targets+=(
-			udevadm
-			src/udev/ata_id
-			src/udev/cdrom_id
-			src/udev/fido_id
-			src/udev/mtd_probe
-			src/udev/scsi_id
-			src/udev/v4l_id
-			man/udev.conf.5
-			man/systemd.link.5
-			man/hwdb.7
-			man/udev.7
-			man/systemd-udevd.service.8
-			man/udevadm.8
-		)
-	fi
-	eninja "${targets[@]}"
-}
-
-multilib_src_install() {
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
-	gen_usr_ldscript -a udev
-	use static-libs && dolib.a src/udev/libudev.a
-
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins src/libudev/libudev.pc
-
-	if multilib_is_native_abi; then
-		into /
-		dobin udevadm
-
-		dosym ../../bin/udevadm /lib/systemd/systemd-udevd
-
-		exeinto /lib/udev
-		doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
-		rm rules.d/99-systemd.rules || die
-		insinto /lib/udev/rules.d
-		doins rules.d/*.rules
-
-		insinto /usr/share/pkgconfig
-		doins src/udev/udev.pc
-
-		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
-		rm man/systemd-udevd-{control,kernel}.socket.8 || die
-		doman man/*.[0-9]
-	fi
-}
-
-multilib_src_install_all() {
-	doheader src/libudev/libudev.h
-
-	insinto /etc/udev
-	doins src/udev/udev.conf
-	keepdir /etc/udev/{hwdb.d,rules.d}
-
-	insinto /lib/systemd/network
-	doins network/99-default.link
-
-	# see src_prepare() for content of 40-gentoo.rules
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-	doins "${S}"/rules.d/*.rules
-
-	dobashcomp shell-completion/bash/udevadm
-
-	insinto /usr/share/zsh/site-functions
-	doins shell-completion/zsh/_udevadm
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	# Update hwdb database in case the format is changed by udev version.
-	if has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT}"
-		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
-	fi
-}
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 7b2a72c3467c..845b40e1a787 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,5 +1,5 @@
 DIST udisks-2.9.1.tar.bz2 1680327 BLAKE2B 6573dd91decfaece6668a9848fc5ff276190c0d2be272e2d0fa550274a3e20df4038a87dd5fbb7b1b6a33a4c94f5668d01297d583da7df7027353353ef3936f4 SHA512 a360cafc65375153c5de65f817eecbc65d56a9d9167222e1adbc8f57568d15ccf7ed317e8e0b567340f250ca9247196de104442191bd069510f72dfc5ed65eb3
 DIST udisks-2.9.2.tar.bz2 1701377 BLAKE2B 402cf2354907acee13230d035c8b22634a70efab0e61939d8ff260391c80a0d166de67f57cc4b78025da027df16deb07c5620ab546d37181681d824ea84d0e8c SHA512 73a162bbb0fd6ec1e6a79af2a01185672712d7e94eacdc1a913f559a87fc620a095fe4c8b4dacbaa12bc816f565fc966d28c2f9299104da18581d4879321aee9
-EBUILD udisks-2.9.1-r1.ebuild 3446 BLAKE2B d42d0f9cdffdcec6f22ee1d03ed7a6d8b69075586e38adc316e794b67daaadc3fd48da317a813d5c5a02cae6a5f0f1c4399a3caad73175ef178e44380f21badb SHA512 d5a5e129d0f8ffe1a1c7e3e7208f2392d5d5bf9913ae19bb8a2aa5fa413cec96f450041ca54c83e8483279e41d9091d8d4733e67ad37c118d955eef69c744bf4
-EBUILD udisks-2.9.2-r1.ebuild 3568 BLAKE2B a2e34c2603f70bbe9eed4d8aadadbb966fcafb6e55fa11032e9a04090d06c889dc551c39d621e29b3300807d0f3a6516203be73ce9ea350172d437f20200f748 SHA512 d0cebbe4f56339110685a6227c3e05a9d8c21226ed0254aa950ea5bd4e85694b156d7e37e9d8e9bca5e32aa86c8ef5fda83b00a9c770a3d35a9a74b1054ce7d7
+EBUILD udisks-2.9.1-r2.ebuild 3529 BLAKE2B 45aa4d904dd309b528754dd7077a1c0c23b94c6f6f2aa3413af4ff793536aafc46947c360274ed38999538838e63accbb34d01d2e846040268df8f24853c0193 SHA512 2d20c606cd8e05f50da1e0020b58f8790f9ae25fbd98de2e4280a1dc55826ae44e15a2d8ceef3c2d6c4fea5da4622c8d29ba71eb86245fcc8583f70728d8dd36
+EBUILD udisks-2.9.2-r2.ebuild 3652 BLAKE2B b7e3809e57ab006d4652152287941e08c902d1cdc950a9dbbd187fb62be7f7dcdfd01bd840157aa62b6612d56bdf11f24dbc048dc01073010c33ac005c39e52c SHA512 83b736c253aedda99a8376e3bcd341a73430d18ccbd056314573af5d7fe29fa7b51fd593c0a260ae22e4fcd7dff04aad35cd4cfffa58e111bd6118f5e6e4a753
 MISC metadata.xml 728 BLAKE2B 4a540e1378d04b04e2b75a531e9df8c13faee4870c8bc3778e9e08dc742eb9e28e2b1134448302e43cbb8815432fa0bbbb402f22722267fa4869fe0c04775c8b SHA512 9f057eb51f5924b53cecf5e495b02bb6fad41e9b23c197b1f24a972e8a25504506e73329a93295e9eb30e62863f7c4454909fba10fdea696be23caa7cf50d8cb
diff --git a/sys-fs/udisks/udisks-2.9.1-r1.ebuild b/sys-fs/udisks/udisks-2.9.1-r1.ebuild
deleted file mode 100644
index c6aaf0083376..000000000000
--- a/sys-fs/udisks/udisks-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 linux-info systemd udev xdg-utils
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	elogind? ( daemon )
-	systemd? ( daemon )
-	zram? ( systemd )
-"
-
-COMMON_DEPEND="
-	>=sys-auth/polkit-0.110
-	>=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?]
-	virtual/udev
-	acl? ( virtual/acl )
-	daemon? (
-		>=dev-libs/glib-2.50:2
-		>=dev-libs/libatasmart-0.19
-		>=dev-libs/libgudev-165:=
-	)
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-	lvm? ( sys-fs/lvm2 )
-	systemd? ( >=sys-apps/systemd-209 )
-	zram? ( >=sys-libs/libblockdev-2.24[kbd] )
-"
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-block/parted-3
-	>=sys-apps/util-linux-2.30
-	selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.1
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	>=dev-util/gdbus-codegen-2.32
-	>=dev-util/gtk-doc-am-1.3
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.8 )
-"
-# If adding a eautoreconf, then these might be needed at buildtime:
-# dev-libs/gobject-introspection-common
-# sys-devel/autoconf-archive
-
-DOCS=( AUTHORS HACKING NEWS README.md )
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_environment_reset
-	default
-
-	if ! use systemd ; then
-		sed -i -e 's:libsystemd-login:&disable:' configure || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-btrfs
-		--disable-gtk-doc
-		--disable-static
-		--localstatedir="${EPREFIX}"/var
-		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
-		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-		--with-udevdir="$(get_udevdir)"
-		$(use_enable acl)
-		$(use_enable daemon)
-		$(use_enable debug)
-		$(use_enable introspection)
-		$(use_enable lvm lvm2)
-		$(use_enable lvm lvmcache)
-		$(use_enable nls)
-		$(use_enable vdo)
-		$(use_enable zram)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-}
-
-pkg_preinst() {
-	# Remove gtk-doc symlink, #597628
-	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
-		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
-	fi
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/run #415987
-
-	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
-	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
diff --git a/sys-fs/udisks/udisks-2.9.1-r2.ebuild b/sys-fs/udisks/udisks-2.9.1-r2.ebuild
new file mode 100644
index 000000000000..57047f60efec
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.9.1-r2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	elogind? ( daemon )
+	systemd? ( daemon )
+	zram? ( systemd )
+"
+
+COMMON_DEPEND="
+	>=sys-auth/polkit-0.110
+	>=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?]
+	virtual/udev
+	acl? ( virtual/acl )
+	daemon? (
+		>=dev-libs/glib-2.50:2
+		>=dev-libs/libatasmart-0.19
+		>=dev-libs/libgudev-165:=
+	)
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	lvm? ( sys-fs/lvm2 )
+	systemd? ( >=sys-apps/systemd-209 )
+	zram? ( >=sys-libs/libblockdev-2.24[kbd] )
+"
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+	>=sys-block/parted-3
+	>=sys-apps/util-linux-2.30
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.1
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	>=dev-util/gdbus-codegen-2.32
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.8 )
+"
+# If adding a eautoreconf, then these might be needed at buildtime:
+# dev-libs/gobject-introspection-common
+# sys-devel/autoconf-archive
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+pkg_setup() {
+	# Listing only major arch's here to avoid tracking kernel's defconfig
+	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
+		CONFIG_CHECK="~!IDE" #319829
+		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+
+	if ! use systemd ; then
+		sed -i -e 's:libsystemd-login:&disable:' configure || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-btrfs
+		--disable-gtk-doc
+		--disable-static
+		--localstatedir="${EPREFIX}"/var
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
+		--with-udevdir="$(get_udevdir)"
+		$(use_enable acl)
+		$(use_enable daemon)
+		$(use_enable debug)
+		$(use_enable introspection)
+		$(use_enable lvm lvm2)
+		$(use_enable lvm lvmcache)
+		$(use_enable nls)
+		$(use_enable vdo)
+		$(use_enable zram)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+	keepdir /var/lib/udisks2 #383091
+
+	rm -rf "${ED}"/usr/share/bash-completion
+	dobashcomp data/completions/udisksctl
+}
+
+pkg_preinst() {
+	# Remove gtk-doc symlink, #597628
+	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
+		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
+	fi
+}
+
+pkg_postinst() {
+	# TODO: obsolete with tmpfiles_process?
+	#mkdir -p "${EROOT}"/run #415987
+
+	tmpfiles_process udisks2.conf
+
+	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}
diff --git a/sys-fs/udisks/udisks-2.9.2-r1.ebuild b/sys-fs/udisks/udisks-2.9.2-r1.ebuild
deleted file mode 100644
index 47fbecee3c8c..000000000000
--- a/sys-fs/udisks/udisks-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 linux-info systemd udev xdg-utils
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	elogind? ( daemon )
-	systemd? ( daemon )
-	zram? ( systemd )
-"
-
-# See configure.ac file for the required min version
-BLOCKDEV_MIN_VER="2.25"
-
-COMMON_DEPEND="
-	>=sys-auth/polkit-0.110
-	>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[cryptsetup,lvm?,vdo?]
-	virtual/udev
-	acl? ( virtual/acl )
-	daemon? (
-		>=dev-libs/glib-2.50:2
-		>=dev-libs/libatasmart-0.19
-		>=dev-libs/libgudev-165:=
-	)
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-	lvm? ( sys-fs/lvm2 )
-	systemd? ( >=sys-apps/systemd-209 )
-	zram? ( >=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[kbd] )
-"
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-block/parted-3
-	>=sys-apps/util-linux-2.30
-	selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.1
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	>=dev-util/gdbus-codegen-2.32
-	>=dev-util/gtk-doc-am-1.3
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.8 )
-"
-# If adding a eautoreconf, then these might be needed at buildtime:
-# dev-libs/gobject-introspection-common
-# sys-devel/autoconf-archive
-
-DOCS=( AUTHORS HACKING NEWS README.md )
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_environment_reset
-	default
-
-	if ! use systemd ; then
-		sed -i -e 's:libsystemd-login:&disable:' configure || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-btrfs
-		--disable-gtk-doc
-		--disable-static
-		--localstatedir="${EPREFIX}"/var
-		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
-		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-		--with-udevdir="$(get_udevdir)"
-		$(use_enable acl)
-		$(use_enable daemon)
-		$(use_enable debug)
-		$(use_enable introspection)
-		$(use_enable lvm lvm2)
-		$(use_enable lvm lvmcache)
-		$(use_enable nls)
-		$(use_enable vdo)
-		$(use_enable zram)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-}
-
-pkg_preinst() {
-	# Remove gtk-doc symlink, #597628
-	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
-		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
-	fi
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/run #415987
-
-	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
-	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
diff --git a/sys-fs/udisks/udisks-2.9.2-r2.ebuild b/sys-fs/udisks/udisks-2.9.2-r2.ebuild
new file mode 100644
index 000000000000..480609ab96ff
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.9.2-r2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	elogind? ( daemon )
+	systemd? ( daemon )
+	zram? ( systemd )
+"
+
+# See configure.ac file for the required min version
+BLOCKDEV_MIN_VER="2.25"
+
+COMMON_DEPEND="
+	>=sys-auth/polkit-0.110
+	>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[cryptsetup,lvm?,vdo?]
+	virtual/udev
+	acl? ( virtual/acl )
+	daemon? (
+		>=dev-libs/glib-2.50:2
+		>=dev-libs/libatasmart-0.19
+		>=dev-libs/libgudev-165:=
+	)
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	lvm? ( sys-fs/lvm2 )
+	systemd? ( >=sys-apps/systemd-209 )
+	zram? ( >=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[kbd] )
+"
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+	>=sys-block/parted-3
+	>=sys-apps/util-linux-2.30
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.1
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	>=dev-util/gdbus-codegen-2.32
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.8 )
+"
+# If adding a eautoreconf, then these might be needed at buildtime:
+# dev-libs/gobject-introspection-common
+# sys-devel/autoconf-archive
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+pkg_setup() {
+	# Listing only major arch's here to avoid tracking kernel's defconfig
+	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
+		CONFIG_CHECK="~!IDE" #319829
+		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+
+	if ! use systemd ; then
+		sed -i -e 's:libsystemd-login:&disable:' configure || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-btrfs
+		--disable-gtk-doc
+		--disable-static
+		--localstatedir="${EPREFIX}"/var
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
+		--with-udevdir="$(get_udevdir)"
+		$(use_enable acl)
+		$(use_enable daemon)
+		$(use_enable debug)
+		$(use_enable introspection)
+		$(use_enable lvm lvm2)
+		$(use_enable lvm lvmcache)
+		$(use_enable nls)
+		$(use_enable vdo)
+		$(use_enable zram)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+	keepdir /var/lib/udisks2 #383091
+
+	rm -rf "${ED}"/usr/share/bash-completion
+	dobashcomp data/completions/udisksctl
+}
+
+pkg_preinst() {
+	# Remove gtk-doc symlink, #597628
+	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
+		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
+	fi
+}
+
+pkg_postinst() {
+	# TODO: obsolete with tmpfiles_process?
+	# mkdir -p "${EROOT}"/run #415987
+
+	tmpfiles_process udisks2.conf
+
+	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 55c17eecb6c8..c75d5b2ad606 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -5,7 +5,7 @@ DIST zfs-2.0.5.tar.gz.asc 836 BLAKE2B 6bc53160ce650f63c717b67116fb754c7a8196c9aa
 DIST zfs-2.1.0.tar.gz 34810470 BLAKE2B f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 SHA512 2121b90a1d4d92353801c48a2e34e2dd42bd295dacc3c30aa77cde967a1326e17c983bdd6905552421df0a652c09e84b3d4d2ba01001e053b8afb12e189c046f
 DIST zfs-2.1.0.tar.gz.asc 195 BLAKE2B d5a7c01c7fd1798a235d5bc9ba89353a85978ac8bb1eaec1c587b8cc6d7cd24b0d7613c465a8da7ba29a172e4ebd6e465f893145d9dd7adf11d7e3858fea835a SHA512 1c5c8d20adbcc27c5e5d760a84e258a897dee7c3950ef1eb56f3ef6bd1c85516c7776ce30b3e63229cd65315d43e06b5e04c587e9483b96b00adb42d24749c1a
 EBUILD zfs-kmod-0.8.6.ebuild 5334 BLAKE2B abaa4b20899db464246d9c445ba55d938ba1982a2686a2c6b22fcc213e76551d2a28a59709760dd5e15af6cfdc8e4999713ae4d1efd3275c02a85f1dfc5b3275 SHA512 f67b1c4483f2a985256c18dcaf232c47219726f67c9fa95b184be6e608dc997b2beab18bd5863d32afcc92da0bad5c3ef8337a8878cf060d45b3931e8e736b77
-EBUILD zfs-kmod-2.0.5.ebuild 5369 BLAKE2B e8ad56e7d466f9663d30a06c52ea06d3ebafc2cc4565caf2b57b6d2355878806ef859f74e43dce2b3622820d64b57dfca21d59ac2fad32c789ab3f1ee2160071 SHA512 df15493fb58aaa9c9fd46ec1017d159478be417f8b480ecfc7abe5bbdd3bf1917d8204428763c79363578a59d26e5691a49ee0698a54a7a3e58ea8a40b1469bf
-EBUILD zfs-kmod-2.1.0.ebuild 4578 BLAKE2B 7555ad82359618753003e5ef2e7e3e2f51405c748aa1c58b6a6019358353f240caa57629ad9bdfacf440cfa9dabf3b2b0d726acbcbc607fc114309e0d89206d0 SHA512 30b8887454da16b66f244ca1ce6a78a8486f09183c3b95316df673292e53ca1ec87706638f725235183779e3464673a6ee73f37aa5d1484ce4ee6441144edb56
-EBUILD zfs-kmod-9999.ebuild 4578 BLAKE2B 7555ad82359618753003e5ef2e7e3e2f51405c748aa1c58b6a6019358353f240caa57629ad9bdfacf440cfa9dabf3b2b0d726acbcbc607fc114309e0d89206d0 SHA512 30b8887454da16b66f244ca1ce6a78a8486f09183c3b95316df673292e53ca1ec87706638f725235183779e3464673a6ee73f37aa5d1484ce4ee6441144edb56
+EBUILD zfs-kmod-2.0.5.ebuild 5377 BLAKE2B c2072da1710548fa4e48db0acfe432c4f274b99fde91e0d567080ddb48b8fe943a0eaae91ea0e5effe36280086c53a7e0945ef7276543cb8cf013d8548b84bc7 SHA512 43f97f4c862b9e92f129922b78aca4fba2be1eb1ec338c8e46ec98ac471efc3cda5c60c9a59cc6d0ffc45f9dd5198f9a4266ed82d8a42a157bf4c4bf8a88f280
+EBUILD zfs-kmod-2.1.0.ebuild 4586 BLAKE2B 2c60424a9ad3f7473eeda9828fe91a6a805d24e2662c768f388ecadd76eedc52e70992a15b701adcf72687557f808b0d47f7849bd4d8e7634a0ce99445918f89 SHA512 2423d31d421a8c1c3f46f9618f13823413eab3c70cd7cb580f25647e9ae9db1e53bda49aa0656ca220f27cc53b4d5c8091db73e6c88be429e04d14249c852c0f
+EBUILD zfs-kmod-9999.ebuild 4586 BLAKE2B 2c60424a9ad3f7473eeda9828fe91a6a805d24e2662c768f388ecadd76eedc52e70992a15b701adcf72687557f808b0d47f7849bd4d8e7634a0ce99445918f89 SHA512 2423d31d421a8c1c3f46f9618f13823413eab3c70cd7cb580f25647e9ae9db1e53bda49aa0656ca220f27cc53b4d5c8091db73e6c88be429e04d14249c852c0f
 MISC metadata.xml 548 BLAKE2B 0245ac0b73ed129ce2df41358814d46749fab0463a03fceb643010629cd522460e84c5b8c0247f499adf4ed2e781e0d6f6857a3c6be4f4fb206eeabba158e86c SHA512 2b98b289369d875c5ff89825590a98c9764a1b716df1b79c852dbb833f4f02d5c66782f43084a1acde11a0ba2cb9ef2956b35c10881f77ec92d6749566276e6b
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
index 1b360228eba2..1087f2c1bc99 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
 	MY_PV="${PV/_rc/-rc}"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
index 1bb0a99b0c65..894d7583448b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
 	MY_PV="${PV/_rc/-rc}"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 1bb0a99b0c65..894d7583448b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
 	MY_PV="${PV/_rc/-rc}"
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 4a677f562de0..88ce734d26d6 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -6,7 +6,7 @@ DIST zfs-2.0.5.tar.gz.asc 836 BLAKE2B 6bc53160ce650f63c717b67116fb754c7a8196c9aa
 DIST zfs-2.1.0.tar.gz 34810470 BLAKE2B f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 SHA512 2121b90a1d4d92353801c48a2e34e2dd42bd295dacc3c30aa77cde967a1326e17c983bdd6905552421df0a652c09e84b3d4d2ba01001e053b8afb12e189c046f
 DIST zfs-2.1.0.tar.gz.asc 195 BLAKE2B d5a7c01c7fd1798a235d5bc9ba89353a85978ac8bb1eaec1c587b8cc6d7cd24b0d7613c465a8da7ba29a172e4ebd6e465f893145d9dd7adf11d7e3858fea835a SHA512 1c5c8d20adbcc27c5e5d760a84e258a897dee7c3950ef1eb56f3ef6bd1c85516c7776ce30b3e63229cd65315d43e06b5e04c587e9483b96b00adb42d24749c1a
 EBUILD zfs-0.8.6.ebuild 6466 BLAKE2B 1826a984e3bcafa84585869df35eb86d77e713f6f909ae5bdef3a3bce10e78fbf3aaa9ace7d3e0d096ddfd926f75b164020f570864c868224551f2c16eece2ca SHA512 f9241fb89ecef5ba2ecd118dc6ac856614a9afd2b247e87c71a67a136736d77e79d28ad2dab0a019beeb241238424c9e58958704f9435de320e9b97e26f26a62
-EBUILD zfs-2.0.5.ebuild 8178 BLAKE2B 1019348eb30db8ddae5ffc43170ea10100e904ddb51b19b4f9218646754636fc34ac26b1b6065de7540c9531b996101897492fb00518b1b309f8b4715998c46b SHA512 6cfb59f8b6d12ceeba412b201247442d02d941ea605eb0cce260fc3605b1cc5d7e1227a6096a8b7df749d0a82f853eac4440553dccc9abadef750d83d61b3924
-EBUILD zfs-2.1.0.ebuild 8138 BLAKE2B cfdc600c5074229690a23b44124bb11c47708ed9d5d732fc0dc88c92ab84f2984894248ca971a04308fe19088a18662e16afb40c310156173b6a40fa6cf0dce3 SHA512 eda0796cbedf4efe4119a6e79da2c05e0ad70d48e4780f6356442ee607fde8981f2c481c84e97fbc0b66156b74715c1034e0ad30b98b3b68a0c857da482b4eab
-EBUILD zfs-9999.ebuild 8179 BLAKE2B 32692c05c5b90cd9f4e15d9a283b159840129dfa899c5c1093eb28d7bf719882bb5c370a95b599ef113911e4d92c06aea19957cf1221d1b1bc280e9f1fc72d6a SHA512 00da3a86127656479a2515eafd8befbd68a6bf51c1e94fb5302c8df2efa50e8810030d019a0a2d28f42eb8b626ff733397c6eb2cde15ef6672f0615dd7c5d73f
+EBUILD zfs-2.0.5.ebuild 8186 BLAKE2B 75107653cabb6c2dd2ddb7ae3b404a41c11ce3289e5d48dd0dd93d915bdcecfe6ead6633a2af28ec91121657bd9c827b68b8f3a114ee2a71fa21bccedd4b2893 SHA512 30dfc53c514287c073281007c98ba939361bec955b4f1d7727d19a97743d1526b3bbf216c2d55bc47b899bf5962cf0e153dfda120aca1c3ddb2a417c0d013be6
+EBUILD zfs-2.1.0.ebuild 8146 BLAKE2B 70a69fab198c6e031f706270e3dfbb3ad3bf2ed4137d4000592413c370142067271a2c7a5f1eee39f8dc6eef38d2ccee066345fbf2dafc2049fa3389dfcf425f SHA512 7901a471ddf8f6186cff822e9aedf3d6100d78b6cc84a790fd3d8820df832a440f4d3541c3e6fef6d98575a02ce31720bf815e6dcb8c8b2cb4fd928bba49de22
+EBUILD zfs-9999.ebuild 8187 BLAKE2B 9de4cebaf3a9bca728e5e2320bd8575c2b98f3ff2471a822103941f38a4c0f3df3375f49f5276f08138f6954c8e45a49bb55132499788e89cf99eb8dc180f3de SHA512 21aaa4d13cd3bd249754b066380acfa9a8fb5ea427f72f1c387dcc4d03d49ccc3fa6f425dcd72ac37fbf838841c32904a7774b4285a7e120cd331b5f301a4377
 MISC metadata.xml 1000 BLAKE2B 1f3e75ef73d5680d5863f0fda415931a6af19ab1a535c9795c417526ccce2a826ede05abee88ff27c2ec99f1f23aa06cce02cd3cb6d49b2952e90eb94ab95a6b SHA512 f8b30ce788d80c8f65db738f251fe5ebdc4d3ec7206dc78e0b9e53c2cf92153b90e20f6799b2a36bf8e616147b28f9660421bbc2ad17e7dbd804d47f430f6e40
diff --git a/sys-fs/zfs/zfs-2.0.5.ebuild b/sys-fs/zfs/zfs-2.0.5.ebuild
index 30cd97c09b90..7a80202ba47e 100644
--- a/sys-fs/zfs/zfs-2.0.5.ebuild
+++ b/sys-fs/zfs/zfs-2.0.5.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
 	MY_P="${P/_rc/-rc}"
diff --git a/sys-fs/zfs/zfs-2.1.0.ebuild b/sys-fs/zfs/zfs-2.1.0.ebuild
index d4c87d5718e6..5f76d5686bf4 100644
--- a/sys-fs/zfs/zfs-2.1.0.ebuild
+++ b/sys-fs/zfs/zfs-2.1.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
 	MY_P="${P/_rc/-rc}"
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index e3ae8b236090..6d147415a2c0 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
 	MY_P="${P/_rc/-rc}"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index bb6ae2034190..41315ca3006b 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 169af81dfe40..15e39d322517 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -2,22 +2,40 @@ DIST genpatches-5.10-58.base.tar.xz 1910208 BLAKE2B 3f385e4cae808101f092a1ebf72d
 DIST genpatches-5.10-58.extras.tar.xz 3420 BLAKE2B 81c42396369ce4e26d2a1574067d251b9013bd012f052e3e35ecaa1953e3d81cb9e398eb9521d191a4197ad2a81780d49059fd7abb9774e886d6d10b6b6831d3 SHA512 79afef40259c8ab2cfa957bdb56666e9ff691ff68362ad95482129e7037fc0659185923ec87ac97d217f5d2956e2be7189077ddf38844fa6c7ced4f0f6f58870
 DIST genpatches-5.10-59.base.tar.xz 1936172 BLAKE2B 86a6133afb3ebd00dd706cee9b99b6b1547ed3eabf92e43348917c06cabc9d2960b5293d5f414bc4a44e55f03eb40f83b344d65e8824f6f842450bd35a3317d1 SHA512 5c0b7f7ab5c7beb1a868235ae4fcb57726b46e7877018b09f1b025f153605d20a6017f36617bb182e41618e889e4f40e190a514bcdac37ad8811fc6884c4459f
 DIST genpatches-5.10-59.extras.tar.xz 3420 BLAKE2B cf603ca226a8edd2254b4c874e6b5a211b2f6071267428a434e5e5f18c884898de396c16b826d9f0eb0ef35fd0dda383126d99e37227b936a13b0900587ff617 SHA512 0398f8468fd61e495fdb7c350e5a35eb1756bd2da9a0967c816f434e639345ceaeb50786a24241f5f1616a401289764174693bdd2c785cc9cdc00e76e598841c
+DIST genpatches-5.10-60.base.tar.xz 1973040 BLAKE2B fb67f230bf6d8a0fb881fd3cc8fd16e8714c74d469053e9f907f609c4e91d3947085db707a7daafc1e8ae52bb35531114161ba9ecadc6015348255df53a556b1 SHA512 364ce59c34b132f2df4df0c8e612a1e5595a26f560ec9ed4e7b5282b54960e12f098a17ea87117d11a1c0e3f23e1c24ba58d22d2d5e8f5430e70aa8c98648770
+DIST genpatches-5.10-60.extras.tar.xz 3420 BLAKE2B 57d4b7bd7fe2cbce448384754e98bb84dc9f68cbe50fddf9799f82449cf4f04b77041f17cdbb08c5a7938cfe38f788bc4802cc6b0c709a84f0cff5ecff4bad71 SHA512 0b1a7ede058eed0b8f20b5f020f9fe41de07d691ca5674d5ee41fbd2636627d77dc95ff4929654a6bc430e6a4d437f2b798ba1c50dc6394e51a7c627bcbdd7a7
+DIST genpatches-5.10-61.base.tar.xz 1978152 BLAKE2B 2943d58ccae232d4111f33e76f8c41234c013eed3d196f12a85d317251549225b7062609876cfb57c0b27a3328aed93ea68508050e9aebec14cdc7c6cb1cc898 SHA512 d1065304d3b0d7d5c9855252f25c4c34328f3f7e97e87e8f9cc12449451501660b279d16e1bd83ade943f42fcd97e5c4d569eabb097a77f7ca837238d6d2e093
+DIST genpatches-5.10-61.extras.tar.xz 3416 BLAKE2B 41bfb877b640ce1a8d5b01226b77db8dd9aea03926139bd9fd4055f86fd9844ebcfe2a21ade837fb860f0f5007a3c1cb27b2147fafe79ae1ea003592a33b887d SHA512 36b16758d14c47dc94d8a00b3416182262f270f04f3ec652e89ce492dfc6694eaf0d4c214a9d57778afd0ab803c72348edb5848e362ba807f2912f7c4d51d66e
 DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac SHA512 08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564
 DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651 SHA512 20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e
 DIST genpatches-5.13-6.base.tar.xz 447968 BLAKE2B afcec75958e44f3ef7da0b2ab3e2a3d9574fbacac23d028335ce241838e36355d813fb89944ab4ed45153f5317997f18e153514f877bee6a490969b75242c043 SHA512 05afae24abbd06771ecc88b8bd93e765e7c41e9ea6826510d291cb8b10387be747ac7738e3df8cbef1d7488c96fd3fcba1138a7cbe9dc7348a76b5df51c95a74
 DIST genpatches-5.13-6.extras.tar.xz 3420 BLAKE2B 9ad0d2bf1b2621b328d142cd464b6de2676c8a4f0caef8ee4c5d7fa60db56d73b9056917e07ca421b02e6de1564b3d5f900299721b6b412cb145efa9bea8d60c SHA512 a7906d25d02082217bec37c435b316880e1af9922018b88569cdb4cf8c2cf5fd789bdac946100f2b1a9e0e2125a69222fc853ab1496abdd30ca00497afcb8fd8
 DIST genpatches-5.13-7.base.tar.xz 481660 BLAKE2B 810b5438e39c8928ec2aca11658cba78666e3384deda7f7ae3c21ed9987fc94b8b1d0c1b802ea454978a226fb6ddc13295097a284d84c95afc060fdbad09b9b8 SHA512 237189cd9f09bf1e83f83f27ea47306881f560fca9a96ce58185bd0dde707a0c46103889bbf798742d9eff9e2c0708c08b27698e659ad1b679d07f0ebcecb061
 DIST genpatches-5.13-7.extras.tar.xz 3420 BLAKE2B 431ffe1f40ef695161540131b2abefb5d3bb993d48dbab6224f6e3afcdeb8e618b3b8258dc3ec170a2f53830591f7363bcf8a21b0743f04cee4ba5af294d8cca SHA512 dd7f5488203f98395b0de62772e353907f11bdb23ef92d049ba785e5ab5be23d066bac4dc5763226057f0ce5fa957417c0435220e4702f5bc4d66c412124a04d
+DIST genpatches-5.13-8.base.tar.xz 536800 BLAKE2B 9805becf97795872d763c43cbaf81c2e9dca63764c2ea0237af5da3efd0d2f83f90d14b4581c98eb87a11b4b28b17116637006029858e68a9416b8732cf7321a SHA512 da8583f0f3620daad689ba9d32cae938fd1332f38cef212e9f1281ed138480484838db67368e1ed5d0663af150b0ae681bbb20f309e4953973f185b58273cfbb
+DIST genpatches-5.13-8.extras.tar.xz 3420 BLAKE2B e0c844f9b463f06b5c49dcbb798bcf489854bf9fcbd1973ad3c3168098bb6559e5236a49ddb0e351ac8642ec85c7494b238ea043c02e4ca0b01683343b524123 SHA512 5a8d67139b53c4f752970471afdd35980b64abb9d5df16e3ef3ce384e46808a56e15b40140a8a4f9ba910df8c7c7cbafa17ca6ac3fb30f0eea69ef13d86b377a
+DIST genpatches-5.13-9.base.tar.xz 542664 BLAKE2B 95e2813cc6965da9f37ee8ceabc548559ebf605c0e40b80e6ae3dcbd31cef26ac7e1833f6cb6c366fb7a235aeed82d1fa66de60745b7276bc16466610aef6939 SHA512 7b99964c0924aa5f2197f8815a0bd5ee9d05faa91bc32822b465fa8e2d494177965c48a8ec1af926bce9f4c8d000ce756d88c533d6ab6cf911ea6a53cb75cec5
+DIST genpatches-5.13-9.extras.tar.xz 3420 BLAKE2B a52e35e1fd84f93ffa3a641e0d3a565831f97d96d16df3b7e07a0b5c47b19cbb680c6fd3d02401a6a0ce51598ab20cb5a142ba1cf95dccfe22d6975cbb39f0a8 SHA512 b480cd4916d6fbbdb20fc47e69916dc8bfaade672bff56cd03bb42075ac0ca2404ab8c2401878f7f72c4321b148642ba7d1433c13237cbacc8236e200c6d5132
 DIST genpatches-5.4-138.base.tar.xz 3760008 BLAKE2B 085dc9525a78dfea4efa6541332c8cc16bc6c5dfbbdcbf1efe307acfe129ebca80d53bb9063d4c9f052a3909c47a094f31f2e9fb487ffb0e014eb7cd6fa8bcfa SHA512 96ccc0c5a7d223c444f7d5c7990a4a5c14de2eb1e8d44c3edfa8526a3c872ca38d0b3cf87aa65f3cd14cdfbc52573831993f0ad0c9531659108aea36c31f7089
 DIST genpatches-5.4-138.extras.tar.xz 1772 BLAKE2B f152fe554bc3a855234d9fccbd7e60003a8933a4ac5d13764d84a2c5a03e93cae7f231e1c7b50a891d9978f3aa151bb8d7c2f4166e3a1ca9feb76614514632c5 SHA512 a2f4bb291f0a4dd061251bcba3ea2fb3f48f84c53c05ab851ac8ec588dcc931a6f0f72447e1ca91950a7881247e396d825176020de0273b35ebf7770b0a07471
 DIST genpatches-5.4-139.base.tar.xz 3773732 BLAKE2B f2eaec4646c9391c5683421d702fd11c4feeac38d37f05d4dfc2b21702c9d768d9df769a8330cddbba609e92baefe62b008a2289cb31e48cac9ca4662a6b761a SHA512 65e3d44fd4ed2d3c97ddde80feee75c19b63f103fd0fd80124a1c2ca95c2655061ef76d2b576e6357cb26a05c452f8f2ffd3303d9cdbdacac89337e736793492
 DIST genpatches-5.4-139.extras.tar.xz 1772 BLAKE2B 9425c6acb177b034c23e119269646ee24c07c5ba89bf641afa3434c50c555b25b936e08f7b6d6513330a7b1cec2a8496243ea79e0f02d6dc47ddd6dbf3e53ddd SHA512 577b9bd1603877024ec30cbd1dbf3283a8292cb3adb4b4cc008dcc373e258a99ed7ce3e5548a8a2e6c4d2412d1b86b578613578102c08ef91af2fb3a1727cac8
+DIST genpatches-5.4-140.base.tar.xz 3800500 BLAKE2B 96f0643b5969a4901c1c0e31cb08e7bb49f1d18b9f175fd4096bd4ee49ef33c1f5184f25abeba67edb1c24b68de4617e0de4322625b258e37e9654c2835e2f1b SHA512 d81f3c4e53de6458f8fefdeedc42e3aad7a54b28c8907e6e0292656fee624b5dec5eea671727a7d27e1217701bc4424f4938e84df527cc46b8e86039204271c0
+DIST genpatches-5.4-140.extras.tar.xz 1772 BLAKE2B e1e90362759de205856b26cb96bb131fd9ea80e198d059e101c67d4d4ec97b4bf15992cd14f50b75015c5accebbf441f28a01dc14060baf5cd71adb87ad1f174 SHA512 2fe6cc926eb174c773144ca7bcb3d6479223582cf11112aa5f30250124e1b1c4f69736b87faf7e6316eb90fa92af441fb1bf9413ce80d568342204f035263a80
+DIST genpatches-5.4-141.base.tar.xz 3803356 BLAKE2B 77cce01a65621f898f939d9f46936d28d1971d8184df8b90a07c9a0e268b2593de27374a340cb1e6f2002630b8501163e412b3b868adbc0007d7e9033fe7a8b4 SHA512 c2434cbf65b5468c62cc295fedca7e74493bde7126c26d1cf47e2725608d9f4dfc845ca18ce779991847cdb7092d34e7018ec91648fbe3c09ef999db35dbc68e
+DIST genpatches-5.4-141.extras.tar.xz 1772 BLAKE2B 647e100ffda7cb137748ab92bc5cc95e4262570cb14b5612d6f40f5c28f7c7d38b022c11c3416506e03a303555995f2e4fb4cf07d53e44bddfbc8094f4467d98 SHA512 4ff6aff1eca4607f01940253b8fdb563fe5dd52684439860a29a2f747ec531af1120652e128f1fe44ca9b36f3a9cf47aeeeb684a3aa313903eb9cbf396177fea
 DIST gentoo-kernel-5.10.52-1.amd64.xpak 65489696 BLAKE2B a2db9e17da673f174515c38e2107d36ffb99ce1478f2852a3f953c0ca4732acdc556806738172342002f73232f960fcaeecc3d31700b9b3d0c1359dfd493e74b SHA512 bb20d147d15358ca0adaf54d32f7c42d4b8c62073c4a7ccb09ae939f5757b42bb988176dd60946f2720d046061a9517426f0f92074257515216f66c548d6c6b1
 DIST gentoo-kernel-5.10.52-1.arm64.xpak 59035661 BLAKE2B b6084e13be321a59402a79ece7bc3c302b1b49e4a0ab24ac456185590fa8c5a555833db68ddebd1905da4bffce3b8f7ad17b86bcf882cdb839d88c8d4d135912 SHA512 1853c88f26a1d2d26b67a37cb40faaab6ef9b4af7ac77fc1b83d0b6603c1addf299f58e34a5608e6a056aeb81d0e9c2058fd1eee056f5f150cf4507327d6c8f2
 DIST gentoo-kernel-5.10.52-1.x86.xpak 57220562 BLAKE2B 89a0555e23ba7c5493b1d3865665497f821d7a256166cc4a92e5854fc506ca8aa5b883b84f4a97771934fc6ac5d61b1a213aaa66767e1881a487db5ca6dee216 SHA512 a12657010017d2d2ae317ad234b8f114daca90f94eab0cd42e3776fa7d6d933b8c8ab507412b43a11aada62a863993f63243c56dd906b4b85796f968dfcd2ca9
 DIST gentoo-kernel-5.10.53-1.amd64.xpak 65475491 BLAKE2B 0697c8449ac103de265c28bb8c0b7c0e73dc95a23d8e6b8e28cf86c86206842165429a5c1b2cb774b314053f12ea9c3897f5929623d22bb33931c606a9746c43 SHA512 ad5d44512bbd09a35197ddf0f8e26f812d8332bb090aa1036c998a2ec623fa4cb068f7129068fad35872765a39b447e78a769b7c429c8c548f717fda1eb19099
 DIST gentoo-kernel-5.10.53-1.arm64.xpak 61215071 BLAKE2B 8a912d6167bd64d8194973f50e3298ed125a5fa8396d3e7a23749cbb8daa2433c490f819971c783a9291ab19eec306b79db6494907936cabaebfc5ca725859b9 SHA512 872b3bfa2e1d5d61eca2ed228c79122b6b7e9bb4cc00f6be2d46ad6fd5c2aa6534a26a6e7763ad3605bbfc3fd572f1d3636b7baf8c10da0652d707a0749aa870
 DIST gentoo-kernel-5.10.53-1.x86.xpak 57218618 BLAKE2B b4948e9bd942e78d079607f4cc9611dae32b78ad2fa60245466e9b556433fb58db2c5c2709d2cb85762176c9fbbe26aeaa7dfae1cac2b7f8bdb10dc4ec243701 SHA512 6c2aaa43dfb99e28059333e43f3756b1405fa76847c19a0b7f52ed71328cb52541c66c1fb3335947e303f0c4c739d32b44598f56616a63fc0e1d8fd4a05dfb6e
+DIST gentoo-kernel-5.10.54-1.amd64.xpak 65489821 BLAKE2B 7503ee8e4620649fbc27779bc11ab92844172ff9a871c4d9f95a905a2220a8598ec957911b87935f473b694130898f3933c2898d3b6f1883a814a24d68940524 SHA512 c5e2f2362fe4934a8181b25f6bda8f2014e5aef17e5148301d72cb543356f51a857fd01231fe6a712132b42ba2b466aa65707dd8d82444d8f1c15d0abcb2413c
+DIST gentoo-kernel-5.10.54-1.arm64.xpak 61166026 BLAKE2B d86c315412edb45b9a8d4261e604db47102acfcfa94af6390855e3ca6a90959004c6958db2022a08d30f1fee35a8bb05f2c82af713433ed6e39d397163eed496 SHA512 cfd0c4eb028ee59c6e72d113387a7ec882c1c758e516cdd3e15d7f02530da9fcad96a686e3ecfa8bb23b02ec0bfec5ae889704b3885bc9fceb922ea9f90d936f
+DIST gentoo-kernel-5.10.54-1.x86.xpak 57217543 BLAKE2B e978d64011c71d186980da394914f0b2933a8154a64298c034337692ac0cf2d2093ded84a7ed574d239b3f176b951508a5ae4c248d5ab5fcce31a01f4f4c2c9c SHA512 c565daf009ccb06dc3b528e3e070464d17451c0d326b9354d103a0d97e679ef102c329da27165f050748c5813dd9bf7b3bee29e86824e97723b06d10d2f958ae
+DIST gentoo-kernel-5.10.55-1.amd64.xpak 65491981 BLAKE2B 73390f8750f11e309cf9f7b32a3f199e84717402459987af695441acbc53e2a19b126904ba2a09e7e2f51188f3b391e2f623dc338473c79baf8ef570c06e3b8d SHA512 a3c1c3e5514c0ffeda250023ad01a384449c78335ec82de2f4d67bd0913a567253ee4fd3819bbc2e82cb3575b980e9157263a2188532ea16ac5bfcbff65e37ce
+DIST gentoo-kernel-5.10.55-1.arm64.xpak 61167016 BLAKE2B 1de73432ca09ac34c84f621d3a14a4c3ef3b8e26dc3f930fff9c569f0b6c6afd44c00f1d7b41f0ddcca15c421532f53256740f12de3ad2305306d5c8181e1221 SHA512 da8952228418f8acdab8f136ebe181a201eef8b0d594645469af73d9b85a9bc297d83ea9a15c32a0b63fc3850b006091ace3ee21dab15c9104755c16dc8c95a6
+DIST gentoo-kernel-5.10.55-1.x86.xpak 57214089 BLAKE2B 6a411b8e89fa877a0f091e8a1c83896208f96e980ca00f6e73f835fe3258a58b62814e114e6728a63ba8d1679de22b7c10c0920db40ec5fd7ec73f3047667ec5 SHA512 6c762a018aa48d7c687c696ce6bf8786801e4b870812f908e1bd15a742aaf098e22b802061c150e62cb0b06e473e99f720444657b984b8f6069e037823522794
 DIST gentoo-kernel-5.12.19-1.amd64.xpak 66346655 BLAKE2B a03cbcdcd1a90d48d7e11e988d03efa43980f4d5d8af4b74e4c81f195faa01803af45fb38f7dc1f5af7e9b5338a53bc6f34837c37f7e853c088ec6c1dc084e44 SHA512 3d7f78c488ecee2532f8a8ad61e3aa0f5e238e4cd520d29288715a3dc5c488670d7378f3dc5bc110252dff10108dfbda27a54722c6b044151999428d002b34e1
 DIST gentoo-kernel-5.12.19-1.arm64.xpak 60043529 BLAKE2B 8746081847a39e1847b8e9f35fcd68565370b116d6418edf803c4cdca9d750ac8ada58c4a7fd377480a1c75b3c805864d419c02ee21675bc77ac195731385a18 SHA512 d1a8a9210a1ab3d3c1894be1fe524e64b859b0a02763feacfed1a24655540ade6c28af751b23e924fcc04fb9abd56e84c43d634ad80bbb4d5de79ed533b5ea50
 DIST gentoo-kernel-5.12.19-1.x86.xpak 58076509 BLAKE2B 0e4aca91c834b23fb169bb6fabab13130de811c15f89e6341ad2a36ac230071ced6c6d7bd30be0f0f3860d09968449c1933cd33ed021213c667304070b80f9a7 SHA512 9786f106ed59661546d9f035e25c39f4c7a4a41f51afa96700867e47bab19e148e8a42c79bc3b7780967c2f82f1fef6920f220fb5fccd6f267a2c6e6a3081126
@@ -25,13 +43,26 @@ DIST gentoo-kernel-5.13.4-1.arm64.xpak 62698454 BLAKE2B 110da7beab919c6a3c95cae9
 DIST gentoo-kernel-5.13.4-2.amd64.xpak 67284746 BLAKE2B 945d5bb6271142f32f421702969ebffe70ca5232f54bd8a1b48a559971510eb623e7a9b803b044cd17273d27606ad37744e8fbd2812cacf46973f3152ee91939 SHA512 af4cb262af32136138754401682de9f7c781929a0a950d2453738300025b06973a3001d1f2c23496e04a3367f12e07ef897ff858ca9325de59309924c04fdc98
 DIST gentoo-kernel-5.13.4-2.x86.xpak 58486426 BLAKE2B b27a59ce5344db5dd255c831a0752a6a2489611e134891d04040023dbc90d3c7bb49e27762efd0ded4ab95a35f92abc48d051d8e65dc4b620ef74bdce9a93ef0 SHA512 2375c524589c509a0025a92842497674b79b791280a115c14a85d8ea5ad97e595c83efbe91ccfe3ebec098444ad4f299d889f97edc953f8122e70251da228139
 DIST gentoo-kernel-5.13.5-1.amd64.xpak 67289943 BLAKE2B 4a176cb85c9a62555ffe8ce685742869010cee77f24eaf2dc01e77e107e3def9d63f2f452ae59ea0e915749513c3202b8d095ec07ae37fee2b45bc357c10be8b SHA512 728b51346674a20576ad7aad870268112794608b75da1917fb846b6e18c44bfd705f29b5b2baa83e8aba3ca6438648cda8d45978edef1ca2657a07451ddd7a4e
+DIST gentoo-kernel-5.13.5-1.arm64.xpak 62750794 BLAKE2B 98c1fb2327eec70004e4e18f62f9e85809c136e13780f0ab7e96fd627e0d42029d8985cb10ce6afd1dd69ab2fbaf7dd8a2c18b119750fd6d870b7ee681e3bd6c SHA512 737644e56624799aa1fa93361c78939481306805862d1ff84001844528728df823daf6c521bf633745d0d0ff4d398851605a2f81a0aff56165ee33f7b8107feb
 DIST gentoo-kernel-5.13.5-1.x86.xpak 58492372 BLAKE2B 21ace06930af832e3465dfa5ecf6597639b2376d749f96f432a3ef82fe001a393afb3659b29c54d10319b73fe3223273f7a6c9fbad3b1343b9c6f317998c7b48 SHA512 a3262bf06f03ed74b4e65daebf00ca9fa7778fe79c3418f2e6e34eb3134fb466b4f5797dc3d884d869ae7358af539a1b42a7b39b9268db38289e0ba3dc924550
+DIST gentoo-kernel-5.13.6-1.amd64.xpak 67333225 BLAKE2B 8ac29fcac29fc999afb27475706feb84cb45c29226112d20dbc4dc10eee76e3b5e6be3c0c9eaf6702e582d20f2171b597a62723a8b65d9d55c67d49d12605b2d SHA512 14210da32d70e6a8c3efe25dd1d007fd049050c4599b65ded8dec9173ac271c9d6e668d53e9c7789414a74d9de0164605e57244fbdf5ffe39e4a9818edb4d52a
+DIST gentoo-kernel-5.13.6-1.arm64.xpak 62701469 BLAKE2B 65be6a649fbb7a64e9bb66aecf17d70c4b0f55ffdb39faf28602b366ea74d500b5f497a16b2056339aef553135de17660606b950c2064528ad5d27ccb5a6d178 SHA512 018b4b7d0283cdce9b0fa154ff9ba0162f5d82a37a272be187949522124c1d1c856ddd264b315392f394362ce42dcf71d36b83981dd39db9fd67fc0d8d60ee46
+DIST gentoo-kernel-5.13.6-1.x86.xpak 58503030 BLAKE2B 155b0e3dbb55457f6f9d2eb4888ac4a31e31ee83374761c115773b7f4068940b3783ec6de76544f312486a7b678545060d39a5876a8499e9b5ffc359969873e2 SHA512 2002d1ffa8ff9ab7182db9e99be7afc61657060649479238bd1764ef20d189f3ad9bb22df63c41aad2d7a742a48c437965f41dfedee613ef33fa9d5e8ac34330
+DIST gentoo-kernel-5.13.7-1.amd64.xpak 67276613 BLAKE2B 18e0b34b5b6f214d98eec3d1a2e573e3323174351a8f8409485a119a4acff6160ebba11ba6f3145f96b3c6044549e03b47103471cf5a72b49a92a73b444b02d4 SHA512 2e7e31fef38e50ec8662040a61cdb6658896b71d294106a43cde41ef338440ee3912c5a5544bb6f093a74e9cd584e86150cea51eb0486cf973051b1610a6f0ed
+DIST gentoo-kernel-5.13.7-1.arm64.xpak 62784203 BLAKE2B fa13585c714e5e0f8a02d23908ef6e4312f04e530869d8827969fc5483bbbe8bd5c9d578a68edf3d7631800b4ef9d4791f44cac5d960d0892e6a401a5503cf62 SHA512 b91ed9f6b9717c1514802a75ef6f2e1d4268dacf95caf404157ad973e7a38d5da34f8ae0d38d2a0f2061e1e1e350815fd0c43c5d322c5affe68989ae160d646e
+DIST gentoo-kernel-5.13.7-1.x86.xpak 58487920 BLAKE2B accf7b6a0f5f57e0759f48ddd6868af0b569571b383b876448424c97c4e7a66a139250752ee3ddb42d314cb8018a45859f9bd3fa3c57074364f4d7a09130a2ef SHA512 456c3aeb610ac6516d46f5ba0944b3cc0d78bbf0d773a7de76abc548f349f9e891ff04ed60420cf51c83588b1b2e162f37034e00416d138daab589b72c67a91b
 DIST gentoo-kernel-5.4.134-1.amd64.xpak 61349154 BLAKE2B c7627b1a8ad85b22450ae1b47a26f9144707f8a2173b01859ea1d876cf4d96e9fcc27be439e6c0239d7494795cc62fa931ecc71be84f9f898ec017a79d82dcf9 SHA512 d4c6613ed069a0ec2dbb5f5bb317abe952309f6ba6fbb163cbf1392478b1756dd129e51665b3b4e9c939395f5cdbc553003d7f0201098f959be9d29233a48cc9
 DIST gentoo-kernel-5.4.134-1.arm64.xpak 56052116 BLAKE2B 6a901fb6a639470145c8b58e435cfe4a380ebd402397ca34eace732936fda8e38a8e92e0f49d747e6f1ae8fb5410960e236ea2cc22dbc7f25ac833275b9b6fea SHA512 216287843b7d1e740afa3c88376e5d5ae99d88882b6669c753fdd341d7f9cd84ee8cbf28fb08f6101b9a9263ce20c6ddeeececf078c7387e571eac53baa52204
 DIST gentoo-kernel-5.4.134-1.x86.xpak 53144418 BLAKE2B d11e4de3fddb270cc41c9ad49c048df0af8e578f9ef0d811dbc4d930c7b399b7bfff724db889e3e8ce9332920b5f736594923646f7c1c8eb9f07371a85f0a1c9 SHA512 7fc2a72b5f7b636312ff28a2beb07a4514093499bb498bd43574cfd5178490c94628391acfb0da1c08569cbe0cc629373a1b9828398418f82c1745961c6508e1
 DIST gentoo-kernel-5.4.135-1.amd64.xpak 61365037 BLAKE2B 40eee7098546c0adddef5ac39312063c7df55231af0d1124f2d6cc850e5caba567bafc423d1385049a85eee75e4dece9f9500e71087aed7981832e0113cedb3e SHA512 0959a1d870248fb6c62b2f83eb698b143a4d1771c3005d4fb8e8bc926b343b29e59eb45e5b5d4e633aa0f704e8c2bd64f7975ae75814209c2edb29547e92c90f
 DIST gentoo-kernel-5.4.135-1.arm64.xpak 58020226 BLAKE2B cbce1061818daa8949ac926bad8b7e5162029ff6c21e51e90ada2f3353304c4fa68bca02cd5910ab2a089997ca6c85e601196f947ea2f0b572433b14e062e067 SHA512 971a4f99526cadf9dc5d6a13c48399c1fc3dbb57e859594b6efe6d423136405631b231563582cd282732a259574b1b8f11e8c2631c578d93c3057dcadeba3e1d
 DIST gentoo-kernel-5.4.135-1.x86.xpak 53141492 BLAKE2B 501bc60cd72cab3bfae35ef59989e4c0136d90032989a9ed6a13c2a63f2ec21e6925ea56058dd2799fd037ee89d95bcc3541d5857be5d664bba71a668f40afff SHA512 479720b66fd004a3ce5baf25f0ac3564b5f8f980c473cf31dd64deba243a9862d931b195b52c09e62f9ee6e2a3bd2b4e632d93b4632fdd52f6338f018254c461
+DIST gentoo-kernel-5.4.136-1.amd64.xpak 61421139 BLAKE2B 797b11e6719fd3800b27517204533f020b94261881daaab0c97fb3080c35bd0d91da1868984a3e14817dabb36f350474a85f44a6be0b538ece6a9db45cb4a764 SHA512 03f4a815846965ce367d43a2a9eaacf75b031929617568099388d94bb874ce6fe2bd5a0231fc89b0803f0411e11b159d74158d8de2be01568ff53d5f199e390c
+DIST gentoo-kernel-5.4.136-1.arm64.xpak 57991376 BLAKE2B 8c5a8d30fe8362a0ea91efd4249b804d29d7ea436255b11f7379f12464cbeb0d25ffdb520f7aa0873e8d3522f9984c7946fa0e07a5f47251b55d3fb5c7297d39 SHA512 13008c837b323f9897627e3d091b1cfeea3443b62356c05413b7afff0a66ea3a4ab2d7cfa90a5b488a0f9ec938296a150bc43b12bc81e6c6a0b3d86033b7d99b
+DIST gentoo-kernel-5.4.136-1.x86.xpak 53155965 BLAKE2B dda19ed3567e9d97385a7fed5683c681405599177df084c085be0b02a946c9180ce23b970e26311738128a70312543eb768af9744fa1fdda2420bafd99a517d4 SHA512 905a8ab761771534f0d54af4843940c8695ed27225f68fa17187cf336da074c68e72e891f58205a9cf224a7d100eb84bf3ec1c50fd5a1070aa636823f9ea0115
+DIST gentoo-kernel-5.4.137-1.amd64.xpak 61351375 BLAKE2B 0ab9e813b74fa66eec713ca7ade8666f1d6e89f7b3a66c8a7cee2c56b07f6af3c7b7e1f000f32e73edc1e438adf8647ae441f731fc68c2cc38f9757286c5e66f SHA512 e2b640546e8bf46917c73277499e3c098a0400dfc1d34587d7942f1b3f6fa99e933ecda2308500f5a4b3f544082e5dcd243d94db05f6dc0dc0b1c2a24b06d5f4
+DIST gentoo-kernel-5.4.137-1.arm64.xpak 58029600 BLAKE2B e52bbf985127a0b1888862e0a7330da458e90fa87ec87ade63cf4c6dfd234959822f59aba6aff2967a7b86765651faebd43bd68040d685571890703f84120e93 SHA512 30a4de2040b8e094cbf0a7186040551302523b628aa6749fbecd425b6f4ff90e1ba95582eb95962c521654429a939d05ca957b151bf9c6201692a7c41debe99d
+DIST gentoo-kernel-5.4.137-1.x86.xpak 53152996 BLAKE2B 640fb56116dc7eec0af1746d491a9e201914ed6831cf98a588c14a116e0d6164da5458bb3798d4e25df85d6e2f515b4eaae710e99521b5b17579b17d3fa7f648 SHA512 da4ce341561f6c24239efa905b7afc17467cb97b4c23b10cefbcad8483055ebeefbe422339eb66d2a9837300e6d1bd5405510189119e848ef45217a744b65bed
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
@@ -40,13 +71,26 @@ EBUILD gentoo-kernel-bin-5.10.52-r2.ebuild 2542 BLAKE2B 94a3c7ae2989e70e7616432f
 EBUILD gentoo-kernel-bin-5.10.52.ebuild 2673 BLAKE2B a7b7a81fa642b2b51f0cac4d00766525f5bcd8cffe9ff07243f541ca1de6d2bbd7ce3eaa770e65c7e6ba7e70b4ea638ae894ab4b577a14d2dbc2659c46e168b2 SHA512 e3ff10bae46d58670a497400b163b01a50e63a179a8454bff58fa4b7cf476b39901ffd253f664361fe83588c806481f71b2f939d8e141345cb4775ac6c9bf2c4
 EBUILD gentoo-kernel-bin-5.10.53-r1.ebuild 2542 BLAKE2B f0875f84db933407258e0b4c068efa29a99a2e87bf77ac1f40c2387be9a73ad15af1ea01c14641b2b3d8ed05b55347059de2feac8bba1853706ad68b72f2b9cd SHA512 bb839e158eca955a08d18fae084cb14359c3e83c459f724b584b3c41c5e763faf6c06d6f35742b564681a7365fd909c1f3a6c1e1070edfa1d2a802a2dc921447
 EBUILD gentoo-kernel-bin-5.10.53.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9dbd328d317f164a3a85dc88c856270d71dc6b5f709b7f088cc7c059aacac96ade4f3d7f1c96f5f1b2a6c03118576b217aa5146f SHA512 56d94d99725ec854f13092a2a5fda787bd1fc60b5576f6f1e39f80d0751062e88a992aa578cd208b76f6c9ab5e4bd4a30d9c7e1ae616eb948cbe1f6847ee0c0f
+EBUILD gentoo-kernel-bin-5.10.54-r1.ebuild 2542 BLAKE2B f0875f84db933407258e0b4c068efa29a99a2e87bf77ac1f40c2387be9a73ad15af1ea01c14641b2b3d8ed05b55347059de2feac8bba1853706ad68b72f2b9cd SHA512 bb839e158eca955a08d18fae084cb14359c3e83c459f724b584b3c41c5e763faf6c06d6f35742b564681a7365fd909c1f3a6c1e1070edfa1d2a802a2dc921447
+EBUILD gentoo-kernel-bin-5.10.54.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9dbd328d317f164a3a85dc88c856270d71dc6b5f709b7f088cc7c059aacac96ade4f3d7f1c96f5f1b2a6c03118576b217aa5146f SHA512 56d94d99725ec854f13092a2a5fda787bd1fc60b5576f6f1e39f80d0751062e88a992aa578cd208b76f6c9ab5e4bd4a30d9c7e1ae616eb948cbe1f6847ee0c0f
+EBUILD gentoo-kernel-bin-5.10.55-r1.ebuild 2542 BLAKE2B f0875f84db933407258e0b4c068efa29a99a2e87bf77ac1f40c2387be9a73ad15af1ea01c14641b2b3d8ed05b55347059de2feac8bba1853706ad68b72f2b9cd SHA512 bb839e158eca955a08d18fae084cb14359c3e83c459f724b584b3c41c5e763faf6c06d6f35742b564681a7365fd909c1f3a6c1e1070edfa1d2a802a2dc921447
+EBUILD gentoo-kernel-bin-5.10.55.ebuild 2675 BLAKE2B 50558464db4279a19a8a2c19827e7cfad716be6c252a58494692bf6debede6d05368253ec8d63f259d8f15377a61e9046e3106d93189865f3a90b9aeeaffb8ed SHA512 c4803d43d6c29839380d6f6c9ad3bf09db75e0fab94fe09025d907f574ab3be35c59114a9a32e4feb511e9d70079a0355dba7d827d439b88eee9d86cc9d4be0f
 EBUILD gentoo-kernel-bin-5.12.19-r2.ebuild 2544 BLAKE2B 7f3517bdd2c1bc73ded6502b5ed35fc403fd5013075a4e9e21335bb610be88ab6e17cb298d74e739beb3e330a7e3d52fe2a3e24cf0d254eaf61590f3a413f92e SHA512 abf32b339058742ec4e95e8ac134bec00d68a5a599efc6ff208299370e2032ea8dc9600eaa21e23047289ce9ec807819a26c232c17893d52e180a852034c70f2
 EBUILD gentoo-kernel-bin-5.12.19.ebuild 2675 BLAKE2B 72309c486946ff627032085b25686e89b43a29fe5c68ecd57be8b6ae8556d76651ea1a41b88f99fc5317880df9589ae6ce49d580d1df3f0d6c7409bf7227ce72 SHA512 5378f15c4f5e70117f8e12726a27d81e26f91e2443936eca2ce086a16dcb61eba1d28f16ae42d5b2f97c88e96e5fbf95b71ecdb79f2a8526627236ed5b408ea4
 EBUILD gentoo-kernel-bin-5.13.4-r1.ebuild 2539 BLAKE2B a43511445c920382f46cc9fd20931bd2a098a026e9f42f2493e68cd148eb68694f9a8cc3f2a74eaf12282013cf14ff7947f7e218151cb12c01246fae6a5972af SHA512 f8040b13ec219010a8946cdb2aaebfdb207c6d8cb818ffaf232a3c526d4a6eed1652e56cab943a71888f0028cedc3e2286b3dfe95ba044f4d89c363bcd67b76f
 EBUILD gentoo-kernel-bin-5.13.4.ebuild 2675 BLAKE2B 130373d1d19ec38f27a88c664b79614dc32ba3f46468789cb2e6ed60e1be0891ec06efb805ede18d0a2489b1d46ac5a76a713b3bc9f49b5387c05d24e8e470b2 SHA512 9ddb9bb07355891b490a406721d78b322daad2d818e87c891a4ae000aecebe4d9b1f1a9996e1f0273e4bc1a364b744282532830d110961cafbc5876e246db477
+EBUILD gentoo-kernel-bin-5.13.5-r1.ebuild 2539 BLAKE2B a43511445c920382f46cc9fd20931bd2a098a026e9f42f2493e68cd148eb68694f9a8cc3f2a74eaf12282013cf14ff7947f7e218151cb12c01246fae6a5972af SHA512 f8040b13ec219010a8946cdb2aaebfdb207c6d8cb818ffaf232a3c526d4a6eed1652e56cab943a71888f0028cedc3e2286b3dfe95ba044f4d89c363bcd67b76f
 EBUILD gentoo-kernel-bin-5.13.5.ebuild 2677 BLAKE2B 36ea71e86c73f165c48bf0be61a199b287b19d8b5a24577a671c458ab58a1489d27d03390092f24cf5685f4e3ec52c7062afd39eb2ba7e3f00cf0bf13caf0c5c SHA512 7a4d3a7525feb32b33e173d469decb36eb65d61a7c0d1bc5454ad3037200fd4d8ce0bb20d421cb88edb72e6846501cb79999c58161c08166d022163b49072634
+EBUILD gentoo-kernel-bin-5.13.6-r1.ebuild 2539 BLAKE2B a43511445c920382f46cc9fd20931bd2a098a026e9f42f2493e68cd148eb68694f9a8cc3f2a74eaf12282013cf14ff7947f7e218151cb12c01246fae6a5972af SHA512 f8040b13ec219010a8946cdb2aaebfdb207c6d8cb818ffaf232a3c526d4a6eed1652e56cab943a71888f0028cedc3e2286b3dfe95ba044f4d89c363bcd67b76f
+EBUILD gentoo-kernel-bin-5.13.6.ebuild 2677 BLAKE2B 36ea71e86c73f165c48bf0be61a199b287b19d8b5a24577a671c458ab58a1489d27d03390092f24cf5685f4e3ec52c7062afd39eb2ba7e3f00cf0bf13caf0c5c SHA512 7a4d3a7525feb32b33e173d469decb36eb65d61a7c0d1bc5454ad3037200fd4d8ce0bb20d421cb88edb72e6846501cb79999c58161c08166d022163b49072634
+EBUILD gentoo-kernel-bin-5.13.7-r1.ebuild 2539 BLAKE2B a43511445c920382f46cc9fd20931bd2a098a026e9f42f2493e68cd148eb68694f9a8cc3f2a74eaf12282013cf14ff7947f7e218151cb12c01246fae6a5972af SHA512 f8040b13ec219010a8946cdb2aaebfdb207c6d8cb818ffaf232a3c526d4a6eed1652e56cab943a71888f0028cedc3e2286b3dfe95ba044f4d89c363bcd67b76f
+EBUILD gentoo-kernel-bin-5.13.7.ebuild 2675 BLAKE2B 51c3d2f67482b88f85e0d4ee7c7ab263f964b4d83f0ef80cab9630fc6afaebadc1f53adf9320dacf12c26859bc3b659cd880001b27cabea86c80b5660a369641 SHA512 281c7feaa3ce6acbc7cb4873eeda9df46027d928446d77437dbf94b38cf55f61b62a30d2c8c2ac3a44867b971b6f3c892f612b435aff6b44e4945cd18109b30c
 EBUILD gentoo-kernel-bin-5.4.134-r2.ebuild 2542 BLAKE2B 9727a87501a83e6d8ced5d1a6c9fa58a737d86eb549cbabc827af379e9e7aea63024f66f0b55f0306212a0b5502c63df810cfebd55e4d6e3de11c37c6cef826e SHA512 738f3f502781058fb53463b5199686c21ce7d08135c6e91a0a0f586c2ee24e70e52f5f7a3d676d2a6f1cf6439037b5ceb05977fa2fa59e9e9e1eb9c6a6e41014
 EBUILD gentoo-kernel-bin-5.4.134.ebuild 2673 BLAKE2B 504684885b7e4d71ef6bf6379565f478cc9714f5334f74e6d8b4f2c974a86176bf6c4e3033784e6296797fe1ad63c81fe3ccacbb5330e55fa2895b6ad3ca471e SHA512 af5e9435a6803789dfcf3b36755f30db552261e362197a8328f8096a9803c27e60db3a60ac5c57c5b6ad357a0bcffa5a5a093d201e8673902a9ef6aacdb282a7
 EBUILD gentoo-kernel-bin-5.4.135-r1.ebuild 2542 BLAKE2B 6d28ac98d98db7ebf5bfcb35c7a2c223b9bc82164fca1a85ce89e987f285b1eb5c8b1848dfb9b185c6ead189d0bd1a6346d44d8638b71dea1ee0083c3e879e02 SHA512 847c2545daa9a7d6cbf094aec806ea00f7e4fcaa4092342d69d2e3313e3dc85adcafb284c5f9a654446e5062340d4b96aa1c007003ce1484d32a8a9e02a7906f
 EBUILD gentoo-kernel-bin-5.4.135.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
+EBUILD gentoo-kernel-bin-5.4.136-r1.ebuild 2542 BLAKE2B 6d28ac98d98db7ebf5bfcb35c7a2c223b9bc82164fca1a85ce89e987f285b1eb5c8b1848dfb9b185c6ead189d0bd1a6346d44d8638b71dea1ee0083c3e879e02 SHA512 847c2545daa9a7d6cbf094aec806ea00f7e4fcaa4092342d69d2e3313e3dc85adcafb284c5f9a654446e5062340d4b96aa1c007003ce1484d32a8a9e02a7906f
+EBUILD gentoo-kernel-bin-5.4.136.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
+EBUILD gentoo-kernel-bin-5.4.137-r1.ebuild 2542 BLAKE2B 6d28ac98d98db7ebf5bfcb35c7a2c223b9bc82164fca1a85ce89e987f285b1eb5c8b1848dfb9b185c6ead189d0bd1a6346d44d8638b71dea1ee0083c3e879e02 SHA512 847c2545daa9a7d6cbf094aec806ea00f7e4fcaa4092342d69d2e3313e3dc85adcafb284c5f9a654446e5062340d4b96aa1c007003ce1484d32a8a9e02a7906f
+EBUILD gentoo-kernel-bin-5.4.137.ebuild 2675 BLAKE2B 81a555fb9602a18818f384c1cbc0929eca560a2c1ca7055dc3ccebb44e66a16e12ca132523ae18b45b61d644fee834cb06aee9145a886cf1a89b8f0a45219883 SHA512 5fc435c9479c488354d3be8457d8ec8fb3934b399bd687bab80b5721474514e0cab39ed3b6ab54eda9e004b8edc860104333a3981e69ce884bb88561055c38b4
 MISC metadata.xml 352 BLAKE2B d14768a94b44290d052fa5b86553dc09bdc609c629fc96da7d5314510091484d7f22f2f4b4244fb033046eb949da8fdf6b9535d698ea3323f2da79400454b8d2 SHA512 a7b17e6764a339943b587985b95d828e84a076ceb3c372181794c905f6ce1a5554be69cb55560d823d71d8ea66666bcd5474fec1ead721633477eba31cf1cc8a
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.54-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.54-r1.ebuild
new file mode 100644
index 000000000000..9f8ae493e215
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.54-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.54.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.54.ebuild
new file mode 100644
index 000000000000..b23f3e054425
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.54.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.55-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.55-r1.ebuild
new file mode 100644
index 000000000000..9f8ae493e215
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.55-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.55.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.55.ebuild
new file mode 100644
index 000000000000..89387b6fe81b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.55.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.5-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.5-r1.ebuild
new file mode 100644
index 000000000000..2f16601a52d9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.5-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+		-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.6-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.6-r1.ebuild
new file mode 100644
index 000000000000..2f16601a52d9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.6-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+		-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.6.ebuild
new file mode 100644
index 000000000000..e00d3ebb8dc1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.6.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.7-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.7-r1.ebuild
new file mode 100644
index 000000000000..2f16601a52d9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.7-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+		-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.7.ebuild
new file mode 100644
index 000000000000..74b16314bf75
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.7.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.136-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.136-r1.ebuild
new file mode 100644
index 000000000000..fe6e6023d323
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.136-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.136.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.136.ebuild
new file mode 100644
index 000000000000..19484744cb5c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.136.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.137-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.137-r1.ebuild
new file mode 100644
index 000000000000..fe6e6023d323
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.137-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.137.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.137.ebuild
new file mode 100644
index 000000000000..ea0354e89533
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.137.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 3f94065a6b8c..e045b3cb9a17 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,16 +2,28 @@ DIST genpatches-5.10-58.base.tar.xz 1910208 BLAKE2B 3f385e4cae808101f092a1ebf72d
 DIST genpatches-5.10-58.extras.tar.xz 3420 BLAKE2B 81c42396369ce4e26d2a1574067d251b9013bd012f052e3e35ecaa1953e3d81cb9e398eb9521d191a4197ad2a81780d49059fd7abb9774e886d6d10b6b6831d3 SHA512 79afef40259c8ab2cfa957bdb56666e9ff691ff68362ad95482129e7037fc0659185923ec87ac97d217f5d2956e2be7189077ddf38844fa6c7ced4f0f6f58870
 DIST genpatches-5.10-59.base.tar.xz 1936172 BLAKE2B 86a6133afb3ebd00dd706cee9b99b6b1547ed3eabf92e43348917c06cabc9d2960b5293d5f414bc4a44e55f03eb40f83b344d65e8824f6f842450bd35a3317d1 SHA512 5c0b7f7ab5c7beb1a868235ae4fcb57726b46e7877018b09f1b025f153605d20a6017f36617bb182e41618e889e4f40e190a514bcdac37ad8811fc6884c4459f
 DIST genpatches-5.10-59.extras.tar.xz 3420 BLAKE2B cf603ca226a8edd2254b4c874e6b5a211b2f6071267428a434e5e5f18c884898de396c16b826d9f0eb0ef35fd0dda383126d99e37227b936a13b0900587ff617 SHA512 0398f8468fd61e495fdb7c350e5a35eb1756bd2da9a0967c816f434e639345ceaeb50786a24241f5f1616a401289764174693bdd2c785cc9cdc00e76e598841c
+DIST genpatches-5.10-60.base.tar.xz 1973040 BLAKE2B fb67f230bf6d8a0fb881fd3cc8fd16e8714c74d469053e9f907f609c4e91d3947085db707a7daafc1e8ae52bb35531114161ba9ecadc6015348255df53a556b1 SHA512 364ce59c34b132f2df4df0c8e612a1e5595a26f560ec9ed4e7b5282b54960e12f098a17ea87117d11a1c0e3f23e1c24ba58d22d2d5e8f5430e70aa8c98648770
+DIST genpatches-5.10-60.extras.tar.xz 3420 BLAKE2B 57d4b7bd7fe2cbce448384754e98bb84dc9f68cbe50fddf9799f82449cf4f04b77041f17cdbb08c5a7938cfe38f788bc4802cc6b0c709a84f0cff5ecff4bad71 SHA512 0b1a7ede058eed0b8f20b5f020f9fe41de07d691ca5674d5ee41fbd2636627d77dc95ff4929654a6bc430e6a4d437f2b798ba1c50dc6394e51a7c627bcbdd7a7
+DIST genpatches-5.10-61.base.tar.xz 1978152 BLAKE2B 2943d58ccae232d4111f33e76f8c41234c013eed3d196f12a85d317251549225b7062609876cfb57c0b27a3328aed93ea68508050e9aebec14cdc7c6cb1cc898 SHA512 d1065304d3b0d7d5c9855252f25c4c34328f3f7e97e87e8f9cc12449451501660b279d16e1bd83ade943f42fcd97e5c4d569eabb097a77f7ca837238d6d2e093
+DIST genpatches-5.10-61.extras.tar.xz 3416 BLAKE2B 41bfb877b640ce1a8d5b01226b77db8dd9aea03926139bd9fd4055f86fd9844ebcfe2a21ade837fb860f0f5007a3c1cb27b2147fafe79ae1ea003592a33b887d SHA512 36b16758d14c47dc94d8a00b3416182262f270f04f3ec652e89ce492dfc6694eaf0d4c214a9d57778afd0ab803c72348edb5848e362ba807f2912f7c4d51d66e
 DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac SHA512 08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564
 DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651 SHA512 20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e
 DIST genpatches-5.13-6.base.tar.xz 447968 BLAKE2B afcec75958e44f3ef7da0b2ab3e2a3d9574fbacac23d028335ce241838e36355d813fb89944ab4ed45153f5317997f18e153514f877bee6a490969b75242c043 SHA512 05afae24abbd06771ecc88b8bd93e765e7c41e9ea6826510d291cb8b10387be747ac7738e3df8cbef1d7488c96fd3fcba1138a7cbe9dc7348a76b5df51c95a74
 DIST genpatches-5.13-6.extras.tar.xz 3420 BLAKE2B 9ad0d2bf1b2621b328d142cd464b6de2676c8a4f0caef8ee4c5d7fa60db56d73b9056917e07ca421b02e6de1564b3d5f900299721b6b412cb145efa9bea8d60c SHA512 a7906d25d02082217bec37c435b316880e1af9922018b88569cdb4cf8c2cf5fd789bdac946100f2b1a9e0e2125a69222fc853ab1496abdd30ca00497afcb8fd8
 DIST genpatches-5.13-7.base.tar.xz 481660 BLAKE2B 810b5438e39c8928ec2aca11658cba78666e3384deda7f7ae3c21ed9987fc94b8b1d0c1b802ea454978a226fb6ddc13295097a284d84c95afc060fdbad09b9b8 SHA512 237189cd9f09bf1e83f83f27ea47306881f560fca9a96ce58185bd0dde707a0c46103889bbf798742d9eff9e2c0708c08b27698e659ad1b679d07f0ebcecb061
 DIST genpatches-5.13-7.extras.tar.xz 3420 BLAKE2B 431ffe1f40ef695161540131b2abefb5d3bb993d48dbab6224f6e3afcdeb8e618b3b8258dc3ec170a2f53830591f7363bcf8a21b0743f04cee4ba5af294d8cca SHA512 dd7f5488203f98395b0de62772e353907f11bdb23ef92d049ba785e5ab5be23d066bac4dc5763226057f0ce5fa957417c0435220e4702f5bc4d66c412124a04d
+DIST genpatches-5.13-8.base.tar.xz 536800 BLAKE2B 9805becf97795872d763c43cbaf81c2e9dca63764c2ea0237af5da3efd0d2f83f90d14b4581c98eb87a11b4b28b17116637006029858e68a9416b8732cf7321a SHA512 da8583f0f3620daad689ba9d32cae938fd1332f38cef212e9f1281ed138480484838db67368e1ed5d0663af150b0ae681bbb20f309e4953973f185b58273cfbb
+DIST genpatches-5.13-8.extras.tar.xz 3420 BLAKE2B e0c844f9b463f06b5c49dcbb798bcf489854bf9fcbd1973ad3c3168098bb6559e5236a49ddb0e351ac8642ec85c7494b238ea043c02e4ca0b01683343b524123 SHA512 5a8d67139b53c4f752970471afdd35980b64abb9d5df16e3ef3ce384e46808a56e15b40140a8a4f9ba910df8c7c7cbafa17ca6ac3fb30f0eea69ef13d86b377a
+DIST genpatches-5.13-9.base.tar.xz 542664 BLAKE2B 95e2813cc6965da9f37ee8ceabc548559ebf605c0e40b80e6ae3dcbd31cef26ac7e1833f6cb6c366fb7a235aeed82d1fa66de60745b7276bc16466610aef6939 SHA512 7b99964c0924aa5f2197f8815a0bd5ee9d05faa91bc32822b465fa8e2d494177965c48a8ec1af926bce9f4c8d000ce756d88c533d6ab6cf911ea6a53cb75cec5
+DIST genpatches-5.13-9.extras.tar.xz 3420 BLAKE2B a52e35e1fd84f93ffa3a641e0d3a565831f97d96d16df3b7e07a0b5c47b19cbb680c6fd3d02401a6a0ce51598ab20cb5a142ba1cf95dccfe22d6975cbb39f0a8 SHA512 b480cd4916d6fbbdb20fc47e69916dc8bfaade672bff56cd03bb42075ac0ca2404ab8c2401878f7f72c4321b148642ba7d1433c13237cbacc8236e200c6d5132
 DIST genpatches-5.4-138.base.tar.xz 3760008 BLAKE2B 085dc9525a78dfea4efa6541332c8cc16bc6c5dfbbdcbf1efe307acfe129ebca80d53bb9063d4c9f052a3909c47a094f31f2e9fb487ffb0e014eb7cd6fa8bcfa SHA512 96ccc0c5a7d223c444f7d5c7990a4a5c14de2eb1e8d44c3edfa8526a3c872ca38d0b3cf87aa65f3cd14cdfbc52573831993f0ad0c9531659108aea36c31f7089
 DIST genpatches-5.4-138.extras.tar.xz 1772 BLAKE2B f152fe554bc3a855234d9fccbd7e60003a8933a4ac5d13764d84a2c5a03e93cae7f231e1c7b50a891d9978f3aa151bb8d7c2f4166e3a1ca9feb76614514632c5 SHA512 a2f4bb291f0a4dd061251bcba3ea2fb3f48f84c53c05ab851ac8ec588dcc931a6f0f72447e1ca91950a7881247e396d825176020de0273b35ebf7770b0a07471
 DIST genpatches-5.4-139.base.tar.xz 3773732 BLAKE2B f2eaec4646c9391c5683421d702fd11c4feeac38d37f05d4dfc2b21702c9d768d9df769a8330cddbba609e92baefe62b008a2289cb31e48cac9ca4662a6b761a SHA512 65e3d44fd4ed2d3c97ddde80feee75c19b63f103fd0fd80124a1c2ca95c2655061ef76d2b576e6357cb26a05c452f8f2ffd3303d9cdbdacac89337e736793492
 DIST genpatches-5.4-139.extras.tar.xz 1772 BLAKE2B 9425c6acb177b034c23e119269646ee24c07c5ba89bf641afa3434c50c555b25b936e08f7b6d6513330a7b1cec2a8496243ea79e0f02d6dc47ddd6dbf3e53ddd SHA512 577b9bd1603877024ec30cbd1dbf3283a8292cb3adb4b4cc008dcc373e258a99ed7ce3e5548a8a2e6c4d2412d1b86b578613578102c08ef91af2fb3a1727cac8
+DIST genpatches-5.4-140.base.tar.xz 3800500 BLAKE2B 96f0643b5969a4901c1c0e31cb08e7bb49f1d18b9f175fd4096bd4ee49ef33c1f5184f25abeba67edb1c24b68de4617e0de4322625b258e37e9654c2835e2f1b SHA512 d81f3c4e53de6458f8fefdeedc42e3aad7a54b28c8907e6e0292656fee624b5dec5eea671727a7d27e1217701bc4424f4938e84df527cc46b8e86039204271c0
+DIST genpatches-5.4-140.extras.tar.xz 1772 BLAKE2B e1e90362759de205856b26cb96bb131fd9ea80e198d059e101c67d4d4ec97b4bf15992cd14f50b75015c5accebbf441f28a01dc14060baf5cd71adb87ad1f174 SHA512 2fe6cc926eb174c773144ca7bcb3d6479223582cf11112aa5f30250124e1b1c4f69736b87faf7e6316eb90fa92af441fb1bf9413ce80d568342204f035263a80
+DIST genpatches-5.4-141.base.tar.xz 3803356 BLAKE2B 77cce01a65621f898f939d9f46936d28d1971d8184df8b90a07c9a0e268b2593de27374a340cb1e6f2002630b8501163e412b3b868adbc0007d7e9033fe7a8b4 SHA512 c2434cbf65b5468c62cc295fedca7e74493bde7126c26d1cf47e2725608d9f4dfc845ca18ce779991847cdb7092d34e7018ec91648fbe3c09ef999db35dbc68e
+DIST genpatches-5.4-141.extras.tar.xz 1772 BLAKE2B 647e100ffda7cb137748ab92bc5cc95e4262570cb14b5612d6f40f5c28f7c7d38b022c11c3416506e03a303555995f2e4fb4cf07d53e44bddfbc8094f4467d98 SHA512 4ff6aff1eca4607f01940253b8fdb563fe5dd52684439860a29a2f747ec531af1120652e128f1fe44ca9b36f3a9cf47aeeeb684a3aa313903eb9cbf396177fea
 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
 DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
@@ -37,9 +49,15 @@ DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-kernel-5.10.52.ebuild 3109 BLAKE2B e15cfaa865253cf75ee6f462e61e15efdd223f3d2d637129120fbf0be1336e036047544a6451ee953c934a0cf51a796ca0483b1ebe67953491848ee19b5f92aa SHA512 7db37241c9919432c31cfe8fa644f48a8aeb16e5e2a04b38c163c7628c8dd85db3e4c2b5afdc8de0ed1a94d77ae31f22ba3a08c1a8fc5e84e74232d26d47e00b
 EBUILD gentoo-kernel-5.10.53.ebuild 3115 BLAKE2B 5c1a0b136cbcfa49036153ad7dacbe9d365ed5fcd1d3b481ae48bf0afaa40f9016e5f0fbfd7425aa4a4de0ab4a03cce825669ef878bdaaebb0f6669f445b0ad6 SHA512 6937e12ea7750e73b6e4b8627cc9a06a64dfd02a35bf84ca99c5a0d69acf0c27e322cc4c52345c1b64bf4b6f0390253800936ae012e5b25416a0056658cbe4b2
+EBUILD gentoo-kernel-5.10.54.ebuild 3115 BLAKE2B 5c1a0b136cbcfa49036153ad7dacbe9d365ed5fcd1d3b481ae48bf0afaa40f9016e5f0fbfd7425aa4a4de0ab4a03cce825669ef878bdaaebb0f6669f445b0ad6 SHA512 6937e12ea7750e73b6e4b8627cc9a06a64dfd02a35bf84ca99c5a0d69acf0c27e322cc4c52345c1b64bf4b6f0390253800936ae012e5b25416a0056658cbe4b2
+EBUILD gentoo-kernel-5.10.55.ebuild 3113 BLAKE2B a931dd6ecf886233766b0b1ec60ea67c73e248a511da1bbe41c92118acfc89ace483dfa85e4dec5e8d8a0ddbdb9635fa7601c5fe2476500039ee0d48a7102d27 SHA512 0027054cec995ac00941c5d7cfaef3c5a32b9eac8f5abed327fad9b6069a78fdf47703e097b3bbd6596bacfca2ca6fde6a409fde0ad96676b24d9f49c8bb9c52
 EBUILD gentoo-kernel-5.12.19.ebuild 3112 BLAKE2B ba1162989a26898748ff8c46f5bd36b6d21de3db498c2017835fc20b874a1ff94171e7917a1f4fa27e20569b05217478a45371224b5e5fb2c0ea88061d1e9533 SHA512 5e2fe2a48dc9c4615e0eddb044bd09b94e29a68afdf36272ab547251649480bf011e9a52a6df4f607c99a4b8eb3af068ef1301a3da26d0bd7cd28e9b45eedcb7
 EBUILD gentoo-kernel-5.13.4.ebuild 3111 BLAKE2B 3859cb3c0ec0f218941b11f20e5239715555dd5cba9faff8c8f53608a27c2f727a11df7ef70e0289dbd6dd0cf8ede9b2b3b1f60f81292704b0375c456da7cfee SHA512 81fa1c65dc0a31e03499242e71c74970aa181f86e7ec3701a95841e25b6e4a7f4262b445b39888cb8383e1b2083dddc855e6d29754f80066ac7c983c75f94d7c
 EBUILD gentoo-kernel-5.13.5.ebuild 3113 BLAKE2B 08f3fb03832666b3a2f78870d8ea06be028b7c1dc16ae748d2fd8d139a46adcfc94341910704ae6bc2a7c6e281756c12469081023c613c6be1e620aeab017ada SHA512 96b1d119094e62370e57c7b82d9d8c68f239779683fa6837fa68600b7fd981fa83366372416734f91ffdab4d30f93e9fafc1fa5b110725df983420b7c8871e63
+EBUILD gentoo-kernel-5.13.6.ebuild 3113 BLAKE2B 08f3fb03832666b3a2f78870d8ea06be028b7c1dc16ae748d2fd8d139a46adcfc94341910704ae6bc2a7c6e281756c12469081023c613c6be1e620aeab017ada SHA512 96b1d119094e62370e57c7b82d9d8c68f239779683fa6837fa68600b7fd981fa83366372416734f91ffdab4d30f93e9fafc1fa5b110725df983420b7c8871e63
+EBUILD gentoo-kernel-5.13.7.ebuild 3111 BLAKE2B 3859cb3c0ec0f218941b11f20e5239715555dd5cba9faff8c8f53608a27c2f727a11df7ef70e0289dbd6dd0cf8ede9b2b3b1f60f81292704b0375c456da7cfee SHA512 81fa1c65dc0a31e03499242e71c74970aa181f86e7ec3701a95841e25b6e4a7f4262b445b39888cb8383e1b2083dddc855e6d29754f80066ac7c983c75f94d7c
 EBUILD gentoo-kernel-5.4.134.ebuild 2816 BLAKE2B d309bcad3bdb461a42844e76b61e76b6a2cc935af6e2c2623126b2e121532e84bd28ebc067beac0fc5259f67a9be36869e7e7c1bdbcbff15674f6760d98c153c SHA512 a75e9374a0cb22935c56aa2050a8b8e3f8e30377807e25bf99bf6cd2c28f703caa25dd1b7a132151745f0c910d412b2e6959bead16ccf1051578e4995e1875d9
 EBUILD gentoo-kernel-5.4.135.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
+EBUILD gentoo-kernel-5.4.136.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
+EBUILD gentoo-kernel-5.4.137.ebuild 2820 BLAKE2B 3b56769b765f440213db7fcadc05eda3569f3bdcbdd69518fea282a8fb6318ef4568efaca467603bdaff2b65adc725e886123d62cf1eabfe66ce829c1351d945 SHA512 61e52d3dfef7bc2634797a7e8744ed9f56883f05965bd0a097ccf56a99862561301bfac6d3e1a88afec466d965c115d4931528ddb4f861007e868afbc833440e
 MISC metadata.xml 464 BLAKE2B 8f1b0ec7ef58c31bba668cd26cb39bdd0e676c22fc9def7802ea02c6fdaa32ca2d129519c51dcf7a6711ff2f5e22b3e8fa10ed5667b129f9be698bf828644c98 SHA512 2b01cf5cd40c16da8bfe767614ec47c8b95ed915a9cf3208276dbd75c9e7c065cc43c036d0e141433b6d19c2cee88fc8ae344ed596d8c1caa31c05e722373a06
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.54.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.54.ebuild
new file mode 100644
index 000000000000..660215fc8655
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.54.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.42
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.55.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.55.ebuild
new file mode 100644
index 000000000000..093862ce1807
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.55.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.42
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.6.ebuild
new file mode 100644
index 000000000000..973b0f5eb16b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.6.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.13.4
+CONFIG_HASH=a219e71ba368d65c1ede4fa6a79a17e70815440c
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.7.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.7.ebuild
new file mode 100644
index 000000000000..51fb697a114a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.7.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.13.4
+CONFIG_HASH=a219e71ba368d65c1ede4fa6a79a17e70815440c
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.136.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.136.ebuild
new file mode 100644
index 000000000000..1bf22439675a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.136.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.137.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.137.ebuild
new file mode 100644
index 000000000000..bb8fb4662a23
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.137.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index ef703a7d1703..9140cb5a48a9 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,21 +1,42 @@
 DIST genpatches-4.14-250.base.tar.xz 5185608 BLAKE2B 9f4bcf1e974bfd276b8fe557a2c3abf99602e123b18108b8aad82dc4f41c8de1065f01faebdf7cbd83dfeb192045ccac2865cc8e600953be629d4d66ba2f0839 SHA512 89bd5674abe0f9bc185174ed8dc2874cf0bff33796cac3cd8cd5372a94619c6bd68c09ac9980e7600fd441e5293520ae935c63aa1053e1cd78d8a5f72df0136b
 DIST genpatches-4.14-250.experimental.tar.xz 5708 BLAKE2B 0558256b46ad8e648039ef4fa53168a3e42cf08de2729c7d1a15a2b61fe43deb285fba05d00343494fe4a0329cd48298e6d9b428d224e15c6434f961857f83a2 SHA512 e683f3b8aba2c5280d03dab54d39eb4ee4ff6f929694fc4de89290bb5a28b120446fc95576abf51d2d66b4232c2724880238b809d83dab687fe872b93f0bb8c1
 DIST genpatches-4.14-250.extras.tar.xz 3340 BLAKE2B a8601179ede30ef4dcfdcc3b79f59313b097e76b6b494745d51e42f9552ab2bb738a973a4c58473aef418bcf7e733dc42b574b6f0387fad4a0712af9baac342c SHA512 664b243f816e1f8e85845b8f7b70e6b0e92ff8643e410afb223dd2f252dc6f5e927ae0a01127e75c65b49e6db9bad5c998e24b6bf0685bd1495f25104f370759
+DIST genpatches-4.14-251.base.tar.xz 5202652 BLAKE2B 0e7be8c48338d75d61550b81ca0ef90533097fe606fcff55a661abe1eed833aa81930238ed52c602176312d131faa3d76542254a661d5f65b50a23e5659a9efc SHA512 c96af7a45c94d7d657a805551ff64651ca996f45396b32b7d930438f2ef7f9fb72182dc391afd6a7618168612a8ebcf85d730b8bb8b69aa14b1b6bd08042e210
+DIST genpatches-4.14-251.experimental.tar.xz 5708 BLAKE2B 06d8d13d3314f742de73042fad4bb02fd8c261f6e9c8f0d34cebec91d5d658593dfbe1a1416688c80e47b5dc79df5c991553231ded0294d1a5ddad0c7fc2ee73 SHA512 d9f9756329b8fd6cc61c643377c2c6c895815e1653d3abf88c09c6262528015c231ba3f652a342552e9825bc39464f03c6dd4ef9791058ba80585480099a2042
+DIST genpatches-4.14-251.extras.tar.xz 3340 BLAKE2B be7681076f30d68770b49c8e8bef09a2b9b247bcdaf1e025a96ad950d85718463ca94882cf70c77d58b3b42a363cda9d5aa6c080d359254146fea139a8305d5f SHA512 6964919505adc947487e45d6dd83cd4e59e2c96d07c465da7327d6dbf7f4fafc9b2b9d2b039312ea3d5777d8ce55d2646b6daf98e7f0ff77f61c1a0b0c25d863
 DIST genpatches-4.19-197.base.tar.xz 4827304 BLAKE2B e6f711dab44d013bd46a969279502cfece6a360773ce8e943e7de07b0208373ca1cf0658844a344d4c5f7c7bc664cc04934224725e7ceec87d572aa0af3bf4d9 SHA512 3d4c02f0af8cba6cd0a86fd9576c64123c67d703987798c1b4f7d4983ef628092a7878a9c146dc801d06efece5171f9305c9738f804c4f71bae00477d830b851
 DIST genpatches-4.19-197.experimental.tar.xz 5472 BLAKE2B 36c7e3fc57f08147e49ad15a13ee336ed7d46ab4d14320955ee16d4e96b3c74214b99d32c6e35204f397984f7dd57ddca51c3197567efb0a08ce77aaa8177010 SHA512 087f40ea713591dc1275da5ce5cb94a4bf6163594057c3cf9359893d146ddd14728816552ea9f22e189148bd39cd35ac647cd7c1beaec6534d061bbdddfeb53f
 DIST genpatches-4.19-197.extras.tar.xz 3320 BLAKE2B 37274f82572529441a009299cfc332ffddc76e4bd34c07e8fa10849df4218d21cf4f852179d7b58acc162ef32ad823f5770a1027f4cce9ca797e65958ae80f8c SHA512 b4207a2d10a778c9c722decc23b7aa96aac22678bbe67a838afddaa5fee669539f721f92bb1eff95475f8f056ab70380d957cb8b9ca3ea2767893c3220074b56
+DIST genpatches-4.19-198.base.tar.xz 4852216 BLAKE2B 8b29a0fe93bfb8ba88c29ec4b54a6e1c33a6362a5abb95af819255451e776e19de57182bbbcb07e4158f2504f2b5e2788d5e8e75ad226ae82e864ecbc4f1704b SHA512 19fe7f6c8b5fc8fe03cd5d157612941a8cc1a5c7dd5605a42cd48ee615319f91cfba6ab6e42593db74ce641ac22f607f981399bf816516add3408805c4efeb19
+DIST genpatches-4.19-198.experimental.tar.xz 5472 BLAKE2B 30fa0310e71fe4b7f9cfc3e9452d4b70c22ef34a82bc3f2214746ce14804a0be274f75ecd57780c7c06068fb794e3bb492d3721e42b1be53ca8d546e02d04566 SHA512 a86ae37f89a1370c5e7d4c41f43d36d70951eae5e1aae15d31aea4efcadd19d7105040f3f25051ad4e29151d7a591b7df79a0ceb95752512805dac537c716867
+DIST genpatches-4.19-198.extras.tar.xz 3316 BLAKE2B 9cd995848fbb08c7f9420374e62801879d0d325a3c6d7b6cbbdc22147b9cbeb1dcf99aef0b787fbc7ca4700292552d969aff8b4f36c1998e43dbdf3454a59b6f SHA512 6830a1afbb0022129c3eed47506366e4716e82f95fc02075f538902100ca0e8fd7de5217c249576b6270eaf7dcdfc961bcc17e24cb3c2922a5248485b74c8207
+DIST genpatches-4.19-199.base.tar.xz 4857860 BLAKE2B 201f1786e2b4c3abc629f86c78694723dc674f0153f937f8abf2c324057c937e23ac20057b97452b18efd115043a0653d3e5489df834498013eeed6c9389e626 SHA512 105b6e0d41c6b33b1782e18cb279703851afe14f2a7247181699b486d09951c6402dde109b67391446170f1712832c69f8135086450f0ca55ad05d825c46aea2
+DIST genpatches-4.19-199.experimental.tar.xz 5468 BLAKE2B 9f23a33125a731501d5c5bc68703cee90072dfbaf361588936948a6e4c4c82c3c92eda125413ff0753b6e24611cb171180a4c720e5ecc6fa8aaba5377ba9d3bb SHA512 07e2311027a123ff318167810833665932643bc2c1efab78249d9da56974fbe31c03c5b3ac0a1b28f99cd9e9adb409844840ebb1d2b371ff6c4e9f5c58a5e1d1
+DIST genpatches-4.19-199.extras.tar.xz 3316 BLAKE2B 7eadb480369c72ca4d72570cf5d8bfccd6eab677cfbc2fbfc512a7eef133f706d3f4ef55f35a04685bc3170d6bd8767130ded4c65dd97daa3e4a13ead569f7ac SHA512 7fd66ae5065fe30a2efa2929963f2020dc6d10be77e82915be7a225ae69d33878f6e2b7b30e1fbb3cae790f752c345ad3e3d76a957ee6edb300236af53f75c69
 DIST genpatches-4.4-278.base.tar.xz 4220100 BLAKE2B 29b976c1d04a2303c9af683ca73ddeb5c7ed0a5b2c9dd01dfbfb8a91ef7747846a7db390721e3b31ce16df6ffb4a73f8c881cf8a1018124052638cddf945040b SHA512 c7f645028bcf397c8c6a4eeb6fa133e5cdd88c2ecf765796e3042848988dd7228ded865860b05c5a1b591e8ceb44e8569a3f38f74ad26e9c63182bc1b8a0de55
 DIST genpatches-4.4-278.experimental.tar.xz 83276 BLAKE2B 326de10594ddc544219d09778f9a50b4c8e80e29c74f1f67d6d591cfc87bf1b507941edf9efb01ae32eb296810b2c6a2268754c8bf133a59b30e3ca613ece860 SHA512 41dfda8d0425c9482c888298a0ede667826645977339e8991c134747ff081b5df67a2ac543ee4412c39961767b60846b7f6b8b3eca83ea8c243cd5a1ce383d86
 DIST genpatches-4.4-278.extras.tar.xz 1788 BLAKE2B 2068810485c3e86622d1131b8695518ff56534f6af5095df48a357716ee095453f406d06543617eff8feac06d4e227fc3710b230181fdcfe8ab8d4ce4b9173a8 SHA512 5e89f24ac7e6a45d682463d9c2526334f9b619f092e340cabdf5a24612bc5ad21c6e3b8760e57e43a82a527dec05b3f0ae6663e4a7bde809a5a020194d9d8200
+DIST genpatches-4.4-279.base.tar.xz 4231600 BLAKE2B 00665e462bc8f1433dee9175b1d9cd5f70fbc2399eb29b653c1ccb2f2ba62bb60a74aa1f37ee252dd16f674f5f62b2b43169a55680927917c5a5fd61d70ab0cf SHA512 87b686b34d672f654d935182d3fa3be5625adfcc218be447308452ba048af411b9777c6914cc6d2bd55bfd27942dae52aceba876791cf1077cba932586010dd2
+DIST genpatches-4.4-279.experimental.tar.xz 83284 BLAKE2B a7dce62b928ca1c6b9fb175e08a39980be2da3cc46e08ea61c503a2b885a5da183b5acda9495d2ec37e61377771c4909fa6d154619d45f1c78d06c1d2699d20f SHA512 96ce30ab41e5b6f40c4fb2bd07b05783df41cde039bdcf903484f0f147d70757d9a22e1753398d6f4951d2478f079f97cd95b5d17fa873898b63886f42ee0c93
+DIST genpatches-4.4-279.extras.tar.xz 1788 BLAKE2B 56d243fbc74757b0477691a8ffef97cd71318a4746e15a653f65a4966827acd1c71a0b488e67c29533ebbf5f5a792c869000956136060660763566847ff8a111 SHA512 52b2638c8d3dce7493d52bd9dc01c2c208d92be7aec81c0720efa427ebfc80caca6123e23b3e400f188402e92d02a316fe52082240c27e547425151195e75449
 DIST genpatches-4.9-280.base.tar.xz 4768964 BLAKE2B c35dfd4d2582b6d915306927920954b8d98b066c52b46fd72a4028f3450e1c4dcf475028c9ddbedf49cab0babc1425f1f60970866698826d018ce4d40ad37f50 SHA512 8140cd9eb97a1a92bd8a7e02668f5317658ade0d13d7348c77eb19eb02cbf115c8ac6033f4606ff581be8f580b606c62100686c83df5381a8dd7c66c6a8d6f5b
 DIST genpatches-4.9-280.experimental.tar.xz 106396 BLAKE2B 093294344dccb1608fdfd6bbad0facc436b3948a832ff9f607c759559e3c59d02fd9b4d94b09fc3def40ee0cde12e773c911e356ba3ffdf10d5bd0132490cddb SHA512 761b109895cba5ddb0103bc902a6422d048c39b4dc3b194e6c65cefe39b707a1cb61a690dabf416baed0ef4b812acb312225381537ed997e3533e00668305b6f
 DIST genpatches-4.9-280.extras.tar.xz 3340 BLAKE2B cd0fdd227d9188dc7e61f5a2793602168b6b3b1a3427a028429cd48cd161c61e73d4b884bbd555b2d08a79478c178a6dd089a4398b2d4c4352bb6c365996d248 SHA512 d95fc7133e2dd8dfd7265173b3a6e1d90ea671b55d396396a437bad2f88142f514f1d79a61faceee25c556bcdbf2d42820d60b4b94d89a61680b4b8e519dbbe7
+DIST genpatches-4.9-281.base.tar.xz 4781732 BLAKE2B 4813bd12b2b38ca92da2cea6a8bb375d69ae6b3a40af1de138fb90bb0def686ff4444343d21fdb68dd6f2e46bffe9901d53f734e473af5aeb4e18332134820cd SHA512 859d27e5334c9c5d07864618dba17cd722cd142769d79e5cd323f57e710b07699529d79ad875ff004e6e849a7f2bd2be7eb1300c89ba2f2383809ea628168ce8
+DIST genpatches-4.9-281.experimental.tar.xz 106376 BLAKE2B b9c6e6fd5598d45680d0c6378edec3cf1795c2bcf3c67ff63acdcafa6edfe72f48ede31786cd562455f60dcdee95a0b6bbb1688cbe599bfdcb974ef7843c635e SHA512 91c2c0cba1e1262c6c676df57b42543f0e2322958ed186a51823fd04435392cca6d8172015c3871c2f991287e33273ebd1193be86e3ee1efdb7f67b8d4983799
+DIST genpatches-4.9-281.extras.tar.xz 3340 BLAKE2B f507788f7c94ae0351b4c4f21b0b23da62210586e501dd891bb603cc2c6ed58cc1707d20fa391a62345ee7b80a635a84551d5c5c66c35fedca443554714b8772 SHA512 7a3dbb96988d43265daf82ab7a2d26c35a8a3fe8b6f9eb3222f36b30c9924acd352a0a06092f592ebd19eccda31b2a2bd2aef95536894d27efa9eb7fd985b1e5
 DIST genpatches-5.10-58.base.tar.xz 1910208 BLAKE2B 3f385e4cae808101f092a1ebf72dc9cf1bcc94ed8bdca8a4772afd0c32cb1424f96fee2e59ab7605b588e64d162e46aae2918b7916bded019f97f637292853ee SHA512 be328dd7212c5a0e009ba95d45c716912d96743f3ae5e2e5e1daabc252f1e151043abe21f61ef90fc4f23d4e164b6ebe2d289abfc1470daf1a33a1564dbe7b06
 DIST genpatches-5.10-58.experimental.tar.xz 16888 BLAKE2B 612c0ebb760571891d4a05cff1f63396457a7da98d29698a87954da7c12dacd79e635072254fa7016b99012c65543ec7cc7670239c12520e29d48428738b019c SHA512 0dfe7846a5cb99ad0fcd01bb8a772401dc93e3ed91387cade18daed2ca884fbc484598dd27d5b1b07bea934c73049342457fdc6051946e68c08d5a045764b307
 DIST genpatches-5.10-58.extras.tar.xz 3420 BLAKE2B 81c42396369ce4e26d2a1574067d251b9013bd012f052e3e35ecaa1953e3d81cb9e398eb9521d191a4197ad2a81780d49059fd7abb9774e886d6d10b6b6831d3 SHA512 79afef40259c8ab2cfa957bdb56666e9ff691ff68362ad95482129e7037fc0659185923ec87ac97d217f5d2956e2be7189077ddf38844fa6c7ced4f0f6f58870
 DIST genpatches-5.10-59.base.tar.xz 1936172 BLAKE2B 86a6133afb3ebd00dd706cee9b99b6b1547ed3eabf92e43348917c06cabc9d2960b5293d5f414bc4a44e55f03eb40f83b344d65e8824f6f842450bd35a3317d1 SHA512 5c0b7f7ab5c7beb1a868235ae4fcb57726b46e7877018b09f1b025f153605d20a6017f36617bb182e41618e889e4f40e190a514bcdac37ad8811fc6884c4459f
 DIST genpatches-5.10-59.experimental.tar.xz 16864 BLAKE2B d4658e290a783c870bc6d59e23d82c1b8043e4d6c0bb80d507d735e1512ae585971c31201337df214f5fb3fdc164bbb6dae430f418f37e9e9a37fdbee7d5662c SHA512 8851a86277c7e2b7245341c93d8f4f9e4727f77d301cd7545fa1805b8c0ae9d15edd33a68593ebb8c8ee331f898f07d4e1668cd7e72a8bb261d3830b0621a7ab
 DIST genpatches-5.10-59.extras.tar.xz 3420 BLAKE2B cf603ca226a8edd2254b4c874e6b5a211b2f6071267428a434e5e5f18c884898de396c16b826d9f0eb0ef35fd0dda383126d99e37227b936a13b0900587ff617 SHA512 0398f8468fd61e495fdb7c350e5a35eb1756bd2da9a0967c816f434e639345ceaeb50786a24241f5f1616a401289764174693bdd2c785cc9cdc00e76e598841c
+DIST genpatches-5.10-60.base.tar.xz 1973040 BLAKE2B fb67f230bf6d8a0fb881fd3cc8fd16e8714c74d469053e9f907f609c4e91d3947085db707a7daafc1e8ae52bb35531114161ba9ecadc6015348255df53a556b1 SHA512 364ce59c34b132f2df4df0c8e612a1e5595a26f560ec9ed4e7b5282b54960e12f098a17ea87117d11a1c0e3f23e1c24ba58d22d2d5e8f5430e70aa8c98648770
+DIST genpatches-5.10-60.experimental.tar.xz 16872 BLAKE2B c5399a4afc092f2d9b3cb26f328ebb7f6784b45e560d7f46dc3b2c9df7dadd49598213ddd9531fa1536deaf8b9d4737c42bd0c159e864792885dbc516164ccd9 SHA512 72c5df0a084a72a406af0a0c8e8ba6dc54282bb55f0ddefc8ab529640e56b867b4b04981e567a89f3dda2a57c6119a42af08f36e07e7738f024a21e48eb8d308
+DIST genpatches-5.10-60.extras.tar.xz 3420 BLAKE2B 57d4b7bd7fe2cbce448384754e98bb84dc9f68cbe50fddf9799f82449cf4f04b77041f17cdbb08c5a7938cfe38f788bc4802cc6b0c709a84f0cff5ecff4bad71 SHA512 0b1a7ede058eed0b8f20b5f020f9fe41de07d691ca5674d5ee41fbd2636627d77dc95ff4929654a6bc430e6a4d437f2b798ba1c50dc6394e51a7c627bcbdd7a7
+DIST genpatches-5.10-61.base.tar.xz 1978152 BLAKE2B 2943d58ccae232d4111f33e76f8c41234c013eed3d196f12a85d317251549225b7062609876cfb57c0b27a3328aed93ea68508050e9aebec14cdc7c6cb1cc898 SHA512 d1065304d3b0d7d5c9855252f25c4c34328f3f7e97e87e8f9cc12449451501660b279d16e1bd83ade943f42fcd97e5c4d569eabb097a77f7ca837238d6d2e093
+DIST genpatches-5.10-61.experimental.tar.xz 16872 BLAKE2B 371e5096439f2517511fd0680b79ff1cb7f4f9a7c70eb17878f2fc662e5d634860da3dd138fa1d09dcedfd1b6e42687c6ac964b447d6c0dc779e0fcdfebcba03 SHA512 a054bc8e0f360c580c501868c176a72037cb57041accceff10a2074abe1db63ec0492ed7cfad8f27c78bee65d8592f9164a3d232e47abdcdb724dffb0a7e5e54
+DIST genpatches-5.10-61.extras.tar.xz 3416 BLAKE2B 41bfb877b640ce1a8d5b01226b77db8dd9aea03926139bd9fd4055f86fd9844ebcfe2a21ade837fb860f0f5007a3c1cb27b2147fafe79ae1ea003592a33b887d SHA512 36b16758d14c47dc94d8a00b3416182262f270f04f3ec652e89ce492dfc6694eaf0d4c214a9d57778afd0ab803c72348edb5848e362ba807f2912f7c4d51d66e
 DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac SHA512 08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564
 DIST genpatches-5.12-22.experimental.tar.xz 70168 BLAKE2B ad642f4dd65ab934f7ad5de9e30bd9aff1a52da5d32e958e753c73b19e8d9a7987a0181e5048c9e47675bcea2a1bd4df1e71f900eea976fd484560fabf332dcf SHA512 1169012901b5e5363242398fd3b6fbbef3db0d62df9d3c24e4e4336a6de917abb58f7d4be4c2ed064d697b6121d4833bbcefacdf2e3babb411960da5f4c46b5f
 DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651 SHA512 20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e
@@ -25,12 +46,24 @@ DIST genpatches-5.13-6.extras.tar.xz 3420 BLAKE2B 9ad0d2bf1b2621b328d142cd464b6d
 DIST genpatches-5.13-7.base.tar.xz 481660 BLAKE2B 810b5438e39c8928ec2aca11658cba78666e3384deda7f7ae3c21ed9987fc94b8b1d0c1b802ea454978a226fb6ddc13295097a284d84c95afc060fdbad09b9b8 SHA512 237189cd9f09bf1e83f83f27ea47306881f560fca9a96ce58185bd0dde707a0c46103889bbf798742d9eff9e2c0708c08b27698e659ad1b679d07f0ebcecb061
 DIST genpatches-5.13-7.experimental.tar.xz 67624 BLAKE2B 16e5ada74a44d8ecbf8dce2394a21223cd215689bcfb8dc3eb9e6ce3c0326a220cfdb6f78a0d7860f899ed44c7fd61ad8d47d783fa54c6c74f1785a3b3ecd8f4 SHA512 2d5df68692675d9782ed1ad386b595d2c50505fccc72c71d9d26fc87e0a2773cbaffa1f2316b6920114b3883929bb0f2c50aa29e1528bfd72322c0ea0b07893e
 DIST genpatches-5.13-7.extras.tar.xz 3420 BLAKE2B 431ffe1f40ef695161540131b2abefb5d3bb993d48dbab6224f6e3afcdeb8e618b3b8258dc3ec170a2f53830591f7363bcf8a21b0743f04cee4ba5af294d8cca SHA512 dd7f5488203f98395b0de62772e353907f11bdb23ef92d049ba785e5ab5be23d066bac4dc5763226057f0ce5fa957417c0435220e4702f5bc4d66c412124a04d
+DIST genpatches-5.13-8.base.tar.xz 536800 BLAKE2B 9805becf97795872d763c43cbaf81c2e9dca63764c2ea0237af5da3efd0d2f83f90d14b4581c98eb87a11b4b28b17116637006029858e68a9416b8732cf7321a SHA512 da8583f0f3620daad689ba9d32cae938fd1332f38cef212e9f1281ed138480484838db67368e1ed5d0663af150b0ae681bbb20f309e4953973f185b58273cfbb
+DIST genpatches-5.13-8.experimental.tar.xz 67640 BLAKE2B f555d38adbdf407826c86c2857f8caa14aa6e82bef98dc1860bdd822c7264753e4781c2ea9a74f72a84dd6839e7cdfab5181cdd8a7f435fe3ae97df2d537bdf5 SHA512 a0beb9c48b4deab3fca765ccdbcccab58218ba6005edc158c2cb6e23277fd6785da8fc535e574dd58dd2cef608713c24d00118bb48fd6c5b07c525a526c44df5
+DIST genpatches-5.13-8.extras.tar.xz 3420 BLAKE2B e0c844f9b463f06b5c49dcbb798bcf489854bf9fcbd1973ad3c3168098bb6559e5236a49ddb0e351ac8642ec85c7494b238ea043c02e4ca0b01683343b524123 SHA512 5a8d67139b53c4f752970471afdd35980b64abb9d5df16e3ef3ce384e46808a56e15b40140a8a4f9ba910df8c7c7cbafa17ca6ac3fb30f0eea69ef13d86b377a
+DIST genpatches-5.13-9.base.tar.xz 542664 BLAKE2B 95e2813cc6965da9f37ee8ceabc548559ebf605c0e40b80e6ae3dcbd31cef26ac7e1833f6cb6c366fb7a235aeed82d1fa66de60745b7276bc16466610aef6939 SHA512 7b99964c0924aa5f2197f8815a0bd5ee9d05faa91bc32822b465fa8e2d494177965c48a8ec1af926bce9f4c8d000ce756d88c533d6ab6cf911ea6a53cb75cec5
+DIST genpatches-5.13-9.experimental.tar.xz 67632 BLAKE2B 4b889e486d98e6929240b12ff3cb59620a89b6026c0f34da2755acb2ffac7b7e07da1ce04d604e98fb94feeac18ad5636dc2f6d633aafcdb6a0366a40082f786 SHA512 e0cb5e3ac6af796b515dffb1963ca74787951e1ff498fc235ed671c1756ec2b8a84c2c4677c95382b76dc98b26d237f832d721f84dfcb8666b317eb62c59a059
+DIST genpatches-5.13-9.extras.tar.xz 3420 BLAKE2B a52e35e1fd84f93ffa3a641e0d3a565831f97d96d16df3b7e07a0b5c47b19cbb680c6fd3d02401a6a0ce51598ab20cb5a142ba1cf95dccfe22d6975cbb39f0a8 SHA512 b480cd4916d6fbbdb20fc47e69916dc8bfaade672bff56cd03bb42075ac0ca2404ab8c2401878f7f72c4321b148642ba7d1433c13237cbacc8236e200c6d5132
 DIST genpatches-5.4-138.base.tar.xz 3760008 BLAKE2B 085dc9525a78dfea4efa6541332c8cc16bc6c5dfbbdcbf1efe307acfe129ebca80d53bb9063d4c9f052a3909c47a094f31f2e9fb487ffb0e014eb7cd6fa8bcfa SHA512 96ccc0c5a7d223c444f7d5c7990a4a5c14de2eb1e8d44c3edfa8526a3c872ca38d0b3cf87aa65f3cd14cdfbc52573831993f0ad0c9531659108aea36c31f7089
 DIST genpatches-5.4-138.experimental.tar.xz 16916 BLAKE2B b654b54afcc3352f989428189f0cb3011aa197dee7559aa8851f6e98f09dfcc91eedf2161a5b1773aef83054b50e03edb3bbbc147820ce4281f91d65e3923138 SHA512 c9dcf8fae83d2c9c51e2a3638ee43689f5587fc05897c26c016f524c4c41842e3a5f7edc642084e0f7c1631532cabeeba3fdd912160ba4cd6d79fa9d1f40d842
 DIST genpatches-5.4-138.extras.tar.xz 1772 BLAKE2B f152fe554bc3a855234d9fccbd7e60003a8933a4ac5d13764d84a2c5a03e93cae7f231e1c7b50a891d9978f3aa151bb8d7c2f4166e3a1ca9feb76614514632c5 SHA512 a2f4bb291f0a4dd061251bcba3ea2fb3f48f84c53c05ab851ac8ec588dcc931a6f0f72447e1ca91950a7881247e396d825176020de0273b35ebf7770b0a07471
 DIST genpatches-5.4-139.base.tar.xz 3773732 BLAKE2B f2eaec4646c9391c5683421d702fd11c4feeac38d37f05d4dfc2b21702c9d768d9df769a8330cddbba609e92baefe62b008a2289cb31e48cac9ca4662a6b761a SHA512 65e3d44fd4ed2d3c97ddde80feee75c19b63f103fd0fd80124a1c2ca95c2655061ef76d2b576e6357cb26a05c452f8f2ffd3303d9cdbdacac89337e736793492
 DIST genpatches-5.4-139.experimental.tar.xz 16920 BLAKE2B 6f1fcceda187c63781b59b18fe04caf0cdcd9a183b79913117fb05cc5b92bf249f5727a4f124dbeb18318e63ee28eea458b524d98c7551522b4519d63476d1c9 SHA512 83408490e327fa2d826ad80e1038e7addeb4d655e1d94e930dffd397aaf93636a58e4f5a20aedbd01531991ebf0e798e68d96f3a99e21dbb45229d9a8bd85b68
 DIST genpatches-5.4-139.extras.tar.xz 1772 BLAKE2B 9425c6acb177b034c23e119269646ee24c07c5ba89bf641afa3434c50c555b25b936e08f7b6d6513330a7b1cec2a8496243ea79e0f02d6dc47ddd6dbf3e53ddd SHA512 577b9bd1603877024ec30cbd1dbf3283a8292cb3adb4b4cc008dcc373e258a99ed7ce3e5548a8a2e6c4d2412d1b86b578613578102c08ef91af2fb3a1727cac8
+DIST genpatches-5.4-140.base.tar.xz 3800500 BLAKE2B 96f0643b5969a4901c1c0e31cb08e7bb49f1d18b9f175fd4096bd4ee49ef33c1f5184f25abeba67edb1c24b68de4617e0de4322625b258e37e9654c2835e2f1b SHA512 d81f3c4e53de6458f8fefdeedc42e3aad7a54b28c8907e6e0292656fee624b5dec5eea671727a7d27e1217701bc4424f4938e84df527cc46b8e86039204271c0
+DIST genpatches-5.4-140.experimental.tar.xz 16912 BLAKE2B 43b3b09561ba5892543506cfc9bf2909c99cac05bbc467f2cf5d15218097e216f53972ed576f95a2cf2617c7032bbbc9e3af7ee9c79d2ce9c3ca7d287003f297 SHA512 fface78bfd139ba56002601256b382336eedbd0565db02f66ddfc8f2101956cb494183dd083f5dfeed38cb72912ed818eb4179e14d1dcc786797d2baabe69be0
+DIST genpatches-5.4-140.extras.tar.xz 1772 BLAKE2B e1e90362759de205856b26cb96bb131fd9ea80e198d059e101c67d4d4ec97b4bf15992cd14f50b75015c5accebbf441f28a01dc14060baf5cd71adb87ad1f174 SHA512 2fe6cc926eb174c773144ca7bcb3d6479223582cf11112aa5f30250124e1b1c4f69736b87faf7e6316eb90fa92af441fb1bf9413ce80d568342204f035263a80
+DIST genpatches-5.4-141.base.tar.xz 3803356 BLAKE2B 77cce01a65621f898f939d9f46936d28d1971d8184df8b90a07c9a0e268b2593de27374a340cb1e6f2002630b8501163e412b3b868adbc0007d7e9033fe7a8b4 SHA512 c2434cbf65b5468c62cc295fedca7e74493bde7126c26d1cf47e2725608d9f4dfc845ca18ce779991847cdb7092d34e7018ec91648fbe3c09ef999db35dbc68e
+DIST genpatches-5.4-141.experimental.tar.xz 16912 BLAKE2B 3fc41eaa1bfe34e1140b92301ae90a8ea43b9bd5608fc4d50a4ad96ab1d1ec12b0d53749ebec3a7c21373fb811738a1baaa1f4a66a23dddeb365eb59e1263e78 SHA512 090446167e9a1106488f29783f9088ff3c1c8a95235a0c18b273dd215d892c3cad2797889453ed78f96fb4918aa145282fe0ffa5efb06cd78f4aed7f45b4611a
+DIST genpatches-5.4-141.extras.tar.xz 1772 BLAKE2B 647e100ffda7cb137748ab92bc5cc95e4262570cb14b5612d6f40f5c28f7c7d38b022c11c3416506e03a303555995f2e4fb4cf07d53e44bddfbc8094f4467d98 SHA512 4ff6aff1eca4607f01940253b8fdb563fe5dd52684439860a29a2f747ec531af1120652e128f1fe44ca9b36f3a9cf47aeeeb684a3aa313903eb9cbf396177fea
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
@@ -40,14 +73,25 @@ DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275b
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-sources-4.14.240.ebuild 730 BLAKE2B 8ae20f5740a13a0eab73e5d1c6c748f3eb39f21a852f2c82a28f10936d859c5de5604874b632e0ba79be4b0d3e7691a4bc450fb7398ff2665d7203ba09841b7e SHA512 3bab8a192e1a2d3efff596ba8c5d97169bf8e65df52a3c92255dac7a1d1563c05dc8e8c155f5b7e4fc1a26629bad29c37e0bef891473f49010bcf151c84d2192
+EBUILD gentoo-sources-4.14.241.ebuild 736 BLAKE2B 848b8ff4e951f5040875b2d35f5e2ce061528630b8ffed112ca91e0e1efcbf78395df4787bd2945a0c83fe0d55353c79c545bd3a18e71744f556188e396dcfe1 SHA512 1e90464611a9f388d5c9ef49ee671e6a5ff635dda62d6291445c246b5b7c4fa1de521ba0ef40f4283d7a56a035ed8733b72a75d67284ed5de94428b636260447
 EBUILD gentoo-sources-4.19.198.ebuild 730 BLAKE2B eb4a1da4f6a8ccc42f5915db24aa5566740e75f65692f6073408ad5237c4b12591e9d553c85d80dfb0dd4bef8f4ed1ff74fd05fff8178f773e67a829d44e70e2 SHA512 a04c571b2db0a3a5b5d7ca27049011aad0f90232f089428001629a79c1a7c496f6f5222ff9cefa17b238f0baac820693b59005a2ddf8c549c3ce7a01affd5d6f
+EBUILD gentoo-sources-4.19.199.ebuild 736 BLAKE2B 94332acee8d2b30c8881dcaee1b221c37e01cbe315ed9294dc0d83f1804f45dedc1ccf58ed1cea509f3762a5d462e5a3a8f5668da92a6a15674b9b7f5f7dd1b2 SHA512 14d468e96fa8e8b70c3a726edae3ea0cc87eb2287a95e47f25abe99aa192d328f6b4813c89c5bd81fe504a80057ffd212d259bc2f052debb3d3cac5f8d74906c
+EBUILD gentoo-sources-4.19.200.ebuild 736 BLAKE2B 86c5489ea9db67746706a6449076ea4df61f2f5144b263a20fafa9d589115aca6ef891d51490a1598f00dacceed1da62b322dfdb56f746598c657334afb69b3e SHA512 52edba3e53f1301452dc5f4e4ea85b3083676d8ed1696682fd65d6cd452e2651f3430112ac752c8df41f210dbbd778eb2288446df400ac6e66a58d6730c4310b
 EBUILD gentoo-sources-4.4.276.ebuild 730 BLAKE2B 8c06c87da83c0d058b3a48f1653b1792a930556ae9f526d3b831e13c5c71eed74590bd635d119f84f6194b1f693a44aeef61efc683954c46b9624915d0f3a339 SHA512 2f6be2ba0b757464c8d2419bcd5703f01cae5835c9988274dee7a5f95908eeba7ed57cb8318f017695a513c05601fcbfeaf412b42c949046e24aa6c6b7927c2a
+EBUILD gentoo-sources-4.4.277.ebuild 736 BLAKE2B 241de1b96d94915dbc3c9089643b84fb57a7fd4551bc77c12a6c404885d55e72a90c5aa128e1f053f36f5621b421d4c244aec2b3261d6690ced88d5cf7c3e1d9 SHA512 3e1fcf3e57b3395c0ab089db8c811b726be4a88365df6b883bdf41dedde2d49e8a81e366aecd188f0398ed34f8a6579aba8b3ebd2852837d3da887fe4f031ff9
 EBUILD gentoo-sources-4.9.276.ebuild 730 BLAKE2B 8a46b97e4c93477c65c065d1387882a202bad7f3e63e26be690122e2b3f4072c5d384a690888738d86d59d4049e5ea64a64caae3fb0dac17cca4585b8929c613 SHA512 e25cc8fd11b1d3369ab27fc91b9dd77cd4d2c6c060ee194ff1c2b802048e2f5a1936878f2263ad9f38161abac2f95a39498701bc80889a9fc41a4238a25a04d6
+EBUILD gentoo-sources-4.9.277.ebuild 736 BLAKE2B 2a9f0f83b44861ed77b34d4fc4669741de76786f9e2aed9d458cd8ebd7278169d07ba78374aaec027ada9da062a8dc5a01e03993250577e9fe0c7c2ff3241fe2 SHA512 7fea33a86a3a8ad1935844811db9bc1321e48d3ea12167a35c99ff4604c98b0ad7b86c324d55c37aaf3462d7dc735f5197428d5a726f7a85db483eafe8118150
 EBUILD gentoo-sources-5.10.52.ebuild 735 BLAKE2B 8f23c05d24848eb773c073eaa34d1276ff4bb6ad64c40cd72210beb6dcff6b18dc93a26bccc38e363b0b97c680ed7322e7b34ee3bbd9883e0529c508029a8a47 SHA512 061223e3a3d795eb4480fdd39d5e8d75d9454b599afb1326cc0e51d0ca0544306bde81568467ab623681d7be06cb6d18ce6a2c9f940888590a18b548075f7d80
 EBUILD gentoo-sources-5.10.53.ebuild 742 BLAKE2B 37a337a076d192483c1db50771f5ea9fde3b6088803144a1f14f4497397baf8bf8c904285211f9142c9795f9ba3bbc16a46f1522e707ecd7772c22240597a98d SHA512 937a330a39db0fce6278178065616438299528e0d76716bfa6234204dfbd1e116c4d7fb4d29e110d0eceb970652f78fcf2a0b86b7a8eb24bda10c7c346fc41ff
+EBUILD gentoo-sources-5.10.54.ebuild 742 BLAKE2B cd24dbc473295c6c86aa26c36d30b28a6a777dff6200f0da626d0a4f5c1293469ecdbb95e5a63f3e0dc848816d38ebff620bc529e210849d6d6225fd55ff0a93 SHA512 dea936401fdd833b3cd5f362cc8054b6c722a47e23c8e34e7a8c2390bb927bdc5f808d928b384dbf8fc898e29da5f79d796b0cc2fa828c661a22d1ace2fd66c4
+EBUILD gentoo-sources-5.10.55.ebuild 742 BLAKE2B 2b77d80f36fef8ee9c1c1e88144a1b73d088c63f15dbb8d0b299fe445195987bc69ae50e0102a8489c22e718861ca4504b734470aac67bca22ca0f20e0603b82 SHA512 4b6ba2f3c8b02703535620ef5c4c3296a6b54db595e7dbb8e85d0612917b1a539aa39aad492186ffbc646c6204b60087c0f7f3fe243db3fd215109901c189e11
 EBUILD gentoo-sources-5.12.19.ebuild 742 BLAKE2B 9bee131b78a23937df942aa798c46becb32f986636724c0175343acd3edb2c9440aa7e5db5653e5c69257944f8160b74e6618992543ee81cd463973b09850ac5 SHA512 70f9dcb289d34a30caa8db6ae7677d2907e216f4f98c28c37c127f09fbb2782f93e0984ebb3672b2f90e89dd363a0804aa1e6e2cb55bcb77f6fe5ec267de03a5
 EBUILD gentoo-sources-5.13.4.ebuild 741 BLAKE2B f0487ca8d40583bcc4579008a474f44071dd6e5abd5135dacb19ef5b090dfff529443df2f9a9d05d02e725fa7701d70e77a4af659f37b17fad8625be213efb46 SHA512 dd24c1ded718b2790c55b49b79dced7279f08e7199adfd79bc7eccf158ac550e3a5e0fd546618d75451b4b959e226b9df9fd38b421437ceac38a907d6bdd3a16
 EBUILD gentoo-sources-5.13.5.ebuild 741 BLAKE2B bbe96fedb8e0b92042297f268a5696ddf692d8615911176bb5109d9bd363013fea30fa7f68995b2e0e3a25539cdefaaf8853638a5e22cebc9a849807e7fe09bb SHA512 0c01d57a1d008a8207626a11ccdfa8a93b7c8a02312ec94a40d37b8e8f7852de9f2cb4a0045a1aa407dcd55e0a71ad531c4f040b9974968dccb19fe215beec2b
+EBUILD gentoo-sources-5.13.6.ebuild 741 BLAKE2B 62862b47ee529bd550507836f5fef896fd76b89ab82de6e8f36036e8990df9e3e008de96e9f90477095ed0c0131e6d1b3cc6a483ba97b94b2ee5756483b62d8e SHA512 4326503ff06f38b82d126907bd960cedf72faaa203b0c40350e668555b614a595c30f2c74a018578a562aeb2caa0f5128fd9b86f6b311adfcb2ee654cb269d86
+EBUILD gentoo-sources-5.13.7.ebuild 741 BLAKE2B 78abb67fc8906fc433e5c50b7858a4799f8c61f8a0f37e6491f77feeff92bc04ce9e6b62320f49ddbba4d698d743fe44896a6d6fe3d538f74c6784b75a837420 SHA512 2eac1bb97c105fc89ddb1bb3feca2b65f3658315e30e97f204ca4fdc8f1505adb62a89ed1bf8e001d1141a924c60c9ae4a9bb9711bff182864e8fe992ff5bc24
 EBUILD gentoo-sources-5.4.134.ebuild 729 BLAKE2B 0faaeb7dc582de55d17f6bebee8c474e7c3f08543826ea61c6f92fd280ff86cbdf46387afe115de73445c393d3922756cde6963fe99ffbed641e0c7ce29e3d28 SHA512 f58cddec29089ffbee4db5007863f89dc5a69610756047609fb2011a56b7f2b5458f7d6424dcae79198ac07015ae174291ea2197e60e8b4a2ec1d917698d0fcc
 EBUILD gentoo-sources-5.4.135.ebuild 736 BLAKE2B 9aee345695a1e40a82525b5728941ef551ff9021d0d94da0cb61c0cc14ff77d34ba376d9aa02140de648337624566f6c03bb93f390e92157aa0cdaa2df2ecdfb SHA512 73958e013fda30305a0dcfa92f15c60a6b9a86ca2a4613048e36fca1d1923bf12b9f4711ee9ecb548bb69a8845e6ebc70cfa5e348b39727e07843bfa4cc762cf
+EBUILD gentoo-sources-5.4.136.ebuild 736 BLAKE2B acba3dd2b842308d1e4df4e06ad9a1238c0a20da7e72de29871a2299be037307ef2835ee48a7dd5c7091e3eed21cc3cda917a8d089ed54595b06fbaa9cc89e3d SHA512 64a2cffdd35d0368c4bc244bb3987af8bf4627eb06a56f462bd029e6f1eeed381550e190547eac07d3bc820cfabd5de789e0661a0a57d2af52bb606639931f28
+EBUILD gentoo-sources-5.4.137.ebuild 736 BLAKE2B ade446b7b90328968c7d101976db783ba98f47b63032dfe4a6b0f0c4bd742a7c7a855b88d1484ed3cf642f77dba1be582051e89c42a50318ef40d8f8438ed4aa SHA512 71746fe02c27b3fb7b10c9a0b99da069fa5edd1f9e5098f3481e4658bd367aed09e06bfd01b0a5a28697d1756edfe9dc857bc60298e127fa7ff6209a1aea39b2
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.241.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.241.ebuild
new file mode 100644
index 000000000000..e95e2616bed2
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.241.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="251"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.199.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.199.ebuild
new file mode 100644
index 000000000000..760c2addd993
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.199.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="198"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.200.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.200.ebuild
new file mode 100644
index 000000000000..6b5c77162290
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.200.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="199"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.277.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.277.ebuild
new file mode 100644
index 000000000000..19743f30a014
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.277.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="279"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.277.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.277.ebuild
new file mode 100644
index 000000000000..8368cdd1ac04
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.277.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="281"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.54.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.54.ebuild
new file mode 100644
index 000000000000..8a2893789167
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.54.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="60"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.55.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.55.ebuild
new file mode 100644
index 000000000000..23a177f5f39d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.55.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="61"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.13.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.13.6.ebuild
new file mode 100644
index 000000000000..4ff616db4fb8
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.13.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="8"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.13.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.13.7.ebuild
new file mode 100644
index 000000000000..1ce68b29e781
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.13.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="9"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.136.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.136.ebuild
new file mode 100644
index 000000000000..3dc9ae1400f0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.136.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="140"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.137.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.137.ebuild
new file mode 100644
index 000000000000..c711f7d8c57d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.137.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="141"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 8d6936ebada6..5e16024741fb 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -5,10 +5,10 @@ DIST mips-sources-4.14.0-patches-v3.tar.xz 287468 BLAKE2B 24212e2d6ca784986d0e3e
 DIST mips-sources-4.19.0-patches-v3.tar.xz 289136 BLAKE2B 9c77c641d4c4603983c0bc11cba5d83337c7373f67bc5870b8b02d6d4a537c8c02f21fe47fd64f13c5e10d37100654857d0b598be6d8c429f5fe1d7332b6b6bd SHA512 7199a20f20f9d0a4eae38279335d8c9da20940fb37f0ba38cb6b68fdd5c9d4d2e2b65efff5383065e685c0fb5ad639c6d79d74989a5b4200b987f175de7da422
 DIST mips-sources-5.4-patches-v6.tar.xz 197884 BLAKE2B 08dad7c3d7ba3d04afe5a39dd0e0930894c124beebecfaa66aab6f42f3151f5271186e6735cd19344e05ea10faf11461290f62667d12379660734a63828c595a SHA512 472f44d1e212ca0bfae896dcf3ec45bbeb47fe1aa49b80060c2d0b7347b065ce8354e6b8ad009d7b5e2923d4072a9a93acf9ecbcc56575195ad5b60bef1af12e
 DIST mipsgit-4.14.0-20180128.diff.xz 1008 BLAKE2B 2a317ff97aab096883680c6b653e993aee31994e6caec52c52dfbbb61f1dc1f25d03ebd3182fa122923a67aeee0aa598b36e603692333e4c9ccdc741fd456d96 SHA512 378deb1bc1d10a6b4912e5e4a0d6fcab28952e2e59c35fc879601841cf8160081b318a2598ef74db225e95f0f26483f6b9a56a348811b1ee7b8934391dd271ae
-DIST patch-4.14.237.xz 4312692 BLAKE2B 125d1801f973568ea7bccd26ee449a50876161e7990a8d214ed8aba0c9de580fc0ca36854fa321adfd50c70814c6695a6974ef54451a4f713f8bd8270249e34d SHA512 986f1c665b0fc692e760b1641b9768f76700e71d22235bf2c7b750d9436b9814ce54efa4a09dd7b89dc16708c5da5d4702638129724ff59de05ddd2522289b45
-DIST patch-4.19.195.xz 4050448 BLAKE2B 3e08e0490acef5cb344c1cf19ed2c0788293dd56cd6fc3bc1d1d85000a38775ed5561e3b767132bd3a24174f00e9e9f51d8350c0890bb6840647edae2546f191 SHA512 22a476bd127d177587ae45e110798dd337dac7ab5ecbee164a0b71bc387ad89a8e986f328797972b1c8d87c03ed28f95b232bfec7c1ef2a14cdbe6717ca06b24
-DIST patch-5.4.127.xz 3036948 BLAKE2B 1a7f99e90bdca9c5251cb98ffdf9ebdce1c8157d265b7fd886bb918ef05aa6707a9c3587184cb7074e1762d8efc2f5ee047cfb3df2e3082de5b75094d7e5aef6 SHA512 44cfb376c6b55fee8bd4a03e8fa3da9051c03c5fee9fdba6f718c69916888c2562380fd3d3ca744eee96472e125e62b3bfb2102a89aeb578878b1e05ad985e8e
-EBUILD mips-sources-4.14.237.ebuild 13089 BLAKE2B e4f37d9c18e427d34ad02127bf8693e8660cbf63e6b662c6fdfc56f15ecfec390a3a88b546ec7fe4d58e82dc595419d344150986e33fa2b8d5813734f55cec05 SHA512 666aeaadb71ea5b96c3a42f9416f2fbc1848fa01a0630020e6a3d81afa32172b2263f604a09f0b7c1b106cf9e85cca2e5d3a265bff4baaab2b8ec464e88f7a2c
-EBUILD mips-sources-4.19.195.ebuild 12687 BLAKE2B f8f62e3facb08bec95910e088c47b49124ce29b90dd67a47b39c4d7117d26619b1e3bd2c6a3143ed13e9caa0fc45cf8e9c734f406cc56c1b89b2b41149958304 SHA512 cf3b84bf2b1a4a343fb3b9c2eae33ffaf6285be80e734ee4486d149ef4bb837ca9f73975f7aabc7d14194d17f0794a8cd0bd4a30c99fcd1868011a41a4430807
-EBUILD mips-sources-5.4.127.ebuild 12687 BLAKE2B cdddc8a92b49d3df0bcbfdf4a68924be5cbe878a151988041fddd1ffc18a059c871a565bf9fc3798b90681f3235f6fe73d29c9374949398f34d5625b2e294430 SHA512 9166f0a5d893988cfae1c088178435908c11dce730e74d1a72cff261b90ea0a14bcc6e251ea76366a7a18da40488e8405d194ef1abaf90ea859e89598f6fc3cb
+DIST patch-4.14.241.xz 4387084 BLAKE2B 7d3126cbb14d1e5459689314b4a465712f66bc4b88392ad8514811cbfca5a2110c3f3c8cf577d86ac7aa5c8cd699336aed1f51368cae0a7e47f36c6ff8758393 SHA512 2f509afd824f1a924c10d763c1608b401c098c2e4084922bcc1b9a3ab558bd43ba3a62c232a99be5717666eb32baa93ca4a2b7c233b8184df567aaf1a5dc92da
+DIST patch-4.19.200.xz 4167064 BLAKE2B 5216e28d2a8cb22415d94a3f397f86cb0bdb9bc8d05be5d6a679e5ef58342c188e2ec37c7469cda0a61ebed42929597a2a4175f56f2b7912494ffc801e1a5189 SHA512 c979cbc8016b5c7409494940ab652f997807a459f008225fda79000c23b46e2f3c4fffa70b746b40a8d07ee0e9654511d1ecd9fab5016c8bdd1977ae51ef5dd4
+DIST patch-5.4.137.xz 3214908 BLAKE2B de1d58f6100e89cee5c103748cab753c4dab425e730695af61000bd4fb2f1a8d4c699aaf32f1dc77c28778477466a2ca24e14b9efca882608cc4166dc51ffb02 SHA512 30da56861035f55ce11fd0db06fb4f289b51753f3f24b5e863b77f23d53dab38edb7cfe80c528d394fb70a7b46d66f47adc9e2e765feebc7b0b293e7515631a3
+EBUILD mips-sources-4.14.241.ebuild 13089 BLAKE2B e4f37d9c18e427d34ad02127bf8693e8660cbf63e6b662c6fdfc56f15ecfec390a3a88b546ec7fe4d58e82dc595419d344150986e33fa2b8d5813734f55cec05 SHA512 666aeaadb71ea5b96c3a42f9416f2fbc1848fa01a0630020e6a3d81afa32172b2263f604a09f0b7c1b106cf9e85cca2e5d3a265bff4baaab2b8ec464e88f7a2c
+EBUILD mips-sources-4.19.200.ebuild 12687 BLAKE2B f8f62e3facb08bec95910e088c47b49124ce29b90dd67a47b39c4d7117d26619b1e3bd2c6a3143ed13e9caa0fc45cf8e9c734f406cc56c1b89b2b41149958304 SHA512 cf3b84bf2b1a4a343fb3b9c2eae33ffaf6285be80e734ee4486d149ef4bb837ca9f73975f7aabc7d14194d17f0794a8cd0bd4a30c99fcd1868011a41a4430807
+EBUILD mips-sources-5.4.137.ebuild 12687 BLAKE2B cdddc8a92b49d3df0bcbfdf4a68924be5cbe878a151988041fddd1ffc18a059c871a565bf9fc3798b90681f3235f6fe73d29c9374949398f34d5625b2e294430 SHA512 9166f0a5d893988cfae1c088178435908c11dce730e74d1a72cff261b90ea0a14bcc6e251ea76366a7a18da40488e8405d194ef1abaf90ea859e89598f6fc3cb
 MISC metadata.xml 659 BLAKE2B 0a4de62c5b7f4b11765e722d0cb95491d8502bacb0ac3265192c87398482fda7425fdc6d74db3c30d28782bd739b4f10b12a20b90722be96a41d350c9a211d7f SHA512 16b3055ff4e57c8cd0c5f393450095bd30f6f8da580bd82fce200715c023add333a8055a1c67303a6f7f7fed2bfea287f695c825a7d328ecab147b44ff6845e1
diff --git a/sys-kernel/mips-sources/mips-sources-4.14.237.ebuild b/sys-kernel/mips-sources/mips-sources-4.14.241.ebuild
index e32d7a2792a8..e32d7a2792a8 100644
--- a/sys-kernel/mips-sources/mips-sources-4.14.237.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.14.241.ebuild
diff --git a/sys-kernel/mips-sources/mips-sources-4.19.195.ebuild b/sys-kernel/mips-sources/mips-sources-4.19.200.ebuild
index 52f4f25547f4..52f4f25547f4 100644
--- a/sys-kernel/mips-sources/mips-sources-4.19.195.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.19.200.ebuild
diff --git a/sys-kernel/mips-sources/mips-sources-5.4.127.ebuild b/sys-kernel/mips-sources/mips-sources-5.4.137.ebuild
index c0810db4f528..c0810db4f528 100644
--- a/sys-kernel/mips-sources/mips-sources-5.4.127.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-5.4.137.ebuild
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index d35309aaba24..3a6915bf727f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -21,21 +21,39 @@ DIST linux-5.10.52.tar.sign 991 BLAKE2B e438edeb31098c0f4ad455ff8814c4a6d4904c78
 DIST linux-5.10.52.tar.xz 116386612 BLAKE2B 60fb5dac282f68a2d8c969616ea391549fffd677a4d96da594fae82d747d2a0d4fe942754cc82c21ead0a2909081c194d33983c2d9f63eb86a9879ad6415862d SHA512 37262e3793ed433ee619e7b08c0ab64d34bbc66e29229025ada498edf45ab2c870569c0a3b17f026379c67153f277e90e1b301c95711638645bde025230201ef
 DIST linux-5.10.53.tar.sign 991 BLAKE2B 46899bf0b966673e3cb1a0441500eb32402babb565c59794dbd8c2a21b96b9f9ac93a88089308329ee786669503ac58b5f88e3ac707f7eff69a9b6053db50ab9 SHA512 1ad3f88a09c91e797955948cc6d63e4290a9d4d2c1372788b9b5a972648085b7e9bde84d3c9da9b4c4b28a0ed6cad7a6456ef682499953cf709b52ae065320f8
 DIST linux-5.10.53.tar.xz 116384272 BLAKE2B 7908ef51cac88d04b5b4aeb37b2f62af330c258967c82530ad41ae74f62e38bb29e4386e7d625e604347b3629f0eb03fde3d4cbdd74a7e03ad93191678d4820c SHA512 5495dd3dcf025695097db656c33e5f33809b488d9f5f57ca6f5e5a34a233f3fbe8b3564f4995ef9f67a627513665bef981d28f8589886604c91a58733a0372ee
+DIST linux-5.10.54.tar.sign 991 BLAKE2B 23c4fd74b10cf6f346061ebb5bf212c199eb6eba7575f73f36217965bec2b61ffc2fbf53a73e50d07cd72d52eab3b5a81e8d8a7ee6ed5421011d4bb6e93623f4 SHA512 7df01b3ca462b125156cbec75d2c8cb96ecdc253660e5d887e6198856af7ae853ecd5d51767fcfe1a217b205dd492b8f45b4cda0d175e9a2c5d1a4124abda7fd
+DIST linux-5.10.54.tar.xz 116390580 BLAKE2B ead7156c56e59aade8c71d2065c1dabeacf04016cb8a7b48cf711efa2038e03bf581ce3e2a40ac6c56a241e7f2fb41cb27c9484003fd85ff0de0a6849aff7a68 SHA512 a46ca0d12baf81f5f0f2d1cae89747beb844f8f1cb5875bc5f44317ea4314eb833bd24464429605aff55bc2dd39bac24df89768a5a804fd71965ff386995db34
+DIST linux-5.10.55.tar.sign 991 BLAKE2B 74f6f4ad107ccde36a4b5537ed400563d1047f58717ed5f10b2f512849dd0bb6c401453204dfaee41b400b1429632b7e362eece46fb62848850836ce87d027b0 SHA512 53a8a737ae6abc46a38e0ab2dd30008e2cdcf0bca12e4efe878e9b82437a3c6c5ad116bf075092ed5729d25b30300db57949315247d320a85703f01fedbf1fa4
+DIST linux-5.10.55.tar.xz 116402012 BLAKE2B d4d981cf2305a6a91ce14ff676b4153fdd42d67e1ad06234ed71243b71955fa18a972de2b0a50fd1dad1c78e72cc58c8122b2377c61d35d1920480f41ffbcd7a SHA512 53b80d1027c6df6a4f13237a21a3ea69bfe51ba12dd4bf4e984da29150e457fea6fdc493542e4b86a04a9ba1481ae0db866bd883767f7107c323b41fb9fe022c
 DIST linux-5.12.19.tar.sign 991 BLAKE2B 881e8f5df1f9503e7ba58b84351b2e4f0e90b63df2b14577bc65cca76f72c6a97f8ba2bef87c46a9d88a714bcf010f7b706c1bf57a68896390126c5902710a1f SHA512 fafe83c82fb1c7f67bcf8402fe4eb3363087324c7ab11ff15892021737685d945fc2ccefa78088f2645570bd763a6d7d846d7c1ff4f998d9af92f5f3e35cba48
 DIST linux-5.12.19.tar.xz 118204168 BLAKE2B 88e4c32cf196662a6a24e72b978019d6f8881a8523918029f4229a995c5fd957a5e01f42de9f53c7980df7e3de5ea6b069cc2c5f93852e615fe8fe78a1b131c6 SHA512 2d010d6d75052083300b1a629dbec25a39f6314a1871ed355133bb59946453915a2265f4ba26e60119ee0d05abb9859c5ee7d8fb8dd816c476ebfdb76d3399ef
 DIST linux-5.13.4.tar.sign 989 BLAKE2B 06c680880006ddca64c4b22e8d853e1b72727a3ca245667ba43d47058089954091a2d49c4b5e02506e34d72a1c3802201291701562dcf91b389c95c70c0a9408 SHA512 e19fb694f7749ad28a401c8f134866028e5b851b95325e81d3f1e4ef15a256b5aead1557f37644118dbb9528d401ca216ae2e2bfdfb4eeda3d46c826e7cbadfc
 DIST linux-5.13.4.tar.xz 119332428 BLAKE2B 325a64af66d0e4390e32c83e60b279745c66cff6f0bf1b0287b1456d7cf5e85444b7f90d19fd08924e3ea652f8743582d21377fa24a794b4b5cd099b68b76ce7 SHA512 dcd44f0da2420093f6ed8e44df4ed81fb8123fbc25d2dcdddd633feb3fc455ec74ef7a683a9c249e7089981393fcbed10c41aad10d4b0108c964cbd485e359e5
 DIST linux-5.13.5.tar.sign 989 BLAKE2B 105ae9b51f0723d074f312dd35e8d8bda13d5f76fcf428e7be953824132bd6a1f4b596f8c0f0fe7307153222396e0373fb401e2355d49934b2d98234b32a16de SHA512 614ce1d057baaf48d80db51a24215f17f0709a6d6840b0de13dce63a2b4c2ee6f711031e291951e9ca13e49fdb11c70e2dc33fd863f4c015b95710f8fe7259a1
 DIST linux-5.13.5.tar.xz 119328832 BLAKE2B 2795e57c54c8e1bfcf959c1468082bee603832157f10233ae5e57aa3e2a6998421ab14f33998869810b68227dd4e0c0791fea0fa5fab0c132f622c1ec5d79c73 SHA512 887a907f5923630224d2bbadd1e60e49856460ee5fde9fd6de770d908bada5c6fe1669f9ed64418695e9101a8e5069854beb23714dc8138cdf9ea7e319b10743
+DIST linux-5.13.6.tar.sign 989 BLAKE2B c559917c2901e237de4e7fb2dbc66b4af9bfa0ab48c48d262dd112191b39a491d9c3ead62cbfde67e4df75c070aaab02946ee319ddd6a9f66b25a3f69803406c SHA512 4cb18ae58d8aec9b350465699ff83fbaaba0e1d32be4664eb7ce4f2aceb45efada59cc98e04584ca81758babfe808d6eac1653c2b80ee2a637f08a675a0b7085
+DIST linux-5.13.6.tar.xz 119331048 BLAKE2B 2ef4e2a144714a188c67bb8262cacff7d81d6eede02f1289c102312570b41dbf51653e7862dc18cff120bdffbc8dd0763018814c3c0279317d7ba8b0b3169cf6 SHA512 3c03d1a8232258e23e6cf3a6f441299ab3ccb422c6d372d4b73ab447c963f3f7add9db9a435f2e63f404b665a8005c7233509090d0c0bac5c06b7387b99c2453
+DIST linux-5.13.7.tar.sign 989 BLAKE2B b466fa48bc704717dac88a759fe0679e114bd4cb2848ff4bffe07c39b06b5e872ff4955bfbb5e832d84f77d5a978195588b34acb82afb6fbb310f16d97d722de SHA512 ca76c553dc38159d5acaa75a7597094092e33e65e0a6fc2ceea236fd7f258bb0685308a3336675995d13c6ac82c085c3e0e0013d09290ad261d9d8f1df09cbb6
+DIST linux-5.13.7.tar.xz 119340120 BLAKE2B 2204912daa4b48f551f8d72b6f982e7e0c3bd12c98a9f4fe3a038c72a3229803e39577da057149d1b1bb117dc4fc33ed3ec0b3889b4d94470f7d77d9dd2c812d SHA512 d50ff2c639f89187b261225223e1c1a599e6face488574325f5f2e2fd43cc551a9684484ac7fefacd7fcaf76b7c86fa2679d62d27c4f4d5b7634f2d1739f0ac5
 DIST linux-5.4.134.tar.sign 991 BLAKE2B d5b705ecf03edfac4274ee6a3d8930e1e022d8e19970822822ac7e75d0ec97a3d50d1c3f2057ecbcd12fd8078a00a314bb8991c4f043ca5cb1db94c53a3264e7 SHA512 cb312e065218605520c8e445032bfde209cb941945947988369e6fdb9900c6843aefd03dcb3c913f8b7a59ad588b7dcea86ccae1aae29566579a19285f4a84a6
 DIST linux-5.4.134.tar.xz 109136880 BLAKE2B c9bfcfdbd6e30fc265cbc16eec5f0014acf8c63cf8271d6a436c1da5126013fbb2b08de2e552707203cc50e8991d9aa78ca8cc7ed67ddf20e3d2d08b825a4659 SHA512 7b5faa3f1c64d2b270f93416b5031407aa3181ee8029f3a576c8f09ac034fd0771f362068c41bbbb546d14b1d389042e8cb940f493d2ff9e3e4173cba1633c93
 DIST linux-5.4.135.tar.sign 991 BLAKE2B 0d64c3b0390b34a42ef4cd60df2f6e5c0ef2eff8e492ece562f301800bd2606042370bab40f5a9edac29a905edf74e9ab5a487ba2dd33a2a84704bd4978939c0 SHA512 95d2689a9297c2214f42b9e94f644e117958baa4bfcd9a2d47b4c80fabe56d1475522dd07471dd35efd72baa4d40a4afdb573c1b06f9e8957bbca2a805c9920b
 DIST linux-5.4.135.tar.xz 109142888 BLAKE2B 9324033cd44ba1413d03cdb4e067c3c9ea2c92f62dd0d461f3d3737a9f4c14e4966b403f4381093f7dd1c943ab64b2a14b8959a96fff64a736763191fbb08ad3 SHA512 cd0ac932a7ba43ab827f7904d14f9bd7b6450f7a2e42999ae8c6ea44cdda830eebc1cd2e692c7c4c94ebb8d95fe40f0da309fc9587d1554e8115941f4834d9d5
+DIST linux-5.4.136.tar.sign 991 BLAKE2B b00eae0e8f6425c148f7be9d613c8c420c2bc0c9836f7c2a9c1afb844771355cbb35d37e02cdad68462bf671646ae5313ac0cb4759666c7cb27e2460855dcdab SHA512 15dc64e218f71d13a2833339de3ac7a873342b098f655afea3f25c7aec05f4c80673c2c39f3c914e4aa22079a4592b34af0dbbcd83a575dd9345749b39d466e7
+DIST linux-5.4.136.tar.xz 109141428 BLAKE2B f9f60af9b63b5abf91057b0160ff9f75b33c587b48f1bf7c8be99e8b6a3ea4c7399bff0f004d054de5631b9a1b44c330a04262647b2ea52c03e78eec237385f4 SHA512 c539deadf9dd44647bef81a5da5efcac1f0b22de473bca87a9f2586f23c47403c210a6d3bdf1f20d77bfc48d2d3ebd72471e7cd2b437e2379bcb17895a9c4a60
+DIST linux-5.4.137.tar.sign 991 BLAKE2B 1df6a3ebc9ce9fa8b55bec8d069f8689661080dc4da0c705c0cd52bceb5afdf4f2a7ecf11bf807558febb36a5853b7772dbcf92b94cc8ce03c64d7d3a34a865d SHA512 17ac540551735313798400f1be8bff03287c8c447f13c3b21c231f70e2024d376ecf1a4da427cc4b2caaeac789406488da5055578b6b95f204882d9d7ac6a62d
+DIST linux-5.4.137.tar.xz 109139968 BLAKE2B 165ddbebf36f877cedfb8449f8b969be33cf98f10a78b1b47e3a01c3cc0788515df2a55710f610657318c45e4c13b0e53de8a1062507bc30714da3e7185a3f80 SHA512 ffe8b15699e4ca2ddfc792cdf4e95687ec89b6f04fda3444d1236790f3a139dab98362c103b26ca68608f17aa1e2126d2d317bcb5129569b52436b893a8126ef
 EBUILD vanilla-kernel-5.10.52.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.10.53.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
+EBUILD vanilla-kernel-5.10.54.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
+EBUILD vanilla-kernel-5.10.55.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.12.19.ebuild 2912 BLAKE2B d1606ffc26790b5bd830d4e43bd873a6bfe974203474136ef5a61ccdeece3a312af4517e4c06f59597f986dff1d4560727d09f1e2d135e14a27978216ba8ed32 SHA512 a8071db701fd3454c62d2643378d9686026b0b43abcee339493cb5f8c3c7fa2f79d39de573b881d24434e804eda0d5d74ac7f7f5e7402b3cd17883f7557b94f2
 EBUILD vanilla-kernel-5.13.4.ebuild 2911 BLAKE2B e8bbdbf21da6da4ababf94ae6f55d46fb62f171275e28333d9fce58e52b782621633f3873dad87f3db18c44ea83f2f8a89d7fa37d1d8cf8ab1ed8ad5ae9438f9 SHA512 11e4066a71ec3ef2c2568b83d85dee4062b30641aa2073810a6f31c198fccf6a077e48984687de9862b2d518307890c1ea60d89362c61471b4685b34f013a922
 EBUILD vanilla-kernel-5.13.5.ebuild 2911 BLAKE2B e8bbdbf21da6da4ababf94ae6f55d46fb62f171275e28333d9fce58e52b782621633f3873dad87f3db18c44ea83f2f8a89d7fa37d1d8cf8ab1ed8ad5ae9438f9 SHA512 11e4066a71ec3ef2c2568b83d85dee4062b30641aa2073810a6f31c198fccf6a077e48984687de9862b2d518307890c1ea60d89362c61471b4685b34f013a922
+EBUILD vanilla-kernel-5.13.6.ebuild 2911 BLAKE2B e8bbdbf21da6da4ababf94ae6f55d46fb62f171275e28333d9fce58e52b782621633f3873dad87f3db18c44ea83f2f8a89d7fa37d1d8cf8ab1ed8ad5ae9438f9 SHA512 11e4066a71ec3ef2c2568b83d85dee4062b30641aa2073810a6f31c198fccf6a077e48984687de9862b2d518307890c1ea60d89362c61471b4685b34f013a922
+EBUILD vanilla-kernel-5.13.7.ebuild 2911 BLAKE2B e8bbdbf21da6da4ababf94ae6f55d46fb62f171275e28333d9fce58e52b782621633f3873dad87f3db18c44ea83f2f8a89d7fa37d1d8cf8ab1ed8ad5ae9438f9 SHA512 11e4066a71ec3ef2c2568b83d85dee4062b30641aa2073810a6f31c198fccf6a077e48984687de9862b2d518307890c1ea60d89362c61471b4685b34f013a922
 EBUILD vanilla-kernel-5.4.134.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 EBUILD vanilla-kernel-5.4.135.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
+EBUILD vanilla-kernel-5.4.136.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
+EBUILD vanilla-kernel-5.4.137.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 MISC metadata.xml 352 BLAKE2B d14768a94b44290d052fa5b86553dc09bdc609c629fc96da7d5314510091484d7f22f2f4b4244fb033046eb949da8fdf6b9535d698ea3323f2da79400454b8d2 SHA512 a7b17e6764a339943b587985b95d828e84a076ceb3c372181794c905f6ce1a5554be69cb55560d823d71d8ea66666bcd5474fec1ead721633477eba31cf1cc8a
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.54.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.54.ebuild
new file mode 100644
index 000000000000..12c958a4bb2d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.54.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.32
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.55.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.55.ebuild
new file mode 100644
index 000000000000..12c958a4bb2d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.55.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.32
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.6.ebuild
new file mode 100644
index 000000000000..7feaac0c449a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.6.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.13.4
+CONFIG_HASH=a219e71ba368d65c1ede4fa6a79a17e70815440c
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.7.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.7.ebuild
new file mode 100644
index 000000000000..7feaac0c449a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.13.4
+CONFIG_HASH=a219e71ba368d65c1ede4fa6a79a17e70815440c
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.136.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.136.ebuild
new file mode 100644
index 000000000000..dc33930084ad
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.136.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.137.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.137.ebuild
new file mode 100644
index 000000000000..dc33930084ad
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.137.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 575989e35588..a5d91759781e 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -6,20 +6,20 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST patch-4.14.240.xz 4374120 BLAKE2B 309c9cc710b9047711d39021a98c98d545428815924f9b01920d251f6522393846a260ef2e84a0cd8ac1bcfc6463a070869e35ee0a36616a4115df34fd80f9c7 SHA512 438ab29402daa79f1a948933e11c83b1a97f9406ae3480df3d355d26929110af5d92620a21910084c1e50d7d1e6de821fb58045afebf8e51b2f8191777b07e2c
-DIST patch-4.19.198.xz 4143156 BLAKE2B 2269d346a0dc0ae58623477de6980886e27206ac873f7c67c3757047f15544ecc039fc70cb67d145ceea60ca90b0c8f0e2984c3c7d2b81e49e53891aaed0a570 SHA512 eb9824bf10832a824bd807ff1aa181d9c425d2418bd872ed2a0681af91853855e2a43a56663a35ee172851a88e8d9fcacf70159a543890fe4a6e61aa17822f2c
-DIST patch-4.4.276.xz 3607296 BLAKE2B f1650bc85cbb90cfb7b20b4caa80b9d4c95190502e62e9e6df768be7b5865d08be4fd4951d3391eea1857b6f7185740e23f52612faf478db1c9697753aa577e1 SHA512 50c671910fba6c6b26e06e670fbcef4a9cfe48ba6d72c9daf6b9839b531827e38c2841b82079ccf05c76b12b11632d1ebd66bba7fb4f17615c4f41564cd50144
-DIST patch-4.9.276.xz 4041728 BLAKE2B d616a727c2ab3a5a5941c6293b93a2aca46d3f95963224d8e957fc95e13b86d291fb242cf88161f9094c6ce2e18c2191670dd784e7c94172366f16d95831de1c SHA512 34a5fbc84cbedc56688aa3fbc74323ce0abedd07bc77334860d1d9548d22607ea6d0890c9dc1cf876d249950b828cab47a0f01029a2f831872d0cee9d70c3c0e
-DIST patch-5.10.53.xz 1821644 BLAKE2B af0e6aa0eb611e5ea81c6fb72525449e5619a519ab435d7d11b7ccc1253cbd63528a3dc314135aba0421e1fd48c5814a53aeaf5dda82bb2231b2e979f9c2211f SHA512 e0ab035f34ec7bfaec547c123efa6aa80ca3147b864cfd0bb46bdce95356dd076a75d22128cc0f78818ac5db24f2e64a2fe15c0ff1df4b040ac4d068354f10d9
+DIST patch-4.14.241.xz 4387084 BLAKE2B 7d3126cbb14d1e5459689314b4a465712f66bc4b88392ad8514811cbfca5a2110c3f3c8cf577d86ac7aa5c8cd699336aed1f51368cae0a7e47f36c6ff8758393 SHA512 2f509afd824f1a924c10d763c1608b401c098c2e4084922bcc1b9a3ab558bd43ba3a62c232a99be5717666eb32baa93ca4a2b7c233b8184df567aaf1a5dc92da
+DIST patch-4.19.200.xz 4167064 BLAKE2B 5216e28d2a8cb22415d94a3f397f86cb0bdb9bc8d05be5d6a679e5ef58342c188e2ec37c7469cda0a61ebed42929597a2a4175f56f2b7912494ffc801e1a5189 SHA512 c979cbc8016b5c7409494940ab652f997807a459f008225fda79000c23b46e2f3c4fffa70b746b40a8d07ee0e9654511d1ecd9fab5016c8bdd1977ae51ef5dd4
+DIST patch-4.4.277.xz 3615816 BLAKE2B ca88745d191bc1f10967f11ed65ecd98f45ba5696b17177544ab5f959ac97d224a56d321fce7381c37136532d72b9bc9374ecac8725822a9f282c43145b25342 SHA512 dd5688365b947409eb65395ca2a903acddcd86183162c31df0f2f40eaa04746b2d3bed6e81a9594f0b18afd4cdde4bf3dd5ec407356c0199935483ad38339b91
+DIST patch-4.9.277.xz 4051168 BLAKE2B f47984484c77acd6609b92b5759e4fb27fc4e87130a2cee36936b5126ef999ef108f59a5a453feca499798865d8c421a91a61db888b8a7ed3671bd8fba92f292 SHA512 53d77bcf45144e624e9ec10397253a142ca8bdaa839a9548cec5740bb93384264b35811a0b15aef9849a16d9c71b0063df4951fcd89ede79efa5a49cd0a6bdc7
+DIST patch-5.10.55.xz 1859036 BLAKE2B 970d29524173d29bdf4031ad06f6c7f14e0db283c140dc416e38f3e490a30cd12f3284eded06e55db236c55f230dc26d1b5dc15efd75f4e07bd20bd56aabe0cb SHA512 cd5003dac939c8748664b902cc3de612f116c94e86ad5e725172fd552add2e4f4f7ee4c7d19f81d2a95d2fd8dec0b455a9ef6ee7eee61a4efdf3e6f58dc9ce3b
 DIST patch-5.12.18.xz 954280 BLAKE2B 45c1485e24a3dcf246694e531a5d259efa6446df5337ceee59271c04ca76a3ba016dcf3e7e9c0b9373728c465d295537da3d5dc4b912231ee228a34207b53426 SHA512 725897d478b61ac6e7fbf9d2de33b89578adb637367c4a70da92996a4a82643a8d314533e7cd9a3c3b992fce967336662175ea87b32ac16b95ebba8d8cec8a60
-DIST patch-5.13.5.xz 473120 BLAKE2B a0dd9f3f972a16de87f0d2d8daa7f5d35b27314d22597a28f471cdbe6cedfa7d4bf69e41504d6a9b9d4c1f085146604394747771185dd0a09276cfd92820b4a8 SHA512 1e4eb575775ccbc2e88b34b902a75562e49d6dfb4699dadd5b41fff9db8c2bc994d946d1e60f6320f48ef233aa721d3725582d4ec57458f2293da9a85806c7b1
-DIST patch-5.4.135.xz 3191160 BLAKE2B 133b744868a7473438108d138b032c680257a9e34932f7a8180e021b27a93152ae4d07adf57ef224d2c8c21098e39620223aa4f82c73cf823c4ad7df7699f2b8 SHA512 a2a1417ba6a21ab416fe34d9af417b1e2c81a50398bfaebde62a3e6920331c0a028b01d6584ade146510e4e32e79c5300a827c6db743c4b9f7c76981a17d4e2f
-EBUILD vanilla-sources-4.14.240.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-4.19.198.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-4.4.276.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-4.9.276.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-5.10.53.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+DIST patch-5.13.7.xz 531132 BLAKE2B c1ed0ba00149d83f2c29ba7796786973c6e9bd6f046b6161a8b56769c5cc746a8f1a6d39245cdc9d1db65737824f31fa7b33f5ae406064ccca723df98450c0de SHA512 4f16262621d2153b9e98db1644af2323e32cecd47dd119f8b3ce52182f46d4018ba1573e29150c2deeb1761131fecdeb7a3215525dbbb1da3de2278c9a1639e2
+DIST patch-5.4.137.xz 3214908 BLAKE2B de1d58f6100e89cee5c103748cab753c4dab425e730695af61000bd4fb2f1a8d4c699aaf32f1dc77c28778477466a2ca24e14b9efca882608cc4166dc51ffb02 SHA512 30da56861035f55ce11fd0db06fb4f289b51753f3f24b5e863b77f23d53dab38edb7cfe80c528d394fb70a7b46d66f47adc9e2e765feebc7b0b293e7515631a3
+EBUILD vanilla-sources-4.14.241.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-4.19.200.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-4.4.277.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-4.9.277.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.10.55.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
 EBUILD vanilla-sources-5.12.18.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-5.13.5.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-5.4.135.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.13.7.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.4.137.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
 MISC metadata.xml 516 BLAKE2B ec4d6b5a7084baa9ed012e2108690e78422b269c88926baa66e8d0705dd5a7cc82fd76edcaeaf9a481c8b5099f65fe612388a826541a6e9a9c5256ab8aabdd92 SHA512 138d42372bcd976186c5c51f1e62b498df6b35662beeba737a46350e9e9f87b3d8bd97aeb57db43c99fc219ebb992aa2612c3ac8473cf4cc68e7d084c0fd8b93
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.240.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.241.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.240.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.241.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.198.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.200.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.198.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.200.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.276.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.277.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.276.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.277.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.276.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.277.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.276.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.277.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.53.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.55.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.53.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.55.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.13.5.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.13.7.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.13.5.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.13.7.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.135.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.137.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.135.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.137.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 6a102cdcf53c..7a95633cfe78 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index fcbccf68e6e7..365229f87452 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -4,13 +4,13 @@ DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fc
 DIST binutils-2.35.2-patches-1.tar.xz 11836 BLAKE2B 0141349c9618992d1ab1e0309f7ed8fbc43b60a58be1dfed05eae8a8fee857241d9e112ae673da6fc9778767675f536ece818cb85567367bb1c8f87a0693623f SHA512 35de5f227c745c5fb800784fe657b2a6216faf43e2498e8481e7b0dc79b0d2f86b3b6a10b896e060319a77a51c61d2e1b7a951ae962b3a6ef8c1a2a261d9bb6c
 DIST binutils-2.35.2.tar.xz 22056908 BLAKE2B 9c392e0db2b482442f9476f30bd80cf2796321cbf7be79cf21af7bef167b6074c4ae009dcf9b438d2f2f4a23381c935176b2cfa85de1a526ab46e0fd844a7ca5 SHA512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348
 DIST binutils-2.36.1-patches-3.tar.xz 32720 BLAKE2B 2a5a60168ec5ff612e7e58530092f306460cdb4a963320978dffcc22d73684486a14a5981f6eab2f7fc270def22cdc9954de455d680b2de4befc1ad4916347ba SHA512 e429cc82451675f14715d4e7640fe7b995495c8759a8e919c4291f8ca8358a663012f05c1ec6e60b1261114848379fefc9df723929770462dd676fa04fc7aa54
-DIST binutils-2.36.1-patches-4.tar.xz 43508 BLAKE2B 116cefcbf4641f1ab649bb0345b80a23c29d1d3340d16f87068a1cffb911e4633f3e6da235534cd79c601cb4168bc78f9b7115185a49cdec78b6e7de7856b344 SHA512 3de95f1bb3787eeb7e942e2a9cf4a2bf967c5758158c3daf76b81a62ccefe5569b0a300cdc02e2e702c61a0cfc63d4209a7d306179cdddc3bc544d21b744eb82
+DIST binutils-2.36.1-patches-5.tar.xz 44388 BLAKE2B 1dadb012fe35ec5fb0c5a15d348ab535bc5e3765375c97a3768c6b9f7126e0fda15d35163c9f9c33a4be98662dd120d7c1b21930a20c18dbb5345f56ecd9ecc1 SHA512 a2ce3388f1f1a77ff865481ff4b625121fd55f5234fed0a885312744f2f9c504717de1499b68252c6de64fa45866db7692df91c5838b43fbeb178938811cbe84
 DIST binutils-2.36.1.tar.xz 22772248 BLAKE2B 03fbfbedd6dba2beaa836b1ed254eddd7a54a163d3061fd93edd2b9591cae24ba049b26658c524b5ccecc2f22d431dfa168218d2531aa356945c994fbbe896fa SHA512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9
 DIST binutils-2.37-patches-2.tar.xz 79304 BLAKE2B bdcbe29efba3582f2d1be9057a39aedb655cbc225abe8ea656c1bcf090a53930c74197505c8de2dcfd9a105f1b1cc8fa84a0d532547221d2df34a77b06e7fa15 SHA512 5cea876cfbdcd1409f5ef8ee138a8c29ad5b3d38b5d72ce312f2eb94fb8b2165e9a10018c46bdc36bc59ade2e2764e5da4ac653d15690bfc0bc9784202cc0164
 DIST binutils-2.37.tar.xz 22916924 BLAKE2B f5a374fdf0300f7734d1e462333296b16c9d5ed6eba167e1742a4da7082f4388c929e286bf76c3933b3e434937380340732a31790723654b491ea0c8ab5b9ba5 SHA512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7
 EBUILD binutils-libs-2.34-r2.ebuild 3680 BLAKE2B 96fbeb96af93c6db271250870c4df85773db022aa7dd070ccfa33ed2dae57ecb0d543d93cb2ff0666e1b403f325e035a1f9988a05a16f53c167d168e3d6bec4a SHA512 9d540bd681a08451091742e9dba7044ab77a9d8c7920b8f078146fa7eacaa31b872f20c30477a33ec5bec3070408e1b2ac51e145af86d56fae794ace5f2972a2
 EBUILD binutils-libs-2.35.2.ebuild 4102 BLAKE2B e988ab2daeb4f77f469f76af9a56d5509100d6dda39cbebfd41e554d944ef2f4aba2f4c320477947b2979ede808dc4b9a06747e10f878d885e8339e58e7e4f24 SHA512 384c2b9e3819516b9191e65793e32c54b492f31fefbe17c6cb61357452ffb5e6916f9b1dc6bb90ae8c9603f805e3c601aca12b7bd66ebafb2b3106f436185a03
 EBUILD binutils-libs-2.36.1-r1.ebuild 4062 BLAKE2B 0e41ac1f70816696b908c79376acb43c313d6337e39420a1b6f03a961e3e599c9b75ff1e18dd7c1998375b0b15b49f00812bfb50d114f2c3d87c93d2070a0410 SHA512 5c62e3511ed4d6eaa21671a2c1332b8b1857863f0adaefffe23f23f0d0455e916665a6c5a047b8bfa85484a52be1ddfc3a03a1ca4317b52926220fe8c7edda61
-EBUILD binutils-libs-2.36.1-r2.ebuild 4062 BLAKE2B ac6599632c52ab78899e297402a233052192875b844ebe649c9c05810b023acbb2457e4d5c0b5caa933828cecae4d2e1515584c68a181a046ebe09b1d8a7f057 SHA512 b5a97603689b58a14a2e93fa44c108f6e90aec8c1a8028143a3902d0e110a1e2d52b9a7dd525e8d94bf32dd7adae611ce7e0d4dc70711ac6b7307c60cc0bfeb0
+EBUILD binutils-libs-2.36.1-r2.ebuild 4062 BLAKE2B ca5eff3b25b8751376d3d4cc1e3416df0fea3dbbdecbfa230aebb7458b648215a375a5d94356a23a0d7ddb4109b6bee26247d4cca967ef13a7ca060ca9d7e7f3 SHA512 ac433565e145f2b19073926998bb74c2b17dbe4343b3d191c7b5e239cd13844d0011cd3d71140ad2bdb3f36a56cea84ee282ed52b54bec6783ebd99b1a040d13
 EBUILD binutils-libs-2.37.ebuild 4063 BLAKE2B 1b7152d900fc718a94aeafab935262dc7fc49099d0b130cd6230518f3d35fb1e18db761f3afcb51f8dedeef1975fa29e5465e27266c1ab149ebfbffa694d4939 SHA512 944f41a606462eec1abcf80ea120de610334cd684465ba3f9d1d587b1f94ca8da391cc4ad2380d24949aa2f5a75eb3415dd2d0d0d2ad94819a3b261e72cdd564
 MISC metadata.xml 611 BLAKE2B 6093d3768ff4bc40fa0f8d1ebb3d9a5454f5e492030892d4791e7aafeef0ab4bd2902b818602725bf54e9045be762c1f495eeaf3742ec3ec4c4beda127e2c8d6 SHA512 21b771eb04b2e6f642e3ac48f13c2db19b728c8ed13821c39bfae696b8726f6f68ee65bb89ec0e90adfcee0e7f07a3109ab35e0699fd555ce0b84ad23ef81d1b
diff --git a/sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild
index 0606cabb2e45..43814735aefc 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PATCH_VER=4
+PATCH_VER=5
 PATCH_DEV=dilfridge
 
 inherit libtool toolchain-funcs multilib-minimal
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 215ae9c5494b..ef3a6792e240 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -12,4 +12,5 @@ EBUILD compiler-rt-sanitizers-11.1.0-r1.ebuild 6036 BLAKE2B 30bbe8f96289a6a4e663
 EBUILD compiler-rt-sanitizers-12.0.0.ebuild 6081 BLAKE2B 7b72248427b99b3210a6aaab4d2d335c66d113bd3b473f16e660396009d1e1444241748d40b2d91851433754227fce0a893132dc668d43c7a8e962ddb83cd635 SHA512 ad69ec8901fa6273498b2b249d87c7546deeb7c294a8625fb3568faad9edaa2dd55443c00686ce18008201fecc3cba120e6282c2cec056db87af4440c920e293
 EBUILD compiler-rt-sanitizers-12.0.1.ebuild 5958 BLAKE2B 817b71b56351dd4ec5fd1b812949b5f02826b6d1122f7ab9d40975aa65f7ff8e8f068bbe4eb111ac579686485be06cf386f621386993cae1c628f1636bed3ab6 SHA512 0ba1217f5949313bd857fe62c0a773d587e629c640eee4d39c2db0a2b558db4398eb39b73cb52dfa0ec2eb5eba9b108fa9c4a219ebd9a979e894eb503d33a3bb
 EBUILD compiler-rt-sanitizers-13.0.0.9999.ebuild 5886 BLAKE2B 63ff0582aae1fb2ec007553d3d0800f9caf900e95299fa8571d5151c2f029696391af2fab3358b5b378c1ae5fe6de4a60136c09b3f8f72435b92d353e948c24e SHA512 c553a0cd3d4849af21324eeb1498aee728bba3705d00c734f6f55ad6d0354cafd3078addfa691be494bf79b902fc8c669cd76b13a45868ddcb00ea196cd5454d
+EBUILD compiler-rt-sanitizers-14.0.0.9999.ebuild 5886 BLAKE2B 63ff0582aae1fb2ec007553d3d0800f9caf900e95299fa8571d5151c2f029696391af2fab3358b5b378c1ae5fe6de4a60136c09b3f8f72435b92d353e948c24e SHA512 c553a0cd3d4849af21324eeb1498aee728bba3705d00c734f6f55ad6d0354cafd3078addfa691be494bf79b902fc8c669cd76b13a45868ddcb00ea196cd5454d
 MISC metadata.xml 1341 BLAKE2B 27ba2b57b7ba21538680b5535aec8b0e8e772a040b25ac8c9285765ed00a485a01ce6dd47c32686c7d162d072f4d6d7d2e1a790e9bd867b61a460b01ad79bade SHA512 909a922e1b0e9649534d88bb7692b1d1d7a9d3d539a4926054dac834d672da065cfea5b2aab02dd23f2a7b0dde0eb0b10ae453990c3ecf99ec20f6a2d2bdbac6
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..cc239e8feec6
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang test elibc_glibc"
+# base targets
+IUSE+=" +libfuzzer +memprof +profile +xray"
+# sanitizer targets, keep in sync with config-ix.cmake
+# NB: ubsan, scudo deliberately match two entries
+SANITIZER_FLAGS=(
+	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
+	shadowcallstack gwp-asan
+)
+IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
+REQUIRED_USE="
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray )
+	test? (
+		cfi? ( ubsan )
+		gwp-asan? ( scudo )
+	)"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		!<sys-apps/sandbox-2.13
+		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+		sys-libs/compiler-rt:${SLOT}
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+LLVM_PATCHSET=9999-1
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	local flag
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if ! use "${flag}"; then
+			local cmake_flag=${flag/-/_}
+			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
+				cmake/config-ix.cmake || die
+		fi
+	done
+
+	# TODO: fix these tests to be skipped upstream
+	if use asan && ! use profile; then
+		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
+	fi
+	if use ubsan && ! use cfi; then
+		> test/cfi/CMakeLists.txt || die
+	fi
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local flag want_sanitizer=OFF
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if use "${flag}"; then
+			want_sanitizer=ON
+			break
+		fi
+	done
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX
+			# This disables i386 for SDK >= 10.15
+			# Will error if has_use tsan and SDK < 10.12
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index b0ff667694c6..6a73abf3dbb5 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -12,4 +12,5 @@ EBUILD compiler-rt-11.1.0.ebuild 3506 BLAKE2B fea54ca4aabe9bf35afc64a579ae18eb44
 EBUILD compiler-rt-12.0.0.ebuild 3541 BLAKE2B 0d5581a8a0f45d6843d3aca9ff184bb447e886e7e41faee2e4ebebb2154cfb2138ffa04be73eb6f76c60f7bbd65a8589649c64c60612037221c646535f04b7b5 SHA512 fa67b1e4105f9aa3bfa95c95a24c8bfeade28c521d4c69b0c08d8e8c469a06d62eb3a2b8c97175806922bd319ece1e016437c693baaab50646ec650f7aecd46e
 EBUILD compiler-rt-12.0.1.ebuild 3544 BLAKE2B b1841f87854a8fe106739b4248ef914219bc82c922a229fc6280ca2213e669bce4c64e06cc389bc3183f098afec0786492a3163d373a51a2664f586f7e700097 SHA512 2555664baf282d0d0e56cbb53c6824a196b4448e28c3c472e9d5f2c8cb114e12c0f1771219a8b62645a9cfbaf77ea8c80dd433b88a48d8a01922ad460e37cd26
 EBUILD compiler-rt-13.0.0.9999.ebuild 3472 BLAKE2B f51cde79576ea3eca64225cc1c9dd85b3613409739593f1ac362282328b5801c5ebd79cea1bb09935b6e33e0bbb080b2a9f6be33b909b3af9ff18270dd4ee120 SHA512 0bce4326f3c704f1f56c3a54e8c53b3424500f1bf0d30cf63d6645bc05daf87dcc8c27c894746c5a14c8b9121ed952e87c3a1c08e8d5c263d1d2fc97d2d952cf
+EBUILD compiler-rt-14.0.0.9999.ebuild 3472 BLAKE2B f51cde79576ea3eca64225cc1c9dd85b3613409739593f1ac362282328b5801c5ebd79cea1bb09935b6e33e0bbb080b2a9f6be33b909b3af9ff18270dd4ee120 SHA512 0bce4326f3c704f1f56c3a54e8c53b3424500f1bf0d30cf63d6645bc05daf87dcc8c27c894746c5a14c8b9121ed952e87c3a1c08e8d5c263d1d2fc97d2d952cf
 MISC metadata.xml 333 BLAKE2B fc411d2ccf9b848ed7ba71d6a1eb01c54237a38e3c612c22d39549f6b23ebc3179dd08c855852a72b9a4f4ae89418a078048702324df27b4fac11c36e80f846b SHA512 ca50c4e5ef7d52c167bca6a4ab2961a1f7f82d0e84722ec65b8ae44d0ff8a4a7db1dce630f6f18f7b526f77c432af7ebc9a29564659631bad1e3900b6f1df49b
diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..6f732cc60ab6
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=9999-1
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	local nolib_flags=( -nodefaultlibs -lc )
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+		# ensure we can use clang before installing compiler-rt
+		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+	elif ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX.
+			# This disables i386 for SDK >= 10.15
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index d8d04f333eb2..cef0573f729a 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -26,8 +26,8 @@ DIST glibc-2.33-patches-3.tar.xz 37076 BLAKE2B 718ab706df85c966145958fb6137b5499
 DIST glibc-2.33-patches-4.tar.xz 60124 BLAKE2B a7a99f39c16df241745772c31b10946dc44c51e6c09f8a447b905e7dd6ba529aee08f66a581431453c6665485ac1848861559aa3f0aaba8c2061c1f1eb77d9be SHA512 05c33dc465a98097f836783bb5037dfa14b3a2c0c140014f642ea72954222ae919fe2db9573ee70ca9c1881b3b59dd4b815a8f39f331494fa12951c9012797ef
 DIST glibc-2.33-patches-5.tar.xz 63032 BLAKE2B e7f5952b2d84dc264e960d8bd3d9af4ca43089ca269735168933e80a0a74d7be1cadc90935b429cfdf5f0052d3ce3482a8f073b15378e7f9c05034535d9eae4d SHA512 00c2f8f104e7899b76398a6a39f054cd109a71f5fcc4020304b7d7e15ae0c53df1c3acbafd56898427b3849452f9fb9e5064ff584d6c86c4d18c8a9201c89d29
 DIST glibc-2.33.tar.xz 17031280 BLAKE2B 703d12121c1e2c5d9e0c6ba5341f5fb5c4d9111611a83f2360029b5de9c6e5a5611249d1833684a58ed4afdf49cae614365d87ec8721ba0e5d218f593b1f229d SHA512 4cb5777b68b22b746cc51669e0e9282b43c83f6944e42656e6db7195ebb68f2f9260f130fdeb4e3cfc64efae4f58d96c43d388f52be1eb024ca448084684abdb
-DIST glibc-systemd-20210724.tar.gz 1475 BLAKE2B 065bb4f364162ed168f9e777178ff2559f85db43c3585a45e63fda00dde34071674522cc2133d446c703737a36b1ba3148823ed53de8a4bc22b130a711a41dd0 SHA512 42ede5ef4b872e50cf3b02a3d305fd25675172a4e4461a8072cace688c4935c77267106a53164420e9181437501bc241dd3413806fd1f65eb87ee5ca877455ed
 DIST glibc-systemd-20210727.tar.gz 1454 BLAKE2B 0383338f73cec9a13165f0be261eb3d46c0362425b5fe31846f0ec00da9aff69d941e8b0e0ad1f8691edf9dc30796c239e8e984207725e4cf98fd037e7168e22 SHA512 09a91f6351657abfca200d110b0a43d541399c2db142c5706e06b4eebb736932e8f1b026be8d844be64f8e2c981777c342004492ef99c3c81cb04bf75a2c3ee8
+DIST glibc-systemd-20210729.tar.gz 1480 BLAKE2B 37722c7579df782d890e44dbab99c3de52ab466eb9de80d82405e9bb5620bf39ffc8c5f466a435bdb86ef6d36dd7019c0736573916bda6c67d02a2581e0ec979 SHA512 efd75af58b50522c28cdac7abd1fc56555bc1bb042512c90d8340c1ec09c5791b3872a305bf83723252bbde5855b75d958c041083457765c4cfd170732d09238
 DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb747c8e371e38316c7ada92f967e0865f573f23cb353d82419c234724143c0aeca9eb70eb945dfc581cc7491eb1 SHA512 b609fddb9ec5e567c008841fef3390eddb5d6e7699a8271b3b8c0ade1b44b0ac2e5d1daa8b9acabf3432e3b88110b538a96f209b1ad0f9e988b7efce66606dff
 DIST locale-gen-2.10.tar.gz 7747 BLAKE2B 49f569c5ae5260fca128503bc6f22d6f6f1cda817920c41fdadadf1527bbb4f3eb161f79fa729830666a4673e9092f99f4685ec8fcac8ddea0b8242bca9c1f4f SHA512 e350e60d458d67638e3090711fca05af6fafac06c51b97648244549f8a0621dab7543f09dc7ad4c62392f13bdae8e5875dc6d0b6c3d83efc29d116bc2eef92db
 EBUILD glibc-2.19-r2.ebuild 38454 BLAKE2B 6019c17c3cd333132abd3d88afd019367d451e6727a7528524ad8835a62d1a741068041dce840c0350a1acdfd8eddb840ac38a9cf6d25dcf46b07c98a31137b3 SHA512 e14489e34e3db70740b31e7b1250884a57a597021f913cd86cd4d946a4b8ceef2ed3fbc409b0c0b13526e128306276c96d48e5f437620835b5d1cf245d778262
@@ -38,5 +38,5 @@ EBUILD glibc-2.32-r8.ebuild 44853 BLAKE2B 724f95c0ed2cda18dc2edcaa03b0783a2bc603
 EBUILD glibc-2.33-r1.ebuild 45207 BLAKE2B 0512c0b719895136a6a5ab76e2625805539c8733403d3738ddc5d069f5d74fdc3592e3fa4fd8865d839c179189260fa74f6a37eaa4ae1e26f008eab60484cbf7 SHA512 42c84f34a6559ebd3d957d6a73a757a542f83f34ba32c98bd013b8b392329816f3e2c09c37afb24fbbfb1a6720ccd2321ed3d555102c0b5a0e797a36995eb6f8
 EBUILD glibc-2.33-r5.ebuild 46548 BLAKE2B 242f7ec2f124fc172e89e21602a8fda9b1ce0d92ac953237736cc83afedb81fbbc7a2204ee99a2149e86a88310ec5d5d229d2db4be47bc93beec0389fc28c3b0 SHA512 f825bede4d8bc7bfebe030ec987fc90dabade3ab8df53cb163227d9bd81395f52d02819e3c65e996c3e1847d6190e3ca42768aef50b3c70636afb634a29ad3ff
 EBUILD glibc-2.33.ebuild 43992 BLAKE2B b5fd1fa3b2e2b727574028241e7805cab448b37d3975502f12140e2cd6cf98784af36393a1116c13ebaa490db3f18b7b20a56bd53343015abc521201c193eb3f SHA512 911c152ce3ff50ff79db9d53b570ff0fcf837549a072656fef8ad429d02788f89d6ee1266605c539dcbcf273aa791cf075043e8b4895eb8d67404be531631086
-EBUILD glibc-9999.ebuild 46809 BLAKE2B d8c1a326a87e25b562c75acd5832ad01b10308338ba1d086e64e68bca9fdcda2a6223d40e700429a326fe92a6a9aaa661cfbf49b2338e69369ca7d8e42482dd8 SHA512 c25c456ecaaa3c26a9efe19fe8c465f0e97014590955d69f3fe79a93003e0a5dff1241e8b3dd6661ca5936fb212be0d49368ffe1c4ef8f7a91eeded2251f2739
+EBUILD glibc-9999.ebuild 46809 BLAKE2B 4d0728aaccb95fae5aed73bcc14c1cf1301ec021b39772ffa281b8112f7e8c4ffb2a4e794197657ec66df62e87c1147fd64004e444e9bfc04d89025782487fd8 SHA512 fe4e3d759c7efb4926b987ebb10de093355e5afe8cdc63c9c893d3e923a78681f4563df1c0813470117262a49acf0acedad9b26485ed247f704e71d34a218d67
 MISC metadata.xml 1611 BLAKE2B 3bd777c160ea20cdbd86cca791d9fd4ff02f8d100344235ec74fff37d5cae1e7119e0ec26969707e75a983dcdb23e994559c8be128ef40fa0ec9ed655017466d SHA512 08be6d085ac47b140fff17a3be8cee77e066a4536cdce76fa44c77875dec2a9dc236ff67ff44301abf75cb196d1902feb2a139dda420220248b46dd9cdb16b9f
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 99426d97e8cf..60bd75d08acd 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -35,7 +35,7 @@ GCC_BOOTSTRAP_VER=20201208
 
 LOCALE_GEN_VER=2.10
 
-GLIBC_SYSTEMD_VER=20210724
+GLIBC_SYSTEMD_VER=20210729
 
 SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
 SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 765cd203af7c..676d4b8e5f59 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -4,6 +4,6 @@ DIST ldb-2.2.1.tar.gz 1676819 BLAKE2B 794575d5bd7d33dcd586cb5de6c392411795c467f4
 DIST ldb-2.3.0.tar.gz 1686378 BLAKE2B b31949e14a41f6fc99ef022e4072021d135037d835aeca80ee81a58ed20cab4f8cbd96e394f59460df11e2424e2e263d5fb01b9cebbfb4ca1bcc77162e93ed3f SHA512 7e389c0b4700a809893276d69216436ebd6d30e1f52407e4a08a1113cf14e151aed74300d8c36765c91c8f3195d8054b13a28cbdfcab031f88fd1d353e415348
 DIST ldb-2.4.0.tar.gz 1689484 BLAKE2B 904d74900011ce3f63ad1c24fe88b1a090e835c68829ddfda5e8af2c0ab3674d7a8cd9a62b95c1f38f26578d0704556d3562e46e21a54cbb44a15b9d83676521 SHA512 6c500b723c081488bc0717b6a5b0e8966c5d8a751232f8856281a6fe4d358ae6b5878c8400a82fa666379066105fbb9259b2967313e73efabef0e1386095e2ee
 EBUILD ldb-2.2.1-r1.ebuild 2932 BLAKE2B 004dc7b83fcd5705135df1e4848a49296b75d850152bc41bfff56ea1c352fd4a0e4f6074a0b96a54576e594b1f8f79ad669a22f39390b90489654180665fcf1c SHA512 8ec5dd9111c238dbad97e0a1ae1f0ebaf90a4e8e083dca3946e597a7d28922ae72ccedfa3e9b6425a997a3f2d21abf7c407231808415076b0dfc2126d47cd164
-EBUILD ldb-2.3.0-r1.ebuild 2946 BLAKE2B 121652fa19655d666497945c4a2b13ec4b2374c166ea3603f634e6a0b9d841deae65eaeb63426f6486131782e5e8360ef5b7a4574c096870c54df2a5c67a7f2d SHA512 1dc5a2b1e787309897b091754c9caf8cd076e3f03970e0b1d5bbe2574832c7e2ea516d5b9b2b5141c70c3fb5b04916d19031b37845408740dad7ae2d929e52ee
+EBUILD ldb-2.3.0-r1.ebuild 2945 BLAKE2B 3206c45d381d82395b3f4862d7784f5657e4ee813a94f625a0f6d7a37edc6d8a0160a171d6167a70bf41bff77362982ce6a52d4da2fd26513a694ee7c04f349f SHA512 aaafae8b4f21815701e955c6a4e9f876a55919a0795d343b544afae5b423cc938d4ed0b8a28b500f7b1187330a37507d257db9e48a3bb7a2c0447638bab56d50
 EBUILD ldb-2.4.0-r1.ebuild 2946 BLAKE2B dde6e4beeec5907b3e32cfbc675bbd08d1f52081fd547d58e30b490305000c36be8a8d55b3daf9ad8b21edc8c7bc90fbd8984dad1bdff90273d1c66b3eb0b0ab SHA512 9994c7964012f99db5c6d2972e6e0a750a3632fcc25d0a6435fbc42bea3b067f8853efe018f7b9e25ea41420f9de325aff1c2e42fae8501c3ec314a9f2494c04
 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95
diff --git a/sys-libs/ldb/ldb-2.3.0-r1.ebuild b/sys-libs/ldb/ldb-2.3.0-r1.ebuild
index 83741f724f5b..9af82267e426 100644
--- a/sys-libs/ldb/ldb-2.3.0-r1.ebuild
+++ b/sys-libs/ldb/ldb-2.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="doc ldap +lmdb python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index d8924b99c708..a17e9ce8c807 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,3 +1,3 @@
 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
-EBUILD libapparmor-3.0.1.ebuild 2099 BLAKE2B 78917701ade725899091e4e76d5bec62dc9cc61d0f678d182764434ea91e515a98f8413413e184747c5e9863fe829860e1e9d1b23fd4c5ac5a06eb007b946659 SHA512 c56a65ab1ca44c0bbbe46eeb6e82ae0eea681c8f12f96dc9569c4a5d842b6a3537517ea3578e04e0a6b07fa39c81d0882a199642159819d1a3f8e82d4ea32cec
+EBUILD libapparmor-3.0.1.ebuild 2069 BLAKE2B 44518b8c99778d41aceafd10c4c4d66535ffa5f725651384d95f20dcb0946a8c49992fecd5495793f3434edded125148dd6932d77816cbc8f41c4c3d7e597e8a SHA512 505c9ae38475dffdeb1017a8678b3e72e1d2a449b0736c578e5ef35303356493c4b8315d8b2db99b7fdada4599ea2eeb499d9a396330a154e91f0a0c795d4943
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-libs/libapparmor/libapparmor-3.0.1.ebuild b/sys-libs/libapparmor/libapparmor-3.0.1.ebuild
index c1c67c1df117..3da7dd1b466e 100644
--- a/sys-libs/libapparmor/libapparmor-3.0.1.ebuild
+++ b/sys-libs/libapparmor/libapparmor-3.0.1.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS="no"
 PYTHON_COMPAT=( python3_{7,8,9} )
 GENTOO_DEPEND_ON_PERL="no"
 
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 332022043e60..d2f268a0e096 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -2,7 +2,7 @@ DIST libblockdev-2.24.tar.gz 905838 BLAKE2B dcc31021d72c2a4f92d8f70387537ec40930
 DIST libblockdev-2.25.tar.gz 930238 BLAKE2B ae28c40b5e114826baf4a8ba9012267b297dbc4abee52669cf39c886d2c9989291f41937ec742c7457049a6a30e674f9c89ad6478923f393ae1773db3afcf621 SHA512 628d05f3a257b44208a9d0b5d84ae248fefd415812d9a93d132c03039b09fefc4d6110beb9aa0d3072e3f0c992e642d7867d0241209056538f132f86a748e195
 DIST libblockdev-2.26.tar.gz 932129 BLAKE2B 39d95db69de917449e6009fa0160b6288327b2c49b64309d17a1e4e028756d1ce170779ce1c4df926c8796d8a8ed7b9131b5d4b51115a3ea901dacdaa971961a SHA512 ddd4e9c22135bd7dad0bb9bc254ac0c63e3bacc592e7c5a0c846e367da3fc248bf6187f1c81407c3bce599d3b0ceeec9a8a0030ad8e981e245f715b35eaec523
 EBUILD libblockdev-2.24.ebuild 2607 BLAKE2B 8070fda4de97cbb3744f72abe7a26e5a158382569d2af63e094b4983485a29096f672ab9ed97e323e5b2a810697669fc8214e47ed0a685a0de43d16201437c11 SHA512 13fb01f0d87e6f9f92d8c94b59404e08976e98f7d7729801b6d5be1f929aaba2f43ce0b15249ef669fb486e2e463e9946cfa1cb72f08e0b34ea6ef0fa9d9e75a
-EBUILD libblockdev-2.25.ebuild 2620 BLAKE2B abdec73cdc1336f734acd7658dc0869f3b05c0653c0cb52b976393f5e4056196cc5e98f5b1072812ae0c593d93eddcf905cb814bb592d3c2b025a738dd08174e SHA512 90894691d584bea79837c9b6c216c7104ffbe59c928ba7c3d7f491cae90650870e12489771c2c62403481580f01d3f331760a61b442a0ffcd40c2666555739e2
+EBUILD libblockdev-2.25.ebuild 2614 BLAKE2B f1ae37eb906d009c780d19afe0f16a125ad61538a68bfd35b521570b21d6e0607de12229cbbe986f36a3c6e9bcec96ec5f4f5631ac419d1d9a329824da4ea55c SHA512 ae0188fa83fdf9da01e37d5dc599b5cae1e5e6f8fe5fb96440f6ca66c4f2b9a82d8cfd0a1e742ec69bb4701883e540670347715183ca86677c599d62358186fa
 EBUILD libblockdev-2.26.ebuild 2620 BLAKE2B abdec73cdc1336f734acd7658dc0869f3b05c0653c0cb52b976393f5e4056196cc5e98f5b1072812ae0c593d93eddcf905cb814bb592d3c2b025a738dd08174e SHA512 90894691d584bea79837c9b6c216c7104ffbe59c928ba7c3d7f491cae90650870e12489771c2c62403481580f01d3f331760a61b442a0ffcd40c2666555739e2
 EBUILD libblockdev-9999.ebuild 2620 BLAKE2B abdec73cdc1336f734acd7658dc0869f3b05c0653c0cb52b976393f5e4056196cc5e98f5b1072812ae0c593d93eddcf905cb814bb592d3c2b025a738dd08174e SHA512 90894691d584bea79837c9b6c216c7104ffbe59c928ba7c3d7f491cae90650870e12489771c2c62403481580f01d3f331760a61b442a0ffcd40c2666555739e2
 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/libblockdev-2.25.ebuild b/sys-libs/libblockdev/libblockdev-2.25.ebuild
index 7a897bf92547..6cf07b867f96 100644
--- a/sys-libs/libblockdev/libblockdev-2.25.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.25.ebuild
@@ -19,7 +19,7 @@ else
 	#MY_P="${PN}-${MY_PV}"
 	#SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 	#S="${WORKDIR}/${MY_P}"
 fi
 LICENSE="LGPL-2+"
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index d7da52f16d19..1277986bcb72 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -12,4 +12,5 @@ EBUILD libcxx-11.1.0.ebuild 6661 BLAKE2B 93445de819484ea32a708d2ff616501d715e7fd
 EBUILD libcxx-12.0.0.ebuild 6950 BLAKE2B 44bdf31592a101724f3a45f41856e68ae2522a9f63cbb1b29d9eecc370fc6e1eb25ba435f9bf06c2faf14107abc3dd0df85f2dbb3cca29c7ca48f7ed5f2deb62 SHA512 9fc4ca41655c5a677ae6a52210943dd00246b080a11d17175f184c956c286915836cfe850716efd91c3c74d0e4b56dc1258d524d4aac9cb787c46c8a4e6e57aa
 EBUILD libcxx-12.0.1.ebuild 6704 BLAKE2B dda3c886e800201a33f2a84bf8ee081637ebbdae1ba61c74da2d5bc46a3b7252b14814cb2bcbf49eaadd7cb0627c8ed3fc5d193e2167351ee445c1c8daaac7ca SHA512 7af30677b2df8518cbe0feee57fe874bd8b1f64d34998f83fe497b9412327ec49445a2e62a71184449b45ddae18fd544ff7e7253cf5599737ec70daaebf63b3e
 EBUILD libcxx-13.0.0.9999.ebuild 6663 BLAKE2B 29fdc86ece97a67463eea19ac3fc7354bae72abda4791960a62af3c3ff8e3b8d24264f191a1e74651b10a451c8bc7e90fb8b37dc6ce9f031de370e6d442f53e5 SHA512 e1bb8090d04e21db78521944f7393e67dc875b1979ec308a204f695d45a9f6975f3eb57a1707d1a0a55c2df7c459a818682db311fc051ef8c29f7d247f257efd
+EBUILD libcxx-14.0.0.9999.ebuild 6663 BLAKE2B 29fdc86ece97a67463eea19ac3fc7354bae72abda4791960a62af3c3ff8e3b8d24264f191a1e74651b10a451c8bc7e90fb8b37dc6ce9f031de370e6d442f53e5 SHA512 e1bb8090d04e21db78521944f7393e67dc875b1979ec308a204f695d45a9f6975f3eb57a1707d1a0a55c2df7c459a818682db311fc051ef8c29f7d247f257efd
 MISC metadata.xml 621 BLAKE2B d8b68920ece0e3a700f1e425cf72a4ca7e75cf4b0b35e1ac6db9374d32020fc9f62b434da2108ad5b3538a46a2a7f4f5de7aa1640cd4b10046f2480ebb89450d SHA512 e1b0c874a6d229e098ffe7c0c2827502f2cdbf74fb7a0254687a0ca75dde74db06ef2bc79bfe8b526c413b13beac27b8261eab8d0b8df36011790dada3eae421
diff --git a/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..db5b489c505b
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
+REQUIRED_USE="libunwind? ( libcxxabi )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
+# llvm-6 for new lit options
+# clang-3.9.0 installs necessary target symlinks unconditionally
+# which removes the need for MULTILIB_USEDEP
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		>=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+DOCS=( CREDITS.TXT )
+
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
+LLVM_PATCHSET=9999-1
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		llvm_pkg_setup
+	fi
+	use test && python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# we want -lgcc_s for unwinder, and for compiler runtime when using
+	# gcc, clang with gcc runtime (or any unknown compiler)
+	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
+	if use libunwind; then
+		# work-around missing -lunwind upstream
+		extra_libs+=( -lunwind )
+		# if we're using libunwind and clang with compiler-rt, we want
+		# to link to compiler-rt instead of -lgcc_s
+		if tc-is-clang; then
+			local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			   ${LDFLAGS} -print-libgcc-file-name)
+			if [[ ${compiler_rt} == *libclang_rt* ]]; then
+				want_gcc_s=OFF
+				want_compiler_rt=ON
+				extra_libs+=( "${compiler_rt}" )
+			fi
+		fi
+	elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then
+		# clang-based darwin prefix disables libunwind useflag during
+		# bootstrap, because libunwind is not in the prefix yet.
+		# override the default, though, because clang based libcxx
+		# should never use gcc_s on Darwin.
+		want_gcc_s=OFF
+		# compiler_rt is not available in EPREFIX during bootstrap,
+		# so we cannot link to it yet anyway, so keep the defaults
+		# of want_compiler_rt=OFF and extra_libs=()
+	fi
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
+		-DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s}
+		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
+	)
+
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxx
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	local libdir=$(get_libdir)
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
+
+	# Move it first.
+	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=" libpthread.a libdl.a"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
+}
+
+gen_shared_ldscript() {
+	local libdir=$(get_libdir)
+	# libsupc++ doesn't have a shared version
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
+
+	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
+	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
+}
+
+multilib_src_install() {
+	cmake_src_install
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		gen_shared_ldscript
+		use static-libs && gen_static_ldscript
+	fi
+}
+
+pkg_postinst() {
+	elog "This package (${PN}) is mainly intended as a replacement for the C++"
+	elog "standard library when using clang."
+	elog "To use it, instead of libstdc++, use:"
+	elog "    clang++ -stdlib=libc++"
+	elog "to compile your C++ programs."
+}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 0fe45be6980a..e0baca913334 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -6,5 +6,6 @@ EBUILD libcxxabi-10.0.1.ebuild 3237 BLAKE2B 828cabd1bccb0f7dc672648fd1143f1913df
 EBUILD libcxxabi-11.1.0.ebuild 3559 BLAKE2B dc74318b252f772fbc6833e413ee2dd9b682c01ae3bca88a78d2f7854aa374311474f7af9f19453e4b4fbb6db4149e8330db7632faf710a0aeb2e0d741119096 SHA512 18632637cb6fb86a3c003ba66f6a80aece299f50e356870599bb932fa100ba3e51293cee71576cc994a7e2b5f56f3b4ec8b4d3eae6202322d50a9bc0aa922ac3
 EBUILD libcxxabi-12.0.0.ebuild 3542 BLAKE2B b64bd260671e5109a31ac3f779f46720ea2972d5da3e5d4b0293453be3e8ab209a1bca2a459c160271fa4cfa39cba968b6faaab1cd12667dd3822bfc0633266f SHA512 8b1874aa691d2aec5f149625d9865f23ef4ba181d8d805852a9cfa22bb7649872183d94f047a3406d2bd9135127e854a477eb8b31281ff7ce2f7a120888fe04f
 EBUILD libcxxabi-12.0.1.ebuild 3547 BLAKE2B 80a38e4458df2465501399df48d71e8907c17f302967b318eb980ef581121b4e7d1f333ff275673b731e8f17dca2efd6da534b418064b1f4240ae6d942a9adb9 SHA512 adabd99bb5fafe4cdf1f8ec72fca0cbe9536ff370cd12327661523ae495056f7a67602e759c766ad09b9f4ff75cc4a1e18cd40d9f44d6049d37af406ecf65416
-EBUILD libcxxabi-13.0.0.9999.ebuild 3506 BLAKE2B 6b303724952f15c6dfdf6d91c76c8368cba917ac914fffdd9676ced8991e9fefc6e7e557f74c1138142dcd3f926824ce709f28c57f1c43daa4ac5d435693de65 SHA512 c03c0f5d91f71695be1413d62c7e20ba6a76ef87d01defed8db6b90f16bcf41a2d701f3aec7764a1d34ba455e5d70d79b54214e8b20675fb41519698d544adf2
+EBUILD libcxxabi-13.0.0.9999.ebuild 3498 BLAKE2B 5483dca08c66645c4ecc947884a103384076d092a2ff3e52d7a4354ec5a0aecca5aa0ec06331120dfef3227823b9a0fd91b3e37c52519a93a44d6293419e9bc1 SHA512 3ff549741d571ea4952e6658c41c1aa476b8db033097aa56f741148bd991e0a62181b60a51969a4e04f8b3a0d8b5cf7491a1e3fc6c2046f1c74941407a17e493
+EBUILD libcxxabi-14.0.0.9999.ebuild 3498 BLAKE2B 5483dca08c66645c4ecc947884a103384076d092a2ff3e52d7a4354ec5a0aecca5aa0ec06331120dfef3227823b9a0fd91b3e37c52519a93a44d6293419e9bc1 SHA512 3ff549741d571ea4952e6658c41c1aa476b8db033097aa56f741148bd991e0a62181b60a51969a4e04f8b3a0d8b5cf7491a1e3fc6c2046f1c74941407a17e493
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
index 5df21898489a..953c0c81796c 100644
--- a/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
@@ -32,7 +32,7 @@ BDEPEND="
 	)"
 
 # libcxx is needed uncondtionally for the headers
-LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake/modules )
+LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake )
 llvm.org_set_globals
 
 python_check_deps() {
diff --git a/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..953c0c81796c
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libunwind static-libs test elibc_musl"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libunwind? (
+		|| (
+			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
+		)
+	)"
+# llvm-6 for new lit options
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+# libcxx is needed uncondtionally for the headers
+LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
+	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		llvm_pkg_setup
+	fi
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	# build a local copy of libc++ for testing to avoid circular dep
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
+}
+
+multilib_src_install_all() {
+	insinto /usr/include/libcxxabi
+	doins -r include/.
+}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 0a510eab772a..43b49c671a0a 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -8,4 +8,5 @@ EBUILD libomp-11.1.0.ebuild 2901 BLAKE2B e18155f24e5d0aa2de9a1976c818777e8d2d160
 EBUILD libomp-12.0.0.ebuild 2947 BLAKE2B b8ad55a9462099224e7a15c781d0ef10b5b408749878496d7813e638cc21c789914f16143ab307bf5f6c42300f5b31145ddf650147c16915e6407469431e30a7 SHA512 69e37474b659a8f05af8ef0a725a6f99911882364ccca279e3179d2bf89bed603067bf760f0c430a9184d95208d41c7f418a023eae534013f2765de98d73ea57
 EBUILD libomp-12.0.1.ebuild 2973 BLAKE2B 2a00ea561ea97eaf205c12f15f9cadf854a24a119e659b605a2ffc94ef645dcc945723d2637ae5c550f997806a74786c49a5fd842cc012888c3872036bd551b2 SHA512 3cc4f781c5e485671a47cc9a46a52a8ac50ccd543d7d3aa34b1499d7572394ad789cada576640738a6d80dbcc2b4af1b8865d5abf885442ec3d8e3345267338e
 EBUILD libomp-13.0.0.9999.ebuild 2886 BLAKE2B 277ab76b2a945ad163abaf324eaa463185c4c331c024ba672328cec8b07d13b86bfb0447705aa9d58a26e75cf10d62d5e95a81f043154f08b0c694845190e669 SHA512 f7dcfc17813949f3bee56104f58931784dda788eabd6ea9e06f8898fdf27f6f1e90a415193028285d0e079663339d77b44a26a98dea6ea997e231940df0af296
+EBUILD libomp-14.0.0.9999.ebuild 2886 BLAKE2B 277ab76b2a945ad163abaf324eaa463185c4c331c024ba672328cec8b07d13b86bfb0447705aa9d58a26e75cf10d62d5e95a81f043154f08b0c694845190e669 SHA512 f7dcfc17813949f3bee56104f58931784dda788eabd6ea9e06f8898fdf27f6f1e90a415193028285d0e079663339d77b44a26a98dea6ea997e231940df0af296
 MISC metadata.xml 825 BLAKE2B 9c4afd81e02ecba9db7cac8487acf4e9dcbf772d62ee46c5c95510f1c624b52e0005786d06c119d4d7f0bf498fbd9cae2f9200a27ea427c9d6e83a5d74d45c1c SHA512 b2ba293ffb87f06c21172607234e8f69730d8ade0732fe98a5bc876353a01853dbef8cbe0ace0f6a556f2ae7217facee040349b460815dc2cf2f3b48cfd46762
diff --git a/sys-libs/libomp/libomp-14.0.0.9999.ebuild b/sys-libs/libomp/libomp-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..5adaa0dfbcac
--- /dev/null
+++ b/sys-libs/libomp/libomp-14.0.0.9999.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib linux-info llvm.org python-any-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="cuda hwloc kernel_linux offload ompt test"
+# CUDA works only with the x86_64 ABI
+REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		virtual/libelf:=[${MULTILIB_USEDEP}]
+		dev-libs/libffi:=[${MULTILIB_USEDEP}]
+		cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	)"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	offload? ( virtual/pkgconfig )
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		>=sys-devel/clang-6
+	)"
+
+LLVM_COMPONENTS=( openmp llvm/include )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+kernel_pds_check() {
+	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+		local CONFIG_CHECK="~!SCHED_PDS"
+		local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+		check_extra_config
+	fi
+}
+
+pkg_pretend() {
+	kernel_pds_check
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+	use offload && mycmakeargs+=(
+		# this is non-fatal and libomp checks for CUDA conditionally
+		# to ABI, so we can just ignore passing the wrong value
+		# on non-amd64 ABIs
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
+	)
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	addpredict /dev/nvidiactl
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 73922fa25dc5..b766dc501466 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,6 +1,6 @@
 DIST libselinux-3.1.tar.gz 204703 BLAKE2B 72ff2d99dd6640405e804f58bdfbf05e152615ea92f902b3942602af13dc17080afeabb942ed33ae6b3f528870f4b11584e533848e455a97bf8f7151a8d44646 SHA512 57730cddd2d4751556d9e1f207c0f85119c81848f0620c16239e997150989e3f9a586a8c23861fd51ed89f7e084ad441190a58a288258a49a95f7beef7dbbb13
 DIST libselinux-3.2.tar.gz 206380 BLAKE2B 544eaaa87b9738c61929abe48713b530a8909eaea017890040f2fe299af86f09b6eb2cf4c9a68e06268ba09923b2b67703ac7a2b973906acb45f698e9ccaeed2 SHA512 18129ac0b9936e1f66021f1b311cf1c1e27a01e50cb70f08a3e1c642c5251e4538aec25a8427778569dfecf5333cf1fb84f1a59afdce8019328d0cff7e5833c5
 EBUILD libselinux-3.1-r1.ebuild 4215 BLAKE2B 36d801acf1836645c710ba451aee245317c85dca7452ee990b1ae4f409e758d1cbdd3e47bd839e642e04e6d0cc30a4413060470a47a613a503361182d51128d6 SHA512 1e62339dd7530ce1eed4884024960e2012b533bc7d1160ce3a821956c502af7eaefee69dddb166df44a5d2a26940d5357400f5019c7b62cfc0209161cfa33af5
-EBUILD libselinux-3.2.ebuild 4242 BLAKE2B e8110d185e21d0ce67f726e8f36900e58f159d5d72ef18d41d816fef4a264858302758ec9b15123ad18473b9cd7e675dea6ef0e1709015810c832d134081dbf9 SHA512 fa05ef9d30804652ec9669c601c42561c5c84d5dfc85969ad4e9ced0573ddc967b1116a595f1fde0f399af349a3cd52ae698f45f4712780b78516619539be4a2
+EBUILD libselinux-3.2.ebuild 4241 BLAKE2B 4b93aa92a88f03e0bbbc1dd917f899416537e8894d6e830e60920c1cd6b17fc8809c1f2753ddf957f5a5c6fda3b74afeb1ab0012cd1e4dcf3bdee41e5b712982 SHA512 9441fd4d3afe9a1a016d3a99de27c2c1c82c0ad8646dae3bc4cd4775aa3ccece58d95343a3f43b6e6c6eec4ac967a8d0735ff162506e06a99e5fdaa82274a740
 EBUILD libselinux-9999.ebuild 4235 BLAKE2B 907af15311f4f5e94583ecd32a097021feb022ef997d95eaddf046c6d36c384f6d9ad4de9f2a58cdeb8a65a2993ea5faf4060a840a2af23fe7fd7c5c1e42fef0 SHA512 83b2dca2f27d387db7ce337a217ff3cc25f2271b9a57d0017aec52f4dbed53aab7bbdea3f5f930ad033dcb9bfa1ac3bd3f37ccaa72b31f4b2341919d0d739e65
 MISC metadata.xml 745 BLAKE2B 6658dad55bd195725b345865e152b62528e04201b9743dd3688058eeb6f3ca87add86035c2a14bea0b238273328464f5e2fa36ce6b96ac35fb1cc679e3cb4a7c SHA512 ee405602d0345a118c4b8eac9126417f082f4a37a7d5816a991e21191d4ce71ec883abe7e91f10f5330cdc61e6f7a174968c12f873b08a4bda5186cc4986b363
diff --git a/sys-libs/libselinux/libselinux-3.2.ebuild b/sys-libs/libselinux/libselinux-3.2.ebuild
index 8e2e8d12cc54..2956e1e94ad9 100644
--- a/sys-libs/libselinux/libselinux-3.2.ebuild
+++ b/sys-libs/libselinux/libselinux-3.2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index edbec5fcf04e..2eaff8fd111c 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -1,6 +1,6 @@
 DIST libsemanage-3.1.tar.gz 179601 BLAKE2B 69450a4eda1f3728d339f65db1eec9940995fcea5208d17dca531ebc998aefbfec48fe91beffa3490e1502953aa550405fb696635d01b0eb8050c8f00f11106a SHA512 8609ca7d13b5c603677740f2b14558fea3922624af182d20d618237ba11fcf2559fab82fc68d1efa6ff118f064d426f005138521652c761de92cd66150102197
 DIST libsemanage-3.2.tar.gz 178839 BLAKE2B c0925812d784923a7a239ba919fc0a0e1d84cb528cbf4a357fb7938d3c06ebd2f0b60cd3eba40b76bf7c2922a081b99b16b32dc16638aa1bfce32553e241fb9f SHA512 6ad670bb298b1bab506217b12a3fda5d2209f4387a11410f0c1b65f765ffb579b0d70795dee19048909e0b72ef904fc318be60d5a01f80ab12742ce07647a084
 EBUILD libsemanage-3.1-r1.ebuild 4274 BLAKE2B eb0866da968e01b89d6ba51cdcdd89f8796b0beeac515a3dbb47a823d7d5b24b64e01a05948373e6a2159b80866394d98edef9d3048436e527b38f0e8a5cb40c SHA512 21cc2d83b6efd83a691010699104d7a5344c84665cc505d4cae13a1a5891c836c728760766ae9492bb1ab0ee03e4d9e764acf6d39aa52824a6e0175db72cfebf
-EBUILD libsemanage-3.2.ebuild 4281 BLAKE2B 67a68128d6a7f1df7cfd43fa38c456d43a86a53a886aae2ffef55e0abdbd5827b993a08945fbe3c74cae30baccb998a4b0ffe900177b72ed603a78b2870c5a25 SHA512 7b8c83f5ab13e7300771766aeafb962030f08a6e755d7e3697851811083fa2d53516603b254f75d36ee9784537c517c938e9521d006d1234f69bc386df37d835
+EBUILD libsemanage-3.2.ebuild 4280 BLAKE2B 073fa436221091ee5a8594a1194c96aae7d3c73c29b34bcf0f594e6cefd3cca082599338c29c10929b11d01151c786d6c9d1d17740484a7282bf78ced31cdff6 SHA512 12d968aacde29854b50fab62d72f08219dbbac21268919cdd867ed01b36e4d8cfbd95ae496477bb4c5ab8a8479c8dbbfaa33d97d8b1856b2265df193ad22c445
 EBUILD libsemanage-9999.ebuild 4275 BLAKE2B f1cb24ab333c9f3d565d7a3d5a4fb80b6339b84b17cc4c7fc445ab1748f443d8ae15c51ff52500e8404f2e635082d24f220afa023f0516214dc2802290518efc SHA512 d2c375e0bd73b51cc663550ecad5401e2a21951105cec6fe0d12ee18e70334a0284afd3ab9eb7454dfe7a172a974804bacc86bd3071c67c03681536e8dc2eeeb
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-libs/libsemanage/libsemanage-3.2.ebuild b/sys-libs/libsemanage/libsemanage-3.2.ebuild
index 18841b5e4d1c..6ed97a92c982 100644
--- a/sys-libs/libsemanage/libsemanage-3.2.ebuild
+++ b/sys-libs/libsemanage/libsemanage-3.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index 7d5e35139df7..3ecb0d279fc6 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -1,6 +1,6 @@
 DIST libsepol-3.1.tar.gz 473842 BLAKE2B ef1d596c4d53cc0a87e899ef4aeb5bf29c9d6b8303632ddc866c100d30debd8aedd0e8b38cb4ce3141b80421cd914148ff072e492d63dc2dacf03ac2ce59ca5a SHA512 4b5f4e82853ff3e9b4fac2dbdea5c2fc3bb7b508af912217ac4b75da6540fbcd77aa314ab95cd9dfa94fbc4a885000656a663c1a152f65b4cf6970ea0b6034ab
 DIST libsepol-3.2.tar.gz 477749 BLAKE2B 6f35387c0373869672080e151f212c081389f6799539124353aa1749ae2648669b2e237a271297c1c212b7a9e0c35f05edfff1bb724c8a15993e8fb8c599ac2e SHA512 1a6b3489ff766958a4b444b9be63a794267243aed303d3e7d87278f11be492dbf603a0c8181c4c5e01cb0e1ceb43810a77f738f0b9bd1d7d2be67053f9c67a6f
 EBUILD libsepol-3.1.ebuild 1136 BLAKE2B 7ea108a698f5701cff8eea482f58442c9e339ed0c720f4cc9a50c2fee7513dc3f4b0d5427cfd1f67d72c48ac4659f31ee653a13cab56b441980c44a850e37a92 SHA512 cfd3e50a39e3dc0b35f961515b8c6d643826280489cc720376641b5b098bab3f883f009b924ca238a1f45af725da0a498a811fc8b841c7d5330e3ea0b7576f43
-EBUILD libsepol-3.2.ebuild 1117 BLAKE2B e275dccbc6f6389520a0926dd83a37db391912f608613790355048707f4d42ca0627fd1d212a0ca088999d3b1d749917ab11ea744b73bfce6044854e9c5a6967 SHA512 dbbd2912bacc1439754d544e27451bbf87c93e04dd2238a9f8ccba8cc50570294b1337440936f7684856beef42e0b53dc36005f535fbf2607bd70407f0ed7d96
+EBUILD libsepol-3.2.ebuild 1116 BLAKE2B 62ca7f18493ba4a8785f1532aed2f907ef065b3ddf5b42a241b1ec7d90ad816276882953504594925d6ccb5d6795a9e5973a7bc3d9af5cfae60ae0fc4e3ddc18 SHA512 33388414115ff52f1848e4bb79a52db30a872b96d94c2a8ef7a249214da9c50671d41d9d19cdce863f671b8f54b7863bf663cc1bd8c907ba74f262fcc4bd244a
 EBUILD libsepol-9999.ebuild 1111 BLAKE2B 8ae2517a060279cb7be432e25697ef5905856b9f271b78f28ee25a73d94efb969c28efb26b34bba4a43ad52f1c316767682fbd8c90f09b825921aae6f945684a SHA512 023d89e557b8dfdc6bcb92b18d0433a23cf030b1c179d8fbb583edf5e4fb7b5fc005ba4305f402e62e818793430141b6a69cda791e99c7dadca4ec0d8feecb89
 MISC metadata.xml 401 BLAKE2B 8d8df536f4fc4276a16dd448cd50fc3344f4f934ec7a8bc34a69e86e368ba47e69d1b8522771229f24dcb6400b3256106b26f9662ec1173cacfd539bffd7ba9a SHA512 67f5d428e108ff13135a3260189f3a4ae70b50f52e1d342029c25fa7e2c8ff2bc1ad579117a0f0caa0cad427a6f1f2aa6b8a6c540551656dd61849b495e10029
diff --git a/sys-libs/libsepol/libsepol-3.2.ebuild b/sys-libs/libsepol/libsepol-3.2.ebuild
index e54878f32cc2..23a044ae99eb 100644
--- a/sys-libs/libsepol/libsepol-3.2.ebuild
+++ b/sys-libs/libsepol/libsepol-3.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 9ebb475da545..0026d73ea600 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -6,5 +6,6 @@ EBUILD llvm-libunwind-10.0.1.ebuild 3185 BLAKE2B 150bde0a85684ac2cbc01d20139e458
 EBUILD llvm-libunwind-11.1.0.ebuild 3223 BLAKE2B c39bdefd6bf0656db7d84f3cd868da01aa4b37f51c729951d1bcb73336f6ab1d8beb114a7d10d79c1441ce945b03aaf9444481e5e1b3e7dd7fdb9a7e971c451d SHA512 ad8cb081326e4dd6cd888882fabcc3fa1a152c37b28197c9565d46d8f8419f233a1a9f6cc9f3bcfe4ba1441cf97147dafb684e3eb60453020d2b64ccfb56d1c1
 EBUILD llvm-libunwind-12.0.0.ebuild 3657 BLAKE2B 4370cc5e2c1d423a7ab3bb3ed6c208d02e785c89d6d5159c5f6f967591dadf6a49602b34f6e94a66e3c8700b3cab273140aeeaabf941eac49c03cf0926470b7e SHA512 0d0aaadc05b8beca6e692b9b6325e426a4c29186b45376d1501cde2c1ee66f69ab5b60b2f148188f7ae708908a200395a51b02920a62c755101176b035aafd2d
 EBUILD llvm-libunwind-12.0.1.ebuild 3662 BLAKE2B cca4b3398c6ab63c31d06e49e81de202cab987c85b0cdb98faa2f91989f27f8c2853d53acc5ed5b80bcedf931d2750d4cf9db21d1c6c08a1b1f59255e1d3a15b SHA512 482caf63adb19a49809a7ca2350c5d9801aa765de96ede422e346da3c5d961b820c629cb77405789d7cfb68fdfca9a5692ca50d54b1e5ee7fe3299910637073c
-EBUILD llvm-libunwind-13.0.0.9999.ebuild 3614 BLAKE2B 3e47e7add3d6d0092623c8206fd8a2945ebcb83e067a0d77218d2eadd391ad1202678e9a8315f4c55f21c167e68461b593871f1d3e183b5b297d70f05886ec86 SHA512 2d78c6359c2bc744ff1c857832c619cf4b4cc1f3788d6a13f1614baadab091b6e12fcc688d240efa347606cdf21f50bc086b9dbee1cbea19aa96a63cd0f27614
+EBUILD llvm-libunwind-13.0.0.9999.ebuild 3606 BLAKE2B d1f27261c22950e15e904340132567781446e14a349f5e39d538ed4eee3659d4a93a27efaf4350e2de14829c93560e66d5a123bebcb04f731c80f81075548e83 SHA512 adfc61c4c2d9f09d5573d04c200fa84f7ca61d59073406ea01d35ff9b6095f8d7aabb30fb09f7a4f97a19fff9368816dae099e8d52427e1c7b32613cfcb3dc83
+EBUILD llvm-libunwind-14.0.0.9999.ebuild 3606 BLAKE2B d1f27261c22950e15e904340132567781446e14a349f5e39d538ed4eee3659d4a93a27efaf4350e2de14829c93560e66d5a123bebcb04f731c80f81075548e83 SHA512 adfc61c4c2d9f09d5573d04c200fa84f7ca61d59073406ea01d35ff9b6095f8d7aabb30fb09f7a4f97a19fff9368816dae099e8d52427e1c7b32613cfcb3dc83
 MISC metadata.xml 302 BLAKE2B ef8858b3c26dfa1727e57685381dbf71eb74008e74127b06467aaff9eea2fd7f3fdcdb1819529b8e828d42720745855e948d608bbe3eb40778fe1e4e260118ad SHA512 d5e641d63402052ef7af157f98998868a816d5e5072424725b09ded5c2477b26aaafbb8874473367a860d3fc365e0f4f0db451315ec4be3df23cce4c1194f2d7
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild
index d64e79cc6b30..ba5225ffe696 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild
@@ -25,7 +25,7 @@ BDEPEND="
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 	)"
 
-LLVM_COMPONENTS=( libunwind libcxx llvm/cmake/modules )
+LLVM_COMPONENTS=( libunwind libcxx llvm/cmake )
 LLVM_TEST_COMPONENTS=( libcxxabi )
 llvm.org_set_globals
 
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..ba5225ffe696
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://github.com/llvm-mirror/libunwind"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!sys-libs/libunwind"
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+LLVM_COMPONENTS=( libunwind libcxx llvm/cmake )
+LLVM_TEST_COMPONENTS=( libcxxabi )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local use_compiler_rt=OFF
+	local libdir=$(get_libdir)
+
+	# link to compiler-rt
+	# https://github.com/gentoo/gentoo/pull/21516
+	if tc-is-clang; then
+		local compiler-rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+		   ${LD_FLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			use_compiler_rt=ON
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+
+		# avoid dependency on libgcc_s if compiler-rt is used
+		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+build_libcxxabi() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
+	local BUILD_DIR=${BUILD_DIR}/libcxxabi
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=
+		-DLIBCXXABI_ENABLE_SHARED=OFF
+		-DLIBCXXABI_ENABLE_STATIC=ONF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	# build local copies of libc++ & libc++abi for testing to avoid
+	# circular deps
+	build_libcxxabi
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# install headers like sys-libs/libunwind
+	doheader "${S}"/include/*.h
+}
diff --git a/sys-libs/musl-nscd/Manifest b/sys-libs/musl-nscd/Manifest
index bca14a563ba3..4d07c49746a5 100644
--- a/sys-libs/musl-nscd/Manifest
+++ b/sys-libs/musl-nscd/Manifest
@@ -4,7 +4,7 @@ AUX nscd.service 337 BLAKE2B 6b163465dd8db024652921892dc913da8dfc0984eec7ffce621
 AUX nscd.tmpfilesd 111 BLAKE2B 4abb7220564e248fc7eeeced41077f186f42594facbfac9a4c0ff36209baac529c219ad6ead8d8aa53ab2b092002f1006a4479459b9e9a7c5a0294cb7d822100 SHA512 53b80b331e1a85d8ee16eb2ce547a7249e944926c3d1cdd4a47a5301a5c842ffc7ec1e3dc0a731542a8facf8261c1c57121802d01741aa89898a3476c09da340
 DIST musl-nscd-1.0.2.tar.gz 44912 BLAKE2B 8a496c941232ba617b8468351cbbb780b1decc2c162210f939abb3baa430a5f5a79e21fcd3aadac2cbe62820452fc18001edc7ebc13cae7a6ab768353c45235f SHA512 45cd73f1e0eee7b32c3dcdfa96c0a11379f6208389b87fee97016af0ecb19e9e7d2a2f10e0df6e5ed8a6ad4bbbef70c01cd31ac3631fb1bcce6e69bf48843a3d
 DIST musl-nscd-1.0.3.tar.gz 45023 BLAKE2B de3985878745497f0f6904efba0ecf1c5d4ab96dd190fe0b776459db946749858821f51e75d457172da75cd68c5bba22143647b269473f35d41e0ab9bbac3e36 SHA512 b931a28d70bbcc19a5b592449e7400ee61d5af93511d44e2e63416010b3938f1d350a965b0ad876699bed406926d3180a0380868279e13d3456e2264c80a4b7d
-EBUILD musl-nscd-1.0.2.ebuild 1015 BLAKE2B 73061b724e64c2eb47d0a56ac7dc7d6b8235ff11700e3f76664eb3c1fcff6e33c23965448a5c13d6f3209e03ccb1c3d6ccffe63b41dbcd7b2976e17e23821861 SHA512 3f31453c735d942ec069957ef32f29507be0562b266213e294642a2061c1986a273947f1675b311701aeeb6b14647abc18e9786abf24a9c109f96a226f93c790
-EBUILD musl-nscd-1.0.3.ebuild 1022 BLAKE2B 8a37057203154bb9919dc54477c44ce62dbf824a02ba68be38fed9dae89c38dccf9e0696336b08a259572240173a8d63f463c0cd34a2c3779ddfab04b0616e81 SHA512 8fed5b3aab25cc9cc23875411d9fe76abe12448fef819c9cb268f1d5a10f33250697783b324ad58d943263e2230078a228491da374af070f2ea7522227ac6676
-EBUILD musl-nscd-9999.ebuild 971 BLAKE2B ec22dc743bc4506ebac6a137aaeaca5656d2f608ae59b3b6bfe547270de9d047ff6b8062fe4b56217e9a7edf64d057348f3708364c0ffc6d7cc06c9262c426a0 SHA512 92b39cd7110da5a0a18506f8e75f3eab66c9b9eb3174b0ed4422d88239d9ae1528569af1230cb60726ca653fbad3aa8c98fd726fc8f9d2466379fbb440745679
+EBUILD musl-nscd-1.0.2.ebuild 1092 BLAKE2B 1526760c7d41e5e8391fb00d20553ebed0f0fb6d7ea2c6c1191f2c5cfc9503d00dcb47efcc99d0ec14526053d352339b56e8e7f3c3e15cf4068f4b74c9d72121 SHA512 26af04c9ce24e08f17fb662922ba18414f34ccd7a961cfe361414246b858b73ccebf1378b9586369c74c8059d2e10b8ce6b7c5c18f4f7be13a3da8ccb0c5df55
+EBUILD musl-nscd-1.0.3.ebuild 1099 BLAKE2B 15ec6f4c9a9f3b6e862a39bd00c1ecd0eb839b8325766e83e25a7273875471811407857a904f65b857f64fa76ae781bd8f16321e0478ba4cb4da77666d8435bf SHA512 906bbc4453aabd6cdddbd8417ea3725931cb63371f76677994ea45e1f0c29e91a5af1129f22bc748dd4500a7b67a40662d11e88e37aff534e118a9590f624c3d
+EBUILD musl-nscd-9999.ebuild 1048 BLAKE2B af3ad0def5f0ab1d43b5c69433b0c8825f30738c32c788eabdf8c1abe5bd5f03c0eac38be37fe27e65db156bc942b3af5e56e0568e0482a0e745c187eb023544 SHA512 466aae0ca3aeaf61d61ec728cc62837b4e7f156b4da03fe9a1a61f84884af29ba7291f2352bbeb156d2b0b7f87f14e773002afc64cda111d5798c8e33abda7e3
 MISC metadata.xml 408 BLAKE2B 579dfe2bda31eb1fc83e098f2b3675ef14b9c62b62ed5cfc01989b22f8925a2fbb029bafcb29d12574faf39abd5611adf699e98266cb01e25324baf3adeb4e62 SHA512 e96f5818d7882c06ec6788eb7ee5caa504773d130cdc20d3f314c1787e655879490c8559b0366561ff5d209cfa9f31a10fc3f9985c522a78947870c2c8b5122f
diff --git a/sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild b/sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild
index 3b1942c21612..055b7e4a3d0d 100644
--- a/sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild
+++ b/sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild
@@ -46,3 +46,9 @@ src_install() {
 		dodoc README
 	fi
 }
+
+pkg_postinst() {
+	if ! use minimal; then
+		tmpfiles_process nscd.conf
+	fi
+}
diff --git a/sys-libs/musl-nscd/musl-nscd-1.0.3.ebuild b/sys-libs/musl-nscd/musl-nscd-1.0.3.ebuild
index fb9101f102ec..0f8e8326c8f1 100644
--- a/sys-libs/musl-nscd/musl-nscd-1.0.3.ebuild
+++ b/sys-libs/musl-nscd/musl-nscd-1.0.3.ebuild
@@ -46,3 +46,9 @@ src_install() {
 		dodoc README
 	fi
 }
+
+pkg_postinst() {
+	if ! use minimal; then
+		tmpfiles_process nscd.conf
+	fi
+}
diff --git a/sys-libs/musl-nscd/musl-nscd-9999.ebuild b/sys-libs/musl-nscd/musl-nscd-9999.ebuild
index e03ce6c6293a..78daab8676aa 100644
--- a/sys-libs/musl-nscd/musl-nscd-9999.ebuild
+++ b/sys-libs/musl-nscd/musl-nscd-9999.ebuild
@@ -44,3 +44,9 @@ src_install() {
 		dodoc README
 	fi
 }
+
+pkg_postinst() {
+	if ! use minimal; then
+		tmpfiles_process nscd.conf
+	fi
+}
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 27c449f4a978..00a7d462d4f8 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 1fec6972bfc0..cfcf2b824d64 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -1,10 +1,4 @@
-DIST acpid-2.0.31.tar.xz 155620 BLAKE2B 11338d72156dfd90f680367e23e373f8c4ee5e553ad4a8a9c9688163e9a97ee99a9b866940320ee5af5a9e9fe956dd3e675d0b879ea984c2cca56162c0d163fd SHA512 05eb96cdae698731b14caa89aa01239a0f16ce732f897d295447753aab7c8d49227c9b9ce901c6fd3bfdb117688e6ed80ec61aea0f64d75c9c0afe2aea2aa91a
 DIST acpid-2.0.32.tar.xz 155768 BLAKE2B 829b2f78f497d9c0bbd90d952cadad96beece3070240bee69f2a5cf28903e9e5f969a3bf9000552c63a52c17f8b94285a181f4301449a9b64c573032d9a4d255 SHA512 c7afffdf9818504e1ac03b0ad693a05f772bfd07af9808262b3b6bb82ca4dabe6253c94e6dc59e5be6f0da9e815e8bcf2d3e16f02b23d0248b6bad4509e78be7
-DIST sys-power_acpid_2.0.29-r1_extras.tar.xz 2548 BLAKE2B 4568f0e44d33382fd294248d48c8852f689f0a6082d9b74b33b77918d3ce21d7f1bf8a3aafeaa252e8fe170b3829155344a256f01fe80414369f02d50a17ff55 SHA512 f2c366c50c75790df32a1f6573b7de640fd09a97c4598155ebd0aad2eba118961ddc82fe0fbb4dc935aa5b6d7fcfe3ade73fff555b4588b0e4579a1028bef12f
-DIST sys-power_acpid_2.0.32-r1_extras.tar.xz 2204 BLAKE2B 7f3b6c7c93c0989071c4e1046a0e07311c617673621aef13ca71e407be7d67b97ace3251daa5b91be23f84d882a8f17bc02f180d3d1946bd880c0f071e7cdbf1 SHA512 5012687d1afec41f5cb617f767c6a97dcfaa118b3261dfe7588ce8be1732edd183abbe405f33ae2441cdb3a11606d52defcf0554f455d04941cdde8d0f4bf822
 DIST sys-power_acpid_2.0.32-r2_extras.tar.xz 2196 BLAKE2B 0975289f7cff6ce24523246f1daac22149d69c410e07a19a5952457e269fc1f736bd3636c93038f660c411f3085d375250c31dc3de3ac1bc6335a97e1fa3dea3 SHA512 f49cf3f75f5db4ca454d29330ae40461deb1109f076e140188a7560fedd78970572a6c023146c4d33c0778ff65056abcbc66725c000ece8e6861419d02d0c6ca
-EBUILD acpid-2.0.31.ebuild 1963 BLAKE2B 849a3193c21d908549798a9a553ae4af336f45a4450a115c9311993dffaa2c7d2bba42a040305120be72e835ae5256d8ff65aa9e8bb0c5b3659906537bf22e4e SHA512 7243e2dba4a56c2c59620615a1752abc4978f67e199d6bbd841eb1cab8c8c5ae2eb3e2ddf84693a786e8e5204b4fcf0708ee2b00b6d28fd08b9864a5df0158e4
-EBUILD acpid-2.0.32-r1.ebuild 2038 BLAKE2B 2c9c8d25586695143f9e036f886793829a539095392b6ba74ac055e55e6a0ec0d90c33d797d195da667fe4488d8dbd88865d60064cd2c60d6ee068a459467609 SHA512 3cad647a535eabcdfd73beef403b7c910254cdd5782340dab3e8d564bdc5834722b134dda6a2aaca832abf87d1b37444f984206a27dca8836026b586341f0931
 EBUILD acpid-2.0.32-r2.ebuild 2045 BLAKE2B b56db810ba3b4362af38554efe552d1eb43fc461b14f892a8b428c0a0c179eb8c87d74761560f371a0c12ab83ec238600ef546539ae0d2e246982ee38f035e00 SHA512 e9da73f20d105b2b5347be72d40d0412bb3a51d91350b91b61f3233508b6d65e4bf7c80d9eb3d18c5a56fa86c9167911655bf6ba7581c578890e0875e496d132
-EBUILD acpid-2.0.32.ebuild 1966 BLAKE2B ec877eb0334d301be61fe4ebc3d458e1c4b98895137d92d8fa6e6c320aa83c9b2199fe61a40ceb5d0fa3cb153da7c11f005d41705b1f0955c1bc223d28e72882 SHA512 ac8d3f67c720261d3d3757118e8196df612e024c0025ffd55861089e85ba8e63fee0ff6daa0ae5d64f90f02f3fd4ecc45f08c884a1afceb2c07d9b4f8579c1f3
 MISC metadata.xml 327 BLAKE2B f6c546808131faaccf65580107772b21a3fe59b681b1ae6c66846ce230c9bb4ce9209287ff88f150f4bd691d71cdbf7e2c4fd4ac8a049a2e8b9d9ab57967c1b3 SHA512 8e93170bc36e09c1cf6c1db7eb751cc1ddf737d3ed240ef69a5ba00279ea3d9e92c5ba5185faa5f2f3c86fca9922adfb8e8e0ffe673817984948aa941a2a7a3a
diff --git a/sys-power/acpid/acpid-2.0.31.ebuild b/sys-power/acpid/acpid-2.0.31.ebuild
deleted file mode 100644
index e03295fad8d4..000000000000
--- a/sys-power/acpid/acpid-2.0.31.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info systemd
-
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
-HOMEPAGE="https://sourceforge.net/projects/acpid2"
-EXTRAS_VER="2.0.29-r1"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
-	https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-apm )"
-DEPEND=">=sys-kernel/linux-headers-3"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~INPUT_EVDEV"
-	local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
-	[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
-}
-
-pkg_setup() { :; }
-
-PATCHES=(
-)
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newdoc kacpimon/README README.kacpimon
-	dodoc -r samples
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
-
-	exeinto /etc/acpi
-	newexe "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.6-default.sh" default.sh
-	exeinto /etc/acpi/actions
-	newexe samples/powerbtn/powerbtn.sh powerbtn.sh
-	insinto /etc/acpi/events
-	newins "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.4-default" default
-
-	newinitd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.26-init.d" ${PN}
-	newconfd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.16-conf.d" ${PN}
-
-	systemd_dounit "${WORKDIR}"/${EXTRAS_NAME}/systemd/${PN}.{service,socket}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may wish to read the Gentoo Linux Power Management Guide,"
-		elog "which can be found online at:"
-		elog "https://wiki.gentoo.org/wiki/Power_management/Guide"
-		elog
-	fi
-
-	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
-	mkdir -p "${ROOT%/}"/run
-
-	if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
diff --git a/sys-power/acpid/acpid-2.0.32-r1.ebuild b/sys-power/acpid/acpid-2.0.32-r1.ebuild
deleted file mode 100644
index 89f652d187ba..000000000000
--- a/sys-power/acpid/acpid-2.0.32-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info systemd
-
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
-HOMEPAGE="https://sourceforge.net/projects/acpid2"
-EXTRAS_VER="2.0.32-r1"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
-	https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-apm )"
-DEPEND=">=sys-kernel/linux-headers-3"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~INPUT_EVDEV"
-	local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
-	[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
-}
-
-pkg_setup() { :; }
-
-PATCHES=(
-	"${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.32-powerbtn-gsd-power.patch" #702700
-)
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newdoc kacpimon/README README.kacpimon
-	dodoc -r samples
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
-
-	exeinto /etc/acpi
-	newexe "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.6-default.sh" default.sh
-	exeinto /etc/acpi/actions
-	newexe samples/powerbtn/powerbtn.sh powerbtn.sh
-	insinto /etc/acpi/events
-	newins "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.4-default" default
-
-	newinitd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.26-init.d" ${PN}
-	newconfd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.16-conf.d" ${PN}
-
-	systemd_dounit "${WORKDIR}"/${EXTRAS_NAME}/systemd/${PN}.{service,socket}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may wish to read the Gentoo Linux Power Management Guide,"
-		elog "which can be found online at:"
-		elog "https://wiki.gentoo.org/wiki/Power_management/Guide"
-		elog
-	fi
-
-	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
-	mkdir -p "${ROOT%/}"/run
-
-	if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
diff --git a/sys-power/acpid/acpid-2.0.32.ebuild b/sys-power/acpid/acpid-2.0.32.ebuild
deleted file mode 100644
index 229b3a21d7ee..000000000000
--- a/sys-power/acpid/acpid-2.0.32.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info systemd
-
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
-HOMEPAGE="https://sourceforge.net/projects/acpid2"
-EXTRAS_VER="2.0.29-r1"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
-	https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-apm )"
-DEPEND=">=sys-kernel/linux-headers-3"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~INPUT_EVDEV"
-	local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
-	[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
-}
-
-pkg_setup() { :; }
-
-PATCHES=(
-)
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newdoc kacpimon/README README.kacpimon
-	dodoc -r samples
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
-
-	exeinto /etc/acpi
-	newexe "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.6-default.sh" default.sh
-	exeinto /etc/acpi/actions
-	newexe samples/powerbtn/powerbtn.sh powerbtn.sh
-	insinto /etc/acpi/events
-	newins "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.4-default" default
-
-	newinitd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.26-init.d" ${PN}
-	newconfd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.16-conf.d" ${PN}
-
-	systemd_dounit "${WORKDIR}"/${EXTRAS_NAME}/systemd/${PN}.{service,socket}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may wish to read the Gentoo Linux Power Management Guide,"
-		elog "which can be found online at:"
-		elog "https://wiki.gentoo.org/wiki/Power_management/Guide"
-		elog
-	fi
-
-	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
-	mkdir -p "${ROOT%/}"/run
-
-	if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 5cad0f304bbf..43f8e4a5fa70 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 549b5a2ca67d..e22a2b707425 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -14,5 +14,5 @@ DIST audit-3.0.tar.gz 1109442 BLAKE2B f9c94f7163522068f5f37163a242cb913acc87b546
 EBUILD audit-2.8.5-r2.ebuild 6395 BLAKE2B 262e839797410f22028128fa7ac232094e19c7a58557b9ff8c354599c409fe1c91fc94ba66ed9500f7ff90df1734d6d6354d7d22601ed0a5ad1bc56ebd1222bb SHA512 0695411810fd45c27d4b9e389f7807dc8d31acddc1a50d02407dc2b5bafe9cda36c902c8b86f6b4b564281e9b4327001a0ce0902bd6396f3dd4f06032fcae90a
 EBUILD audit-3.0.1.ebuild 4262 BLAKE2B 95c293ae585d4c8e5decbf05938012ab0fab3c4dafc6348977107043f6e02252947eec36c7d0fe446c872caf7143b56fa70641e8a399a7e0b4a467d6ccb02571 SHA512 fff5966e9deeaca3387d1de975e8e934c7dcce303fa6a1ea6a2ab60fe92a37e16eaf2af8b3a65ddd12c0ba20267a785cf57f0c00e31a710e86b3949f588586e2
 EBUILD audit-3.0.2.ebuild 4215 BLAKE2B 1c349d818cd2d82a4956f61ff927a1da22cc3cfce0933b5f23a4f406d33ff4cfdb8bc54f779c8c7621f7e8ed53fb7d3447cf13f3584e9b9c6fd3c7c6a00d34e9 SHA512 34d842ff81a353ff5b5dd4ea96d83a935b394de4d10aabbe3b4fc9ab6a5c773166406c456f861acac6fab2b9fda781d94df8d766072ed566e3e6c87fc2fe0795
-EBUILD audit-3.0.ebuild 4185 BLAKE2B 94e5e7ea609ef9aedd3b8d464d36eaceda40db0d966e78a12f6c0cec4ea957007b761d8aece1d45bc3dcacb74d1696fb74926e8da3527c8c76fc7e76189fba7e SHA512 5426f21df0fc7bc6f96b3e77fe5073d01da2839ea83a591c327e3094b59d0878769c6b73cef20b44e6e4308a0ea266776cc1dbd1fcbb0645a555493a0bbfa8ed
+EBUILD audit-3.0.ebuild 4192 BLAKE2B 415b25348c40cf38e9333ff748acfc1f36cc2d22e104d57d71ee4d0cf43a0a2625ab52d05dac4d62cf577e7f3d2364de2e4fb38f08aaf5032398e221062db7b0 SHA512 563e1772e38d538d7f4335a1671622606352eaa84c7fa3e8315dc5964e45ff184e322e700f7e47568d7b6110adb927e961bb846a0d61cde0fafcdc33a14e9baa
 MISC metadata.xml 364 BLAKE2B d056ff5b5d3a6fd968f926ceaa85eaaf9b6c54f069dfe3e3d6eb8f784dd1eb4353b3c1236a4eb7691cd48893b7b10a10647a86bd2355b33f2b682c435510422c SHA512 3e5dcff1ff9cfa5c209ab052de5f2ac44ef2bef1d991e8daab6603b72cef81cae6106a34f5181196e083596183a454cb47436d7560084cd51779ae8eb9901202
diff --git a/sys-process/audit/audit-3.0.ebuild b/sys-process/audit/audit-3.0.ebuild
index d63564e38f4d..5ffdac1ab82e 100644
--- a/sys-process/audit/audit-3.0.ebuild
+++ b/sys-process/audit/audit-3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="gssapi ldap python static-libs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index a73483025db4..6d88c5818aa9 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -6,8 +6,8 @@ DIST parallel-20210622.tar.bz2 2251075 BLAKE2B 4855ee0e581bf1d3ebb7dd16e4126873f
 DIST parallel-20210622.tar.bz2.sig 2080 BLAKE2B f21c6dc3b90757e56547b88ea429e33cb04b7853cc3493a19bd3352a9e2c14f8d293ee1180cacd1449a37047e3084fa4d12dccc5767a28e2daf40d086c9f5404 SHA512 50fa1de3b40f8447c9adf5e52c23e8cf932dca0565ac663bab128f44db5e8159a399208d1a23ed6d5eff78b9cb0d6eb4ada92d642279e41d40b0c429ef4c825e
 DIST parallel-20210722.tar.bz2 2248893 BLAKE2B c72da41de516e00af9d73216a134a184b3436f4d8be89c92bf4607243ba18c6530364cd7b3b4b99cba8f7a55c8a0235819edd1dbe431de1b37716fe104cd9f72 SHA512 2b5bec76ca6db090bc93f57bd09771d264a761677adbd6f4b93256776cf65a62a5a3a4641c450b68044cb7e86c5e7202d9455d2f9b0ad0cb8ad64d6da6955f89
 DIST parallel-20210722.tar.bz2.sig 2080 BLAKE2B 48186854bb752e50c719f2fc6c964b3dd0b3407bf5d0683dafb475a7e6a537de1ae0e6f054f9105a4860b2fcfab50bc59ca159639bf72fcc42373f457af1cb93 SHA512 bc999d37c6eed6b170b845a01d3b0fb88661ed271fe4c18609144d3d224173ac2c66bd6fe40a5b8ddc4894503a38e558835a45ffad3ee8c0201d04dc1aed9a3c
-EBUILD parallel-20210422-r1.ebuild 888 BLAKE2B 791ac2d68a863daa215171d144e4923aa2826aa16cb7cb4dbccd6517adfb1ba6049e5cbc84af2027ed9785cfe9fce61c04df0d9d5228ccdb57934e02c4a632f6 SHA512 eb9e83be56d468988c1cfdb6ba9906e4f7b8db210f3dc36088b051a23da91eb1ce64342cdf05a86e3b58511ae4b1c707ac7dd8392e3bb3ca329aa5d49e8040af
-EBUILD parallel-20210522.ebuild 888 BLAKE2B 791ac2d68a863daa215171d144e4923aa2826aa16cb7cb4dbccd6517adfb1ba6049e5cbc84af2027ed9785cfe9fce61c04df0d9d5228ccdb57934e02c4a632f6 SHA512 eb9e83be56d468988c1cfdb6ba9906e4f7b8db210f3dc36088b051a23da91eb1ce64342cdf05a86e3b58511ae4b1c707ac7dd8392e3bb3ca329aa5d49e8040af
-EBUILD parallel-20210622.ebuild 889 BLAKE2B 312de95a1d0f6c5458970652214eb5577fd012cb9ccf75ebada36f28f1cfd127769d92e73884f8ccb5b0a9d6a0e3aab180763380993f4cfab701f7ed1f9227e0 SHA512 131f3473dfd697a8de47f3e83ddfa921230d536f4f1052784870d8999d45a7c5f9b46396040088e77f7ea145317497bb58c346196fe301a15b0e9c5fe04fbc9d
-EBUILD parallel-20210722.ebuild 892 BLAKE2B 74cc5985f1f9cf5288a7c6874622e8b7d96997a6b7126e8f00f854f341a2cabedaa97e5bd1ff49015fde7d4c5bd10e250bde04f5126636a206d5a1c10a410e85 SHA512 410d4b983df2d2b7bc0c7631d8cd46283ec470650835d9020e9ed5e94601c943bb0c348ba0cc8dd3314d4700a03d4084bc535c52128b1475a9fb697445774808
+EBUILD parallel-20210422-r1.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
+EBUILD parallel-20210522.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
+EBUILD parallel-20210622.ebuild 897 BLAKE2B 93b79bc381e23c42963d939ef6d48c0d1b820345786bb2aa7693ad055f8e8bea2d3c2bc775a0719d9444a213ce1cc3799fa07226bdc1c4931cf08eb56387b084 SHA512 1f83a41a9d4f4251ab988e298466f255f12453c0c598f9770290c8ae242c43f8a77f2af9d8b16a778116d4a3b294e0a1c0046c382dda707af55b39cd21c24f4b
+EBUILD parallel-20210722.ebuild 900 BLAKE2B 24fc7f4850789ce9d10a96500af216cbbd64d985f8560581b27dbc0ee672fa48393ecefcc815e38a534e3eac2e84cf54bd2c1393d767bea203532c7296e245da SHA512 ae23b5af9ce95be7936712ff4b0da8f26db8d74f74c97ae58a6869234093cefb6ba77c423cedba198e2cd973fcc7acfa504636492f46856c8c64358b0d4359d1
 MISC metadata.xml 1077 BLAKE2B a636be1d6e6e4861e156561d8670e0c07ae27657e2ddf8cac3a6d9dfcb3c637931fe95daf998dc93fac1ab2a31d9ae43e73469a2882124fa8e229f1c7bf55d06 SHA512 5cfcbca8d00c6fd19ef2ad24fe6f23d3e02164b31a330d0ab34a739a8a4152f8d8df31a42c563d0b482a94519bdc4b0d92182b04d6937dd98f06bcee3726493b
diff --git a/sys-process/parallel/parallel-20210422-r1.ebuild b/sys-process/parallel/parallel-20210422-r1.ebuild
index 296ea5ed45b1..33f0a0338b71 100644
--- a/sys-process/parallel/parallel-20210422-r1.ebuild
+++ b/sys-process/parallel/parallel-20210422-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/oletange.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/oletange.asc
 inherit verify-sig
 
 DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
diff --git a/sys-process/parallel/parallel-20210522.ebuild b/sys-process/parallel/parallel-20210522.ebuild
index 296ea5ed45b1..33f0a0338b71 100644
--- a/sys-process/parallel/parallel-20210522.ebuild
+++ b/sys-process/parallel/parallel-20210522.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/oletange.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/oletange.asc
 inherit verify-sig
 
 DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
diff --git a/sys-process/parallel/parallel-20210622.ebuild b/sys-process/parallel/parallel-20210622.ebuild
index bd0c98c15f42..584dd57ac596 100644
--- a/sys-process/parallel/parallel-20210622.ebuild
+++ b/sys-process/parallel/parallel-20210622.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/oletange.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/oletange.asc
 inherit verify-sig
 
 DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
diff --git a/sys-process/parallel/parallel-20210722.ebuild b/sys-process/parallel/parallel-20210722.ebuild
index df4e4dc4a9df..184819eb8c40 100644
--- a/sys-process/parallel/parallel-20210722.ebuild
+++ b/sys-process/parallel/parallel-20210722.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/oletange.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/oletange.asc
 inherit verify-sig
 
 DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 5fa7f9409d49..01383d2d862f 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 5e2f6a27b8aa..09c252a28762 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,8 +1,14 @@
 EBUILD dist-kernel-5.10.52.ebuild 383 BLAKE2B 80eec9edaf8e2502e3d24e3c4c48b98ef709ff2236aab76f8a1885f3423822c2f323cdb401e881f49f19c2a10024d69e97080e4ea265e62b7538c6500871d2af SHA512 232d47e93114609f82b9fb34db5cdf25f4519d5ae9942cebbf6018b554fc4f9a0486b37b8b83646b504fc8a75856af061c1c7d9516f91556ef01adb11b775322
 EBUILD dist-kernel-5.10.53.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.10.54.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.10.55.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.12.19.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.13.4.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.13.5.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.13.6.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.13.7.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.4.134.ebuild 378 BLAKE2B 425766351233e0cc1717be1ad4fd1e200bc799f0aba6693f174bc043be6a179616a25797d8411897c3fe6dcac975f3d7917d33171d3e0cfea8e842586ff68808 SHA512 763d2b93d60d712cdca6dfb85666b79d3e678a8ea3969609c8edd8f96f05d372cb768718893cbf7dc85e0a4615b1d3842fc1423d287e07c598d30f0bd321cf29
 EBUILD dist-kernel-5.4.135.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
+EBUILD dist-kernel-5.4.136.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
+EBUILD dist-kernel-5.4.137.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 MISC metadata.xml 290 BLAKE2B bcb7e629ba04928387a13bfb6b95fc2acce4d8b2bdf2669ea1c6299a954c8e94b0e3b4d65cd4b424dd8da2e33405bfd0cac3a12ff2603faad3f69b516d0f0aa4 SHA512 6b8c9a6b6055c46b0cce5bbd155d53a0dd1115edaad016bade7fc1cbe3ee4a9c2097fa3392f9df6830546b36c65cdf99cf2ffda40a313117ab5f32249677c753
diff --git a/virtual/dist-kernel/dist-kernel-5.10.54.ebuild b/virtual/dist-kernel/dist-kernel-5.10.54.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.54.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.55.ebuild b/virtual/dist-kernel/dist-kernel-5.10.55.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.55.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.13.6.ebuild b/virtual/dist-kernel/dist-kernel-5.13.6.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.13.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.13.7.ebuild b/virtual/dist-kernel/dist-kernel-5.13.7.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.13.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.136.ebuild b/virtual/dist-kernel/dist-kernel-5.4.136.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.136.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.137.ebuild b/virtual/dist-kernel/dist-kernel-5.4.137.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.137.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/perl-Scalar-List-Utils/Manifest b/virtual/perl-Scalar-List-Utils/Manifest
index c5c88cdce76b..7a2a63e66dac 100644
--- a/virtual/perl-Scalar-List-Utils/Manifest
+++ b/virtual/perl-Scalar-List-Utils/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Scalar-List-Utils-1.500.0-r2.ebuild 578 BLAKE2B 5188053e08f2ae6f517094a8c391a51f4b62703d32c5e1874861626dc22ebddcc4d85da132f77865cd770e727ff732e53e6d85ab1405aec756b7070622ed04f6 SHA512 357f134eb7a407fbc6ad196919062d89c3348ea059528f7e30dc0d89e5986bc761e756af2716e778b57e69db8f10dbd5a12886b2db5b7a426ed320b0ff9b8057
 EBUILD perl-Scalar-List-Utils-1.550.0-r1.ebuild 599 BLAKE2B 17b1a08223c879fdb32b1cfac4e85cb4ca143a0a998ee50e28795e898049d6f0b0a2ba2f080792c2d46a05e6fb0e81a298395184a0f83b58078f3275288d878c SHA512 e3e785f47dbb30978f04ec17a552ed06b10c977d6620d7bfa87532a1eabddbed0e03267a54f5d502749fbe8d5fcb5539782424729238a4f89b911db003b12d98
-EBUILD perl-Scalar-List-Utils-1.560.0.ebuild 491 BLAKE2B c6c19abb160f254fcb055424b27629d0be47460a1f9d55da758a57932571ae9c8818e90a78d3c2c3c031d3bbfcd2bbb1fc67e4cd5b21827f049c46d136dc1b85 SHA512 378ae208319a56fdc67a71d9af5d4964465c906c8415c1dce4b9a7f0c37a1b9bf58d5da704e2fc28181d24aab58aa105873c04f72c0387049175fbd3dda5eca6
+EBUILD perl-Scalar-List-Utils-1.560.0.ebuild 488 BLAKE2B a6be35d721e9b9e42036d68a14fb6e78d745a23fc1a33c532a92f7029883d1ed7e97a838ac02c6d8ebc0e060a76ccaaf4cbd4b7fb7191e0dce4859a389c71b57 SHA512 c4e5987334d9b211764f3f258bdfa2716c0f1f5c123290eaea568cef295d16f7881317415ffc36a91bdc8060428df862eafa155584b70682ed407294ab06d137
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.560.0.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.560.0.ebuild
index 9461d243ad82..0dca780dd4a9 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.560.0.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.560.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils"
 SLOT="0"
-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"
+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"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index be8d3d92523a..abcc9d54eee2 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,3 +1,3 @@
 EBUILD rust-1.52.1.ebuild 371 BLAKE2B 9c84995703f6feb85f28aa4960fc6b1fb6bd699c470d470605945204113f65489b6cc0c11d4ec548be5bfa09b4cf292a3680978823274054d27993ca26e7c91b SHA512 d35e99a11737a5196751cd1e54f67bf9d326cca8302ec40ca2a53c2379a1338e3cfda92f629ad0cc69c7aa4d11ec067182037f18a5a1eaab5afc1cae35f01c29
-EBUILD rust-1.53.0.ebuild 374 BLAKE2B f61907f1ff152a55c455f3705bce8a22600347a5fdea8bd2181745df338558ef1bab0dcd8e37cf28c88f647a88ab874d844cada929ac22b4244dd01c44c7f248 SHA512 5d8c62ce4ce0e64ca8ddf6feacc984c0655bde73cc5ca64ef8196ac89c3a0be6a11b3ab13a271952a00a94342dde6520b4cb58f524a36a1f5a293fe1d9ac915b
+EBUILD rust-1.53.0.ebuild 372 BLAKE2B 8e8f813389a3e15a42ec37bd19e5a6dabf07026ad681c1087d417e74ac51a144e8dc6734bb0b81fd3586e5fccfd975c1f4f0269d7acf11fed787f91d6c8df08b SHA512 1bc96791519f5156463109461535fd3c7e94155d65b0a972799b89aaaab6739c2b6ccd47b6278f6da7b1c65951863f599013dce5fb1fb9280291f9e96c924f28
 MISC metadata.xml 268 BLAKE2B 46d3c7977b1330642faf645f584a622873cefe48d21a61da239a4dd81ee2d8eaf48365cce90e6daef2958902cfb659c865177baf60e1fb042f3a8c3f20dba238 SHA512 030301fb1334a76098e632d92941c0c5547f07cb845f88c468528bff146f962d17e8b13e993d4a6e843dcd25b24896853412bb5b49ec7773af738a7c39e994c6
diff --git a/virtual/rust/rust-1.53.0.ebuild b/virtual/rust/rust-1.53.0.ebuild
index 51cf9b317ba8..f30cb07276fb 100644
--- a/virtual/rust/rust-1.53.0.ebuild
+++ b/virtual/rust/rust-1.53.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Virtual for Rust language compiler"
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86"
 
 BDEPEND=""
 RDEPEND="|| ( ~dev-lang/rust-${PV}[${MULTILIB_USEDEP}] ~dev-lang/rust-bin-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 2f3f3c595ecd..99333ec29f4b 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_auth_kerb/Manifest b/www-apache/mod_auth_kerb/Manifest
index a4bad7dab215..8209b5d55307 100644
--- a/www-apache/mod_auth_kerb/Manifest
+++ b/www-apache/mod_auth_kerb/Manifest
@@ -2,5 +2,5 @@ AUX 11_mod_auth_kerb.conf 338 BLAKE2B c9093c961dae957f392bde032b20690a9a83c0fcac
 AUX mod_auth_kerb.conf 40 BLAKE2B 76bfe68f7dd32d9f8dffb5a2124628c7971f7f7470182d003fa576ba386239fd946d2eee50b49f2e4f0d6d8061b61c927e212a68fb3e1cfc21d9c2dc01c688a8 SHA512 fd21cb7d6da1ac4ce5becab4e3c72a56245878625990ebddbf1d612a3b9cc273a6b3e87509db59ed67e934b5834c3db10914118982cb77a6b8220b0f65cd6e1d
 DIST mod_auth_kerb-5.4-gentoo-patchset.tar.bz2 8717 BLAKE2B 759ad350bb6c07226c86fa51e22f17023378928abed3fd80ff280bac54a472a8d918cba680b3c75ce93805a7f803bbd370a6bb1b73665f5a8d5fb7cdc6353d1c SHA512 3909c2677b30790cc17c0d8843feaa00d9acd14a012672443a887c0e88473d6b1572ba045e1491bcab53cbacff193c11cfe15e63ef1046cfcdf1f4ab60e0ac57
 DIST mod_auth_kerb-5.4.tar.gz 93033 BLAKE2B 2f5c2c26f0f9fa5919f879680e0b8f29087edd001c166655f8130e8d7efd527b0bb9bbb79fe3e508c14622ecefaa693a96dc7dd16a3298da8ae0ad4b69b48ca6 SHA512 93fdf0e43af1c24e8c8204d09240b708747068ef99dd8d21b45cb4d132d31e6d582d49ea5e23b905f55cb0d4a20b1ecb58de1bcbfdad1d016e536fc622b63214
-EBUILD mod_auth_kerb-5.4-r2.ebuild 1348 BLAKE2B 40e2ff68fb49536caa601bc6d7b5946078ff153aa04bf52505768796679876ba2a036c71f064c9292735fe3a1fd0cf420d03953efebaad93375d370426bbfd07 SHA512 01e299d020775704b7275491ea7783e588963598cefabed8f920f7fb80586e86d65d21fa12b72d759880867f0332c309e88cdfb35477443c81330c15ebb1a161
+EBUILD mod_auth_kerb-5.4-r2.ebuild 1397 BLAKE2B 793f5f2703d63596e4ea97cfb8cda795d4e10238814f7fff08429fbce086cf09c211eedf32ce6e348b868d6f8d2acca35cfefb395ca83c7dc451e19a15bb8fcd SHA512 664917f2de1e463573baba7599f68022270480cc9210b520fbd4d551549a8b02045210722c1f2824ef2914dfcebabf5ee53fca528d0fef85791e246a96d57f00
 MISC metadata.xml 248 BLAKE2B f2b54a005672ac4bbad84611ba34daf4076b2551add4f8c982dd2dc3761a02084719693536a8cdb1080c6613915eed75501dedafa905089211bddade9f8d7083 SHA512 f46a08a90200cc49b6389361c42fc1580504fcbb3ce3ce817916a6c6ae1c9b700f3dcbfa95e7b1284372c6cd5e51c7d93ea9076c5c26fa3b02f1ad7e1c053c36
diff --git a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild
index 8b56d40b4d03..a83b2926d126 100644
--- a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild
+++ b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild
@@ -52,3 +52,7 @@ src_install() {
 	apache-module_src_install
 	dotmpfiles "${FILESDIR}/${PN}.conf"
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 12bcb1c2174a..eb39787d5da0 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 64b34721de50..1da2c24526d7 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,12 +1,16 @@
 AUX grafana-r1.confd 870 BLAKE2B e222e17f5a14dc48f9bbc922250754d88610a951b1e6230736fffc0624a24a140bd9a9f11c6900e0f57b652ce3f334963ea453a5db5ee667863c6b69acc0f207 SHA512 cb6836ba69b9d1f0c50778823c507eaffd963341edbc4ea5409d0b068cfcecececfacac71e34b1d546a85674f67b12db99f384e5c6aa2186abe86814818d5db1
 AUX grafana.initd 1498 BLAKE2B ac97391c228c09353ef11efb0de37f25802484fbbf71bccedfc9858079ca679ba1567a2a7a40e250ed1fa7477189c30b8c5f175e607b455ae755566a9d89098d SHA512 c3ef1926fabe53728adca6954eb48e8d69c33b4238795e2d0d0406e55e08b3f84760b1abfec556f258af3184e10e6fa116c1b21c704575a54f88050a5266ec87
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
+DIST grafana-bin-7.5.10.tar.gz 52219967 BLAKE2B d8ba713423a5b58539db91174a681d1bfb0980738fa9d88cdf3d232aba70272898fa277e1d4b203e4b604e751699fb8cc97384141b227a7edd763d11ecd695de SHA512 127944f1d0adf670ecbbe22982526a906acbf5e4954c1ab1f3cf158bdbc24052c11eb3cb3561421cf0e120c4e64b092b7d1efe5eca56b04b6b3d5f290329a3c3
 DIST grafana-bin-7.5.7.tar.gz 52194760 BLAKE2B 4cc60188bb750c0d36d8b50336f51f8410cca5a730a93cd1536479dabefba79c955cddec554e7fabed782bdcbdf751c33794f893b4e0981214f3fc1041ee976a SHA512 ea5e9eef7a013e770abe827029bbb2b8b3ccfe28db985541597677671510e4c76b42009ceddfc687d23c249be792b99f1e8d5d518a271f36c4497d38380f0b54
 DIST grafana-bin-7.5.9.tar.gz 52215297 BLAKE2B 06fa63811f950081a581d402527a14660a7eac3cb00455357329b0da27874244e38265f78b2dbfd41d9ce8f7551f1dc9fc297138600e6d7430c70e3c82423178 SHA512 0e6e9504f6767d5d226954a3c61544353c4442ad56ed86124e3520c2bb35e4a401c3fc5fb462dbdacb5c31f80de3478d7db9c06f2a85131346185426b67e0837
 DIST grafana-bin-8.0.2.tar.gz 55512802 BLAKE2B fd535c8e1fca3136913ef1008c6e5ef8efa2871accc7a035354afd4b79a6e4d6340749c460c8c3d15e9edc07c426640b349c688a64ab678d61809f88f81b913a SHA512 d2421ba74b3eaaff3091fcf5015e6ca5cc050e205276b4d873a8d1fb3071cddd20fa846d9a03044752079564a458172e084ef69db4609fb520897a4f1d6fa4f2
 DIST grafana-bin-8.0.5.tar.gz 55588076 BLAKE2B 85845c7492a4dd76b47d959cadbcfb1bffa1f00b295296e4e8ae3033e4a52f654551a66f781f34d4ab4666bf05681bf3ced870fab6c59f758f9814fe67e5b1d7 SHA512 c0df8ee147c4876e29fd8b4f7943550b4c615787ecd50e7a40eee68d8f64bd4e9958e2473e00fc4244e4440f01750cf7b349a4baa769d69ee61c043538679a56
+DIST grafana-bin-8.0.6.tar.gz 55602674 BLAKE2B da782a59bf2ae363ac639b43540883985b0ba1a42b1ab8f5438157a22b91f129e22d54dc4e95e6b817ea6b1edb35350883129254b6235f1e6d02739bd494a4bd SHA512 f8a65c52c4e6d9f72d8828c09bab719b1cb81173be4d661dc40925618054f1ef924af06c20d36d901feb8b17a0b7dc1cf55ab9d65e9c3829e34967063f854413
+EBUILD grafana-bin-7.5.10.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
 EBUILD grafana-bin-7.5.7.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
 EBUILD grafana-bin-7.5.9.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
 EBUILD grafana-bin-8.0.2.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
 EBUILD grafana-bin-8.0.5.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
+EBUILD grafana-bin-8.0.6.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/grafana-bin-7.5.10.ebuild b/www-apps/grafana-bin/grafana-bin-7.5.10.ebuild
new file mode 100644
index 000000000000..937332ec5f09
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-7.5.10.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/grafana
+	acct-user/grafana"
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_PREBUILT="usr/bin/grafana-*"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana-r1.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog "${PN} has built-in log rotation. Please see [log.file] section of"
+		elog "/etc/grafana/grafana.ini for related settings."
+		elog
+		elog "You may add your own custom configuration for app-admin/logrotate if you"
+		elog "wish to use external rotation of logs. In this case, you also need to make"
+		elog "sure the built-in rotation is turned off."
+	fi
+}
diff --git a/www-apps/grafana-bin/grafana-bin-8.0.6.ebuild b/www-apps/grafana-bin/grafana-bin-8.0.6.ebuild
new file mode 100644
index 000000000000..937332ec5f09
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-8.0.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/grafana
+	acct-user/grafana"
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_PREBUILT="usr/bin/grafana-*"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana-r1.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog "${PN} has built-in log rotation. Please see [log.file] section of"
+		elog "/etc/grafana/grafana.ini for related settings."
+		elog
+		elog "You may add your own custom configuration for app-admin/logrotate if you"
+		elog "wish to use external rotation of logs. In this case, you also need to make"
+		elog "sure the built-in rotation is turned off."
+	fi
+}
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index c21be6be1c32..f8a3ddcdba78 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -940,11 +940,11 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLA
 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 hugo-0.85.0.tar.gz 38968286 BLAKE2B 37f80c7ecea465b8fc7ee9b8a8467c90b22e3f88636ef6e10b09210c13c39c8d75983bedca4cbe6f0e0fae156129642669cc6e0e361712b23449520fb2aa419a SHA512 213ff0d1d87cca7ff87731216d0d0a80c2e5abbcca39a4222615a5a43f7f13f5456609ef47ab7d493a30af8ec65fb8dcfb21bcaacb43fc2d550178f5fe448966
 DIST hugo-0.86.0.tar.gz 39142083 BLAKE2B d260c908be3464f98bf49a61469c11eb0c76ef4aef1be4be171683796ae8d0b1eaae3785d1a542dab366395a1676baaae8c458c53213236d1787c92b15ec5954 SHA512 b6073ea67890b165e63fca48653f0ead03fe72cbdd557ecb98555ebbb22eb9133e36156d376ee9b2c9b739756efcc97c4f626a3a5c47cf520cfc02159f7949f2
+DIST hugo-0.86.1.tar.gz 39141633 BLAKE2B 2a19dbc88ce8405c00f202fc65187703b30ee91811992e2f43a3a45b8c7bcd4d567dedb6210a28da3a1af769f0ab15143989cc608fba17c1e6159a6a58b856e6 SHA512 cd97e7d3066d2c69f5bc5a16010ab7de3d4a92ed1e5a0093576d7210c8329eabdae045226f0d5f14d26fcdfa0c63c1aadf3ecbf10c494b2a675a377418c740f6
 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 hugo-0.85.0.ebuild 51639 BLAKE2B af5ec52e7649a912e825e4e8b601d300b11fd991164d9413eef5239bfa55548cab2bf0944439b0b0d5bdd4a951e04bb94d179fca7d2b4bbdb4b56a9bf03d5dfc SHA512 aecedbcc535e61cc8fe5e83d3d58fd47614409d0905cd1b23ee5eaaf1d01b25590bc892291dfbc13575a6bc9bfa01e359d8617f4e20fd92de1d6bd9ced4c4e73
 EBUILD hugo-0.86.0.ebuild 51639 BLAKE2B af5ec52e7649a912e825e4e8b601d300b11fd991164d9413eef5239bfa55548cab2bf0944439b0b0d5bdd4a951e04bb94d179fca7d2b4bbdb4b56a9bf03d5dfc SHA512 aecedbcc535e61cc8fe5e83d3d58fd47614409d0905cd1b23ee5eaaf1d01b25590bc892291dfbc13575a6bc9bfa01e359d8617f4e20fd92de1d6bd9ced4c4e73
+EBUILD hugo-0.86.1.ebuild 51631 BLAKE2B 5986f878dede65aba53531e86b93bf581a5c853a6815071cc11cdf7adbd1102b871a62c18a667648cf6294a9acbe4b708aaf16fbbfea68aaa70584d591b3912e SHA512 e9da87cb9a596b6efa2f105ffebd6f562887cdf558491f111bb8d8cc333a1f98fb99c7fd721a8a04ea09cd0108ef227132ba1ea43309e0df65c2cc98593d963f
 MISC metadata.xml 726 BLAKE2B dedf419edaeb32c30b19c00dc42027ee4621ee836b44df94a6a35d63396074f379088d48c5f8a99a68a23166d4e595e3cc81f03b281fe9118693931e22d7ea63 SHA512 d7d396fc8f553322e50809f42977da39e82a7b51c56e47b4b23c1ef99bb2e5b2928232a518cecf3059d48fbd2f8a83bbc54f3a23c7f614802f38db413924349c
diff --git a/www-apps/hugo/hugo-0.85.0.ebuild b/www-apps/hugo/hugo-0.85.0.ebuild
deleted file mode 100644
index 6fd2f589ad8e..000000000000
--- a/www-apps/hugo/hugo-0.85.0.ebuild
+++ /dev/null
@@ -1,995 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module bash-completion-r1
-
-DESCRIPTION="The world's fastest framework for building websites"
-HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
-
-EGO_SUM=(
-	"bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod"
-	"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.39.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.44.3/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.55.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.58.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/go.mod"
-	"cloud.google.com/go v0.74.0/go.mod"
-	"cloud.google.com/go v0.78.0/go.mod"
-	"cloud.google.com/go v0.79.0/go.mod"
-	"cloud.google.com/go v0.81.0"
-	"cloud.google.com/go v0.81.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/firestore v1.1.0/go.mod"
-	"cloud.google.com/go/firestore v1.2.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.9.0/go.mod"
-	"cloud.google.com/go/storage v1.10.0"
-	"cloud.google.com/go/storage v1.10.0/go.mod"
-	"contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod"
-	"contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod"
-	"contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod"
-	"contrib.go.opencensus.io/resource v0.1.1/go.mod"
-	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
-	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.2.1/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.2.2"
-	"github.com/Azure/azure-pipeline-go v0.2.2/go.mod"
-	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod"
-	"github.com/Azure/azure-service-bus-go v0.10.1/go.mod"
-	"github.com/Azure/azure-storage-blob-go v0.9.0"
-	"github.com/Azure/azure-storage-blob-go v0.9.0/go.mod"
-	"github.com/Azure/go-amqp v0.12.6/go.mod"
-	"github.com/Azure/go-amqp v0.12.7/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.3"
-	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.3"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69"
-	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-	"github.com/GeertJohan/go.incremental v1.0.0/go.mod"
-	"github.com/GeertJohan/go.rice v1.0.0/go.mod"
-	"github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/PuerkitoBio/purell v1.1.1"
-	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
-	"github.com/akavel/rsrc v0.8.0/go.mod"
-	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
-	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
-	"github.com/alecthomas/chroma v0.7.2-0.20200305040604-4f3623dce67a/go.mod"
-	"github.com/alecthomas/chroma v0.8.2/go.mod"
-	"github.com/alecthomas/chroma v0.9.1"
-	"github.com/alecthomas/chroma v0.9.1/go.mod"
-	"github.com/alecthomas/chroma v0.9.2"
-	"github.com/alecthomas/chroma v0.9.2/go.mod"
-	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
-	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
-	"github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod"
-	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod"
-	"github.com/alecthomas/kong v0.2.4/go.mod"
-	"github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod"
-	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
-	"github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1"
-	"github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/armon/go-radix v1.0.0"
-	"github.com/armon/go-radix v1.0.0/go.mod"
-	"github.com/aws/aws-sdk-go v1.15.27/go.mod"
-	"github.com/aws/aws-sdk-go v1.19.18/go.mod"
-	"github.com/aws/aws-sdk-go v1.31.13/go.mod"
-	"github.com/aws/aws-sdk-go v1.38.23"
-	"github.com/aws/aws-sdk-go v1.38.23/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/beorn7/perks v1.0.0/go.mod"
-	"github.com/bep/debounce v1.2.0"
-	"github.com/bep/debounce v1.2.0/go.mod"
-	"github.com/bep/gitmap v1.1.2"
-	"github.com/bep/gitmap v1.1.2/go.mod"
-	"github.com/bep/godartsass v0.12.0"
-	"github.com/bep/godartsass v0.12.0/go.mod"
-	"github.com/bep/golibsass v1.0.0"
-	"github.com/bep/golibsass v1.0.0/go.mod"
-	"github.com/bep/gowebp v0.1.0"
-	"github.com/bep/gowebp v0.1.0/go.mod"
-	"github.com/bep/tmc v0.5.1"
-	"github.com/bep/tmc v0.5.1/go.mod"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/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/cli/safeexec v1.0.0"
-	"github.com/cli/safeexec v1.0.0/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/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
-	"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
-	"github.com/coreos/bbolt v1.3.2/go.mod"
-	"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
-	"github.com/coreos/go-semver v0.3.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/daaku/go.zipexe v1.0.0/go.mod"
-	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
-	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
-	"github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/devigned/tab v0.1.1/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/disintegration/gift v1.2.1"
-	"github.com/disintegration/gift v1.2.1/go.mod"
-	"github.com/dlclark/regexp2 v1.1.6/go.mod"
-	"github.com/dlclark/regexp2 v1.2.0/go.mod"
-	"github.com/dlclark/regexp2 v1.4.0"
-	"github.com/dlclark/regexp2 v1.4.0/go.mod"
-	"github.com/dustin/go-humanize v1.0.0"
-	"github.com/dustin/go-humanize v1.0.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/go-control-plane v0.9.7/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/evanw/esbuild v0.11.16"
-	"github.com/evanw/esbuild v0.11.16/go.mod"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fortytw2/leaktest v1.3.0"
-	"github.com/fortytw2/leaktest v1.3.0/go.mod"
-	"github.com/frankban/quicktest v1.4.1/go.mod"
-	"github.com/frankban/quicktest v1.7.2/go.mod"
-	"github.com/frankban/quicktest v1.11.2/go.mod"
-	"github.com/frankban/quicktest v1.12.0"
-	"github.com/frankban/quicktest v1.12.0/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.9"
-	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
-	"github.com/getkin/kin-openapi v0.61.0"
-	"github.com/getkin/kin-openapi v0.61.0/go.mod"
-	"github.com/ghodss/yaml v1.0.0"
-	"github.com/ghodss/yaml v1.0.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-ini/ini v1.25.4/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-	"github.com/go-openapi/jsonpointer v0.19.5"
-	"github.com/go-openapi/jsonpointer v0.19.5/go.mod"
-	"github.com/go-openapi/swag v0.19.5"
-	"github.com/go-openapi/swag v0.19.5/go.mod"
-	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/gobuffalo/flect v0.2.2"
-	"github.com/gobuffalo/flect v0.2.2/go.mod"
-	"github.com/gobwas/glob v0.2.3"
-	"github.com/gobwas/glob v0.2.3/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013"
-	"github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013/go.mod"
-	"github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95"
-	"github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/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/mock v1.5.0/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.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/go.mod"
-	"github.com/golang/protobuf v1.5.0/go.mod"
-	"github.com/golang/protobuf v1.5.1/go.mod"
-	"github.com/golang/protobuf v1.5.2"
-	"github.com/golang/protobuf v1.5.2/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.3/go.mod"
-	"github.com/google/go-cmp v0.5.4/go.mod"
-	"github.com/google/go-cmp v0.5.5"
-	"github.com/google/go-cmp v0.5.5/go.mod"
-	"github.com/google/go-replayers/grpcreplay v0.1.0"
-	"github.com/google/go-replayers/grpcreplay v0.1.0/go.mod"
-	"github.com/google/go-replayers/httpreplay v0.1.0"
-	"github.com/google/go-replayers/httpreplay v0.1.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible"
-	"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod"
-	"github.com/google/martian/v3 v3.0.0/go.mod"
-	"github.com/google/martian/v3 v3.1.0"
-	"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-20200507031123-427632fa3b1c/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/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
-	"github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
-	"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
-	"github.com/google/renameio v0.1.0/go.mod"
-	"github.com/google/subcommands v1.0.1/go.mod"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/google/uuid v1.1.2"
-	"github.com/google/uuid v1.1.2/go.mod"
-	"github.com/google/wire v0.4.0"
-	"github.com/google/wire v0.4.0/go.mod"
-	"github.com/googleapis/gax-go v2.0.2+incompatible"
-	"github.com/googleapis/gax-go v2.0.2+incompatible/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/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorilla/csrf v1.6.0/go.mod"
-	"github.com/gorilla/handlers v1.4.1/go.mod"
-	"github.com/gorilla/mux v1.7.3/go.mod"
-	"github.com/gorilla/mux v1.8.0/go.mod"
-	"github.com/gorilla/securecookie v1.1.1/go.mod"
-	"github.com/gorilla/websocket v1.4.2"
-	"github.com/gorilla/websocket v1.4.2/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
-	"github.com/hashicorp/consul/api v1.1.0/go.mod"
-	"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/hashicorp/go.net v0.0.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/hcl v1.0.0"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/hashicorp/logutils v1.0.0/go.mod"
-	"github.com/hashicorp/mdns v1.0.0/go.mod"
-	"github.com/hashicorp/memberlist v0.1.3/go.mod"
-	"github.com/hashicorp/serf v0.8.2/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/inconshreveable/mousetrap v1.0.0"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/jdkato/prose v1.2.1"
-	"github.com/jdkato/prose v1.2.1/go.mod"
-	"github.com/jessevdk/go-flags v1.4.0/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
-	"github.com/jmespath/go-jmespath v0.4.0"
-	"github.com/jmespath/go-jmespath v0.4.0/go.mod"
-	"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
-	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
-	"github.com/joho/godotenv v1.3.0/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jstemmer/go-junit-report v0.9.1"
-	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
-	"github.com/jtolds/gls v4.20.0+incompatible"
-	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/kr/fs v0.1.0/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pretty v0.2.1"
-	"github.com/kr/pretty v0.2.1/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kylelemons/godebug v1.1.0"
-	"github.com/kylelemons/godebug v1.1.0/go.mod"
-	"github.com/kyokomi/emoji/v2 v2.2.8"
-	"github.com/kyokomi/emoji/v2 v2.2.8/go.mod"
-	"github.com/lib/pq v1.1.1/go.mod"
-	"github.com/magefile/mage v1.11.0"
-	"github.com/magefile/mage v1.11.0/go.mod"
-	"github.com/magiconair/properties v1.8.1"
-	"github.com/magiconair/properties v1.8.1/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e"
-	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
-	"github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.6/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.1"
-	"github.com/mattn/go-ieproxy v0.0.1/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.9"
-	"github.com/mattn/go-runewidth v0.0.9/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/miekg/dns v1.0.14/go.mod"
-	"github.com/miekg/mmark v1.3.6"
-	"github.com/miekg/mmark v1.3.6/go.mod"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/gox v0.4.0/go.mod"
-	"github.com/mitchellh/hashstructure v1.0.0"
-	"github.com/mitchellh/hashstructure v1.0.0/go.mod"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/mitchellh/mapstructure v1.3.3"
-	"github.com/mitchellh/mapstructure v1.3.3/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/montanaflynn/stats v0.6.3/go.mod"
-	"github.com/muesli/smartcrop v0.3.0"
-	"github.com/muesli/smartcrop v0.3.0/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/neurosnap/sentences v1.0.6/go.mod"
-	"github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646"
-	"github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod"
-	"github.com/niklasfasching/go-org v1.5.0"
-	"github.com/niklasfasching/go-org v1.5.0/go.mod"
-	"github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod"
-	"github.com/oklog/ulid v1.3.1/go.mod"
-	"github.com/olekukonko/tablewriter v0.0.5"
-	"github.com/olekukonko/tablewriter v0.0.5/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/pelletier/go-toml v1.2.0/go.mod"
-	"github.com/pelletier/go-toml v1.9.0"
-	"github.com/pelletier/go-toml v1.9.0/go.mod"
-	"github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pkg/sftp v1.10.1/go.mod"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.3/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-	"github.com/prometheus/common v0.4.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-	"github.com/prometheus/tsdb v0.7.1/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-	"github.com/rogpeppe/go-internal v1.8.0"
-	"github.com/rogpeppe/go-internal v1.8.0/go.mod"
-	"github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6"
-	"github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd"
-	"github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod"
-	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-	"github.com/sanity-io/litter v1.5.0"
-	"github.com/sanity-io/litter v1.5.0/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/sergi/go-diff v1.0.0"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shogo82148/go-shuffle v0.0.0-20180218125048-27e6095f230d/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/goconvey v1.6.4"
-	"github.com/smartystreets/goconvey v1.6.4/go.mod"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-	"github.com/spf13/afero v1.1.2/go.mod"
-	"github.com/spf13/afero v1.6.0"
-	"github.com/spf13/afero v1.6.0/go.mod"
-	"github.com/spf13/cast v1.3.0/go.mod"
-	"github.com/spf13/cast v1.3.1"
-	"github.com/spf13/cast v1.3.1/go.mod"
-	"github.com/spf13/cobra v1.1.3"
-	"github.com/spf13/cobra v1.1.3/go.mod"
-	"github.com/spf13/fsync v0.9.0"
-	"github.com/spf13/fsync v0.9.0/go.mod"
-	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-	"github.com/spf13/jwalterweatherman v1.1.0"
-	"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/spf13/viper v1.7.0"
-	"github.com/spf13/viper v1.7.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/objx v0.2.0/go.mod"
-	"github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/stretchr/testify v1.5.1/go.mod"
-	"github.com/stretchr/testify v1.6.1"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"github.com/subosito/gotenv v1.2.0"
-	"github.com/subosito/gotenv v1.2.0/go.mod"
-	"github.com/tdewolff/minify/v2 v2.9.16"
-	"github.com/tdewolff/minify/v2 v2.9.16/go.mod"
-	"github.com/tdewolff/minify/v2 v2.9.18"
-	"github.com/tdewolff/minify/v2 v2.9.18/go.mod"
-	"github.com/tdewolff/parse/v2 v2.5.14"
-	"github.com/tdewolff/parse/v2 v2.5.14/go.mod"
-	"github.com/tdewolff/parse/v2 v2.5.18"
-	"github.com/tdewolff/parse/v2 v2.5.18/go.mod"
-	"github.com/tdewolff/test v1.0.6"
-	"github.com/tdewolff/test v1.0.6/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-	"github.com/valyala/bytebufferpool v1.0.0/go.mod"
-	"github.com/valyala/fasttemplate v1.0.1/go.mod"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-	"github.com/yuin/goldmark v1.1.22/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"
-	"github.com/yuin/goldmark v1.3.8"
-	"github.com/yuin/goldmark v1.3.8/go.mod"
-	"github.com/yuin/goldmark v1.3.9"
-	"github.com/yuin/goldmark v1.3.9/go.mod"
-	"github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691"
-	"github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691/go.mod"
-	"go.etcd.io/bbolt v1.3.2/go.mod"
-	"go.opencensus.io v0.15.0/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.mod"
-	"go.opencensus.io v0.23.0"
-	"go.opencensus.io v0.23.0/go.mod"
-	"go.uber.org/atomic v1.4.0/go.mod"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/zap v1.10.0/go.mod"
-	"gocloud.dev v0.20.0"
-	"gocloud.dev v0.20.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-	"golang.org/x/crypto v0.0.0-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-20190820162420-60c769a6c586/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/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/image v0.0.0-20210220032944-ac19c3e999fb"
-	"golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/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/lint v0.0.0-20201208152925-83fdc39ff7b5"
-	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/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/mod v0.4.0/go.mod"
-	"golang.org/x/mod v0.4.1"
-	"golang.org/x/mod v0.4.1/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-20181023162649-9b4f9f5ad519/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/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-20190813141303-74dc4d7220e7/go.mod"
-	"golang.org/x/net v0.0.0-20191112182307-2180aed22343/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-20200602114024-627f9648deb9/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-20201110031124-69a78807bb2b/go.mod"
-	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
-	"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
-	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
-	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4"
-	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/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-20190402181905-9f3314589c9a/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/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78"
-	"golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/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/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
-	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
-	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
-	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/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-20191005200804-aed5e4c7ecf9/go.mod"
-	"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/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-20200317113312-5766fd39f98d/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-20200413165638-669c56c373c4/go.mod"
-	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
-	"golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/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-20200602225109-6fdc65e7d980/go.mod"
-	"golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/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/go.mod"
-	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
-	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
-	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
-	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
-	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
-	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
-	"golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750"
-	"golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750/go.mod"
-	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007"
-	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/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/go.mod"
-	"golang.org/x/text v0.3.5/go.mod"
-	"golang.org/x/text v0.3.6"
-	"golang.org/x/text v0.3.6/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-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-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/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-20191112195655-aa38f8e97acc/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-20200317043434-63da46f3035e/go.mod"
-	"golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/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-20200601175630-2caf76543d99/go.mod"
-	"golang.org/x/tools v0.0.0-20200606014950-c42cb6316fb6/go.mod"
-	"golang.org/x/tools v0.0.0-20200608174601-1b747fd94509/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/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
-	"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
-	"golang.org/x/tools v0.1.0"
-	"golang.org/x/tools v0.1.0/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.5.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.26.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/go.mod"
-	"google.golang.org/api v0.40.0/go.mod"
-	"google.golang.org/api v0.41.0/go.mod"
-	"google.golang.org/api v0.43.0/go.mod"
-	"google.golang.org/api v0.45.0"
-	"google.golang.org/api v0.45.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-20190508193815-b515fa19cec8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/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-20200317114155-1f3552e48f24/go.mod"
-	"google.golang.org/genproto v0.0.0-20200325114520-5b2d0af7952b/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-20200603110839-e855014d5736/go.mod"
-	"google.golang.org/genproto v0.0.0-20200608115520-7c474a2e3482/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/go.mod"
-	"google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
-	"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
-	"google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
-	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
-	"google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
-	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
-	"google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod"
-	"google.golang.org/genproto v0.0.0-20210413151531-c14fb6ef47c3"
-	"google.golang.org/genproto v0.0.0-20210413151531-c14fb6ef47c3/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.0/go.mod"
-	"google.golang.org/grpc v1.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/go.mod"
-	"google.golang.org/grpc v1.34.0/go.mod"
-	"google.golang.org/grpc v1.35.0/go.mod"
-	"google.golang.org/grpc v1.36.0/go.mod"
-	"google.golang.org/grpc v1.36.1/go.mod"
-	"google.golang.org/grpc v1.37.0"
-	"google.golang.org/grpc v1.37.0/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-	"google.golang.org/protobuf v1.21.0/go.mod"
-	"google.golang.org/protobuf v1.22.0/go.mod"
-	"google.golang.org/protobuf v1.23.0/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/go.mod"
-	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
-	"google.golang.org/protobuf v1.26.0"
-	"google.golang.org/protobuf v1.26.0/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"gopkg.in/ini.v1 v1.51.0/go.mod"
-	"gopkg.in/ini.v1 v1.51.1"
-	"gopkg.in/ini.v1 v1.51.1/go.mod"
-	"gopkg.in/neurosnap/sentences.v1 v1.0.6/go.mod"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"gopkg.in/yaml.v2 v2.3.0/go.mod"
-	"gopkg.in/yaml.v2 v2.4.0"
-	"gopkg.in/yaml.v2 v2.4.0/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-	"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/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}
-"
-
-LICENSE="Apache-2.0 Unlicense BSD BSD-2 MPL-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +sass"
-
-BDEPEND=">=dev-lang/go-1.16.0"
-
-src_compile() {
-	mkdir -pv bin || die
-	go build -ldflags \
-		"-X ${EGO_PN}/hugolib.CommitHash=${GIT_COMMIT}" \
-		$(usex sass "-tags extended" "") -o "${S}/bin/hugo" || die
-
-	bin/hugo gen man --dir man || die
-	bin/hugo gen autocomplete --completionfile hugo || die
-
-	if use doc ; then
-		bin/hugo gen doc --dir doc || die
-	fi
-}
-
-src_install() {
-	dobin bin/*
-	doman man/*
-	dobashcomp hugo
-
-	if use doc ; then
-		dodoc -r doc/*
-	fi
-}
diff --git a/www-apps/hugo/hugo-0.86.1.ebuild b/www-apps/hugo/hugo-0.86.1.ebuild
new file mode 100644
index 000000000000..5100663eae61
--- /dev/null
+++ b/www-apps/hugo/hugo-0.86.1.ebuild
@@ -0,0 +1,995 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module bash-completion-r1
+
+DESCRIPTION="The world's fastest framework for building websites"
+HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
+
+EGO_SUM=(
+	"bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod"
+	"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.39.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.44.3/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.55.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.58.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/go.mod"
+	"cloud.google.com/go v0.74.0/go.mod"
+	"cloud.google.com/go v0.78.0/go.mod"
+	"cloud.google.com/go v0.79.0/go.mod"
+	"cloud.google.com/go v0.81.0"
+	"cloud.google.com/go v0.81.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/firestore v1.1.0/go.mod"
+	"cloud.google.com/go/firestore v1.2.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.9.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod"
+	"contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod"
+	"contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod"
+	"contrib.go.opencensus.io/resource v0.1.1/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod"
+	"github.com/Azure/azure-pipeline-go v0.2.1/go.mod"
+	"github.com/Azure/azure-pipeline-go v0.2.2"
+	"github.com/Azure/azure-pipeline-go v0.2.2/go.mod"
+	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod"
+	"github.com/Azure/azure-service-bus-go v0.10.1/go.mod"
+	"github.com/Azure/azure-storage-blob-go v0.9.0"
+	"github.com/Azure/azure-storage-blob-go v0.9.0/go.mod"
+	"github.com/Azure/go-amqp v0.12.6/go.mod"
+	"github.com/Azure/go-amqp v0.12.7/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.3"
+	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.3"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69"
+	"github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/GeertJohan/go.incremental v1.0.0/go.mod"
+	"github.com/GeertJohan/go.rice v1.0.0/go.mod"
+	"github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+	"github.com/akavel/rsrc v0.8.0/go.mod"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
+	"github.com/alecthomas/chroma v0.7.2-0.20200305040604-4f3623dce67a/go.mod"
+	"github.com/alecthomas/chroma v0.8.2/go.mod"
+	"github.com/alecthomas/chroma v0.9.1"
+	"github.com/alecthomas/chroma v0.9.1/go.mod"
+	"github.com/alecthomas/chroma v0.9.2"
+	"github.com/alecthomas/chroma v0.9.2/go.mod"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
+	"github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod"
+	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod"
+	"github.com/alecthomas/kong v0.2.4/go.mod"
+	"github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
+	"github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1"
+	"github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.27/go.mod"
+	"github.com/aws/aws-sdk-go v1.19.18/go.mod"
+	"github.com/aws/aws-sdk-go v1.31.13/go.mod"
+	"github.com/aws/aws-sdk-go v1.38.23"
+	"github.com/aws/aws-sdk-go v1.38.23/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/bep/debounce v1.2.0"
+	"github.com/bep/debounce v1.2.0/go.mod"
+	"github.com/bep/gitmap v1.1.2"
+	"github.com/bep/gitmap v1.1.2/go.mod"
+	"github.com/bep/godartsass v0.12.0"
+	"github.com/bep/godartsass v0.12.0/go.mod"
+	"github.com/bep/golibsass v1.0.0"
+	"github.com/bep/golibsass v1.0.0/go.mod"
+	"github.com/bep/gowebp v0.1.0"
+	"github.com/bep/gowebp v0.1.0/go.mod"
+	"github.com/bep/tmc v0.5.1"
+	"github.com/bep/tmc v0.5.1/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/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/cli/safeexec v1.0.0"
+	"github.com/cli/safeexec v1.0.0/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/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/daaku/go.zipexe v1.0.0/go.mod"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
+	"github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/devigned/tab v0.1.1/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/disintegration/gift v1.2.1"
+	"github.com/disintegration/gift v1.2.1/go.mod"
+	"github.com/dlclark/regexp2 v1.1.6/go.mod"
+	"github.com/dlclark/regexp2 v1.2.0/go.mod"
+	"github.com/dlclark/regexp2 v1.4.0"
+	"github.com/dlclark/regexp2 v1.4.0/go.mod"
+	"github.com/dustin/go-humanize v1.0.0"
+	"github.com/dustin/go-humanize v1.0.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/go-control-plane v0.9.7/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanw/esbuild v0.11.16"
+	"github.com/evanw/esbuild v0.11.16/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fortytw2/leaktest v1.3.0"
+	"github.com/fortytw2/leaktest v1.3.0/go.mod"
+	"github.com/frankban/quicktest v1.4.1/go.mod"
+	"github.com/frankban/quicktest v1.7.2/go.mod"
+	"github.com/frankban/quicktest v1.11.2/go.mod"
+	"github.com/frankban/quicktest v1.12.0"
+	"github.com/frankban/quicktest v1.12.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/getkin/kin-openapi v0.61.0"
+	"github.com/getkin/kin-openapi v0.61.0/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.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-ini/ini v1.25.4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.5"
+	"github.com/go-openapi/jsonpointer v0.19.5/go.mod"
+	"github.com/go-openapi/swag v0.19.5"
+	"github.com/go-openapi/swag v0.19.5/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobuffalo/flect v0.2.2"
+	"github.com/gobuffalo/flect v0.2.2/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013"
+	"github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013/go.mod"
+	"github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95"
+	"github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/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/mock v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.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/go.mod"
+	"github.com/golang/protobuf v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.5.1/go.mod"
+	"github.com/golang/protobuf v1.5.2"
+	"github.com/golang/protobuf v1.5.2/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.3/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-replayers/grpcreplay v0.1.0"
+	"github.com/google/go-replayers/grpcreplay v0.1.0/go.mod"
+	"github.com/google/go-replayers/httpreplay v0.1.0"
+	"github.com/google/go-replayers/httpreplay v0.1.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible"
+	"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/martian/v3 v3.1.0"
+	"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-20200507031123-427632fa3b1c/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/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
+	"github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
+	"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/subcommands v1.0.1/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/google/wire v0.4.0"
+	"github.com/google/wire v0.4.0/go.mod"
+	"github.com/googleapis/gax-go v2.0.2+incompatible"
+	"github.com/googleapis/gax-go v2.0.2+incompatible/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/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/csrf v1.6.0/go.mod"
+	"github.com/gorilla/handlers v1.4.1/go.mod"
+	"github.com/gorilla/mux v1.7.3/go.mod"
+	"github.com/gorilla/mux v1.8.0/go.mod"
+	"github.com/gorilla/securecookie v1.1.1/go.mod"
+	"github.com/gorilla/websocket v1.4.2"
+	"github.com/gorilla/websocket v1.4.2/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/hashicorp/consul/api v1.1.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/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/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jdkato/prose v1.2.1"
+	"github.com/jdkato/prose v1.2.1/go.mod"
+	"github.com/jessevdk/go-flags v1.4.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.4.0"
+	"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+	"github.com/joho/godotenv v1.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/fs v0.1.0/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.1"
+	"github.com/kr/pretty v0.2.1/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/kyokomi/emoji/v2 v2.2.8"
+	"github.com/kyokomi/emoji/v2 v2.2.8/go.mod"
+	"github.com/lib/pq v1.1.1/go.mod"
+	"github.com/magefile/mage v1.11.0"
+	"github.com/magefile/mage v1.11.0/go.mod"
+	"github.com/magiconair/properties v1.8.1"
+	"github.com/magiconair/properties v1.8.1/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e"
+	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+	"github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
+	"github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod"
+	"github.com/mattn/go-ieproxy v0.0.1"
+	"github.com/mattn/go-ieproxy v0.0.1/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/miekg/mmark v1.3.6"
+	"github.com/miekg/mmark v1.3.6/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/hashstructure v1.0.0"
+	"github.com/mitchellh/hashstructure v1.0.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.3.3"
+	"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/montanaflynn/stats v0.6.3/go.mod"
+	"github.com/muesli/smartcrop v0.3.0"
+	"github.com/muesli/smartcrop v0.3.0/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/neurosnap/sentences v1.0.6/go.mod"
+	"github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646"
+	"github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod"
+	"github.com/niklasfasching/go-org v1.5.0"
+	"github.com/niklasfasching/go-org v1.5.0/go.mod"
+	"github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.5"
+	"github.com/olekukonko/tablewriter v0.0.5/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.9.0"
+	"github.com/pelletier/go-toml v1.9.0/go.mod"
+	"github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/sftp v1.10.1/go.mod"
+	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.8.0"
+	"github.com/rogpeppe/go-internal v1.8.0/go.mod"
+	"github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6"
+	"github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd"
+	"github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/sanity-io/litter v1.5.0"
+	"github.com/sanity-io/litter v1.5.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shogo82148/go-shuffle v0.0.0-20180218125048-27e6095f230d/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.6.0"
+	"github.com/spf13/afero v1.6.0/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cast v1.3.1"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cobra v1.1.3"
+	"github.com/spf13/cobra v1.1.3/go.mod"
+	"github.com/spf13/fsync v0.9.0"
+	"github.com/spf13/fsync v0.9.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.1.0"
+	"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.7.0"
+	"github.com/spf13/viper v1.7.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/subosito/gotenv v1.2.0"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/tdewolff/minify/v2 v2.9.16"
+	"github.com/tdewolff/minify/v2 v2.9.16/go.mod"
+	"github.com/tdewolff/minify/v2 v2.9.18"
+	"github.com/tdewolff/minify/v2 v2.9.18/go.mod"
+	"github.com/tdewolff/parse/v2 v2.5.14"
+	"github.com/tdewolff/parse/v2 v2.5.14/go.mod"
+	"github.com/tdewolff/parse/v2 v2.5.18"
+	"github.com/tdewolff/parse/v2 v2.5.18/go.mod"
+	"github.com/tdewolff/test v1.0.6"
+	"github.com/tdewolff/test v1.0.6/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/valyala/bytebufferpool v1.0.0/go.mod"
+	"github.com/valyala/fasttemplate v1.0.1/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/yuin/goldmark v1.1.22/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"
+	"github.com/yuin/goldmark v1.3.8"
+	"github.com/yuin/goldmark v1.3.8/go.mod"
+	"github.com/yuin/goldmark v1.3.9"
+	"github.com/yuin/goldmark v1.3.9/go.mod"
+	"github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691"
+	"github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.opencensus.io v0.15.0/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.mod"
+	"go.opencensus.io v0.23.0"
+	"go.opencensus.io v0.23.0/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"gocloud.dev v0.20.0"
+	"gocloud.dev v0.20.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-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-20190820162420-60c769a6c586/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/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/image v0.0.0-20210220032944-ac19c3e999fb"
+	"golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/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/lint v0.0.0-20201208152925-83fdc39ff7b5"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/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/mod v0.4.0/go.mod"
+	"golang.org/x/mod v0.4.1"
+	"golang.org/x/mod v0.4.1/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-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/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-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20191112182307-2180aed22343/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-20200602114024-627f9648deb9/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-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+	"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4"
+	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/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-20190402181905-9f3314589c9a/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/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78"
+	"golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/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/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/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-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/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-20200317113312-5766fd39f98d/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-20200413165638-669c56c373c4/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/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-20200602225109-6fdc65e7d980/go.mod"
+	"golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/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/go.mod"
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
+	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750"
+	"golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750/go.mod"
+	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007"
+	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/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/go.mod"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/text v0.3.6"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-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-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/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-20191112195655-aa38f8e97acc/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-20200317043434-63da46f3035e/go.mod"
+	"golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/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-20200601175630-2caf76543d99/go.mod"
+	"golang.org/x/tools v0.0.0-20200606014950-c42cb6316fb6/go.mod"
+	"golang.org/x/tools v0.0.0-20200608174601-1b747fd94509/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/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
+	"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
+	"golang.org/x/tools v0.1.0"
+	"golang.org/x/tools v0.1.0/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.5.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.26.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/go.mod"
+	"google.golang.org/api v0.40.0/go.mod"
+	"google.golang.org/api v0.41.0/go.mod"
+	"google.golang.org/api v0.43.0/go.mod"
+	"google.golang.org/api v0.45.0"
+	"google.golang.org/api v0.45.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-20190508193815-b515fa19cec8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/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-20200317114155-1f3552e48f24/go.mod"
+	"google.golang.org/genproto v0.0.0-20200325114520-5b2d0af7952b/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-20200603110839-e855014d5736/go.mod"
+	"google.golang.org/genproto v0.0.0-20200608115520-7c474a2e3482/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/go.mod"
+	"google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
+	"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
+	"google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
+	"google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
+	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
+	"google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod"
+	"google.golang.org/genproto v0.0.0-20210413151531-c14fb6ef47c3"
+	"google.golang.org/genproto v0.0.0-20210413151531-c14fb6ef47c3/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.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/go.mod"
+	"google.golang.org/grpc v1.34.0/go.mod"
+	"google.golang.org/grpc v1.35.0/go.mod"
+	"google.golang.org/grpc v1.36.0/go.mod"
+	"google.golang.org/grpc v1.36.1/go.mod"
+	"google.golang.org/grpc v1.37.0"
+	"google.golang.org/grpc v1.37.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/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/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"google.golang.org/protobuf v1.26.0"
+	"google.golang.org/protobuf v1.26.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/ini.v1 v1.51.0/go.mod"
+	"gopkg.in/ini.v1 v1.51.1"
+	"gopkg.in/ini.v1 v1.51.1/go.mod"
+	"gopkg.in/neurosnap/sentences.v1 v1.0.6/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"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/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+"
+
+LICENSE="Apache-2.0 Unlicense BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +sass"
+
+BDEPEND=">=dev-lang/go-1.16.0"
+
+src_compile() {
+	mkdir -pv bin || die
+	go build -ldflags \
+		"-X ${EGO_PN}/hugolib.CommitHash=${GIT_COMMIT}" \
+		$(usex sass "-tags extended" "") -o "${S}/bin/hugo" || die
+
+	bin/hugo gen man --dir man || die
+	bin/hugo gen autocomplete --completionfile hugo || die
+
+	if use doc ; then
+		bin/hugo gen doc --dir doc || die
+	fi
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+	dobashcomp hugo
+
+	if use doc ; then
+		dodoc -r doc/*
+	fi
+}
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 732d9ad57358..5ba6e8ef7265 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,8 +1,12 @@
 DIST icingaweb2-2.8.2.tar.gz 8514166 BLAKE2B 7e6a44574999967a6a728c5818999ac6f15234f1cfd1415132e1a8219e897affddd4d4ec488bb90ced82a0ce5403220463ccfa0424014a4c090176d85fd968a9 SHA512 252ecb36751add239897b6344dd622542f892b1850398fe724d0ab91e8d691cefe0b33c727c28aa630c93b76b381aabe69721db034c4de0518f346bbd5b698de
 DIST icingaweb2-2.8.3.tar.gz 8514052 BLAKE2B 507753833ed8a0de816651f3fdb06f3fdf04b3fa9c43fad5046c28924c93f3c3e491d9a4e1532f08ac0d6abe97c1343b85cdb23de9ece9f16858b91886283e9c SHA512 236385dc54dbd11d8e100059bb7e29b3a4efc23888f187e13e563510dfb1f3d20e5c4107e2dadfa6842e6689aaa21d4e9465abd0a234c52229354f43ec44cfb4
+DIST icingaweb2-2.8.4.tar.gz 8514585 BLAKE2B 1c331d45152a94dcaf21509e36ecd9c90c840f41bf14d102910e65fce28994bb7db3319c39e5d5740638a673c74b84b54d803b97d91cb8968260174b2437a7ca SHA512 7f136f7901db8398fab85fef079d4e5af1662c13c5c107d3c1c10e022186bdca29d3b144f937e40e470975b97bd98215ec3e0c7f2b6127a6a74143fbe0e1882c
 DIST icingaweb2-2.9.0.tar.gz 10895850 BLAKE2B cf0f1375e3eb29ddbbf6691afd1c240ae1431b7dd82bd591dd3fe135602d1eabc418c6279fe7bd8f8e519f264b69a9da8bb1d09d286f37aa2f7e5ed21ddacd5a SHA512 d8f2817c025160cd8f59f33d678ca6eea9b893b80ca5c45c719d8778269da46322e720a1c73d7bcd7be73a07f08dbe279ffb78220f2a6c00f7e07e9f0f88d4d4
+DIST icingaweb2-2.9.2.tar.gz 12304718 BLAKE2B ba5d0872318a504d25b614825008e90cabd4680b30686d90ad438408e4a248f9dc2ef9410c5405da7efac949c6c41d89c64604b18c6d86f9ba479c99a8daff9a SHA512 67268544db0c267f9522b2105db52d87967835279eb621b79827b7b1b80a327b69348c849e4d3716a9cd26dfaef31a06b5ba125d30a48c3f5686dcf4c7a7a959
 EBUILD icingaweb2-2.8.2-r1.ebuild 2309 BLAKE2B 3fcaed75fcbb6cd194810b19f9a1f47394a4a4e41aff82598152b224f937faa156a8142e63018e140c430be2fc38deb2f86e09001540fd2ea85dd252d9f21882 SHA512 ce4a4933dc9c5e6a05639be9c92199cf83a5a9690f5fde5fac7a9ba68c816308d7c0977544bdf8b0d04124ebd5df13ef54393c0e984d15fdc937f735e7327a0a
 EBUILD icingaweb2-2.8.3.ebuild 2311 BLAKE2B fa669bbc37e8a8445563d4a1b248be139030ab8807b272efdd720abaeb2aa2904c4befbb2699582114232bb247673e46589800b7e74cb53bf9803f4af6bf0c65 SHA512 b68aacddeba57332a45ea1382d4e8d1272f5ab38611e175865836335b382a27fda740aa834b777b0a070abc3d1a38b560426bf2455adddd020346e727d9f0ffb
+EBUILD icingaweb2-2.8.4.ebuild 2311 BLAKE2B fa669bbc37e8a8445563d4a1b248be139030ab8807b272efdd720abaeb2aa2904c4befbb2699582114232bb247673e46589800b7e74cb53bf9803f4af6bf0c65 SHA512 b68aacddeba57332a45ea1382d4e8d1272f5ab38611e175865836335b382a27fda740aa834b777b0a070abc3d1a38b560426bf2455adddd020346e727d9f0ffb
 EBUILD icingaweb2-2.9.0.ebuild 2410 BLAKE2B 5308c70815caf5d6246345ef85953dbced9f959d936504296e05aabf54047dbda5a5b4645c7656fefa19aaec26699412df47335e983acdfb3699c916beb13583 SHA512 9b37521628b155a9cf17da90c2690c106dbda1f0b5b3155687bc854b4304505e490d3636e3acf30270b112e863825b364c7d6071fbdfdcc436bb6095e7ecb0e6
+EBUILD icingaweb2-2.9.2.ebuild 2410 BLAKE2B 5308c70815caf5d6246345ef85953dbced9f959d936504296e05aabf54047dbda5a5b4645c7656fefa19aaec26699412df47335e983acdfb3699c916beb13583 SHA512 9b37521628b155a9cf17da90c2690c106dbda1f0b5b3155687bc854b4304505e490d3636e3acf30270b112e863825b364c7d6071fbdfdcc436bb6095e7ecb0e6
 EBUILD icingaweb2-9999.ebuild 2311 BLAKE2B fa669bbc37e8a8445563d4a1b248be139030ab8807b272efdd720abaeb2aa2904c4befbb2699582114232bb247673e46589800b7e74cb53bf9803f4af6bf0c65 SHA512 b68aacddeba57332a45ea1382d4e8d1272f5ab38611e175865836335b382a27fda740aa834b777b0a070abc3d1a38b560426bf2455adddd020346e727d9f0ffb
 MISC metadata.xml 443 BLAKE2B 408760755558425f54f2a06aace2d16f0dfb1f585b9226d5745e69dddd020116ffe8f64f475205ed5454f1cac25b3c3ade29aad2e404d39bccc0697be89287f1 SHA512 81020a9b2ca89e23526a3d46de4f845ab433c66989db2483a9cfdfb8ae998c00b24b7acb8211c3041d43685742bd6f2f58762d0ac93608263c0cdfe83bba4128
diff --git a/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild
new file mode 100644
index 000000000000..c5f119e375d9
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit depend.apache multilib
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
+REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2-server? ( >=www-servers/apache-2.4.0 )
+		nginx? ( >=www-servers/nginx-1.7.0:* )
+		|| (
+			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+		)
+		acct-group/icingacmd
+		acct-group/icingaweb2"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/icingaweb2/icingaweb2-2.9.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.9.2.ebuild
new file mode 100644
index 000000000000..84db9d6e0716
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.9.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit depend.apache multilib
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
+REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2-server? ( >=www-servers/apache-2.4.0 )
+		nginx? ( >=www-servers/nginx-1.7.0:* )
+		|| (
+			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+		)
+		acct-group/icingacmd
+		acct-group/icingaweb2"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 2aa4777c28c0..187614616965 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,17 +1,23 @@
 AUX kibana.confd 72 BLAKE2B 786203cfc47132fedb989fbcaebc799ed566e15f2b0ced9657980269906a0395ffd6287d8b89ce41fd437086173177a9727daa2cd03de8bda26045c013f7c6dc SHA512 7dfb5c2e99e48227a95ac405fdf9f1ffdf20f7173c5a211a1aedf73b2e2ac37b7f428e5e3c7b713b78433cc9ea7bbfac723477c4497a6cb18ed787d42d8faddd
 AUX kibana.initd 1019 BLAKE2B f57bce1793768f2936dc8cd3437aacbb4d4e034ac53612f01064cd5bcec7449a968242368abc3144f6436d8765c1738e7786147cbc1ecabed9c734035daf4669 SHA512 e5fd56da7fc83466c26acdbd3e9aa341676ac9221495f6f83c46263838c15951164d31ac7e62b732fba1c0e63c6e5c2c97681b15ac5409b74a5c090f72ae6383
+AUX kibana.initd-r1 1126 BLAKE2B bf5fbfec39cc4961269900f2ef6b55b2c3cd2bf5134db12055eeaad4e6a2d71d8d2f8cb0a28e88f9733d142cad706839378b9c800ef6552f4d78305ee83b55f0 SHA512 6f36729960a80f7325a0bff3ca39d0ac9fa48d85a6b122d1ed869ca3470eb347301f22ed1b6604f1bb68daf24d789e898f4f95d02472294d5810c92ac4a83687
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
 DIST kibana-6.8.15-linux-x86_64.tar.gz 188083650 BLAKE2B ce12b1f564f9059952402d53a43c4e2b5a550b69b8835460f870fdf772ce8881325239165677659f6bfc295e148831b3e0459e7a059f73d03e218260c8e5139e SHA512 7afbcd42f332b281106fc58397d7229aa3e3ac38aa9ffcd5d7e3edf32b084f6bf812eac002166099b4e270019651a0d6cb3a9ea06f93f5927c4b4329eb36a14e
 DIST kibana-6.8.16-linux-x86_64.tar.gz 185438137 BLAKE2B 50870e1b15f190210502d9df498b2d2d88de8055f81dba5cc424963419a950710ce85aadf0f65c539322583f09aae70dce224eea8763061e745fb4f3ce02ad38 SHA512 55a9f615eaf0f67704f8704211f2bff06d6f085f789c75dde2df95061632b0be5ceb3614eb4e38a602531b4c482ed3f8f303b902e08422e0556a8b19aaccecf3
+DIST kibana-6.8.17-linux-x86_64.tar.gz 186139184 BLAKE2B 4b6bead148e9d222f5631ad24a81d6d5b84972c3c2dc4d8010fd4081179251365289858e8f60d8930c20653df6ee502a8833146613cb0195a0cd2bf6ccd5114d SHA512 50ae600ab3b6d69d11e86c84124eea6fd5c2f756c6c961c6f45f32ea3a65f0c29b249a4229dc9cfd6b7a64383efc21cd4bb53c44265ccd9109c6f8d990b3e14d
 DIST kibana-7.12.0-linux-x86_64.tar.gz 281022115 BLAKE2B 6400dc95f0d2eb357cce46679ab3eb1043f873dcc5904cb1d1169d44fefdc8ca5bcde8c8d3990f951754c2448c12514ac4d0a355f817e5b9b5ce7bf52fb41d00 SHA512 0b6a9596698c64a65d82cc146dad8e24118eb8991b9ed36e13f309d2e3d7af408c35358a8b39899bf2daf260ddd8d50678d437a3dba32923fe026da99a526006
 DIST kibana-7.12.1-linux-x86_64.tar.gz 281051589 BLAKE2B 041ac27f3d58ad419cf6410fcd452dad34a205699701088eeea11056974429e27a1c980ddc2609a592ee1c33f73bde39724603c17c604973a5c80bf1c36e3a70 SHA512 f215ae38c6976e0926b57a3dcb639ba532b724a8195e791a33a09540865a49e7180bed1692a6530b149e0bd6c4dd130c1d6c2dc6022b3ec5b8ec7ec4dc977b17
 DIST kibana-7.13.2-linux-x86_64.tar.gz 305904726 BLAKE2B 4d71432f10cfcc5b56ab007092334a46b1699eba2b3990381d4212b5053c6f6476d2434341907939e213226dd4d03000f8d73e0b32890a9c1194ab934a95efb6 SHA512 e4b88dd0e0266f82e893d1040689aaa88c4541ea355603680cb60d0757d5dbca8e628c65d9d74a1f898afa6926bb8d79f9008361c44c4f0cfc3284b07087ac37
+DIST kibana-7.13.4-linux-x86_64.tar.gz 306413260 BLAKE2B 3afe039b7be9809b395adb609e65785ccb8f3de07391b306804a79158cacb53c2d8b844b04468e932dc0113b9ecce34bc4bd8326231c9f2191fa5b12f2e00b4e SHA512 1accd5d6933f3f2f54174e53da626bc275b99b2f102d5f8cfee934d3520ee55a97c9c545cca32ddffec06a96114ce284e2e128cf334538214566c6530d1d673e
 DIST kibana-oss-6.8.15-linux-x86_64.tar.gz 70468224 BLAKE2B 5ad359cef5082035eaefe277128f8badce8539484f30399d504efe8fe645b1e925f22126a48bf3ef89efc466eff641241e109372ca84f34d2ac4014aeec1868a SHA512 ef67258e2f3d3f447a53ec23d519f13ea50a65f3fde7215352178a6efad9b20c9ce5ade14c4a185c2005b9ec29c997e40e435a0129dd4d03adeaaa21868c9a22
 DIST kibana-oss-6.8.16-linux-x86_64.tar.gz 67967956 BLAKE2B 3b1fcb88fb696c180b5e81219112598f4f156c6a9cb40535aa99cced65dbc8e441c31e9f0c43fd86d0a06cc154c1e5cafc2e8256303c0d65ed7c1c269edac7c2 SHA512 7b2962c78c33e535068ac11d050abcd4a3aa662c533d0ca2d918751ece6fcd84ef08862d1767dd9564d480dc200bd65b7a7199f543e3d5c3fc125ac3d3f4f902
+DIST kibana-oss-6.8.17-linux-x86_64.tar.gz 68076062 BLAKE2B b87a8067b0598e9291eb78b7666b69ac8babe774ad3f2ae1fcb37d12517ceed067fe0e022cb34e576727525c570863625237b91c6c5ad0b3901e8b6333a13c16 SHA512 28953bc77fd606a11c1f2522bb53b9fe38e7f711f71ac073c4d669a0078ba6fb050688ab06de49d4b5f7fdd0c76b8d040e05194bef814c872a00b9383b9a6d60
 EBUILD kibana-bin-6.8.15.ebuild 2524 BLAKE2B 1c3fd84640cf6fbb363b79410db8b5efd9a49bd2a7ef8f55cc3e3d590ee67a6b11782f368fa631cd9866344dfaccd38789efa2050a15227f39ae91406688f87b SHA512 7b36816cbadc0edc36714b81823fc2a21001337907204651a56b5c0245647af8b2c1e2ec40349ab344696971be969fd3c42ace58e3f9a7b17885751a4e351136
 EBUILD kibana-bin-6.8.16.ebuild 2524 BLAKE2B 1c3fd84640cf6fbb363b79410db8b5efd9a49bd2a7ef8f55cc3e3d590ee67a6b11782f368fa631cd9866344dfaccd38789efa2050a15227f39ae91406688f87b SHA512 7b36816cbadc0edc36714b81823fc2a21001337907204651a56b5c0245647af8b2c1e2ec40349ab344696971be969fd3c42ace58e3f9a7b17885751a4e351136
+EBUILD kibana-bin-6.8.17.ebuild 2524 BLAKE2B 1c3fd84640cf6fbb363b79410db8b5efd9a49bd2a7ef8f55cc3e3d590ee67a6b11782f368fa631cd9866344dfaccd38789efa2050a15227f39ae91406688f87b SHA512 7b36816cbadc0edc36714b81823fc2a21001337907204651a56b5c0245647af8b2c1e2ec40349ab344696971be969fd3c42ace58e3f9a7b17885751a4e351136
 EBUILD kibana-bin-7.12.0-r1.ebuild 2635 BLAKE2B c5d247f7732c7fc8cd06c54c6f555d532536ad82faa36afb5a983e542e338974d5a92a96f52b5b82f193d90bffa8fb0dcdef921de5707214ad120c61615fbc64 SHA512 c4373a9b1a56c27c68ff2977d2412c87e6e1604d2d26a4403ca227912d2c6e5c499e3e2f40fd4bad586c7960fdce8930aa4fea70bf177d58ebfb9073b4dc9fca
 EBUILD kibana-bin-7.12.1.ebuild 2537 BLAKE2B d01242c393c73232af9b9c6ba4d16201c9a7e2e847d09df7484c26982d0928fbdf4f74548b5667320505efc1cb9edc5f931f2b22d9f5f8ade74333c54b8ebebe SHA512 ce3432f6a6ba0476880c3e66e8103456624ac46fb807162e118fb3c944e802ef283dd6a5b7405352acbe62a5f04d1381a025c0036b24917b53422d2f42cbd62c
 EBUILD kibana-bin-7.13.2.ebuild 2537 BLAKE2B d01242c393c73232af9b9c6ba4d16201c9a7e2e847d09df7484c26982d0928fbdf4f74548b5667320505efc1cb9edc5f931f2b22d9f5f8ade74333c54b8ebebe SHA512 ce3432f6a6ba0476880c3e66e8103456624ac46fb807162e118fb3c944e802ef283dd6a5b7405352acbe62a5f04d1381a025c0036b24917b53422d2f42cbd62c
+EBUILD kibana-bin-7.13.4.ebuild 2540 BLAKE2B 4b97a79688192c43ae54c840e6da8a48b0c40abc5f9809337c878cb8e857212121f8f671d95eb9b7e69bbb787d67ea0c9356b5faa9a0b3fc3ff6afc423ed7b12 SHA512 3c3a347f7e799f16501ccaf557b3076430e8b3f2dda793847c87f1fcd5ba90049a49f4a2109e2eebd4291f8f779734315951f1f1d8c20fcdd8fef81e0aea96b7
 MISC metadata.xml 690 BLAKE2B 760ed33239b72e0464be29979034d3ea1ab4e44b9645f76088a5aff5d8d1812a9eb3c42dc218d35139898592580d7fa80e19115249df96552201c05b37470be1 SHA512 4d6347db943b11b799884dcc266bc4b4cb8de6516d64a9eb689d952ea9202f4efbf8f5c950c3502d4e30793d012a080f34c653b8563ad63b1701ae7afe8de7c3
diff --git a/www-apps/kibana-bin/files/kibana.initd-r1 b/www-apps/kibana-bin/files/kibana.initd-r1
new file mode 100644
index 000000000000..124cb683c939
--- /dev/null
+++ b/www-apps/kibana-bin/files/kibana.initd-r1
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+KIBANA_USER="${KIBANA_USER:-kibana}"
+KIBANA_CONFIG="${KIBANA_CONFIG:-/etc/kibana/kibana.yml}"
+KIBANA_CACHE_DIR="${KIBANA_CACHE_DIR:-/var/cache/kibana}"
+KIBANA_BABEL_CACHE_PATH="${KIBANA_CACHE_DIR}/.babelcache.json"
+KIBANA_DATA_DIR="${KIBANA_DATA_DIR:-/var/lib/kibana}"
+KIBANA_LOG_DIR="${KIBANA_LOG_DIR:-/var/log/kibana}"
+
+command="/opt/kibana/bin/kibana"
+command_args="--elasticsearch ${ES_INSTANCE} --config ${KIBANA_CONFIG} --path.data=${KIBANA_DATA_DIR}"
+command_user="${KIBANA_USER}"
+error_log="${KIBANA_LOG_DIR}/kibana.err"
+output_log="${KIBANA_LOG_DIR}/kibana.log"
+
+pidfile="/run/${RC_SVCNAME}.pid"
+command_background="true"
+start_stop_daemon_args="--env BABEL_CACHE_PATH=${KIBANA_BABEL_CACHE_PATH}"
+
+start_pre() {
+	checkpath -d -o "${KIBANA_USER}" -m750 "${KIBANA_CACHE_DIR}"
+	checkpath -d -o "${KIBANA_USER}" -m750 "${KIBANA_DATA_DIR}"
+	checkpath -d -o "${KIBANA_USER}" -m750 "${KIBANA_LOG_DIR}"
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+
+	pkill -P $(cat "${pidfile}")
+	pwait -F "${pidfile}"
+}
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.17.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.17.ebuild
new file mode 100644
index 000000000000..8b3812bc5d6b
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-6.8.17.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="
+	acct-group/kibana
+	acct-user/kibana
+	>=net-libs/nodejs-10.15.2
+	<net-libs/nodejs-14
+	x-pack? (
+		dev-libs/expat
+		dev-libs/nss
+	)"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+src_prepare() {
+	default
+
+	# remove empty unused directory
+	rmdir data || die
+
+	# remove bundled nodejs
+	rm -r node || die
+
+	# move optimize/plugins to /var/lib/kibana
+	rm -r optimize plugins || die
+
+	# handle node.js version with RDEPEND
+	sed -i /node_version_validator/d src/setup_node_env/index.js || die
+}
+
+src_install() {
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -r config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+	insinto /opt/${MY_PN}
+	doins -r .
+
+	fperms -R +x /opt/${MY_PN}/bin
+
+	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+	keepdir /var/lib/${MY_PN}/optimize
+	keepdir /var/lib/${MY_PN}/plugins
+	keepdir /var/log/${MY_PN}
+
+	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
+	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
+}
+
+pkg_postinst() {
+	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
+	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
+	ewarn "please remove the optimize directory content:"
+	ewarn "rm -r /var/lib/kibana/optimize/*"
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
+	elog
+	elog "To set a customized Elasticsearch instance:"
+	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/kibana-bin/kibana-bin-7.13.4.ebuild b/www-apps/kibana-bin/kibana-bin-7.13.4.ebuild
new file mode 100644
index 000000000000..f04b3a03b6b0
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-7.13.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 Elastic-2.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-group/kibana
+	acct-user/kibana
+	dev-libs/expat
+	dev-libs/nss
+	>=net-libs/nodejs-14.16.0
+	<net-libs/nodejs-15
+"
+
+# Do not complain about CFLAGS etc since we don't use them
+QA_FLAGS_IGNORED='.*'
+QA_PRESTRIPPED="
+	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/headless_shell
+	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/swiftshader/libEGL.so
+	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/swiftshader/libGLESv2.so
+	opt/kibana/node_modules/re2/build/Release/re2.node
+"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+src_prepare() {
+	default
+
+	# remove unused directory
+	rm -r data || die
+
+	# remove bundled nodejs
+	rm -r node || die
+	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
+		bin/kibana || die
+
+	# move plugins to /var/lib/kibana
+	rm -r plugins || die
+
+	# handle node.js version with RDEPEND
+	sed -i /node_version_validator/d \
+		src/setup_node_env/index.js \
+		src/setup_node_env/no_transpilation.js || die
+}
+
+src_install() {
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -r config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd-r1 ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+	insinto /opt/${MY_PN}
+	doins -r .
+
+	fperms -R +x /opt/${MY_PN}/bin
+
+	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+	keepdir /var/lib/${MY_PN}/plugins
+	keepdir /var/log/${MY_PN}
+
+	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
+}
+
+pkg_postinst() {
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 14. Some plugins may fail with other versions of Node.js (Bug #656008)."
+	elog
+	elog "To set a customized Elasticsearch instance:"
+	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index b4fde187b0fa..cbb83d1ece6e 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en-2.3.txt 1827 BLAKE2B 49402566ddf6981cf0226f6a963fdd2c482957903583807f5c42731dfd5b4aea56de7d1ebd47ab6909f12492bd5e7a788322e0b2d80e15d883483a080f8fe11c SHA512 59e304d63830227b1619ed1299e9b61f5b6e534cb03da4d3a0e35a0fe727ccf2d994a034bd12d515bba4f8a6a8ca513cf2131c031fa63f85906639aca159993a
 DIST postfixadmin-3.3.9.tar.gz 1866167 BLAKE2B 28546631dce340d3c1128b525de1c33e9e3aa23cd557e6c8f7e9b26f97aedba67f2e5f3ea351e0db2d79e068e16cfa1672cbe3e6abbffd19e5009e2a9df84523 SHA512 791b05df34a4f2eec01fe6f6b9038a6630cd60c42e1f2e725fe3d033a692b77d2d688858b947c53d1ce48258c7c87a2e3fb31356e553632b88149d5a29bfa70e
-EBUILD postfixadmin-3.3.9-r1.ebuild 2932 BLAKE2B 267b42789f8946de5111ee783c18a6f3a291152c5bdcdd2203e7daa21ba4ce4b8026f458bc170858425cf115c131e9d473eb7742ff1199384b862d46e32cb694 SHA512 0c7cb2e541c93050b64a691120fd7dd87a990ce03c2e91acea114efb62472e4ae5b976de81b3ed0baa3e472851d2f9c8ab1fb1808d914f80dcf6593c11d6470a
+EBUILD postfixadmin-3.3.9-r2.ebuild 2901 BLAKE2B 19b5cb0f3397715224a29106f105bc5bf8c168e62880be57ed85693ff33b170c1ae6f32f1827b4392171f615509a00100067863b359499f951d461793032858a SHA512 4f7435f7b52b2f10ffd36e7abc3225921c39e4718ba4a8f4b163191a61ce8703e2a5d031168b2c19d80fa19d343aa11e24f592e39306e3a34f1688454dea1497
 MISC metadata.xml 560 BLAKE2B 2dccae38d76ef72520678dcc26582c6d99d2221c8cad753063e4948b75cd84b39f47b854a010217a6a52186a7308a3355c41ab6a7229af2417deb39ccb3eae84 SHA512 4ab5d3db2584f100b9f1d9729eb50487e40b27d16c436cbe09dd03d24c533d5d7c61b4b19eda03aa423fb34d9cf2b9f3ec55679196bb8e8da5ea3157c0bc567b
diff --git a/www-apps/postfixadmin/postfixadmin-3.3.9-r1.ebuild b/www-apps/postfixadmin/postfixadmin-3.3.9-r1.ebuild
deleted file mode 100644
index fb3485975968..000000000000
--- a/www-apps/postfixadmin/postfixadmin-3.3.9-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
-HOMEPAGE="http://postfixadmin.sourceforge.net"
-SRC_URI="https://github.com/postfixadmin/postfixadmin/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+mysql postgres +vacation"
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="
-	dev-lang/php:*[unicode,imap,postgres?]
-	vacation? (
-		acct-group/vacation
-		acct-user/vacation
-		dev-perl/DBI
-		dev-perl/Email-Sender
-		dev-perl/Email-Valid
-		dev-perl/Log-Dispatch
-		dev-perl/Log-Log4perl
-		dev-perl/MIME-Charset
-		dev-perl/MIME-EncWords
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/httpd-php
-	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )
-"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	if use vacation; then
-		insinto /var/spool/vacation
-		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
-		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
-		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
-		dodoc VIRTUAL_VACATION/FILTER_README
-		newdoc VIRTUAL_VACATION/INSTALL.md VIRTUAL_VACATION_INSTALL.md
-		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.md,tests,FILTER_README} || die
-	fi
-
-	docinto /usr/share/doc/${PF}/
-	dodoc -r ADDITIONS
-
-	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
-	dodoc ${docs}
-
-	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	einfo "Please note that if upgrading from version prior to 3.3.0,"
-	einfo "existing setup_password will no longer work and you will"
-	einfo "need to generate new one. See instructions in setup.php."
-
-	if use vacation; then
-		# portage does not update owners of directories (feature :)
-		chown vacation:vacation "${ROOT}"/var/spool/vacation/
-		einfo
-		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
-		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
-		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
-	fi
-}
-
-pkg_postrm() {
-	# Make sure we don't leave broken vacation.pl symlink
-	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
-	local shopt_save=$(shopt -p nullglob)
-	shopt -s nullglob
-	local vacation=( "${ROOT}"/var/spool/vacation/vacation.pl-* )
-	${shopt_save}
-	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl && -n ${vacation[@]} ]]; then
-		ln -s "${vacation[-1]}" "${ROOT}"/var/spool/vacation/vacation.pl || die
-		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
-		ewarn "recent verion, but please, do your own checks"
-	fi
-}
diff --git a/www-apps/postfixadmin/postfixadmin-3.3.9-r2.ebuild b/www-apps/postfixadmin/postfixadmin-3.3.9-r2.ebuild
new file mode 100644
index 000000000000..fae0d87352a6
--- /dev/null
+++ b/www-apps/postfixadmin/postfixadmin-3.3.9-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
+HOMEPAGE="http://postfixadmin.sourceforge.net"
+SRC_URI="https://github.com/postfixadmin/postfixadmin/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="+mysql postgres +vacation"
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="
+	dev-lang/php:*[unicode,imap,postgres?]
+	vacation? (
+		acct-group/vacation
+		acct-user/vacation
+		dev-perl/DBI
+		dev-perl/Email-Sender
+		dev-perl/Email-Valid
+		dev-perl/Log-Dispatch
+		dev-perl/Log-Log4perl
+		dev-perl/MIME-Charset
+		dev-perl/MIME-EncWords
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	virtual/httpd-php
+	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )
+"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	if use vacation; then
+		insinto /var/spool/vacation
+		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
+		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
+		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
+		dodoc VIRTUAL_VACATION/FILTER_README
+		newdoc VIRTUAL_VACATION/INSTALL.md VIRTUAL_VACATION_INSTALL.md
+		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.md,tests,FILTER_README} || die
+	fi
+
+	dodoc -r ADDITIONS
+
+	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
+	dodoc ${docs}
+
+	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	einfo "Please note that if upgrading from version prior to 3.3.0,"
+	einfo "existing setup_password will no longer work and you will"
+	einfo "need to generate new one. See instructions in setup.php."
+
+	if use vacation; then
+		# portage does not update owners of directories (feature :)
+		chown vacation:vacation "${ROOT}"/var/spool/vacation/
+		einfo
+		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
+		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
+		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
+	fi
+}
+
+pkg_postrm() {
+	# Make sure we don't leave broken vacation.pl symlink
+	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
+	local shopt_save=$(shopt -p nullglob)
+	shopt -s nullglob
+	local vacation=( "${ROOT}"/var/spool/vacation/vacation.pl-* )
+	${shopt_save}
+	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl && -n ${vacation[@]} ]]; then
+		ln -s "${vacation[-1]}" "${ROOT}"/var/spool/vacation/vacation.pl || die
+		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
+		ewarn "recent verion, but please, do your own checks"
+	fi
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index b76921483a73..3e7305c1f1be 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 27e14d048917..4273b1f18eca 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -12,9 +12,9 @@ DIST chromium-92-patchset-7.tar.xz 4004 BLAKE2B 8587663a072eb08abacbc2e54924855f
 DIST chromium-92-ppc64le-1.tar.xz 30416 BLAKE2B e953e3ba1ac0ff4bae437328eb1c52fb3863007ff92db91c6858c8c5f7b4c5c39fb8bf6898c3385c7faa82666f1a18aae7fcb5379b9199e58c5c0526fbd9dbee SHA512 b5a20076a34705c53c56d7763189ebfd860a456ca544a7f0c9ce30c877be92270ea724f1bebb9b597b301def27dde0a672b0c30e16e6abbf958cecfd60b07ec5
 DIST chromium-92.0.4515.107.tar.xz 957809240 BLAKE2B 61f34c6de424dbc0bed4a3f6ede42c936389e3280ffccc6db8750674fc512257120fad4006bf5e31701cfebf9cd12df96bb2936296293312317dee85748bf773 SHA512 8814a3371e38836cee02178fa06bee612d00efe561791278351ef5312f5225742d416043fe6e25e9e353ae3d82dbd5ef57c9b1f115423da6537288e9aece779a
 DIST chromium-93-patchset-6.tar.xz 6796 BLAKE2B 2688c68becac1187668b459f9827ffca79de6c7ee64299dff20f91cb774af676ec3d95d809b4fc5f7bd663c3b8c904a46ac9cd3ec70a5ce248456dcd48834932 SHA512 eaf0d2bc29c53c7021ccded9c14463bbde2887926c069154c0126ee1bf513bf41a38eeb3dc21023a2e9637ce3e1e541a3b2a79a990bb8becae0da0a04e57c76a
-DIST chromium-93.0.4577.15.tar.xz 1041763744 BLAKE2B 25c718be97d05db8023096282605638a6410326f7999cdaed5f64fcf281d165c37be79b77f96cb6b5d93b18a1324d74bf752f9d3e35a79b57bd99dfb99cbfa77 SHA512 d710cd12ce974eef8ceddee6b9df17d3615ab60a691c16c64965153b96e1de359d02047ac85d273db1457e2a1abadc2a179f97aefa8878082679eee1be68f170
+DIST chromium-93.0.4577.18.tar.xz 1041809024 BLAKE2B 4f67353559143985dd94c862279c16120e35e03e77997140edc236bdc03ca308131acc434741c1585a3ef3e92458a0d4ec97eb5a1006076b09eab5b17e472041 SHA512 939a8692a9432d9c1b9a1bf117bf59e301299e73c465023ca5318948399e6d5522f5f0eacea93b56d745a8d3b223e425c8862f3db312f450f43f0362fce0294d
 DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 EBUILD chromium-92.0.4515.107.ebuild 30606 BLAKE2B d5dfc50b5ae57fe99e59f3e110e72bca5af88610e5f37d8e81fbd7d35cb328cf60d44a461819bb2a76780cbd7a4a7d2b0dcbbd5d9d3a6b7848d482220d29458b SHA512 5b322b95205cd0e174d9fc865cea4ce92d873b678bdd6d31172769d15c3a604dc38a2706e511d07512567b489d6f88cb83d51ff39bf31d15ba4ca2f8369212c0
-EBUILD chromium-93.0.4577.15.ebuild 29762 BLAKE2B 3b6ebfac90c4d271c0e59cad01bd62ff630e61a13d8084283e0b09e5c6f153cd327f53a177dfd7e26755847137c04389fb1d6c3b2fb8adde40638d2afe3f6f6a SHA512 b856d59a1b4e06d8ebd38ee9998b8417e7b6f58b8100c5769930efececae95859ae87afc180677b746c0bcf9d792236bbb4491cb86df7f47b56d5d8804042dcf
+EBUILD chromium-93.0.4577.18.ebuild 29762 BLAKE2B 3b6ebfac90c4d271c0e59cad01bd62ff630e61a13d8084283e0b09e5c6f153cd327f53a177dfd7e26755847137c04389fb1d6c3b2fb8adde40638d2afe3f6f6a SHA512 b856d59a1b4e06d8ebd38ee9998b8417e7b6f58b8100c5769930efececae95859ae87afc180677b746c0bcf9d792236bbb4491cb86df7f47b56d5d8804042dcf
 MISC metadata.xml 1519 BLAKE2B e4364e8141099703f087f1733b2d28aa688930f5e9cf4659fc3561af30d4490c611b76728b2bf2d745eb07b1482f59923166ca340740d48a0321fffc908ef4ed SHA512 b6a1e1f04b7e1b92ea2172c4aa89ce67186a6c8abe6dc6502db7b0588a9b3be2d0fa8d43c797f83b95f7d1c7a20381c26ee534082c4b81b17d4105b63aad06e4
diff --git a/www-client/chromium/chromium-93.0.4577.15.ebuild b/www-client/chromium/chromium-93.0.4577.18.ebuild
index 524c45ad4972..524c45ad4972 100644
--- a/www-client/chromium/chromium-93.0.4577.15.ebuild
+++ b/www-client/chromium/chromium-93.0.4577.18.ebuild
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index b67397559e67..8e9384ebad2a 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_92.0.4515.107-1_amd64.deb 86204868 BLAKE2B 4a5e6256d30a1534a72c2f2a719eb570e13d9a9fe7fe780d1a8cab9316a8170f281977c532299d0b95df2abb27564a4a9ca80b500eeed1884bafd561c3d4686e SHA512 337f78ecd93ffdf18659d1d85e34afa32e7c2946d04d1e29f1ac40c9984d05d97f8723d265df2a341936e51600b30981701cf0429002ef798f4e2efff122ad92
-EBUILD google-chrome-beta-92.0.4515.107.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
+DIST google-chrome-beta_93.0.4577.18-1_amd64.deb 81258624 BLAKE2B 97372492b2fbf057232094e9567e816b30828a75fccb2438bf10974d4b522e1924ad4cb784cb11b8b7cbfaee18f25b0a0d06f4fd9fbeee2f438e9e57590a8192 SHA512 67e57bae0eaa5e4d6b98bb93c87928109ab616c0792ee95ac3719333efcf61cbbfca03514821571cf8248185a83408dd48d057cb3de4b05175e44377dc9a2631
+EBUILD google-chrome-beta-93.0.4577.18.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-92.0.4515.107.ebuild b/www-client/google-chrome-beta/google-chrome-beta-93.0.4577.18.ebuild
index 823e4a8ef49e..823e4a8ef49e 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-92.0.4515.107.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-93.0.4577.18.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index aff8d670479d..9c34f4319325 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_93.0.4577.15-1_amd64.deb 81257676 BLAKE2B f14ffb08d7e85ab9592d250633e50ac798d9432abbc422d321726c4f694ee314027295ca2c08402bbe4d112a2a5fd75c1fb6843ed56402a23272d39e22ea5959 SHA512 e54c5039e4a6e45f3685acf8625aee07cb08f3ff828285ceb6c6418101a75cab1a1ff6bcf2ba5ebc8b6aca140c1268937f89b016ad021a959ff9f92051d6a8ac
-EBUILD google-chrome-unstable-93.0.4577.15.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
+DIST google-chrome-unstable_93.0.4577.18-1_amd64.deb 81246220 BLAKE2B d20840b798b880f7f8758fb50e7744c3c5e2bb6765e75756ab9f828f09687ecf5a7481192ea732283c0bc3059a1e6ac17f483380d8c9190b76ea37168146ceef SHA512 0d2c36806e44c8fc83ba35b755c75373a4166834f61ef2c70c0aac6868a991697e4f0dbf47854adb894330e39e6e9a7d3651c542a97d78bb592bd3874b38abaf
+EBUILD google-chrome-unstable-93.0.4577.18.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4577.15.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4577.18.ebuild
index 823e4a8ef49e..823e4a8ef49e 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4577.15.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4577.18.ebuild
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 9bd794fac678..44f5204ad49c 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_92.0.902.45-1_amd64.deb 101831812 BLAKE2B 007c3b081a8ddf294c0ccb14d93cf0e245c6142075e9d5792ae6f2d812e17f4c563b85c30aaed058f8c5da02eebad499ee3943e163ac433ab0b97487d06f2a8b SHA512 b06e72d7cd181c5c6ab9b08b318dcc588865bcaa8743b2cc07f89aa5c75c0b6867758381889fc60237823fb70856bc9aa2872fec83299723e1cd2b5a14e04c2e
 DIST microsoft-edge-beta_92.0.902.49-1_amd64.deb 101813676 BLAKE2B 45cf8c9a3bca228639914c63ecfd70f29611361b8e3a0194e1a60baa3d044f5e8a0b976cf72dddc940679fe0a3929e8378a36534d37572ccea988618960b4759 SHA512 f33b024576d6263a4f27488858ddfbec2fd4d160cab67c679d9f68423334dae47a68e69610cd9bba8d9cb55f067167ddd676cc64af3792824924d2f4618f61e3
 DIST microsoft-edge-beta_92.0.902.55-1_amd64.deb 101830296 BLAKE2B b5194d43b28e73f2764e0b27b42fba737d2b1b12c03d7b7f9066ef9bfe41895b39acc160d27174fee214b157d17216613dc6960c0c868a037799368ee3476829 SHA512 4bf960e814576f72232bb40a0abfad634cc6fae1101b053cf831c12e04806feead2b6886acfb1a70dfd0eb812214cc2dbae3f0aba98293c1f3a6c898864aa59f
-EBUILD microsoft-edge-beta-92.0.902.45.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+DIST microsoft-edge-beta_92.0.902.62-1_amd64.deb 101311562 BLAKE2B f116c5d13307f9f8c2a4ba2dba24b846cfad3dd315cef725ac6244b1824b027f9808efaa79b5fb6b134f7b4576225ce2f7f9732e556a68e485fa1f68ecae16f7 SHA512 61e087e3b88a6cb68f35280acd0dfde9faed9b57bbffb5273748d1dedf0cee2a0145a95d5038a6384cfb0da10564d059cdfbc791a3f495ae805f65b0ab70a983
 EBUILD microsoft-edge-beta-92.0.902.49.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
 EBUILD microsoft-edge-beta-92.0.902.55.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+EBUILD microsoft-edge-beta-92.0.902.62.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.45.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.62.ebuild
index 6887ef49a3a3..6887ef49a3a3 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.45.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.62.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 523dc44db10e..0a8fe93dd1ef 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,8 +1,8 @@
-DIST opera-beta_78.0.4093.46_amd64.deb 77075956 BLAKE2B 0eb0d05dc2dd98d6f600b9f36ec247fba96bb51ef5c19dc7813448e8f65150bb0ba83018de2acab809fb5bdc6eafe7e56f47a8bb9aadf84b00d89da266a2b555 SHA512 72f16bfb20ca1aadee6f89db5ffb5b4cd5f031504629124f48d46c8799e490b82a37939c5079797c863675f0dfac02cb8980b3230f45979e4a21c38c4da8eb82
+DIST opera-beta_78.0.4093.103_amd64.deb 77211528 BLAKE2B 0df5d6c7bdaee9147a3cc621aa549c24a4f7c128a0017fbb7b6e2350ace0ffcdc267810334aaf901f4f50f2ce7526a5ca2b32110b69f170ac67f24989ca162ac SHA512 5dc7ef7ac24c6a7ef78b79862d3f39f4d1d99f4b351e7a7a118e3c82028421f1bf23d9c9dbb3e6ef7018cc8eb2ddc95c96290fe01e3505fd5970214431a26fd5
 DIST opera-beta_78.0.4093.68_amd64.deb 77090336 BLAKE2B 852cdf096bd15454ab75403bd7bdceb22e49775c630381dff1687655ee2c41718eb4cdd574e92be3816cd74418595858be44c4d89cf048905e010145956cd2f3 SHA512 77bef8fc5e99856a8ed1d52485c876c6df90fcd6d4d2fc1918947eeaf51fb7c6c142de0fdfa752e4eeb1f818b7c1c8c3fa15f26626da5ffc9bad393f6fd2ff57
 DIST opera-beta_78.0.4093.79_amd64.deb 77241316 BLAKE2B 3d678a96ccc40df1047380ca7c15b018663407406d267d30eb0dfd328a7eb1b28d78734b45034ff2ebb4ab73bb6d38adc24be031f6e451ad2f97f5d97c4090a1 SHA512 d1abb8bf7494ac36d8268f3c2c3862b3337948bc68b4a5c65bb070f5aa391e2c45d0c328ba572b745d68dc54b306a9c913eb0fffa0bce557e1f3b9ec7cff09fb
 DIST opera-ffmpeg-codecs-92.0.4515.20.tar.xz 1382256 BLAKE2B 1e00bb4ee655573ac7b6c2f04ae2ae9a073f839ff6deeba3e3c4c2c58a10b1152068f0549fb3c6de758628317ad7c568cf5d3031294208800b470e3ed00c938b SHA512 6aeec66a9fcea1fcf5ecfd23b56589598f5e612e788b4e417037250470b83f91e461e3b0c20caf7853677d314053ca9d489983736708f15d21a82d68d2cdd5c2
-EBUILD opera-beta-78.0.4093.46.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
+EBUILD opera-beta-78.0.4093.103.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
 EBUILD opera-beta-78.0.4093.68.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
 EBUILD opera-beta-78.0.4093.79.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
 MISC metadata.xml 379 BLAKE2B 1945bc4341ba4a9e75097fec82275f5fd31fca881a432a31ee0cb5ebfb51ebea4cd707731673a5de3cee8797cb532a3e929db9f9f144b84fd54af545b4444118 SHA512 19c3f7dc99f1c71bf9e6b1ed440b660c2712000d543f40f454a2fdd43f4eb3ed2ea4907880859d4084ea8ac1591b03463a8f19ae56b2396eee442c4224fc60be
diff --git a/www-client/opera-beta/opera-beta-78.0.4093.46.ebuild b/www-client/opera-beta/opera-beta-78.0.4093.103.ebuild
index 5f5790fcf46c..5f5790fcf46c 100644
--- a/www-client/opera-beta/opera-beta-78.0.4093.46.ebuild
+++ b/www-client/opera-beta/opera-beta-78.0.4093.103.ebuild
diff --git a/www-client/pybugz/Manifest b/www-client/pybugz/Manifest
index 2362e5483fa3..c50c4959cdaf 100644
--- a/www-client/pybugz/Manifest
+++ b/www-client/pybugz/Manifest
@@ -1,4 +1,4 @@
 DIST pybugz-0.13.tar.gz 26876 BLAKE2B fbab5ff308e137bf590620362fe102408444c7c1cb375f2c2d426cf5873fba5cf8759d7083be4c6bd305191680af8d1afc3aaf0648e186a93af4dd0b60442093 SHA512 2cbbd32b44d0d513e91e5c35dca5c68e34a963190c31f9139922f6b8ba69c7362063155b35833a00c2bd064f94d99367e2941a573aed4488f9a71a3b163d4b54
-EBUILD pybugz-0.13.ebuild 1044 BLAKE2B 9b9744ee370fe09dc4b4f472459f76b6ea849e8e0d7c7cebabe18b6d3b51eab72bcb6d910758f10bcb0ab0624a19dab99402ee1487e9fba78a5c2faa58b530b5 SHA512 fad5049f92b3169349709731b810daa1f1acd6bebd1a9178eb8cf2fd710c4af7cfae5aa0f979229755b931ca46c3ca9715319a5d1835a418c740eca54a02ceae
-EBUILD pybugz-9999.ebuild 1046 BLAKE2B ba47fa2bdf06d9fa5adc2620b05a4898c03d18445ab4c8d97a232e15556585c618c67085ba267df4fcf9f98eb0260ba6cbbd6d4a4c3ce8673b2d1831dad17db9 SHA512 a3ce6e10ae074d858bc96e1644976f595471a31bfe00bcc33b555ada5ec970a5bd992a6333eff87068f5f5700c3b8fb31d8aea80536395484f90c3904431b5f2
+EBUILD pybugz-0.13-r1.ebuild 988 BLAKE2B 784c24798d5d45a6f3a41e3556957b44b6a3a49b0c461fbfa2c49ea133acea7b5ff712098ee499853430610218f5cd0f4daf1dd460d92d9cfc1446bace94f2ca SHA512 b48eb371d1a6b64fa04e6bedecd3d4c3f4369400cd383ce168a9233e061b449179918af12dc363b90c065fab487ce95de41de8e034d93cdcf9fa533431669076
+EBUILD pybugz-9999.ebuild 990 BLAKE2B 17d724beb858ade1a2909f51494ef18aff5b17884ccad430a246504831376c2f403e2ea362d631aa2c955701df25c05a5ebbb0c06e4b05cb0503e668d2f4b420 SHA512 d1e20b7f25c5bf60a16781f494103f569fe0fc9d2af9e11f322e7ee4ae942b6b2022443bb9d3b075edb0d0f91f3b951de1bdef6e29b4906eaeeb9cc7c7e9b781
 MISC metadata.xml 307 BLAKE2B 35d9a21eb8997a7ebed4e14a088ac85802c9828d3d968adc0b41b1c7f5a54d863747cd32a96624785e16caecb6ca0a5b645aec61459c19ce746bedd67000a3a6 SHA512 ae4880029f219b2a1db5b8975ae0b442eb23d9059bdf5798f79d2f23a7d43bdd5efd7e8c626cb3dc642936f7ae84bbdf66d9509cd96e5c986bba136c77668b75
diff --git a/www-client/pybugz/pybugz-0.13-r1.ebuild b/www-client/pybugz/pybugz-0.13-r1.ebuild
new file mode 100644
index 000000000000..bdd2da64a75c
--- /dev/null
+++ b/www-client/pybugz/pybugz-0.13-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="readline(+)"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/williamh/pybugz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+fi
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Command line interface to (Gentoo) Bugzilla"
+HOMEPAGE="https://github.com/williamh/pybugz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp contrib/bash-completion bugz
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh-completion _pybugz
+}
diff --git a/www-client/pybugz/pybugz-0.13.ebuild b/www-client/pybugz/pybugz-0.13.ebuild
deleted file mode 100644
index 263a9fda68c9..000000000000
--- a/www-client/pybugz/pybugz-0.13.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="readline(+)"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/williamh/pybugz.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-fi
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Command line interface to (Gentoo) Bugzilla"
-HOMEPAGE="https://github.com/williamh/pybugz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="zsh-completion"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp contrib/bash-completion bugz
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh-completion _pybugz
-	fi
-}
diff --git a/www-client/pybugz/pybugz-9999.ebuild b/www-client/pybugz/pybugz-9999.ebuild
index 96ffebb7859e..f95c65ea1b0d 100644
--- a/www-client/pybugz/pybugz-9999.ebuild
+++ b/www-client/pybugz/pybugz-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="readline(+)"
 
 if [ "${PV}" = "9999" ]; then
@@ -17,9 +18,9 @@ inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Command line interface to (Gentoo) Bugzilla"
 HOMEPAGE="https://github.com/williamh/pybugz"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="zsh-completion"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
@@ -28,8 +29,6 @@ python_install_all() {
 	distutils-r1_python_install_all
 	newbashcomp contrib/bash-completion bugz
 
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh-completion _pybugz
-	fi
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh-completion _pybugz
 }
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 64843584dd8a..64d589303992 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-snapshot_4.1.2358.15-1_amd64.deb 85118372 BLAKE2B ba0812c276d36c7fcdb1cce040ee0daa32afa9fc95695136cc202a86110132050ddffd80ec9d2f10293030f3af8e6c47382da7d8b59bca62e5a5636fc8980222 SHA512 ce7819f297cce1dde4746bfde503abb2133defc0ef80d89c371ed1d6bea76e5123c7f449c4edb0cc0212d2f7f1e651fe4d8960162320e04c48761666cd61f1ef
-DIST vivaldi-snapshot_4.1.2358.15-1_arm64.deb 80658544 BLAKE2B bd42810379f787abe46f88ba2844c209f1c8d41089b3a7a9a487f2e8b6599f0577ea46df3dfd4c3ff35f3ecf9ba9b86920131e6b16313a5852efb00e683f6860 SHA512 60f75623b5891978bc35f032fc676671d1d1277989a7b42a2fcae318943eb60d8830f76738b08b11833d205b8d27ce00deed7969a2a80de1c421987526b642fd
-DIST vivaldi-snapshot_4.1.2358.15-1_armhf.deb 76520492 BLAKE2B bc96e33a3b9395402df488f54819759eaa169665376b6f779917f1d1d284c0dc43cc276b5428746ab02157093ea8a6323dfc86db4265721fd83dea6715f9bfc3 SHA512 2db620443b842929bef57e1ab64a23540d02b03cfd08ef67d45fe73d6a7ac948e895ccddd571c9b1145bfa8a7255ab878ff2b65578b7be358da770f88653f407
 DIST vivaldi-snapshot_4.1.2367.3-1_amd64.deb 85157012 BLAKE2B 9d857c360a9e9edc41dab9629f6b1b378852767b73409657f6d23a53501f00b7e73c66152c3ecbbb72585c65e47250c7bf505582a0c784fee0ff85efd1022dc9 SHA512 277d77414a2bb6ee8656390d8769fcc6c99d3247be22436fd78b0d370ba0b368dbbe24e7f5cd7da05fa4f076ae5ab526de371aff7a3299a534cbd85f76dbc60a
 DIST vivaldi-snapshot_4.1.2367.3-1_arm64.deb 80674668 BLAKE2B b28f6eba0d5cfec734435e493e8ec348974d9fb4efb9533ce6c4283223a8bc46d1a0b8772692a93f6dd1521744a30ad25edbf6f0bfab967a66fced915128216c SHA512 27244952e5ebc0271a9d05d2a792d90840ba59a5920c6767aab94459895c71cbefc721b582b81616021db73d7855634d0e01c6164719251375638774eb920547
 DIST vivaldi-snapshot_4.1.2367.3-1_armhf.deb 76537504 BLAKE2B 61e624822b2a0b54529e2213690fbc5c5c17c15e8fd57a8549466e016f11e42806796be1212da103e05d4327aa9a6a704e4adce75897f0274f7e0e1711885e97 SHA512 b5a62e6b6dfe1b7242dfb860ba8ba2cde188b7bbac1f22ee02e439030eabecfe5977d441cd6310d087d8ef301025cdae3f30285bed962289ef2b1bce038955dc
-EBUILD vivaldi-snapshot-4.1.2358.15.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
+DIST vivaldi-snapshot_4.1.2369.10-1_amd64.deb 84518232 BLAKE2B fd9d08f4fcc4bcd41890c37cbd9873e0fe666633c12c5286331b406a74b55ba222ed0343700a21bedb7f25e4f9182bbebefbcc11c6b8285eebbac2c78e231f8c SHA512 2b946221863a7b2b7514e83be8e639482135ddb4a04c2cc3c8eda37fa196ccfc16007c12f1d43541d70fea0660cb10268c1d358db2e62575521cd39e525e7b79
+DIST vivaldi-snapshot_4.1.2369.10-1_arm64.deb 80662848 BLAKE2B b3ad7300ba690b69ca5eae5e45599346b0197b694d93fa657754312c4e6a91089fe5b962dee7b1ec12d5fa953273333cc52827724f4fd6961d5f7de8d39230e3 SHA512 8774cca3850a7fd77da594d9015342cb3a86016a6674b630b2b397b6e4e472486e3d97acbc1932d4da815f6dc442a4cb3b11f2edf64377e715a9dbca9a1a68ab
+DIST vivaldi-snapshot_4.1.2369.10-1_armhf.deb 76550964 BLAKE2B 54501659c49199b928ad1e12f72fd1b7646be9766718cf35b6d4c36fbe3c68b692e707343e34f46004ca0b692c768248a2294602db67d7f2b2db6ee979311d3c SHA512 8bdc52e2edc084ae6c2316d9bc3727f47f46ef509c0176df439b7e9ef9ef8a93b1c22b0a7aa2f956feedc5399636638b528d9a369984717ab1dffce9f7d455b4
 EBUILD vivaldi-snapshot-4.1.2367.3.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
+EBUILD vivaldi-snapshot-4.1.2369.10.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2358.15.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2369.10.ebuild
index c2409d01a97f..c2409d01a97f 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2358.15.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.1.2369.10.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 9289f18b8d65..cbe868322097 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -2,13 +2,13 @@ DIST vivaldi-stable_3.7.2218.58-1_amd64.deb 78992560 BLAKE2B da8f3eacd8d0c826006
 DIST vivaldi-stable_3.7.2218.58-1_arm64.deb 71046428 BLAKE2B 8f0dd3e845f2e4587d238c8f48447e514ac7605acab8d67f30c30ce2df04fae600382218087aea68f75621887f5a71506389c81f9b31614e20d3d7611d7bfe0e SHA512 2126c24ae8a7e4370f4ced2b37580871394de1f38a02b88d24c974ee23c13a4264ca8c11e0c5b7ad542812531898d9ee425657d9c7eeba4e08c718c07c7337bd
 DIST vivaldi-stable_3.7.2218.58-1_armhf.deb 69900368 BLAKE2B a85b97405c80dd10907d9b0b9846b8c2b1101346cdce4b19ddeb1192de64c49056e086903829b30b9e6bb4928c3de500138cda460596dff7c2505fae0661d6ca SHA512 2d37b2080dbacbd6986e9d346be4e0aefd48a25f039668e2c1e697a025c294e4f945fdd3d86ae34688335e0d2b496355461756ae650e0b0fd212fbd983494ae0
 DIST vivaldi-stable_3.7.2218.58-1_i386.deb 76040556 BLAKE2B 4710993024a401a8b9e25dd5cae55d5e5077423a7f7bba7af55150675d7848427f6bdca1fa8666f338b7609cbb11254c75df901e3c33fc6b75c5824c17808b71 SHA512 d5a8658d80aa8a4b5ec38491f3a4f6fb16c5a0de7934d4f7f518efaee36afc1d9585695c121f5cd65d961ae134c7cae0cd6bf0b07858ef2f906d715ca424ead4
-DIST vivaldi-stable_4.0.2312.38-1_amd64.deb 84294796 BLAKE2B 0942e8590d6af17eecb036ca22958c3aea4da3c02bcbf8253a85f921a4f1a292310f37f238830291afc7219b7f8bd81195956602f330bb4e836080e841ed92b4 SHA512 4081f8c702003c19d0568a939f689df1f7783ce406cfc71d40aeb69ab9f6dbcad4c959c74b9ebd6e66e822af3f5ed60906f654e5ddda8165751fc3b0493811d7
-DIST vivaldi-stable_4.0.2312.38-1_arm64.deb 79737624 BLAKE2B 367fdec2e15913c5282165f266ce057cd94043e7523f3839266f789a7a43c44d839b2e5394c07bae071bbfe86f89134ed59ca0dd0c76114c127da354fc2dc3fa SHA512 a40ddb6c928135c89e6ba5c654c46d9154c544132abad5f42685d2b4da55d5b71cc7acac58e45150d67106aaddd66e9f00d586f087b3f6fe5b2594fa7fee65b0
-DIST vivaldi-stable_4.0.2312.38-1_armhf.deb 75853312 BLAKE2B 24650e64ac1630b1e12d3671760d49cc31b529a35d0075b61485d3b15b0d50006119d16a20a16f395a0054f77b78bec4277919a156fb842adb1a50d68781ea26 SHA512 1f4a3188d14d89a45bbafdcb8c595b65f5649d7a39d04b7f477d8297a5f01b18fa3a0b1016d90306a5d01dd847211d0dd1796dcb08421bbb37abb735871e10db
 DIST vivaldi-stable_4.0.2312.41-1_amd64.deb 84277076 BLAKE2B ce8510c543837484ee8965e14736bb58dc8d3075132f91260540d0ece800aea2cb4f23c3ae5bbe9bef7bf5f46433aa46d54dbdafc8ba39501cba35e5e7362c18 SHA512 e5032b90f7b02ee6048461a8cab2d606a65d3606c9eba5d78683fff3be28fc3fb2a753c58c36f966eedde00bb70a772d9c492b3e0ee1d3b85f28855ee1ae383a
 DIST vivaldi-stable_4.0.2312.41-1_arm64.deb 79731100 BLAKE2B c14a931f593350c9fcc8570649bc1eb4423ae57353722ff1efdaae0b40e54e09b824ed912137606ae8692bf1cb31ce28cb444e1e4f3a4b87ba350227dddd2d65 SHA512 97441983c680d5808434a60b985122d7e7740c10f2f14d38d24f472c339984ef69f4d52b3a4a7a1b28c100dc5589cfd68420c16eccbc6fa72a10a8add9b9da97
 DIST vivaldi-stable_4.0.2312.41-1_armhf.deb 75855988 BLAKE2B f2210d7dc9115b6dd285fcaa273e99bcc21c1ef8590222ff9d0ca0bd4dd9d171f7692660cfde3413b5700e97668e52aa13628d4cc65692a72c45774689fa2900 SHA512 c123c8730bfd2b70cc9ab673df42ae5d2434e0284bdae949e4f439c91bba17292981839abe7b62227d39f17a5a92b8434de04b0657e9e4b02b0414032cde8c16
+DIST vivaldi-stable_4.1.2369.11-1_amd64.deb 85123092 BLAKE2B ac26efabb9fbd4bb7ee7fec29fab5a775feee72b9d570af497c0b68e16bfd32aac777f9d4403ea46097403d01bc78724ebc356e2b9b58d1e82595d8e28216808 SHA512 563608daaf13fa45e955adbc3118b5333e10095b88289e11fe4930bf6d0690194cf261f674782ef340a2d9c3b3b7bc13c6781ee17a5df539992e115adf01f441
+DIST vivaldi-stable_4.1.2369.11-1_arm64.deb 80693356 BLAKE2B 3493d13de4a9124bee575f63c2216cf191917e8131fef5ea84349c9d4768cb02690df230820adc39b2d5e58e37008e69aa864b9d1fb269da3e6b94b0362d0147 SHA512 c4e47a62923f17fb77ae799d5c073a2650c4d95d6822f992c97f71650d3d476407efd561487223ecbd112aa1ecb64e1bedfdbcd0b44e476900ed58753960c74c
+DIST vivaldi-stable_4.1.2369.11-1_armhf.deb 76550248 BLAKE2B 24946708b7d2d51fe6c02a20d33ecbec052c6b36ed239df65fc05a28ad8eab8777da514823ba22af562acc6c83a52b116f782eb43ac520ad226a2f893e5e587f SHA512 1f5f9e4303b42d192df26e3a135ef8f13ab49d0519ad1764d39371924b8bcfde577c67d7a69bfccec72d18137dec598e60fc24e0071e97fe96b20d5897e23fef
 EBUILD vivaldi-3.7.2218.58.ebuild 3553 BLAKE2B 3b6cd7c057d571f6a40d6578fd6a973cf5462aa7b64a854b5b6c88ea56b855311b8f23e1ca34a3c1350929fdaa6aa029c693783665cb034f4e759bf4f57e208d SHA512 757316d9fa2eb0d653591bde29b1a3520aafe713475d61ce3f71ca7f709119448ccf172870a1c0fd3fbe9890938dbeb47bc5f01c0b02b6c70accc10f74402fef
-EBUILD vivaldi-4.0.2312.38.ebuild 3549 BLAKE2B 91580e4afcd928523049e88050387f7f18bca8c311d1dc9e82e4a369a125a786a7ee9fc1986bf98bbc9e98e00b50ab42ac9d0198d6e0834159a814c89197c2bd SHA512 bf2443fe71ff0f4289b766c012099b738647bd1782654754ff951d25c6ec85ac1c52a894a12db07f0b8b3dcc52748c3a212c673948c7c747f9c6f50e4cea28c8
-EBUILD vivaldi-4.0.2312.41.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
+EBUILD vivaldi-4.0.2312.41.ebuild 3549 BLAKE2B 91580e4afcd928523049e88050387f7f18bca8c311d1dc9e82e4a369a125a786a7ee9fc1986bf98bbc9e98e00b50ab42ac9d0198d6e0834159a814c89197c2bd SHA512 bf2443fe71ff0f4289b766c012099b738647bd1782654754ff951d25c6ec85ac1c52a894a12db07f0b8b3dcc52748c3a212c673948c7c747f9c6f50e4cea28c8
+EBUILD vivaldi-4.1.2369.11.ebuild 3550 BLAKE2B 5d1cc6e8b1158e15e310fa8be06df5d9914ab8c705361b29425a1a18813d4cb84d800a0b80cfb7c5aea6b28ac67a47b393d8fd145d306f3ba81641cd54d0a8f3 SHA512 e9b8fc4ddc652a5cea2ad12ca09b8f45f833275493e2b108cbe8ccd15ec6a9776c0a6c293dda022d6a1ed63946a5d541566290784d86f0e2c49ee5c4af17c95f
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi/vivaldi-4.0.2312.38.ebuild b/www-client/vivaldi/vivaldi-4.0.2312.38.ebuild
deleted file mode 100644
index ba5f6dc05f73..000000000000
--- a/www-client/vivaldi/vivaldi-4.0.2312.38.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	az
-	be
-	bg
-	bn
-	ca
-	cs
-	da
-	de
-	de-CH
-	el
-	en-GB
-	en-US
-	eo
-	es
-	es-419
-	es-PE
-	et
-	eu
-	fa
-	fi
-	fil
-	fr
-	fy
-	gd
-	gl
-	gu
-	he
-	hi
-	hr
-	hu
-	hy
-	id
-	io
-	is
-	it
-	ja
-	jbo
-	ka
-	kab
-	kn
-	ko
-	ku
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pa
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	sr-Latn
-	sv
-	sw
-	ta
-	te
-	th
-	tr
-	uk
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-KEYWORDS="-* amd64 ~arm ~arm64"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-
-RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
-RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
-RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
-RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
-
-LICENSE="Vivaldi"
-SLOT="0"
-IUSE="proprietary-codecs widevine"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	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/pango[X]
-	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	[[ ${PN} = vivaldi-snapshot ]] &&
-		dosym ${PN} /${VIVALDI_HOME}/vivaldi
-}
diff --git a/www-client/vivaldi/vivaldi-4.0.2312.41.ebuild b/www-client/vivaldi/vivaldi-4.0.2312.41.ebuild
index c2409d01a97f..ba5f6dc05f73 100644
--- a/www-client/vivaldi/vivaldi-4.0.2312.41.ebuild
+++ b/www-client/vivaldi/vivaldi-4.0.2312.41.ebuild
@@ -95,7 +95,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
diff --git a/www-client/vivaldi/vivaldi-4.1.2369.11.ebuild b/www-client/vivaldi/vivaldi-4.1.2369.11.ebuild
new file mode 100644
index 000000000000..c2409d01a97f
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-4.1.2369.11.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	az
+	be
+	bg
+	bn
+	ca
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	gl
+	gu
+	he
+	hi
+	hr
+	hu
+	hy
+	id
+	io
+	is
+	it
+	ja
+	jbo
+	ka
+	kab
+	kn
+	ko
+	ku
+	lt
+	lv
+	mk
+	ml
+	mr
+	ms
+	nb
+	nl
+	nn
+	pa
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sc
+	sk
+	sl
+	sq
+	sr
+	sr-Latn
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2 desktop unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+
+RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
+RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
+RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
+RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
+
+LICENSE="Vivaldi"
+SLOT="0"
+IUSE="proprietary-codecs widevine"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	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/pango[X]
+	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use proprietary-codecs; then
+		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
+		rmdir ${VIVALDI_HOME}/lib || die
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \
+			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+
+	[[ ${PN} = vivaldi-snapshot ]] &&
+		dosym ${PN} /${VIVALDI_HOME}/vivaldi
+}
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 402a76d333c4..f08ea7ee5706 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index 6042f64f20c8..d695e51a8a58 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -4,6 +4,6 @@ AUX vdradmin-3.6.7.init 1860 BLAKE2B e8e93378a56a2a2118a5a3ac0cd879690a09c5508a5
 AUX vdradmind.conf 92 BLAKE2B 14d1abac4f0718dcf0679ffaab81f2d1867cdca3f3cf8534ddef84129a4bcd4c93c2e18ce9877f44ed9759a81d67b6eb9541c86ac184ffec7705278fcac243b4 SHA512 d54253b0eb684dfcfa924e141b5f0975cea659f3258a519afd625e692855de45d9c863a8d9eb11d4b16597fa76eee955694350f224b443733b238071b3ad9d16
 AUX vdradmind.service 236 BLAKE2B 605e037f32ab03877b7d33d4cf964cac1a453c2026a34c12e966920c6bdb4e221cff83ca2f54a7288a0fc64cfeec5f1906ad2acbe29024ddbcc77fed1b1e07e4 SHA512 dc674c38be6eb26cda20511c0366c7cff8f70e4d02781508828e8027e4c82c591e62361efa44862382cdf3417c30e679babdc7928a31ad054250aed41c06fff5
 DIST vdradmin-am-3.6.10.tar.bz2 606665 BLAKE2B c475b36c840548b6e0d50b2095ce3278b0b526af856c891a25d28bb2f0cb9f950aa9979533a6b6425a2a36a594dc5d6a075fca7713eb1f59071fec854582cf5b SHA512 f7546f79b786ca383c0846656e74bd69dc9faf57fe5794ffd68776123497ec2a96c2f131801e3d5d19247ac36eaa896801e1ac9cd11291418abb518ba208e597
-EBUILD vdradmin-am-3.6.10-r1.ebuild 4743 BLAKE2B ff14dfc328ba51233e916c447e7d48d6eeb950f5d52a631445b1df99969376ac2b254fd50b4260ccf8aa9b43de57cf118aa01c3dde9fb574f53dae14b9310b8a SHA512 4ee2e4c111a35d342d2cadfadf113ed4c78323b5861fad3ac1169ef092024f07db6d28bf770e94c9e8e981e9e0f215f28d98f129bd38cc2301a12e7176b22c3d
+EBUILD vdradmin-am-3.6.10-r1.ebuild 4777 BLAKE2B a6e1cda3a7c1a3a184e702a0668f448c8444955c53a89ce6ec2142f2495bf3378ee62234afa4a7dda1fdbb6c80cb270d87a5265063717670935aaa0ac2b7868c SHA512 6906521c9b5840e1fc3f4ffa2ebb71dd7a27dfbedb85f6c9c5bead7ed71ceeae9d37b82cac8bc656f2322754a8f80da605234b6bde502a76d86d29ffd4e9311d
 EBUILD vdradmin-am-3.6.10-r2.ebuild 4755 BLAKE2B 51cc4118ff1ccbbb87127ebaa4bb6b0bb6dbce3f0d35e984b791fdf5bbfc7d02d6582e00375741fd9d3ec5e62ff221ad28ae97f8f6afe79794d2264f259719c6 SHA512 14560129181f2e17ecd98a4982266b357d1571d83b8e84c679641d2589c4ac2fdcc126b0419d59cf16e5d91f50c06b52e62b2604ff33f958bb949eb922727c3f
 MISC metadata.xml 507 BLAKE2B 92d909221ef2246c9e2153e30d3c7403ae620d244251c3979c0705f8c22692a9f5b8d8185bef273a4ea12b444ba7979b4fbbe7770e7dcb2e9e33c65533aeaaaa SHA512 6b476aba4692e2731884d7187efefda306824f7c3b3005f8d570131a06d6fc537200746a2bbc9ae3506c2730cf8505435ebcd9b013a7340f33271542a62aea44
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
index 7ceb43a448d5..d4dfe74d6145 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
@@ -142,6 +142,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	tmpfiles_process vdradmind.conf
+
 	if use ipv6; then
 		elog
 		elog "To make use of the ipv6 protocol"
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 74f0fdff481a..12609e5b3a77 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index e2ac44bd920b..f0f307d7bff3 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_92.0.4515.107-1_amd64.deb 86204868 BLAKE2B 4a5e6256d30a1534a72c2f2a719eb570e13d9a9fe7fe780d1a8cab9316a8170f281977c532299d0b95df2abb27564a4a9ca80b500eeed1884bafd561c3d4686e SHA512 337f78ecd93ffdf18659d1d85e34afa32e7c2946d04d1e29f1ac40c9984d05d97f8723d265df2a341936e51600b30981701cf0429002ef798f4e2efff122ad92
+DIST google-chrome-beta_93.0.4577.18-1_amd64.deb 81258624 BLAKE2B 97372492b2fbf057232094e9567e816b30828a75fccb2438bf10974d4b522e1924ad4cb784cb11b8b7cbfaee18f25b0a0d06f4fd9fbeee2f438e9e57590a8192 SHA512 67e57bae0eaa5e4d6b98bb93c87928109ab616c0792ee95ac3719333efcf61cbbfca03514821571cf8248185a83408dd48d057cb3de4b05175e44377dc9a2631
 DIST google-chrome-stable_92.0.4515.107-1_amd64.deb 86193152 BLAKE2B 3b1bcdb5b117b24546ca5476706c786881c0a68d7eb720362f7128d1ea9cad298ea4d5f0bfb708848264fc51d0265ba67c9f206bc6a89ea4e8d1b0bdc9ce0ff9 SHA512 c842e423e8d6dd42bace4d5bb835f7dbf44f46bce0723317d41f4bf56c6250321351b68bdc3d4b46336a6cfbfb78b621eac1df0b530b345bbd2997612e0561cc
-DIST google-chrome-unstable_93.0.4577.15-1_amd64.deb 81257676 BLAKE2B f14ffb08d7e85ab9592d250633e50ac798d9432abbc422d321726c4f694ee314027295ca2c08402bbe4d112a2a5fd75c1fb6843ed56402a23272d39e22ea5959 SHA512 e54c5039e4a6e45f3685acf8625aee07cb08f3ff828285ceb6c6418101a75cab1a1ff6bcf2ba5ebc8b6aca140c1268937f89b016ad021a959ff9f92051d6a8ac
+DIST google-chrome-unstable_93.0.4577.18-1_amd64.deb 81246220 BLAKE2B d20840b798b880f7f8758fb50e7744c3c5e2bb6765e75756ab9f828f09687ecf5a7481192ea732283c0bc3059a1e6ac17f483380d8c9190b76ea37168146ceef SHA512 0d2c36806e44c8fc83ba35b755c75373a4166834f61ef2c70c0aac6868a991697e4f0dbf47854adb894330e39e6e9a7d3651c542a97d78bb592bd3874b38abaf
 EBUILD chrome-binary-plugins-92.0.4515.107.ebuild 1171 BLAKE2B e81b97fb2023b7dca16db3eb99b30a844f31546669b0e95a972777acbd37aa8765c3a5a40123d8c7f93dd2ec627d1417100c4cdcac6f013e9402c2ff392f13eb SHA512 7fbadae792a71fd25142c1fea11f26af0508be8d29b3e59c349a0e3d02d3c5f9898f9ad2914bc7b4d8bfe0ac53544ae87fd7367cf1b008774fbd3490169c1900
-EBUILD chrome-binary-plugins-92.0.4515.107_beta.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
-EBUILD chrome-binary-plugins-93.0.4577.15_alpha.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
+EBUILD chrome-binary-plugins-93.0.4577.18_alpha.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
+EBUILD chrome-binary-plugins-93.0.4577.18_beta.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
 MISC metadata.xml 262 BLAKE2B 6958ab33a832169dbd6b7077bfeae3f398c5d825430d3d85f7f37d732951fa0585a75d28766111d82e5103fa4078cfb3e3d16b98a4520b268d4fd6b670ce811e SHA512 b440c405c25f905f11aeaab1ee3721846ac26502b1e02656f773a3b3be4bc636e85af6185c043c8e94205a3297476d3d2230d6c519d477b5c7d42268916e1128
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.107_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.18_alpha.ebuild
index 969dd2f57c6a..969dd2f57c6a 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.107_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.18_alpha.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.15_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.18_beta.ebuild
index 969dd2f57c6a..969dd2f57c6a 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.15_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.18_beta.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index df67043f37af..d9b0754406ea 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 0316013d0c21..26a1b6564163 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -3,5 +3,5 @@ AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
 DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
 DIST httpd-2.4.48.tar.bz2 7194385 BLAKE2B 5006535dc15b703b4388d90d57559bd882f16210c2f38f4d773312ed8322803629deee18709ca4446000c20c94ff8b0037acbe4dddab9cdbe45417079f708039 SHA512 6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724
-EBUILD apache-2.4.48-r3.ebuild 8246 BLAKE2B 96030fe4dc22adaa182893a2f4b5b0768ef06ae0dd6748bec489b6cf78f65ba8c4dda9bd6b333777ef41c1f4851b234e5300319a6d43a68001eeeb9f3c869940 SHA512 8d693bed1da56e2255c98e16d580ad1b2fae91d0eafa3db25ad7b75a22c257a57e35d667ba8ec6d9311e94956cccdfd19e2720636cf98c1224d39d4cbd74c177
+EBUILD apache-2.4.48-r3.ebuild 8253 BLAKE2B 0004004bfd6590492d43b1bc58e874fea89ee15b3f0af91862b7ca3e55048b629616ae8b7df648b3fd99d807728657491788ae10bc2eead8b91b53f6a0cd79b7 SHA512 76c05e266513f4c81ea0ee76dd55a74b21a6254c4139ec2669e5d1eb65e7e2a1461df7049f90b085b649bf2c0bd5ad19169daf09a5d3c0b963b579edb3b69c35
 MISC metadata.xml 900 BLAKE2B bc278df7a16090cb248b55179c0228b3c9ab846d918799e7b74b21d55f6410556909016ba6960cc77909fd4f8f85b8ebf25ba261553b8c5d42803d750a462cac SHA512 f98af69b59e4403ff194387781e92fe825df71a5d2f8d1c8a960b222eb548e1723335e13479b6e225e62b92b9af09cbd418fa95ddb676a5f039445945d5ae686
diff --git a/www-servers/apache/apache-2.4.48-r3.ebuild b/www-servers/apache/apache-2.4.48-r3.ebuild
index be666634be72..86f6bcd3ee9f 100644
--- a/www-servers/apache/apache-2.4.48-r3.ebuild
+++ b/www-servers/apache/apache-2.4.48-r3.ebuild
@@ -140,7 +140,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
 
 # FIXME! Move this to eclass once all ebuilds are EAPI-7
 RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )"
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 139587169c85..af0de4184098 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -11,7 +11,7 @@ AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d620
 DIST lighttpd-1.4.55.tar.xz 765660 BLAKE2B 7b972de86e7d1a51438718e4d5bd49188c107b0f2e656ead597085ae84f3d41cdb662a7774c6655155d390c26f3e4f0b0dc4243c85cb0255a91d8ca57742f402 SHA512 023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439
 DIST lighttpd-1.4.58.tar.xz 956828 BLAKE2B b8b0a111db64a8af429dd9922503991e55276808b58143ffce3268bc8b20a39cfec9d8c1e2917b34326ac5502801a6ca3b9bae26874f86b6749c363a09225ca3 SHA512 b7f18223e46bf78f866eb22f44a7702df07424271e085da9f0d03e626198c30e87a3959536d02e3588aa47ba4bc7db7c432307175fb3b25a2984f9cf692c0ca4
 DIST lighttpd-1.4.59.tar.xz 968352 BLAKE2B 8997386be24d9d84fa8012aedd8ac97b3ad4fd19bb756163d3e9b8c6984c740475c6db2810817db9d1a246320bcd81f7ab35847707316454523c614a4485299f SHA512 94d312f6ac65c32057018b749c4865220b43b3e4b7fe9396848aa403ea7fdc2ccbf3f4f91daf281b754cf272a52a8bcdc689502773ea33cae36eead2785daa0f
-EBUILD lighttpd-1.4.55-r101.ebuild 6930 BLAKE2B 4c4fa416b1c16180aa963cb27142b204359720984ffda46e97b72f271f33492a2e312124f65297ebd713f416b46eae14738befacb76db774660a977d0ea20cf8 SHA512 825d5eda1bea989b061daf2deaed0a7fb4677b07c5a813b28d46a7b1232ead07013eae16d428471e812d9b614f5c5a504a9d23f1ccef6fb0dc10da951a5857e8
-EBUILD lighttpd-1.4.58-r1.ebuild 7553 BLAKE2B 86e08f4bec91ec5609c202d0f9966b4aa680307dbd58f521b153ac5d31b273ea749ea51f92d5d5e05efb688a18b2fd5b072199fa62376d2f0b4837dc3d696dc4 SHA512 5e39ddbe0fc1e71ec6394e002aab4924812636768650ae79b43f38d87a4c381646ddc531ffce9b1e8cc15497f185a4073491e0df4ea63a4246f551223c1f7d33
-EBUILD lighttpd-1.4.59-r1.ebuild 6630 BLAKE2B 130dd417c1c78dafc4776379e56544b03124fa31d324145f34756fffac1e6c245a84e6eddd44c23e3827fa55518a597bc8f48e25967a430128f6444b5cd96d69 SHA512 41bdb222c0f819050a6da4bc7228ae9df9d4d11bb322f9a4acc49f78a528291a7c5a3968a1fe2d20edfd2f465c0277063c4b5dc818cc9031a50d2107d23dd47e
+EBUILD lighttpd-1.4.55-r101.ebuild 6969 BLAKE2B 4d4f5f97ecf84b270d405e639d2b80c739e9bf80e4fb9282cb76395ab4e02b0d41775ae3c5af504d487cf040072523ebec063059f6d508de81292243f20ff77a SHA512 ffc11c91eb34e8c06727725b2c12570def1ab2165e3497643d2cb468e2913b8835436e2afe936365055032e9a05b22a23eed22a85ab7fcefc49a3f8a0b7edb6e
+EBUILD lighttpd-1.4.58-r1.ebuild 7583 BLAKE2B cb86b521d9affc799ed4dd3feeec74305377043d5610beeb83440cdbb5f3fa1bd59b3727736e62f55f0bc2f6694533b7809b6887cb9db923bb10e37fcb2dbf22 SHA512 c1ea434d4a75494fa3115ac5efe37baa5f38212089e6cf6f01ce4b408e704806b560aa82c59ea17dbcd495651b94db137c5fa10b38ab438ec7f9b6b6305936d1
+EBUILD lighttpd-1.4.59-r1.ebuild 6660 BLAKE2B 563407dd0174623b5f595cdd927af15cda641e11ca467ae0dd3787cdb34794b0fa7f8afc4a6782d6c42216d5117af719e3ee1b7d5ebfeb0d2d024fe64cffcad7 SHA512 03f0012a825934e04c5a71ca450f8192a90083eed75f9178d9888d8f6e283ca5b10ebd115929cae91ab95384261b8e3b73e45c4fff0d057aefc6a9f9d5f972aa
 MISC metadata.xml 1795 BLAKE2B 40fb9d80ed77f9513c3d0c6b2ac4ee919fc496411bd003fad6f505d82eeebb4847e19def7d412939d6936d859eab088d1c345f30be4e6c4f5ca03d8a1dad7039 SHA512 b2c25885ae42fa963aad249a7f183a2093df7a612bbc7f8f33ea173f8c6ff3ebcdaa052e722a4e467ffc56815a4bf40dbb95782bb17b616be93c55a4ef5160fd
diff --git a/www-servers/lighttpd/lighttpd-1.4.55-r101.ebuild b/www-servers/lighttpd/lighttpd-1.4.55-r101.ebuild
index 2da970b100e4..eb3c31223865 100644
--- a/www-servers/lighttpd/lighttpd-1.4.55-r101.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.55-r101.ebuild
@@ -229,6 +229,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.tmpfiles.conf
+
 	use ipv6 && readme.gentoo_print_elog
 
 	if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then
diff --git a/www-servers/lighttpd/lighttpd-1.4.58-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.58-r1.ebuild
index ced96c23fec4..957835c1132b 100644
--- a/www-servers/lighttpd/lighttpd-1.4.58-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.58-r1.ebuild
@@ -229,6 +229,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	use ipv6 && readme.gentoo_print_elog
 
 	if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then
diff --git a/www-servers/lighttpd/lighttpd-1.4.59-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.59-r1.ebuild
index 0ad33eb525b3..6c00dcca0b4f 100644
--- a/www-servers/lighttpd/lighttpd-1.4.59-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.59-r1.ebuild
@@ -209,6 +209,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	if use ipv6; then readme.gentoo_print_elog; fi
 
 	if [[ -f ${ROOT}/etc/lighttpd.conf ]] ; then
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 01340cdb4ad0..19a6ea3fdedf 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -39,5 +39,5 @@ DIST njs-0.6.0.tar.gz 528419 BLAKE2B 7b3c9dd4be8182298cc283e8b19eb4efeef66416d26
 DIST njs-0.6.1.tar.gz 529124 BLAKE2B a24b6542dcef6599d18b86d38dbaeb554beeddb5c100f5bfb97c87c81bd66842afc6f77f23ef2c542ba32da96d5c2f999d3c869fa8d76d919a4f964020d19e30 SHA512 996cdc11d65af5e3d5b3a8f28087868c40409a062e6e1ed3eac8e516cb60b13f88a945c86bea5dde1bc089fe5f96f3ba351d87dbfd513f7140ea4ce98119959f
 EBUILD nginx-1.20.1-r2.ebuild 40244 BLAKE2B 0e325b379b27a89daad78d3b5267d166cc011e7436525170f816718806fe04fe008665f97cc6863100a2a4e3c0b024ccb67277bd324b77a6f2d365d885dfdee0 SHA512 3ce05cf4102b39f1dc02313063dba64011ca8dc4b78550d7492abbabfbd241691c044f57e12d906bbed67b23eb2cfbde1a82192902de62e9b7c58e1d83dc94b4
 EBUILD nginx-1.21.0-r2.ebuild 40247 BLAKE2B 030d4299eb71c2c15c128d6999de8e37a82b231c2944cacd2d43b86c7b192f2abe43bd87aec89d28b343e9f915947850efc2a05eae9d77083c84de9915c8107f SHA512 39e598591c3ecf5d0b28558375a04c53188b6dfaf44b301ea55a5fe5354bc0e2bf800f0d3167414713369c57627beaa9d7a92242e59eacb30ca3c3d36b586377
-EBUILD nginx-1.21.1.ebuild 40247 BLAKE2B e0913a7d4ce26d71fbdb6f318e7e9c0787a66e7f310d8561e55359f60554cb2d384d11ae85f3c47ca5359db4c82d31242b95c4e5c95b3f8c0c5430ac28815b46 SHA512 238608eeebf243d5baff375a388bdfca4f6b09fa3bc49ca45aa2d5a493e84753bd009156e5a749c77c22562784b869b3358b373231e607618501ef9afd4ca2d5
+EBUILD nginx-1.21.1.ebuild 40254 BLAKE2B 39d149c942a6e7b4b80f9a9f4e34901218f7c58b040deecd7e1a63624125ac9579bb8df2afed47654bf4884fa8494e61953c7842aefc79f9f8685257cffc65d3 SHA512 4f241d292ef1a255c1938fc3c241800247d0fd2250debf40a33c476a0ed3b36945d245827b24cf31e8df60e6c39dec9dbf7d29c9b612d588fa43502c49e1fca8
 MISC metadata.xml 1045 BLAKE2B e439ddfd1104b92548cc094a890152297ff81e1c4c3d04e58df8c2f1ebef01daadf317d3d22047c22c1c907fdfb3ed844d279a4692b837d8afb1149da4205538 SHA512 33b75c84396551de2559a56efb9922284991e5ebaa9a18c9d7088b49290f4225a08302c917090dafd6805bb717aa8bd24cdab8fa6d2a0b12050d43f7cb936847
diff --git a/www-servers/nginx/nginx-1.21.1.ebuild b/www-servers/nginx/nginx-1.21.1.ebuild
index 8eee002db06b..5c6078c50aec 100644
--- a/www-servers/nginx/nginx-1.21.1.ebuild
+++ b/www-servers/nginx/nginx-1.21.1.ebuild
@@ -203,7 +203,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 # Package doesn't provide a real test suite
 RESTRICT="test"
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 9cae9c8b374e..9df1b4e95e09 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,3 +1,5 @@
 DIST puma-5.3.2.tar.gz 297673 BLAKE2B e3bfa38347526063587db966d20ea68f32cd88616d89b5f2d9152228d5d420b50c2918e24304c1bc8119af5790a2464f0a055ab92862a56262013ddbba006a1f SHA512 32e80b413184d371d451a35985a371a7655df0f7e81624f2a05e3cf65c2e1b035275a8e25ab03d13c9c1f921ec30cdeb3659e1201baae5940dcb3edcb525ff25
+DIST puma-5.4.0.tar.gz 298525 BLAKE2B d93231582cd83519c258093fd9ac5e2b06398133e82e2d350103e7438a4ed1fd9b36f627739dbbad86e839211850c5387be57d5d114835e7e4d99940e842b128 SHA512 032a507d852c555393f401d4e72c358cf8c49d1c93ff7a559969f3d1f84c0b49180cbcee975bb6fea621d034a00874268ff05ae76f91775cc24089de0b4560da
 EBUILD puma-5.3.2-r1.ebuild 1851 BLAKE2B 56e2293d48a3a862bea7b875afb7bc86d743996abdb0d9c2f7db0b962e5bd1616ea213b2c8eb6f4cdbaa6b2c0a9ae1d7a1f87e2943931c05cd14c9efd4acf095 SHA512 d3de6f6d1c5ace870b89e08a9169dd05ce10e5cc65e8c7013bcb1cd7b6902e9acfb73ce6d95f3ca7806c1b8106460529a51000f3e6b49296fb38c4c6780faa73
+EBUILD puma-5.4.0.ebuild 1846 BLAKE2B 512faa73342671a5bab9059d65985e407c15a6cf0536a484090c7efa8aa813b086e1454cbfb4b5e0cc932042ef1264027cc31dee4d927727824ce76bec11e529 SHA512 f2492d9f48ea27964de2a17c9daedba5d0dc0be4b9809ef14f37e63f13161c2a68c9d57df0ff9be6413a2b1b2519269407645a9b8cc9c4ded26ce065a5a015be
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-5.4.0.ebuild b/www-servers/puma/puma-5.4.0.ebuild
new file mode 100644
index 000000000000..6c3ebe85ea28
--- /dev/null
+++ b/www-servers/puma/puma-5.4.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
+HOMEPAGE="https://puma.io/"
+SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
+RDEPEND+=" dev-libs/openssl:0="
+
+ruby_add_bdepend "virtual/ruby-ssl
+	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
+
+ruby_add_rdepend "dev-ruby/nio4r:2"
+
+all_ruby_prepare() {
+	sed -e '/bundler/ s:^:#:' \
+		-e '/prove/ s:^:#:' \
+		-e '/stub_const/ s:^:#:' \
+		-i test/helper.rb || die
+
+	# Avoid tests failing inconsistently
+	sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
+
+	# Avoid launcher tests since they make assumptions about bundler use
+	rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die
+
+	# Skip integration tests since they make a lot of assumptions about
+	# the environment
+	rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
+
+	# Avoid test that uses unpackaged stub_const
+	sed -i -e '/test_shutdown_with_grace/,/^  end/ s:^:#:' test/test_thread_pool.rb || die
+
+	sed -e 's/git ls-files --/find/' \
+		-e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	einfo "Running test suite"
+	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
+}
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index 8f48251c8a6c..b75fb4838ab9 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -1,5 +1,5 @@
 DIST tornado-6.0.4.tar.gz 496204 BLAKE2B 6c092214d03baf5cf7615b780043e2fa40a4ed623b7ca59a2528cc3625ba904b21ef93c528278adedaf83e3b6e5a6311d867833dfe9826637e97918dee6fa334 SHA512 d29d69cf40f8b34fb2c55d81b6ecd9bc7c6fdf644eb4ff35452829510c0d5ec185da0a6067fec3e8afb2bedf9f5f08b06adb0ad53dcab04cb791a75abc304d6e
 DIST tornado-6.1.tar.gz 497359 BLAKE2B ed5981dec5cca962f907f97b7f906c1eef40d2b2b6d6cc16a21bd0a0a91ee58a60bea84b7ceeeff30b3462d707c56a5062c71d4ac8f25ca6a306ded6c6f072c5 SHA512 0ec1db1fad911182bda547c177a18b107b906cf66576443069e2b986cf041b3d4ebe08e5a168aa5cd3b56547f32f8b384bacaf74db89f582951d7b610b7494e8
 EBUILD tornado-6.0.4.ebuild 1378 BLAKE2B c6f2df1b4d99b49aee5ff67fbe2e231d20ff77162fbb7e1561ec8364eb4e8311cec852b1ed419f3b16057b0df0008ba6f096a94c7b1a6072652f70aef9e2d379 SHA512 4d9aa908a512a4f59e09008d301fcd6b4efaa5c3498d190c7e55e694f9740d2ebb1d3056ee73c7f973f4f1c35ad30e63eeea5d7a78d5126a0e4025e486472e4f
-EBUILD tornado-6.1.ebuild 1434 BLAKE2B 766e987eaff1564163d880c0c4bb9811b565f85b2460bab866463ef53fa69718403c1caff6a99118aff0749c9aa555e8a67c3539455279ab655d1357c81c4b9f SHA512 41cf69d8ae2151b95c6f09d90611c6853a399b550ef9447f1599e4ab5b53ad5abb212b8df5d64b4b2c4371c182c741f7c0d5dd21b2e855d2bbf4b21c02062dd7
+EBUILD tornado-6.1.ebuild 1432 BLAKE2B 3d4c844f22c6e50e0c7bd54ca9425c4587fa9e626393064daa0c765f81fe4c27e2fe4ccae3637082ad14ed51a808224ba0f6a180770cdc1749995276ba03aa7b SHA512 c503cc6aee3296228b84ee2ebe527fc731528718856f6727408e8f70d95e487872e6b7c76c2950035a85998893f8415e1faf20461449ece5f7e8ac75cbb95b1f
 MISC metadata.xml 380 BLAKE2B 16a28ca707ba911df09dfad39b269bd888734c1f5e54fdc57d84f62b541e284f248137a01c13055f5e9fa1e1da0a2c9e1382006119cc11ec19302516262b7dc1 SHA512 e790429d61042b60a9011710e96df0044c64cc5ac941ab6268386138d3a66e46d40ed1098ec8bc164d9f4341040946ec7231e8f28dda11790ecc482b06978771
diff --git a/www-servers/tornado/tornado-6.1.ebuild b/www-servers/tornado/tornado-6.1.ebuild
index 8c099492931d..4fbcd193a31d 100644
--- a/www-servers/tornado/tornado-6.1.ebuild
+++ b/www-servers/tornado/tornado-6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 61de2645b586..ac826b03ad3f 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -3,5 +3,5 @@ AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
 DIST uwsgi-2.0.19.1.tar.gz 804398 BLAKE2B 73fc19990866eb1058a742b34a817b3bd87e00c838da055bece2bff5e13c161f53c642866ed591aa4afeb23ef924205502f2cb0a4cf9d303b5b63fb9a53f57e2 SHA512 34b55f7c7a77dc0b0dab34d1a9ca9a4cba8a9261969656c88435e7f32fe8a0c5654e1562706775f77e2f60c4ad0f5c6055257a23ab7d387c1579639e054807b5
 EBUILD uwsgi-2.0.19.1-r102.ebuild 11527 BLAKE2B 9fc8b239c913b4bb7cdbf389549d5a70c8ec1433b188787fb5d0260d6766f1afee6bead57da94ea1b40b3db8bba93622cb0d34deab2cc283babf940344ec6355 SHA512 8b76bda9d5db446f7376201a0f6d639bb3e3534701b9d45ba91c0a22f76cc290dd2b9ffd1dd9d57905f0d5ce59a9c8c1a6cbd3034e292c5f45d91ff5d38e4875
-EBUILD uwsgi-2.0.19.1-r103.ebuild 11531 BLAKE2B 3c9e8d071aa31f0a630e4b46ca7887d2d4babd13bf800c24ff9d161db8abdfadf3b0e0a76a68a1dc499e97dfa942dfa1bb3df57888c7840372647c6540134df9 SHA512 d98e62940fb008aff7eadd28b10c74c8f92f80b85e78faa8d4b1a6e6325c40ab8de989ed7deb1a4f9738cc6686b06ddab14b0ce85db9cf9b9cebc5c8cd3d55b0
+EBUILD uwsgi-2.0.19.1-r103.ebuild 11529 BLAKE2B 4614706b2c3b5fde0b35feab45c9dc4b653f59d02c70b35f973a646348b9570b8232eab98ef48241c308b5b6ffdbc370099a81cb06d12050d8667a713c7ca410 SHA512 25e50dd327bb7fbd11882d324b86da8fc86906283f4e6aae4f64d10d7de569a4dbccd1e11a892e7f6e71df6c4f88733417beb2212c078fe339d07e1d565d7b11
 MISC metadata.xml 1411 BLAKE2B 89114f75b2150f4340e30cd106115f0e9aa1a00389558f6f75aa86c0bf5a11d5df5ecb794c12f7bb39791d8edef40415cbca4403f8f2b65bd642ce52e95357a3 SHA512 33d3767a25dfca633e5149a20900d56998c40204a4c55e3814248574d0c8525883a842222ed5f8ac739a06cd09d806c189ff6f742d1277bcd3f8e8afdea84445
diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1-r103.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r103.ebuild
index 567debaeaf20..984dd22ab31c 100644
--- a/www-servers/uwsgi/uwsgi-2.0.19.1-r103.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.19.1-r103.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm x86 ~amd64-linux"
 
 UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
 	http ugreen signal syslog rsyslog
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index b3598c162808..85f4270ff438 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index ac3fe6bc22cc..9d8018a4a212 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -3,9 +3,11 @@ AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.20.11.tar.bz2 6476116 BLAKE2B 71ec31c4ed050a3e27fadd525f1039895e43571c04b0a1efa9b35fda318f17b3c89d403c914c591345e7d245a7ebbd6e0f206e4415c1d54f1368fb0735a3d7ef SHA512 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2
 DIST xorg-server-1.20.12.tar.xz 5143456 BLAKE2B 1e70823890ccb382add92b8bda9e88168477d651edee70a97fd7632a290a20b8848f2c364aa859700e3e8528e4211d39104fa7dafac3f75f8e51afcfa98cffcf SHA512 98350c42fb1f10c965663c1c8d4b225689a6a63163d788d454aa71b28b9cc8fcf9709a932f882358a13ca0c277c0c15812d05919092b4c32828d4ed61cca0406
+DIST xorg-server-1.20.13.tar.xz 5122260 BLAKE2B 4435d25d8b379142fcc4bf60d82e52417ac3ab22a77ededa1472785d67c23bfb95be8e10465fc4859645405b8e580d6dcb262caea39c408e724d0e5ea61b37af SHA512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3
 EBUILD xorg-server-1.20.11-r2.ebuild 5219 BLAKE2B 7bd00eb534c539e80ca36cf387d0d0e57a0c45a6f489e0fba3c48d263a2d1b46cac1612e190280f0dbc47f018c8b32c98f3a25fb1241f886d3bae1b488c9ca59 SHA512 d9258c86c261e7772bfae2024ffb282d6aedf0591928e923d4ddd561e75349ea634a4d26d731542aba75784d61a88d65b3b609ff5d793d629e6380106c90b195
-EBUILD xorg-server-1.20.11-r3.ebuild 5295 BLAKE2B 85bd4a2d53afaf305953f0f125bcf501b0f4c720748efbdeb6a596242881c37c65a5aedd4c3685c35fdf55f6db718fa4854b49fbfc125bc896f8e161e53f9189 SHA512 ad61d98793d0edfcf8f77f1fb0155d695404a2295a07511a329e6d1344fbefd3208f18072f3f312b535988497d0e0ab28a9a7a120f7c28311094a9d82ab85b43
+EBUILD xorg-server-1.20.11-r4.ebuild 5232 BLAKE2B f11f0744e455d8b4fa241a26c7bc4b116c8b9107d7968e255838b4bdb092d79e333c730ebb5a5977890ee5f11380ead8be48ce18bd1f9955d5f5ffe6922bf0dc SHA512 e6737367baf082ecf0de2f97ebe3b9a2864bcafc8da677fd62f8783729ac02f568fdb5592b5c66fedf22975883e54dd7848f2896d3660477a64f6d2754a9780d
 EBUILD xorg-server-1.20.11.ebuild 5574 BLAKE2B 9e1a53aab7fc913898e01728057bb121f68e41d3f50ad022328474e6b2fcea48502d5d64c2116faa8417db174259146420171cb77f1d10328a9951bb67de6b4b SHA512 b209f1dbbcdb8cacac4b638b2ad9db0527b535c5111535a99f6965124dba0e77fec890c292b07e5cdfef8f3a5f8e5a5f4e53464061b9936c8b391dbd0a23e635
 EBUILD xorg-server-1.20.12.ebuild 5320 BLAKE2B 73f6cc91d34fef4b897a2fe4fe68bf6f2a8de588a8821e283efb8f6b44f9038834e8495acae877f74f29920a0bb022d34b164eeb2f5db246a7169a14232a5045 SHA512 451311224e15acc480e43e4cfb986661fb84c17604b22f53a5c5d0d7adc742690deac89075b0a3f735feb07439a9fa0e2ce823bdb55b43837818884498b74c5c
-EBUILD xorg-server-9999.ebuild 5320 BLAKE2B 73f6cc91d34fef4b897a2fe4fe68bf6f2a8de588a8821e283efb8f6b44f9038834e8495acae877f74f29920a0bb022d34b164eeb2f5db246a7169a14232a5045 SHA512 451311224e15acc480e43e4cfb986661fb84c17604b22f53a5c5d0d7adc742690deac89075b0a3f735feb07439a9fa0e2ce823bdb55b43837818884498b74c5c
+EBUILD xorg-server-1.20.13-r1.ebuild 5263 BLAKE2B 29bf1bd18ed5b65fdfc76071167cc4650a84fcdc55ed03bfa7fd0fa526880e263ba70f5b1a131e1e8925f5031b40edf64fff49cfe574b30558e42be0bc2b7b3c SHA512 b0cc8ac3574d4376dbdf2fe38dec763419fb6a53f6af8529457aa24c1648c7e9d78dfa30d2d2042040ab77dcfde274aa8ad4145c14ccdd2ca0c2f50c25e6ffe7
+EBUILD xorg-server-9999.ebuild 5263 BLAKE2B 29bf1bd18ed5b65fdfc76071167cc4650a84fcdc55ed03bfa7fd0fa526880e263ba70f5b1a131e1e8925f5031b40edf64fff49cfe574b30558e42be0bc2b7b3c SHA512 b0cc8ac3574d4376dbdf2fe38dec763419fb6a53f6af8529457aa24c1648c7e9d78dfa30d2d2042040ab77dcfde274aa8ad4145c14ccdd2ca0c2f50c25e6ffe7
 MISC metadata.xml 895 BLAKE2B 03b64d8a77f70c326650f17775d8c605c1dad44529330d26daee4136bd36e0f53d79212a7038d943795dbc5772dbcd52208b762aad42ed832ebabd848e5fa15f SHA512 fcee97e4ee4b1f972c4bea7626a719aa4d18b75b4475554327369349d5f42c0b1a3b8fb513727751b9703cfb9afc34fdb073cf19e116e7c5f6fad9b204574a5c
diff --git a/x11-base/xorg-server/xorg-server-1.20.11-r3.ebuild b/x11-base/xorg-server/xorg-server-1.20.11-r3.ebuild
deleted file mode 100644
index 29069a22532d..000000000000
--- a/x11-base/xorg-server/xorg-server-1.20.11-r3.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-inherit xorg-3 multilib flag-o-matic toolchain-funcs
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	media-libs/libglvnd[X]
-	dev-libs/openssl:0=
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	xephyr? (
-		x11-libs/libxcb[xkb]
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-18[X(+),egl,gbm]
-		>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	)
-	udev? ( virtual/libudev:= )
-	unwind? ( sys-libs/libunwind )
-	>=x11-apps/xinit-1.3.3-r1
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)
-	elogind? (
-		sys-apps/dbus
-		sys-auth/elogind[pam]
-		sys-auth/pambase[elogind]
-	)
-	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
-"
-DEPEND="${CDEPEND}
-	>=x11-base/xorg-proto-2018.4
-	>=x11-libs/xtrans-1.3.5
-	dmx? (
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-"
-RDEPEND="${CDEPEND}
-	!systemd? ( gui-libs/display-manager-init )
-	selinux? ( sec-policy/selinux-xserver )
-	wayland? ( x11-base/xwayland )
-"
-BDEPEND="
-	sys-devel/flex
-"
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	elogind? ( udev )
-	?? ( elogind systemd )
-	minimal? ( !wayland )
-	xephyr? ( kdrive )"
-
-UPSTREAMED_PATCHES=(
-)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-)
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating; and I have no idea if Gentoo
-	#	package it somewhere
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable debug)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable test unit-tests)
-		$(use_enable unwind libunwind)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal dri3)
-		$(use_enable !minimal glamor)
-		$(use_enable !minimal glx)
-		$(use_enable xcsecurity)
-		$(use_enable xephyr)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_with systemd systemd-daemon)
-		--disable-xwayland
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-		CPP="$(tc-getPROG CPP cpp)"
-	)
-
-	if use systemd || use elogind; then
-		XORG_CONFIGURE_OPTIONS+=(
-			--enable-systemd-logind
-			--disable-install-setuid
-			$(use_enable suid suid-wrapper)
-		)
-	else
-		XORG_CONFIGURE_OPTIONS+=(
-			--disable-systemd-logind
-			--disable-suid-wrapper
-			$(use_enable suid install-setuid)
-		)
-	fi
-
-	xorg-3_src_configure
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x || die
-	fi
-}
-
-src_install() {
-	xorg-3_src_install
-
-	server_based_install
-
-	if ! use minimal && use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${S}"/hw/xfree86/xorg.conf.example
-
-		rm \
-			"${ED}"/usr/bin/cvt \
-			"${ED}"/usr/share/man/man1/cvt.1 || die
-	fi
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-
-	find "${ED}"/var -type d -empty -delete || die
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.20.11-r4.ebuild b/x11-base/xorg-server/xorg-server-1.20.11-r4.ebuild
new file mode 100644
index 000000000000..82ce49e94854
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.20.11-r4.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+inherit xorg-3 multilib flag-o-matic toolchain-funcs
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+if [[ ${PV} != 9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	media-libs/libglvnd[X]
+	dev-libs/openssl:0=
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.89
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont2-2.0.1
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		x11-libs/libXrender
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	xephyr? (
+		x11-libs/libxcb[xkb]
+		x11-libs/xcb-util
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-18[X(+),egl,gbm]
+		>=media-libs/libepoxy-1.5.4[X,egl(+)]
+	)
+	udev? ( virtual/libudev:= )
+	unwind? ( sys-libs/libunwind )
+	>=x11-apps/xinit-1.3.3-r1
+	systemd? (
+		sys-apps/dbus
+		sys-apps/systemd
+	)
+	elogind? (
+		sys-apps/dbus
+		sys-auth/elogind[pam]
+		sys-auth/pambase[elogind]
+	)
+	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
+"
+DEPEND="${CDEPEND}
+	>=x11-base/xorg-proto-2018.4
+	>=x11-libs/xtrans-1.3.5
+	dmx? (
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)
+"
+RDEPEND="${CDEPEND}
+	!systemd? ( gui-libs/display-manager-init )
+	selinux? ( sec-policy/selinux-xserver )
+"
+BDEPEND="
+	sys-devel/flex
+"
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)
+	elogind? ( udev )
+	?? ( elogind systemd )
+	xephyr? ( kdrive )"
+
+UPSTREAMED_PATCHES=(
+)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	# needed for new eselect-opengl, bug #541232
+	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+)
+
+src_configure() {
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# NOTE: fop is used for doc generating; and I have no idea if Gentoo
+	#	package it somewhere
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable debug)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable test unit-tests)
+		$(use_enable unwind libunwind)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal dri3)
+		$(use_enable !minimal glamor)
+		$(use_enable !minimal glx)
+		$(use_enable xcsecurity)
+		$(use_enable xephyr)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		$(use_with systemd systemd-daemon)
+		--disable-xwayland
+		--enable-libdrm
+		--sysconfdir="${EPREFIX}"/etc/X11
+		--localstatedir="${EPREFIX}"/var
+		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+		--with-xkb-output="${EPREFIX}"/var/lib/xkb
+		--disable-config-hal
+		--disable-linux-acpi
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+		--with-sha1=libcrypto
+		CPP="$(tc-getPROG CPP cpp)"
+	)
+
+	if use systemd || use elogind; then
+		XORG_CONFIGURE_OPTIONS+=(
+			--enable-systemd-logind
+			--disable-install-setuid
+			$(use_enable suid suid-wrapper)
+		)
+	else
+		XORG_CONFIGURE_OPTIONS+=(
+			--disable-systemd-logind
+			--disable-suid-wrapper
+			$(use_enable suid install-setuid)
+		)
+	fi
+
+	xorg-3_src_configure
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x || die
+	fi
+}
+
+src_install() {
+	xorg-3_src_install
+
+	server_based_install
+
+	if ! use minimal && use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${S}"/hw/xfree86/xorg.conf.example
+
+		rm \
+			"${ED}"/usr/bin/cvt \
+			"${ED}"/usr/share/man/man1/cvt.1 || die
+	fi
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+
+	find "${ED}"/var -type d -empty -delete || die
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
diff --git a/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild
new file mode 100644
index 000000000000..93c416de7606
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3 multilib flag-o-matic toolchain-funcs
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+if [[ ${PV} != 9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	media-libs/libglvnd[X]
+	dev-libs/openssl:0=
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.89
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont2-2.0.1
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		x11-libs/libXrender
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	xephyr? (
+		x11-libs/libxcb[xkb]
+		x11-libs/xcb-util
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
+		>=media-libs/libepoxy-1.5.4[X,egl(+)]
+	)
+	udev? ( virtual/libudev:= )
+	unwind? ( sys-libs/libunwind )
+	>=x11-apps/xinit-1.3.3-r1
+	systemd? (
+		sys-apps/dbus
+		sys-apps/systemd
+	)
+	elogind? (
+		sys-apps/dbus
+		sys-auth/elogind[pam]
+		sys-auth/pambase[elogind]
+	)
+	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
+"
+DEPEND="${CDEPEND}
+	>=x11-base/xorg-proto-2018.4
+	>=x11-libs/xtrans-1.3.5
+	dmx? (
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)
+"
+RDEPEND="${CDEPEND}
+	!systemd? ( gui-libs/display-manager-init )
+	selinux? ( sec-policy/selinux-xserver )
+"
+BDEPEND="
+	sys-devel/flex
+"
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)
+	elogind? ( udev )
+	?? ( elogind systemd )
+	xephyr? ( kdrive )"
+
+UPSTREAMED_PATCHES=(
+)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	# needed for new eselect-opengl, bug #541232
+	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+)
+
+src_configure() {
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# NOTE: fop is used for doc generating; and I have no idea if Gentoo
+	#	package it somewhere
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable debug)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable test unit-tests)
+		$(use_enable unwind libunwind)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal dri3)
+		$(use_enable !minimal glamor)
+		$(use_enable !minimal glx)
+		$(use_enable xcsecurity)
+		$(use_enable xephyr)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		$(use_with systemd systemd-daemon)
+		--disable-xwayland
+		--enable-libdrm
+		--sysconfdir="${EPREFIX}"/etc/X11
+		--localstatedir="${EPREFIX}"/var
+		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+		--with-xkb-output="${EPREFIX}"/var/lib/xkb
+		--disable-config-hal
+		--disable-linux-acpi
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+		--with-sha1=libcrypto
+		CPP="$(tc-getPROG CPP cpp)"
+	)
+
+	if use systemd || use elogind; then
+		XORG_CONFIGURE_OPTIONS+=(
+			--enable-systemd-logind
+			--disable-install-setuid
+			$(use_enable suid suid-wrapper)
+		)
+	else
+		XORG_CONFIGURE_OPTIONS+=(
+			--disable-systemd-logind
+			--disable-suid-wrapper
+			$(use_enable suid install-setuid)
+		)
+	fi
+
+	xorg-3_src_configure
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x || die
+	fi
+}
+
+src_install() {
+	xorg-3_src_install
+
+	server_based_install
+
+	if ! use minimal && use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${S}"/hw/xfree86/xorg.conf.example
+
+		rm \
+			"${ED}"/usr/bin/cvt \
+			"${ED}"/usr/share/man/man1/cvt.1 || die
+	fi
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+
+	find "${ED}"/var -type d -empty -delete || die
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 9d8b35301a6c..93c416de7606 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} != 9999* ]]; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity"
 RESTRICT="!test? ( test )"
 
@@ -63,7 +63,7 @@ CDEPEND="
 	!minimal? (
 		>=x11-libs/libX11-1.1.5
 		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-18[X(+),egl,gbm]
+		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
 		>=media-libs/libepoxy-1.5.4[X,egl(+)]
 	)
 	udev? ( virtual/libudev:= )
@@ -96,7 +96,6 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	!systemd? ( gui-libs/display-manager-init )
 	selinux? ( sec-policy/selinux-xserver )
-	wayland? ( x11-base/xwayland )
 "
 BDEPEND="
 	sys-devel/flex
@@ -109,7 +108,6 @@ REQUIRED_USE="!minimal? (
 	)
 	elogind? ( udev )
 	?? ( elogind systemd )
-	minimal? ( !wayland )
 	xephyr? ( kdrive )"
 
 UPSTREAMED_PATCHES=(
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index b7408381cd69..6b27ddcd1d70 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -4,5 +4,5 @@ DIST xwayland-21.1.1.tar.xz 1257776 BLAKE2B 181aca3d3fad3759eb726c6f6141912d588a
 DIST xwayland-21.1.2.tar.xz 1258732 BLAKE2B 1a797e4dedee4f47ada968d4a06c89da2fac64bbfa587e84f01d5b0aa7da23402b70369a274a672470e6d8df0645fd117d129d1f2049b25394d825a9eed3e451 SHA512 3bd595a563cbc44b49a00c85adabdbcddf02fd55c6500ed2711557c156f10cd273af93f7b232865141ad27392a85583e40268bcedad183ad9eeefba457cef6c6
 EBUILD xwayland-21.1.1-r2.ebuild 1794 BLAKE2B 3558e27b1006cba4b301645dc203cfc7e2f69b884b714d47eccb613e01cdd51c3e3570dcd0f9ca1de11116b507442f701a9ead1c7f694f508a3686d17e044102 SHA512 8bef4a535c5257c6be77706b7a809701adfc6b0a604efa7a1dbcc4fb333a1be20a41dbcd7a20a6f6613b400b725c96627890cb6b86287ebfaa912d57b4ac63c1
 EBUILD xwayland-21.1.1.901.ebuild 1808 BLAKE2B 05ff3178a7e0327e31f566c1822d3014028eb17db924a078f26d689d376ce684b4b65571075057331dd600d29dcc4c95a3a681a78dd818766e5fd302e5a03fe4 SHA512 75e1a6dac3d1486bcb3680c6e414ac11abdd59b0c4be57ecbe6f93e572192726c8f3f25258ff2d76157532a345b7e7a6679b6eaa2bb83aac939592b73e70eca0
-EBUILD xwayland-21.1.2.ebuild 1912 BLAKE2B d5a8ab21b6fd6622f2f3df295f47112ff74143b45c579e46f42fd6bb0a03cff51052e002f3bc9293ee0acd5243b62b4599863d8115bfe46060f02d43049b6996 SHA512 14977c1d9cb9b4e7508019b0e365e7e499e5ca3b2f74cff6bc2c059cbc0dc06cdef697d3b4c48c7fbfa8ad0a93ac0323f865f0e2c83b15caee847c2cf4862331
+EBUILD xwayland-21.1.2.ebuild 1918 BLAKE2B 55c67dbdb3a7221f4694bd4b9b5a0c574640067ec15b14eb8a2bf6e2dfdc8601ff1db3fab6fb1aa03a0bfbaafccdbbf22d567df849b771d345bb25da1ce86768 SHA512 bf8c1c16d346227c0a54e116faae4824cad188dab8c9caea0018835edb447c8beb1df15dc7f54ec0ded4bf70250c2ba22824e5e9020142e2777ad618efeb073d
 MISC metadata.xml 492 BLAKE2B df9bce6c0bf8fc88dc1386143ceffe54b16e9e024281d6839496827ba1e645b01126ed2937e152b9cd06ee232c8149c5a789bc4ce6d380b5b6cec722b7c65c13 SHA512 987198d7347e1849f7974873d8140d9dfa921b3afff3a6864c47b59baa29de92bdc90a83b03f3765c7a4e15553f2afaa1ae164aac2d9e3b52d9839444bee6255
diff --git a/x11-base/xwayland/xwayland-21.1.2.ebuild b/x11-base/xwayland/xwayland-21.1.2.ebuild
index b4eed7a433eb..327122b433d5 100644
--- a/x11-base/xwayland/xwayland-21.1.2.ebuild
+++ b/x11-base/xwayland/xwayland-21.1.2.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	>=x11-libs/libXdmcp-1.0.2
 	>=x11-libs/libdrm-2.4.89
 	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	>=media-libs/mesa-18[X(+),egl,gbm]
+	>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
 	>=x11-libs/libxshmfence-1.1
 	rpc? ( net-libs/libtirpc )
 	>=x11-libs/libXau-1.0.4
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 6ed3a52878af..10cb86950215 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index f4aa8313a352..5dfda9faf5fe 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -49,9 +49,9 @@ DIST nvidia-xconfig-460.84.tar.bz2 108471 BLAKE2B cc3f100902778b66088bca3ff74df1
 DIST nvidia-xconfig-460.91.03.tar.bz2 108477 BLAKE2B d95505e508ca16d8ebe8c22c445a1b686c32a626c379b1b48e2a8101969fc03b90446953cc30e945da9388237fa1b9e5f83417aba1fb062d58866a523c256769 SHA512 4bb8f7fc42e7fa5e3897884bd7e722c4fe8ab1e4a87cad4136e1764cdd91d4795f817dcee63a20279315b4839d92fe5244d073ea2310c704f8aacd38bacb28a4
 DIST nvidia-xconfig-470.57.02.tar.bz2 109072 BLAKE2B e3a8f98cb31ec323ae0055252611193669a26ff43184b42433b3089899f88b6baeb13d18ee9dd09807710601558ea1e4c6be54326bc59cbff448ec6dd30f425e SHA512 da4d5de04aadb4941837062ba28592135ee2e2344132c6f5561288e22448a40bb2467d39bd09e0bf838caaa178ccc36a0c2fdbdf80006f3769161aa15550e350
 EBUILD nvidia-drivers-390.143-r1.ebuild 11738 BLAKE2B 7812ee0aea4f6e80aa67a088c03f8f5192883e360d867a0c637f228663dc368ac5e1d4706ad8c02fbd2b3f4d3e0312785bf79c38aace63bc1e42aaef9e1717f3 SHA512 f895e434a013b444925876f90374f1ab254d7ae43b91e389ac60938eb904ce5c34be6b9754ceee5f686399c66f8b0ea2fbf55296ea9288c1f65193872cd88367
-EBUILD nvidia-drivers-390.144.ebuild 11605 BLAKE2B e7377375ad3b5e16eefebb3f12b75fe6320d8eec1d16efceccb3dfa04d24d319256cea2a7462b0a78cdd4fa65b97dace4351c1b8a830f377880203f37191e504 SHA512 b625b15f009560310629458bcc701754d16cdd8de1a8e4a0fdbfe7975f3cc74959b4126d967798cbd4cb8fe04c37887ae2833bb1221c26dea68c33b5d753aa71
+EBUILD nvidia-drivers-390.144.ebuild 11603 BLAKE2B 688f91af5e40040f653348a6f1006509cb55e3fbbccf4786326b291260cd193dbd4e910d13bd9389c41155fc245016209d18b7a962960fa1b45e0c50d2b71989 SHA512 2e9d5ce910e7f17c4370c4bc8c350c975bdd91a8a14100a15602a2c9299827efa3242db417dddb6ae176044eb74f86a49701f87f494620934c4e1b44d285e6c8
 EBUILD nvidia-drivers-460.67.ebuild 11237 BLAKE2B 0084f35297377161c1a96e11c2981641f21dedca2fa1eea6d04adc31558107cc1546def9b286e81d1a912993e9b29362c27479084cd5b1a3a3c6050488406a8a SHA512 5e294a7d73c9d5b49b9e8c9c7a98dc93f5cd38f27404ab0a22b4ee1d55f215c963b2edbb942aa6cef5fc856c3e44b5a13c55f4c5027308feb49e0c2e782b8188
 EBUILD nvidia-drivers-460.84.ebuild 11769 BLAKE2B 386291ff10db832ccc664d9b8b211eb7ef8d88ab1ceb349e47ce386aefeb0a960d100672655d23b5c26259e88653c360c54f62e27505b1d82f4a42f94d3890ac SHA512 d5aaceb43c0d25ea69123d8b613840550a92cf83e407a0ee4cf38e2e9b5ff9338effe8053d6caf3aab0e19e818c9a8fe993d9443e3ec37aef27a6319243fa8c5
-EBUILD nvidia-drivers-460.91.03.ebuild 11770 BLAKE2B 8fed287207f2c927feaf0e07654b3761a6f78feb029d4e57a7e4bc69136dcfb8e331f72182eb90299af3f19fc774fe1178b9eabfad8a0fd48faf5bf03846c8b7 SHA512 3b4bc6a406b706ba04a034cb98d2ea0f782af659ce1e9c27a896737c185bbf88e65d484aa8f91946c29b1acbad0920748aca6609a1a7aa51a15911dca0840183
-EBUILD nvidia-drivers-470.57.02.ebuild 13846 BLAKE2B f0403b95170aa6582ce30fa3bbf4ae94720f988da970dae09d9854956c9166f68c4b014a0c59f957b9092da1c427fe3e73c1558419c9dee7df077c17dbd90277 SHA512 3b9916ced8648175c9f70ce60e54792f967479806fcddd7b3a1d601c05576ecd5f2bc39a48b05cdbbf323d42cd59023cc20585d5dc098976c0e712a31fd6c258
-MISC metadata.xml 872 BLAKE2B 288b9c7801429c23f8f07780640c08d4108a55f79de091c6461c46524c6b1d46bf0927ad6ebb9621e587cefb59cbc18576756fd68d27b7e5bc2f8c19737bc652 SHA512 d940a03167959acb9e8c62efb8d47e3dee8c49c12ab281f419780346cbd4703d6f853cab8cd49e1680686378474d38aed8fa188e6d69ea58a404c84cb14a2e01
+EBUILD nvidia-drivers-460.91.03.ebuild 11774 BLAKE2B f1dbd1b2edfab144149437a7e7c33728da2a39829834926c80f297afdc075c8e15348079c068f423ceeac3d4ff24fc3d32e142d86297b1c1b0b0b59730ce0e17 SHA512 d9d79a51cdbfa1ce7af1478c05824e062885e98d01deab08b26baa9933d89536e30c2edb7109da1499277fe751091e9c792692572dabb28ff28db17baa9f44c7
+EBUILD nvidia-drivers-470.57.02.ebuild 13851 BLAKE2B d153b8b866985b9016c5d78c819a353657be298d242981410b3daae3d5912583774597854af74a0dae866bd20fa4a37f0f7e22624dc50574b59831a8dff2ce04 SHA512 98d03bc7641c4f9262e27de543020f9f7158359d4fcd851082e27585739366a6ca411b8ce34d2fec747a4580537837fd59e9532703b5774205a5f6e89e94d8bd
+MISC metadata.xml 901 BLAKE2B 00dda86ba59983764dd3c77d326ae6c33280ed6623d0cb1e6bc6bca03638763e067c2390669a4656b0f714d6b773b685c5f18f08bc9ce66ee13d7d212106e230 SHA512 bacdfaf46613050270b31874ec794953a8e988aca8c2d9f9cf5addad409dc619d95a0f0fc243a9f4c3e6e7c08307588c94de63a74b8a958d15af5ad30cb526b8
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index 0624fc192269..09e3ff07b400 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<maintainer type="person">
 		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
 	</maintainer>
 	<use>
 		<flag name="driver">Install kernel driver modules</flag>
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
index 24a3a3618ea9..3868afcbfa88 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2 MIT NVIDIA-r2"
 SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="+X +driver static-libs +tools"
 
 COMMON_DEPEND="
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
index f244d91a9477..6d71ba06004b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2 MIT NVIDIA-r2 ZLIB"
 SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="+X +driver static-libs +tools"
 
 COMMON_DEPEND="
@@ -91,7 +91,7 @@ pkg_setup() {
 		~!LOCKDEP
 		!DEBUG_MUTEXES"
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and optional nvidia-drm.modeset=1.
+	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, so enable
 	options such as CONFIG_DRM_FBDEV_EMULATION instead."
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild
index dc6c66192c96..de8316a2bc2d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.57.02.ebuild
@@ -93,7 +93,7 @@ pkg_setup() {
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES"
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and optional nvidia-drm.modeset=1.
+	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, so enable
 	options such as CONFIG_DRM_FBDEV_EMULATION instead."
 
diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index 98d1e42ae4e2..91f30aed7523 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1,5 +1,7 @@
 AUX xf86-video-amdgpu-19.1.0-Fix-link-failure-with-gcc-10.patch 848 BLAKE2B a4f7b14f2c3568ea3b0a1d568e8a144b8e7a1872b8723ba4d452df2c75e814eae3aa9cb336ad0c4a44639f10ea6cc66a9bce6d0ad33b730fd45f50f7d77b6df4 SHA512 1f4e580a11ddee24114a5f7692ec8331eafe57492f7f59461f8043132a2fc48d71adce2f7a831b6394804161689c13023711178c25fb34c2d299a9dada603fe4
 DIST xf86-video-amdgpu-19.1.0.tar.bz2 441746 BLAKE2B 75906c9b2200174711360e8cf095b8537e62618747afe5ec13f5a36ad8b61001b94e9df675df2026a61e66b6ea05e0e022640d487851d62ca4ed5ce61dd5aae7 SHA512 ccdaa2378492da1a2f3d18fedacd1318c4708da534a8a959276a82730d5420619d83ad1ec8d7835c55655fe56123cd9bffb44e6223c5a97033c01f598af4a173
+DIST xf86-video-amdgpu-21.0.0.tar.bz2 448400 BLAKE2B c7a90606b37b646b946f76d083b3d59755df331ffb7e83e4e65a821a8c0e556504b20207d6bb86e80ea98646184549b6388727df543e1e2cbab37600e243fa72 SHA512 44ccc8ddc36f09d1608cf58b6cf85dda090671c46c5643e9453f7d67f4d6850c3c9753eba43539d45773198b8042898a50153b5225780e4b2852410c5521314a
 EBUILD xf86-video-amdgpu-19.1.0.ebuild 629 BLAKE2B 1f93b25f75de10b7e3b71fd8d5a78370d6395978f5ef82695979ae9ff3ca6618c834e77acde34bffa6e92e30cb56267a8dc3a2045fbd4e1979c87084bd31d64a SHA512 fac323b81cc04858c3e000fecde83b660c20563bbfacf083f22dc56c7795a878e8aec03dd15928752bce19b5326480172fb89c4decf43350938f2376d7ce7fb6
+EBUILD xf86-video-amdgpu-21.0.0.ebuild 564 BLAKE2B db3dc75a28395ff27f91caac1265b5f3d425c55b9a4c0a388b5b4ebdae587c071def6f394ef7a689dc9a6e36abb193dcb648af05a947f3d8d27b5c65dedb0d11 SHA512 c3a37da2d616ddbdae98965bbd248b16f18b49cbed029c0d58bbe99f7dacbabee1e3adb130ce2fb0f88ad2a62a074e342500af876b8e89e052ac3b624199f834
 EBUILD xf86-video-amdgpu-9999.ebuild 557 BLAKE2B 4acc38d1587451eb60056590aa5a6f578f2a3b190ebe77c76e7807ff9ac7280bc88e428a2b980d06c396d3c82fad76b869961cb33852a2156a39605f3f3d135f SHA512 6456b7b9c1ec69d93455a5ab260baaa83412474d0cb9ec904138fc9e31ab3f9455bbe2fcdac4ecf1d1653d1fefcf3389ed7f9779fb5d5c1c70906a97a4455b14
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild
new file mode 100644
index 000000000000..5dc34b7fecce
--- /dev/null
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+XORG_DRI="always"
+inherit xorg-3
+
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
+
+IUSE="udev"
+
+RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_amdgpu]
+	x11-base/xorg-server[-minimal]
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		--enable-glamor
+		$(use_enable udev)
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 7e298410b79e..06926fd6b86f 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index cb3e14458b8c..56180b9e0b2d 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -2,6 +2,6 @@ DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a95
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
 DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586 SHA512 c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1
 EBUILD qscintilla-2.11.5.ebuild 1959 BLAKE2B 66709df30efbbee01900254c1fbe9026155fc6a063b2bbc2dee69278c6600a258ba351155519db19588d6a032080be7bdbb2dc0ecad7dcacdd4eb017f2e5b542 SHA512 f786290e1496a6d1ff12f9c235269e5d72d4e5898fd5b57a787df74d84f33359b6eeff3530d96fb9037804e26be126abcd3cf84c9242f4c24238ea94898646b5
-EBUILD qscintilla-2.11.6.ebuild 1964 BLAKE2B d7b1627cc76f089054a76cfb01263cd78278b2ff17295dcac245bea8cbf3ca5ea0830a8e30ea8e3ba69b968f0cf8ecbdbae6a82972ea3f0cd085cb8c54807dca SHA512 3f69bb7fb27ac4c0d3c5292dc98d219f938c10ff73bb78eb62972b5f2f80b66fd9f717ce0b3cae0d3e43f4d2929fc1bc2fc8b12533ac3b0429eb6f0dd3d5938b
+EBUILD qscintilla-2.11.6.ebuild 1960 BLAKE2B a61443c1d296896aba43182508ab745467fbd44276f118bb5ed40d5064541bb27a5d8edaefa4aa584540f2ee1d572dae2bece400377c5e12c363599769e30f41 SHA512 fa113212d1f891c908edec7d0a1279dd7df8e2e6e8eebe8b836afc1206e6c70e676d00a78d6743b11fc353b5e6026699b80687623cc597d0cca501b4f73b0c54
 EBUILD qscintilla-2.13.0.ebuild 1896 BLAKE2B 848a3f5f88a75733433a4dde205043d200d1983301c09696f2b93156b300128cc92a554c3653853d2f53e712fb4c74288b0a618fd0db7b061094bf3912546afe SHA512 cb5c43d8dc3651755928ee1ce640089374862ecb316affdcde06b4a79ae773a6c0b5212470b9079e025066fc941b84700c92e604733b0113a5e2146d25cba0e0
 MISC metadata.xml 604 BLAKE2B d353a492de987b1b7898a206a1d29fff43dc25ec7809d95fe8ddd816507c24b7fea26de43ce16cb0b939e31d663d280231202b787fcff2f6b79d4716c9a00713 SHA512 ff45db818793a808f2fee2a85fbf9d3a069bcf406f8d18c5a49f527d332002cad64295ae9b31f5297203610a4497db12e5aace0861069e55f127c736a4065580
diff --git a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
index 82d8a6e8e812..bc6d19a21706 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 x86"
 IUSE="designer doc"
 
 RDEPEND="
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index e2fb0911c352..4f9a0bc188b0 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,5 +1,5 @@
 DIST xapps-2.2.1.tar.gz 239789 BLAKE2B ee7f3f2b3c54b0b40158dff6abbe2233c0d1a1fa4e134ce4bd6ee48842335b16e0d94ad430cb59301529dd85e2705cbb1c1f5ba10844b6fb85f598ca0c42d1db SHA512 412f5c207d81d2507f2aa5cc69beed2036db07058f08613793aa7c277bac30191a02d9aff4eca0aeb8829e3e39d5f3a87e34232bf51220c4d4bc7c8ee37b9e65
-DIST xapps-2.2.2.tar.gz 239823 BLAKE2B a45b2707c505c9ed69b9748c846f69ef7668600619bc3d0f86c693c99e536afb9994ff4ed10cbf0efc194a1e861cf0911af50170e97a7b858b1363c370551799 SHA512 ab37714849365a81b2a500ed38ada9bf6b52edc17d3b3bfa6d41551a18af1b983f8fe084dee94939e81647814a77d2c219b87694349ac5d0d0ac59ba5ad79aa7
+DIST xapps-2.2.3.tar.gz 242330 BLAKE2B dba7f77eea7314fe978a1ba2b691f5c2d7e5d88f499d2f8533c8b1141262ce981cc395f8d6a0b1feaba715c63034e8dfe887e4183b5e119a0947b1ad85d99bbd SHA512 e8ac24decfa89aa949cf837a2e7a7ccdb8ef9d777081d0f3ea0e3a0b42378c721eed3eafacae669244a64c7f4202cb5c2a878d3574823f8f94bfdf51ec29f9ae
 EBUILD xapps-2.2.1.ebuild 2137 BLAKE2B 7d58cac8c262526bcab27af3cddb3ace003d65f89b4dbb41566e516a3e67fc515832115085c6c1f42e6a93bb02fdba198b665cf11a0ed0f246dad47bd51065bd SHA512 52d1fe7c51936c187a9c2bbb5ab7df97e657fa8a1ca5d0f874913bc75f5f25498abd28dc56c1fabd785d867f2cffe50abe36428f2afa8ea1797532eecc45e901
-EBUILD xapps-2.2.2.ebuild 2139 BLAKE2B 4a91afb77aadf2ffa5c7b31e06559f74be2c7f782bc7e491acad2e58e5fc3251dece2b9905d05e59c3608ccc776c964862b12a4c3c715b4c76e70317d732da7a SHA512 45d015894b5c354d486ae1f8bafac913b309a5ea86ec576396d4965664d7bd11f49ed83b3ec5a1b21ccc5f7b2a2ee36929e2d305ccbc5b54de0726be1065fe98
+EBUILD xapps-2.2.3.ebuild 2139 BLAKE2B 4a91afb77aadf2ffa5c7b31e06559f74be2c7f782bc7e491acad2e58e5fc3251dece2b9905d05e59c3608ccc776c964862b12a4c3c715b4c76e70317d732da7a SHA512 45d015894b5c354d486ae1f8bafac913b309a5ea86ec576396d4965664d7bd11f49ed83b3ec5a1b21ccc5f7b2a2ee36929e2d305ccbc5b54de0726be1065fe98
 MISC metadata.xml 484 BLAKE2B de6e513c5b0bf8090a3987c27f28c2c178ea1d4b7c90711dfed21e881989dd5894ee7a822f85135a4f2e0ca240d37158bce8206063892f4d9712387e6586926e SHA512 22a7d6e00716057a38f97ae73d4cb906bbc6c3aeabc23d586ba1788be0f77ebac6930870f55f931ab0fb6fa8ad41e7a6ac8e94eab3c459ebcb5f296b7f6dfcde
diff --git a/x11-libs/xapps/xapps-2.2.2.ebuild b/x11-libs/xapps/xapps-2.2.3.ebuild
index a7434062a552..a7434062a552 100644
--- a/x11-libs/xapps/xapps-2.2.2.ebuild
+++ b/x11-libs/xapps/xapps-2.2.3.ebuild
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 62f67a5dfc54..73aeb94bfaf0 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/bbcd/Manifest b/x11-misc/bbcd/Manifest
index ce3b1e49044e..ccbd460576c2 100644
--- a/x11-misc/bbcd/Manifest
+++ b/x11-misc/bbcd/Manifest
@@ -2,5 +2,5 @@ AUX bbcd-0.3.1-gcc3.3.patch 547 BLAKE2B 202470e473c5742608afc1efd42e54cb6e1c0988
 AUX bbcd-0.3.1-gcc4.3.patch 254 BLAKE2B 7ace4e13e7423fd0e54801b9ef5738545068ff47670f887dbc694176971c7e134bb9066bdc85f56959179f17974667f7f5eb9e7e35774fb09f22c548e88cedc0 SHA512 8bee8daa0579736f5678f59023ebe54617106fbd53aa0b938ebcbae1b6d7b15e4798baf7e81ae4b3f84ffe36cd18789639ac13657110271d174039b9723fa737
 AUX bbcd-0.3.1_0.3.1a.diff 1794 BLAKE2B 233815b158b32e738e2849f9bd475cf5c3eabbcff30685c7aa1ac460dca466a4d4c38b6aaba054e39929d845cfeecd37201640e1693cf7707d45e8bb149df240 SHA512 422ae54b3e18e3d9dfaa4adc28e8d0285d127cb28a175fce2772ef4d3577755e95c43bdd15e1000469da64dd9b6693cb2f11d92c5d261266cc791b9671cdfd82
 DIST bbcd-0.3.1.tar.gz 74853 BLAKE2B 446f295b7716548f9a6ded07ee10323483bdac460d53b9308bd6dd22483e8c664a24bfd9848caeca730801d3273de3000bd771e925a9fd334a2c009453f773b3 SHA512 817c41e8989d28fed45b3a797ffac193ce2060bae7d8793253a8f2812945b0f72e2f14ecd607329f769fc07773b678ca507a84c7f3b214fb5ac4afd62d77de7f
-EBUILD bbcd-0.3.1-r3.ebuild 586 BLAKE2B 7df56f31ecdd919d81e3daf51a2f1074554f9773fd3b9cdbf9b93cab1e5267444086e2a739957e9cae68c9e6fdb84d5319cf19f7a355ea466bbae294e052977f SHA512 6fe2e90cf1b8c49b50c01b4b114fa6d9f2a7342d51448801e21e47b7d1aa2210dc2af92190041017771b12ad6803081edc2e5c82c7b227cdc26661d0bcf89dfc
+EBUILD bbcd-0.3.1-r3.ebuild 666 BLAKE2B 9ff23133a3597efb569341fd710e6cdf401da13ecef2f493e5df5acbdd38595a6b34a255737130b6277d614b458919e6196d818a5b3e73d946826a2cfb813b41 SHA512 6e662a2b1125cdfb6ec31dcd8d14835953e2f8ef91548cbad77c71a6170a35944361ea7386f3f4085378b5c8eb5ef0a414af74ff81e43ccad84907ce7761621a
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/x11-misc/bbcd/bbcd-0.3.1-r3.ebuild b/x11-misc/bbcd/bbcd-0.3.1-r3.ebuild
index 23c67dd2c16c..ee2e46b6956b 100644
--- a/x11-misc/bbcd/bbcd-0.3.1-r3.ebuild
+++ b/x11-misc/bbcd/bbcd-0.3.1-r3.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit flag-o-matic
+
 DESCRIPTION="Basic CD Player for blackbox wm"
 HOMEPAGE="http://tranber1.free.fr/bbcd.html"
 SRC_URI="http://tranber1.free.fr/${P}.tar.gz"
@@ -23,6 +25,11 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc4.3.patch
 )
 
+src_configure() {
+	append-cxxflags -std=c++14
+	default
+}
+
 src_install() {
 	default
 	rm "${ED%/}"/usr/share/bbtools/README.bbcd || die
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index b943c1d05566..cbc345c43912 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -4,5 +4,5 @@ AUX lightdm-autologin 157 BLAKE2B 54ce42f09f88c793e90f5f21743e17a0184227b83c1119
 AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790ea9c2a0632abe8238a6187b3e01b4296a1187349864b30291853889ceaa519f5a12a98b2aecbb1ea SHA512 5b60788e35ebd7918b21ab52dc3f5cc29dd3aa45ddf6cfe75a72d1c541620f0438378a9bd681e2c151a465cf981e803b399f61b48ff5d0f2e1a3cc950c30d23a
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
-EBUILD lightdm-1.30.0-r2.ebuild 4274 BLAKE2B f4eb28fe47ae818fe06a19798d7e26d9cfc1c59b8ca883d2c8a896f81053f905a74fd0c371fc6d7579b16e2a68388e7071cc08db6c21fb3f1104acabba5b1fc5 SHA512 007bb50c32c2f6850fea677f68295a8276115bbdf15a3e170506ffa128478440e5418f54684d019e61dff648710058f34d4a44134ff845ad504c49c5a8073da4
+EBUILD lightdm-1.30.0-r2.ebuild 4221 BLAKE2B 8a05099fede3ac9c02c47e22098959f22d2e5c8b264d440db985254a904eb64a4c949528fab3a0f331ad296f8cde949ac96c2eb17011eaf3cb7b2dd124a28b68 SHA512 852bf5029560db55d865e6992aae0d6ae23ac024a31a48638e385aaab9d970552c24019263b9238f1f2f392ae881fff3594674bfe92da863ab161570e157bae5
 MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/lightdm-1.30.0-r2.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r2.ebuild
index d9817636806d..bd8fd0cb9b0a 100644
--- a/x11-misc/lightdm/lightdm-1.30.0-r2.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd user vala xdg-utils
+inherit autotools pam qmake-utils readme.gentoo-r1 systemd user vala xdg-utils
 
 DESCRIPTION="A lightweight display manager"
 HOMEPAGE="https://github.com/CanonicalLtd/lightdm"
@@ -99,8 +99,6 @@ src_configure() {
 	einfo "Default session: ${_session}"
 	einfo "Greeter user: ${_user}"
 
-	use qt5 && append-cxxflags -std=c++11
-
 	# also disable tests because libsystem.c does not build. Tests are
 	# restricted so it does not matter anyway.
 	local myeconfargs=(
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 623f26a3056a..19a9274c3933 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,3 +1,3 @@
 DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
-EBUILD makedepend-1.0.6.ebuild 390 BLAKE2B 8944e958d858be037c3c812608e1598e70d388c8f92e87d4905f37e9579036a9eb7a881dea4e5e15e9f26a80f2c46e79dd2aed8e905c161de6c331b55285e821 SHA512 2a1c7d72f42a2b28982b4fedabe05df55a6ddcdf9808e9f756c2b071c4f0e971463620477b70832a37723c19cdef6039b0d3261d0e1b68ba0c02f32740bb0374
+EBUILD makedepend-1.0.6.ebuild 397 BLAKE2B 294b493cfe4c019faa18e0b48205c95f82f40c080fc47878989357e3d876c39c3f9b351d9b97f4bc9bfb5fedab24befd5fd72fd60d2f12d62b01c1f065c1f8db SHA512 a7cf34d65d3b3823395b4fda6f6742b6699664fd163333dabfa6b083ca244da34e6705b120acf6d1c6426c5301ef9134c3305fbde8065b523cb0661bf14ac0ae
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild
index d59cde933a93..b8a9c80500f0 100644
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index 4aa28c3329a9..c861a25de5f1 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,3 +1,3 @@
 DIST menulibre-2.2.1.tar.gz 453217 BLAKE2B 86b3d2d8b20bfc7dcfcba380f656ec1e99f1d5dbc3779eadb9e7cc3a2b8c96afc0c2efe72802d0c93833f6c705c67d05a4ba6cc6cf9b95e0c9b9850ae4424fee SHA512 cf1425d604af26b7bde92106aa758a1f7dcc66ad1fbcdcd4c23db90bc7b6de5fe1160b917035f1d949daa1af8ba6b1145d7376ae637c8937a25cb108bf8cd15f
-EBUILD menulibre-2.2.1-r2.ebuild 1743 BLAKE2B 15009c1b0fde5d75a6fc017452d79aaefbcbd3cc015300aa46e75a3964dca85f8025e1f3dcd4fb069365cdeb834690138d23c64d680674fd332512cfcc051097 SHA512 5863fcdfe7d68a2fa2bb7b04395dddbb9da63db77acdc80c2ee6cdfa5a30b133ebfea7ee1907b4a56a5ffa548256109fb357d307f63eccf6fa4c55a761d44f5d
+EBUILD menulibre-2.2.1-r2.ebuild 1742 BLAKE2B d25bf7116c57ba82b6e0c098d7cb75bb9af830d593e58eb2f2fbb12543c707c0031a77435e5b4e6573fac0e9f1a7db92fcacd44067a94575c79657cd06cda052 SHA512 040ee792748927b61600afc471204a46b87b9e97c618e48934908266d7bd59636cc4a6201ee7a38dac3f12d809232de6029ee296a93545f4d770bfdfda2c1730
 MISC metadata.xml 244 BLAKE2B 074f1e921f4d984a8bb58f3ff2800ddc85868c9d33c331dfd7a19503c02563f9e291876e99a3f4bc9afd171fcd8299e5c22d46bc24ec9ca475fa88d1535fb112 SHA512 0929c8d7177ffd5ac6e346f4bbfcafa764105312388307b7a8cf240d72f385437beb275aa530b4ad0248e807e5f42fa4f5437affdc94557baa1ece5a9f5586fc
diff --git a/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild b/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
index b4f8aab14192..1cd6aaa6ce46 100644
--- a/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index d6067ba8e9e0..39fe9e22809b 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,5 +1,5 @@
 DIST shutter-0.95.tar.gz 2567849 BLAKE2B ecb29ef21990dfcb29f71c87b690f0e0609890f88edb2ed3ae3d0650456974242ff278e443a13bd3081625491b86c5d53642c5c2c997a37fcd1d7752994a7cab SHA512 77df43b952c10e6280b12170de997c12e0e13d5868f80f1ab22ad9a062b4b67eb93dfc540d4ed0f5db2e950eaae8a258f3d01d9ddf6043d26f8f16f0ce93e75a
 DIST shutter-0.97.tar.gz 2558672 BLAKE2B 72d641750b81b0d4ea1942883b15bed20980c1eb2f96cbc3af101387897b686487b7d0a4e46dfd1ae82cc0d889fba6dd48472c340d088a9600ee9a919c262fe8 SHA512 40315ee03a138c71c29e05e82202d4a1adc0d930aef163e643e757ea2674dd8470e7a4d7d8b38ab5d3386ce8b9d774cbbb9a8b4bc2cb4d5b3b13812c77cf4334
 EBUILD shutter-0.95.ebuild 2101 BLAKE2B 9dbc3526fc832f35ecf43b4f6f9e71ba4bf163d77aafc84745abd8dbe5c2c819c5b099e25ff73a397477e2fa9324228429731a4ba970e84d4a6082e0c6780694 SHA512 e5d94e24724be26f6dc6d6a7b78c55f8ef7cbb1cc261369b12671304276d1b37185904c193b527bfba0622be301f46a5e6aab0a9341d550f004be03e78107f68
-EBUILD shutter-0.97.ebuild 2132 BLAKE2B de17585c65ff3fc69a490c3ae3e073ce3f750c98268baf9f1ef390f754adfe2fdc05580a2c13bea2252d6c25c4c28bafc717d243732c465befc97199549d6a51 SHA512 b37fcacdb758e8798eca72ef19c3849d84c94f9e85bb0cc496fd00651ef65ff2c603ab67ee5f106f523ac57d5182872b672ce9fcf6376b865a1bed59738ac150
+EBUILD shutter-0.97.ebuild 2131 BLAKE2B 28f354d1e340221e618c61165a560d00dbb29dcdb5aa98e1bb67b86051f1b4c62e23dd67eba07c527791fa3c0d9b23644990b49648e801b6f814dd6977925f2d SHA512 719411c211bcd34bc04920c5aee574743ece2fef9252682b1702a30fd1465cc715d16924d0785fbd4317e07782dde13507b5621cbd2baf4570e12ee6b3f56676
 MISC metadata.xml 403 BLAKE2B c07092357bb7c9820fe97d4c08081d1074576757c53e81ff0836f4c6b9b4ae7bd604d1c8272c40bf40c0cbc76ea09501ed261d6a65798cde887d85acbf93005b SHA512 69fb60834dd62cec6ec79c6d2d4adf2eb0bcec46914f1794ad6ec611e999919a1dbafd9e648341d7cf2bb03dfd35004293a1192b5392682534ca331aed8681b1
diff --git a/x11-misc/shutter/shutter-0.97.ebuild b/x11-misc/shutter/shutter-0.97.ebuild
index e37edd03ab72..9d00eb454695 100644
--- a/x11-misc/shutter/shutter-0.97.ebuild
+++ b/x11-misc/shutter/shutter-0.97.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 4e19fd058925..53c0330537e7 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -12,7 +12,6 @@ AUX slim-1.3.6-libslim-cmake-fixes.patch 852 BLAKE2B d4879e855e0cb0e1b2409890ed4
 AUX slim-1.3.6-session-chooser.patch 3994 BLAKE2B 48990db75196e9da4022af1ecf8ae509453d2e001d44327eb89fbb4513d661ac3b3bbbdbe8e85ca34dabbf179d84076b584401cb777c28beef1860f28425f0c8 SHA512 7227fa0210d7870971870409da2d86d9f239ae285dde116e2b2d817318339fb51324bd11d04dc4c26a2ca3c1e5a0f0686987eab7042265389fb2f60cc7d37a45
 AUX slim-1.3.6-strip-systemd-unit-install.patch 474 BLAKE2B 77f06c1f31801a56289b699f4e801ee169543c0407a79c6d7d73aa83053fdb70f74dbd962654b93081c6af680d800c9ede45cbf7116bc66ef540f216154a3f06 SHA512 990723e37a3adcec5a43a6b9bf5196d580121f8af9a6db533a3eb1c4d38269150fb01f0efd8d8e57c85b4662a573195347bdd95259059052b70f22c4b3164f9f
 AUX slim-1.3.6-systemd-session.patch 820 BLAKE2B 39345e96a1dc2cfc7a94b874d5be4bc099377aada324056bb8be073bb1c5245bbdd8b265b37b286a0fd1863fbc1de1ffd37b1001f468a1df3d49ac33c0f544de SHA512 df653a31bd2b0d3bb5b09d700d89d6b4c444b3ef49dc6d5a0646cab5480841a76ecb1c3bcd45b602eb0d2000971a5ef576eac63de67907769ea23b6925329635
-AUX slim-9999-config.diff 2480 BLAKE2B 11dcd073dd0cfb83e49bc545fde0190a2d733104a63b502822a7adb6b1ed21b2e227ab6ab6957e33741a3604852ff4164b106d64be039c779f2be5c23d06bd5e SHA512 6018c5eadd0c63e86b07ad8662ffc046fd1f586c101dc84bc9452295a9a11ed1a82a6a8a228bf8d5e064cc5d17b1bcea8662f957b831c96f8ba21c0f55a0d216
 AUX slim.logrotate 102 BLAKE2B 8b41d56746b9889ee7f13f3cef08f80532c0c58505061ce09262aa629af5ec77dc35278ce979c717cd53f6ba586c529201e0dca47a28044231bf2d0b9cd8f317 SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2
 DIST slim-1.3.6.tar.gz 232547 BLAKE2B 3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506 SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
 EBUILD slim-1.3.6-r5.ebuild 3811 BLAKE2B 1da707f0dbeaa34d9708b50d8339f3447ca4fc13533dad09fa0930d85c2c42d7498a298fcba7c7fb66b6dc782d424365b539e70a6c9c703b64166ade89d6cd29 SHA512 a9be0049e39b7e28c607156f7b98824ceaa78f5ab532e7d21fadc64878acd4c5a356194ede7ec8331d843dc2cdf166ea9c8857c47ae2a9aa481178b976a808c4
diff --git a/x11-misc/slim/files/slim-9999-config.diff b/x11-misc/slim/files/slim-9999-config.diff
deleted file mode 100644
index 81f0feea43f1..000000000000
--- a/x11-misc/slim/files/slim-9999-config.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/slim.conf b/slim.conf
-index 2c72255..7af4adb 100644
---- a/slim.conf
-+++ b/slim.conf
-@@ -2,7 +2,7 @@
- # Note: -xauth $authfile is automatically appended
- default_path        /bin:/usr/bin:/usr/local/bin
- default_xserver     /usr/bin/X
--#xserver_arguments   -dpi 75
-+xserver_arguments   -nolisten tcp -br -deferglyphs 16 vt07
- 
- # Commands for halt, login, etc.
- halt_cmd            /sbin/shutdown -h now
-@@ -18,7 +18,7 @@ authfile           /var/run/slim.auth
- 
- 
- # Activate numlock when slim starts. Valid values: on|off
--# numlock             on
-+numlock             on
- 
- # Hide the mouse cursor (note: does not work with some WMs).
- # Valid values: true|false
-@@ -33,19 +33,20 @@ authfile           /var/run/slim.auth
- # to adjust the command according to your preferred shell,
- # i.e. for freebsd use:
- # login_cmd           exec /bin/sh - ~/.xinitrc %session
--login_cmd           exec /bin/bash -login ~/.xinitrc %session
-+# login_cmd           exec /bin/bash -login ~/.xinitrc %session
-+login_cmd           exec /bin/bash -login /usr/share/slim/Xsession %session
- 
- # Commands executed when starting and exiting a session.
- # They can be used for registering a X11 session with
- # sessreg. You can use the %user variable
- #
--# sessionstart_cmd	some command
--# sessionstop_cmd	some command
-+sessionstart_cmd	/usr/bin/sessreg -a -l :0.0 %user
-+sessionstop_cmd		/usr/bin/sessreg -d -l :0.0 %user
- 
- # Start in daemon mode. Valid values: yes | no
- # Note that this can be overriden by the command line
- # options "-d" and "-nodaemon"
--# daemon	yes
-+daemon	yes
- 
- # Available sessions:
- # The current chosen session name replaces %session in the login_cmd
-@@ -63,7 +64,10 @@ login_cmd           exec /bin/bash -login ~/.xinitrc %session
- sessiondir     /usr/share/xsessions
- 
- # Executed when pressing F11 (requires imagemagick for 'import')
--screenshot_cmd      import -window root /slim.png
-+# Alternative: media-gfx/scrot. See Gentoo bug 252241 for more info.
-+screenshot_cmd      import -window root /tmp/slim.png
-+#screenshot_cmd      scrot /tmp/slim.png
-+
- 
- # welcome message. Available variables: %host, %domain
- welcome_msg         Welcome to %host
-@@ -92,8 +96,8 @@ reboot_msg         The system is rebooting...
- # randomly choose from
- current_theme       default
- 
--# Lock file
--lockfile            /var/run/slim.lock
-+# Lock file, /etc/init.d/xdm expects slim.pid
-+lockfile            /run/slim.pid
- 
- # Log file
- logfile             /var/log/slim.log
diff --git a/x11-misc/xsel/Manifest b/x11-misc/xsel/Manifest
index 83575cc50a86..605f0c95bd8d 100644
--- a/x11-misc/xsel/Manifest
+++ b/x11-misc/xsel/Manifest
@@ -1,4 +1,4 @@
 DIST xsel-1.2.0.tar.gz 169155 BLAKE2B 59b5c2f03058be1a584f12bd5c129a008ae581545b7aed3a54240f6a0b9c29e857c7425cbf6fa6421ccd577a1907a9a6c1d7213e4ccc43309a5e8933e707847d SHA512 e28623e6cc180f2e2210c20697d21d336633f0a5272ca9b62150a1c535e8de89731acc07230a9977e391e37d3943a9d687f1f967765a15bca5092a6c6d8c4d8f
-EBUILD xsel-1.2.0-r1.ebuild 613 BLAKE2B 69245c95d60f0a354023c251c45d0c2fa8af71627e7f31d294141f8a2b9fa3b7d06973f43c00670f5cb780d55ddfc9f96810777c4f24be1ad6a16f787838e886 SHA512 dda5623dd332ea4c4200e4c704fe79489b638134b1b9028244738e69005d274fff2bcd745af699e0601cabafe061c05a9866f6838836ad977876f92e4302a54a
+EBUILD xsel-1.2.0-r1.ebuild 620 BLAKE2B bef4204ce1b9c61bccbe90b355f9d74fb1c521b30ead257da07e86886ca84462d31dc3963b5cd23a69ff8e88320b6c1ff12a237d3cfd64e91b49405a3c7ae57b SHA512 f00090c01ce3a84201821b458280077643722edd321a6339b90f0329dd882208f195710afc48e751eb4f27a310c8b99233530132f0b470ea71a692d806c9d2d2
 EBUILD xsel-9999.ebuild 568 BLAKE2B 66dcdd575ed15292aab0e6f629bfe0f65d8e83fa80e2678061a502704c3da015f55fb4553573a23782afae1945afc11264eb74b58f81ad91fe725aa542d6f56a SHA512 02903c21b332e05b486718e831fc68a51b92365b0d5021b626a8814696428e6ebfe7037be6c397909c25b4d153259de4907374d433285ac0c1c2fcc26539166d
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsel/xsel-1.2.0-r1.ebuild b/x11-misc/xsel/xsel-1.2.0-r1.ebuild
index 6436a43bf185..e9b83bd97659 100644
--- a/x11-misc/xsel/xsel-1.2.0-r1.ebuild
+++ b/x11-misc/xsel/xsel-1.2.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.vergenet.net/~conrad/software/${PN}/download/${P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index cd5632282593..19e2407b174b 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/purple-mattermost/Manifest b/x11-plugins/purple-mattermost/Manifest
deleted file mode 100644
index bd5a6885414a..000000000000
--- a/x11-plugins/purple-mattermost/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST purple-mattermost-2.0.tar.gz 99301 BLAKE2B e4de82581238b399fc1d5e77abd3c6c925d36e6012c5da354eecc26364b2e671c106e867b387b10ca82553b2bc4b11fd9f448ff744295fb81a4419086afdae4c SHA512 5f192e5c8f07a28f4ce568e1f07b023c4edafd5eb938beb2067925f3addbb1f920ee9c1a8f46a1e5a46518d201c979e2cf8be17cb38e2f652a4f34921e151f7b
-EBUILD purple-mattermost-2.0.ebuild 549 BLAKE2B 468dc23bb52957149baa75a487bdd109f05fd2bb8d04eb73fcd3178053a7dfa46eea68aaecc7df608697764dcbad355c7358761034fba8f7a9a5b594503404cd SHA512 844ee8f419a66a877bed09e2247278eaea1d575e973daeaf8743b9d0f3d9e75863d8aba5167ae99b14c0eb533265aaae14e4e2c951d7215628641f7ef57afb09
-MISC metadata.xml 258 BLAKE2B 263f304c2e9b486c0afdeae484449e0e1ce634b28585ac7d0ab5aea0f8aeb482805cc5e4b6254255e9517000016f0f499246c3685c578529d3898873382a2954 SHA512 f285dfc0fbc8128dca552f3ca89f4f17b1266eab124f9bed38039f4bc1161cc7a4cacb20fa41fd0341c680100a30b1fe0e952985b8ab6fb4e852cdeaf23c97be
diff --git a/x11-plugins/purple-mattermost/metadata.xml b/x11-plugins/purple-mattermost/metadata.xml
deleted file mode 100644
index 2622afb59331..000000000000
--- a/x11-plugins/purple-mattermost/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">EionRobb/purple-mattermost</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-plugins/purple-mattermost/purple-mattermost-2.0.ebuild b/x11-plugins/purple-mattermost/purple-mattermost-2.0.ebuild
deleted file mode 100644
index c6af4b1659f6..000000000000
--- a/x11-plugins/purple-mattermost/purple-mattermost-2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A libpurple/Pidgin plugin for Mattermost"
-HOMEPAGE="https://github.com/EionRobb/purple-mattermost"
-SRC_URI="https://github.com/EionRobb/purple-mattermost/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-text/discount
-	dev-libs/glib
-	dev-libs/json-glib
-	net-im/pidgin
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	tc-export CC CPP
-}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 7c18cbb8f484..94c7a1bc7d6c 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index e776a17b6e53..005ec3153d13 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,3 +1,3 @@
 DIST terminology-1.9.0.tar.xz 4971192 BLAKE2B 840da3f9c5432d795fc21418b24a351e6c3057566339c673c2de7c08ff16db9d65cbb431ac1151cb85f035a577b509339fbf6eed68197ac96d67dd59c6a67cb1 SHA512 03955899f320b9d018d9e8a4a195b298e35052e6b5fa7d6c804f1810edf9ef55cac02e8d8c7261e1b890e8a453fce6418dc53a37abe499067688d3e16fdff9f1
-EBUILD terminology-1.9.0.ebuild 1226 BLAKE2B 8fdf15b9301e3348a593325d196ed1dc461069a75d49e36c2cd74ac8cdebc4863548d81a825aad36c2298f0b7a07d62e42549c5c1a028fdd919c2bdc8d7a3eac SHA512 985197b0995fef7319ad212dc3094f2b2da7054b8d72d57b2f15a8e7a33c00a61cad2f02851932d770bfa8ff0d7e143193982a1ce5773d172f4e492d515a2630
+EBUILD terminology-1.9.0.ebuild 1233 BLAKE2B a844d74d704ecda740148ec5ea454734912013637837d6cdde9d567e8e969bdac13b4aa71ff9aeef32fa9a09fc45efb986bb67ef6d0c80486813538072415f3c SHA512 fcd04d587cf2ddb2554fcef1e05418c9b709148fbaadb7f1ef09d7748fff1ff79d18d0fc58300f866ad8201a2d4503760913afe6fada78174050486e1fa0df41
 MISC metadata.xml 335 BLAKE2B 284db47c691f29fa5b409845f970dde0aa4f2db13d11c4f383bf3b6d13ec8ce05786817a774755a1711e3c748a007733f6a55941a25f7fefa6a87d16df2de625 SHA512 050b1e1ebe7f891d60a1cdb1e6156535eeaa91e7a8064f9dfa9dd0ae948444b13c568761ff7d1f980d78c9afefdb9df1b33813fa2167b7347bcb3f43cb95fb96
diff --git a/x11-terms/terminology/terminology-1.9.0.ebuild b/x11-terms/terminology/terminology-1.9.0.ebuild
index 64d957e9b8a7..5d245455c848 100644
--- a/x11-terms/terminology/terminology-1.9.0.ebuild
+++ b/x11-terms/terminology/terminology-1.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/terminology/${P}.tar.xz htt
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="extras nls"
 
 RDEPEND="|| ( dev-libs/efl[gles2-only] dev-libs/efl[opengl] )
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 4fd343cb0a08..582e6e04210e 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 091319e58492..80c6f5b6eec9 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,4 +1,4 @@
 DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3 SHA512 73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c
 EBUILD herbstluftwm-0.9.3.ebuild 2982 BLAKE2B e9cbbe5b76e1553cdf2bd3197b93a3e7ad22612b8284c8ef20008bf9fab94f2117879f2f3c529766048f03ba0a22035750a62f5c8d78ab7b2d8e5ddb192bbcfc SHA512 107c2485d18e30abac5801a946cd565700ce90d75057a762ecb4c8a8d503b9c9f011396b6bf746ae90eb7da922ef5b043c915eea57bf348ea386b66b55c53d53
-EBUILD herbstluftwm-9999.ebuild 2984 BLAKE2B df15aa0ba6046e3f5aaeee12e872a544a1b94aaa96a27ca477493ae7be13cf18700474589198d1280cf44a8760061e609f0151338e91a5ad8fce5754dc139c3a SHA512 a60df5c98a7ad7329161d5ea4f26ac302f89f1ae1384aec815f0f91e11bc03e15bcdc3313a4cc43fa9961773c0c11e358800c5f5427a45ce5e87ecbb2a52025a
+EBUILD herbstluftwm-9999.ebuild 3262 BLAKE2B 0c6d211c2fa9d0e80b271e5107650a5176fa1bab34f1c948d25fd72f8111409c6d9c6543a1b46bb02ba103c030cc3b28edcd34d2b9e121f2b75072b534d7a7e4 SHA512 2739175752081dc17db123bd089e8f027d17ba1d1fb9a81b836d381976f07aaea194509733d766617b2dd8444992d62a065f5b83a091e0395c1b218c3afc893e
 MISC metadata.xml 448 BLAKE2B 454fa91d4bf0e1b7f3bf133e1de6cecd55588ac8c49d15c6624f0baf3fcc08663f52c972a8d7ebcb41107825f5bd70c2b8f7e67e10db674d0493d600a2f88de4 SHA512 22390ec4b20611620ea61bc0d93e7f9e67c154843bd3094592f4b69728eccbaaa5ea811872f5d63d55e0c7e0d0c65d7941eb2e57c74c85bfa63469fd4432531d
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index 37035a6a5ff8..ed397f906c24 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -55,6 +55,10 @@ BDEPEND="
 "
 
 if [[ -n "${EGIT_REPO_URI}" ]]; then
+	# If hlwm is build from VCS, then hlwm-doc.json, which is used in
+	# the tests, needs to generated by the WITH_DOCUMENTATION option.
+	REQUIRED_USE+=" test? ( doc )"
+
 	# Herbstluftwm tarballs ship with pre-compiled documentation, only
 	# if we build from git asciidoc is needed.
 	BDEPEND+=" doc? ( app-text/asciidoc )"
@@ -126,15 +130,21 @@ src_install() {
 
 distutils_enable_tests pytest
 
-src_test() {
-	ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient"
-	ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm"
-
+python_test() {
 	pushd python > /dev/null || die
 	distutils_install_for_testing
 	popd > /dev/null || die
 
-	# Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658.
-	export PYTHONPATH
-	python_test
+	distutils-r1_python_test
+}
+
+src_test() {
+	if [[ -n "${EGIT_REPO_URI}" ]]; then
+		ln -s "${BUILD_DIR}/doc/hlwm-doc.json" "doc/hlwm-doc.json" || die "Could not symlink hlwm-doc.json"
+	fi
+
+	ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient"
+	ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm"
+
+	distutils-r1_src_test
 }
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 46f5a6247849..367ecce47752 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -2,5 +2,5 @@ AUX muffin-4.8.1-slibtool.patch 6242 BLAKE2B 487b87b47378cb827eaa85b0dbaa533bf6e
 DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31
 DIST muffin-5.0.1.tar.gz 5197104 BLAKE2B b9c9039c2fcd042859c28829f0df1f2d6991a0d90f4a1647d34cc56069ee80f5e0b4a13b1a49797f84815a97adbd96379060cc879c4aa4966f7f0a23cf7e938e SHA512 8e91e37372a2ac67e216c5e1c457e3a1f2a57a274976716aa28bb9c8621af4241f49ab5e46da609588abb23bbbf48b2b67af5926e43d052f31ddc6c6068ef81f
 EBUILD muffin-4.8.1.ebuild 2391 BLAKE2B c7bba34a7a838e54661e93df09dd5939632d911d3e95a11f8cee8b432e1d0dce7f370986cac7c89f0cf8e52005f1c839e556cb684ec848160382267bbec5811f SHA512 f6a8d5f7d4d1bed6d019f2f50ef026b989ecf9cc37feab790f7de04c8c173390df70f82c4f1202e6edf98fb20e161c4df40a753caae6faaa9d2629207c124f7a
-EBUILD muffin-5.0.1.ebuild 2338 BLAKE2B 0c58d9dfe83369e4d9e1759cd180da381935240605f2de243cbaa15f262cc8dc0acdaaefe0f10a38087f2f917ca5f09e56fc19145fbe54f7e96ffe1a848df73b SHA512 99a49dbb02dd0d003fb661e9200def28bb8f9ef77b71463d45bd8b8d62ba941d83b53079a7ebf3ebe96f2c932371fc454f5bee02426eb3081ace6627085d7eea
+EBUILD muffin-5.0.1-r1.ebuild 2341 BLAKE2B a970ae932f31099e2c072a648ac69ee64839044ad8ff5579a29dec4d1240fe6182425df3f435354b7bc40af4b016f851f9f6a93d5616b336189a0c8040477144 SHA512 68402d22b36fd23c1140c4e48026a871bb59d26e6db27972b990ff3b4e8d4a4c9673aa4054990405a34ff31fb4baaea5665a9f6e3d74aebb0a91f1d4a7ffd075
 MISC metadata.xml 485 BLAKE2B 9c98a549cc02d9f3406afb6677215d183d8b8a78bfaaf322d1094d976352bc7f7bc361d3dbdb2ec935cecf991bec6b43cc869e4a6f61b88913c7643aa2d3d6fd SHA512 901c002088995674a0b3ef67d2558ea63bc1989c6ee459bb0bc074edd7a3e20d09284f8e76d87a4609bda6342586a1022e16caa61fbe5d4db8ba0024922c8998
diff --git a/x11-wm/muffin/muffin-5.0.1-r1.ebuild b/x11-wm/muffin/muffin-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..bad4d915000b
--- /dev/null
+++ b/x11-wm/muffin/muffin-5.0.1-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools gnome2-utils xdg-utils virtualx
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=dev-libs/json-glib-1.0
+	>=gnome-extra/cinnamon-desktop-5.0:0=
+	gnome-extra/zenity
+	>=media-libs/libcanberra-0.26[gtk3]
+	virtual/opengl
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+	>=x11-libs/libXcomposite-0.3
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/libXi-1.6.0
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/pango-1.14.0[X,introspection?]
+	>=x11-libs/startup-notification-0.7:=
+	x11-misc/xkeyboard-config
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+
+	test? ( app-text/docbook-xml-dtd:4.5 )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+	gnome2_disable_deprecation_warning
+}
+
+# Wayland is not supported upstream.
+src_configure() {
+	econf \
+		--disable-gtk-doc \
+		--disable-maintainer-mode \
+		--disable-schemas-compile \
+		--enable-compile-warnings=minimum \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	dodoc HACKING MAINTAINERS *.txt doc/*.txt
+}
+
+src_test() {
+	virtx default
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
diff --git a/x11-wm/muffin/muffin-5.0.1.ebuild b/x11-wm/muffin/muffin-5.0.1.ebuild
deleted file mode 100644
index 88d5bcdbe869..000000000000
--- a/x11-wm/muffin/muffin-5.0.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools gnome2-utils xdg-utils virtualx
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=dev-libs/json-glib-1.0
-	>=gnome-extra/cinnamon-desktop-5.0:0=
-	gnome-extra/zenity
-	>=media-libs/libcanberra-0.26[gtk3]
-	virtual/opengl
-	>=x11-libs/cairo-1.14:=[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-	>=x11-libs/libXcomposite-0.3
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/libXi-1.6.0
-	>=x11-libs/libxkbcommon-0.4.3
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=x11-libs/pango-1.14.0[X,introspection?]
-	>=x11-libs/startup-notification-0.7:=
-	x11-misc/xkeyboard-config
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-# needs gtk-doc, not just -am, for gtk-doc.make
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-	gnome2_disable_deprecation_warning
-}
-
-# Wayland is not supported upstream.
-src_configure() {
-	econf \
-		--disable-gtk-doc \
-		--disable-maintainer-mode \
-		--disable-schemas-compile \
-		--enable-compile-warnings=minimum \
-		--disable-static \
-		--enable-shape \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-xsync \
-		--enable-verbose-mode \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	dodoc HACKING MAINTAINERS *.txt doc/*.txt
-}
-
-src_test() {
-	virtx default
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index a11ea9f6c1d6..aac5695949b8 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -3,6 +3,6 @@ AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c824
 AUX xpra-4.2-suid-warning.patch 745 BLAKE2B 58153996d70476058b8daba30e61cbe02a84f10bc61ba79bafa045c1474d8436f4aa7c7e1bfa0ffc92450effca92810016d6afeaf1261cd568b5c9dd9b41f468 SHA512 82e994786967fb258cf273ea69d579207e503af5a53466821d4c155c5c61099468db26b7c31b4e91d343eff8e60cc06a66664e6a7a7e968e8ea7f1b8f862700d
 DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9 SHA512 553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
-EBUILD xpra-4.2.1.ebuild 4174 BLAKE2B 407e6d7a2da77c89bac668cb3708f519cd72133f7cea2cd3c7d039e4706417298929d102d24f13b0392f63b4dedbe4bd66feb838d51d26131fdd7d6f4c1b7bff SHA512 35ae0360bfcd7978c5b38be30498e26c78b7c02a6ffa2c18acb2755c08e70356056ab793b896e6e95cf08c24a6349780560054b5e321f318b1c4f53e5cf3fe65
-EBUILD xpra-4.2.ebuild 4172 BLAKE2B 0310419a1ce47d0a7b58d141845dbf13609e2633d0fd481e53c091340ec0c643b71095bc39b393a2639a21c61983de03aeb34533b1d8226d35ec6898870f4247 SHA512 54179fbdbfa576c03e0ec1263c453c8f08e0a80d3614cf3b782e2595a8edb4402ee968ffad6d67ba9cd47bdee2bbe172d2860e3a45ace1d2da0b31b9071034ca
+EBUILD xpra-4.2.1.ebuild 4153 BLAKE2B 83fabbba7623d98cd9fc4455f405eebf8d0c8d227f172ecc2e6db62f748a7c0452d37c15aefa61d29fe532afd80fe4a581c9703ba296e374654dcbeae25705b9 SHA512 7c78c3248308d8aff10618eb3dae089dea1206192e919f45a622455276b885a668ccce392cd87f1d124bc75b3a4cbd5584c839048f2112b79df7f463853d4850
+EBUILD xpra-4.2.ebuild 4151 BLAKE2B ed1a85aee717a2aca5d7c7b5f76ebba8a3514b3fd7f0261429836b363bd30d69a8312bc6e2526ce3f8bd92b8ebf3f7bb0a2047192b11527f8257595b72bb5e69 SHA512 73dc455a42f2ea0365c8344adeb39dc75976ad2e737d4e956e09bb2bcefcbeda9968bd8c203e307ce28eaa8ae6b176a3a4253e6e8a870b6922e70aa2e59ddcd4
 MISC metadata.xml 1250 BLAKE2B 925a45bc8dccabae8b537ac5b2bc5ed8a1add84a7fb42d69165fe2a79ec38bc87ac264f16649fa37282dfb4a411e2cc5579802f61dde8129df2f5dade3850bf5 SHA512 a4efcabc1ef671a0c47bc4201b2fd89a0452f620e05d3d9419ee6ba19728275ba7405b943e151944939b6e9cba20ed321c6021b84a438bef61094ca0bd05b204
diff --git a/x11-wm/xpra/xpra-4.2.1.ebuild b/x11-wm/xpra/xpra-4.2.1.ebuild
index 1f8dc0a75fa6..3cf2a6ed02a9 100644
--- a/x11-wm/xpra/xpra-4.2.1.ebuild
+++ b/x11-wm/xpra/xpra-4.2.1.ebuild
@@ -98,12 +98,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2-suid-warning.patch
 )
 
-pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
-	xdg_pkg_postinst
-}
-
 python_prepare_all() {
 	hprefixify -w '/os.path/' setup.py
 	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
@@ -168,3 +162,8 @@ python_install_all() {
 	dodir "${dir%/*}"
 	mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
 }
+
+pkg_postinst() {
+	tmpfiles_process xpra.conf
+	xdg_pkg_postinst
+}
diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild
index f79d0e144a07..6e18d37932bb 100644
--- a/x11-wm/xpra/xpra-4.2.ebuild
+++ b/x11-wm/xpra/xpra-4.2.ebuild
@@ -98,12 +98,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2-suid-warning.patch
 )
 
-pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
-	xdg_pkg_postinst
-}
-
 python_prepare_all() {
 	hprefixify -w '/os.path/' setup.py
 	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
@@ -168,3 +162,8 @@ python_install_all() {
 	dodir "${dir%/*}"
 	mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
 }
+
+pkg_postinst() {
+	tmpfiles_process xpra.conf
+	xdg_pkg_postinst
+}